Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 933933c7028ae75d883ec7f91df299e7ee478fc3)
+++ src/Parser/parser.yy	(revision 0982a056951836dd5c60fab580311fce37cc0165)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 29 16:44:17 2018
-// Update Count     : 4006
+// Last Modified On : Thu Aug 30 17:02:25 2018
+// Update Count     : 4029
 //
 
@@ -191,4 +191,8 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+	ConstantExpr *constant = dynamic_cast<ConstantExpr *>(type->get_expr());
+	if ( constant && (constant->get_constant()->get_value() == "0" || constant->get_constant()->get_value() == "1") ) {
+    	type = new ExpressionNode( new CastExpr( maybeMoveBuild< Expression >(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
+	} // if
 	return new ForCtrl(
 		distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
@@ -218,6 +222,5 @@
 
 // Types declaration for productions
-%union
-{
+%union {
 	Token tok;
 	ParseNode * pn;
Index: tests/.expect/forctrl.txt
===================================================================
--- tests/.expect/forctrl.txt	(revision 933933c7028ae75d883ec7f91df299e7ee478fc3)
+++ tests/.expect/forctrl.txt	(revision 0982a056951836dd5c60fab580311fce37cc0165)
@@ -2,4 +2,7 @@
 empty
 empty
+
+A
+A A
 A A A A A A A A A A
 B B B B B
@@ -9,5 +12,5 @@
 0 1 2 3 4 5 6 7 8 9
 0 1 2 3 4 5 6 7 8 9
-2 4 6 8 10
+1 3 5 7 9
 10 8 6 4 2
 0.5 1.5 2.5 3.5 4.5
Index: tests/forctrl.c
===================================================================
--- tests/forctrl.c	(revision 933933c7028ae75d883ec7f91df299e7ee478fc3)
+++ tests/forctrl.c	(revision 0982a056951836dd5c60fab580311fce37cc0165)
@@ -10,6 +10,6 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 29 18:04:15 2018
-// Update Count     : 26
+// Last Modified On : Thu Aug 30 17:12:12 2018
+// Update Count     : 43
 // 
 
@@ -34,8 +34,11 @@
 	for () { sout | "empty"; break; }		sout | endl;
 
+	for ( 0 ) { sout | "A"; }				sout | endl;
+	for ( 1 ) { sout | "A"; }				sout | endl;
+	for ( 2 ) { sout | "A"; }				sout | endl;
 	for ( 10 ) { sout | "A"; }				sout | endl;
 
-	for ( 2 ~= 10 ~ 2 ) { sout | "B"; }		sout | endl;
-	for ( 10 -~= 2 ~ -2 ) { sout | "C"; }	sout | endl;
+	for ( 1 ~= 10 ~ 2 ) { sout | "B"; }		sout | endl;
+	for ( 10 -~= 1 ~ -2 ) { sout | "C"; }	sout | endl;
 	for ( 0.5 ~ 5.5 ) { sout | "D"; }		sout | endl;
 	for ( 5.5 -~ 0.5 ) { sout | "E"; }		sout | endl;
@@ -44,7 +47,6 @@
 	for ( j; 10 ) { sout | j; }				sout | endl;
 
-	//for ( i; 1 ~= 10 ~ 2 ) { sout | i; }	sout | endl;
-	for ( i; 2 ~= 10 ~ 2 ) { sout | i; }	sout | endl;
-	for ( i; 10 -~= 2 ~ -2 ) { sout | i; }	sout | endl;
+	for ( i; 1 ~= 10 ~ 2 ) { sout | i; }	sout | endl;
+	for ( i; 10 -~= 1 ~ -2 ) { sout | i; }	sout | endl;
 	for ( i; 0.5 ~ 5.5 ) { sout | i; }		sout | endl;
 	for ( i; 5.5 -~ 0.5 ) { sout | i; }		sout | endl;