Changes in src/Parser/StatementNode.cc [ba3706f:a378ca7]

File:

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

src/Parser/StatementNode.cc

@@ -37 +37 @@
         DeclarationNode *agg = decl->extractAggregate();
         if ( agg ) {
-                StatementNode *nextStmt = new StatementNode( new DeclStmt( maybeBuild< Declaration >( decl ) ) );
+                StatementNode *nextStmt = new StatementNode( new DeclStmt( noLabels, maybeBuild< Declaration >( decl ) ) );
                 set_next( nextStmt );
                 if ( decl->get_next() ) {
@@ -50 +50 @@
                 agg = decl;
         } // if
-        stmt.reset( new DeclStmt( maybeMoveBuild< Declaration >(agg) ) );
+        stmt.reset( new DeclStmt( noLabels, maybeMoveBuild< Declaration >(agg) ) );
 } // StatementNode::StatementNode
 
@@ -75 +75 @@
 
         if ( e )
-                return new ExprStmt( e );
+                return new ExprStmt( noLabels, e );
         else
-                return new NullStmt();
+                return new NullStmt( noLabels );
 }
 
@@ -113 +113 @@
         }
         delete ctl;
-        return new IfStmt( cond, thenb, elseb, init );
+        return new IfStmt( noLabels, cond, thenb, elseb, init );
 }
 
@@ -120 +120 @@
         buildMoveList< Statement, StatementNode >( stmt, branches );
         // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
-        return new SwitchStmt( maybeMoveBuild< Expression >(ctl), branches );
+        return new SwitchStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
 }
 Statement *build_case( ExpressionNode *ctl ) {
         std::list< Statement * > branches;
-        return new CaseStmt( maybeMoveBuild< Expression >(ctl), branches );
+        return new CaseStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
 }
 Statement *build_default() {
         std::list< Statement * > branches;
-        return new CaseStmt( nullptr, branches, true );
+        return new CaseStmt( noLabels, nullptr, branches, true );
 }
 
@@ -135 +135 @@
         buildMoveList< Statement, StatementNode >( stmt, branches );
         assert( branches.size() == 1 );
-        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), kind );
+        return new WhileStmt( noLabels, notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), kind );
 }
 
@@ -157 +157 @@
 
         delete forctl;
-        return new ForStmt( init, cond, incr, branches.front() );
+        return new ForStmt( noLabels, init, cond, incr, branches.front() );
 }
 
 Statement *build_branch( BranchStmt::Type kind ) {
-        Statement * ret = new BranchStmt( "", kind );
+        Statement * ret = new BranchStmt( noLabels, "", kind );
         return ret;
 }
 Statement *build_branch( std::string *identifier, BranchStmt::Type kind ) {
-        Statement * ret = new BranchStmt( *identifier, kind );
+        Statement * ret = new BranchStmt( noLabels, *identifier, kind );
         delete identifier;                                                                      // allocated by lexer
         return ret;
 }
 Statement *build_computedgoto( ExpressionNode *ctl ) {
-        return new BranchStmt( maybeMoveBuild< Expression >(ctl), BranchStmt::Goto );
+        return new BranchStmt( noLabels, maybeMoveBuild< Expression >(ctl), BranchStmt::Goto );
 }
 
@@ -176 +176 @@
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
-        return new ReturnStmt( exps.size() > 0 ? exps.back() : nullptr );
+        return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr );
 }
 
@@ -183 +183 @@
         buildMoveList( ctl, exps );
         assertf( exps.size() < 2, "This means we are leaking memory");
-        return new ThrowStmt( ThrowStmt::Terminate, !exps.empty() ? exps.back() : nullptr );
+        return new ThrowStmt( noLabels, ThrowStmt::Terminate, !exps.empty() ? exps.back() : nullptr );
 }
 
@@ -190 +190 @@
         buildMoveList( ctl, exps );
         assertf( exps.size() < 2, "This means we are leaking memory");
-        return new ThrowStmt( ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
+        return new ThrowStmt( noLabels, ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
 }
 
@@ -204 +204 @@
         CompoundStmt *tryBlock = strict_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
-        return new TryStmt( tryBlock, branches, finallyBlock );
+        return new TryStmt( noLabels, tryBlock, branches, finallyBlock );
 }
 Statement *build_catch( CatchStmt::Kind kind, DeclarationNode *decl, ExpressionNode *cond, StatementNode *body ) {
@@ -210 +210 @@
         buildMoveList< Statement, StatementNode >( body, branches );
         assert( branches.size() == 1 );
-        return new CatchStmt( kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
+        return new CatchStmt( noLabels, kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
 }
 Statement *build_finally( StatementNode *stmt ) {
@@ -216 +216 @@
         buildMoveList< Statement, StatementNode >( stmt, branches );
         assert( branches.size() == 1 );
-        return new FinallyStmt( dynamic_cast< CompoundStmt * >( branches.front() ) );
+        return new FinallyStmt( noLabels, dynamic_cast< CompoundStmt * >( branches.front() ) );
 }
 
@@ -282 +282 @@
         node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
 
-        node->orelse.statement = maybeMoveBuild<Statement >( else_stmt );
+        node->orelse.statement  = maybeMoveBuild<Statement >( else_stmt );
         node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( else_when ) );
 
@@ -288 +288 @@
 }
 
+WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
+        std::list< Expression * > e;
+        buildMoveList( exprs, e );
+        Statement * s = maybeMoveBuild<Statement>( stmt );
+        return new WithStmt( e, s );
+}
+
 Statement *build_compound( StatementNode *first ) {
-        CompoundStmt *cs = new CompoundStmt();
+        CompoundStmt *cs = new CompoundStmt( noLabels );
         buildMoveList( first, cs->get_kids() );
         return cs;
@@ -301 +308 @@
         buildMoveList( input, in );
         buildMoveList( clobber, clob );
-        return new AsmStmt( voltile, instruction, out, in, clob, gotolabels ? gotolabels->labels : noLabels );
+        return new AsmStmt( noLabels, voltile, instruction, out, in, clob, gotolabels ? gotolabels->labels : noLabels );
 }