Changeset 8e87f37 for src/Parser

Timestamp:

Jul 16, 2019, 5:33:24 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3f654ec, 8ac3b0e

Parents:

8d75345a (diff), 6f15121 (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

Location:

src/Parser

Files:

• ParseNode.h (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)

src/Parser/ParseNode.h

@@ -437 +437 @@
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when, StatementNode * else_stmt, ExpressionNode * else_when );
-WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt );
+Statement * build_with( ExpressionNode * exprs, StatementNode * stmt );
 
 //##############################################################################

src/Parser/StatementNode.cc

@@ -317 +317 @@
 } // build_waitfor_timeout
 
-WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
+Statement * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
         std::list< Expression * > e;
         buildMoveList( exprs, e );
         Statement * s = maybeMoveBuild<Statement>( stmt );
-        return new WithStmt( e, s );
+        return new DeclStmt( new WithStmt( e, s ) );
 } // build_with