Changeset b7d6a36 for tests/concurrent/waitfor/parse.cfa

Timestamp:

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

• tests/concurrent/waitfor/parse.cfa (modified) (7 diffs)

tests/concurrent/waitfor/parse.cfa

@@ -24 +24 @@
 
         //---------------------------------------
-        waitfor( f1, a ) {
+        waitfor( f1 : a ) {
                 1;
         }
 
         //---------------------------------------
-        waitfor( f1, a ) {
+        waitfor( f1 : a ) {
                 2;
         }
-        waitfor( f2, a ) {
+        waitfor( f2 : a ) {
                 3;
         }
 
         //---------------------------------------
-        when( 1 < 3 ) waitfor( f2, a, a ) {
+        when( 1 < 3 ) waitfor( f2 : a, a ) {
                 4;
         }
@@ -45 +45 @@
 
         //---------------------------------------
-        when( 2 < 3 ) waitfor( f3, a ) {
+        when( 2 < 3 ) waitfor( f3 : a ) {
                 5;
         }
@@ -53 +53 @@
 
         //---------------------------------------
-        when( 3 < 3 ) waitfor( f3, a, a ) {
+        when( 3 < 3 ) waitfor( f3 : a, a ) {
                 7;
         }
@@ -64 +64 @@
 
         //---------------------------------------
-        when( 6 < 3 ) waitfor( f3, a, a, a ) {
+        when( 6 < 3 ) waitfor( f3 : a, a, a ) {
                 10;
         }
-        or when( 7 < 3 ) waitfor( f1, a  ) {
+        or when( 7 < 3 ) waitfor( f1 : a  ) {
                 11;
         }
@@ -75 +75 @@
 
         //---------------------------------------
-        when( 8 < 3 ) waitfor( f3, a, a ) {
+        when( 8 < 3 ) waitfor( f3 : a, a ) {
                 13;
         }
-        or waitfor( f1, a  ) {
+        or waitfor( f1 : a  ) {
                 14;
         }
@@ -86 +86 @@
 
         //---------------------------------------
-        when( 10 < 3 ) waitfor( f1, a ) {
+        when( 10 < 3 ) waitfor( f1 : a ) {
                 16;
         }
-        or waitfor( f2, a, a ) {
+        or waitfor( f2 : a, a ) {
                 17;
         }
@@ -100 +100 @@
 }
 
-int main() {
-
-}
+int main() {}