Bug fix (for loops) in parser.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@675 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/parser/PrismParser.java

@@ -2560,15 +2560,15 @@ public class PrismParser implements PrismParserConstants {
 // For loop
   static final public ForLoop ForLoop() throws ParseException {
         String s;
-        Expression to = null, from = null, step = null;
+        Expression from = null, to = null, step = null;
         ForLoop fl = new ForLoop();
         Token begin;
             begin = getToken(1);
     s = Identifier();
     jj_consume_token(EQ);
-    to = Expression();
-    jj_consume_token(COLON);
     from = Expression();
+    jj_consume_token(COLON);
+    to = Expression();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case COLON:
       jj_consume_token(COLON);
@@ -2580,8 +2580,8 @@ public class PrismParser implements PrismParserConstants {
     }
     jj_consume_token(0);
                 fl.setLHS(s);
-                fl.setTo(to);
                 fl.setFrom(from);
+                fl.setTo(to);
                 if (step != null) fl.setStep(step);
                 fl.setPosition(begin, getToken(0));
                 {if (true) return fl;}

prism/src/parser/PrismParser.jj

@@ -1582,16 +1582,16 @@ int LtGt() :
 ForLoop ForLoop() :
 {
 	String s;
-	Expression to = null, from = null, step = null;
+	Expression from = null, to = null, step = null;
 	ForLoop fl = new ForLoop();
 	Token begin;
 }
 {
-	( { begin = getToken(1); } s=Identifier() <EQ> to = Expression() <COLON> from = Expression() ( <COLON> step = Expression() )? <EOF> )
+	( { begin = getToken(1); } s=Identifier() <EQ> from = Expression() <COLON> to = Expression() ( <COLON> step = Expression() )? <EOF> )
 	{
 		fl.setLHS(s);
-		fl.setTo(to);
 		fl.setFrom(from);
+		fl.setTo(to);
 		if (step != null) fl.setStep(step);
 		fl.setPosition(begin, getToken(0));
 		return fl;