Changes in src/Concurrency/Keywords.cc [a8367eb:5b7c8b5]

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