Changeset 949339b for src/Concurrency/Keywords.cc

Timestamp:

Sep 27, 2021, 2:09:55 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

cc287800

Parents:

4e28d2e9 (diff), 056cbdb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Concurrency/Keywords.cc (modified) (3 diffs)

src/Concurrency/Keywords.cc

@@ -1200 +1200 @@
                                 new PointerType(
                                         noQualifiers,
-                                        new TypeofType( noQualifiers, args.front()->clone() )
+                                        //new TypeofType( noQualifiers, args.front()->clone() )
+                                        new TypeofType( noQualifiers, new UntypedExpr(
+                                                        new NameExpr( "__get_type" ),
+                                                        { args.front()->clone() }
+                                                ) 
+                                        )
                                 ),
                                 new ConstantExpr( Constant::from_ulong( args.size() ) ),
@@ -1209 +1214 @@
                                 map_range < std::list<Initializer*> > ( args, [](Expression * var ){
                                         return new SingleInit( new UntypedExpr(
-                                                new NameExpr( "__get_pointer" ),
-                                                { var }
+                                                        new NameExpr( "__get_ptr" ),
+                                                        { var }
                                         ) );
+                                        //return new SingleInit( new AddressExpr( var ) );
                                 })
                         )
@@ -1217 +1223 @@
 
                 StructInstType * lock_guard_struct = new StructInstType( noQualifiers, lock_guard_decl );
-                TypeExpr * lock_type_expr = new TypeExpr( new TypeofType( noQualifiers, args.front()->clone() ) );
+                TypeExpr * lock_type_expr = new TypeExpr( 
+                        new TypeofType( noQualifiers, new UntypedExpr(
+                                new NameExpr( "__get_type" ),
+                                { args.front()->clone() }
+                                ) 
+                        ) 
+                );
 
                 lock_guard_struct->parameters.push_back( lock_type_expr ) ;