Changeset fc0996a

Timestamp:

Jun 1, 2023, 11:56:38 AM (18 months ago)

Author:

caparsons <caparson@…>

Branches:

ast-experimental, master

Children:

22f2b7d

Parents:

70a4ed5

Message:

refactores to account for removal of ret val from on_selected

File:

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

src/Concurrency/Waituntil.cpp

@@ -95 +95 @@
                         case 0:
                             try {
-                                if (on_selected( A, clause1 ))
+                                    on_selected( A, clause1 );
                                     doA();
                             }
@@ -122 +122 @@
         // the unregister and on_selected calls are needed to support primitives where the acquire has side effects
         // so the corresponding block MUST be run for those primitives to not lose state (example is channels)
-        if ( ! has_run(clause_statuses[0]) && whenA && unregister_select(A, clause1) && on_selected( A, clause1 ) )
+        if ( !has_run(clause_statuses[0]) && whenA && unregister_select(A, clause1) )
+            on_selected( A, clause1 )
             doA(); 
         ... repeat if above for B and C ...
@@ -619 +620 @@
 
 // Generates:
-/* if ( on_selected( target_1, node_1 )) ... corresponding body of target_1 ... 
+/* on_selected( target_1, node_1 ); ... corresponding body of target_1 ... 
 */
 CompoundStmt * GenerateWaitUntilCore::genStmtBlock( const WhenClause * clause, const ClauseData * data ) {
@@ -625 +626 @@
     return new CompoundStmt( cLoc,
         {
-            new IfStmt( cLoc,
-                genSelectTraitCall( clause, data, "on_selected" ),
-                new CompoundStmt( cLoc,
-                    {
-                        ast::deepCopy( clause->stmt )
-                    }
-                )
-            )
+            new ExprStmt( cLoc,
+                genSelectTraitCall( clause, data, "on_selected" )
+            ),
+            ast::deepCopy( clause->stmt )
         }
     );
@@ -644 +641 @@
             case 0:
                 try {
-                    if (on_selected( target1, clause1 ))
-                        dotarget1stmt();
+                    on_selected( target1, clause1 );
+                    dotarget1stmt();
                 }
                 finally { clause_statuses[i] = __SELECT_RUN; unregister_select(target1, clause1); }
@@ -664 +661 @@
         case 0:
             try {
-                if (on_selected( target1, clause1 ))
-                    dotarget1stmt();
+                on_selected( target1, clause1 );
+                dotarget1stmt();
             }
             finally { clause_statuses[i] = __SELECT_RUN; unregister_select(target1, clause1); }
@@ -1020 +1017 @@
                 ifCond,
                 genStmtBlock( stmt->clauses.at(idx), data.at(idx) ),
-                // ast::deepCopy( stmt->clauses.at(idx)->stmt ),
                 recursiveOrIfGen( stmt, data, idx + 1, elseWhenName )
             )