Changes in src/Parser/parser.yy [67d4e37:1528a2c]

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 : Sat Apr 13 14:00:24 2019
-// Update Count     : 4285
+// Last Modified On : Fri Mar 15 14:25:43 2019
+// Update Count     : 4248
 //
 
@@ -334 +334 @@
 %type<en> subrange
 %type<decl> asm_name_opt
-%type<en> asm_operands_opt                              asm_operands_list                       asm_operand
+%type<en> asm_operands_opt asm_operands_list asm_operand
 %type<label> label_list
 %type<en> asm_clobbers_list_opt
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
-%type<genexpr> generic_association              generic_assoc_list
+%type<genexpr> generic_association generic_assoc_list
 
 // statements
@@ -1164 +1164 @@
         for_control_expression
         | for_control_expression_list ':' for_control_expression
-                // ForCtrl + ForCtrl:
-                //    init + init => multiple declaration statements that are hoisted
-                //    condition + condition => (expression) && (expression)
-                //    change + change => (expression), (expression)
-                {
-                        $1->init->set_last( $3->init );
-                        if ( $1->condition ) {
-                                if ( $3->condition ) {
-                                        $1->condition->expr.reset( new LogicalExpr( $1->condition->expr.release(), $3->condition->expr.release(), true ) );
-                                } // if
-                        } else $1->condition = $3->condition;
-                        if ( $1->change ) {
-                                if ( $3->change ) {
-                                        $1->change->expr.reset( new CommaExpr( $1->change->expr.release(), $3->change->expr.release() ) );
-                                } // if
-                        } else $1->change = $3->change;
-                        $$ = $1;
-                }
+                { $$ = $3; }
         ;
 
@@ -1191 +1174 @@
         | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
                 { $$ = new ForCtrl( $1, $2, $4 ); }
-
         | comma_expression                                                                      // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
@@ -1206 +1188 @@
         | comma_expression ';' comma_expression inclexcl comma_expression '~' comma_expression // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, $7 ); }
-
-                // There is a S/R conflicit if ~ and -~ are factored out.
-        | comma_expression ';' comma_expression '~' '@'         // CFA
-                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | comma_expression ';' comma_expression ErangeDown '@' // CFA
-                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::GThan, nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | comma_expression ';' comma_expression '~' '@' '~' comma_expression // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, $7 ); }