Changeset b067d9b for src/Concurrency/Keywords.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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) (8 diffs)

src/Concurrency/Keywords.cc

@@ -97 +97 @@
                         "__thrd",
                         "get_thread",
-                        "thread keyword requires threads to be in scope, add #include <thread>",
+                        "thread keyword requires threads to be in scope, add #include <thread.hfa>",
                         true,
                         KeywordCastExpr::Thread
@@ -129 +129 @@
                         "__cor",
                         "get_coroutine",
-                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine>",
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
                         true,
                         KeywordCastExpr::Coroutine
@@ -161 +161 @@
                         "__mon",
                         "get_monitor",
-                        "monitor keyword requires monitors to be in scope, add #include <monitor>",
+                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
                         false,
                         KeywordCastExpr::Monitor
@@ -488 +488 @@
                 // Do we have the required headers
                 if( !monitor_decl || !guard_decl || !dtor_guard_decl )
-                        SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>\n" );
+                        SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor.hfa>\n" );
 
                 // Instrument the body
@@ -501 +501 @@
         void MutexKeyword::postvisit(StructDecl* decl) {
 
-                if( decl->name == "monitor_desc" ) {
+                if( decl->name == "monitor_desc" && decl->body ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
                 }
-                else if( decl->name == "monitor_guard_t" ) {
+                else if( decl->name == "monitor_guard_t" && decl->body ) {
                         assert( !guard_decl );
                         guard_decl = decl;
                 }
-                else if( decl->name == "monitor_dtor_guard_t" ) {
+                else if( decl->name == "monitor_dtor_guard_t" && decl->body ) {
                         assert( !dtor_guard_decl );
                         dtor_guard_decl = decl;
@@ -575 +575 @@
 
                 //in reverse order :
-                // monitor_guard_t __guard = { __monitors, #, func };
+                // monitor_dtor_guard_t __guard = { __monitors, func };
                 body->push_front(
                         new DeclStmt( new ObjectDecl(
@@ -634 +634 @@
                 assert(generic_func);
 
-                //in reverse order :
+                // in reverse order :
                 // monitor_guard_t __guard = { __monitors, #, func };
                 body->push_front(
@@ -685 +685 @@
                 if( type && type->get_baseStruct()->is_thread() ) {
                         if( !thread_decl || !thread_ctor_seen ) {
-                                SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread>");
+                                SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread.hfa>");
                         }