Changes in src/Parser/StatementNode.cc [c0aa336:a67b60e]

File:

• src/Parser/StatementNode.cc (modified) (3 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 : Thu Feb  2 22:16:40 2017
-// Update Count     : 327
+// Last Modified On : Wed Jun 28 21:08:37 2017
+// Update Count     : 330
 //
 
@@ -21 +21 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Expression.h"
-#include "parseutility.h"
+#include "parserutility.h"
 #include "Common/utility.h"
 
@@ -152 +152 @@
         return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr );
 }
+
 Statement *build_throw( ExpressionNode *ctl ) {
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
         assertf( exps.size() < 2, "This means we are leaking memory");
-        return new ReturnStmt( noLabels, !exps.empty() ? exps.back() : nullptr, true );
+        return new ThrowStmt( noLabels, ThrowStmt::Terminate, !exps.empty() ? exps.back() : nullptr );
+}
+
+Statement *build_resume( ExpressionNode *ctl ) {
+        std::list< Expression * > exps;
+        buildMoveList( ctl, exps );
+        assertf( exps.size() < 2, "This means we are leaking memory");
+        return new ThrowStmt( noLabels, ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
+}
+
+Statement *build_resume_at( ExpressionNode *ctl, ExpressionNode *target ) {
+        (void)ctl;
+        (void)target;
+        assertf( false, "resume at (non-local throw) is not yet supported," );
 }
 
 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) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );
 }
-Statement *build_catch( DeclarationNode *decl, StatementNode *stmt, bool catchAny ) {
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( stmt, branches );
-        assert( branches.size() == 1 );
-        return new CatchStmt( noLabels, maybeMoveBuild< Declaration >(decl), branches.front(), catchAny );
+Statement *build_catch( CatchStmt::Kind kind, DeclarationNode *decl, ExpressionNode *cond, StatementNode *body ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( body, branches );
+        assert( branches.size() == 1 );
+        return new CatchStmt( noLabels, kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
 }
 Statement *build_finally( StatementNode *stmt ) {