From c576574ea06cf5a88e40023f3a0955eb569849b0 Mon Sep 17 00:00:00 2001
From: Joachim Klein <klein@tcs.inf.tu-dresden.de>
Date: Fri, 12 Oct 2018 14:25:40 +0200
Subject: [PATCH] imported patch
 rewardcounter-TemporalOperatorBound-use-refresh.patch

---
 prism/src/parser/PrismParser.java | 693 +++++++++++++++---------------
 1 file changed, 348 insertions(+), 345 deletions(-)

diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index e7c031e0..a3a4cf88 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -1788,6 +1788,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
 // (see ExpressionTemporal production for lookahead explanation)
   static final public 
 void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lBound, uBound;
+        TemporalOperatorBound bound = new TemporalOperatorBound();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LE:{
       jj_consume_token(LE);
@@ -1831,7 +1832,7 @@ void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lB
           throw new ParseException();
         }
       }
-exprTemp.setUpperBound(uBound, false);
+bound.setUpperBound(uBound, false);
       break;
       }
     case LT:{
@@ -1876,7 +1877,7 @@ exprTemp.setUpperBound(uBound, false);
           throw new ParseException();
         }
       }
-exprTemp.setUpperBound(uBound, true);
+bound.setUpperBound(uBound, true);
       break;
       }
     case GE:{
@@ -1921,7 +1922,7 @@ exprTemp.setUpperBound(uBound, true);
           throw new ParseException();
         }
       }
-exprTemp.setLowerBound(lBound, false);
+bound.setLowerBound(lBound, false);
       break;
       }
     case GT:{
@@ -1966,7 +1967,7 @@ exprTemp.setLowerBound(lBound, false);
           throw new ParseException();
         }
       }
-exprTemp.setLowerBound(lBound, true);
+bound.setLowerBound(lBound, true);
       break;
       }
     case LBRACKET:{
@@ -1975,13 +1976,13 @@ exprTemp.setLowerBound(lBound, true);
       jj_consume_token(COMMA);
       uBound = Expression(false, false);
       jj_consume_token(RBRACKET);
-exprTemp.setLowerBound(lBound, false); exprTemp.setUpperBound(uBound, false);
+bound.setLowerBound(lBound, false); bound.setUpperBound(uBound, false);
       break;
       }
     case EQ:{
       jj_consume_token(EQ);
       lBound = Expression(false, false);
-exprTemp.setEqualBounds(lBound);
+bound.setEqualBounds(lBound);
       break;
       }
     default:
@@ -1989,6 +1990,7 @@ exprTemp.setEqualBounds(lBound);
       jj_consume_token(-1);
       throw new ParseException();
     }
+exprTemp.setBound(bound);
   }
 
 // Expression: if-then-else, i.e. "cond ? then : else"
@@ -3193,6 +3195,7 @@ Expression ExpressionRewardContents(boolean prop, boolean pathprop) throws Parse
         ExpressionTemporal exprTemp = null;
         Expression ret = null;
         Token begin;
+        TemporalOperatorBound b = new TemporalOperatorBound();
 begin = getToken(1);
     if (jj_2_20(2147483647)) {
       expr = ExpressionSS(prop, true);
@@ -3210,7 +3213,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
           begin = jj_consume_token(C);
           jj_consume_token(LE);
           expr = Expression(false, false);
-exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); exprTemp.setUpperBound(expr); ret = exprTemp;
+exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp;
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case C:{
@@ -3222,7 +3225,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_C, null, null);
             jj_consume_token(I);
             jj_consume_token(EQ);
             expr = Expression(false, false);
-exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); exprTemp.setUpperBound(expr); ret = exprTemp;
+exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp;
             break;
             }
           case A:
@@ -3872,13 +3875,6 @@ fl.setLHS(s);
     finally { jj_save(20, xla); }
   }
 
