Index: tests/concurrent/examples/boundedBufferEXT.cfa =================================================================== --- tests/concurrent/examples/boundedBufferEXT.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/examples/boundedBufferEXT.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -10,6 +10,6 @@ // Created On : Wed Apr 18 22:52:12 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jun 21 08:19:20 2019 -// Update Count : 14 +// Last Modified On : Thu Jan 16 22:36:34 2020 +// Update Count : 15 // @@ -37,5 +37,5 @@ void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) { - if ( count == BufferSize ) waitfor( remove, buffer ); + if ( count == BufferSize ) waitfor( remove : buffer ); elements[back] = elem; back = ( back + 1 ) % BufferSize; @@ -44,5 +44,5 @@ T remove( Buffer(T) & mutex buffer ) with( buffer ) { - if ( count == 0 ) waitfor( insert, buffer ); + if ( count == 0 ) waitfor( insert : buffer ); T elem = elements[front]; front = ( front + 1 ) % BufferSize; Index: tests/concurrent/examples/boundedBufferTHREAD.cfa =================================================================== --- tests/concurrent/examples/boundedBufferTHREAD.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/examples/boundedBufferTHREAD.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -10,6 +10,6 @@ // Created On : Wed Apr 18 22:52:12 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jun 21 11:50:12 2019 -// Update Count : 24 +// Last Modified On : Thu Jan 16 23:09:43 2020 +// Update Count : 25 // @@ -44,10 +44,10 @@ void main( Buffer & buffer ) with( buffer ) { for () { - waitfor( ^?{}, buffer ) { + waitfor( ^?{} : buffer ) { break; - } or when ( count != 20 ) waitfor( insert, buffer ) { + } or when ( count != 20 ) waitfor( insert : buffer ) { back = (back + 1) % 20; count += 1; - } or when ( count != 0 ) waitfor( remove, buffer ) { + } or when ( count != 0 ) waitfor( remove : buffer ) { front = (front + 1) % 20; count -= 1; Index: tests/concurrent/examples/gortn.cfa =================================================================== --- tests/concurrent/examples/gortn.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/examples/gortn.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -10,6 +10,6 @@ // Created On : Wed Feb 20 08:02:37 2019 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jun 21 08:25:03 2019 -// Update Count : 4 +// Last Modified On : Thu Jan 16 22:43:40 2020 +// Update Count : 5 // @@ -26,8 +26,8 @@ void main( GoRtn & gortn ) with( gortn ) { for () { - waitfor( mem1, gortn ) sout | i; - or waitfor( mem2, gortn ) sout | f; - or waitfor( mem3, gortn ) sout | m.i | m.j; - or waitfor( ^?{}, gortn ) break; + waitfor( mem1 : gortn ) sout | i; + or waitfor( mem2 : gortn ) sout | f; + or waitfor( mem3 : gortn ) sout | m.i | m.j; + or waitfor( ^?{} : gortn ) break; } } Index: tests/concurrent/waitfor/barge.cfa =================================================================== --- tests/concurrent/waitfor/barge.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/barge.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -65,5 +65,5 @@ yield(random( 10 )); this.state = WAITFOR; - waitfor(do_call, this) { + waitfor(do_call : this) { sout | i; } Index: tests/concurrent/waitfor/dtor.cfa =================================================================== --- tests/concurrent/waitfor/dtor.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/dtor.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -47,5 +47,5 @@ yield(random( 10 )); set_state( this, MAIN ); - waitfor( ^?{}, this ) { + waitfor( ^?{} : this ) { set_state( this, AFTER ); } Index: tests/concurrent/waitfor/else.cfa =================================================================== --- tests/concurrent/waitfor/else.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/else.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -14,9 +14,9 @@ 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,5 +24,5 @@ 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,5 +30,5 @@ 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,5 +36,5 @@ sout | "Step" | i++; - when( false ) waitfor( notcalled, m ); or when( false ) else { + when( false ) waitfor( notcalled : m ); or when( false ) else { sout | "else called"; } Index: tests/concurrent/waitfor/parse.cfa =================================================================== --- tests/concurrent/waitfor/parse.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/parse.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -24,18 +24,18 @@ //--------------------------------------- - 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,5 +45,5 @@ //--------------------------------------- - when( 2 < 3 ) waitfor( f3, a ) { + when( 2 < 3 ) waitfor( f3 : a ) { 5; } @@ -53,5 +53,5 @@ //--------------------------------------- - when( 3 < 3 ) waitfor( f3, a, a ) { + when( 3 < 3 ) waitfor( f3 : a, a ) { 7; } @@ -64,8 +64,8 @@ //--------------------------------------- - 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,8 +75,8 @@ //--------------------------------------- - 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,8 +86,8 @@ //--------------------------------------- - 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,5 +100,3 @@ } -int main() { - -} +int main() {} Index: tests/concurrent/waitfor/parse2.cfa =================================================================== --- tests/concurrent/waitfor/parse2.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/parse2.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -10,6 +10,6 @@ // Created On : Wed Aug 30 17:53:29 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 22 13:42:11 2019 -// Update Count : 3 +// Last Modified On : Thu Jan 16 23:13:37 2020 +// Update Count : 6 // @@ -26,5 +26,5 @@ } - waitfor( x, z ) { + waitfor( x : z ) { } @@ -37,5 +37,5 @@ or waitfor( y ); - waitfor( x, z ); + waitfor( x : z ); or waitfor( y ); @@ -43,5 +43,5 @@ or when( true ) waitfor( y ); - when( true ) waitfor( x, z ); + when( true ) waitfor( x : z ); or when( true ) waitfor( y ); @@ -50,5 +50,5 @@ } - waitfor( x, z ) { + waitfor( x : z ) { } or waitfor( y ) { } @@ -80,5 +80,5 @@ or else; - when( true ) waitfor( x, z ); + when( true ) waitfor( x : z ); or else; @@ -99,5 +99,5 @@ } - when( true ) waitfor( x, z ); + when( true ) waitfor( x : z ); or else { } @@ -115,5 +115,5 @@ or when( true ) else; - when( true ) waitfor( x, z ); + when( true ) waitfor( x : z ); or when( true ) else; @@ -134,5 +134,5 @@ } - when( true ) waitfor( x, z ); + when( true ) waitfor( x : z ); or when( true ) else { } @@ -149,5 +149,5 @@ or timeout( 3 ); - waitfor( x, z ); + waitfor( x : z ); or timeout( 3 ); @@ -163,5 +163,5 @@ } - when( true ) waitfor( x, z ) { + when( true ) waitfor( x : z ) { } or timeout( 3 ) { } @@ -171,5 +171,5 @@ } - when( true ) waitfor( x, z ) { + when( true ) waitfor( x : z ) { } or when ( true ) timeout( 3 ) { } @@ -229,12 +229,12 @@ int or, timeout; - waitfor( timeout, 7 ) 3; - waitfor( timeout, 7 ) 3; or waitfor( timeout, 7 ) 3; - when( or ) waitfor( or, ) { 4; } or timeout( 1 ) 3; - when( 3 ) waitfor( or, 2 ) 4; or else 4; - when( 3 ) waitfor( or, 3 ) 4; or when( or ) timeout( or ) 4; or when( or ) else timeout; - when( 3 ) waitfor( or, or ) 3; or when( or ) waitfor( or, timeout ) 4; or else 4; - when( 3 ) waitfor( or, or ) 3; or waitfor( or, 9 ) 4; or when( or ) timeout( timeout ) 4; - when( 3 ) waitfor( or, 3 ) 3; or waitfor( or, 7 ) or; or timeout( 1 ) or; or when( 3 ) else or; + waitfor( timeout : 7 ) 3; + waitfor( timeout : 7 ) 3; or waitfor( timeout : 7 ) 3; + when( or ) waitfor( or : ) { 4; } or timeout( 1 ) 3; + when( 3 ) waitfor( or : 2 ) 4; or else 4; + when( 3 ) waitfor( or : 3 ) 4; or when( or ) timeout( or ) 4; or when( or ) else timeout; + when( 3 ) waitfor( or : or ) 3; or when( or ) waitfor( or : timeout ) 4; or else 4; + when( 3 ) waitfor( or : or ) 3; or waitfor( or : 9 ) 4; or when( or ) timeout( timeout ) 4; + when( 3 ) waitfor( or : 3 ) 3; or waitfor( or : 7 ) or; or timeout( 1 ) or; or when( 3 ) else or; // test else selection Index: tests/concurrent/waitfor/recurse.cfa =================================================================== --- tests/concurrent/waitfor/recurse.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/recurse.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -66,5 +66,5 @@ rand_yield(); - waitfor( call4, this ); + waitfor( call4 : this ); rand_yield(); @@ -78,5 +78,5 @@ rand_yield(); - waitfor( call3, this ); + waitfor( call3 : this ); rand_yield(); @@ -92,5 +92,5 @@ rand_yield(); - waitfor( call2, this ); + waitfor( call2 : this ); rand_yield(); Index: tests/concurrent/waitfor/statment.cfa =================================================================== --- tests/concurrent/waitfor/statment.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/statment.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -101,12 +101,12 @@ while( !done ) { - waitfor( get_index, this ); - or waitfor( call1, this ) { sout | "Statement"; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val; } } - or waitfor( call2, this ) { sout | "Statement"; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val; } } - or waitfor( call3, this ) { sout | "Statement"; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val; } } - or waitfor( call4, this ) { sout | "Statement"; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val; } } - or waitfor( call5, this ) { sout | "Statement"; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val; } } - or waitfor( call6, this ) { sout | "Statement"; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val; } } - or waitfor( call7, this ) { sout | "Statement"; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val; } } + waitfor( get_index : this ); + or waitfor( call1 : this ) { sout | "Statement"; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val; } } + or waitfor( call2 : this ) { sout | "Statement"; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val; } } + or waitfor( call3 : this ) { sout | "Statement"; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val; } } + or waitfor( call4 : this ) { sout | "Statement"; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val; } } + or waitfor( call5 : this ) { sout | "Statement"; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val; } } + or waitfor( call6 : this ) { sout | "Statement"; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val; } } + or waitfor( call7 : this ) { sout | "Statement"; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val; } } done = true; Index: tests/concurrent/waitfor/when.cfa =================================================================== --- tests/concurrent/waitfor/when.cfa (revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71) +++ tests/concurrent/waitfor/when.cfa (revision 8b16980c32b666a9179e12e780d2eb89df7d5941) @@ -58,10 +58,10 @@ void arbiter( global_t & mutex this ) { for( int i = 0; i < N; i++ ) { - when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call; } } - or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call; } } - or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call; } } - or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call; } } - or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call; } } - or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call; } } + when( this.last_call == 6 ) waitfor( call1 : this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call; } } + or when( this.last_call == 1 ) waitfor( call2 : this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call; } } + or when( this.last_call == 2 ) waitfor( call3 : this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call; } } + or when( this.last_call == 3 ) waitfor( call4 : this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call; } } + or when( this.last_call == 4 ) waitfor( call5 : this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call; } } + or when( this.last_call == 5 ) waitfor( call6 : this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call; } } sout | this.last_call;