Changes in src/Parser/StatementNode.cc [4f147cc:ab57786]

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 : Mon Aug 15 20:47:11 2016
-// Update Count     : 322
+// Last Modified On : Sun Aug 21 11:59:37 2016
+// Update Count     : 325
 //
 
@@ -54 +54 @@
         // find end of list and maintain previous pointer
         for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) {
-                StatementNode *node = safe_dynamic_cast< StatementNode * >(curr);
+                StatementNode *node = dynamic_cast< StatementNode * >(curr);
+                assert( node );
                 assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
@@ -137 +138 @@
 }
 
-Statement *build_branch( std::string identifier, BranchStmt::Type kind ) {
-        return new BranchStmt( noLabels, identifier, kind );
+Statement *build_branch( BranchStmt::Type kind ) {
+        Statement * ret = new BranchStmt( noLabels, "", kind );
+        return ret;
+}
+Statement *build_branch( std::string *identifier, BranchStmt::Type kind ) {
+        Statement * ret = new BranchStmt( noLabels, *identifier, kind );
+        delete identifier;                                                                      // allocated by lexer
+        return ret;
 }
 Statement *build_computedgoto( ExpressionNode *ctl ) {
@@ -159 +166 @@
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( catch_stmt, branches );
-        CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        CompoundStmt *tryBlock = dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        assert( tryBlock );
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );