Changeset ba54f7d for src/Parser/StatementNode.cc

Timestamp:

Sep 13, 2017, 3:11:24 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

c57ded70, db70fe4

Parents:

d130fe8 (diff), 982832e (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

File:

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

src/Parser/StatementNode.cc

@@ -14 +14 @@
 //
 
-#include <cassert>                 // for assert, safe_dynamic_cast, assertf
+#include <cassert>                 // for assert, strict_dynamic_cast, assertf
 #include <list>                    // for list
 #include <memory>                  // for unique_ptr
@@ -57 +57 @@
         // 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 = strict_dynamic_cast< StatementNode * >(curr);
                 assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
@@ -106 +106 @@
                 for ( Statement * stmt : init ) {
                         // build the && of all of the declared variables compared against 0
-                        DeclStmt * declStmt = safe_dynamic_cast< DeclStmt * >( stmt );
-                        DeclarationWithType * dwt = safe_dynamic_cast< DeclarationWithType * >( declStmt->decl );
+                        DeclStmt * declStmt = strict_dynamic_cast< DeclStmt * >( stmt );
+                        DeclarationWithType * dwt = strict_dynamic_cast< DeclarationWithType * >( declStmt->decl );
                         Expression * nze = notZeroExpr( new VariableExpr( dwt ) );
                         cond = cond ? new LogicalExpr( cond, nze, true ) : nze;
@@ -202 +202 @@
         std::list< CatchStmt * > branches;
         buildMoveList< CatchStmt, StatementNode >( catch_stmt, branches );
-        CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        CompoundStmt *tryBlock = strict_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );