Changeset 2acf5fc for src/Parser/StatementNode.cc

Timestamp:

Aug 22, 2016, 3:11:00 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

837a17c, bd9f8be, c1c1112

Parents:

ab57786 (diff), 8d2844a (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

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

src/Parser/StatementNode.cc

@@ -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 );