From fe968fb469fd2c0520ef4a121fb64119bf287908 Mon Sep 17 00:00:00 2001
From: Sascha Wunderlich <sascha.wunderlich@tu-dresden.de>
Date: Fri, 7 Dec 2018 14:37:06 +0100
Subject: [PATCH] Parser refresh

---
 prism/src/parser/PrismParser.java | 2156 +++++++++++++++--------------
 1 file changed, 1137 insertions(+), 1019 deletions(-)

diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index 54b33052..d2556b72 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -1655,78 +1655,144 @@ Expression ExpressionTemporalBinary(boolean prop, boolean pathprop) throws Parse
         TemporalOperatorBound defaultBound = null;
         TemporalOperatorBounds bounds = null;
         Token begin = null;
+
+        //Accumulation
+        ExpressionAccumulation accexp;
+        AccumulationConstraint constr;
+        TemporalOperatorBound bound;
+        Expression reg;
+        ArrayList<Expression> fireOn;
 begin = getToken(1);
     ret = ExpressionTemporalUnary(prop, pathprop);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case R:
     case U:
-    case W:{
+    case W:
+    case ACCUNTIL:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case R:
+      case U:
+      case W:{
 if (!pathprop) {if (true) throw generateParseException();}
 exprTemp = new ExpressionTemporal(); exprTemp.setOperand1(ret);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case U:{
-        jj_consume_token(U);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case U:{
+          jj_consume_token(U);
 exprTemp.setOperator(ExpressionTemporal.P_U);
-        break;
-        }
-      case W:{
-        jj_consume_token(W);
+          break;
+          }
+        case W:{
+          jj_consume_token(W);
 exprTemp.setOperator(ExpressionTemporal.P_W);
-        break;
-        }
-      case R:{
-        jj_consume_token(R);
+          break;
+          }
+        case R:{
+          jj_consume_token(R);
 exprTemp.setOperator(ExpressionTemporal.P_R);
-        break;
+          break;
+          }
+        default:
+          jj_la1[38] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[38] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LBRACKET:
-      case LBRACE:
-      case EQ:
-      case LT:
-      case GT:
-      case LE:
-      case GE:
-      case CARET:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case LBRACKET:
+        case LBRACE:
         case EQ:
         case LT:
         case GT:
         case LE:
-        case GE:{
-          defaultBound = BoundExpression();
+        case GE:
+        case CARET:{
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case LBRACKET:
+          case EQ:
+          case LT:
+          case GT:
+          case LE:
+          case GE:{
+            defaultBound = BoundExpression();
 exprTemp.getBounds().setDefaultBound(defaultBound);
+            break;
+            }
+          case LBRACE:
+          case CARET:{
+            bounds = TemporalOpBounds();
+exprTemp.setBounds(bounds);
+            break;
+            }
+          default:
+            jj_la1[39] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
           break;
           }
-        case LBRACE:
-        case CARET:{
-          bounds = TemporalOpBounds();
-exprTemp.setBounds(bounds);
+        default:
+          jj_la1[40] = jj_gen;
+          ;
+        }
+        expr = ExpressionTemporalUnary(prop, pathprop);
+exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = exprTemp;
+        break;
+        }
+      case ACCUNTIL:{
+        jj_consume_token(ACCUNTIL);
+accexp = new ExpressionAccumulation(AccumulationSymbol.ACCUNTIL); accexp.setOperand1(ret);
+        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);
+accexp.setRegularExpression((ExpressionRegular)reg);
+          break;
+          }
+        case LBRACKET:
+        case EQ:
+        case LT:
+        case GT:
+        case LE:
+        case GE:{
+          bound = BoundExpression();
+accexp.setBoundExpression(bound);
           break;
           }
         default:
-          jj_la1[39] = jj_gen;
+          jj_la1[41] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
+        jj_consume_token(RPARENTH);
+        jj_consume_token(LPARENTH);
+        constr = ExpressionAccumulationConstraint();
+accexp.setConstraint(constr);
+        jj_consume_token(RPARENTH);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LPARENTH:{
+          jj_consume_token(LPARENTH);
+          fireOn = ExpressionAccumulationFire();
+accexp.setFireOn(fireOn);
+          jj_consume_token(RPARENTH);
+          break;
+          }
+        default:
+          jj_la1[42] = jj_gen;
+          ;
+        }
+        ret = ExpressionTemporalUnary(prop, pathprop);
+accexp.setOperand2(ret); ret = accexp;
         break;
         }
       default:
-        jj_la1[40] = jj_gen;
-        ;
+        jj_la1[43] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      expr = ExpressionTemporalUnary(prop, pathprop);
-exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = exprTemp;
       break;
       }
     default:
-      jj_la1[41] = jj_gen;
+      jj_la1[44] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -1761,7 +1827,7 @@ exprTemp.setOperator(ExpressionTemporal.P_G);
         break;
         }
       default:
-        jj_la1[42] = jj_gen;
+        jj_la1[45] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1792,14 +1858,14 @@ exprTemp.setBounds(bounds);
           break;
           }
         default:
-          jj_la1[43] = jj_gen;
+          jj_la1[46] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[44] = jj_gen;
+        jj_la1[47] = jj_gen;
         ;
       }
       expr = ExpressionTemporalUnary(prop, pathprop);
@@ -1841,7 +1907,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
       break;
       }
     default:
-      jj_la1[45] = jj_gen;
+      jj_la1[48] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1878,7 +1944,7 @@ ret = new ExpressionAccumulation(AccumulationSymbol.ACCBOXMINUS);
       break;
       }
     default:
-      jj_la1[46] = jj_gen;
+      jj_la1[49] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1901,7 +1967,7 @@ ret.setBoundExpression(bound);
       break;
       }
     default:
-      jj_la1[47] = jj_gen;
+      jj_la1[50] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1919,7 +1985,7 @@ ret.setFireOn(fireOn);
       break;
       }
     default:
-      jj_la1[48] = jj_gen;
+      jj_la1[51] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -1959,7 +2025,7 @@ ret.setBoundExpression(bound);
       break;
       }
     default:
-      jj_la1[49] = jj_gen;
+      jj_la1[52] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1977,7 +2043,7 @@ ret.setFireOn(fireOn);
       break;
       }
     default:
-      jj_la1[50] = jj_gen;
+      jj_la1[53] = jj_gen;
       ;
     }
     jj_consume_token(LPARENTH);
@@ -2037,7 +2103,7 @@ ret.add(s);
           break;
           }
         default:
-          jj_la1[51] = jj_gen;
+          jj_la1[54] = jj_gen;
           break label_18;
         }
         jj_consume_token(COMMA);
@@ -2048,7 +2114,7 @@ ret.add(s);
       break;
       }
     default:
-      jj_la1[52] = jj_gen;
+      jj_la1[55] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2077,7 +2143,7 @@ factors.add(factor);
         break;
         }
       default:
-        jj_la1[53] = jj_gen;
+        jj_la1[56] = jj_gen;
         break label_19;
       }
       jj_consume_token(PLUS);
@@ -2129,7 +2195,7 @@ factors.add(factor);
         break;
         }
       default:
-        jj_la1[54] = jj_gen;
+        jj_la1[57] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2173,7 +2239,7 @@ func = AccumulationFunction.ACC_STEPS;
         break;
         }
       default:
-        jj_la1[55] = jj_gen;
+        jj_la1[58] = jj_gen;
         ;
       }
 func = AccumulationFunction.ACC_REWARD;
