diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index 1d94fe0f..54b33052 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -1837,7 +1837,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
     case ACCDIAMINUS:
     case ACCBOXPLUS:
     case ACCBOXMINUS:{
-      ret = ExpressionAccumulation(prop, pathprop);
+      ret = ExpressionAccumulationNullary(prop, pathprop);
       break;
       }
     default:
@@ -1851,10 +1851,11 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
 
 /* START
    Accumulation Specification */
-  static final public ExpressionAccumulation ExpressionAccumulation(boolean prop, boolean pathprop) throws ParseException {ExpressionAccumulation ret;
+  static final public ExpressionAccumulation ExpressionAccumulationNullary(boolean prop, boolean pathprop) throws ParseException {ExpressionAccumulation ret;
         AccumulationConstraint constr;
         TemporalOperatorBound bound;
         Expression reg;
+        ArrayList<Expression> fireOn;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ACCDIAPLUS:{
       jj_consume_token(ACCDIAPLUS);
@@ -1909,7 +1910,148 @@ ret.setBoundExpression(bound);
     constr = ExpressionAccumulationConstraint();
 ret.setConstraint(constr);
     jj_consume_token(RPARENTH);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPARENTH:{
+      jj_consume_token(LPARENTH);
+      fireOn = ExpressionAccumulationFire();
+ret.setFireOn(fireOn);
+      jj_consume_token(RPARENTH);
+      break;
+      }
+    default:
+      jj_la1[48] = jj_gen;
+      ;
+    }
+{if ("" != null) return ret;}
+    throw new Error("Missing return statement in function");
+}
+
+  static final public ExpressionAccumulation ExpressionAccumulationBinary(boolean prop, boolean pathprop) throws ParseException {ExpressionAccumulation ret = new ExpressionAccumulation(AccumulationSymbol.ACCUNTIL);
+
+        AccumulationConstraint constr;
+        TemporalOperatorBound bound;
+        Expression reg;
+        ArrayList<Expression> fireOn;
+
+        Expression op1;
+        Expression op2;
+    jj_consume_token(LPARENTH);
+    op1 = Expression(prop, pathprop);
+ret.setOperand1(op1);
+    jj_consume_token(RPARENTH);
+    jj_consume_token(ACCUNTIL);
+    jj_consume_token(LPARENTH);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REGEXP_MARKER:{
+      jj_consume_token(REGEXP_MARKER);
+      reg = ExpressionRegularUnary(prop, false);
+ret.setRegularExpression((ExpressionRegular)reg);
+      break;
+      }
+    case LBRACKET:
+    case EQ:
+    case LT:
+    case GT:
+    case LE:
+    case GE:{
+      bound = BoundExpression();
+ret.setBoundExpression(bound);
+      break;
+      }
+    default:
+      jj_la1[49] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    jj_consume_token(RPARENTH);
+    jj_consume_token(LPARENTH);
+    constr = ExpressionAccumulationConstraint();
+ret.setConstraint(constr);
+    jj_consume_token(RPARENTH);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPARENTH:{
+      jj_consume_token(LPARENTH);
+      fireOn = ExpressionAccumulationFire();
+ret.setFireOn(fireOn);
+      jj_consume_token(RPARENTH);
+      break;
+      }
+    default:
+      jj_la1[50] = jj_gen;
+      ;
+    }
+    jj_consume_token(LPARENTH);
+    op2 = Expression(prop, pathprop);
+ret.setOperand2(op2);
+    jj_consume_token(RPARENTH);
+{if ("" != null) return ret;}
+    throw new Error("Missing return statement in function");
+}
+
+  static final public ArrayList<Expression> ExpressionAccumulationFire() throws ParseException {ArrayList<Expression> ret = new ArrayList<Expression>();
+        Expression s;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TIMES:{
+      jj_consume_token(TIMES);
+{if ("" != null) return ret ;}
+      break;
+      }
+    case A:
+    case E:
+    case FALSE:
+    case FILTER:
+    case FUNC:
+    case F:
+    case G:
+    case MAX:
+    case MIN:
+    case X:
+    case PMAX:
+    case PMIN:
+    case P:
+    case RMAX:
+    case RMIN:
+    case R:
+    case S:
+    case TRUE:
+    case NOT:
+    case LPARENTH:
+    case LBRACKET:
+    case LT:
+    case MINUS:
+    case ACCDIAPLUS:
+    case ACCDIAMINUS:
+    case ACCBOXPLUS:
+    case ACCBOXMINUS:
+    case REG_INT:
+    case REG_DOUBLE:
+    case REG_IDENT:
+    case REG_QUOTED_IDENT:{
+      s = Expression(true,false);
+ret.add(s);
+      label_18:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[51] = jj_gen;
+          break label_18;
+        }
+        jj_consume_token(COMMA);
+        s = Expression(true,false);
+ret.add(s);
+      }
 {if ("" != null) return ret;}
+      break;
+      }
+    default:
+      jj_la1[52] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
     throw new Error("Missing return statement in function");
 }
 
@@ -1927,7 +2069,7 @@ ret.setConstraint(constr);
         ArrayList<AccumulationFactor> factors = new ArrayList<AccumulationFactor>();
     factor = ExpressionAccumulationLinearFactor();
 factors.add(factor);
-    label_18:
+    label_19:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -1935,8 +2077,8 @@ factors.add(factor);
         break;
         }
       default:
-        jj_la1[48] = jj_gen;
-        break label_18;
+        jj_la1[53] = jj_gen;
+        break label_19;
       }
       jj_consume_token(PLUS);
       factor = ExpressionAccumulationLinearFactor();
@@ -1987,7 +2129,7 @@ factors.add(factor);
         break;
         }
       default:
-        jj_la1[49] = jj_gen;
+        jj_la1[54] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2031,7 +2173,7 @@ func = AccumulationFunction.ACC_STEPS;
         break;
         }
       default:
-        jj_la1[50] = jj_gen;
+        jj_la1[55] = jj_gen;
         ;
       }
 func = AccumulationFunction.ACC_REWARD;
@@ -2067,7 +2209,7 @@ expr = new ExpressionRegular(ExpressionRegular.P_O, expr, null);
       break;
       }
     default:
-      jj_la1[51] = jj_gen;
+      jj_la1[56] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2078,7 +2220,7 @@ expr = new ExpressionRegular(ExpressionRegular.P_K, expr, null);
       break;
       }
     default:
-      jj_la1[52] = jj_gen;
+      jj_la1[57] = jj_gen;
       ;
     }
 {if ("" != null) return expr;}
@@ -2096,7 +2238,7 @@ ret = new ExpressionRegular(ExpressionRegular.P_C, left,right);
       break;
       }
     default:
-      jj_la1[53] = jj_gen;
+      jj_la1[58] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2114,7 +2256,7 @@ ret = new ExpressionRegular(ExpressionRegular.P_O, left,right);
       break;
       }
     default:
-      jj_la1[54] = jj_gen;
+      jj_la1[59] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2168,7 +2310,7 @@ TemporalOperatorBound BoundExpression() throws ParseException {Expression lBound
           break;
           }
         default:
-          jj_la1[55] = jj_gen;
+          jj_la1[60] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2217,7 +2359,7 @@ bound.setUpperBound(uBound, false);
           break;
           }
         default:
-          jj_la1[56] = jj_gen;
+          jj_la1[61] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2266,7 +2408,7 @@ bound.setUpperBound(uBound, true);
           break;
           }
         default:
-          jj_la1[57] = jj_gen;
+          jj_la1[62] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2315,7 +2457,7 @@ bound.setLowerBound(lBound, false);
           break;
           }
         default:
-          jj_la1[58] = jj_gen;
+          jj_la1[63] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2339,7 +2481,7 @@ bound.setEqualBounds(lBound);
       break;
       }
     default:
-      jj_la1[59] = jj_gen;
+      jj_la1[64] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2355,13 +2497,13 @@ bound.setEqualBounds(lBound);
       break;
       }
     default:
-      jj_la1[60] = jj_gen;
+      jj_la1[65] = jj_gen;
       ;
     }
     jj_consume_token(LBRACE);
     bound = TemporalOpBound();
 bounds.addBound(bound);
-    label_19:
+    label_20:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2369,8 +2511,8 @@ bounds.addBound(bound);
         break;
         }
       default:
-        jj_la1[61] = jj_gen;
-        break label_19;
+        jj_la1[66] = jj_gen;
+        break label_20;
       }
       jj_consume_token(COMMA);
       bound = TemporalOpBound();
@@ -2417,7 +2559,7 @@ bound.setBoundType(TemporalOperatorBound.BoundType.STEP_BOUND);
         break;
         }
       default:
-        jj_la1[62] = jj_gen;
+        jj_la1[67] = jj_gen;
         ;
       }
       bound = BoundExpression();
@@ -2447,7 +2589,7 @@ ret = new ExpressionITE(ret, left, right); ret.setPosition(begin, getToken(0));
       break;
       }
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[68] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2460,7 +2602,7 @@ Expression ExpressionImplies(boolean prop, boolean pathprop) throws ParseExcepti
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionIff(prop, pathprop);
-    label_20:
+    label_21:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IMPLIES:{
@@ -2468,8 +2610,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[64] = jj_gen;
-        break label_20;
+        jj_la1[69] = jj_gen;
+        break label_21;
       }
       jj_consume_token(IMPLIES);
       expr = ExpressionIff(prop, pathprop);
@@ -2485,7 +2627,7 @@ Expression ExpressionIff(boolean prop, boolean pathprop) throws ParseException {
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionOr(prop, pathprop);
-    label_21:
+    label_22:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IFF:{
@@ -2493,8 +2635,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[65] = jj_gen;
-        break label_21;
+        jj_la1[70] = jj_gen;
+        break label_22;
       }
       jj_consume_token(IFF);
       expr = ExpressionOr(prop, pathprop);
@@ -2510,7 +2652,7 @@ Expression ExpressionOr(boolean prop, boolean pathprop) throws ParseException {E
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionAnd(prop, pathprop);
-    label_22:
+    label_23:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case OR:{
@@ -2518,8 +2660,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[66] = jj_gen;
-        break label_22;
+        jj_la1[71] = jj_gen;
+        break label_23;
       }
       jj_consume_token(OR);
       expr = ExpressionAnd(prop, pathprop);
@@ -2535,7 +2677,7 @@ Expression ExpressionAnd(boolean prop, boolean pathprop) throws ParseException {
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionNot(prop, pathprop);
-    label_23:
+    label_24:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND:{
@@ -2543,8 +2685,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[67] = jj_gen;
-        break label_23;
+        jj_la1[72] = jj_gen;
+        break label_24;
       }
       jj_consume_token(AND);
       expr = ExpressionNot(prop, pathprop);
@@ -2592,7 +2734,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin,
       break;
       }
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[73] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2607,7 +2749,7 @@ Expression ExpressionEquality(boolean prop, boolean pathprop) throws ParseExcept
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionRelop(prop, pathprop);
-    label_24:
+    label_25:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case EQ:
@@ -2616,8 +2758,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[69] = jj_gen;
-        break label_24;
+        jj_la1[74] = jj_gen;
+        break label_25;
       }
       op = EqNeq();
       expr = ExpressionRelop(prop, pathprop);
@@ -2634,7 +2776,7 @@ Expression ExpressionRelop(boolean prop, boolean pathprop) throws ParseException
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionPlusMinus(prop, pathprop);
-    label_25:
+    label_26:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LT:
@@ -2645,8 +2787,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[70] = jj_gen;
-        break label_25;
+        jj_la1[75] = jj_gen;
+        break label_26;
       }
       op = LtGt();
       expr = ExpressionPlusMinus(prop, pathprop);
