Changeset 3d5701e for tests/concurrent/waitfor/else.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• tests/concurrent/waitfor/else.cfa (modified) (4 diffs)

tests/concurrent/waitfor/else.cfa

@@ -14 +14 @@
         sout | "Starting";
 
-        when( false ) waitfor( notcalled, m );
+        when( false ) waitfor( notcalled : m );
 
         sout | "Step" | i++;
 
-        waitfor( notcalled, m ); or else {
+        waitfor( notcalled : m ); or else {
                 sout | "else called";
         }
@@ -24 +24 @@
         sout | "Step" | i++;
 
-        when( true ) waitfor( notcalled, m ); or when( true ) else {
+        when( true ) waitfor( notcalled : m ); or when( true ) else {
                 sout | "else called";
         }
@@ -30 +30 @@
         sout | "Step" | i++;
 
-        when( false ) waitfor( notcalled, m ); or when( true ) else {
+        when( false ) waitfor( notcalled : m ); or when( true ) else {
                 sout | "else called";
         }
@@ -36 +36 @@
         sout | "Step" | i++;
 
-        when( false ) waitfor( notcalled, m ); or when( false ) else {
+        when( false ) waitfor( notcalled : m ); or when( false ) else {
                 sout | "else called";
         }