@@ -2209,7 +2275,7 @@ expr = new ExpressionRegular(ExpressionRegular.P_O, expr, null);
       break;
       }
     default:
-      jj_la1[56] = jj_gen;
+      jj_la1[59] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2220,7 +2286,7 @@ expr = new ExpressionRegular(ExpressionRegular.P_K, expr, null);
       break;
       }
     default:
-      jj_la1[57] = jj_gen;
+      jj_la1[60] = jj_gen;
       ;
     }
 {if ("" != null) return expr;}
@@ -2238,7 +2304,7 @@ ret = new ExpressionRegular(ExpressionRegular.P_C, left,right);
       break;
       }
     default:
-      jj_la1[58] = jj_gen;
+      jj_la1[61] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2256,7 +2322,7 @@ ret = new ExpressionRegular(ExpressionRegular.P_O, left,right);
       break;
       }
     default:
-      jj_la1[59] = jj_gen;
+      jj_la1[62] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2310,7 +2376,7 @@ TemporalOperatorBound BoundExpression() throws ParseException {Expression lBound
           break;
           }
         default:
-          jj_la1[60] = jj_gen;
+          jj_la1[63] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2359,7 +2425,7 @@ bound.setUpperBound(uBound, false);
           break;
           }
         default:
-          jj_la1[61] = jj_gen;
+          jj_la1[64] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2408,7 +2474,7 @@ bound.setUpperBound(uBound, true);
           break;
           }
         default:
-          jj_la1[62] = jj_gen;
+          jj_la1[65] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2457,7 +2523,7 @@ bound.setLowerBound(lBound, false);
           break;
           }
         default:
-          jj_la1[63] = jj_gen;
+          jj_la1[66] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2481,7 +2547,7 @@ bound.setEqualBounds(lBound);
       break;
       }
     default:
-      jj_la1[64] = jj_gen;
+      jj_la1[67] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2497,7 +2563,7 @@ bound.setEqualBounds(lBound);
       break;
       }
     default:
-      jj_la1[65] = jj_gen;
+      jj_la1[68] = jj_gen;
       ;
     }
     jj_consume_token(LBRACE);
@@ -2511,7 +2577,7 @@ bounds.addBound(bound);
         break;
         }
       default:
-        jj_la1[66] = jj_gen;
+        jj_la1[69] = jj_gen;
         break label_20;
       }
       jj_consume_token(COMMA);
@@ -2559,7 +2625,7 @@ bound.setBoundType(TemporalOperatorBound.BoundType.STEP_BOUND);
         break;
         }
       default:
-        jj_la1[67] = jj_gen;
+        jj_la1[70] = jj_gen;
         ;
       }
       bound = BoundExpression();
@@ -2589,7 +2655,7 @@ ret = new ExpressionITE(ret, left, right); ret.setPosition(begin, getToken(0));
       break;
       }
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[71] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2610,7 +2676,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[69] = jj_gen;
+        jj_la1[72] = jj_gen;
         break label_21;
       }
       jj_consume_token(IMPLIES);
@@ -2635,7 +2701,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[70] = jj_gen;
+        jj_la1[73] = jj_gen;
         break label_22;
       }
       jj_consume_token(IFF);
@@ -2660,7 +2726,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[71] = jj_gen;
+        jj_la1[74] = jj_gen;
         break label_23;
       }
       jj_consume_token(OR);
@@ -2685,7 +2751,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[72] = jj_gen;
+        jj_la1[75] = jj_gen;
         break label_24;
       }
       jj_consume_token(AND);
@@ -2734,7 +2800,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin,
       break;
       }
     default:
-      jj_la1[73] = jj_gen;
+      jj_la1[76] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2758,7 +2824,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[74] = jj_gen;
+        jj_la1[77] = jj_gen;
         break label_25;
       }
       op = EqNeq();
@@ -2787,7 +2853,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[75] = jj_gen;
+        jj_la1[78] = jj_gen;
         break label_26;
       }
       op = LtGt();
@@ -2821,7 +2887,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[76] = jj_gen;
+        jj_la1[79] = jj_gen;
         break label_27;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2836,7 +2902,7 @@ op = ExpressionBinaryOp.MINUS;
         break;
         }
       default:
-        jj_la1[77] = jj_gen;
+        jj_la1[80] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2863,7 +2929,7 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[78] = jj_gen;
+        jj_la1[81] = jj_gen;
         break label_28;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2878,7 +2944,7 @@ op = ExpressionBinaryOp.DIVIDE;
         break;
         }
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[82] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2926,7 +2992,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begi
       break;
       }
     default:
-      jj_la1[80] = jj_gen;
+      jj_la1[83] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3001,7 +3067,7 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException
       break;
       }
     default:
-      jj_la1[81] = jj_gen;
+      jj_la1[84] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3033,7 +3099,7 @@ ret = new ExpressionFunc(s);
       break;
       }
     default:
-      jj_la1[82] = jj_gen;
+      jj_la1[85] = jj_gen;
       ;
     }
 ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
@@ -3057,7 +3123,7 @@ s = "max";
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[86] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3092,7 +3158,7 @@ s = "max";
       break;
       }
     default:
-      jj_la1[84] = jj_gen;
+      jj_la1[87] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3117,7 +3183,7 @@ func.addOperand(expr);
         break;
         }
       default:
-        jj_la1[85] = jj_gen;
+        jj_la1[88] = jj_gen;
         break label_29;
       }
       jj_consume_token(COMMA);
@@ -3169,7 +3235,7 @@ ret = new ExpressionLiteral(TypeBool.getInstance(), false);
       break;
       }
     default:
-      jj_la1[86] = jj_gen;
+      jj_la1[89] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3216,7 +3282,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[87] = jj_gen;
+        jj_la1[90] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3234,14 +3300,14 @@ minMax = MinMax.max();
           break;
           }
         default:
-          jj_la1[88] = jj_gen;
+          jj_la1[91] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[89] = jj_gen;
+        jj_la1[92] = jj_gen;
         ;
       }
       break;
@@ -3257,7 +3323,7 @@ minMax = MinMax.max();
       break;
       }
     default:
-      jj_la1[90] = jj_gen;
+      jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3278,7 +3344,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[91] = jj_gen;
+      jj_la1[94] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3291,7 +3357,7 @@ relOp = "="; isBool = false;
         break;
         }
       default:
-        jj_la1[92] = jj_gen;
+        jj_la1[95] = jj_gen;
         ;
       }
     } else {
@@ -3302,7 +3368,7 @@ relOp = "="; isBool = false;
         break;
         }
       default:
-        jj_la1[93] = jj_gen;
+        jj_la1[96] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3411,7 +3477,7 @@ result = Expression.Not(result);
         break;
         }
       default:
-        jj_la1[94] = jj_gen;
+        jj_la1[97] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3435,7 +3501,7 @@ result = new ExpressionHOA(hoaAutomatonFile);
         break;
         }
       default:
-        jj_la1[95] = jj_gen;
+        jj_la1[98] = jj_gen;
         break label_30;
       }
       jj_consume_token(COMMA);
@@ -3465,7 +3531,7 @@ filter = new Filter(expr);
         break;
         }
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[99] = jj_gen;
         break label_31;
       }
       jj_consume_token(LBRACE);
@@ -3481,7 +3547,7 @@ filter.setMaxRequested(true);
         break;
         }
       default:
-        jj_la1[97] = jj_gen;
+        jj_la1[100] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3519,7 +3585,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[98] = jj_gen;
+        jj_la1[101] = jj_gen;
         ;
       }
       r = LtGt();
