Changes in src/Parser/parser.yy [ca78437:67cf18c]

File:

• src/Parser/parser.yy (modified) (4 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 12 12:59:00 2017
-// Update Count     : 2402
+// Last Modified On : Thu May 25 15:21:59 2017
+// Update Count     : 2398
 //
 
@@ -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
@@ -547 +547 @@
                 { $$ = new ExpressionNode( build_attrtype( build_varref( $1 ), $3 ) ); }
 //      | ANDAND IDENTIFIER                                                                     // GCC, address of label
-//              { $$ = new ExpressionNode( new OperatorNode( OperKinds::LabelAddress ), new ExpressionNode( build_varref( $2 ) ); }
+//              { $$ = new ExpressionNode( new OperatorNode( OperKinds::LabelAddress ), new ExpressionNode( build_varref( $2, true ) ); }
         ;
 
@@ -931 +931 @@
                 { $$ = new StatementNode( build_throw( $2 ) ); }
         | THROWRESUME assignment_expression_opt ';'                     // handles reresume
-                { $$ = new StatementNode( build_resume( $2 ) ); }
+                { $$ = new StatementNode( build_throw( $2 ) ); }
         | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume
-                { $$ = new StatementNode( build_resume_at( $2, $4 ) ); }
+                { $$ = new StatementNode( build_throw( $2 ) ); }
         ;
 
 exception_statement:
-        TRY compound_statement handler_clause
+        TRY compound_statement handler_list
                 { $$ = new StatementNode( build_try( $2, $3, 0 ) ); }
         | TRY compound_statement finally_clause
                 { $$ = new StatementNode( build_try( $2, 0, $3 ) ); }
-        | TRY compound_statement handler_clause finally_clause
+        | TRY compound_statement handler_list 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( CatchStmt::Terminate, $5, nullptr, $8 ) ); }
+                { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, $6, nullptr, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( CatchStmt::Resume, $5, nullptr, $8 ) ); }
+                { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Resume, $6, nullptr, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         ;