Changeset fbcb354 for src/Parser/StatementNode.cc

Timestamp:

Aug 31, 2017, 3:33:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

058f549

Parents:

326338ae (diff), 2ad507b8 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/Parser/StatementNode.cc

@@ -212 +212 @@
         WaitForStmt::Target target;
         target.function = maybeBuild<Expression>( targetExpr );
-        buildMoveList< Expression >( targetExpr, target.arguments );
+
+        ExpressionNode * next = dynamic_cast<ExpressionNode *>( targetExpr->get_next() );
+        targetExpr->set_next( nullptr );
+        buildMoveList< Expression >( next, target.arguments );
+
         delete targetExpr;
 
@@ -226 +230 @@
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when, WaitForStmt * node ) {
         WaitForStmt::Target target;
-
         target.function = maybeBuild<Expression>( targetExpr );
-        buildMoveList< Expression >( targetExpr, target.arguments );
+
+        ExpressionNode * next = dynamic_cast<ExpressionNode *>( targetExpr->get_next() );
+        targetExpr->set_next( nullptr );
+        buildMoveList< Expression >( next, target.arguments );
+
         delete targetExpr;