Changeset daf1af8 for src/Parser

Timestamp:

Jun 8, 2017, 5:04:55 PM (8 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

cfaabe2c

Parents:

28762a1

Message:

Added a new ThrowStmt? node to the Syntax Tree.

Location:

src/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• StatementNode.cc (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/ParseNode.h ¶

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 15:42:18 2017
-// Update Count     : 777
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 17 16:23:00 2017
+// Update Count     : 778
 //
 
@@ -393 +393 @@
 Statement * build_return( ExpressionNode * ctl );
 Statement * build_throw( ExpressionNode * ctl );
+Statement * build_resume( ExpressionNode * ctl );
+Statement * build_resume_at( ExpressionNode * ctl , ExpressionNode * target );
 Statement * build_try( StatementNode * try_stmt, StatementNode * catch_stmt, StatementNode * finally_stmt );
 Statement * build_catch( DeclarationNode * decl, StatementNode * stmt, bool catchAny = false );

src/Parser/StatementNode.cc ¶

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // 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 By : Andrew Beach
+// Last Modified On : Thu Jun  8 16:16:00 2017
+// Update Count     : 328
 //
 
@@ -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 ) {
+        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 );
 }
 

src/Parser/parser.yy ¶

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 25 15:21:59 2017
-// Update Count     : 2398
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 25 16:58:00 2017
+// Update Count     : 2399
 //
 
@@ -931 +931 @@
                 { $$ = new StatementNode( build_throw( $2 ) ); }
         | THROWRESUME assignment_expression_opt ';'                     // handles reresume
-                { $$ = new StatementNode( build_throw( $2 ) ); }
+                { $$ = new StatementNode( build_resume( $2 ) ); }
         | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume
-                { $$ = new StatementNode( build_throw( $2 ) ); }
+                { $$ = new StatementNode( build_resume_at( $2, $4 ) ); }
         ;