Changes in src/Concurrency/Keywords.cc [3b0c8cb:2bf7ef6]

File:

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

src/Concurrency/Keywords.cc

@@ -59 +59 @@
 
                 Declaration * postmutate( StructDecl * decl );
-                DeclarationWithType * postmutate( FunctionDecl * decl );
 
                 void handle( StructDecl * );
@@ -78 +77 @@
                 KeywordCastExpr::Target cast_target;
 
-                StructDecl   * type_decl = nullptr;
-                FunctionDecl * dtor_decl = nullptr;
+                StructDecl* type_decl = nullptr;
         };
 
@@ -99 +97 @@
                         "__thrd",
                         "get_thread",
-                        "thread keyword requires threads to be in scope, add #include <thread.hfa>\n",
+                        "thread keyword requires threads to be in scope, add #include <thread.hfa>",
                         true,
                         KeywordCastExpr::Thread
@@ -131 +129 @@
                         "__cor",
                         "get_coroutine",
-                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>\n",
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
                         true,
                         KeywordCastExpr::Coroutine
@@ -163 +161 @@
                         "__mon",
                         "get_monitor",
-                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>\n",
+                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
                         false,
                         KeywordCastExpr::Monitor
@@ -286 +284 @@
         }
 
-        DeclarationWithType * ConcurrentSueKeyword::postmutate( FunctionDecl * decl ) {
-                if( !type_decl ) return decl;
-                if( !CodeGen::isDestructor( decl->name ) ) return decl;
-
-                auto params = decl->type->parameters;
-                if( params.size() != 1 ) return decl;
-
-                auto type = dynamic_cast<ReferenceType*>( params.front()->get_type() );
-                if( !type ) return decl;
-
-                auto stype = dynamic_cast<StructInstType*>( type->base );
-                if( !stype ) return decl;
-                if( stype->baseStruct != type_decl ) return decl;
-
-                if( !dtor_decl ) dtor_decl = decl;
-                return decl;
-        }
-
         Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
                 if ( cast_target == cast->target ) {
                         // convert (thread &)t to (thread_desc &)*get_thread(t), etc.
                         if( !type_decl ) SemanticError( cast, context_error );
-                        if( !dtor_decl ) SemanticError( cast, context_error );
-                        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;
+                        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 ) )
+                                );
                 }
                 return cast;
@@ -322 +308 @@
 
                 if( !type_decl ) SemanticError( decl, context_error );
-                if( !dtor_decl ) SemanticError( decl, context_error );
 
                 FunctionDecl * func = forwardDeclare( decl );