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

File:

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

src/Parser/StatementNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 13:03:00 2017
-// Update Count     : 329
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Feb  2 22:16:40 2017
+// Update Count     : 327
 //
 
@@ -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 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 ) {
-        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 );
+        return new ReturnStmt( noLabels, !exps.empty() ? exps.back() : nullptr, true );
 }
 
@@ -181 +166 @@
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );
 }
-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_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_finally( StatementNode *stmt ) {