-  static private boolean jj_3R_96()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_30()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_152()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -3887,6 +3883,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_96()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_30()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_158()
  {
     if (jj_3R_32()) return true;
@@ -3940,23 +3943,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_161()
- {
-    if (jj_scan_token(REG_DOUBLE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_3()
+  static private boolean jj_3R_229()
  {
-    if (jj_scan_token(LABEL)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_228()) return true;
     return false;
   }
 
-  static private boolean jj_3R_229()
+  static private boolean jj_3R_161()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_228()) return true;
+    if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
@@ -3979,6 +3975,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_3()
+ {
+    if (jj_scan_token(LABEL)) return true;
+    if (jj_3R_32()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_216()
  {
     if (jj_scan_token(TIMES)) return true;
@@ -4002,26 +4005,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_85()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_34()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_160()
  {
     if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_84()
- {
-    if (jj_3R_31()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_148()
  {
     Token xsp;
@@ -4039,6 +4028,32 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_85()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_34()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_166()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_84()
+ {
+    if (jj_3R_31()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_184()
+ {
+    if (jj_3R_152()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_76()
  {
     if (jj_scan_token(COMMA)) return true;
@@ -4052,9 +4067,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_166()
+  static private boolean jj_3R_212()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_153()) return true;
     return false;
   }
 
@@ -4072,15 +4087,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_184()
- {
-    if (jj_3R_152()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_212()
+  static private boolean jj_3R_183()
  {
-    if (jj_3R_153()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_212()) {
+    jj_scanpos = xsp;
+    if (jj_3R_213()) return true;
+    }
     return false;
   }
 
@@ -4095,14 +4109,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_183()
+  static private boolean jj_3R_182()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_212()) {
-    jj_scanpos = xsp;
-    if (jj_3R_213()) return true;
-    }
+    if (jj_scan_token(DLBRACKET)) return true;
+    if (jj_3R_211()) return true;
+    if (jj_scan_token(DRBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_181()
+ {
+    if (jj_scan_token(DLT)) return true;
+    if (jj_3R_211()) return true;
+    if (jj_scan_token(DGT)) return true;
     return false;
   }
 
@@ -4115,11 +4134,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_182()
+  static private boolean jj_3R_227()
  {
-    if (jj_scan_token(DLBRACKET)) return true;
-    if (jj_3R_211()) return true;
-    if (jj_scan_token(DRBRACKET)) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
@@ -4131,20 +4148,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_181()
- {
-    if (jj_scan_token(DLT)) return true;
-    if (jj_3R_211()) return true;
-    if (jj_scan_token(DGT)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_227()
- {
-    if (jj_3R_44()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_157()
  {
     Token xsp;
@@ -4161,6 +4164,25 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_151()
+ {
+    if (jj_scan_token(FUNC)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_168()) {
+    jj_scanpos = xsp;
+    if (jj_3R_169()) {
+    jj_scanpos = xsp;
+    if (jj_3R_170()) return true;
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_167()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_56()
  {
     if (jj_scan_token(OR)) return true;
@@ -4185,22 +4207,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_151()
+  static private boolean jj_3R_221()
  {
-    if (jj_scan_token(FUNC)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_168()) {
-    jj_scanpos = xsp;
-    if (jj_3R_169()) {
-    jj_scanpos = xsp;
-    if (jj_3R_170()) return true;
-    }
-    }
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_44()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_165()
+ {
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -4229,33 +4244,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_221()
+  static private boolean jj_3R_156()
  {
+    if (jj_scan_token(A)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_44()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_64()
- {
-    if (jj_3R_74()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_75()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_165()
- {
-    if (jj_scan_token(MIN)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_8()
- {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
@@ -4273,20 +4267,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_156()
+  static private boolean jj_3R_64()
  {
-    if (jj_scan_token(A)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_74()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_75()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_49()
+  static private boolean jj_3_8()
  {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_55()) return true;
     return false;
   }
 
@@ -4298,17 +4293,18 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_10()
+  static private boolean jj_3R_49()
  {
     if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_55()) return true;
     return false;
   }
 
-  static private boolean jj_3_2()
+  static private boolean jj_3_10()
  {
-    if (jj_3R_31()) return true;
-    if (jj_scan_token(COLON)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
@@ -4330,6 +4326,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_2()
+ {
+    if (jj_3R_31()) return true;
+    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_65()
  {
     if (jj_scan_token(OR)) return true;
@@ -4346,6 +4349,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_21()
+ {
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_55()
  {
     if (jj_3R_64()) return true;
@@ -4355,13 +4365,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_21()
- {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_147()
  {
     if (jj_3R_159()) return true;
@@ -4392,12 +4395,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_144()
- {
-    if (jj_3R_156()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_209()
  {
     if (jj_scan_token(I)) return true;
@@ -4406,9 +4403,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_19()
+  static private boolean jj_3R_144()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_156()) return true;
     return false;
   }
 
@@ -4418,9 +4415,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_143()
+  static private boolean jj_3_19()
  {
-    if (jj_3R_155()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -4432,6 +4429,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_143()
+ {
+    if (jj_3R_155()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_133()
  {
     if (jj_scan_token(DIVIDE)) return true;
@@ -4462,27 +4465,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_140()
- {
-    if (jj_3R_153()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_205()
  {
     if (jj_3R_39()) return true;
     return false;
   }
 
-  static private boolean jj_3R_226()
+  static private boolean jj_3R_140()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_153()) return true;
     return false;
   }
 
-  static private boolean jj_3R_139()
+  static private boolean jj_3R_226()
  {
-    if (jj_3R_152()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -4509,20 +4506,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_138()
+  static private boolean jj_3R_139()
  {
-    if (jj_3R_151()) return true;
+    if (jj_3R_152()) return true;
     return false;
   }
 
-  static private boolean jj_3R_48()
+  static private boolean jj_3R_138()
  {
-    if (jj_3R_55()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_56()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_151()) return true;
     return false;
   }
 
@@ -4544,6 +4536,17 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_48()
+ {
+    if (jj_3R_55()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_56()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_135()
  {
     if (jj_3R_148()) return true;
@@ -4676,12 +4679,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_34()
- {
-    if (jj_3R_41()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_127()
  {
     Token xsp;
@@ -4694,6 +4691,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_34()
+ {
+    if (jj_3R_41()) return true;
+    return false;
+  }
+
   static private boolean jj_3_7()
  {
     if (jj_3R_31()) return true;
@@ -4755,14 +4758,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_1()
- {
-    if (jj_scan_token(MODULE)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(EQ)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_123()
  {
     Token xsp;
@@ -4804,6 +4799,14 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_1()
+ {
+    if (jj_scan_token(MODULE)) return true;
+    if (jj_3R_30()) return true;
+    if (jj_scan_token(EQ)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_176()
  {
     if (jj_scan_token(R)) return true;
@@ -4929,22 +4932,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_114()
- {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_112()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_60()
  {
     if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_107()
+  static private boolean jj_3R_114()
  {
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
@@ -4954,21 +4951,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_105()
+  static private boolean jj_3R_58()
  {
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_58()
+  static private boolean jj_3R_57()
  {
-    if (jj_scan_token(LT)) return true;
+    if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_103()
+  static private boolean jj_3R_51()
  {
-    if (jj_3R_44()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_57()) {
+    jj_scanpos = xsp;
+    if (jj_3R_58()) {
+    jj_scanpos = xsp;
+    if (jj_3R_59()) {
+    jj_scanpos = xsp;
+    if (jj_3R_60()) return true;
+    }
+    }
+    }
     return false;
   }
 
@@ -4989,39 +4997,27 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_57()
+  static private boolean jj_3R_107()
  {
-    if (jj_scan_token(GT)) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  static private boolean jj_3R_51()
+  static private boolean jj_3R_105()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_58()) {
-    jj_scanpos = xsp;
-    if (jj_3R_59()) {
-    jj_scanpos = xsp;
-    if (jj_3R_60()) return true;
-    }
-    }
-    }
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  static private boolean jj_3R_101()
+  static private boolean jj_3R_103()
  {
     if (jj_3R_44()) return true;
     return false;
   }
 
-  static private boolean jj_3R_47()
+  static private boolean jj_3R_101()
  {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_46()) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
@@ -5036,6 +5032,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_47()
+ {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_46()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_125()
  {
     if (jj_scan_token(NE)) return true;
@@ -5078,16 +5081,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_46()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_54()) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_110()
  {
     if (jj_3R_112()) return true;
@@ -5112,6 +5105,16 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_46()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_54()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_44()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_53()
  {
     if (jj_scan_token(LBRACE)) return true;
@@ -5138,6 +5141,17 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_108()
+ {
+    if (jj_3R_110()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_111()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_40()
  {
     if (jj_3R_46()) return true;
@@ -5155,17 +5169,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_108()
- {
-    if (jj_3R_110()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_111()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
   static private boolean jj_3R_33()
  {
     Token xsp;
@@ -5304,27 +5307,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_13()
- {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_12()
- {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_11()
- {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
   static private boolean jj_3_16()
  {
     jj_lookingAhead = true;
@@ -5343,24 +5325,39 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_13()
+ {
+    if (jj_3R_35()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_32()
  {
     if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_81()
+  static private boolean jj_3_12()
  {
-    if (jj_3R_88()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_89()) jj_scanpos = xsp;
+    if (jj_3R_35()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_106()
+  static private boolean jj_3_11()
  {
     if (jj_3R_35()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_81()
+ {
+    if (jj_3R_88()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_89()) jj_scanpos = xsp;
     return false;
   }
 
@@ -5380,21 +5377,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_104()
- {
-    if (jj_3R_35()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_102()
+  static private boolean jj_3R_106()
  {
     if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_100()
+  static private boolean jj_3R_189()
  {
-    if (jj_3R_35()) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
@@ -5415,9 +5406,27 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_189()
+  static private boolean jj_3R_104()
  {
-    if (jj_scan_token(OR)) return true;
+    if (jj_3R_35()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_102()
+ {
+    if (jj_3R_35()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_100()
+ {
+    if (jj_3R_35()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_35()
+ {
+    if (jj_3R_30()) return true;
     return false;
   }
 
@@ -5438,12 +5447,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_35()
- {
-    if (jj_3R_30()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_93()
  {
     if (jj_scan_token(GT)) return true;
@@ -5521,12 +5524,30 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_31()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_80()
  {
     if (jj_3R_82()) return true;
     return false;
   }
 
+  static private boolean jj_3R_188()
+ {
+    if (jj_scan_token(AND)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_186()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_79()
  {
     if (jj_scan_token(G)) return true;
@@ -5545,21 +5566,24 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_31()
+  static private boolean jj_3R_194()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_3R_51()) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  static private boolean jj_3R_188()
+  static private boolean jj_3R_193()
  {
-    if (jj_scan_token(AND)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_35()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_186()
+  static private boolean jj_3R_30()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
@@ -5580,27 +5604,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_194()
- {
-    if (jj_3R_51()) return true;
-    if (jj_3R_44()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_193()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_30()
- {
-    if (jj_scan_token(REG_IDENT)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_197()
  {
     if (jj_scan_token(MAX)) return true;
@@ -5638,17 +5641,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_61()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_66()) {
-    jj_scanpos = xsp;
-    if (jj_3R_67()) return true;
-    }
-    return false;
-  }
-
   static private boolean jj_3R_172()
  {
     if (jj_scan_token(PMIN)) return true;
@@ -5657,21 +5649,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_71()
- {
-    if (jj_3R_82()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_70()
- {
-    if (jj_scan_token(R)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_69()
+  static private boolean jj_3R_61()
  {
-    if (jj_scan_token(W)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_66()) {
+    jj_scanpos = xsp;
+    if (jj_3R_67()) return true;
+    }
     return false;
   }
 
@@ -5702,9 +5687,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_68()
+  static private boolean jj_3R_71()
  {
-    if (jj_scan_token(U)) return true;
+    if (jj_3R_82()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_70()
+ {
+    if (jj_scan_token(R)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_190()
+ {
+    if (jj_3R_30()) return true;
     return false;
   }
 
@@ -5727,9 +5724,27 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_190()
+  static private boolean jj_3R_69()
  {
-    if (jj_3R_30()) return true;
+    if (jj_scan_token(W)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_187()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_68()
+ {
+    if (jj_scan_token(U)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_185()
+ {
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -5750,18 +5765,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_187()
- {
-    if (jj_scan_token(PLUS)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_185()
- {
-    if (jj_scan_token(MIN)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_159()
  {
     if (jj_scan_token(FILTER)) return true;