Changeset 321f55d for src/Parser/parser.yy

Timestamp:

Aug 10, 2016, 11:31:15 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

27fefeb6

Parents:

2f22cc4

Message:

more refactoring of parser code

File:

• src/Parser/parser.yy (modified) (5 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 : Wed Aug 10 13:09:53 2016
-// Update Count     : 1844
+// Last Modified On : Wed Aug 10 23:03:05 2016
+// Update Count     : 1846
 //
 
@@ -723 +723 @@
         IF '(' comma_expression ')' statement                           %prec THEN
                 // explicitly deal with the shift/reduce conflict on if/else
-                //{ $$ = new StatementNode( StatementNode::If, $3, $5 ); }
                 { $$ = new StatementNode2( build_if( $3, $5, nullptr ) ); }
         | IF '(' comma_expression ')' statement ELSE statement
-                //{ $$ = new StatementNode( StatementNode::If, $3, (StatementNode *)mkList((*$5, *$7 )) ); }
                 { $$ = new StatementNode2( build_if( $3, $5, $7 ) ); }
         | SWITCH '(' comma_expression ')' case_clause           // CFA
-                //{ $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
                 { $$ = new StatementNode2( build_switch( $3, $5 ) ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
@@ -742 +739 @@
                 }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
-                //{ $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
                 { $$ = new StatementNode2( build_switch( $3, $5 ) ); }
         | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt choose_clause_list_opt '}' // CFA
                 {
-                        //StatementNode *sw = new StatementNode( StatementNode::Switch, $3, $8 );
                         StatementNode *sw = new StatementNode2( build_switch( $3, $8 ) );
                         $$ = $7 != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( $7 ))->set_link( sw )) ) : sw;
@@ -844 +839 @@
 jump_statement:
         GOTO IDENTIFIER ';'
-                { $$ = new StatementNode( StatementNode::Goto, $2 ); }
+                //{ $$ = new StatementNode( StatementNode::Goto, $2 ); }
+                { $$ = new StatementNode2( build_branch( *$2, BranchStmt::Goto ) ); }
         | GOTO '*' comma_expression ';'                                         // GCC, computed goto
                 // The syntax for the GCC computed goto violates normal expression precedence, e.g., goto *i+3; => goto *(i+3);
@@ -851 +847 @@
         | CONTINUE ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Continue ); }
+                //{ $$ = new StatementNode( StatementNode::Continue ); }
+                { $$ = new StatementNode2( build_branch( "", BranchStmt::Continue ) ); }
         | CONTINUE IDENTIFIER ';'                                                       // CFA, multi-level continue
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Continue, $2 ); }
+                //{ $$ = new StatementNode( StatementNode::Continue, $2 ); }
+                { $$ = new StatementNode2( build_branch( *$2, BranchStmt::Continue ) ); delete $2; }
         | BREAK ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Break ); }
+                //{ $$ = new StatementNode( StatementNode::Break ); }
+                { $$ = new StatementNode2( build_branch( "", BranchStmt::Break ) ); }
         | BREAK IDENTIFIER ';'                                                          // CFA, multi-level exit
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Break, $2 ); }
+                //{ $$ = new StatementNode( StatementNode::Break, $2 ); }
+                { $$ = new StatementNode2( build_branch( *$2, BranchStmt::Break ) ); delete $2; }
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( StatementNode::Return, $2, 0 ); }