@@ -3534,7 +3600,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[102] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3546,7 +3612,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[103] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3592,7 +3658,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[101] = jj_gen;
+        jj_la1[104] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3601,7 +3667,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[102] = jj_gen;
+        jj_la1[105] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3619,14 +3685,14 @@ minMax = MinMax.max();
           break;
           }
         default:
-          jj_la1[103] = jj_gen;
+          jj_la1[106] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[104] = jj_gen;
+        jj_la1[107] = jj_gen;
         ;
       }
       break;
@@ -3642,7 +3708,7 @@ minMax = MinMax.max();
       break;
       }
     default:
-      jj_la1[105] = jj_gen;
+      jj_la1[108] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3663,7 +3729,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3675,7 +3741,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[110] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3710,7 +3776,7 @@ void RewardSpecification(ExpressionReward exprRew) throws ParseException {Object
       break;
       }
     default:
-      jj_la1[108] = jj_gen;
+      jj_la1[111] = jj_gen;
       ;
     }
 exprRew.setRewardStructIndex(index);
@@ -3760,7 +3826,7 @@ exprRew.setRewardStructIndex(index);
         break;
         }
       default:
-        jj_la1[109] = jj_gen;
+        jj_la1[112] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3793,7 +3859,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
         break;
         }
       default:
-        jj_la1[110] = jj_gen;
+        jj_la1[113] = jj_gen;
         if (jj_2_28(2147483647)) {
           begin = jj_consume_token(C);
           jj_consume_token(LE);
@@ -3849,7 +3915,7 @@ ret = expr;
             break;
             }
           default:
-            jj_la1[111] = jj_gen;
+            jj_la1[114] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3918,7 +3984,7 @@ ret = new ExpressionStrategy(false);
       break;
       }
     default:
-      jj_la1[112] = jj_gen;
+      jj_la1[115] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3943,7 +4009,7 @@ ret = new ExpressionStrategy(false);
         break;
         }
       default:
-        jj_la1[113] = jj_gen;
+        jj_la1[116] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3956,7 +4022,7 @@ ret.addOperand(expr);
       break;
       }
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[117] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3976,7 +4042,7 @@ exprStrat.setCoalitionAllPlayers();
       break;
       }
     default:
-      jj_la1[117] = jj_gen;
+      jj_la1[120] = jj_gen;
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case REG_INT:
       case REG_IDENT:{
@@ -3990,7 +4056,7 @@ coalition.add(s);
             break;
             }
           default:
-            jj_la1[115] = jj_gen;
+            jj_la1[118] = jj_gen;
             break label_32;
           }
           jj_consume_token(COMMA);
@@ -4000,7 +4066,7 @@ coalition.add(s);
         break;
         }
       default:
-        jj_la1[116] = jj_gen;
+        jj_la1[119] = jj_gen;
         ;
       }
 exprStrat.setCoalition(coalition);
@@ -4020,7 +4086,7 @@ String ExpressionStrategyCoalitionPlayer() throws ParseException {String s;
       break;
       }
     default:
-      jj_la1[118] = jj_gen;
+      jj_la1[121] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4083,7 +4149,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[119] = jj_gen;
+      jj_la1[122] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4096,7 +4162,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[120] = jj_gen;
+      jj_la1[123] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
@@ -4160,7 +4226,7 @@ s = getToken(0).image;
       break;
       }
     default:
-      jj_la1[121] = jj_gen;
+      jj_la1[124] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4192,7 +4258,7 @@ ident="max";
       break;
       }
     default:
-      jj_la1[122] = jj_gen;
+      jj_la1[125] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4229,7 +4295,7 @@ int EqNeq() throws ParseException {
       break;
       }
     default:
-      jj_la1[123] = jj_gen;
+      jj_la1[126] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4261,7 +4327,7 @@ int LtGt() throws ParseException {
       break;
       }
     default:
-      jj_la1[124] = jj_gen;
+      jj_la1[127] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4287,7 +4353,7 @@ begin = getToken(1);
       break;
       }
     default:
-      jj_la1[125] = jj_gen;
+      jj_la1[128] = jj_gen;
       ;
     }
     jj_consume_token(0);
@@ -4524,81 +4590,80 @@ fl.setLHS(s);
     finally { jj_save(27, xla); }
   }
 
-  static private boolean jj_3R_49()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_121()
+  static private boolean jj_3_21()
  {
-    if (jj_scan_token(IMPLIES)) return true;
-    if (jj_3R_120()) 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_46()) return true;
+    if (jj_3R_33()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_163()) jj_scanpos = xsp;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3_25()
+  static private boolean jj_3_20()
  {
     jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT
-                         && getToken(2).kind==COLON;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps");
     jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_50()) return true;