@@ -2670,7 +2812,7 @@ Expression ExpressionPlusMinus(boolean prop, boolean pathprop) throws ParseExcep
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionTimesDivide(prop, pathprop);
-    label_26:
+    label_27:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:
@@ -2679,8 +2821,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[71] = jj_gen;
-        break label_26;
+        jj_la1[76] = jj_gen;
+        break label_27;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -2694,7 +2836,7 @@ op = ExpressionBinaryOp.MINUS;
         break;
         }
       default:
-        jj_la1[72] = jj_gen;
+        jj_la1[77] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2712,7 +2854,7 @@ Expression ExpressionTimesDivide(boolean prop, boolean pathprop) throws ParseExc
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionUnaryMinus(prop, pathprop);
-    label_27:
+    label_28:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TIMES:
@@ -2721,8 +2863,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[73] = jj_gen;
-        break label_27;
+        jj_la1[78] = jj_gen;
+        break label_28;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TIMES:{
@@ -2736,7 +2878,7 @@ op = ExpressionBinaryOp.DIVIDE;
         break;
         }
       default:
-        jj_la1[74] = jj_gen;
+        jj_la1[79] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2784,7 +2926,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begi
       break;
       }
     default:
-      jj_la1[75] = jj_gen;
+      jj_la1[80] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2859,7 +3001,7 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException
       break;
       }
     default:
-      jj_la1[76] = jj_gen;
+      jj_la1[81] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2891,7 +3033,7 @@ ret = new ExpressionFunc(s);
       break;
       }
     default:
-      jj_la1[77] = jj_gen;
+      jj_la1[82] = jj_gen;
       ;
     }
 ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
@@ -2915,7 +3057,7 @@ s = "max";
       break;
       }
     default:
-      jj_la1[78] = jj_gen;
+      jj_la1[83] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2950,7 +3092,7 @@ s = "max";
       break;
       }
     default:
-      jj_la1[79] = jj_gen;
+      jj_la1[84] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2967,7 +3109,7 @@ func.setPosition(begin, getToken(0)); {if ("" != null) return func;}
 void ExpressionFuncArgs(boolean prop, boolean pathprop, ExpressionFunc func) throws ParseException {Expression expr;
     expr = Expression(prop, pathprop);
 func.addOperand(expr);
-    label_28:
+    label_29:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2975,8 +3117,8 @@ func.addOperand(expr);
         break;
         }
       default:
-        jj_la1[80] = jj_gen;
-        break label_28;
+        jj_la1[85] = jj_gen;
+        break label_29;
       }
       jj_consume_token(COMMA);
       expr = Expression(prop, pathprop);
@@ -3027,7 +3169,7 @@ ret = new ExpressionLiteral(TypeBool.getInstance(), false);
       break;
       }
     default:
-      jj_la1[81] = jj_gen;
+      jj_la1[86] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3074,7 +3216,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[87] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3092,14 +3234,14 @@ minMax = MinMax.max();
           break;
           }
         default:
-          jj_la1[83] = jj_gen;
+          jj_la1[88] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[84] = jj_gen;
+        jj_la1[89] = jj_gen;
         ;
       }
       break;
@@ -3115,7 +3257,7 @@ minMax = MinMax.max();
       break;
       }
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[90] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3136,7 +3278,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[86] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3149,7 +3291,7 @@ relOp = "="; isBool = false;
         break;
         }
       default:
-        jj_la1[87] = jj_gen;
+        jj_la1[92] = jj_gen;
         ;
       }
     } else {
@@ -3160,7 +3302,7 @@ relOp = "="; isBool = false;
         break;
         }
       default:
-        jj_la1[88] = jj_gen;
+        jj_la1[93] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3269,7 +3411,7 @@ result = Expression.Not(result);
         break;
         }
       default:
-        jj_la1[89] = jj_gen;
+        jj_la1[94] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3285,7 +3427,7 @@ result = Expression.Not(result);
         String ap, label;
     hoaAutomatonFile = QuotedString();
 result = new ExpressionHOA(hoaAutomatonFile);
-    label_29:
+    label_30:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -3293,8 +3435,8 @@ result = new ExpressionHOA(hoaAutomatonFile);
         break;
         }
       default:
-        jj_la1[90] = jj_gen;
-        break label_29;
+        jj_la1[95] = jj_gen;
+        break label_30;
       }
       jj_consume_token(COMMA);
       ap = QuotedIdentifier();
@@ -3315,7 +3457,7 @@ Filter Filter() throws ParseException {Filter filter;
     expr = Expression(true, false);
 filter = new Filter(expr);
     jj_consume_token(RBRACE);
-    label_30:
+    label_31:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACE:{
@@ -3323,8 +3465,8 @@ filter = new Filter(expr);
         break;
         }
       default:
-        jj_la1[91] = jj_gen;
-        break label_30;
+        jj_la1[96] = jj_gen;
+        break label_31;
       }
       jj_consume_token(LBRACE);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3339,7 +3481,7 @@ filter.setMaxRequested(true);
         break;
         }
       default:
-        jj_la1[92] = jj_gen;
+        jj_la1[97] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3377,7 +3519,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[93] = jj_gen;
+        jj_la1[98] = jj_gen;
         ;
       }
       r = LtGt();
@@ -3392,7 +3534,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[99] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3404,7 +3546,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[100] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3450,7 +3592,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[101] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3459,7 +3601,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[97] = jj_gen;
+        jj_la1[102] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3477,14 +3619,14 @@ minMax = MinMax.max();
           break;
           }
         default:
-          jj_la1[98] = jj_gen;
+          jj_la1[103] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[99] = jj_gen;
+        jj_la1[104] = jj_gen;
         ;
       }
       break;
@@ -3500,7 +3642,7 @@ minMax = MinMax.max();
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[105] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3521,7 +3663,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[106] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3533,7 +3675,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[107] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3568,7 +3710,7 @@ void RewardSpecification(ExpressionReward exprRew) throws ParseException {Object
       break;
       }
     default:
-      jj_la1[103] = jj_gen;
+      jj_la1[108] = jj_gen;
       ;
     }
 exprRew.setRewardStructIndex(index);
@@ -3618,7 +3760,7 @@ exprRew.setRewardStructIndex(index);
         break;
         }
       default:
-        jj_la1[104] = jj_gen;
+        jj_la1[109] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3651,7 +3793,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
         break;
         }
       default:
-        jj_la1[105] = jj_gen;
+        jj_la1[110] = jj_gen;
         if (jj_2_28(2147483647)) {
           begin = jj_consume_token(C);
           jj_consume_token(LE);
@@ -3707,7 +3849,7 @@ ret = expr;
             break;
             }
           default:
-            jj_la1[106] = jj_gen;
+            jj_la1[111] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3776,7 +3918,7 @@ ret = new ExpressionStrategy(false);
       break;
       }
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[112] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3801,7 +3943,7 @@ ret = new ExpressionStrategy(false);
         break;
         }
       default:
-        jj_la1[108] = jj_gen;
+        jj_la1[113] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3814,7 +3956,7 @@ ret.addOperand(expr);
       break;
       }
     default:
-      jj_la1[109] = jj_gen;
+      jj_la1[114] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3834,13 +3976,13 @@ exprStrat.setCoalitionAllPlayers();
       break;
       }
     default:
-      jj_la1[112] = jj_gen;
+      jj_la1[117] = jj_gen;
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case REG_INT:
       case REG_IDENT:{
         s = ExpressionStrategyCoalitionPlayer();
 coalition.add(s);
-        label_31:
+        label_32:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case COMMA:{
@@ -3848,8 +3990,8 @@ coalition.add(s);
             break;
             }
           default:
-            jj_la1[110] = jj_gen;
-            break label_31;
+            jj_la1[115] = jj_gen;
+            break label_32;
           }
           jj_consume_token(COMMA);
           s = ExpressionStrategyCoalitionPlayer();
@@ -3858,7 +4000,7 @@ coalition.add(s);
         break;
         }
       default:
-        jj_la1[111] = jj_gen;
+        jj_la1[116] = jj_gen;
         ;
       }
 exprStrat.setCoalition(coalition);
@@ -3878,7 +4020,7 @@ String ExpressionStrategyCoalitionPlayer() throws ParseException {String s;
       break;
       }
     default:
-      jj_la1[113] = jj_gen;
+      jj_la1[118] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3941,7 +4083,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[119] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3954,7 +4096,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[115] = jj_gen;
+      jj_la1[120] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
@@ -4018,7 +4160,7 @@ s = getToken(0).image;
       break;
       }
     default:
-      jj_la1[116] = jj_gen;
+      jj_la1[121] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4050,7 +4192,7 @@ ident="max";
       break;
       }
     default:
-      jj_la1[117] = jj_gen;
+      jj_la1[122] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4087,7 +4229,7 @@ int EqNeq() throws ParseException {
       break;
       }
     default:
-      jj_la1[118] = jj_gen;
+      jj_la1[123] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4119,7 +4261,7 @@ int LtGt() throws ParseException {
       break;
       }
     default:
-      jj_la1[119] = jj_gen;
+      jj_la1[124] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4145,7 +4287,7 @@ begin = getToken(1);
       break;
       }
     default:
-      jj_la1[120] = jj_gen;
+      jj_la1[125] = jj_gen;
       ;
     }
     jj_consume_token(0);
@@ -4382,1956 +4524,1994 @@ fl.setLHS(s);
     finally { jj_save(27, xla); }
   }
 
-  static private boolean jj_3R_62()
+  static private boolean jj_3R_49()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_55()
+  static private boolean jj_3R_121()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(IMPLIES)) return true;
+    if (jj_3R_120()) return true;
     return false;
   }
 
