Changeset e9a3b20b for src/Parser

Timestamp:

Jun 21, 2017, 5:47:52 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:

1a18423, 2c37f34, 925b7f4, 969ee0df, fda8168

Parents:

d56e5bc (diff), 06edda0 (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

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (1 diff)
• ParseNode.h (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -348 +348 @@
 
 Expression *build_valexpr( StatementNode *s ) {
-        return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr );
+        return new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(s) ) );
 }
 Expression *build_typevalue( DeclarationNode *decl ) {

src/Parser/ParseNode.h

@@ -415 +415 @@
                                 result->location = cur->location;
                                 * out++ = result;
+                        } else {
+                                assertf(false, "buildList unknown type");
                         } // if
                 } catch( SemanticError &e ) {

src/Parser/StatementNode.cc

@@ -175 +175 @@
 
 Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ) {
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( catch_stmt, branches );
+        std::list< CatchStmt * > branches;
+        buildMoveList< CatchStmt, StatementNode >( catch_stmt, branches );
         CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );