Changeset 7030dab for src/Concurrency/Waitfor.cc

Timestamp:

Apr 6, 2020, 4:46:28 PM (5 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:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

File:

• src/Concurrency/Waitfor.cc (modified) (4 diffs)

src/Concurrency/Waitfor.cc

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 7
+// Update Count     : 12
 //
 
@@ -23 +23 @@
 #include "Common/PassVisitor.h"    // for PassVisitor
 #include "Common/SemanticError.h"  // for SemanticError
+#include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for deleteAll, map_range
 #include "CodeGen/OperatorTable.h" // for isConstructor
 #include "InitTweak/InitTweak.h"   // for getPointerBase
-#include "Parser/LinkageSpec.h"    // for Cforall
 #include "ResolvExpr/Resolver.h"   // for findVoidExpression
+#include "SynTree/LinkageSpec.h"   // for Cforall
 #include "SynTree/Constant.h"      // for Constant
 #include "SynTree/Declaration.h"   // for StructDecl, FunctionDecl, ObjectDecl
@@ -41 +42 @@
 void foo() {
         while( true ) {
-                when( a < 1 ) waitfor( f, a ) { bar(); }
+                when( a < 1 ) waitfor( f : a ) { bar(); }
                 or timeout( swagl() );
-                or waitfor( g, a ) { baz(); }
-                or waitfor( ^?{}, a ) { break; }
+                or waitfor( g : a ) { baz(); }
+                or waitfor( ^?{} : a ) { break; }
                 or waitfor( ^?{} ) { break; }
         }
@@ -243 +244 @@
                         decl_mask = decl;
                 }
-                else if( decl->name == "monitor_desc" ) {
+                else if( decl->name == "$monitor" ) {
                         assert( !decl_monitor );
                         decl_monitor = decl;