-  static private boolean jj_3R_54()
+  static private boolean jj_3_25()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_62()) jj_scanpos = xsp;
-    if (jj_3R_63()) return true;
-    if (jj_3R_56()) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT
+                         && getToken(2).kind==COLON;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_50()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_247()
+  static private boolean jj_3R_228()
  {
-    if (jj_scan_token(NE)) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_246()
+  static private boolean jj_3R_106()
  {
-    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_120()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_121()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_227()
+  static private boolean jj_3R_48()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_246()) {
-    jj_scanpos = xsp;
-    if (jj_3R_247()) return true;
-    }
     return false;
   }
 
-  static private boolean jj_3R_189()
+  static private boolean jj_3R_43()
  {
-    if (jj_3R_227()) return true;
-    if (jj_3R_188()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_174()
+  static private boolean jj_3R_107()
  {
-    if (jj_3R_188()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_189()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_106()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_95()) return true;
     return false;
   }
 
-  static private boolean jj_3R_50()
+  static private boolean jj_3_24()
  {
-    if (jj_scan_token(S)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_54()) {
-    jj_scanpos = xsp;
-    if (jj_3R_55()) return true;
-    }
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_56()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_57()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==NOT
+                        && getToken(2).kind==REG_IDENT
+                        && getToken(2).image.equals("HOA")
+                        && getToken(3).kind==COLON;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_49()) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_265()) return true;
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_157()
+  static private boolean jj_3R_57()
  {
-    if (jj_3R_174()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
-  static private boolean jj_3R_56()
+  static private boolean jj_3_4()
  {
-    if (jj_3R_64()) return true;
+    if (jj_scan_token(LABEL)) return true;
     return false;
   }
 
-  static private boolean jj_3R_156()
+  static private boolean jj_3_23()
  {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_150()) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT
+                        && getToken(1).image.equals("HOA")
+                        && getToken(2).kind==COLON;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_48()) return true;
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_265()) return true;
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_4()
+  static private boolean jj_3R_95()
  {
-    if (jj_scan_token(LABEL)) return true;
+    if (jj_3R_106()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_107()) jj_scanpos = xsp;
+    return false;
+  }
+
+  static private boolean jj_3R_47()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_23()) {
+    jj_scanpos = xsp;
+    if (jj_3_24()) {
+    jj_scanpos = xsp;
+    if (jj_3_25()) {
+    jj_scanpos = xsp;
+    if (jj_3R_54()) return true;
+    }
+    }
+    }
     return false;
   }
 
   static private boolean jj_3_3()
  {
     if (jj_scan_token(LABEL)) return true;
-    if (jj_3R_34()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_66()
+  static private boolean jj_3R_34()
  {
-    if (jj_scan_token(REG_IDENTPRIME)) return true;
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_86()
+  static private boolean jj_3R_255()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_150()
+  static private boolean jj_3R_237()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_156()) {
-    jj_scanpos = xsp;
-    if (jj_3R_157()) return true;
-    }
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_85()
+  static private boolean jj_3R_227()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(AND)) return true;
     return false;
   }
 
-  static private boolean jj_3R_100()
+  static private boolean jj_3R_225()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_36()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_75()
+  static private boolean jj_3R_46()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_85()) {
-    jj_scanpos = xsp;
-    if (jj_3R_86()) return true;
-    }
-    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_151()
+  static private boolean jj_3R_45()
  {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_150()) return true;
     return false;
   }
 
-  static private boolean jj_3R_99()
+  static private boolean jj_3R_44()
  {
-    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_65()
+  static private boolean jj_3R_155()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(RBRACE)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_75()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_161()) return true;
     return false;
   }
 
