Changeset 1cdfa82 for src/Concurrency

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

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

src/Concurrency/Keywords.cc

@@ -54 +54 @@
           public:
 
-                ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main ) :
-                  type_name( type_name ), field_name( field_name ), getter_name( getter_name ), context_error( context_error ), needs_main( needs_main ) {}
+                ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main, KeywordCastExpr::Target cast_target ) :
+                  type_name( type_name ), field_name( field_name ), getter_name( getter_name ), context_error( context_error ), needs_main( needs_main ), cast_target( cast_target ) {}
 
                 virtual ~ConcurrentSueKeyword() {}
 
-                void postvisit( StructDecl * decl );
+                Declaration * postmutate( StructDecl * decl );
 
                 void handle( StructDecl * );
@@ -67 +67 @@
 
                 virtual bool is_target( StructDecl * decl ) = 0;
+
+                Expression * postmutate( KeywordCastExpr * cast );
 
           private:
@@ -74 +76 @@
                 const std::string context_error;
                 bool needs_main;
+                KeywordCastExpr::Target cast_target;
 
                 StructDecl* type_decl = nullptr;
@@ -96 +99 @@
                         "get_thread",
                         "thread keyword requires threads to be in scope, add #include <thread>",
-                        true
+                        true,
+                        KeywordCastExpr::Thread
                 )
                 {}
@@ -106 +110 @@
                 static void implement( std::list< Declaration * > & translationUnit ) {
                         PassVisitor< ThreadKeyword > impl;
-                        acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
                 }
         };
@@ -127 +131 @@
                         "get_coroutine",
                         "coroutine keyword requires coroutines to be in scope, add #include <coroutine>",
-                        true
+                        true,
+                        KeywordCastExpr::Coroutine
                 )
                 {}
@@ -137 +142 @@
                 static void implement( std::list< Declaration * > & translationUnit ) {
                         PassVisitor< CoroutineKeyword > impl;
-                        acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
                 }
         };
@@ -158 +163 @@
                         "get_monitor",
                         "monitor keyword requires monitors to be in scope, add #include <monitor>",
-                        false
+                        false,
+                        KeywordCastExpr::Monitor
                 )
                 {}
@@ -168 +174 @@
                 static void implement( std::list< Declaration * > & translationUnit ) {
                         PassVisitor< MonitorKeyword > impl;
-                        acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
                 }
         };
@@ -263 +269 @@
         }
 
-        void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
+        Declaration * ConcurrentSueKeyword::postmutate(StructDecl * decl) {
                 if( decl->name == type_name && decl->body ) {
                         assert( !type_decl );
@@ -271 +277 @@
                         handle( 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 );
+                        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;
+        }
+
 
         void ConcurrentSueKeyword::handle( StructDecl * decl ) {