Changeset f80f840 for src/Concurrency/Keywords.cc

Timestamp:

Dec 10, 2019, 4:24:49 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2a3d446

Parents:

b798713 (diff), e307e12 (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' into relaxed_ready

File:

• src/Concurrency/Keywords.cc (modified) (1 diff)

src/Concurrency/Keywords.cc

@@ -309 +309 @@
                         if( !type_decl ) SemanticError( cast, context_error );
                         if( !dtor_decl ) SemanticError( cast, context_error );
-                        Expression * arg = cast->arg;
-                        cast->arg = nullptr;
-                        delete cast;
-                        return new CastExpr(
-                                UntypedExpr::createDeref(
-                                        new UntypedExpr( new NameExpr( getter_name ), { arg } )
-                                ),
-                                new ReferenceType(
-                                        noQualifiers,
-                                        new StructInstType( noQualifiers, type_decl ) )
-                                );
+                        assert( cast->result == nullptr );
+                        cast->set_result( new ReferenceType( noQualifiers, new StructInstType( noQualifiers, type_decl ) ) );
+                        cast->concrete_target.field  = field_name;
+                        cast->concrete_target.getter = getter_name;
                 }
                 return cast;