Changeset a724ac1 for src/Parser

Timestamp:

Jun 12, 2017, 3:38:07 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1bc9dcb

Parents:

82ff5845 (diff), 465ed18 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• StatementNode.cc (modified) (3 diffs)
• parser.yy (modified) (3 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 : Mon Jun 12 13:00:00 2017
+// Update Count     : 779
 //
 
@@ -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 );
+Statement * build_catch( CatchStmt::Kind kind, DeclarationNode *decl, ExpressionNode *cond, StatementNode *body );
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );

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 : Mon Jun 12 13:03:00 2017
+// Update Count     : 329
 //
 
@@ -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 );
 }
 
@@ -166 +181 @@
         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 ) {

src/Parser/parser.yy

@@ -10 +10 @@
 // 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 On : Mon Jun 12 12:59:00 2017
+// Update Count     : 2402
 //
 
@@ -193 +193 @@
 %type<sn> case_value_list                               case_label                                      case_label_list
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
-%type<sn> handler_list                                  handler_clause                          finally_clause
+%type<sn> /* handler_list */                    handler_clause                          finally_clause
 
 // declarations
@@ -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 ) ); }
         ;
 
 exception_statement:
-        TRY compound_statement handler_list
+        TRY compound_statement handler_clause
                 { $$ = new StatementNode( build_try( $2, $3, 0 ) ); }
         | TRY compound_statement finally_clause
                 { $$ = new StatementNode( build_try( $2, 0, $3 ) ); }
-        | TRY compound_statement handler_list finally_clause
+        | TRY compound_statement handler_clause finally_clause
                 { $$ = new StatementNode( build_try( $2, $3, $4 ) ); }
         ;
 
-handler_list:
-        handler_clause
-                // ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
-        | CATCH '(' ELLIPSIS ')' compound_statement
-                { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
-        | handler_clause CATCH '(' ELLIPSIS ')' compound_statement
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
-        | CATCHRESUME '(' ELLIPSIS ')' compound_statement
-                { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
-        | handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
-        ;
+//handler_list:
+//      handler_clause
+//              // ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
+//      | CATCH '(' ELLIPSIS ')' compound_statement
+//              { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
+//      | handler_clause CATCH '(' ELLIPSIS ')' compound_statement
+//              { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+//      | CATCHRESUME '(' ELLIPSIS ')' compound_statement
+//              { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
+//      | handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
+//              { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+//      ;
 
 handler_clause:
         CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( $5, $8 ) ); }
+                { $$ = new StatementNode( build_catch( CatchStmt::Terminate, $5, nullptr, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, $6, nullptr, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( $5, $8 ) ); }
+                { $$ = new StatementNode( build_catch( CatchStmt::Resume, $5, nullptr, $8 ) ); }
         | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Resume, $6, nullptr, $9 ) ) ); }
         ;