Changeset 9082d7e8 for src/Parser/StatementNode.cc

Timestamp:

Mar 30, 2023, 4:05:59 PM (2 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

bd72c284

Parents:

d24b1985 (diff), ff443e5 (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/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 Feb  2 20:29:30 2022
-// Update Count     : 425
+// Last Modified On : Wed Mar 29 08:51:23 2023
+// Update Count     : 454
 //
 
@@ -268 +268 @@
 
         return node;
-}
-
-WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when ) {
-        auto node = new WaitForStmt();
-
+} // build_suspend
+
+WaitForStmt * build_waitfor( WaitForStmt * existing, ExpressionNode * when, ExpressionNode * targetExpr, StatementNode * stmt ) {
         WaitForStmt::Target target;
         target.function = maybeBuild( targetExpr );
@@ -282 +280 @@
         delete targetExpr;
 
-        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{
+        existing->clauses.insert( existing->clauses.begin(), WaitForStmt::Clause{
                 std::move( target ),
                 maybeMoveBuild( stmt ),
@@ -307 +286 @@
         });
 
-        return node;
+        return existing;
 } // build_waitfor
 
-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;
+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;
 } // build_waitfor_timeout