Changeset 2f22cc4 for src/Parser/parser.yy

Timestamp:

Aug 10, 2016, 2:02:10 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:

321f55d, a563f01

Parents:

a6dd5b0

Message:

more refactoring of parser code

File:

• src/Parser/parser.yy (modified) (7 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 : Tue Aug  9 12:59:11 2016
-// Update Count     : 1821
+// Last Modified On : Wed Aug 10 13:09:53 2016
+// Update Count     : 1844
 //
 
@@ -122 +122 @@
         StatementNode *sn;
         ConstantExpr *constant;
+        ForCtl *fctl;
         LabelNode *label;
         InitializerNode *in;
@@ -142 +143 @@
 %type<en> constant_expression                   assignment_expression           assignment_expression_opt
 %type<en> comma_expression                              comma_expression_opt
-%type<en> argument_expression_list              argument_expression                     for_control_expression          assignment_opt
+//%type<en> argument_expression_list            argument_expression                     for_control_expression          assignment_opt
+%type<en> argument_expression_list              argument_expression                     assignment_opt
+%type<fctl> for_control_expression
 %type<en> subrange
 %type<en> asm_operands_opt asm_operands_list asm_operand
@@ -720 +723 @@
         IF '(' comma_expression ')' statement                           %prec THEN
                 // explicitly deal with the shift/reduce conflict on if/else
-                { $$ = new StatementNode( StatementNode::If, $3, $5 ); }
+                //{ $$ = 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 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 StatementNode( StatementNode::Switch, $3, $5 ); }
+                { $$ = new StatementNode2( build_switch( $3, $5 ) ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
                 {
-                        StatementNode *sw = new StatementNode( StatementNode::Switch, $3, $8 );
+                        StatementNode *sw = new StatementNode2( build_switch( $3, $8 ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
@@ -736 +742 @@
                 }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
-                { $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
+                //{ $$ = 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 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;
                 }
@@ -820 +828 @@
 iteration_statement:
         WHILE '(' comma_expression ')' statement
-                { $$ = new StatementNode( StatementNode::While, $3, $5 ); }
+                { $$ = new StatementNode2( build_while( $3, $5 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
-                { $$ = new StatementNode( StatementNode::Do, $5, $2 ); }
+                { $$ = new StatementNode2( build_while( $5, $2 ) ); }
         | FOR '(' push for_control_expression ')' statement
-                { $$ = new StatementNode( StatementNode::For, $4, $6 ); }
+                { $$ = new StatementNode2( build_for( $4, $6 ) ); }
         ;
 
 for_control_expression:
         comma_expression_opt pop ';' comma_expression_opt ';' comma_expression_opt
-                { $$ = new ForCtlExprNode( $1, $4, $6 ); }
+                { $$ = new ForCtl( $1, $4, $6 ); }
         | declaration comma_expression_opt ';' comma_expression_opt // C99
-                { $$ = new ForCtlExprNode( $1, $2, $4 ); }
+                { $$ = new ForCtl( $1, $2, $4 ); }
         ;
 
@@ -946 +954 @@
                 { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6, $8, $10 ); }
         | ASM asm_volatile_opt GOTO '(' string_literal_list ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
-        { $$ = new AsmStmtNode( StatementNode::Asm, $2, $5, 0, $8, $10, $12 ); }
+                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $5, 0, $8, $10, $12 ); }
         ;