-    if (jj_3R_43()) return true;
+    if (!jj_semLA || jj_3R_45()) return true;
+    if (jj_3R_33()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_228()
+  static private boolean jj_3_19()
  {
-    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_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_106()
+  static private boolean jj_3R_143()
  {
-    if (jj_3R_120()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_121()) { 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_48()
+  static private boolean jj_3R_233()
  {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_43()
+  static private boolean jj_3R_232()
  {
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_107()
+  static private boolean jj_3R_237()
  {
-    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;
+    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_3_24()
+  static private boolean jj_3R_229()
  {
-    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;
+    if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
@@ -4608,277 +4673,36 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_4()
+  static private boolean jj_3R_227()
  {
-    if (jj_scan_token(LABEL)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3_23()
+  static private boolean jj_3_18()
  {
-    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;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_95()
- {
-    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_35()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_34()
- {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_255()
- {
-    if (jj_scan_token(MAX)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_237()
- {
-    if (jj_3R_66()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_227()
- {
-    if (jj_scan_token(AND)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_225()
- {
-    if (jj_scan_token(MAX)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_46()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_45()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_44()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_155()
- {
-    if (jj_3R_161()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_33()
- {
-    if (jj_scan_token(REG_IDENT)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_101()
- {
-    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_100()
- {
-    if (jj_3R_34()) return true;
-    return false;
-  }
-
-  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_155()) jj_scanpos = xsp;
-    if (jj_3R_116()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_20()
- {
-    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_90()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_33()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_99()
- {
-    if (jj_3R_33()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_19()
- {
-    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_88()
- {
-    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_131()
- {
-    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;
-    }
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_230()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_57()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_229()
- {
-    if (jj_3R_33()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_119()
- {
-    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_235()
- {
-    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_226()
- {
-    if (jj_scan_token(PLUS)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_9()
- {
-    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_224()
- {
-    if (jj_scan_token(MIN)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_18()
+  static private boolean jj_3_17()
  {
     if (jj_3R_43()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_17()
+  static private boolean jj_3R_144()
  {
-    if (jj_3R_43()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_143()) return true;
     return false;
   }
 
-  static private boolean jj_3R_132()
+  static private boolean jj_3_4()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_131()) return true;
+    if (jj_scan_token(LABEL)) return true;
     return false;
   }
 
@@ -4896,45 +4720,45 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_212()
+  static private boolean jj_3R_215()
  {
     if (jj_scan_token(REGEXP_MARKER)) return true;
-    if (jj_3R_152()) return true;
+    if (jj_3R_147()) return true;
     return false;
   }
 
-  static private boolean jj_3R_117()
+  static private boolean jj_3R_127()
  {
     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;
+    if (jj_3R_143()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_132()) { jj_scanpos = xsp; break; }
+      if (jj_3R_144()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_193()
+  static private boolean jj_3R_195()
  {
     if (jj_scan_token(FILTER)) return true;
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_224()) {
+    if (jj_3R_227()) {
     jj_scanpos = xsp;
-    if (jj_3R_225()) {
+    if (jj_3R_228()) {
     jj_scanpos = xsp;
-    if (jj_3R_226()) {
+    if (jj_3R_229()) {
     jj_scanpos = xsp;
-    if (jj_3R_227()) {
+    if (jj_3R_230()) {
     jj_scanpos = xsp;
-    if (jj_3R_228()) {
+    if (jj_3R_231()) {
     jj_scanpos = xsp;
-    if (jj_3R_229()) return true;
+    if (jj_3R_232()) return true;
     }
     }
     }
@@ -4943,155 +4767,121 @@ fl.setLHS(s);
     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_3R_233()) jj_scanpos = xsp;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
+  static private boolean jj_3_3()
+ {
+    if (jj_scan_token(LABEL)) return true;
+    if (jj_3R_35()) return true;
+    return false;
+  }
+
   static private boolean jj_3_22()
  {
     if (jj_3R_47()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_237()) jj_scanpos = xsp;
+    if (jj_3R_239()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_211()
+  static private boolean jj_3R_214()
  {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  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_103()
- {
-    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_210()
+  static private boolean jj_3R_213()
  {
     if (jj_3R_64()) return true;
     if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_148()
+  static private boolean jj_3R_154()
  {
     if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_254()
+  static private boolean jj_3R_255()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_236()
+  static private boolean jj_3R_238()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_254()) {
+    if (jj_3R_255()) {
     jj_scanpos = xsp;
-    if (jj_3R_255()) return true;
+    if (jj_3R_256()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_146()
+  static private boolean jj_3R_152()
  {
     if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_209()
+  static private boolean jj_3R_212()
  {
     if (jj_scan_token(PMAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_144()
+  static private boolean jj_3R_150()
  {
     if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_208()
+  static private boolean jj_3R_211()
  {
     if (jj_scan_token(PMIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_142()
+  static private boolean jj_3R_148()
  {
     if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_207()
+  static private boolean jj_3R_210()
  {
     if (jj_scan_token(P)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_235()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_236()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_89()
- {
-    Token xsp;
+    if (jj_3R_237()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_102()) {
-    jj_scanpos = xsp;
-    if (jj_3R_103()) return true;
-    }
+    if (jj_3R_238()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_102()
+  static private boolean jj_3R_138()
  {
-    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;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_130()
+  static private boolean jj_3R_105()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_57()) 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_129()
+  static private boolean jj_3R_137()
  {
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_57()) return true;
@@ -5101,113 +4891,114 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_128()
+  static private boolean jj_3R_136()
  {
     if (jj_scan_token(GT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_148()) {
+    if (jj_3R_154()) {
     jj_scanpos = xsp;
-    if (jj_3R_149()) return true;
+    if (jj_3R_155()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_77()
+  static private boolean jj_3R_104()
  {
-    if (jj_3R_88()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_89()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_127()
+  static private boolean jj_3R_135()
  {
     if (jj_scan_token(GE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_146()) {
+    if (jj_3R_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_147()) return true;
+    if (jj_3R_153()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_187()
+  static private boolean jj_3R_189()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_207()) {
+    if (jj_3R_210()) {
     jj_scanpos = xsp;
-    if (jj_3R_208()) {
+    if (jj_3R_211()) {
     jj_scanpos = xsp;
-    if (jj_3R_209()) return true;
+    if (jj_3R_212()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_210()) {
+    if (jj_3R_213()) {
     jj_scanpos = xsp;
-    if (jj_3R_211()) return true;
+    if (jj_3R_214()) 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_3R_215()) return true;
     }
     if (jj_scan_token(RBRACKET)) 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_126()
+  static private boolean jj_3R_134()
  {
     if (jj_scan_token(LT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_144()) {
+    if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_145()) return true;
+    if (jj_3R_151()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_125()
+  static private boolean jj_3R_133()
  {
     if (jj_scan_token(LE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_142()) {
+    if (jj_3R_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_143()) return true;
+    if (jj_3R_149()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_116()
+  static private boolean jj_3R_88()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_33()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_103()
+ {
+    if (jj_3R_33()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_122()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_125()) {
+    if (jj_3R_133()) {
     jj_scanpos = xsp;
-    if (jj_3R_126()) {
+    if (jj_3R_134()) {
     jj_scanpos = xsp;
-    if (jj_3R_127()) {
+    if (jj_3R_135()) {
     jj_scanpos = xsp;
-    if (jj_3R_128()) {
+    if (jj_3R_136()) {
     jj_scanpos = xsp;
-    if (jj_3R_129()) {
+    if (jj_3R_137()) {
     jj_scanpos = xsp;
-    if (jj_3R_130()) return true;
+    if (jj_3R_138()) return true;
     }
     }
     }
@@ -5216,54 +5007,63 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_192()
+  static private boolean jj_3R_194()
  {
     if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_249()
+  static private boolean jj_3R_86()
  {
-    if (jj_3R_188()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_103()) {
+    jj_scanpos = xsp;
+    if (jj_3R_104()) {
+    jj_scanpos = xsp;
+    if (jj_3R_105()) return true;
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_62()
+  static private boolean jj_3R_251()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_190()) return true;
     return false;
   }
 
-  static private boolean jj_3R_234()
+  static private boolean jj_3R_126()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_57()) 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_206()
+  static private boolean jj_3R_236()
  {
-    if (jj_3R_33()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3_10()
+  static private boolean jj_3_9()
  {
     if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3_2()
+  static private boolean jj_3R_209()
  {
-    if (jj_3R_34()) return true;
-    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_274()
+  static private boolean jj_3R_275()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -5274,39 +5074,47 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_159()
+  static private boolean jj_3R_161()
  {
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_152()) return true;
+    if (jj_3R_147()) return true;
     return false;
   }
 
-  static private boolean jj_3R_152()
+  static private boolean jj_3R_147()
  {
-    if (jj_3R_158()) return true;
+    if (jj_3R_160()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_159()) jj_scanpos = xsp;
+    if (jj_3R_161()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_78()
+  static private boolean jj_3R_69()
  {
     if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) 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_107()
+ {
+    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_90()) { jj_scanpos = xsp; break; }
+      if (jj_3R_126()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(RBRACKET)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_77()) return true;
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_186()
+  static private boolean jj_3R_188()
  {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_57()) return true;
@@ -5314,189 +5122,259 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_275()
+  static private boolean jj_3R_276()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_274()) return true;
+    if (jj_3R_275()) return true;
     return false;
   }
 
-  static private boolean jj_3R_68()
+  static private boolean jj_3R_268()
+ {
+    if (jj_3R_275()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_276()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_261()
  {
-    if (jj_3R_77()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_78()) jj_scanpos = xsp;
+    if (jj_3R_268()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_267()
+  static private boolean jj_3R_87()
  {
-    if (jj_3R_274()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_275()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_106()) {
+    jj_scanpos = xsp;
+    if (jj_3R_107()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_260()
+  static private boolean jj_3R_106()
  {
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_33()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_267()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_125()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_259()
+  static private boolean jj_3R_260()
  {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_247()
+  static private boolean jj_3R_249()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_259()) {
+    if (jj_3R_260()) {
     jj_scanpos = xsp;
-    if (jj_3R_260()) return true;
+    if (jj_3R_261()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_164()
+  static private boolean jj_3R_166()
  {
     if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_3R_158()) return true;
+    if (jj_3R_160()) return true;
     return false;
   }
 
-  static private boolean jj_3R_205()
+  static private boolean jj_3R_77()
+ {
+    if (jj_3R_86()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_87()) { jj_scanpos = xsp; break; }
+    }
+    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_208()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_199()
+  static private boolean jj_3R_202()
  {
     if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_198()
+  static private boolean jj_3R_201()
  {
     if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_158()
+  static private boolean jj_3R_160()
  {
-    if (jj_3R_122()) return true;
+    if (jj_3R_121()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_164()) jj_scanpos = xsp;
+    if (jj_3R_166()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_223()
+  static private boolean jj_3R_62()
  {
-    if (jj_3R_186()) 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_248()
+  static private boolean jj_3R_226()
  {
-    if (jj_3R_187()) return true;
+    if (jj_3R_188()) return true;
     return false;
   }
 
-  static private boolean jj_3R_137()
+  static private boolean jj_3_10()
+ {
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_250()
+ {
+    if (jj_3R_189()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_132()
  {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_222()
+  static private boolean jj_3R_225()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_248()) {
+    if (jj_3R_250()) {
     jj_scanpos = xsp;
-    if (jj_3R_249()) return true;
+    if (jj_3R_251()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_197()
+  static private boolean jj_3R_200()
  {
     if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_61()
+  static private boolean jj_3_2()
  {
-    if (jj_3R_68()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_69()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_34()) return true;
+    if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  static private boolean jj_3R_221()
+  static private boolean jj_3R_224()
  {
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_247()) return true;
+    if (jj_3R_249()) return true;
     if (jj_scan_token(RBRACKET)) return true;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_220()
+  static private boolean jj_3R_223()
  {
     if (jj_scan_token(LT)) return true;
     if (jj_scan_token(LT)) return true;
-    if (jj_3R_247()) return true;
+    if (jj_3R_249()) return true;
     if (jj_scan_token(GT)) return true;
     if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_136()
+  static private boolean jj_3R_131()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_152()) return true;
+    if (jj_3R_147()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_191()
+  static private boolean jj_3R_78()
+ {
+    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_88()) { 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_3R_193()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_220()) {
+    if (jj_3R_223()) {
     jj_scanpos = xsp;
-    if (jj_3R_221()) return true;
+    if (jj_3R_224()) return true;
     }
     xsp = jj_scanpos;
-    if (jj_3R_222()) {
+    if (jj_3R_225()) {
     jj_scanpos = xsp;
-    if (jj_3R_223()) return true;
+    if (jj_3R_226()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_204()
+  static private boolean jj_3R_207()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_135()
+  static private boolean jj_3R_68()
+ {
+    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_130()
  {
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_57()) return true;
@@ -5504,49 +5382,49 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_196()
+  static private boolean jj_3R_199()
  {
     if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_182()
+  static private boolean jj_3R_184()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_196()) {
+    if (jj_3R_199()) {
     jj_scanpos = xsp;
-    if (jj_3R_197()) {
+    if (jj_3R_200()) {
     jj_scanpos = xsp;
-    if (jj_3R_198()) {
+    if (jj_3R_201()) {
     jj_scanpos = xsp;
-    if (jj_3R_199()) return true;
+    if (jj_3R_202()) return true;
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_122()
+  static private boolean jj_3R_121()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_135()) {
+    if (jj_3R_130()) {
     jj_scanpos = xsp;
-    if (jj_3R_136()) return true;
+    if (jj_3R_131()) return true;
     }
     xsp = jj_scanpos;
-    if (jj_3R_137()) jj_scanpos = xsp;
+    if (jj_3R_132()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_202()
+  static private boolean jj_3R_205()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_179()
+  static private boolean jj_3R_197()
  {
     if (jj_3R_57()) return true;
     return false;
@@ -5557,20 +5435,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_181()
- {
-    if (jj_3R_161()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_53()
+  static private boolean jj_3R_183()
  {
-    if (jj_3R_61()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_62()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_180()) return true;
     return false;
   }
 
@@ -5579,13 +5446,13 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_203()
+  static private boolean jj_3R_206()
  {
     if (jj_3R_57()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_234()) { jj_scanpos = xsp; break; }
+      if (jj_3R_236()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -5595,7 +5462,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_190()
+  static private boolean jj_3R_192()
  {
     if (jj_scan_token(A)) return true;
     if (jj_scan_token(LBRACKET)) return true;
@@ -5613,7 +5480,18 @@ fl.setLHS(s);
     if (jj_3R_33()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_181()) jj_scanpos = xsp;
+    if (jj_3R_183()) jj_scanpos = xsp;
+    return false;
+  }
+
+  static private boolean jj_3R_61()
+ {
+    if (jj_3R_68()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_69()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -5627,31 +5505,25 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_185()
+  static private boolean jj_3R_187()
  {
     if (jj_scan_token(FUNC)) return true;
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_204()) {
+    if (jj_3R_207()) {
     jj_scanpos = xsp;
-    if (jj_3R_205()) {
+    if (jj_3R_208()) {
     jj_scanpos = xsp;
-    if (jj_3R_206()) return true;
+    if (jj_3R_209()) return true;
     }
     }
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_203()) return true;
+    if (jj_3R_206()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_37()
- {
-    if (jj_3R_53()) return true;
-    return false;
-  }
-
   static private boolean jj_3_12()
  {
     jj_lookingAhead = true;
@@ -5676,19 +5548,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_7()
- {
-    if (jj_3R_34()) return true;
-    if (jj_3R_37()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_38()
  {
     return false;
   }
 
-  static private boolean jj_3R_189()
+  static private boolean jj_3R_191()
  {
     if (jj_scan_token(E)) return true;
     if (jj_scan_token(LBRACKET)) return true;
@@ -5697,42 +5562,34 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_201()
+  static private boolean jj_3R_204()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_153()
+  static private boolean jj_3R_156()
  {
-    if (jj_3R_160()) return true;
+    if (jj_3R_162()) return true;
     if (jj_scan_token(TIMES)) return true;
     if (jj_3R_39()) return true;
     return false;
   }
 
-  static private boolean jj_3R_184()
+  static private boolean jj_3R_186()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_201()) {
+    if (jj_3R_204()) {
     jj_scanpos = xsp;
-    if (jj_3R_202()) return true;
+    if (jj_3R_205()) return true;
     }
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_203()) return true;
+    if (jj_3R_206()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  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_3_28()
  {
     if (jj_scan_token(C)) return true;
@@ -5751,18 +5608,29 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_138()
+  static private boolean jj_3R_53()
+ {
+    if (jj_3R_61()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_62()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_139()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_11()) {
     jj_scanpos = xsp;
-    if (jj_3R_153()) return true;
+    if (jj_3R_156()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_246()
+  static private boolean jj_3R_248()
  {
     if (jj_3R_57()) return true;
     return false;
@@ -5774,7 +5642,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_245()
+  static private boolean jj_3R_247()
  {
     if (jj_scan_token(I)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -5782,28 +5650,28 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_200()
+  static private boolean jj_3R_203()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_203()) return true;
+    if (jj_3R_206()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_244()
+  static private boolean jj_3R_246()
  {
     if (jj_scan_token(C)) return true;
     return false;
   }
 
-  static private boolean jj_3R_139()
+  static private boolean jj_3R_140()
  {
     if (jj_scan_token(PLUS)) return true;
-    if (jj_3R_138()) return true;
+    if (jj_3R_139()) return true;
     return false;
   }
 
-  static private boolean jj_3R_243()
+  static private boolean jj_3R_245()
  {
     if (jj_scan_token(C)) return true;
     if (jj_scan_token(LE)) return true;
@@ -5811,30 +5679,30 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_183()
+  static private boolean jj_3R_185()
  {
     if (jj_3R_33()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_200()) jj_scanpos = xsp;
+    if (jj_3R_203()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_242()
+  static private boolean jj_3R_244()
  {
     if (jj_scan_token(S)) return true;
     return false;
   }
 
-  static private boolean jj_3R_241()
+  static private boolean jj_3R_243()
  {
     if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3_6()
+  static private boolean jj_3R_37()
  {
-    if (jj_3R_34()) return true;
+    if (jj_3R_53()) return true;
     return false;
   }
 
@@ -5844,21 +5712,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_218()
+  static private boolean jj_3R_221()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_241()) {
-    jj_scanpos = xsp;
-    if (jj_3R_242()) {
-    jj_scanpos = xsp;
     if (jj_3R_243()) {
     jj_scanpos = xsp;
     if (jj_3R_244()) {
     jj_scanpos = xsp;
     if (jj_3R_245()) {
     jj_scanpos = xsp;
-    if (jj_3R_246()) return true;
+    if (jj_3R_246()) {
+    jj_scanpos = xsp;
+    if (jj_3R_247()) {
+    jj_scanpos = xsp;
+    if (jj_3R_248()) return true;
     }
     }
     }
@@ -5869,128 +5737,143 @@ fl.setLHS(s);
 
   static private boolean jj_3R_123()
  {
-    if (jj_3R_138()) return true;
+    if (jj_3R_139()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_139()) { jj_scanpos = xsp; break; }
+      if (jj_3R_140()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_177()
+  static private boolean jj_3_7()
  {
-    if (jj_3R_193()) return true;
+    if (jj_3R_34()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_219()
+  static private boolean jj_3R_179()
+ {
+    if (jj_3R_195()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_222()
  {
     if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_178()
+  static private boolean jj_3R_196()
  {
     if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_176()
+  static private boolean jj_3R_178()
  {
-    if (jj_3R_192()) return true;
+    if (jj_3R_194()) return true;
     return false;
   }
 
-  static private boolean jj_3R_175()
+  static private boolean jj_3R_177()
  {
-    if (jj_3R_191()) return true;
+    if (jj_3R_193()) return true;
     return false;
   }
 
-  static private boolean jj_3R_114()
+  static private boolean jj_3R_101()
  {
     if (jj_3R_123()) return true;
-    if (jj_3R_116()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_174()
+  static private boolean jj_3R_176()
  {
-    if (jj_3R_190()) return true;
+    if (jj_3R_192()) return true;
     return false;
   }
 
-  static private boolean jj_3R_173()
+  static private boolean jj_3R_175()
  {
-    if (jj_3R_189()) return true;
+    if (jj_3R_191()) return true;
     return false;
   }
 
-  static private boolean jj_3R_271()
+  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_280()
  {
     if (jj_scan_token(DIVIDE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_172()
+  static private boolean jj_3R_174()
  {
-    if (jj_3R_188()) return true;
+    if (jj_3R_190()) return true;
     return false;
   }
 
-  static private boolean jj_3R_171()
+  static private boolean jj_3R_173()
  {
     if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3R_154()
+  static private boolean jj_3R_157()
  {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_170()
+  static private boolean jj_3R_172()
  {
-    if (jj_3R_187()) return true;
+    if (jj_3R_189()) return true;
     return false;
   }
 
-  static private boolean jj_3R_161()
+  static private boolean jj_3R_180()
  {
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_178()) {
+    if (jj_3R_196()) {
     jj_scanpos = xsp;
-    if (jj_3R_179()) return true;
+    if (jj_3R_197()) return true;
     }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_169()
+  static private boolean jj_3R_171()
  {
-    if (jj_3R_186()) return true;
+    if (jj_3R_188()) return true;
     return false;
   }
 
-  static private boolean jj_3R_141()
+  static private boolean jj_3R_142()
  {
     if (jj_3R_57()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_154()) { jj_scanpos = xsp; break; }
+      if (jj_3R_157()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_168()
+  static private boolean jj_3R_170()
  {
-    if (jj_3R_185()) return true;
+    if (jj_3R_187()) return true;
     return false;
   }
 
@@ -5998,73 +5881,75 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_140()) {
+    if (jj_3R_141()) {
     jj_scanpos = xsp;
-    if (jj_3R_141()) return true;
+    if (jj_3R_142()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_140()
+  static private boolean jj_3R_141()
  {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_167()
+  static private boolean jj_3R_169()
  {
-    if (jj_3R_184()) return true;
+    if (jj_3R_186()) return true;
     return false;
   }
 
-  static private boolean jj_3R_166()
+  static private boolean jj_3R_168()
  {
-    if (jj_3R_183()) return true;
+    if (jj_3R_185()) return true;
     return false;
   }
 
-  static private boolean jj_3R_165()
+  static private boolean jj_3R_167()
  {
-    if (jj_3R_182()) return true;
+    if (jj_3R_184()) return true;
     return false;
   }
 
-  static private boolean jj_3R_266()
+  static private boolean jj_3_6()
  {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_3R_161()) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_264()
+  static private boolean jj_3R_272()
  {
     if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_258()
+  static private boolean jj_3R_267()
+ {
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_180()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_259()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_256()
+  static private boolean jj_3R_257()
  {
-    if (jj_3R_161()) return true;
+    if (jj_3R_180()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_266()) jj_scanpos = xsp;
+    if (jj_3R_267()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_160()
+  static private boolean jj_3R_162()
  {
     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()) {
@@ -6085,7 +5970,11 @@ fl.setLHS(s);
     jj_scanpos = xsp;
     if (jj_3R_176()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_177()) {
+    jj_scanpos = xsp;
+    if (jj_3R_178()) {
+    jj_scanpos = xsp;
+    if (jj_3R_179()) return true;
     }
     }
     }
@@ -6101,131 +5990,86 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_60()
- {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_269()
+  static private boolean jj_3R_278()
  {
-    if (jj_3R_160()) return true;
+    if (jj_3R_162()) return true;
     return false;
   }
 
-  static private boolean jj_3R_268()
+  static private boolean jj_3R_277()
  {
     if (jj_scan_token(MINUS)) return true;
-    if (jj_3R_261()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_59()
- {
-    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;
+    if (jj_3R_269()) return true;
     return false;
   }
 
-  static private boolean jj_3R_261()
+  static private boolean jj_3R_269()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_268()) {
+    if (jj_3R_277()) {
     jj_scanpos = xsp;
-    if (jj_3R_269()) return true;
+    if (jj_3R_278()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_270()
+  static private boolean jj_3R_279()
  {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_262()
+  static private boolean jj_3R_270()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_270()) {
+    if (jj_3R_279()) {
     jj_scanpos = xsp;
-    if (jj_3R_271()) return true;
+    if (jj_3R_280()) return true;
     }
-    if (jj_3R_261()) return true;
+    if (jj_3R_269()) return true;
     return false;
   }
 
-  static private boolean jj_3R_217()
+  static private boolean jj_3R_220()
  {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_52()
- {
-    if (jj_3R_59()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_60()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_216()
+  static private boolean jj_3R_219()
  {
     if (jj_3R_64()) return true;
     if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3_5()
- {
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_257()
+  static private boolean jj_3R_258()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_240()
- {
-    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_36()
+  static private boolean jj_3R_242()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_52()) {
+    if (jj_3R_258()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(49)) return true;
+    if (jj_3R_259()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_239()
+  static private boolean jj_3R_241()
  {
-    if (jj_3R_256()) return true;
+    if (jj_3R_257()) return true;
     return false;
   }
 
-  static private boolean jj_3R_238()
+  static private boolean jj_3R_240()
  {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_43()) return true;
@@ -6233,91 +6077,98 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_215()
+  static private boolean jj_3R_218()
  {
     if (jj_scan_token(RMAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_250()
+  static private boolean jj_3R_262()
  {
-    if (jj_3R_261()) return true;
+    if (jj_3R_269()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_262()) { jj_scanpos = xsp; break; }
+      if (jj_3R_270()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_214()
+  static private boolean jj_3R_217()
  {
     if (jj_scan_token(RMIN)) return true;
     return false;
   }
 
+  static private boolean jj_3R_60()
+ {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_58()
  {
     if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_263()
+  static private boolean jj_3R_271()
  {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_251()
+  static private boolean jj_3R_263()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_263()) {
+    if (jj_3R_271()) {
     jj_scanpos = xsp;
-    if (jj_3R_264()) return true;
+    if (jj_3R_272()) return true;
     }
-    if (jj_3R_250()) return true;
+    if (jj_3R_262()) return true;
     return false;
   }
 
-  static private boolean jj_3R_213()
+  static private boolean jj_3R_216()
  {
     if (jj_scan_token(R)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_238()) jj_scanpos = xsp;
+    if (jj_3R_240()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_239()) jj_scanpos = xsp;
+    if (jj_3R_241()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_240()) jj_scanpos = xsp;
+    if (jj_3R_242()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_188()
+  static private boolean jj_3R_190()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_213()) {
+    if (jj_3R_216()) {
     jj_scanpos = xsp;
-    if (jj_3R_214()) {
+    if (jj_3R_217()) {
     jj_scanpos = xsp;
-    if (jj_3R_215()) return true;
+    if (jj_3R_218()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_216()) {
+    if (jj_3R_219()) {
     jj_scanpos = xsp;
-    if (jj_3R_217()) return true;
+    if (jj_3R_220()) return true;
     }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_218()) return true;
+    if (jj_3R_221()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_219()) jj_scanpos = xsp;
+    if (jj_3R_222()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_115()
+  static private boolean jj_3R_118()
  {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_124()) return true;
@@ -6325,58 +6176,96 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_231()
+  static private boolean jj_3R_252()
  {
-    if (jj_3R_250()) return true;
+    if (jj_3R_262()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_251()) { jj_scanpos = xsp; break; }
+      if (jj_3R_263()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_113()
+  static private boolean jj_3R_59()
  {
-    if (jj_3R_116()) 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_112()
+  static private boolean jj_3R_117()
  {
-    if (jj_scan_token(REGEXP_MARKER)) return true;
     if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_111()
+  static private boolean jj_3R_116()
+ {
+    if (jj_scan_token(REGEXP_MARKER)) return true;
+    if (jj_3R_121()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_115()
  {
     if (jj_scan_token(ACCBOXMINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_110()
+  static private boolean jj_3R_114()
  {
     if (jj_scan_token(ACCBOXPLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_109()
+  static private boolean jj_3R_113()
  {
     if (jj_scan_token(ACCDIAMINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_108()
+  static private boolean jj_3R_112()
  {
     if (jj_scan_token(ACCDIAPLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_232()
+  static private boolean jj_3R_52()
+ {
+    if (jj_3R_59()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_60()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3_5()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_36()
+ {
+    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_253()
  {
     if (jj_3R_64()) return true;
-    if (jj_3R_231()) return true;
+    if (jj_3R_252()) return true;
     return false;
   }
 
@@ -6392,32 +6281,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_96()
+  static private boolean jj_3R_94()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_108()) {
+    if (jj_3R_112()) {
     jj_scanpos = xsp;
-    if (jj_3R_109()) {
+    if (jj_3R_113()) {
     jj_scanpos = xsp;
-    if (jj_3R_110()) {
+    if (jj_3R_114()) {
     jj_scanpos = xsp;
-    if (jj_3R_111()) return true;
+    if (jj_3R_115()) return true;
     }
     }
     }
     if (jj_scan_token(LPARENTH)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_112()) {
+    if (jj_3R_116()) {
     jj_scanpos = xsp;
-    if (jj_3R_113()) return true;
+    if (jj_3R_117()) return true;
     }
     if (jj_scan_token(RPARENTH)) return true;
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_114()) return true;
+    if (jj_3R_101()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_115()) jj_scanpos = xsp;
+    if (jj_3R_118()) jj_scanpos = xsp;
     return false;
   }
 
@@ -6427,13 +6316,13 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_194()
+  static private boolean jj_3R_234()
  {
-    if (jj_3R_231()) return true;
+    if (jj_3R_252()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_232()) { jj_scanpos = xsp; break; }
+      if (jj_3R_253()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -6478,7 +6367,7 @@ fl.setLHS(s);
 
   static private boolean jj_3R_81()
  {
-    if (jj_3R_96()) return true;
+    if (jj_3R_94()) return true;
     return false;
   }
 
@@ -6492,89 +6381,89 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_253()
+  static private boolean jj_3R_265()
  {
     if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_252()
+  static private boolean jj_3R_264()
  {
     if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_233()
+  static private boolean jj_3R_254()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_252()) {
+    if (jj_3R_264()) {
     jj_scanpos = xsp;
-    if (jj_3R_253()) return true;
+    if (jj_3R_265()) return true;
     }
     return false;
   }
 
   static private boolean jj_3R_80()
  {
-    if (jj_3R_95()) return true;
+    if (jj_3R_93()) return true;
     return false;
   }
 
-  static private boolean jj_3R_195()
+  static private boolean jj_3R_235()
  {
-    if (jj_3R_233()) return true;
-    if (jj_3R_194()) return true;
+    if (jj_3R_254()) return true;
+    if (jj_3R_234()) return true;
     return false;
   }
 
-  static private boolean jj_3R_105()
+  static private boolean jj_3R_109()
  {
-    if (jj_3R_117()) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
-  static private boolean jj_3R_94()
+  static private boolean jj_3R_92()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_104()) {
+    if (jj_3R_108()) {
     jj_scanpos = xsp;
-    if (jj_3R_105()) return true;
+    if (jj_3R_109()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_104()
+  static private boolean jj_3R_108()
  {
-    if (jj_3R_116()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_180()
+  static private boolean jj_3R_198()
  {
-    if (jj_3R_194()) return true;
+    if (jj_3R_234()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_195()) { jj_scanpos = xsp; break; }
+      if (jj_3R_235()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_93()
+  static private boolean jj_3R_91()
  {
     if (jj_scan_token(G)) return true;
     return false;
   }
 
-  static private boolean jj_3R_92()
+  static private boolean jj_3R_90()
  {
     if (jj_scan_token(F)) return true;
     return false;
   }
 
-  static private boolean jj_3R_91()
+  static private boolean jj_3R_89()
  {
     if (jj_scan_token(X)) return true;
     return false;
@@ -6597,9 +6486,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_163()
+  static private boolean jj_3R_182()
  {
-    if (jj_3R_180()) return true;
+    if (jj_3R_198()) return true;
     return false;
   }
 
@@ -6607,187 +6496,369 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_91()) {
+    if (jj_3R_89()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) {
+    if (jj_3R_90()) {
     jj_scanpos = xsp;
-    if (jj_3R_93()) return true;
+    if (jj_3R_91()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_94()) jj_scanpos = xsp;
+    if (jj_3R_92()) jj_scanpos = xsp;
     if (jj_3R_74()) return true;
     return false;
   }
 
-  static private boolean jj_3R_162()
+  static private boolean jj_3R_181()
+ {
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_164()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_67()
+ {
+    if (jj_scan_token(REG_IDENTPRIME)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_85()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_164()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_181()) {
+    jj_scanpos = xsp;
+    if (jj_3R_182()) return true;
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_74()
+ {
+    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_84()
+ {
+    if (jj_scan_token(MIN)) 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_84()) {
+    jj_scanpos = xsp;
+    if (jj_3R_85()) return true;
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_165()
+ {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_164()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_102()
+ {
+    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_66()
+ {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_57()) return true;
+    if (jj_scan_token(RBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_76()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_158()
+ {
+    if (jj_3R_164()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_165()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_100()
+ {
+    if (jj_3R_122()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_99()
+ {
+    if (jj_scan_token(REGEXP_MARKER)) return true;
+    if (jj_3R_121()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_282()
+ {
+    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_159()
+ {
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_158()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_281()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_145()
+ {
+    if (jj_3R_158()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_159()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_274()
+ {
+    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_155()
  {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_156()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_67()
+  static private boolean jj_3R_273()
  {
-    if (jj_scan_token(REG_IDENTPRIME)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_281()) {
+    jj_scanpos = xsp;
+    if (jj_3R_282()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_87()
+  static private boolean jj_3R_153()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_156()
+  static private boolean jj_3R_83()
  {
+    if (jj_scan_token(ACCUNTIL)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_162()) {
+    if (jj_3R_99()) {
     jj_scanpos = xsp;
-    if (jj_3R_163()) return true;
+    if (jj_3R_100()) return true;
     }
+    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_101()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_102()) jj_scanpos = xsp;
+    if (jj_3R_74()) return true;
     return false;
   }
 
-  static private boolean jj_3R_74()
+  static private boolean jj_3R_266()
  {
+    if (jj_3R_273()) 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;
-    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_274()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_86()
+  static private boolean jj_3R_151()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_98()
+  static private boolean jj_3R_149()
  {
-    if (jj_3R_117()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_85()
+  static private boolean jj_3R_120()
+ {
+    if (jj_3R_127()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_98()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_97()) {
+    if (jj_3R_119()) {
     jj_scanpos = xsp;
-    if (jj_3R_98()) return true;
+    if (jj_3R_120()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_97()
+  static private boolean jj_3R_119()
  {
-    if (jj_3R_116()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_84()
+  static private boolean jj_3R_97()
  {
     if (jj_scan_token(R)) return true;
     return false;
   }
 
-  static private boolean jj_3R_76()
+  static private boolean jj_3R_96()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
-    }
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_scan_token(W)) return true;
     return false;
   }
 
-  static private boolean jj_3R_157()
+  static private boolean jj_3R_146()
  {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_156()) return true;
+    if (jj_scan_token(IFF)) return true;
+    if (jj_3R_145()) return true;
     return false;
   }
 
-  static private boolean jj_3R_83()
+  static private boolean jj_3R_50()
  {
-    if (jj_scan_token(W)) return true;
     return false;
   }
 
-  static private boolean jj_3R_82()
+  static private boolean jj_3R_95()
  {
     if (jj_scan_token(U)) return true;
     return false;
   }
 
-  static private boolean jj_3R_66()
+  static private boolean jj_3R_128()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_57()) return true;
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_3R_145()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_76()) { jj_scanpos = xsp; break; }
+      if (jj_3R_146()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_150()
+  static private boolean jj_3R_75()
  {
-    if (jj_3R_156()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_157()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_82()) {
+    jj_scanpos = xsp;
+    if (jj_3R_83()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_75()
+  static private boolean jj_3R_82()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_82()) {
+    if (jj_3R_95()) {
     jj_scanpos = xsp;
-    if (jj_3R_83()) {
+    if (jj_3R_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_84()) return true;
+    if (jj_3R_97()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_85()) jj_scanpos = xsp;
+    if (jj_3R_98()) jj_scanpos = xsp;
     if (jj_3R_74()) return true;
     return false;
   }
 
-  static private boolean jj_3R_277()
+  static private boolean jj_3R_35()
  {
-    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_151()
+  static private boolean jj_3R_54()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_150()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_276()
+  static private boolean jj_3R_49()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_129()
+ {
+    if (jj_scan_token(IMPLIES)) return true;
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  static private boolean jj_3_25()
+ {
+    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_231()
+ {
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
@@ -6800,111 +6871,158 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_133()
+  static private boolean jj_3R_110()
  {
-    if (jj_3R_150()) return true;
+    if (jj_3R_128()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_151()) { jj_scanpos = xsp; break; }
+      if (jj_3R_129()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_273()
+  static private boolean jj_3R_48()
  {
-    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_149()
+  static private boolean jj_3R_43()
  {
-    if (jj_3R_57()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_272()
+  static private boolean jj_3R_111()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_276()) {
-    jj_scanpos = xsp;
-    if (jj_3R_277()) return true;
-    }
+    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_110()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_93()) return true;
     return false;
   }
 
-  static private boolean jj_3R_147()
+  static private boolean jj_3_24()
  {
-    if (jj_3R_57()) 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_266()) return true;
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_265()
+  static private boolean jj_3_23()
  {
-    if (jj_3R_272()) 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_266()) return true;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_93()
+ {
+    if (jj_3R_110()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_273()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_111()) 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_3R_145()
+  static private boolean jj_3R_34()
  {
-    if (jj_3R_57()) return true;
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_143()
+  static private boolean jj_3R_256()
  {
-    if (jj_3R_57()) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_134()
+  static private boolean jj_3R_239()
  {
-    if (jj_scan_token(IFF)) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_50()
+  static private boolean jj_3R_230()
+ {
+    if (jj_scan_token(AND)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_228()
  {
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_120()
+  static private boolean jj_3R_46()
  {
-    if (jj_3R_133()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_134()) { jj_scanpos = xsp; break; }
-    }
     return false;
   }
 
-  static private boolean jj_3R_118()
+  static private boolean jj_3R_125()
  {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_35()
+  static private boolean jj_3R_45()
  {
-    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_54()
+  static private boolean jj_3R_44()
  {
-    if (jj_3R_57()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_163()
+ {
+    if (jj_3R_180()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_33()
+ {
+    if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
@@ -6923,7 +7041,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[126];
+  static final private int[] jj_la1 = new int[129];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -6933,13 +7051,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,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,};
+	   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,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,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,};
+	   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,0x0,0x40000000,0xc2000,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,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,};
+	   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,0x800003d1,0x0,0x400000,0x400000,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;
@@ -6963,7 +7081,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 129; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6978,7 +7096,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 129; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6996,7 +7114,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 129; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -7015,7 +7133,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 129; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -7032,7 +7150,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 129; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -7042,7 +7160,7 @@ fl.setLHS(s);
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 129; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -7173,7 +7291,7 @@ fl.setLHS(s);
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 126; i++) {
+	 for (int i = 0; i < 129; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {