Changes in src/Parser/StatementNode.cc [ab57786:837a17c]

File:

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

src/Parser/StatementNode.cc

@@ -44 +44 @@
                         agg = decl;
                 } // if
-                stmt.reset( new DeclStmt( noLabels, maybeBuild< Declaration >(agg) ) );
+                stmt.reset( new DeclStmt( noLabels, maybeMoveBuild< Declaration >(agg) ) );
         } else {
                 assert( false );
@@ -54 +54 @@
         // find end of list and maintain previous pointer
         for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) {
-                StatementNode *node = dynamic_cast< StatementNode * >(curr);
-                assert( node );
+                StatementNode *node = safe_dynamic_cast< StatementNode * >(curr);
                 assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
@@ -166 +165 @@
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( catch_stmt, branches );
-        CompoundStmt *tryBlock = dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
-        assert( tryBlock );
+        CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );