Changes in src/Concurrency/Waituntil.cpp [b93bf85:ded018f]

File:

• src/Concurrency/Waituntil.cpp (modified) (2 diffs)

src/Concurrency/Waituntil.cpp

@@ -1290 +1290 @@
     // Collection of unregister calls on resources to be put in finally clause
     // for each clause: 
-    // if ( !__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei ) ) { ... clausei stmt ... }
+    // when_cond_i = (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
     // OR if when( ... ) defined on resource
-    // if ( when_cond_i && (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei ) ) { ... clausei stmt ... }
+    // if ( when_cond_i ) 
+    //   when_cond_i =  (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
     CompoundStmt * unregisters = new CompoundStmt( loc );
+
 
     Expr * statusExpr; // !__CFA_has_clause_run( clause_statuses[i] )
@@ -1346 +1348 @@
             new IfStmt( cLoc,
                 statusExpr,
-                new CompoundStmt( cLoc,
-                    {
-                        new IfStmt( cLoc,
-                            genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "on_selected" ),
-                            ast::deepCopy( stmt->clauses.at(i)->stmt )
-                        )
-                    }
-                )
-            )
-        );
-
-        // // generates:
-        // // if ( statusExpr ) { ... clausei stmt ... }
-        // unregisters->push_back( 
-        //     new IfStmt( cLoc,
-        //         statusExpr,
-        //         genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
-        //     )
-        // );
+                genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
+            )
+        );
     }