Changeset b7d6a36 for src/Concurrency/Waitfor.cc

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 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:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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/Waitfor.cc (modified) (3 diffs)

src/Concurrency/Waitfor.cc

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 10
+// Update Count     : 12
 //
 
@@ -27 +27 @@
 #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
@@ -42 +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; }
         }