Changes in src/Parser/parser.yy [936e9f4:cbce272]

File:

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

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 : Wed Aug 16 18:09:14 2017
-// Update Count     : 2485
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  4 13:33:00 2017
+// Update Count     : 2475
 //
 
@@ -98 +98 @@
         StatementNode * sn;
         ConstantExpr * constant;
-        IfCtl * ifctl;
         ForCtl * fctl;
         LabelNode * label;
@@ -176 +175 @@
 %type<en> comma_expression                              comma_expression_opt
 %type<en> argument_expression_list              argument_expression                     default_initialize_opt
-%type<ifctl> if_control_expression
 %type<fctl> for_control_expression
 %type<en> subrange
@@ -796 +794 @@
 
 selection_statement:
-        IF '(' if_control_expression ')' statement                              %prec THEN
+        IF '(' comma_expression ')' statement                           %prec THEN
                 // explicitly deal with the shift/reduce conflict on if/else
                 { $$ = new StatementNode( build_if( $3, $5, nullptr ) ); }
-        | IF '(' if_control_expression ')' statement ELSE statement
+        | IF '(' comma_expression ')' statement ELSE statement
                 { $$ = new StatementNode( build_if( $3, $5, $7 ) ); }
         | SWITCH '(' comma_expression ')' case_clause           // CFA
@@ -821 +819 @@
                 }
         ;
-
-if_control_expression:
-        comma_expression
-                { $$ = new IfCtl( nullptr, $1 ); }
-        | c_declaration                                                                         // no semi-coln
-                { $$ = new IfCtl( $1, nullptr ); }
-        | cfa_declaration                                                                       // no semi-colon
-                { $$ = new IfCtl( $1, nullptr ); }
-        | declaration comma_expression
-                { $$ = new IfCtl( $1, $2 ); }
-        ;
 
 // CASE and DEFAULT clauses are only allowed in the SWITCH statement, precluding Duff's device. In addition, a case
@@ -1110 +1097 @@
 
 KR_declaration_list:
-        c_declaration ';'
-        | KR_declaration_list push c_declaration ';'
+        c_declaration
+        | KR_declaration_list push c_declaration
                 { $$ = $1->appendList( $3 ); }
         ;
@@ -1130 +1117 @@
         ;
 
-declaration:                                                                                    // old & new style declarations
-        c_declaration ';'
-        | cfa_declaration ';'                                                           // CFA
+declaration:                                                                                    // CFA, new & old style declarations
+        cfa_declaration
+        | c_declaration
         ;
 
@@ -1147 +1134 @@
 
 cfa_declaration:                                                                                // CFA
-        cfa_variable_declaration pop
-        | cfa_typedef_declaration pop
-        | cfa_function_declaration pop
-        | type_declaring_list pop
-        | trait_specifier pop
+        cfa_variable_declaration pop ';'
+        | cfa_typedef_declaration pop ';'
+        | cfa_function_declaration pop ';'
+        | type_declaring_list pop ';'
+        | trait_specifier pop ';'
         ;
 
@@ -1351 +1338 @@
 
 c_declaration:
-        declaration_specifier declaring_list pop
+        declaration_specifier declaring_list pop ';'
                 {
                         $$ = distAttr( $1, $2 );
                 }
-        | typedef_declaration pop
-        | typedef_expression pop                                                        // GCC, naming expression type
-        | sue_declaration_specifier pop
+        | typedef_declaration pop ';'
+        | typedef_expression pop ';'                                            // GCC, naming expression type
+        | sue_declaration_specifier pop ';'
         ;