-  static private boolean jj_3R_89()
+  static private boolean jj_3R_33()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_98()
+  static private boolean jj_3R_101()
  {
-    if (jj_3R_32()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_37()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_145()
+  static private boolean jj_3R_100()
  {
-    if (jj_3R_150()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_151()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_87()
+  static private boolean jj_3_21()
  {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_46()) return true;
+    if (jj_3R_33()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_98()) {
-    jj_scanpos = xsp;
-    if (jj_3R_99()) {
-    jj_scanpos = xsp;
-    if (jj_3R_100()) return true;
-    }
-    }
+    if (jj_3R_155()) jj_scanpos = xsp;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_117()
+  static private boolean jj_3_20()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_32()) return true;
-    if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_32()) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_45()) return true;
+    if (jj_3R_33()) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_271()
+  static private boolean jj_3R_90()
  {
-    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_146()
+  static private boolean jj_3R_99()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_145()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3_9()
+  static private boolean jj_3_19()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("time");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_44()) return true;
+    if (jj_3R_33()) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_270()
+  static private boolean jj_3R_88()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_99()) {
+    jj_scanpos = xsp;
+    if (jj_3R_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_101()) return true;
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_130()
+  static private boolean jj_3R_131()
  {
-    if (jj_3R_145()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_146()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3_19()) {
+    jj_scanpos = xsp;
+    if (jj_3_20()) {
+    jj_scanpos = xsp;
+    if (jj_3_21()) return true;
+    }
     }
     return false;
   }
 
-  static private boolean jj_3R_267()
+  static private boolean jj_3R_230()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_33()) return true;
-    if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_56()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_144()
+  static private boolean jj_3R_229()
  {
-    if (jj_3R_56()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_266()
+  static private boolean jj_3R_119()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_270()) {
-    jj_scanpos = xsp;
-    if (jj_3R_271()) return true;
-    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_33()) return true;
+    if (jj_scan_token(RENAME)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_142()
+  static private boolean jj_3R_235()
  {
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_259()
+  static private boolean jj_3R_226()
  {
-    if (jj_3R_266()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_267()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_140()
+  static private boolean jj_3_9()
  {
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_138()
+  static private boolean jj_3R_224()
  {
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_68()
+  static private boolean jj_3_18()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_52()) return true;
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_102()
+  static private boolean jj_3_17()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_32()) return true;
-    if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_32()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_117()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_131()
+  static private boolean jj_3R_132()
  {
-    if (jj_scan_token(IFF)) return true;
-    if (jj_3R_130()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
-  static private boolean jj_3R_49()
+  static private boolean jj_3_16()
  {
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_118()
+  static private boolean jj_3_15()
  {
-    if (jj_3R_130()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_131()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_88()
+  static private boolean jj_3R_212()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_101()) {
-    jj_scanpos = xsp;
-    if (jj_3R_102()) return true;
-    }
+    if (jj_scan_token(REGEXP_MARKER)) return true;
+    if (jj_3R_152()) return true;
     return false;
   }
 
-  static private boolean jj_3R_101()
+  static private boolean jj_3R_117()
  {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_32()) return true;
     Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(81)) jj_scanpos = xsp;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_131()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_116()) { jj_scanpos = xsp; break; }
+      if (jj_3R_132()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_34()
- {
-    if (jj_3R_33()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_53()
- {
-    if (jj_3R_56()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_76()
+  static private boolean jj_3R_193()
  {
-    if (jj_3R_87()) return true;
+    if (jj_scan_token(FILTER)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_88()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_224()) {
+    jj_scanpos = xsp;
+    if (jj_3R_225()) {
+    jj_scanpos = xsp;
+    if (jj_3R_226()) {
+    jj_scanpos = xsp;
+    if (jj_3R_227()) {
+    jj_scanpos = xsp;
+    if (jj_3R_228()) {
+    jj_scanpos = xsp;
+    if (jj_3R_229()) return true;
     }
+    }
+    }
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_57()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_230()) jj_scanpos = xsp;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_8()
- {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_48()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_119()
+  static private boolean jj_3_22()
  {
-    if (jj_scan_token(IMPLIES)) return true;
-    if (jj_3R_118()) return true;
+    if (jj_3R_47()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_237()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3_25()
+  static private boolean jj_3R_211()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT
-                         && getToken(2).kind==COLON;
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_49()) return true;
-    if (jj_3R_42()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_222()
+  static private boolean jj_3R_69()
  {
     if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_53()) return true;
     return false;
   }
 
-  static private boolean jj_3R_105()
+  static private boolean jj_3R_103()
  {
-    if (jj_3R_118()) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_33()) return true;
+    if (jj_scan_token(RENAME)) return true;
+    if (jj_3R_33()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_3R_119()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_47()
+  static private boolean jj_3R_210()
  {
+    if (jj_3R_64()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_42()
+  static private boolean jj_3R_148()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_61()
+  static private boolean jj_3R_254()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_67()) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3_10()
+  static private boolean jj_3R_236()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_254()) {
+    jj_scanpos = xsp;
+    if (jj_3R_255()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_106()
+  static private boolean jj_3R_146()
  {
-    if (jj_scan_token(QMARK)) return true;
-    if (jj_3R_105()) return true;
-    if (jj_scan_token(COLON)) return true;
-    if (jj_3R_94()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3_24()
+  static private boolean jj_3R_209()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==NOT
-                        && getToken(2).kind==REG_IDENT
-                        && getToken(2).image.equals("HOA")
-                        && getToken(3).kind==COLON;
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_48()) return true;
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(COLON)) return true;
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_259()) return true;
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_scan_token(PMAX)) return true;
     return false;
   }
 
-  static private boolean jj_3_2()
+  static private boolean jj_3R_144()
  {
-    if (jj_3R_33()) return true;
-    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3_23()
+  static private boolean jj_3R_208()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT
-                        && getToken(1).image.equals("HOA")
-                        && getToken(2).kind==COLON;
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_47()) return true;
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(COLON)) return true;
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_259()) return true;
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_scan_token(PMIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_77()
+  static private boolean jj_3R_142()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_32()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_89()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACKET)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_76()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_94()
+  static private boolean jj_3R_207()
  {
-    if (jj_3R_105()) return true;
+    if (jj_scan_token(P)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_106()) jj_scanpos = xsp;
+    if (jj_3R_235()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_236()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_46()
+  static private boolean jj_3R_89()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_23()) {
+    if (jj_3R_102()) {
     jj_scanpos = xsp;
-    if (jj_3_24()) {
-    jj_scanpos = xsp;
-    if (jj_3_25()) {
-    jj_scanpos = xsp;
-    if (jj_3R_53()) return true;
-    }
-    }
+    if (jj_3R_103()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_33()
+  static private boolean jj_3R_102()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_33()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_118()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_249()
+  static private boolean jj_3R_130()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_231()
+  static private boolean jj_3R_129()
  {
-    if (jj_3R_65()) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_67()
+  static private boolean jj_3R_128()
  {
-    if (jj_3R_76()) return true;
+    if (jj_scan_token(GT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_77()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_221()
- {
-    if (jj_scan_token(AND)) return true;
+    if (jj_3R_148()) {
+    jj_scanpos = xsp;
+    if (jj_3R_149()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_219()
+  static private boolean jj_3R_77()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_88()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_89()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_45()
+  static private boolean jj_3R_127()
  {
+    if (jj_scan_token(GE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_146()) {
+    jj_scanpos = xsp;
+    if (jj_3R_147()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_44()
+  static private boolean jj_3R_187()
  {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_207()) {
+    jj_scanpos = xsp;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) return true;
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
+    if (jj_3R_211()) return true;
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    xsp = jj_scanpos;
+    if (jj_3_22()) {
+    jj_scanpos = xsp;
+    if (jj_3R_212()) return true;
+    }
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_43()
+  static private boolean jj_3_8()
  {
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_149()
+  static private boolean jj_3R_126()
  {
-    if (jj_3R_155()) return true;
+    if (jj_scan_token(LT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_144()) {
+    jj_scanpos = xsp;
+    if (jj_3R_145()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_32()
+  static private boolean jj_3R_125()
  {
-    if (jj_scan_token(REG_IDENT)) return true;
+    if (jj_scan_token(LE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_142()) {
+    jj_scanpos = xsp;
+    if (jj_3R_143()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3_21()
+  static private boolean jj_3R_116()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward");
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_45()) return true;
-    if (jj_3R_32()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_149()) jj_scanpos = xsp;
-    if (jj_3R_114()) return true;
+    if (jj_3R_125()) {
+    jj_scanpos = xsp;
+    if (jj_3R_126()) {
+    jj_scanpos = xsp;
+    if (jj_3R_127()) {
+    jj_scanpos = xsp;
+    if (jj_3R_128()) {
+    jj_scanpos = xsp;
+    if (jj_3R_129()) {
+    jj_scanpos = xsp;
+    if (jj_3R_130()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3_20()
+  static private boolean jj_3R_192()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps");
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_44()) return true;
-    if (jj_3R_32()) return true;
-    if (jj_3R_114()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3_19()
+  static private boolean jj_3R_249()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("time");
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_43()) return true;
-    if (jj_3R_32()) return true;
-    if (jj_3R_114()) return true;
+    if (jj_3R_188()) return true;
     return false;
   }
 
-  static private boolean jj_3R_128()
+  static private boolean jj_3R_62()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_19()) {
-    jj_scanpos = xsp;
-    if (jj_3_20()) {
-    jj_scanpos = xsp;
-    if (jj_3_21()) return true;
-    }
-    }
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
-  static private boolean jj_3R_224()
+  static private boolean jj_3R_234()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_56()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_223()
+  static private boolean jj_3R_206()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_229()
+  static private boolean jj_3_10()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_220()
+  static private boolean jj_3_2()
  {
-    if (jj_scan_token(PLUS)) return true;
+    if (jj_3R_34()) return true;
+    if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  static private boolean jj_3R_60()
+  static private boolean jj_3R_274()
  {
-    if (jj_3R_67()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_68()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_scan_token(87)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(90)) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_218()
- {
-    if (jj_scan_token(MIN)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_18()
+  static private boolean jj_3R_159()
  {
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_152()) return true;
     return false;
   }
 
-  static private boolean jj_3_17()
+  static private boolean jj_3R_152()
  {
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_158()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_159()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_129()
+  static private boolean jj_3R_78()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_128()) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_33()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_90()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
-  static private boolean jj_3_16()
+  static private boolean jj_3R_186()
  {
-    if (jj_3R_42()) return true;
     if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_15()
+  static private boolean jj_3R_275()
  {
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_274()) return true;
     return false;
   }
 
-  static private boolean jj_3R_206()
+  static private boolean jj_3R_68()
  {
-    if (jj_scan_token(REGEXP_MARKER)) return true;
-    if (jj_3R_147()) return true;
+    if (jj_3R_77()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_78()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_115()
+  static private boolean jj_3R_267()
  {
+    if (jj_3R_274()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(81)) jj_scanpos = xsp;
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_128()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_129()) { jj_scanpos = xsp; break; }
+      if (jj_3R_275()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_187()
+  static private boolean jj_3R_260()
  {
-    if (jj_scan_token(FILTER)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_218()) {
-    jj_scanpos = xsp;
-    if (jj_3R_219()) {
-    jj_scanpos = xsp;
-    if (jj_3R_220()) {
-    jj_scanpos = xsp;
-    if (jj_3R_221()) {
-    jj_scanpos = xsp;
-    if (jj_3R_222()) {
-    jj_scanpos = xsp;
-    if (jj_3R_223()) return true;
-    }
-    }
-    }
-    }
-    }
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_56()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_224()) jj_scanpos = xsp;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_267()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3_22()
+  static private boolean jj_3R_259()
+ {
+    if (jj_scan_token(TIMES)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_247()
  {
-    if (jj_3R_46()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_231()) jj_scanpos = xsp;
+    if (jj_3R_259()) {
+    jj_scanpos = xsp;
+    if (jj_3R_260()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_205()
+  static private boolean jj_3R_164()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_3R_158()) return true;
     return false;
   }
 
-  static private boolean jj_3R_204()
+  static private boolean jj_3R_205()
  {
-    if (jj_3R_63()) return true;
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_143()
+  static private boolean jj_3R_199()
  {
-    if (jj_3R_42()) return true;
+    if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_248()
+  static private boolean jj_3R_198()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_230()
+  static private boolean jj_3R_158()
  {
+    if (jj_3R_122()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_248()) {
-    jj_scanpos = xsp;
-    if (jj_3R_249()) return true;
-    }
+    if (jj_3R_164()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_141()
+  static private boolean jj_3R_223()
  {
-    if (jj_3R_42()) return true;
+    if (jj_3R_186()) return true;
     return false;
   }
 
-  static private boolean jj_3R_203()
+  static private boolean jj_3R_248()
  {
-    if (jj_scan_token(PMAX)) return true;
+    if (jj_3R_187()) return true;
     return false;
   }
 
-  static private boolean jj_3R_139()
+  static private boolean jj_3R_137()
  {
-    if (jj_3R_42()) return true;
+    if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_202()
+  static private boolean jj_3R_222()
  {
-    if (jj_scan_token(PMIN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_248()) {
+    jj_scanpos = xsp;
+    if (jj_3R_249()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_137()
+  static private boolean jj_3R_197()
  {
-    if (jj_3R_42()) return true;
+    if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_201()
+  static private boolean jj_3R_61()
  {
-    if (jj_scan_token(P)) return true;
+    if (jj_3R_68()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_229()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_230()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_127()
- {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_56()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_69()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_126()
+  static private boolean jj_3R_221()
  {
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_247()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_125()
+  static private boolean jj_3R_220()
  {
+    if (jj_scan_token(LT)) return true;
+    if (jj_scan_token(LT)) return true;
+    if (jj_3R_247()) return true;
+    if (jj_scan_token(GT)) return true;
     if (jj_scan_token(GT)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_143()) {
-    jj_scanpos = xsp;
-    if (jj_3R_144()) return true;
-    }
     return false;
   }
 
-  static private boolean jj_3R_124()
+  static private boolean jj_3R_136()
  {
-    if (jj_scan_token(GE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_141()) {
-    jj_scanpos = xsp;
-    if (jj_3R_142()) return true;
-    }
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_152()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_181()
+  static private boolean jj_3R_191()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_201()) {
-    jj_scanpos = xsp;
-    if (jj_3R_202()) {
-    jj_scanpos = xsp;
-    if (jj_3R_203()) return true;
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_204()) {
+    if (jj_3R_220()) {
     jj_scanpos = xsp;
-    if (jj_3R_205()) return true;
+    if (jj_3R_221()) return true;
     }
-    if (jj_scan_token(LBRACKET)) return true;
     xsp = jj_scanpos;
-    if (jj_3_22()) {
+    if (jj_3R_222()) {
     jj_scanpos = xsp;
-    if (jj_3R_206()) return true;
+    if (jj_3R_223()) return true;
     }
-    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_123()
+  static private boolean jj_3R_204()
  {
-    if (jj_scan_token(LT)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_139()) {
-    jj_scanpos = xsp;
-    if (jj_3R_140()) return true;
-    }
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_52()
+  static private boolean jj_3R_135()
  {
-    if (jj_3R_60()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_61()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_122()
+  static private boolean jj_3R_196()
  {
-    if (jj_scan_token(LE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_137()) {
-    jj_scanpos = xsp;
-    if (jj_3R_138()) return true;
-    }
+    if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_114()
+  static private boolean jj_3R_182()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_122()) {
-    jj_scanpos = xsp;
-    if (jj_3R_123()) {
+    if (jj_3R_196()) {
     jj_scanpos = xsp;
-    if (jj_3R_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_125()) {
+    if (jj_3R_197()) {
     jj_scanpos = xsp;
-    if (jj_3R_126()) {
+    if (jj_3R_198()) {
     jj_scanpos = xsp;
-    if (jj_3R_127()) return true;
-    }
-    }
+    if (jj_3R_199()) return true;
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_186()
+  static private boolean jj_3R_122()
  {
-    if (jj_3R_34()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_135()) {
+    jj_scanpos = xsp;
+    if (jj_3R_136()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_137()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_243()
+  static private boolean jj_3R_202()
  {
-    if (jj_3R_182()) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_228()
+  static private boolean jj_3R_179()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_56()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_200()
+  static private boolean jj_3R_42()
  {
-    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_36()
+  static private boolean jj_3R_181()
  {
-    if (jj_3R_52()) return true;
+    if (jj_3R_161()) return true;
     return false;
   }
 
-  static private boolean jj_3R_268()
+  static private boolean jj_3R_53()
  {
+    if (jj_3R_61()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(86)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(89)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_62()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_153()
+  static private boolean jj_3R_41()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_147()) return true;
     return false;
   }
 
-  static private boolean jj_3_7()
+  static private boolean jj_3R_203()
  {
-    if (jj_3R_33()) return true;
-    if (jj_3R_36()) return true;
+    if (jj_3R_57()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_234()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_147()
+  static private boolean jj_3R_40()
  {
-    if (jj_3R_152()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_153()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_180()
+  static private boolean jj_3R_190()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(A)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_269()
+  static private boolean jj_3_14()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_268()) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_42()) return true;
+    if (jj_3R_33()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_181()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_261()
+  static private boolean jj_3_13()
  {
-    if (jj_3R_268()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_269()) { jj_scanpos = xsp; break; }
-    }
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_41()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_254()
+  static private boolean jj_3R_185()
  {
+    if (jj_scan_token(FUNC)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_261()) jj_scanpos = xsp;
+    if (jj_3R_204()) {
+    jj_scanpos = xsp;
+    if (jj_3R_205()) {
+    jj_scanpos = xsp;
+    if (jj_3R_206()) return true;
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_203()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_1()
+  static private boolean jj_3R_37()
  {
-    if (jj_scan_token(MODULE)) return true;
-    if (jj_3R_32()) return true;
-    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_53()) return true;
     return false;
   }
 
-  static private boolean jj_3R_253()
+  static private boolean jj_3_12()
  {
-    if (jj_scan_token(TIMES)) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("time");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_40()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_241()
+  static private boolean jj_3R_39()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_253()) {
+    if (jj_3_12()) {
     jj_scanpos = xsp;
-    if (jj_3R_254()) return true;
+    if (jj_3_13()) {
+    jj_scanpos = xsp;
+    if (jj_3_14()) return true;
+    }
     }
     return false;
   }
 
-  static private boolean jj_3R_158()
+  static private boolean jj_3_7()
  {
-    if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_3R_152()) return true;
+    if (jj_3R_34()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_199()
+  static private boolean jj_3R_38()
  {
-    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_193()
+  static private boolean jj_3R_189()
  {
-    if (jj_scan_token(FALSE)) return true;
+    if (jj_scan_token(E)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_192()
+  static private boolean jj_3R_201()
  {
-    if (jj_scan_token(TRUE)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_152()
+  static private boolean jj_3R_153()
  {
-    if (jj_3R_120()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_158()) jj_scanpos = xsp;
+    if (jj_3R_160()) return true;
+    if (jj_scan_token(TIMES)) return true;
+    if (jj_3R_39()) return true;
     return false;
   }
 
-  static private boolean jj_3R_217()
+  static private boolean jj_3R_184()
  {
-    if (jj_3R_180()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_201()) {
+    jj_scanpos = xsp;
+    if (jj_3R_202()) return true;
+    }
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_203()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_6()
+  static private boolean jj_3_1()
  {
+    if (jj_scan_token(MODULE)) return true;
     if (jj_3R_33()) return true;
+    if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_242()
+  static private boolean jj_3_28()
  {
-    if (jj_3R_181()) return true;
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_134()
+  static private boolean jj_3_11()
  {
-    if (jj_scan_token(TIMES)) return true;
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT &&
+            ( getToken(1).image.equals("time") || getToken(1).image.equals("steps") || getToken(1).image.equals("reward") );
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_38()) return true;
+    if (jj_3R_39()) return true;
     return false;
   }
 
-  static private boolean jj_3R_216()
+  static private boolean jj_3R_138()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_242()) {
+    if (jj_3_11()) {
     jj_scanpos = xsp;
-    if (jj_3R_243()) return true;
+    if (jj_3R_153()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_191()
+  static private boolean jj_3R_246()
  {
-    if (jj_scan_token(REG_DOUBLE)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_215()
+  static private boolean jj_3_27()
  {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_241()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3R_214()
+  static private boolean jj_3R_245()
  {
-    if (jj_scan_token(LT)) return true;
-    if (jj_scan_token(LT)) return true;
-    if (jj_3R_241()) return true;
-    if (jj_scan_token(GT)) return true;
-    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(I)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_133()
+  static private boolean jj_3R_200()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_147()) return true;
+    if (jj_3R_203()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_185()
+  static private boolean jj_3R_244()
+ {
+    if (jj_scan_token(C)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_139()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    if (jj_3R_138()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_243()
+ {
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
+    if (jj_3R_57()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_183()
  {
+    if (jj_3R_33()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_214()) {
-    jj_scanpos = xsp;
-    if (jj_3R_215()) return true;
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_216()) {
-    jj_scanpos = xsp;
-    if (jj_3R_217()) return true;
-    }
+    if (jj_3R_200()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_198()
+  static private boolean jj_3R_242()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(S)) return true;
     return false;
   }
 
-  static private boolean jj_3R_132()
+  static private boolean jj_3R_241()
  {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3R_190()
+  static private boolean jj_3_6()
  {
-    if (jj_scan_token(REG_INT)) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_176()
+  static private boolean jj_3_26()
+ {
+    if (jj_3R_34()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_218()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_190()) {
+    if (jj_3R_241()) {
     jj_scanpos = xsp;
-    if (jj_3R_191()) {
+    if (jj_3R_242()) {
     jj_scanpos = xsp;
-    if (jj_3R_192()) {
+    if (jj_3R_243()) {
     jj_scanpos = xsp;
-    if (jj_3R_193()) return true;
+    if (jj_3R_244()) {
+    jj_scanpos = xsp;
+    if (jj_3R_245()) {
+    jj_scanpos = xsp;
+    if (jj_3R_246()) return true;
+    }
+    }
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_120()
+  static private boolean jj_3R_123()
  {
+    if (jj_3R_138()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_132()) {
-    jj_scanpos = xsp;
-    if (jj_3R_133()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_139()) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_134()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_196()
+  static private boolean jj_3R_177()
+ {
+    if (jj_3R_193()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_219()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_173()
+  static private boolean jj_3R_178()
  {
-    if (jj_3R_56()) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_41()
+  static private boolean jj_3R_176()
  {
+    if (jj_3R_192()) return true;
     return false;
   }
 
   static private boolean jj_3R_175()
  {
-    if (jj_3R_155()) return true;
+    if (jj_3R_191()) return true;
     return false;
   }
 
-  static private boolean jj_3R_40()
+  static private boolean jj_3R_114()
  {
+    if (jj_3R_123()) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_197()
+  static private boolean jj_3R_174()
  {
-    if (jj_3R_56()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_228()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_190()) return true;
     return false;
   }
 
-  static private boolean jj_3R_39()
+  static private boolean jj_3R_173()
  {
+    if (jj_3R_189()) return true;
     return false;
   }
 
-  static private boolean jj_3R_184()
+  static private boolean jj_3R_271()
  {
-    if (jj_scan_token(A)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_scan_token(DIVIDE)) return true;
     return false;
   }
 
-  static private boolean jj_3_14()
+  static private boolean jj_3R_172()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward");
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_41()) return true;
-    if (jj_3R_32()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_175()) jj_scanpos = xsp;
+    if (jj_3R_188()) return true;
     return false;
   }
 
-  static private boolean jj_3_13()
+  static private boolean jj_3R_171()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps");
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_40()) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3R_179()
+  static private boolean jj_3R_154()
  {
-    if (jj_scan_token(FUNC)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_198()) {
-    jj_scanpos = xsp;
-    if (jj_3R_199()) {
-    jj_scanpos = xsp;
-    if (jj_3R_200()) return true;
-    }
-    }
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3_12()
+  static private boolean jj_3R_170()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("time");
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_39()) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_187()) return true;
     return false;
   }
 
-  static private boolean jj_3R_38()
+  static private boolean jj_3R_161()
  {
+    if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_12()) {
-    jj_scanpos = xsp;
-    if (jj_3_13()) {
+    if (jj_3R_178()) {
     jj_scanpos = xsp;
-    if (jj_3_14()) return true;
-    }
+    if (jj_3R_179()) return true;
     }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_59()
- {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_58()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_37()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_183()
+  static private boolean jj_3R_169()
  {
-    if (jj_scan_token(E)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_186()) return true;
     return false;
   }
 
-  static private boolean jj_3R_195()
+  static private boolean jj_3R_141()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_3R_57()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_154()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_148()
+  static private boolean jj_3R_168()
  {
-    if (jj_3R_154()) return true;
-    if (jj_scan_token(TIMES)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_185()) return true;
     return false;
   }
 
-  static private boolean jj_3R_178()
+  static private boolean jj_3R_124()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_195()) {
+    if (jj_3R_140()) {
     jj_scanpos = xsp;
-    if (jj_3R_196()) return true;
+    if (jj_3R_141()) return true;
     }
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_28()
+  static private boolean jj_3R_140()
  {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
+    if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3_11()
+  static private boolean jj_3R_167()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT &&
-            ( getToken(1).image.equals("time") || getToken(1).image.equals("steps") || getToken(1).image.equals("reward") );
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_37()) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_184()) return true;
     return false;
   }
 
-  static private boolean jj_3R_58()
+  static private boolean jj_3R_166()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_66()) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_56()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_183()) return true;
     return false;
   }
 
-  static private boolean jj_3R_135()
+  static private boolean jj_3R_165()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_11()) {
-    jj_scanpos = xsp;
-    if (jj_3R_148()) return true;
-    }
+    if (jj_3R_182()) return true;
     return false;
   }
 
-  static private boolean jj_3R_240()
+  static private boolean jj_3R_266()
  {
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_161()) return true;
     return false;
   }
 
-  static private boolean jj_3_27()
+  static private boolean jj_3R_264()
  {
-    if (jj_3R_50()) return true;
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_239()
+  static private boolean jj_3R_258()
  {
-    if (jj_scan_token(I)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_194()
+  static private boolean jj_3R_256()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_161()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_266()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_238()
+  static private boolean jj_3R_160()
  {
-    if (jj_scan_token(C)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_165()) {
+    jj_scanpos = xsp;
+    if (jj_3R_166()) {
+    jj_scanpos = xsp;
+    if (jj_3R_167()) {
+    jj_scanpos = xsp;
+    if (jj_3R_168()) {
+    jj_scanpos = xsp;
+    if (jj_3R_169()) {
+    jj_scanpos = xsp;
+    if (jj_3R_170()) {
+    jj_scanpos = xsp;
+    if (jj_3R_171()) {
+    jj_scanpos = xsp;
+    if (jj_3R_172()) {
+    jj_scanpos = xsp;
+    if (jj_3R_173()) {
+    jj_scanpos = xsp;
+    if (jj_3R_174()) {
+    jj_scanpos = xsp;
+    if (jj_3R_175()) {
+    jj_scanpos = xsp;
+    if (jj_3R_176()) {
+    jj_scanpos = xsp;
+    if (jj_3R_177()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_136()
+  static private boolean jj_3R_60()
  {
-    if (jj_scan_token(PLUS)) return true;
-    if (jj_3R_135()) return true;
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
-  static private boolean jj_3R_237()
+  static private boolean jj_3R_269()
  {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
-    if (jj_3R_56()) return true;
+    if (jj_3R_160()) return true;
     return false;
   }
 
-  static private boolean jj_3R_177()
+  static private boolean jj_3R_268()
  {
-    if (jj_3R_32()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_194()) jj_scanpos = xsp;
+    if (jj_scan_token(MINUS)) return true;
+    if (jj_3R_261()) return true;
     return false;
   }
 
-  static private boolean jj_3R_236()
+  static private boolean jj_3R_59()
  {
-    if (jj_scan_token(S)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_67()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_51()
+  static private boolean jj_3R_261()
  {
-    if (jj_3R_58()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_59()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_268()) {
+    jj_scanpos = xsp;
+    if (jj_3R_269()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3_5()
- {
-    if (jj_3R_35()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_235()
+  static private boolean jj_3R_270()
  {
-    if (jj_3R_50()) return true;
+    if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_35()
+  static private boolean jj_3R_262()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_51()) {
+    if (jj_3R_270()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(49)) return true;
+    if (jj_3R_271()) return true;
     }
+    if (jj_3R_261()) return true;
     return false;
   }
 
-  static private boolean jj_3_26()
+  static private boolean jj_3R_217()
  {
-    if (jj_3R_33()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_212()
+  static private boolean jj_3R_52()
  {
+    if (jj_3R_59()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_235()) {
-    jj_scanpos = xsp;
-    if (jj_3R_236()) {
-    jj_scanpos = xsp;
-    if (jj_3R_237()) {
-    jj_scanpos = xsp;
-    if (jj_3R_238()) {
-    jj_scanpos = xsp;
-    if (jj_3R_239()) {
-    jj_scanpos = xsp;
-    if (jj_3R_240()) return true;
-    }
-    }
-    }
-    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_60()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_121()
+  static private boolean jj_3R_216()
+ {
+    if (jj_3R_64()) return true;
+    if (jj_3R_57()) return true;
+    return false;
+  }
+
+  static private boolean jj_3_5()
  {
-    if (jj_3R_135()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_136()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3R_171()
+  static private boolean jj_3R_257()
  {
-    if (jj_3R_187()) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_213()
+  static private boolean jj_3R_240()
  {
-    if (jj_3R_65()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_257()) {
+    jj_scanpos = xsp;
+    if (jj_3R_258()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_172()
+  static private boolean jj_3R_36()
  {
-    if (jj_3R_33()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_52()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(49)) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_170()
+  static private boolean jj_3R_239()
  {
-    if (jj_3R_186()) return true;
+    if (jj_3R_256()) return true;
     return false;
   }
 
-  static private boolean jj_3R_169()
+  static private boolean jj_3R_238()
  {
-    if (jj_3R_185()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_43()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_113()
+  static private boolean jj_3R_215()
  {
-    if (jj_3R_121()) return true;
-    if (jj_3R_114()) return true;
+    if (jj_scan_token(RMAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_168()
+  static private boolean jj_3R_250()
  {
-    if (jj_3R_184()) return true;
+    if (jj_3R_261()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_262()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_167()
+  static private boolean jj_3R_214()
  {
-    if (jj_3R_183()) return true;
+    if (jj_scan_token(RMIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_265()
+  static private boolean jj_3R_58()
  {
-    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_166()
+  static private boolean jj_3R_263()
  {
-    if (jj_3R_182()) return true;
+    if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_165()
+  static private boolean jj_3R_251()
  {
-    if (jj_3R_50()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_263()) {
+    jj_scanpos = xsp;
+    if (jj_3R_264()) return true;
+    }
+    if (jj_3R_250()) return true;
     return false;
   }
 
-  static private boolean jj_3R_164()
+  static private boolean jj_3R_213()
  {
-    if (jj_3R_181()) return true;
+    if (jj_scan_token(R)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_238()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_239()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_240()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_155()
+  static private boolean jj_3R_188()
  {
-    if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_172()) {
+    if (jj_3R_213()) {
     jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
+    if (jj_3R_214()) {
+    jj_scanpos = xsp;
+    if (jj_3R_215()) return true;
     }
-    if (jj_scan_token(RBRACE)) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_216()) {
+    jj_scanpos = xsp;
+    if (jj_3R_217()) return true;
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_218()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_219()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_112()
+  static private boolean jj_3R_115()
  {
-    if (jj_3R_114()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_124()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_111()
+  static private boolean jj_3R_231()
  {
-    if (jj_scan_token(REGEXP_MARKER)) return true;
-    if (jj_3R_120()) return true;
+    if (jj_3R_250()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_251()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_163()
+  static private boolean jj_3R_113()
  {
-    if (jj_3R_180()) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_162()
+  static private boolean jj_3R_112()
  {
-    if (jj_3R_179()) return true;
+    if (jj_scan_token(REGEXP_MARKER)) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_161()
+  static private boolean jj_3R_111()
  {
-    if (jj_3R_178()) return true;
+    if (jj_scan_token(ACCBOXMINUS)) return true;
     return false;
   }
 
   static private boolean jj_3R_110()
  {
-    if (jj_scan_token(ACCBOXMINUS)) return true;
+    if (jj_scan_token(ACCBOXPLUS)) return true;
     return false;
   }
 
   static private boolean jj_3R_109()
  {
-    if (jj_scan_token(ACCBOXPLUS)) return true;
+    if (jj_scan_token(ACCDIAMINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_160()
+  static private boolean jj_3R_108()
  {
-    if (jj_3R_177()) return true;
+    if (jj_scan_token(ACCDIAPLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_108()
+  static private boolean jj_3R_232()
  {
-    if (jj_scan_token(ACCDIAMINUS)) return true;
+    if (jj_3R_64()) return true;
+    if (jj_3R_231()) return true;
     return false;
   }
 
-  static private boolean jj_3R_107()
+  static private boolean jj_3R_73()
  {
-    if (jj_scan_token(ACCDIAPLUS)) return true;
+    if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_159()
+  static private boolean jj_3R_72()
  {
-    if (jj_3R_176()) return true;
+    if (jj_scan_token(GE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_260()
+  static private boolean jj_3R_96()
  {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_3R_155()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_108()) {
+    jj_scanpos = xsp;
+    if (jj_3R_109()) {
+    jj_scanpos = xsp;
+    if (jj_3R_110()) {
+    jj_scanpos = xsp;
+    if (jj_3R_111()) return true;
+    }
+    }
+    }
+    if (jj_scan_token(LPARENTH)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_112()) {
+    jj_scanpos = xsp;
+    if (jj_3R_113()) return true;
+    }
+    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_114()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_115()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_258()
+  static private boolean jj_3R_71()
  {
-    if (jj_scan_token(MINUS)) return true;
+    if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_252()
+  static private boolean jj_3R_194()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_231()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_232()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_250()
+  static private boolean jj_3R_70()
  {
-    if (jj_3R_155()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_260()) jj_scanpos = xsp;
+    if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_154()
+  static private boolean jj_3R_64()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_159()) {
-    jj_scanpos = xsp;
-    if (jj_3R_160()) {
-    jj_scanpos = xsp;
-    if (jj_3R_161()) {
-    jj_scanpos = xsp;
-    if (jj_3R_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) {
-    jj_scanpos = xsp;
-    if (jj_3R_164()) {
-    jj_scanpos = xsp;
-    if (jj_3R_165()) {
-    jj_scanpos = xsp;
-    if (jj_3R_166()) {
-    jj_scanpos = xsp;
-    if (jj_3R_167()) {
-    jj_scanpos = xsp;
-    if (jj_3R_168()) {
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_169()) {
+    if (jj_3R_71()) {
     jj_scanpos = xsp;
-    if (jj_3R_170()) {
+    if (jj_3R_72()) {
     jj_scanpos = xsp;
-    if (jj_3R_171()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_73()) return true;
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_95()
+  static private boolean jj_3R_63()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_107()) {
-    jj_scanpos = xsp;
-    if (jj_3R_108()) {
-    jj_scanpos = xsp;
-    if (jj_3R_109()) {
-    jj_scanpos = xsp;
-    if (jj_3R_110()) return true;
-    }
-    }
-    }
-    if (jj_scan_token(LPARENTH)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_111()) {
-    jj_scanpos = xsp;
-    if (jj_3R_112()) return true;
-    }
-    if (jj_scan_token(RPARENTH)) return true;
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_113()) return true;
+    if (jj_3R_43()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_263()
+  static private boolean jj_3R_56()
  {
-    if (jj_3R_154()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_262()
+  static private boolean jj_3R_81()
  {
-    if (jj_scan_token(MINUS)) return true;
-    if (jj_3R_255()) return true;
+    if (jj_3R_96()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_55()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_63()) jj_scanpos = xsp;
+    if (jj_3R_64()) return true;
+    if (jj_3R_57()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_253()
+ {
+    if (jj_scan_token(NE)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_252()
+ {
+    if (jj_scan_token(EQ)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_233()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_252()) {
+    jj_scanpos = xsp;
+    if (jj_3R_253()) return true;
+    }
     return false;
   }
 
@@ -6341,383 +6521,390 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_79()
+  static private boolean jj_3R_195()
  {
-    if (jj_3R_94()) return true;
+    if (jj_3R_233()) return true;
+    if (jj_3R_194()) return true;
     return false;
   }
 
-  static private boolean jj_3R_104()
+  static private boolean jj_3R_105()
  {
-    if (jj_3R_115()) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
-  static private boolean jj_3R_93()
+  static private boolean jj_3R_94()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_103()) {
+    if (jj_3R_104()) {
     jj_scanpos = xsp;
-    if (jj_3R_104()) return true;
+    if (jj_3R_105()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_103()
+  static private boolean jj_3R_104()
  {
-    if (jj_3R_114()) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_255()
+  static private boolean jj_3R_180()
  {
+    if (jj_3R_194()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_262()) {
-    jj_scanpos = xsp;
-    if (jj_3R_263()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_195()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_92()
+  static private boolean jj_3R_93()
  {
     if (jj_scan_token(G)) return true;
     return false;
   }
 
-  static private boolean jj_3R_91()
+  static private boolean jj_3R_92()
  {
     if (jj_scan_token(F)) return true;
     return false;
   }
 
-  static private boolean jj_3R_90()
+  static private boolean jj_3R_91()
  {
     if (jj_scan_token(X)) return true;
     return false;
   }
 
-  static private boolean jj_3R_264()
- {
-    if (jj_scan_token(TIMES)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_256()
+  static private boolean jj_3R_51()
  {
+    if (jj_scan_token(S)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_264()) {
+    if (jj_3R_55()) {
     jj_scanpos = xsp;
-    if (jj_3R_265()) return true;
+    if (jj_3R_56()) return true;
     }
-    if (jj_3R_255()) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_57()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_58()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_78()
+  static private boolean jj_3R_163()
+ {
+    if (jj_3R_180()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_79()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_90()) {
-    jj_scanpos = xsp;
     if (jj_3R_91()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_92()) {
+    jj_scanpos = xsp;
+    if (jj_3R_93()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_93()) jj_scanpos = xsp;
-    if (jj_3R_73()) return true;
+    if (jj_3R_94()) jj_scanpos = xsp;
+    if (jj_3R_74()) return true;
     return false;
   }
 
-  static private boolean jj_3R_211()
+  static private boolean jj_3R_162()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_156()) return true;
     return false;
   }
 
-  static private boolean jj_3R_210()
+  static private boolean jj_3R_67()
  {
-    if (jj_3R_63()) return true;
-    if (jj_3R_56()) return true;
+    if (jj_scan_token(REG_IDENTPRIME)) return true;
     return false;
   }
 
-  static private boolean jj_3R_251()
+  static private boolean jj_3R_87()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_234()
+  static private boolean jj_3R_156()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_251()) {
+    if (jj_3R_162()) {
     jj_scanpos = xsp;
-    if (jj_3R_252()) return true;
+    if (jj_3R_163()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_233()
+  static private boolean jj_3R_74()
  {
-    if (jj_3R_250()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_79()) {
+    jj_scanpos = xsp;
+    if (jj_3R_80()) {
+    jj_scanpos = xsp;
+    if (jj_3R_81()) return true;
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_232()
+  static private boolean jj_3R_86()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_42()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_209()
+  static private boolean jj_3R_98()
  {
-    if (jj_scan_token(RMAX)) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
-  static private boolean jj_3R_244()
+  static private boolean jj_3R_85()
  {
-    if (jj_3R_255()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_256()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_97()) {
+    jj_scanpos = xsp;
+    if (jj_3R_98()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_208()
+  static private boolean jj_3R_97()
  {
-    if (jj_scan_token(RMIN)) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  static private boolean jj_3R_73()
+  static private boolean jj_3R_84()
+ {
+    if (jj_scan_token(R)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_76()
  {
+    if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_78()) {
-    jj_scanpos = xsp;
-    if (jj_3R_79()) {
+    if (jj_3R_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_80()) return true;
-    }
+    if (jj_3R_87()) return true;
     }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_57()
+  static private boolean jj_3R_157()
  {
-    if (jj_3R_65()) return true;
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_156()) return true;
     return false;
   }
 
-  static private boolean jj_3R_257()
+  static private boolean jj_3R_83()
  {
-    if (jj_scan_token(PLUS)) return true;
+    if (jj_scan_token(W)) return true;
     return false;
   }
 
-  static private boolean jj_3R_97()
+  static private boolean jj_3R_82()
  {
-    if (jj_3R_115()) return true;
+    if (jj_scan_token(U)) return true;
     return false;
   }
 
-  static private boolean jj_3R_84()
+  static private boolean jj_3R_66()
  {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RBRACE)) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_96()) {
-    jj_scanpos = xsp;
-    if (jj_3R_97()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_76()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_96()
+  static private boolean jj_3R_150()
  {
-    if (jj_3R_114()) return true;
+    if (jj_3R_156()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_157()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_245()
+  static private boolean jj_3R_75()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_257()) {
+    if (jj_3R_82()) {
     jj_scanpos = xsp;
-    if (jj_3R_258()) return true;
+    if (jj_3R_83()) {
+    jj_scanpos = xsp;
+    if (jj_3R_84()) return true;
     }
-    if (jj_3R_244()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_85()) jj_scanpos = xsp;
+    if (jj_3R_74()) return true;
     return false;
   }
 
-  static private boolean jj_3R_207()
+  static private boolean jj_3R_277()
  {
-    if (jj_scan_token(R)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_232()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_233()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_234()) jj_scanpos = xsp;
+    if (jj_scan_token(REG_QUOTED_STRING)) return true;
     return false;
   }
 
-  static private boolean jj_3R_83()
+  static private boolean jj_3R_151()
  {
-    if (jj_scan_token(R)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_150()) return true;
     return false;
   }
 
-  static private boolean jj_3R_82()
+  static private boolean jj_3R_276()
  {
-    if (jj_scan_token(W)) return true;
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_81()
+  static private boolean jj_3R_65()
  {
-    if (jj_scan_token(U)) return true;
+    if (jj_3R_74()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_75()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_182()
+  static private boolean jj_3R_133()
  {
+    if (jj_3R_150()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_207()) {
-    jj_scanpos = xsp;
-    if (jj_3R_208()) {
-    jj_scanpos = xsp;
-    if (jj_3R_209()) return true;
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_210()) {
-    jj_scanpos = xsp;
-    if (jj_3R_211()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_151()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_212()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_213()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_74()
+  static private boolean jj_3R_273()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_81()) {
-    jj_scanpos = xsp;
-    if (jj_3R_82()) {
-    jj_scanpos = xsp;
-    if (jj_3R_83()) return true;
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_84()) jj_scanpos = xsp;
-    if (jj_3R_73()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_34()) return true;
+    if (jj_scan_token(RENAME)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_225()
+  static private boolean jj_3R_149()
  {
-    if (jj_3R_244()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_245()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_64()
+  static private boolean jj_3R_272()
  {
-    if (jj_3R_73()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_74()) jj_scanpos = xsp;
+    if (jj_3R_276()) {
+    jj_scanpos = xsp;
+    if (jj_3R_277()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_226()
+  static private boolean jj_3R_147()
  {
-    if (jj_3R_63()) return true;
-    if (jj_3R_225()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_72()
+  static private boolean jj_3R_265()
  {
-    if (jj_scan_token(LE)) return true;
+    if (jj_3R_272()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_273()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_116()
+  static private boolean jj_3R_145()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_71()
+  static private boolean jj_3R_143()
  {
-    if (jj_scan_token(GE)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_70()
+  static private boolean jj_3R_134()
  {
-    if (jj_scan_token(LT)) return true;
+    if (jj_scan_token(IFF)) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
-  static private boolean jj_3R_188()
+  static private boolean jj_3R_50()
+ {
+    return false;
+  }
+
+  static private boolean jj_3R_120()
  {
-    if (jj_3R_225()) return true;
+    if (jj_3R_133()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_226()) { jj_scanpos = xsp; break; }
+      if (jj_3R_134()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_69()
+  static private boolean jj_3R_118()
  {
-    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_63()
+  static private boolean jj_3R_35()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_69()) {
-    jj_scanpos = xsp;
-    if (jj_3R_70()) {
-    jj_scanpos = xsp;
-    if (jj_3R_71()) {
-    jj_scanpos = xsp;
-    if (jj_3R_72()) return true;
-    }
-    }
-    }
+    if (jj_3R_34()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_54()
+ {
+    if (jj_3R_57()) return true;
     return false;
   }
 
@@ -6736,7 +6923,7 @@ fl.setLHS(s);
   static private boolean jj_lookingAhead = false;
   static private boolean jj_semLA;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[121];
+  static final private int[] jj_la1 = new int[126];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -6746,13 +6933,13 @@ fl.setLHS(s);
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0xa0000000,0x0,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0xa0000000,0x0,0x0,0x0,0x0,0xa0ba0808,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0000000,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa0ba0808,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0xa0000000,0x0,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0xa0000000,0x0,0x0,0x0,0x0,0xa0ba0808,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0000000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0x0,0xc2000,0x2,0x0,0x0,0x4012783a,0x0,0x0,0x0,0x40027838,0x0,0x40000000,0x0,0x8000000,0x400000,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x10000000,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x0,0x38,0x0,0x0,0x0,0x4012783a,0x10000000,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x3800,0x0,0x0,0x0,0x4012783a,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x0,0x4000000,};
+	   jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0x0,0xc2000,0x2,0x0,0x0,0x4012783a,0x0,0x0,0x40000000,0x0,0x40000000,0x10000000,0x4012783a,0x0,0x40027838,0x0,0x40000000,0x0,0x8000000,0x400000,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x10000000,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x0,0x38,0x0,0x0,0x0,0x4012783a,0x10000000,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x3800,0x0,0x0,0x0,0x4012783a,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x0,0x4000000,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x6c00841,0x0,0x6c00841,0x6c00841,0x0,0x6c00841,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x1,0x2000000,0x0,0x1,0x2000000,0x400,0x6fc0841,0x0,0x0,0x0,0x6fc0841,0x2000000,0x1,0x0,0x2004,0x0,0x0,0x2004,0x6000000,0x0,0x203d5,0x203d5,0x0,0x0,0x203d5,0x203d5,0x6fc0841,0x3c0000,0x400003d1,0x400,0x6c00041,0x4,0x1,0x1000,0x0,0x0,0x6fc0841,0x6fc0841,0x6fc0841,0x6fc0841,0x3d1,0x20000,0x0,0x4,0x10000,0x0,0x0,0x0,0x0,0x6c00841,0x30,0x3c0,0xc00,0xc00,0x3000,0x3000,0x6c00841,0x6c00041,0x0,0x0,0x2000000,0x0,0xc00000,0x0,0x0,0x0,0x0,0x3d0,0x4,0x40000000,0x6fc0841,0x0,0x4,0x0,0x0,0x3d0,0x4,0x0,0x4,0x0,0x0,0x0,0x3d0,0x4,0x2000,0x6fc0841,0x0,0x6fc0841,0x41,0x0,0x0,0x0,0x2400000,0x1000,0x2400000,0x2000400,0x0,0xc000000,0x2000000,0x30,0x3c0,0x0,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0xd800841,0x0,0xd800841,0xd800841,0x0,0xd800841,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x1,0x4000000,0x0,0x1,0x4000000,0x400,0xdbc0841,0x0,0x0,0x0,0xdbc0841,0x4000000,0x1,0x0,0x2004,0x0,0x0,0x2004,0xc000000,0x0,0x203d5,0x203d5,0x0,0x0,0x203d5,0x203d5,0xdbc0841,0x3c0000,0x800003d1,0x0,0x800003d1,0x0,0x0,0xdbc1841,0x400,0xd800041,0x4,0x1,0x1000,0x0,0x0,0xdbc0841,0xdbc0841,0xdbc0841,0xdbc0841,0x3d1,0x20000,0x0,0x4,0x10000,0x0,0x0,0x0,0x0,0xd800841,0x30,0x3c0,0xc00,0xc00,0x3000,0x3000,0xd800841,0xd800041,0x0,0x0,0x4000000,0x0,0x1800000,0x0,0x0,0x0,0x0,0x3d0,0x4,0x80000000,0xdbc0841,0x0,0x4,0x0,0x0,0x3d0,0x4,0x0,0x4,0x0,0x0,0x0,0x3d0,0x4,0x2000,0xdbc0841,0x0,0xdbc0841,0x41,0x0,0x0,0x0,0x4800000,0x1000,0x4800000,0x4000400,0x0,0x18000000,0x4000000,0x30,0x3c0,0x0,};
 	}
   static final private JJCalls[] jj_2_rtns = new JJCalls[28];
   static private boolean jj_rescan = false;
@@ -6776,7 +6963,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 121; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6791,7 +6978,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 121; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6809,7 +6996,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 121; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6828,7 +7015,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 121; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6845,7 +7032,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 121; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6855,7 +7042,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 121; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6981,12 +7168,12 @@ fl.setLHS(s);
   /** Generate ParseException. */
   static public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[95];
+	 boolean[] la1tokens = new boolean[96];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 121; i++) {
+	 for (int i = 0; i < 126; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -7001,7 +7188,7 @@ fl.setLHS(s);
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 95; i++) {
+	 for (int i = 0; i < 96; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
diff --git a/prism/src/parser/PrismParserConstants.java b/prism/src/parser/PrismParserConstants.java
index 23335938..bb8d6189 100644
--- a/prism/src/parser/PrismParserConstants.java
+++ b/prism/src/parser/PrismParserConstants.java
@@ -181,23 +181,25 @@ public interface PrismParserConstants {
   /** RegularExpression Id. */
   int ACCBOXMINUS = 85;
   /** RegularExpression Id. */
-  int REG_INT = 86;
+  int ACCUNTIL = 86;
   /** RegularExpression Id. */
-  int REG_DOUBLE = 87;
+  int REG_INT = 87;
   /** RegularExpression Id. */
-  int REG_IDENTPRIME = 88;
+  int REG_DOUBLE = 88;
   /** RegularExpression Id. */
-  int REG_IDENT = 89;
+  int REG_IDENTPRIME = 89;
   /** RegularExpression Id. */
-  int REG_QUOTED_IDENT = 90;
+  int REG_IDENT = 90;
   /** RegularExpression Id. */
-  int REG_QUOTED_STRING = 91;
+  int REG_QUOTED_IDENT = 91;
   /** RegularExpression Id. */
-  int PREPROC = 92;
+  int REG_QUOTED_STRING = 92;
   /** RegularExpression Id. */
-  int LEXICAL_ERROR = 93;
+  int PREPROC = 93;
   /** RegularExpression Id. */
-  int REGEXP_MARKER = 94;
+  int LEXICAL_ERROR = 94;
+  /** RegularExpression Id. */
+  int REGEXP_MARKER = 95;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -290,6 +292,7 @@ public interface PrismParserConstants {
     "\"<->\"",
     "\"[+]\"",
     "\"[-]\"",
+    "\"U+\"",
     "<REG_INT>",
     "<REG_DOUBLE>",
     "<REG_IDENTPRIME>",
diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java
index 4c3041b4..ff65c274 100644
--- a/prism/src/parser/PrismParserTokenManager.java
+++ b/prism/src/parser/PrismParserTokenManager.java
@@ -25,24 +25,24 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
+         if ((active0 & 0xc783a04a00908L) != 0L || (active1 & 0x80400000L) != 0L)
+            return 31;
          if ((active0 & 0x387c5fb5ff6f0L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             return 31;
          }
-         if ((active0 & 0xc783a04a00908L) != 0L || (active1 & 0x40000000L) != 0L)
-            return 31;
          if ((active1 & 0x2000L) != 0L)
             return 1;
          if ((active0 & 0x2000000000000000L) != 0L)
             return 11;
          return -1;
       case 1:
-         if ((active0 & 0x39fddfb5ff6f0L) != 0L || (active1 & 0x40000000L) != 0L)
+         if ((active0 & 0x39fddfb5ff6f0L) != 0L || (active1 & 0x80000000L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 89;
+               jjmatchedKind = 90;
                jjmatchedPos = 1;
             }
             return 31;
@@ -51,60 +51,60 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 2:
          if ((active0 & 0x100e8000000L) != 0L)
             return 31;
-         if ((active0 & 0x39edd135ff6f0L) != 0L || (active1 & 0x40000000L) != 0L)
+         if ((active0 & 0x39edd135ff6f0L) != 0L || (active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 2;
             return 31;
          }
          return -1;
       case 3:
+         if ((active0 & 0x21ad801100490L) != 0L)
+            return 31;
          if ((active0 & 0x18405124ff260L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 89;
+               jjmatchedKind = 90;
                jjmatchedPos = 3;
             }
             return 31;
          }
-         if ((active0 & 0x21ad801100490L) != 0L)
-            return 31;
          return -1;
       case 4:
+         if ((active0 & 0x10020060L) != 0L)
+            return 31;
          if ((active0 & 0x18445024df200L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
             return 31;
          }
-         if ((active0 & 0x10020060L) != 0L)
-            return 31;
          return -1;
       case 5:
          if ((active0 & 0x1000100480200L) != 0L)
             return 31;
          if ((active0 & 0x84440205f000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 5;
             return 31;
          }
          return -1;
       case 6:
+         if ((active0 & 0x40000041000L) != 0L)
+            return 31;
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 6;
             return 31;
          }
-         if ((active0 & 0x40000041000L) != 0L)
-            return 31;
          return -1;
       case 7:
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 7;
             return 31;
          }
@@ -114,7 +114,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x80440000a000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 8;
             return 31;
          }
@@ -124,7 +124,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 9;
             return 31;
          }
@@ -132,7 +132,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 10:
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 10;
             return 31;
          }
@@ -142,7 +142,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x4400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 11;
             return 31;
          }
@@ -152,7 +152,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 12;
             return 31;
          }
@@ -160,7 +160,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 13:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 13;
             return 31;
          }
@@ -168,7 +168,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 14:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 14;
             return 31;
          }
@@ -245,11 +245,12 @@ static private int jjMoveStringLiteralDfa0_0(){
          return jjMoveStringLiteralDfa1_0(0x1800000000L, 0x0L);
       case 82:
          jjmatchedKind = 45;
-         return jjMoveStringLiteralDfa1_0(0x180000000000L, 0x40000000L);
+         return jjMoveStringLiteralDfa1_0(0x180000000000L, 0x80000000L);
       case 83:
          return jjStartNfaWithStates_0(0, 46, 31);
       case 85:
-         return jjStartNfaWithStates_0(0, 50, 31);
+         jjmatchedKind = 50;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000L);
       case 87:
          return jjStartNfaWithStates_0(0, 51, 31);
       case 88:
@@ -308,6 +309,8 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    switch(curChar)
    {
       case 43:
+         if ((active1 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 86);
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x140000L);
       case 45:
          if ((active1 & 0x8000L) != 0L)
@@ -342,7 +345,7 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
       case 100:
          return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000L, active1, 0x80000000L);
       case 105:
          return jjMoveStringLiteralDfa2_0(active0, 0x80080000L, active1, 0L);
       case 108:
@@ -399,7 +402,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
       case 100:
          return jjMoveStringLiteralDfa3_0(active0, 0x10001f000L, active1, 0L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000L);
       case 105:
          return jjMoveStringLiteralDfa3_0(active0, 0x101001000000L, active1, 0L);
       case 108:
@@ -450,8 +453,8 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
    switch(curChar)
    {
       case 58:
-         if ((active1 & 0x40000000L) != 0L)
-            return jjStopAtPos(3, 94);
+         if ((active1 & 0x80000000L) != 0L)
+            return jjStopAtPos(3, 95);
          break;
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0x40002000000L, active1, 0L);
@@ -872,14 +875,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 89)
-                        kind = 89;
+                     if (kind > 90)
+                        kind = 90;
                      { jjCheckNAdd(22); }
                   }
                   else if (curChar == 39)
                   {
-                     if (kind > 88)
-                        kind = 88;
+                     if (kind > 89)
+                        kind = 89;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                      { jjCheckNAddTwoStates(20, 21); }
@@ -887,8 +890,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 87)
-                        kind = 87;
+                     if (kind > 88)
+                        kind = 88;
                      { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
@@ -906,14 +909,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 1;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 86)
-                        kind = 86;
+                     if (kind > 87)
+                        kind = 87;
                      { jjCheckNAdd(8); }
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 86)
-                        kind = 86;
+                     if (kind > 87)
+                        kind = 87;
                   }
                   break;
                case 1:
@@ -949,20 +952,20 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 7:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAdd(8); }
                   break;
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAdd(8); }
                   break;
                case 9:
-                  if (curChar == 48 && kind > 86)
-                     kind = 86;
+                  if (curChar == 48 && kind > 87)
+                     kind = 87;
                   break;
                case 10:
                   if (curChar == 46)
@@ -971,8 +974,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 87)
-                     kind = 87;
+                  if (kind > 88)
+                     kind = 88;
                   { jjCheckNAddTwoStates(11, 12); }
                   break;
                case 13:
@@ -982,8 +985,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 87)
-                     kind = 87;
+                  if (kind > 88)
+                     kind = 88;
                   { jjCheckNAdd(14); }
                   break;
                case 15:
@@ -995,14 +998,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 17:
-                  if (curChar == 35 && kind > 92)
-                     kind = 92;
+                  if (curChar == 35 && kind > 93)
+                     kind = 93;
                   break;
                case 18:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 87)
-                     kind = 87;
+                  if (kind > 88)
+                     kind = 88;
                   { jjCheckNAddStates(0, 3); }
                   break;
                case 20:
@@ -1010,14 +1013,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
-                  if (curChar == 39 && kind > 88)
-                     kind = 88;
+                  if (curChar == 39 && kind > 89)
+                     kind = 89;
                   break;
                case 22:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 90)
+                     kind = 90;
                   { jjCheckNAdd(22); }
                   break;
                case 23:
@@ -1029,8 +1032,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjAddStates(11, 12); }
                   break;
                case 26:
-                  if (curChar == 34 && kind > 90)
-                     kind = 90;
+                  if (curChar == 34 && kind > 91)
+                     kind = 91;
                   break;
                case 28:
                   { jjCheckNAddStates(13, 15); }
@@ -1040,8 +1043,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddStates(13, 15); }
                   break;
                case 30:
-                  if (curChar == 34 && kind > 91)
-                     kind = 91;
+                  if (curChar == 34 && kind > 92)
+                     kind = 92;
                   break;
                default : break;
             }
@@ -1057,8 +1060,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 89)
-                        kind = 89;
+                     if (kind > 90)
+                        kind = 90;
                      { jjCheckNAdd(22); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
@@ -1067,8 +1070,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 90)
+                     kind = 90;
                   { jjCheckNAddStates(16, 18); }
                   break;
                case 2:
@@ -1090,8 +1093,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 22:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
+                  if (kind > 90)
+                     kind = 90;
                   { jjCheckNAdd(22); }
                   break;
                case 24:
@@ -1177,7 +1180,7 @@ public static final String[] jjstrLiteralImages = {
 "\174", "\75\76", "\74\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", 
 "\133", "\135", "\173", "\175", "\75", "\41\75", "\74", "\76", "\74\75", "\76\75", 
 "\53", "\55", "\52", "\57", "\47", "\74\55", "\77", "\136", "\74\53\76", "\74\55\76", 
-"\133\53\135", "\133\55\135", null, null, null, null, null, null, null, null, 
+"\133\53\135", "\133\55\135", "\125\53", null, null, null, null, null, null, null, null, 
 "\122\145\147\72", };
 static protected Token jjFillToken()
 {
@@ -1252,9 +1255,9 @@ public static Token getNextToken()
    jjmatchedKind = 0x7fffffff;
    jjmatchedPos = 0;
    curPos = jjMoveStringLiteralDfa0_0();
-   if (jjmatchedPos == 0 && jjmatchedKind > 93)
+   if (jjmatchedPos == 0 && jjmatchedKind > 94)
    {
-      jjmatchedKind = 93;
+      jjmatchedKind = 94;
    }
    if (jjmatchedKind != 0x7fffffff)
    {
@@ -1422,10 +1425,10 @@ public static final int[] jjnewLexState = {
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffffffff9L, 0x7fffffffL, 
+   0xfffffffffffffff9L, 0xffffffffL, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L,