Changeset b067d9b for src/Concurrency/Waitfor.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Concurrency/Waitfor.cc

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 5
+// Update Count     : 7
 //
 
@@ -66 +66 @@
 void foo() {
         while( true ) {
-
-                acceptable_t acceptables[3];
-                if( a < 1 ) {
-                        acceptables[0].func = f;
-                        acceptables[0].mon = a;
-                }
-                acceptables[1].func = g;
-                acceptables[1].mon = a;
-
-                acceptables[2].func = f;
-                acceptables[2].mon = a;
-                acceptables[2].is_dtor = true;
-
-                int ret = waitfor_internal( acceptables, swagl() );
-
-                switch( ret ) {
-                        case 0:
-                        {
-                                bar();
+                {
+                        acceptable_t acceptables[3];
+                        if( a < 1 ) {
+                                acceptables[0].func = f;
+                                acceptables[0].mon = a;
                         }
-                        case 1:
-                        {
-                                baz();
+                        acceptables[1].func = g;
+                        acceptables[1].mon = a;
+
+                        acceptables[2].func = f;
+                        acceptables[2].mon = a;
+                        acceptables[2].is_dtor = true;
+
+                        int ret = waitfor_internal( acceptables, swagl() );
+
+                        switch( ret ) {
+                                case 0:
+                                {
+                                        bar();
+                                }
+                                case 1:
+                                {
+                                        baz();
+                                }
+                                case 2:
+                                        signal(a);
+                                        {
+                                                break;
+                                        }
                         }
-                        case 2:
-                                signal(a);
-                                {
-                                        break;
-                                }
                 }
         }
@@ -250 +251 @@
         Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) {
                 if( !decl_monitor || !decl_acceptable || !decl_mask )
-                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor>" );
+                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor.hfa>" );
 
                 CompoundStmt * stmt = new CompoundStmt();
@@ -555 +556 @@
                                         new ConstantExpr( Constant::from_ulong( i++ ) ),
                                         {
-                                                clause.statement,
-                                                new BranchStmt(
-                                                        "",
-                                                        BranchStmt::Break
-                                                )
+                                                new CompoundStmt({
+                                                        clause.statement,
+                                                        new BranchStmt(
+                                                                "",
+                                                                BranchStmt::Break
+                                                        )
+                                                })
                                         }
                                 )
@@ -570 +573 @@
                                         new ConstantExpr( Constant::from_int( -2 ) ),
                                         {
-                                                waitfor->timeout.statement,
-                                                new BranchStmt(
-                                                        "",
-                                                        BranchStmt::Break
-                                                )
+                                                new CompoundStmt({
+                                                        waitfor->timeout.statement,
+                                                        new BranchStmt(
+                                                                "",
+                                                                BranchStmt::Break
+                                                        )
+                                                })
                                         }
                                 )
@@ -585 +590 @@
                                         new ConstantExpr( Constant::from_int( -1 ) ),
                                         {
-                                                waitfor->orelse.statement,
-                                                new BranchStmt(
-                                                        "",
-                                                        BranchStmt::Break
-                                                )
+                                                new CompoundStmt({
+                                                        waitfor->orelse.statement,
+                                                        new BranchStmt(
+                                                                "",
+                                                                BranchStmt::Break
+                                                        )
+                                                })
                                         }
                                 )