Changes in src/Parser/StatementNode.cc [d3b7937:e04ef3a]

File:

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

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 14:39:39 2015
-// Update Count     : 130
+// Last Modified On : Thu Jun  9 14:18:46 2016
+// Update Count     : 132
 //
 
@@ -222 +222 @@
                                 branches.pop_front();
                         } // if
-                        return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
+                        return new IfStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), thenb, elseb );
                 }
           case While:
                 assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( get_control()->build() ), branches.front() );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front() );
           case Do:
                 assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( get_control()->build() ), branches.front(), true );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front(), true );
           case For:
                 {
@@ -244 +244 @@
                         Expression *cond = 0;
                         if ( ctl->get_condition() != 0 )
-                                cond = notZeroExpr( ctl->get_condition()->build() );
+                                cond = notZeroExpr( maybeBuild<Expression>(ctl->get_condition()) );
 
                         Expression *incr = 0;
                         if ( ctl->get_change() != 0 )
-                                incr = ctl->get_change()->build();
+                                incr = maybeBuild<Expression>(ctl->get_change());
 
                         return new ForStmt( labs, init, cond, incr, branches.front() );
                 }
           case Switch:
-                return new SwitchStmt( labs, get_control()->build(), branches );
+                return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Choose:
-                return new ChooseStmt( labs, get_control()->build(), branches );
+                return new ChooseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Fallthru:
                 return new FallthruStmt( labs );
           case Case: 
-                return new CaseStmt( labs, get_control()->build(), branches );
+                return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Default:
                 return new CaseStmt( labs, 0, branches, true );
@@ -266 +266 @@
                         if ( get_target() == "" ) {                                     // computed goto
                                 assert( get_control() != 0 );
-                                return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
+                                return new BranchStmt( labs, maybeBuild<Expression>(get_control()), BranchStmt::Goto );
                         } // if