Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision 1528a2cb2c9975b91dbf801e17f460d20448a579)
+++ src/Parser/ParseNode.h	(revision 3c40dc2a8aa14f3cd934daf20c401cf7f2933350)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 13 17:36:49 2019
-// Update Count     : 867
+// Last Modified On : Sat Apr 13 15:44:20 2019
+// Update Count     : 873
 //
 
@@ -132,12 +132,13 @@
 	void printOneLine( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
 
-	Expression *get_expr() const { return expr.get(); }
+	Expression * get_expr() const { return expr.get(); }
 	template<typename T>
 	bool isExpressionType() const {	return nullptr != dynamic_cast<T>(expr.get()); }
 
 	Expression * build() const { return const_cast<ExpressionNode *>(this)->expr.release(); }
+
+	std::unique_ptr<Expression> expr;					// public because of lifetime implications
   private:
 	bool extension = false;
-	std::unique_ptr<Expression> expr;
 }; // ExpressionNode
 
Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 1528a2cb2c9975b91dbf801e17f460d20448a579)
+++ src/Parser/parser.yy	(revision 3c40dc2a8aa14f3cd934daf20c401cf7f2933350)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 15 14:25:43 2019
-// Update Count     : 4248
+// Last Modified On : Sat Apr 13 14:00:24 2019
+// Update Count     : 4285
 //
 
@@ -334,10 +334,10 @@
 %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,5 +1164,22 @@
 	for_control_expression
 	| for_control_expression_list ':' for_control_expression
-		{ $$ = $3; }
+		// 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;
+		}
 	;
 
@@ -1174,4 +1191,5 @@
 	| 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" ) ) ),
@@ -1188,4 +1206,10 @@
 	| 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 ); }