Changes in src/Parser/StatementNode.cc [9fd9d015:702e826]

File:

• src/Parser/StatementNode.cc (modified) (4 diffs)

src/Parser/StatementNode.cc

@@ -11 +11 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 29 08:51:23 2023
-// Update Count     : 454
+// Last Modified On : Wed Feb  2 20:29:30 2022
+// Update Count     : 425
 //
 
@@ -268 +268 @@
 
         return node;
-} // build_suspend
-
-WaitForStmt * build_waitfor( WaitForStmt * existing, ExpressionNode * when, ExpressionNode * targetExpr, StatementNode * stmt ) {
+}
+
+WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when ) {
+        auto node = new WaitForStmt();
+
         WaitForStmt::Target target;
         target.function = maybeBuild( targetExpr );
@@ -280 +282 @@
         delete targetExpr;
 
-        existing->clauses.insert( existing->clauses.begin(), WaitForStmt::Clause{
+        node->clauses.push_back( WaitForStmt::Clause{
+                target,
+                maybeMoveBuild( stmt ),
+                notZeroExpr( maybeMoveBuild( when ) )
+        });
+
+        return node;
+} // build_waitfor
+
+WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when, WaitForStmt * node ) {
+        WaitForStmt::Target target;
+        target.function = maybeBuild( targetExpr );
+
+        ExpressionNode * next = dynamic_cast<ExpressionNode *>( targetExpr->get_next() );
+        targetExpr->set_next( nullptr );
+        buildMoveList< Expression >( next, target.arguments );
+
+        delete targetExpr;
+
+        node->clauses.insert( node->clauses.begin(), WaitForStmt::Clause{
                 std::move( target ),
                 maybeMoveBuild( stmt ),
@@ -286 +307 @@
         });
 
-        return existing;
+        return node;
 } // build_waitfor
 
-WaitForStmt * build_waitfor_else( WaitForStmt * existing, ExpressionNode * when, StatementNode * stmt ) {
-        existing->orelse.statement  = maybeMoveBuild( stmt );
-        existing->orelse.condition  = notZeroExpr( maybeMoveBuild( when ) );
-
-        return existing;
-} // build_waitfor_else
-
-WaitForStmt * build_waitfor_timeout( WaitForStmt * existing, ExpressionNode * when, ExpressionNode * timeout, StatementNode * stmt ) {
-        existing->timeout.time      = maybeMoveBuild( timeout );
-        existing->timeout.statement = maybeMoveBuild( stmt );
-        existing->timeout.condition = notZeroExpr( maybeMoveBuild( when ) );
-
-        return existing;
+WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when ) {
+        auto node = new WaitForStmt();
+
+        if( timeout ) {
+                node->timeout.time      = maybeMoveBuild( timeout );
+                node->timeout.statement = maybeMoveBuild( stmt    );
+                node->timeout.condition = notZeroExpr( maybeMoveBuild( when ) );
+        } else {
+                node->orelse.statement  = maybeMoveBuild( stmt );
+                node->orelse.condition  = notZeroExpr( maybeMoveBuild( when ) );
+        } // if
+
+        return node;
+} // build_waitfor_timeout
+
+WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when,  StatementNode * else_, ExpressionNode * else_when ) {
+        auto node = new WaitForStmt();
+
+        node->timeout.time      = maybeMoveBuild( timeout );
+        node->timeout.statement = maybeMoveBuild( stmt    );
+        node->timeout.condition = notZeroExpr( maybeMoveBuild( when ) );
+
+        node->orelse.statement  = maybeMoveBuild( else_ );
+        node->orelse.condition  = notZeroExpr( maybeMoveBuild( else_when ) );
+
+        return node;
 } // build_waitfor_timeout