From d7699190862eeaf3cbcbe2d22c069edb8bf91ede Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Fri, 12 Oct 2018 14:25:46 +0200 Subject: [PATCH] imported patch rewardcounter-TemporalOperatorBounds-use-refresh.patch --- prism/src/parser/PrismParser.java | 2389 +++++++++-------- prism/src/parser/PrismParserConstants.java | 19 +- prism/src/parser/PrismParserTokenManager.java | 128 +- 3 files changed, 1384 insertions(+), 1152 deletions(-) diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index f15bd47a..d8ca32bc 100644 --- a/prism/src/parser/PrismParser.java +++ b/prism/src/parser/PrismParser.java @@ -1709,7 +1709,7 @@ Expression Expression(boolean prop, boolean pathprop) throws ParseException {Exp // that does not really help since this is done post-parsing. // To prevent (very common) cases such as "F<=t (b)", "F<=t (b)&(c)", etc. // being mis-parsed ("t(b)" would always be taken over "t"), we catch this case -// separately (see TimeBound() production below for details). +// separately (see BoundExpression() production below for details). // This means that more complex time-bounds, especially those that // start/end with an identifier should be parenthesised, e.g. "F<=(t1+t2)". @@ -1719,6 +1719,8 @@ Expression Expression(boolean prop, boolean pathprop) throws ParseException {Exp static final public Expression ExpressionTemporalBinary(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr; ExpressionTemporal exprTemp; + TemporalOperatorBound defaultBound = null; + TemporalOperatorBounds bounds = null; Token begin = null; begin = getToken(1); ret = ExpressionTemporalUnary(prop, pathprop); @@ -1751,16 +1753,39 @@ exprTemp.setOperator(ExpressionTemporal.P_R); } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case LBRACKET: + case LBRACE: case EQ: case LT: case GT: case LE: - case GE:{ - TimeBound(exprTemp); + 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[40] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } break; } default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; ; } expr = ExpressionTemporalUnary(prop, pathprop); @@ -1768,7 +1793,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr break; } default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; ; } {if ("" != null) return ret;} @@ -1777,6 +1802,8 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr static final public Expression ExpressionTemporalUnary(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr; ExpressionTemporal exprTemp; + TemporalOperatorBound defaultBound = null; + TemporalOperatorBounds bounds = null; Token begin = null; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case F: @@ -1801,22 +1828,45 @@ exprTemp.setOperator(ExpressionTemporal.P_G); break; } default: - jj_la1[42] = jj_gen; + jj_la1[43] = 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:{ - TimeBound(exprTemp); + 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[44] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } break; } default: - jj_la1[43] = jj_gen; + jj_la1[45] = jj_gen; ; } expr = ExpressionTemporalUnary(prop, pathprop); @@ -1851,7 +1901,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr break; } default: - jj_la1[44] = jj_gen; + jj_la1[46] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1859,10 +1909,10 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr throw new Error("Missing return statement in function"); } -// Time bound for temporal operators +// Bound expression for temporal operators // (see ExpressionTemporal production for lookahead explanation) static final public -void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lBound, uBound; +TemporalOperatorBound BoundExpression() throws ParseException {Expression lBound, uBound; TemporalOperatorBound bound = new TemporalOperatorBound(); switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case LE:{ @@ -1902,7 +1952,7 @@ void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lB break; } default: - jj_la1[45] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1947,7 +1997,7 @@ bound.setUpperBound(uBound, false); break; } default: - jj_la1[46] = jj_gen; + jj_la1[48] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1992,7 +2042,7 @@ bound.setUpperBound(uBound, true); break; } default: - jj_la1[47] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2037,7 +2087,7 @@ bound.setLowerBound(lBound, false); break; } default: - jj_la1[48] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2061,11 +2111,96 @@ bound.setEqualBounds(lBound); break; } default: - jj_la1[49] = jj_gen; + jj_la1[51] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } +{if ("" != null) return bound;} + throw new Error("Missing return statement in function"); + } + + static final public TemporalOperatorBounds TemporalOpBounds() throws ParseException {TemporalOperatorBounds bounds = new TemporalOperatorBounds(); + TemporalOperatorBound bound; + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case CARET:{ + jj_consume_token(CARET); + break; + } + default: + jj_la1[52] = jj_gen; + ; + } + jj_consume_token(LBRACE); + bound = TemporalOpBound(); +bounds.addBound(bound); + label_19: + while (true) { + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case COMMA:{ + ; + break; + } + default: + jj_la1[53] = jj_gen; + break label_19; + } + jj_consume_token(COMMA); + bound = TemporalOpBound(); +bounds.addBound(bound); + } + jj_consume_token(RBRACE); +{if ("" != null) return bounds;} + throw new Error("Missing return statement in function"); + } + + static final public TemporalOperatorBound TemporalOpBound() throws ParseException {TemporalOperatorBound bound = null; + Object rewardIndex = null; + if (jj_2_15(1)) { + if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("time")) { + + } else { + jj_consume_token(-1); + throw new ParseException(); + } + Identifier(); + bound = BoundExpression(); +bound.setBoundType(TemporalOperatorBound.BoundType.TIME_BOUND); + } else if (jj_2_16(1)) { + if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps")) { + + } else { + jj_consume_token(-1); + throw new ParseException(); + } + Identifier(); + bound = BoundExpression(); +bound.setBoundType(TemporalOperatorBound.BoundType.STEP_BOUND); + } else if (jj_2_17(1)) { + if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward")) { + + } else { + jj_consume_token(-1); + throw new ParseException(); + } + Identifier(); + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case LBRACE:{ + rewardIndex = RewardIndex(); + break; + } + default: + jj_la1[54] = jj_gen; + ; + } + bound = BoundExpression(); +bound.setBoundType(TemporalOperatorBound.BoundType.REWARD_BOUND); + bound.setRewardStructureIndex(rewardIndex); + } else { jj_consume_token(-1); throw new ParseException(); } -exprTemp.setBound(bound); +{if ("" != null) return bound;} + throw new Error("Missing return statement in function"); } // Expression: if-then-else, i.e. "cond ? then : else" @@ -2084,7 +2219,7 @@ ret = new ExpressionITE(ret, left, right); ret.setPosition(begin, getToken(0)); break; } default: - jj_la1[50] = jj_gen; + jj_la1[55] = jj_gen; ; } {if ("" != null) return ret;} @@ -2097,7 +2232,7 @@ Expression ExpressionImplies(boolean prop, boolean pathprop) throws ParseExcepti Token begin = null; begin = getToken(1); ret = ExpressionIff(prop, pathprop); - label_19: + label_20: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case IMPLIES:{ @@ -2105,8 +2240,8 @@ begin = getToken(1); break; } default: - jj_la1[51] = jj_gen; - break label_19; + jj_la1[56] = jj_gen; + break label_20; } jj_consume_token(IMPLIES); expr = ExpressionIff(prop, pathprop); @@ -2122,7 +2257,7 @@ Expression ExpressionIff(boolean prop, boolean pathprop) throws ParseException { Token begin = null; begin = getToken(1); ret = ExpressionOr(prop, pathprop); - label_20: + label_21: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case IFF:{ @@ -2130,8 +2265,8 @@ begin = getToken(1); break; } default: - jj_la1[52] = jj_gen; - break label_20; + jj_la1[57] = jj_gen; + break label_21; } jj_consume_token(IFF); expr = ExpressionOr(prop, pathprop); @@ -2147,7 +2282,7 @@ Expression ExpressionOr(boolean prop, boolean pathprop) throws ParseException {E Token begin = null; begin = getToken(1); ret = ExpressionAnd(prop, pathprop); - label_21: + label_22: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case OR:{ @@ -2155,8 +2290,8 @@ begin = getToken(1); break; } default: - jj_la1[53] = jj_gen; - break label_21; + jj_la1[58] = jj_gen; + break label_22; } jj_consume_token(OR); expr = ExpressionAnd(prop, pathprop); @@ -2172,7 +2307,7 @@ Expression ExpressionAnd(boolean prop, boolean pathprop) throws ParseException { Token begin = null; begin = getToken(1); ret = ExpressionNot(prop, pathprop); - label_22: + label_23: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case AND:{ @@ -2180,8 +2315,8 @@ begin = getToken(1); break; } default: - jj_la1[54] = jj_gen; - break label_22; + jj_la1[59] = jj_gen; + break label_23; } jj_consume_token(AND); expr = ExpressionNot(prop, pathprop); @@ -2229,7 +2364,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin, break; } default: - jj_la1[55] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2244,7 +2379,7 @@ Expression ExpressionEquality(boolean prop, boolean pathprop) throws ParseExcept Token begin = null; begin = getToken(1); ret = ExpressionRelop(prop, pathprop); - label_23: + label_24: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case EQ: @@ -2253,8 +2388,8 @@ begin = getToken(1); break; } default: - jj_la1[56] = jj_gen; - break label_23; + jj_la1[61] = jj_gen; + break label_24; } op = EqNeq(); expr = ExpressionRelop(prop, pathprop); @@ -2271,7 +2406,7 @@ Expression ExpressionRelop(boolean prop, boolean pathprop) throws ParseException Token begin = null; begin = getToken(1); ret = ExpressionPlusMinus(prop, pathprop); - label_24: + label_25: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case LT: @@ -2282,8 +2417,8 @@ begin = getToken(1); break; } default: - jj_la1[57] = jj_gen; - break label_24; + jj_la1[62] = jj_gen; + break label_25; } op = LtGt(); expr = ExpressionPlusMinus(prop, pathprop); @@ -2307,7 +2442,7 @@ Expression ExpressionPlusMinus(boolean prop, boolean pathprop) throws ParseExcep Token begin = null; begin = getToken(1); ret = ExpressionTimesDivide(prop, pathprop); - label_25: + label_26: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case PLUS: @@ -2316,8 +2451,8 @@ begin = getToken(1); break; } default: - jj_la1[58] = jj_gen; - break label_25; + jj_la1[63] = jj_gen; + break label_26; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case PLUS:{ @@ -2331,7 +2466,7 @@ op = ExpressionBinaryOp.MINUS; break; } default: - jj_la1[59] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2349,7 +2484,7 @@ Expression ExpressionTimesDivide(boolean prop, boolean pathprop) throws ParseExc Token begin = null; begin = getToken(1); ret = ExpressionUnaryMinus(prop, pathprop); - label_26: + label_27: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case TIMES: @@ -2358,8 +2493,8 @@ begin = getToken(1); break; } default: - jj_la1[60] = jj_gen; - break label_26; + jj_la1[65] = jj_gen; + break label_27; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case TIMES:{ @@ -2373,7 +2508,7 @@ op = ExpressionBinaryOp.DIVIDE; break; } default: - jj_la1[61] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2421,7 +2556,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begi break; } default: - jj_la1[62] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2496,7 +2631,7 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException break; } default: - jj_la1[63] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2528,7 +2663,7 @@ ret = new ExpressionFunc(s); break; } default: - jj_la1[64] = jj_gen; + jj_la1[69] = jj_gen; ; } ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;} @@ -2552,7 +2687,7 @@ s = "max"; break; } default: - jj_la1[65] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2587,7 +2722,7 @@ s = "max"; break; } default: - jj_la1[66] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2604,7 +2739,7 @@ func.setPosition(begin, getToken(0)); {if ("" != null) return func;} void ExpressionFuncArgs(boolean prop, boolean pathprop, ExpressionFunc func) throws ParseException {Expression expr; expr = Expression(prop, pathprop); func.addOperand(expr); - label_27: + label_28: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case COMMA:{ @@ -2612,8 +2747,8 @@ func.addOperand(expr); break; } default: - jj_la1[67] = jj_gen; - break label_27; + jj_la1[72] = jj_gen; + break label_28; } jj_consume_token(COMMA); expr = Expression(prop, pathprop); @@ -2664,7 +2799,7 @@ ret = new ExpressionLiteral(TypeBool.getInstance(), new Boolean(false)); break; } default: - jj_la1[68] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2710,7 +2845,7 @@ if (!prop) {if (true) throw generateParseException();} break; } default: - jj_la1[69] = jj_gen; + jj_la1[74] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -2744,7 +2879,7 @@ relOp = "max="; isBool = false; break; } default: - jj_la1[70] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2765,7 +2900,7 @@ relOp = "max="; isBool = false; break; } default: - jj_la1[71] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2777,7 +2912,7 @@ relOp = "max="; isBool = false; break; } default: - jj_la1[72] = jj_gen; + jj_la1[77] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2805,7 +2940,7 @@ ret.setModifier(modifier == null ? null : modifier.getName()); // - a (possibly negated) HOA: ... automaton specification static final public Expression PathSpecification(boolean prop) throws ParseException {Expression result; ExpressionIdent kind = null; - if (jj_2_15(1)) { + if (jj_2_18(1)) { if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("HOA") && getToken(2).kind==COLON) { @@ -2819,7 +2954,7 @@ ret.setModifier(modifier == null ? null : modifier.getName()); jj_consume_token(LBRACE); result = PathSpecificationHOA(prop); jj_consume_token(RBRACE); - } else if (jj_2_16(1)) { + } else if (jj_2_19(1)) { if (getToken(1).kind==NOT && getToken(2).kind==REG_IDENT && getToken(2).image.equals("HOA") @@ -2836,7 +2971,7 @@ ret.setModifier(modifier == null ? null : modifier.getName()); result = PathSpecificationHOA(prop); jj_consume_token(RBRACE); result = Expression.Not(result); - } else if (jj_2_17(1)) { + } else if (jj_2_20(1)) { if (getToken(1).kind==REG_IDENT && getToken(2).kind==COLON) { @@ -2879,7 +3014,7 @@ result = Expression.Not(result); break; } default: - jj_la1[73] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2895,7 +3030,7 @@ result = Expression.Not(result); String ap, label; hoaAutomatonFile = QuotedString(); result = new ExpressionHOA(hoaAutomatonFile); - label_28: + label_29: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case COMMA:{ @@ -2903,8 +3038,8 @@ result = new ExpressionHOA(hoaAutomatonFile); break; } default: - jj_la1[74] = jj_gen; - break label_28; + jj_la1[79] = jj_gen; + break label_29; } jj_consume_token(COMMA); ap = QuotedIdentifier(); @@ -2925,7 +3060,7 @@ Filter Filter() throws ParseException {Filter filter; expr = Expression(true, false); filter = new Filter(expr); jj_consume_token(RBRACE); - label_29: + label_30: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case LBRACE:{ @@ -2933,8 +3068,8 @@ filter = new Filter(expr); break; } default: - jj_la1[75] = jj_gen; - break label_29; + jj_la1[80] = jj_gen; + break label_30; } jj_consume_token(LBRACE); switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -2949,7 +3084,7 @@ filter.setMaxRequested(true); break; } default: - jj_la1[76] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2987,7 +3122,7 @@ if (!prop) {if (true) throw generateParseException();} break; } default: - jj_la1[77] = jj_gen; + jj_la1[82] = jj_gen; ; } r = LtGt(); @@ -3002,7 +3137,7 @@ relOp = "="; isBool = false; break; } default: - jj_la1[78] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3014,7 +3149,7 @@ relOp = "="; isBool = false; break; } default: - jj_la1[79] = jj_gen; + jj_la1[84] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -3059,16 +3194,16 @@ if (!prop) {if (true) throw generateParseException();} break; } default: - jj_la1[80] = jj_gen; + jj_la1[85] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case LBRACE:{ - RewardIndex(ret); + RewardSpecification(ret); break; } default: - jj_la1[81] = jj_gen; + jj_la1[86] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -3102,7 +3237,7 @@ relOp = "max="; isBool = false; break; } default: - jj_la1[82] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3123,7 +3258,7 @@ relOp = "max="; isBool = false; break; } default: - jj_la1[83] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3135,7 +3270,7 @@ relOp = "max="; isBool = false; break; } default: - jj_la1[84] = jj_gen; + jj_la1[89] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -3157,12 +3292,30 @@ ret.setModifier(modifier == null ? null : modifier.getName()); throw new Error("Missing return statement in function"); } -// Reward struct index for R operator +// Reward specification for R operator static final public -void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = null; +void RewardSpecification(ExpressionReward exprRew) throws ParseException {Object index = null; Object indexDiv = null; + index = RewardIndex(); + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case DIVIDE:{ + jj_consume_token(DIVIDE); + indexDiv = RewardIndex(); + break; + } + default: + jj_la1[90] = jj_gen; + ; + } +exprRew.setRewardStructIndex(index); + if (indexDiv != null) { + exprRew.setRewardStructIndexDiv(indexDiv); + } + } + + static final public Object RewardIndex() throws ParseException {Object index = null; jj_consume_token(LBRACE); - if (jj_2_18(2147483647)) { + if (jj_2_21(2147483647)) { index = QuotedIdentifier(); } else { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -3197,67 +3350,14 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = break; } default: - jj_la1[85] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case DIVIDE:{ - jj_consume_token(DIVIDE); - jj_consume_token(LBRACE); - if (jj_2_19(2147483647)) { - indexDiv = QuotedIdentifier(); - } else { - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case A: - case E: - case FALSE: - case FILTER: - case FUNC: - case F: - case G: - case MAX: - case MIN: - case X: - case PMAX: - case PMIN: - case P: - case RMAX: - case RMIN: - case R: - case S: - case TRUE: - case NOT: - case LPARENTH: - case DLBRACKET: - case DLT: - case MINUS: - case REG_INT: - case REG_DOUBLE: - case REG_IDENT: - case REG_QUOTED_IDENT:{ - indexDiv = Expression(false, false); - break; - } - default: - jj_la1[86] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } - jj_consume_token(RBRACE); - break; - } - default: - jj_la1[87] = jj_gen; - ; - } -exprRew.setRewardStructIndex(index); - if (indexDiv != null) { - exprRew.setRewardStructIndexDiv(indexDiv); - } +{if ("" != null) return index;} + throw new Error("Missing return statement in function"); } // Contents of an R operator @@ -3272,7 +3372,7 @@ Expression ExpressionRewardContents(boolean prop, boolean pathprop) throws Parse Token begin; TemporalOperatorBound b = new TemporalOperatorBound(); begin = getToken(1); - if (jj_2_20(2147483647)) { + if (jj_2_22(2147483647)) { expr = ExpressionSS(prop, true); ret = expr; } else { @@ -3283,12 +3383,12 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null); break; } default: - jj_la1[88] = jj_gen; - if (jj_2_21(2147483647)) { + jj_la1[92] = jj_gen; + if (jj_2_23(2147483647)) { begin = jj_consume_token(C); jj_consume_token(LE); expr = Expression(false, false); -exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp; +exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); b.setUpperBound(expr); exprTemp.getBounds().setDefaultBound(b); ret = exprTemp; } else { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case C:{ @@ -3300,7 +3400,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); jj_consume_token(I); jj_consume_token(EQ); expr = Expression(false, false); -exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp; +exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); b.setUpperBound(expr); exprTemp.getBounds().setDefaultBound(b); ret = exprTemp; break; } case A: @@ -3335,7 +3435,7 @@ ret = expr; break; } default: - jj_la1[89] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3400,7 +3500,7 @@ ret = new ExpressionStrategy(false); break; } default: - jj_la1[90] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3425,7 +3525,7 @@ ret = new ExpressionStrategy(false); break; } default: - jj_la1[91] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3438,7 +3538,7 @@ ret.addOperand(expr); break; } default: - jj_la1[92] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3458,13 +3558,13 @@ exprStrat.setCoalitionAllPlayers(); break; } default: - jj_la1[95] = jj_gen; + jj_la1[99] = jj_gen; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case REG_INT: case REG_IDENT:{ s = ExpressionStrategyCoalitionPlayer(); coalition.add(s); - label_30: + label_31: while (true) { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case COMMA:{ @@ -3472,8 +3572,8 @@ coalition.add(s); break; } default: - jj_la1[93] = jj_gen; - break label_30; + jj_la1[97] = jj_gen; + break label_31; } jj_consume_token(COMMA); s = ExpressionStrategyCoalitionPlayer(); @@ -3482,7 +3582,7 @@ coalition.add(s); break; } default: - jj_la1[94] = jj_gen; + jj_la1[98] = jj_gen; ; } exprStrat.setCoalition(coalition); @@ -3502,7 +3602,7 @@ String ExpressionStrategyCoalitionPlayer() throws ParseException {String s; break; } default: - jj_la1[96] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3565,7 +3665,7 @@ op = "|"; break; } default: - jj_la1[97] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3578,7 +3678,7 @@ op = "|"; break; } default: - jj_la1[98] = jj_gen; + jj_la1[102] = jj_gen; ; } jj_consume_token(RPARENTH); @@ -3642,7 +3742,7 @@ s = getToken(0).image; break; } default: - jj_la1[99] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3674,7 +3774,7 @@ ident="max"; break; } default: - jj_la1[100] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3711,7 +3811,7 @@ int EqNeq() throws ParseException { break; } default: - jj_la1[101] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3743,7 +3843,7 @@ int LtGt() throws ParseException { break; } default: - jj_la1[102] = jj_gen; + jj_la1[106] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3769,7 +3869,7 @@ begin = getToken(1); break; } default: - jj_la1[103] = jj_gen; + jj_la1[107] = jj_gen; ; } jj_consume_token(0); @@ -3950,132 +4050,108 @@ fl.setLHS(s); finally { jj_save(20, xla); } } - static private boolean jj_3R_149() + static private boolean jj_2_22(int xla) { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_161()) { - jj_scanpos = xsp; - if (jj_3R_162()) { - jj_scanpos = xsp; - if (jj_3R_163()) { - jj_scanpos = xsp; - if (jj_3R_164()) return true; - } - } - } - return false; + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_22(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(21, xla); } } - static private boolean jj_3R_86() + static private boolean jj_2_23(int xla) { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_35()) return true; - if (jj_scan_token(RPARENTH)) return true; - return false; + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_23(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(22, xla); } } - static private boolean jj_3R_167() + static private boolean jj_3R_91() { - if (jj_scan_token(MAX)) return true; + if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_36()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_85() + static private boolean jj_3R_171() { - if (jj_3R_32()) return true; + if (jj_scan_token(E)) return true; + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_49()) return true; + if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_185() + static private boolean jj_3R_90() { - if (jj_3R_153()) return true; + if (jj_3R_33()) return true; return false; } - static private boolean jj_3R_77() + static private boolean jj_3R_180() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_31()) return true; + if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_183()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_84() + static private boolean jj_3R_81() { - if (jj_3R_31()) return true; + if (jj_scan_token(COMMA)) return true; + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_213() + static private boolean jj_3R_89() { - if (jj_3R_154()) return true; + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_75() + static private boolean jj_3R_79() { Token xsp; xsp = jj_scanpos; - if (jj_3R_84()) { + if (jj_3R_89()) { jj_scanpos = xsp; - if (jj_3R_85()) { + if (jj_3R_90()) { jj_scanpos = xsp; - if (jj_3R_86()) return true; + if (jj_3R_91()) return true; } } return false; } - static private boolean jj_3R_184() + static private boolean jj_3R_165() { + if (jj_3R_32()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_213()) { - jj_scanpos = xsp; - if (jj_3R_214()) return true; - } - return false; - } - - static private boolean jj_3R_168() - { - if (jj_3R_45()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_193()) { jj_scanpos = xsp; break; } - } + if (jj_3R_180()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_183() + static private boolean jj_3_23() { - if (jj_scan_token(DLBRACKET)) return true; - if (jj_3R_212()) return true; - if (jj_scan_token(DRBRACKET)) return true; + if (jj_scan_token(C)) return true; + if (jj_scan_token(LE)) return true; return false; } - static private boolean jj_3R_182() + static private boolean jj_3R_226() { - if (jj_scan_token(DLT)) return true; - if (jj_3R_212()) return true; - if (jj_scan_token(DGT)) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_98() + static private boolean jj_3R_101() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_31()) return true; + if (jj_3R_32()) return true; if (jj_scan_token(RENAME)) return true; - if (jj_3R_31()) return true; - return false; - } - - static private boolean jj_3R_228() - { - if (jj_3R_45()) return true; + if (jj_3R_32()) return true; return false; } @@ -4087,19 +4163,17 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_158() + static private boolean jj_3_22() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_182()) { - jj_scanpos = xsp; - if (jj_3R_183()) return true; - } - xsp = jj_scanpos; - if (jj_3R_184()) { - jj_scanpos = xsp; - if (jj_3R_185()) return true; - } + if (jj_3R_44()) return true; + return false; + } + + static private boolean jj_3R_225() + { + if (jj_scan_token(I)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_3R_49()) return true; return false; } @@ -4109,714 +4183,805 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_152() + static private boolean jj_3R_224() { - if (jj_scan_token(FUNC)) return true; - if (jj_scan_token(LPARENTH)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_169()) { - jj_scanpos = xsp; - if (jj_3R_170()) { - jj_scanpos = xsp; - if (jj_3R_171()) return true; - } - } - if (jj_scan_token(COMMA)) return true; - if (jj_3R_168()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_scan_token(C)) return true; + return false; + } + + static private boolean jj_3R_223() + { + if (jj_scan_token(C)) return true; + if (jj_scan_token(LE)) return true; + if (jj_3R_49()) return true; + return false; + } + + static private boolean jj_3R_222() + { + if (jj_scan_token(S)) return true; return false; } static private boolean jj_3_3() { if (jj_scan_token(LABEL)) return true; - if (jj_3R_33()) return true; + if (jj_3R_34()) return true; return false; } - static private boolean jj_3R_57() + static private boolean jj_3R_163() + { + if (jj_3R_175()) return true; + return false; + } + + static private boolean jj_3R_221() + { + if (jj_3R_44()) return true; + return false; + } + + static private boolean jj_3R_162() + { + if (jj_3R_174()) return true; + return false; + } + + static private boolean jj_3R_61() { if (jj_scan_token(OR)) return true; if (jj_scan_token(OR)) return true; if (jj_scan_token(OR)) return true; - if (jj_3R_42()) return true; + if (jj_3R_46()) return true; return false; } - static private boolean jj_3R_88() + static private boolean jj_3R_93() { if (jj_scan_token(LBRACE)) return true; - if (jj_3R_31()) return true; + if (jj_3R_32()) return true; if (jj_scan_token(RENAME)) return true; - if (jj_3R_31()) return true; + if (jj_3R_32()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_98()) { jj_scanpos = xsp; break; } + if (jj_3R_101()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_222() + static private boolean jj_3R_161() { - if (jj_3R_45()) return true; + if (jj_3R_173()) return true; return false; } - static private boolean jj_3R_166() + static private boolean jj_3_21() { - if (jj_scan_token(MIN)) return true; + if (jj_3R_33()) return true; return false; } - static private boolean jj_3R_76() + static private boolean jj_3R_195() { Token xsp; xsp = jj_scanpos; - if (jj_3R_87()) { + if (jj_3R_221()) { jj_scanpos = xsp; - if (jj_3R_88()) return true; + if (jj_3R_222()) { + jj_scanpos = xsp; + if (jj_3R_223()) { + jj_scanpos = xsp; + if (jj_3R_224()) { + jj_scanpos = xsp; + if (jj_3R_225()) { + jj_scanpos = xsp; + if (jj_3R_226()) return true; + } + } + } + } } return false; } - static private boolean jj_3R_87() + static private boolean jj_3R_160() + { + if (jj_3R_172()) return true; + return false; + } + + static private boolean jj_3R_159() + { + if (jj_3R_171()) return true; + return false; + } + + static private boolean jj_3R_149() { if (jj_scan_token(DIVIDE)) return true; - if (jj_scan_token(LBRACE)) return true; - if (jj_3R_31()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_97()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_157() + static private boolean jj_3R_158() { - if (jj_scan_token(A)) return true; - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_45()) return true; - if (jj_scan_token(RBRACKET)) return true; + if (jj_3R_170()) return true; return false; } - static private boolean jj_3R_151() + static private boolean jj_3R_80() { Token xsp; xsp = jj_scanpos; - if (jj_3R_166()) { + if (jj_3R_92()) { jj_scanpos = xsp; - if (jj_3R_167()) return true; + if (jj_3R_93()) return true; } - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_168()) return true; - if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_65() + static private boolean jj_3R_92() { - if (jj_3R_75()) return true; + if (jj_scan_token(DIVIDE)) return true; + if (jj_scan_token(LBRACE)) return true; + if (jj_3R_32()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_76()) { jj_scanpos = xsp; break; } + if (jj_3R_100()) { jj_scanpos = xsp; break; } } + if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3_8() + static private boolean jj_3R_196() { - if (jj_scan_token(OR)) return true; - if (jj_scan_token(OR)) return true; + if (jj_3R_58()) return true; return false; } - static private boolean jj_3R_165() + static private boolean jj_3R_157() { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_168()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_3R_44()) return true; return false; } - static private boolean jj_3R_50() + static private boolean jj_3R_69() { - if (jj_scan_token(OR)) return true; - if (jj_scan_token(OR)) return true; - if (jj_3R_56()) return true; + if (jj_3R_79()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_80()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3_10() + static private boolean jj_3R_156() + { + if (jj_3R_169()) return true; + return false; + } + + static private boolean jj_3_8() { if (jj_scan_token(OR)) return true; - if (jj_scan_token(LBRACKET)) return true; + if (jj_scan_token(OR)) return true; return false; } - static private boolean jj_3R_150() + static private boolean jj_3R_130() { - if (jj_3R_31()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_165()) jj_scanpos = xsp; + if (jj_3R_33()) return true; return false; } - static private boolean jj_3R_156() + static private boolean jj_3R_155() { - if (jj_scan_token(E)) return true; - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_45()) return true; - if (jj_scan_token(RBRACKET)) return true; + if (jj_3R_168()) return true; return false; } - static private boolean jj_3R_66() + static private boolean jj_3R_154() { - if (jj_scan_token(OR)) return true; - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_31()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_77()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RBRACKET)) return true; - if (jj_scan_token(OR)) return true; - if (jj_3R_65()) return true; - return false; - } - - static private boolean jj_3_21() - { - if (jj_scan_token(C)) return true; - if (jj_scan_token(LE)) return true; - return false; - } - - static private boolean jj_3R_56() - { - if (jj_3R_65()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_66()) jj_scanpos = xsp; + if (jj_3R_167()) return true; return false; } - static private boolean jj_3R_148() + static private boolean jj_3R_153() { - if (jj_3R_160()) return true; + if (jj_3R_166()) return true; return false; } - static private boolean jj_3R_147() + static private boolean jj_3R_152() { - if (jj_3R_159()) return true; + if (jj_3R_165()) return true; return false; } - static private boolean jj_3R_211() + static private boolean jj_3R_54() { - if (jj_3R_45()) return true; + if (jj_scan_token(OR)) return true; + if (jj_scan_token(OR)) return true; + if (jj_3R_60()) return true; return false; } - static private boolean jj_3R_146() + static private boolean jj_3R_151() { - if (jj_3R_158()) return true; + if (jj_3R_164()) return true; return false; } - static private boolean jj_3_20() + static private boolean jj_3_10() { - if (jj_3R_40()) return true; + if (jj_scan_token(OR)) return true; + if (jj_scan_token(LBRACKET)) return true; return false; } - static private boolean jj_3R_210() + static private boolean jj_3R_127() { - if (jj_scan_token(I)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_3R_45()) return true; + if (jj_scan_token(LBRACE)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_130()) { + jj_scanpos = xsp; + if (jj_3R_131()) return true; + } + if (jj_scan_token(RBRACE)) return true; return false; } static private boolean jj_3R_145() { - if (jj_3R_157()) return true; + if (jj_scan_token(MINUS)) return true; return false; } - static private boolean jj_3R_209() + static private boolean jj_3R_150() { - if (jj_scan_token(C)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_151()) { + jj_scanpos = xsp; + if (jj_3R_152()) { + jj_scanpos = xsp; + if (jj_3R_153()) { + jj_scanpos = xsp; + if (jj_3R_154()) { + jj_scanpos = xsp; + if (jj_3R_155()) { + jj_scanpos = xsp; + if (jj_3R_156()) { + jj_scanpos = xsp; + if (jj_3R_157()) { + jj_scanpos = xsp; + if (jj_3R_158()) { + jj_scanpos = xsp; + if (jj_3R_159()) { + jj_scanpos = xsp; + if (jj_3R_160()) { + jj_scanpos = xsp; + if (jj_3R_161()) { + jj_scanpos = xsp; + if (jj_3R_162()) { + jj_scanpos = xsp; + if (jj_3R_163()) return true; + } + } + } + } + } + } + } + } + } + } + } + } return false; } - static private boolean jj_3_19() + static private boolean jj_3R_70() { + if (jj_scan_token(OR)) return true; + if (jj_scan_token(LBRACKET)) return true; if (jj_3R_32()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_81()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RBRACKET)) return true; + if (jj_scan_token(OR)) return true; + if (jj_3R_69()) return true; return false; } - static private boolean jj_3R_208() + static private boolean jj_3R_147() { - if (jj_scan_token(C)) return true; - if (jj_scan_token(LE)) return true; - if (jj_3R_45()) return true; + if (jj_3R_150()) return true; return false; } - static private boolean jj_3R_144() + static private boolean jj_3R_236() { - if (jj_3R_156()) return true; + if (jj_scan_token(DIVIDE)) return true; + if (jj_3R_127()) return true; return false; } - static private boolean jj_3R_134() + static private boolean jj_3R_60() { - if (jj_scan_token(DIVIDE)) return true; + if (jj_3R_69()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_70()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_143() + static private boolean jj_3R_146() { - if (jj_3R_155()) return true; + if (jj_scan_token(MINUS)) return true; + if (jj_3R_142()) return true; return false; } - static private boolean jj_3R_207() + static private boolean jj_3R_231() { - if (jj_scan_token(S)) return true; + if (jj_3R_127()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_236()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_181() + static private boolean jj_3R_142() { - if (jj_3R_54()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_146()) { + jj_scanpos = xsp; + if (jj_3R_147()) return true; + } return false; } - static private boolean jj_3R_142() + static private boolean jj_3R_148() { - if (jj_3R_40()) return true; + if (jj_scan_token(TIMES)) return true; return false; } - static private boolean jj_3R_206() + static private boolean jj_3R_143() { - if (jj_3R_40()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_148()) { + jj_scanpos = xsp; + if (jj_3R_149()) return true; + } + if (jj_3R_142()) return true; return false; } - static private boolean jj_3R_141() + static private boolean jj_3R_53() { - if (jj_3R_154()) return true; + if (jj_3R_60()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_61()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_227() + static private boolean jj_3_2() { - if (jj_3R_32()) return true; + if (jj_3R_33()) return true; + if (jj_scan_token(COLON)) return true; return false; } - static private boolean jj_3R_180() + static private boolean jj_3R_138() { + if (jj_3R_142()) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_206()) { - jj_scanpos = xsp; - if (jj_3R_207()) { - jj_scanpos = xsp; - if (jj_3R_208()) { - jj_scanpos = xsp; - if (jj_3R_209()) { - jj_scanpos = xsp; - if (jj_3R_210()) { - jj_scanpos = xsp; - if (jj_3R_211()) return true; - } - } - } - } + while (true) { + xsp = jj_scanpos; + if (jj_3R_143()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_140() + static private boolean jj_3R_217() { - if (jj_3R_153()) return true; + if (jj_3R_56()) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_139() + static private boolean jj_3R_144() { - if (jj_3R_152()) return true; + if (jj_scan_token(PLUS)) return true; return false; } - static private boolean jj_3_18() + static private boolean jj_3R_216() { - if (jj_3R_32()) return true; + if (jj_3R_231()) return true; return false; } - static private boolean jj_3R_138() + static private boolean jj_3R_215() { - if (jj_3R_151()) 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_137() + static private boolean jj_3R_220() { - if (jj_3R_150()) return true; + if (jj_scan_token(MAX)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_49() + static private boolean jj_3R_194() + { + if (jj_scan_token(RMAX)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; + return false; + } + + static private boolean jj_3R_139() { - if (jj_3R_56()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_57()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_144()) { + jj_scanpos = xsp; + if (jj_3R_145()) return true; } + if (jj_3R_138()) return true; return false; } - static private boolean jj_3_2() + static private boolean jj_3R_219() { - if (jj_3R_32()) return true; - if (jj_scan_token(COLON)) return true; + if (jj_scan_token(MIN)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_136() + static private boolean jj_3R_193() { - if (jj_3R_149()) return true; + if (jj_scan_token(RMIN)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_130() + static private boolean jj_3R_218() { - if (jj_scan_token(MINUS)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_221() + static private boolean jj_3R_50() { - if (jj_3R_32()) return true; + if (jj_3R_58()) return true; return false; } - static private boolean jj_3R_135() + static private boolean jj_3R_192() { + if (jj_scan_token(R)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_136()) { - jj_scanpos = xsp; - if (jj_3R_137()) { - jj_scanpos = xsp; - if (jj_3R_138()) { - jj_scanpos = xsp; - if (jj_3R_139()) { - jj_scanpos = xsp; - if (jj_3R_140()) { - jj_scanpos = xsp; - if (jj_3R_141()) { - jj_scanpos = xsp; - if (jj_3R_142()) { - jj_scanpos = xsp; - if (jj_3R_143()) { - jj_scanpos = xsp; - if (jj_3R_144()) { - jj_scanpos = xsp; - if (jj_3R_145()) { + if (jj_3R_215()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_216()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_217()) { jj_scanpos = xsp; - if (jj_3R_146()) { + if (jj_3R_218()) { jj_scanpos = xsp; - if (jj_3R_147()) { + if (jj_3R_219()) { jj_scanpos = xsp; - if (jj_3R_148()) return true; - } - } - } - } - } - } - } - } - } + if (jj_3R_220()) return true; } } } return false; } - static private boolean jj_3R_132() + static private boolean jj_3R_135() { - if (jj_3R_135()) return true; + if (jj_3R_138()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_139()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_223() + static private boolean jj_3R_170() { - if (jj_scan_token(DIVIDE)) return true; - if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_227()) { + if (jj_3R_192()) { jj_scanpos = xsp; - if (jj_3R_228()) return true; + if (jj_3R_193()) { + jj_scanpos = xsp; + if (jj_3R_194()) return true; } - if (jj_scan_token(RBRACE)) return true; + } + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_195()) return true; + xsp = jj_scanpos; + if (jj_3R_196()) jj_scanpos = xsp; + if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_131() + static private boolean jj_3R_46() { - if (jj_scan_token(MINUS)) return true; - if (jj_3R_127()) return true; + if (jj_3R_53()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_54()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_216() + static private boolean jj_3R_36() { - if (jj_scan_token(LBRACE)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_221()) { - jj_scanpos = xsp; - if (jj_3R_222()) return true; - } - if (jj_scan_token(RBRACE)) return true; - xsp = jj_scanpos; - if (jj_3R_223()) jj_scanpos = xsp; + if (jj_3R_46()) return true; return false; } - static private boolean jj_3R_42() + static private boolean jj_3R_136() { - if (jj_3R_49()) return true; + if (jj_3R_56()) return true; + if (jj_3R_135()) return true; + return false; + } + + static private boolean jj_3R_133() + { + if (jj_3R_135()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_50()) { jj_scanpos = xsp; break; } + if (jj_3R_136()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_127() + static private boolean jj_3_7() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_131()) { - jj_scanpos = xsp; - if (jj_3R_132()) return true; - } + if (jj_3R_33()) return true; + if (jj_3R_36()) return true; return false; } - static private boolean jj_3R_133() + static private boolean jj_3R_65() { - if (jj_scan_token(TIMES)) return true; + if (jj_scan_token(LE)) return true; return false; } - static private boolean jj_3R_128() + static private boolean jj_3R_64() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_133()) { - jj_scanpos = xsp; - if (jj_3R_134()) return true; - } - if (jj_3R_127()) return true; + if (jj_scan_token(GE)) return true; return false; } - static private boolean jj_3R_35() + static private boolean jj_3R_134() { - if (jj_3R_42()) return true; + if (jj_3R_137()) return true; + if (jj_3R_133()) return true; return false; } - static private boolean jj_3_7() + static private boolean jj_3R_63() { - if (jj_3R_32()) return true; - if (jj_3R_35()) return true; + if (jj_scan_token(LT)) return true; return false; } - static private boolean jj_3R_123() + static private boolean jj_3R_55() { - if (jj_3R_127()) 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_48() + { + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; + return false; + } + + static private boolean jj_3R_62() + { + if (jj_scan_token(GT)) return true; + return false; + } + + static private boolean jj_3R_56() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_62()) { + jj_scanpos = xsp; + if (jj_3R_63()) { + jj_scanpos = xsp; + if (jj_3R_64()) { + jj_scanpos = xsp; + if (jj_3R_65()) return true; + } + } + } + return false; + } + + static private boolean jj_3R_132() + { + if (jj_3R_133()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_128()) { jj_scanpos = xsp; break; } + if (jj_3R_134()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_202() + static private boolean jj_3R_47() { - if (jj_3R_52()) return true; - if (jj_3R_45()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_55()) jj_scanpos = xsp; + if (jj_3R_56()) return true; + if (jj_3R_49()) return true; return false; } static private boolean jj_3R_129() { - if (jj_scan_token(PLUS)) return true; + if (jj_3R_132()) return true; return false; } - static private boolean jj_3R_201() + static private boolean jj_3R_141() { - if (jj_3R_216()) return true; + if (jj_scan_token(NE)) return true; return false; } - static private boolean jj_3R_200() + static private boolean jj_3R_128() { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_36()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_scan_token(NOT)) return true; + if (jj_3R_125()) return true; return false; } - static private boolean jj_3R_205() + static private boolean jj_3R_137() { - if (jj_scan_token(MAX)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_140()) { + jj_scanpos = xsp; + if (jj_3R_141()) return true; + } return false; } - static private boolean jj_3R_179() + static private boolean jj_3R_140() { - if (jj_scan_token(RMAX)) return true; if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_124() + static private boolean jj_3R_44() { + if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_129()) { + if (jj_3R_47()) { jj_scanpos = xsp; - if (jj_3R_130()) return true; + if (jj_3R_48()) return true; } - if (jj_3R_123()) return true; + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_49()) return true; + xsp = jj_scanpos; + if (jj_3R_50()) jj_scanpos = xsp; + if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_204() + static private boolean jj_3R_125() { - if (jj_scan_token(MIN)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_128()) { + jj_scanpos = xsp; + if (jj_3R_129()) return true; + } return false; } - static private boolean jj_3R_178() + static private boolean jj_3R_78() { - if (jj_scan_token(RMIN)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_203() + static private boolean jj_3R_77() { - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_scan_token(MIN)) return true; return false; } - static private boolean jj_3R_46() + static private boolean jj_3R_59() { - if (jj_3R_54()) return true; + if (jj_scan_token(REG_IDENTPRIME)) return true; return false; } - static private boolean jj_3R_177() + static private boolean jj_3R_126() { - if (jj_scan_token(R)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_200()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_201()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_202()) { - jj_scanpos = xsp; - if (jj_3R_203()) { - jj_scanpos = xsp; - if (jj_3R_204()) { - jj_scanpos = xsp; - if (jj_3R_205()) return true; - } - } - } + if (jj_scan_token(AND)) return true; + if (jj_3R_125()) return true; return false; } - static private boolean jj_3R_120() + static private boolean jj_3R_122() { - if (jj_3R_123()) return true; + if (jj_3R_125()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_124()) { jj_scanpos = xsp; break; } + if (jj_3R_126()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_155() + static private boolean jj_3R_68() { + if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_177()) { + if (jj_3R_77()) { jj_scanpos = xsp; - if (jj_3R_178()) { - jj_scanpos = xsp; - if (jj_3R_179()) return true; - } + if (jj_3R_78()) return true; } - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_180()) return true; - xsp = jj_scanpos; - if (jj_3R_181()) jj_scanpos = xsp; - if (jj_scan_token(RBRACKET)) return true; - return false; - } - - static private boolean jj_3R_121() - { - if (jj_3R_52()) return true; - if (jj_3R_120()) return true; + if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_118() + static private boolean jj_3R_58() { - if (jj_3R_120()) return true; + if (jj_scan_token(LBRACE)) return true; + if (jj_3R_49()) return true; + if (jj_scan_token(RBRACE)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_121()) { jj_scanpos = xsp; break; } + if (jj_3R_68()) { jj_scanpos = xsp; break; } } return false; } @@ -4824,644 +4989,705 @@ fl.setLHS(s); static private boolean jj_3_1() { if (jj_scan_token(MODULE)) return true; - if (jj_3R_31()) return true; + if (jj_3R_32()) return true; if (jj_scan_token(EQ)) return true; return false; } - static private boolean jj_3R_119() + static private boolean jj_3R_123() { + if (jj_scan_token(OR)) return true; if (jj_3R_122()) return true; - if (jj_3R_118()) return true; return false; } - static private boolean jj_3R_51() + static private boolean jj_3R_112() { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_36()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_3R_122()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_123()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_44() + static private boolean jj_3R_121() { - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_117() + static private boolean jj_3R_119() { - if (jj_3R_118()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_119()) { jj_scanpos = xsp; break; } - } + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_43() + static private boolean jj_3R_117() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_51()) jj_scanpos = xsp; - if (jj_3R_52()) return true; - if (jj_3R_45()) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_116() + static private boolean jj_3_6() { - if (jj_3R_117()) return true; + if (jj_3R_33()) return true; return false; } - static private boolean jj_3_6() + static private boolean jj_3R_115() { - if (jj_3R_32()) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_61() + static private boolean jj_3R_235() { - if (jj_scan_token(LE)) return true; + if (jj_scan_token(COMMA)) return true; + if (jj_3R_33()) return true; + if (jj_scan_token(RENAME)) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_115() + static private boolean jj_3R_239() { - if (jj_scan_token(NOT)) return true; - if (jj_3R_113()) return true; + if (jj_scan_token(REG_QUOTED_STRING)) return true; return false; } - static private boolean jj_3R_60() + static private boolean jj_3R_238() { - if (jj_scan_token(GE)) return true; + if (jj_scan_token(REG_QUOTED_IDENT)) return true; return false; } - static private boolean jj_3R_59() + static private boolean jj_3R_230() { - if (jj_scan_token(LT)) return true; + if (jj_3R_234()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_235()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_58() + static private boolean jj_3R_113() { - if (jj_scan_token(GT)) return true; + if (jj_scan_token(IFF)) return true; + if (jj_3R_112()) return true; return false; } - static private boolean jj_3R_52() + static private boolean jj_3R_102() { + if (jj_3R_112()) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_58()) { - jj_scanpos = xsp; - if (jj_3R_59()) { - jj_scanpos = xsp; - if (jj_3R_60()) { - jj_scanpos = xsp; - if (jj_3R_61()) return true; - } - } + while (true) { + xsp = jj_scanpos; + if (jj_3R_113()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_40() + static private boolean jj_3R_234() { - if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_43()) { + if (jj_3R_238()) { jj_scanpos = xsp; - if (jj_3R_44()) return true; + if (jj_3R_239()) return true; } - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_45()) return true; - xsp = jj_scanpos; - if (jj_3R_46()) jj_scanpos = xsp; - if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_108() + static private boolean jj_3R_43() { - if (jj_3R_45()) return true; return false; } - static private boolean jj_3R_106() + static private boolean jj_3R_214() { - if (jj_3R_45()) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_104() + static private boolean jj_3R_103() { - if (jj_3R_45()) return true; + if (jj_scan_token(IMPLIES)) return true; + if (jj_3R_102()) return true; return false; } - static private boolean jj_3R_102() + static private boolean jj_3R_42() { - if (jj_3R_45()) return true; return false; } - static private boolean jj_3R_113() + static private boolean jj_3R_96() { + if (jj_3R_102()) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_115()) { - jj_scanpos = xsp; - if (jj_3R_116()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_103()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_126() + static private boolean jj_3R_34() { - if (jj_scan_token(NE)) return true; + if (jj_3R_33()) return true; return false; } - static private boolean jj_3R_122() + static private boolean jj_3_20() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_125()) { - jj_scanpos = xsp; - if (jj_3R_126()) return true; - } + jj_lookingAhead = true; + jj_semLA = getToken(1).kind==REG_IDENT + && getToken(2).kind==COLON; + jj_lookingAhead = false; + if (!jj_semLA || jj_3R_43()) return true; + if (jj_3R_37()) return true; return false; } - static private boolean jj_3R_125() + static private boolean jj_3R_97() { - if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; + if (jj_3R_96()) return true; + if (jj_scan_token(COLON)) return true; + if (jj_3R_86()) return true; return false; } - static private boolean jj_3R_74() + static private boolean jj_3R_41() { - if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_73() + static private boolean jj_3R_205() { - if (jj_scan_token(MIN)) return true; + if (jj_scan_token(OR)) return true; return false; } - static private boolean jj_3R_114() + static private boolean jj_3_19() { - if (jj_scan_token(AND)) return true; - if (jj_3R_113()) 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_42()) return true; + if (jj_scan_token(NOT)) return true; + if (jj_3R_37()) return true; + if (jj_scan_token(COLON)) return true; + if (jj_scan_token(LBRACE)) return true; + if (jj_3R_230()) return true; + if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_111() + static private boolean jj_3R_37() { - if (jj_3R_113()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_114()) { jj_scanpos = xsp; break; } - } + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_64() + static private boolean jj_3R_86() { - if (jj_scan_token(LBRACE)) return true; + if (jj_3R_96()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_73()) { - jj_scanpos = xsp; - if (jj_3R_74()) return true; - } - if (jj_scan_token(RBRACE)) return true; + if (jj_3R_97()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_54() + 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_41()) return true; + if (jj_3R_37()) return true; + if (jj_scan_token(COLON)) return true; if (jj_scan_token(LBRACE)) return true; - if (jj_3R_45()) return true; + if (jj_3R_230()) return true; if (jj_scan_token(RBRACE)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_64()) { jj_scanpos = xsp; break; } - } return false; } - static private boolean jj_3R_55() + static private boolean jj_3R_40() { - if (jj_scan_token(REG_IDENTPRIME)) return true; return false; } - static private boolean jj_3R_112() + static private boolean jj_3R_39() { - if (jj_scan_token(OR)) return true; - if (jj_3R_111()) return true; return false; } - static private boolean jj_3R_109() + static private boolean jj_3R_190() { - if (jj_3R_111()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_112()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3_18()) { + jj_scanpos = xsp; + if (jj_3_19()) { + jj_scanpos = xsp; + if (jj_3_20()) { + jj_scanpos = xsp; + if (jj_3R_214()) return true; + } + } } return false; } - static private boolean jj_3R_220() + static private boolean jj_3R_38() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_32()) return true; - if (jj_scan_token(RENAME)) return true; - if (jj_3R_45()) return true; return false; } - static private boolean jj_3R_48() + static private boolean jj_3R_52() { if (jj_scan_token(AND)) return true; - if (jj_3R_47()) return true; + if (jj_3R_51()) return true; return false; } - static private boolean jj_3R_215() + static private boolean jj_3R_124() { - if (jj_3R_219()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_220()) { jj_scanpos = xsp; break; } - } + if (jj_3R_127()) return true; return false; } - static private boolean jj_3R_110() + static private boolean jj_3R_33() { - if (jj_scan_token(IFF)) return true; - if (jj_3R_109()) return true; + if (jj_scan_token(REG_QUOTED_IDENT)) return true; return false; } - static private boolean jj_3R_99() + static private boolean jj_3_17() { - if (jj_3R_109()) 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_40()) return true; + if (jj_3R_32()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_110()) { jj_scanpos = xsp; break; } - } + xsp = jj_scanpos; + if (jj_3R_124()) jj_scanpos = xsp; + if (jj_3R_98()) return true; return false; } - static private boolean jj_3R_39() + static private boolean jj_3R_204() { + if (jj_scan_token(AND)) return true; return false; } - static private boolean jj_3R_226() + static private boolean jj_3R_202() { - if (jj_scan_token(REG_QUOTED_STRING)) return true; + if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_225() + static private boolean jj_3_16() { - if (jj_scan_token(REG_QUOTED_IDENT)) return true; + jj_lookingAhead = true; + jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps"); + jj_lookingAhead = false; + if (!jj_semLA || jj_3R_39()) return true; + if (jj_3R_32()) return true; + if (jj_3R_98()) return true; return false; } - static private boolean jj_3R_199() + static private boolean jj_3_15() { - if (jj_3R_45()) 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_38()) return true; + if (jj_3R_32()) return true; + if (jj_3R_98()) return true; return false; } - static private boolean jj_3R_47() + static private boolean jj_3R_110() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3_15()) { + jj_scanpos = xsp; + if (jj_3_16()) { + jj_scanpos = xsp; + if (jj_3_17()) return true; + } + } + return false; + } + + static private boolean jj_3R_32() + { + if (jj_scan_token(REG_IDENT)) return true; + return false; + } + + static private boolean jj_3R_51() { if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_55()) return true; + if (jj_3R_59()) return true; if (jj_scan_token(EQ)) return true; - if (jj_3R_45()) return true; + if (jj_3R_49()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_100() + static private boolean jj_3_14() { - if (jj_scan_token(IMPLIES)) return true; - if (jj_3R_99()) return true; + if (jj_3R_37()) return true; + if (jj_scan_token(LPARENTH)) return true; return false; } - static private boolean jj_3R_38() + static private boolean jj_3_13() { + if (jj_3R_37()) return true; + if (jj_scan_token(LPARENTH)) return true; return false; } - static private boolean jj_3R_89() + static private boolean jj_3R_111() { - if (jj_3R_99()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_100()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(COMMA)) return true; + if (jj_3R_110()) return true; return false; } - static private boolean jj_3R_219() + static private boolean jj_3_12() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_225()) { - jj_scanpos = xsp; - if (jj_3R_226()) return true; - } + if (jj_3R_37()) return true; + if (jj_scan_token(LPARENTH)) return true; return false; } - - static private boolean jj_3_17() - { - jj_lookingAhead = true; - jj_semLA = getToken(1).kind==REG_IDENT - && getToken(2).kind==COLON; - jj_lookingAhead = false; - if (!jj_semLA || jj_3R_39()) return true; - if (jj_3R_36()) return true; + + static private boolean jj_3R_210() + { + if (jj_3R_56()) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_90() + static private boolean jj_3R_209() { - if (jj_scan_token(QMARK)) return true; - if (jj_3R_89()) return true; - if (jj_scan_token(COLON)) return true; - if (jj_3R_82()) 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_37() + static private boolean jj_3_11() { + if (jj_3R_37()) return true; + if (jj_scan_token(LPARENTH)) return true; return false; } - static private boolean jj_3R_41() + static private boolean jj_3R_45() { - if (jj_3R_47()) return true; + if (jj_3R_51()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_48()) { jj_scanpos = xsp; break; } + if (jj_3R_52()) { jj_scanpos = xsp; break; } } return false; } + static private boolean jj_3R_207() + { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_49()) return true; + return false; + } + static private boolean jj_3_5() { - if (jj_3R_34()) return true; + if (jj_3R_35()) return true; return false; } - static private boolean jj_3R_34() + static private boolean jj_3R_99() { Token xsp; xsp = jj_scanpos; - if (jj_3R_41()) { - jj_scanpos = xsp; - if (jj_scan_token(54)) return true; + if (jj_scan_token(90)) jj_scanpos = xsp; + if (jj_scan_token(LBRACE)) return true; + if (jj_3R_110()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_111()) { jj_scanpos = xsp; break; } } + if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3_14() + static private boolean jj_3R_213() { - if (jj_3R_36()) return true; - if (jj_scan_token(LPARENTH)) return true; + if (jj_scan_token(MAX)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3_16() + static private boolean jj_3R_191() { - 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_38()) return true; - if (jj_scan_token(NOT)) return true; - if (jj_3R_36()) return true; - if (jj_scan_token(COLON)) return true; - if (jj_scan_token(LBRACE)) return true; - if (jj_3R_215()) return true; - if (jj_scan_token(RBRACE)) return true; + if (jj_3R_58()) return true; return false; } - static private boolean jj_3_13() + static private boolean jj_3R_35() { - if (jj_3R_36()) return true; - if (jj_scan_token(LPARENTH)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_45()) { + jj_scanpos = xsp; + if (jj_scan_token(54)) return true; + } return false; } - static private boolean jj_3R_33() + static private boolean jj_3R_212() { - if (jj_3R_32()) return true; + if (jj_scan_token(MIN)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3_12() + static private boolean jj_3R_211() { - if (jj_3R_36()) return true; - if (jj_scan_token(LPARENTH)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3_11() + static private boolean jj_3R_206() { - if (jj_3R_36()) return true; - if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_82() + static private boolean jj_3R_120() { - if (jj_3R_89()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_90()) jj_scanpos = xsp; + if (jj_3R_37()) return true; return false; } - static private boolean jj_3_15() + static private boolean jj_3R_203() { - 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_37()) return true; - if (jj_3R_36()) return true; - if (jj_scan_token(COLON)) return true; - if (jj_scan_token(LBRACE)) return true; - if (jj_3R_215()) return true; - if (jj_scan_token(RBRACE)) return true; + if (jj_scan_token(PLUS)) return true; return false; } - static private boolean jj_3R_107() + static private boolean jj_3R_118() { - if (jj_3R_36()) return true; + if (jj_3R_37()) return true; return false; } - static private boolean jj_3R_190() + static private boolean jj_3R_201() { - if (jj_scan_token(OR)) return true; + if (jj_scan_token(MIN)) return true; return false; } - static private boolean jj_3R_175() + static private boolean jj_3R_189() { - Token xsp; - xsp = jj_scanpos; - if (jj_3_15()) { - jj_scanpos = xsp; - if (jj_3_16()) { - jj_scanpos = xsp; - if (jj_3_17()) { - jj_scanpos = xsp; - if (jj_3R_199()) return true; - } - } - } + if (jj_scan_token(PMAX)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_105() + static private boolean jj_3R_116() { - if (jj_3R_36()) return true; + if (jj_3R_37()) return true; return false; } - static private boolean jj_3R_103() + static private boolean jj_3R_188() { - if (jj_3R_36()) return true; + if (jj_scan_token(PMIN)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_101() + static private boolean jj_3R_114() { - if (jj_3R_36()) return true; + if (jj_3R_37()) return true; return false; } - static private boolean jj_3R_36() + static private boolean jj_3R_109() { - if (jj_3R_31()) return true; + if (jj_scan_token(EQ)) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_96() + static private boolean jj_3R_108() { - if (jj_scan_token(EQ)) return true; - if (jj_3R_45()) return true; + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_49()) return true; + if (jj_scan_token(COMMA)) return true; + if (jj_3R_49()) return true; + if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_95() + static private boolean jj_3R_187() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_45()) return true; + if (jj_scan_token(P)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_209()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_210()) { + jj_scanpos = xsp; + if (jj_3R_211()) { + jj_scanpos = xsp; + if (jj_3R_212()) { + jj_scanpos = xsp; + if (jj_3R_213()) return true; + } + } + } + return false; + } + + static private boolean jj_3R_175() + { + if (jj_scan_token(FILTER)) return true; + if (jj_scan_token(LPARENTH)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_201()) { + jj_scanpos = xsp; + if (jj_3R_202()) { + jj_scanpos = xsp; + if (jj_3R_203()) { + jj_scanpos = xsp; + if (jj_3R_204()) { + jj_scanpos = xsp; + if (jj_3R_205()) { + jj_scanpos = xsp; + if (jj_3R_206()) return true; + } + } + } + } + } if (jj_scan_token(COMMA)) return true; - if (jj_3R_45()) return true; - if (jj_scan_token(RBRACKET)) return true; + if (jj_3R_49()) return true; + xsp = jj_scanpos; + if (jj_3R_207()) jj_scanpos = xsp; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_94() + static private boolean jj_3R_107() { if (jj_scan_token(GT)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_107()) { + if (jj_3R_120()) { jj_scanpos = xsp; - if (jj_3R_108()) return true; + if (jj_3R_121()) return true; } return false; } - static private boolean jj_3R_93() + static private boolean jj_3R_106() { if (jj_scan_token(GE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_105()) { + if (jj_3R_118()) { jj_scanpos = xsp; - if (jj_3R_106()) return true; + if (jj_3R_119()) return true; } return false; } - static private boolean jj_3R_92() + static private boolean jj_3R_105() { if (jj_scan_token(LT)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_103()) { + if (jj_3R_116()) { jj_scanpos = xsp; - if (jj_3R_104()) return true; + if (jj_3R_117()) return true; } return false; } - static private boolean jj_3R_91() + static private boolean jj_3R_169() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_187()) { + jj_scanpos = xsp; + if (jj_3R_188()) { + jj_scanpos = xsp; + if (jj_3R_189()) return true; + } + } + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_190()) return true; + xsp = jj_scanpos; + if (jj_3R_191()) jj_scanpos = xsp; + if (jj_scan_token(RBRACKET)) return true; + return false; + } + + static private boolean jj_3R_104() { if (jj_scan_token(LE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_101()) { + if (jj_3R_114()) { jj_scanpos = xsp; - if (jj_3R_102()) return true; + if (jj_3R_115()) return true; } return false; } - static private boolean jj_3R_83() + static private boolean jj_3R_98() { Token xsp; xsp = jj_scanpos; - if (jj_3R_91()) { + if (jj_3R_104()) { jj_scanpos = xsp; - if (jj_3R_92()) { + if (jj_3R_105()) { jj_scanpos = xsp; - if (jj_3R_93()) { + if (jj_3R_106()) { jj_scanpos = xsp; - if (jj_3R_94()) { + if (jj_3R_107()) { jj_scanpos = xsp; - if (jj_3R_95()) { + if (jj_3R_108()) { jj_scanpos = xsp; - if (jj_3R_96()) return true; + if (jj_3R_109()) return true; } } } @@ -5470,425 +5696,424 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_68() - { - if (jj_3R_82()) return true; - return false; - } - - static private boolean jj_3R_32() + static private boolean jj_3R_72() { - if (jj_scan_token(REG_QUOTED_IDENT)) return true; + if (jj_3R_86()) return true; return false; } - static private boolean jj_3R_81() + static private boolean jj_3R_95() { - if (jj_3R_83()) return true; + if (jj_3R_99()) return true; return false; } - static private boolean jj_3R_189() + static private boolean jj_3R_85() { - if (jj_scan_token(AND)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_94()) { + jj_scanpos = xsp; + if (jj_3R_95()) return true; + } return false; } - static private boolean jj_3R_187() + static private boolean jj_3R_94() { - if (jj_scan_token(MAX)) return true; + if (jj_3R_98()) return true; return false; } - static private boolean jj_3R_80() + static private boolean jj_3R_208() { - if (jj_scan_token(G)) return true; + if (jj_scan_token(COMMA)) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_79() + static private boolean jj_3R_186() { - if (jj_scan_token(F)) return true; + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_78() + static private boolean jj_3R_84() { - if (jj_scan_token(X)) return true; + if (jj_scan_token(G)) return true; return false; } - static private boolean jj_3R_195() + static private boolean jj_3R_83() { - if (jj_3R_52()) return true; - if (jj_3R_45()) return true; + if (jj_scan_token(F)) return true; return false; } - static private boolean jj_3R_194() + static private boolean jj_3R_174() { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_36()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_3R_34()) return true; return false; } - static private boolean jj_3R_31() + static private boolean jj_3R_82() { - if (jj_scan_token(REG_IDENT)) return true; + if (jj_scan_token(X)) return true; return false; } - static private boolean jj_3R_67() + static private boolean jj_3R_71() { Token xsp; xsp = jj_scanpos; - if (jj_3R_78()) { + if (jj_3R_82()) { jj_scanpos = xsp; - if (jj_3R_79()) { + if (jj_3R_83()) { jj_scanpos = xsp; - if (jj_3R_80()) return true; + if (jj_3R_84()) return true; } } xsp = jj_scanpos; - if (jj_3R_81()) jj_scanpos = xsp; - if (jj_3R_62()) return true; + if (jj_3R_85()) jj_scanpos = xsp; + if (jj_3R_66()) return true; return false; } - static private boolean jj_3R_198() + static private boolean jj_3R_229() { - if (jj_scan_token(MAX)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_3R_170()) return true; return false; } - static private boolean jj_3R_176() + static private boolean jj_3R_168() { - if (jj_3R_54()) return true; + if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_49()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_197() + static private boolean jj_3R_240() { - if (jj_scan_token(MIN)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(91)) { + jj_scanpos = xsp; + if (jj_scan_token(94)) return true; + } return false; } - static private boolean jj_3R_196() + static private boolean jj_3R_66() { - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_71()) { + jj_scanpos = xsp; + if (jj_3R_72()) return true; + } return false; } - static private boolean jj_3R_174() + static private boolean jj_3R_88() { - if (jj_scan_token(PMAX)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_3R_99()) return true; return false; } - static private boolean jj_3R_173() + static private boolean jj_3R_185() { - if (jj_scan_token(PMIN)) return true; - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_62() + static private boolean jj_3R_76() { Token xsp; xsp = jj_scanpos; - if (jj_3R_67()) { + if (jj_3R_87()) { jj_scanpos = xsp; - if (jj_3R_68()) return true; + if (jj_3R_88()) return true; } return false; } - static private boolean jj_3R_192() + static private boolean jj_3R_87() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_45()) return true; + if (jj_3R_98()) return true; return false; } - static private boolean jj_3R_172() + static private boolean jj_3R_179() { - if (jj_scan_token(P)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_195()) { - jj_scanpos = xsp; - if (jj_3R_196()) { - jj_scanpos = xsp; - if (jj_3R_197()) { - jj_scanpos = xsp; - if (jj_3R_198()) return true; - } - } - } + if (jj_scan_token(FALSE)) return true; return false; } - static private boolean jj_3R_72() + static private boolean jj_3R_241() { - if (jj_3R_83()) return true; + if (jj_scan_token(COMMA)) return true; + if (jj_3R_240()) return true; return false; } - static private boolean jj_3R_71() + static private boolean jj_3R_75() { if (jj_scan_token(R)) return true; return false; } - static private boolean jj_3R_191() + static private boolean jj_3R_237() { - if (jj_3R_31()) return true; + if (jj_3R_240()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_241()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_154() + static private boolean jj_3R_178() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_172()) { - jj_scanpos = xsp; - if (jj_3R_173()) { - jj_scanpos = xsp; - if (jj_3R_174()) return true; - } - } - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_175()) return true; - xsp = jj_scanpos; - if (jj_3R_176()) jj_scanpos = xsp; - if (jj_scan_token(RBRACKET)) return true; + if (jj_scan_token(TRUE)) return true; return false; } - static private boolean jj_3R_70() + static private boolean jj_3R_74() { if (jj_scan_token(W)) return true; return false; } - static private boolean jj_3R_188() + static private boolean jj_3R_73() { - if (jj_scan_token(PLUS)) return true; + if (jj_scan_token(U)) return true; return false; } - static private boolean jj_3R_69() + static private boolean jj_3R_233() { - if (jj_scan_token(U)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_237()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_186() + static private boolean jj_3R_232() { - if (jj_scan_token(MIN)) return true; + if (jj_scan_token(TIMES)) return true; return false; } - static private boolean jj_3R_63() + static private boolean jj_3R_227() { Token xsp; xsp = jj_scanpos; - if (jj_3R_69()) { + if (jj_3R_232()) { jj_scanpos = xsp; - if (jj_3R_70()) { - jj_scanpos = xsp; - if (jj_3R_71()) return true; - } + if (jj_3R_233()) return true; } - xsp = jj_scanpos; - if (jj_3R_72()) jj_scanpos = xsp; - if (jj_3R_62()) return true; return false; } - static private boolean jj_3R_160() + static private boolean jj_3R_67() { - if (jj_scan_token(FILTER)) return true; - if (jj_scan_token(LPARENTH)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_186()) { - jj_scanpos = xsp; - if (jj_3R_187()) { - jj_scanpos = xsp; - if (jj_3R_188()) { - jj_scanpos = xsp; - if (jj_3R_189()) { + if (jj_3R_73()) { jj_scanpos = xsp; - if (jj_3R_190()) { + if (jj_3R_74()) { jj_scanpos = xsp; - if (jj_3R_191()) return true; - } - } - } + if (jj_3R_75()) return true; } } - if (jj_scan_token(COMMA)) return true; - if (jj_3R_45()) return true; xsp = jj_scanpos; - if (jj_3R_192()) jj_scanpos = xsp; - if (jj_scan_token(RPARENTH)) return true; - return false; - } - - static private boolean jj_3R_193() - { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_45()) return true; + if (jj_3R_76()) jj_scanpos = xsp; + if (jj_3R_66()) return true; return false; } - static private boolean jj_3R_171() + static private boolean jj_3R_177() { - if (jj_3R_31()) return true; + if (jj_scan_token(REG_DOUBLE)) return true; return false; } - static private boolean jj_3R_53() + static private boolean jj_3R_57() { - if (jj_3R_62()) return true; + if (jj_3R_66()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_63()) jj_scanpos = xsp; - return false; - } - - static private boolean jj_3R_153() - { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_45()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_3R_67()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_97() + static private boolean jj_3R_200() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_31()) return true; + if (jj_3R_168()) return true; return false; } - static private boolean jj_3R_159() + static private boolean jj_3R_184() { - if (jj_3R_33()) return true; + if (jj_scan_token(MIN)) return true; return false; } - static private boolean jj_3R_214() + static private boolean jj_3R_228() { - if (jj_3R_155()) return true; + if (jj_3R_169()) return true; return false; } - static private boolean jj_3R_170() + static private boolean jj_3R_199() { - if (jj_scan_token(MAX)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_228()) { + jj_scanpos = xsp; + if (jj_3R_229()) return true; + } return false; } - static private boolean jj_3R_164() + static private boolean jj_3R_198() { - if (jj_scan_token(FALSE)) return true; + if (jj_scan_token(DLBRACKET)) return true; + if (jj_3R_227()) return true; + if (jj_scan_token(DRBRACKET)) return true; return false; } - static private boolean jj_3R_163() + static private boolean jj_3R_176() { - if (jj_scan_token(TRUE)) return true; + if (jj_scan_token(REG_INT)) return true; return false; } - static private boolean jj_3R_229() + static private boolean jj_3R_164() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(90)) { + if (jj_3R_176()) { jj_scanpos = xsp; - if (jj_scan_token(93)) return true; + if (jj_3R_177()) { + jj_scanpos = xsp; + if (jj_3R_178()) { + jj_scanpos = xsp; + if (jj_3R_179()) return true; + } + } } return false; } - static private boolean jj_3R_45() + static private boolean jj_3R_197() { - if (jj_3R_53()) return true; + if (jj_scan_token(DLT)) return true; + if (jj_3R_227()) return true; + if (jj_scan_token(DGT)) return true; return false; } - static private boolean jj_3R_230() + static private boolean jj_3R_100() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_229()) return true; + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_162() + static private boolean jj_3R_182() { - if (jj_scan_token(REG_DOUBLE)) return true; + if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_224() + static private boolean jj_3R_173() { - if (jj_3R_229()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_230()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_197()) { + jj_scanpos = xsp; + if (jj_3R_198()) return true; + } + xsp = jj_scanpos; + if (jj_3R_199()) { + jj_scanpos = xsp; + if (jj_3R_200()) return true; } return false; } - static private boolean jj_3R_218() + static private boolean jj_3R_183() { + if (jj_3R_49()) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_224()) jj_scanpos = xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_208()) { jj_scanpos = xsp; break; } + } return false; } - static private boolean jj_3R_217() + static private boolean jj_3R_131() { - if (jj_scan_token(TIMES)) return true; + if (jj_3R_49()) return true; return false; } - static private boolean jj_3R_212() + static private boolean jj_3R_167() { + if (jj_scan_token(FUNC)) return true; + if (jj_scan_token(LPARENTH)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_217()) { + if (jj_3R_184()) { + jj_scanpos = xsp; + if (jj_3R_185()) { jj_scanpos = xsp; - if (jj_3R_218()) return true; + if (jj_3R_186()) return true; } + } + if (jj_scan_token(COMMA)) return true; + if (jj_3R_183()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_169() + static private boolean jj_3R_49() + { + if (jj_3R_57()) return true; + return false; + } + + static private boolean jj_3R_172() + { + if (jj_scan_token(A)) return true; + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_49()) return true; + if (jj_scan_token(RBRACKET)) return true; + return false; + } + + static private boolean jj_3R_181() { if (jj_scan_token(MIN)) return true; return false; } - static private boolean jj_3R_161() + static private boolean jj_3R_166() { - if (jj_scan_token(REG_INT)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_181()) { + jj_scanpos = xsp; + if (jj_3R_182()) return true; + } + if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_183()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } @@ -5907,7 +6132,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[104]; + static final private int[] jj_la1 = new int[108]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -5919,18 +6144,18 @@ fl.setLHS(s); jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0xa28804c0,0xa08804c0,0x2000000,0x60340848,0x0,0x60340848,0x60340848,0x0,0x60340848,0x400,0x80000000,0x80,0x80000480,0x10000210,0x10000210,0x0,0x40,0x0,0x2000000,0x10000030,0x0,0x4000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400000,0x0,0x41740808,0x41740808,0x41740808,0x41740808,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x40340808,0x0,0x40000000,0x40000000,0x0,0x40000,0x0,0x40000000,0x0,0x0,0x41740808,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x41740808,0x41740808,0x0,0x0,0x49740908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0xa28804c0,0xa08804c0,0x2000000,0x60340848,0x0,0x60340848,0x60340848,0x0,0x60340848,0x400,0x80000000,0x80,0x80000480,0x10000210,0x10000210,0x0,0x40,0x0,0x2000000,0x10000030,0x0,0x4000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400000,0x0,0x0,0x41740808,0x41740808,0x41740808,0x41740808,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x40340808,0x0,0x40000000,0x40000000,0x0,0x40000,0x0,0x40000000,0x0,0x0,0x41740808,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x41740808,0x0,0x49740908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x30fe3a,0x107e08,0x208032,0x24f51c1,0x0,0x24f51c1,0x24f51c1,0x0,0x24f51c1,0x800,0x8,0x100000,0x102e08,0x0,0x0,0x5000,0x5000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24f01c5,0x4000000,0x400000,0x0,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1840000,0x0,0x1840000,0x4,0x0,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x0,0x0,0x10000000,0x20000000,0x8000000,0x4000000,0x24f01c1,0x0,0x0,0x0,0x0,0x0,0x0,0x4f01c1,0x4f01c1,0x0,0x1,0x1,0x0,0x400000,0x0,0x1,0x1c0,0x0,0x24f01c5,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x70000,0x0,0x24f01c5,0x24f01c5,0x0,0x80000,0x24f01c5,0x0,0x701c0,0x701c0,0x0,0x0,0x0,0x0,0xc000001,0x0,0x0,0x1,0x0,0x0,0x80000000,}; + jj_la1_1 = new int[] {0x30fe3a,0x107e08,0x208032,0x24f51c1,0x0,0x24f51c1,0x24f51c1,0x0,0x24f51c1,0x800,0x8,0x100000,0x102e08,0x0,0x0,0x5000,0x5000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24f01c5,0x4000000,0x400000,0x0,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1840000,0x0,0x0,0x1840000,0x4,0x0,0x0,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x10000000,0x20000000,0x8000000,0x4000000,0x24f01c1,0x0,0x0,0x0,0x0,0x0,0x0,0x4f01c1,0x4f01c1,0x0,0x1,0x1,0x0,0x400000,0x0,0x1,0x1c0,0x0,0x24f01c5,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x70000,0x0,0x0,0x24f01c5,0x80000,0x24f01c5,0x0,0x701c0,0x701c0,0x0,0x0,0x0,0x0,0xc000001,0x0,0x0,0x1,0x0,0x0,0x80000000,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x6c108088,0x1,0x6c108088,0x6c108088,0x1,0x6c108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x20000000,0x0,0x20,0x20000000,0x80000,0x6c108088,0x0,0x8,0x2,0x6c1080a8,0x20000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0x60000008,0x0,0x66820,0x0,0x0,0x66820,0x6c108088,0x6c108088,0x6c108088,0x6c108088,0x6c108088,0x66820,0x2000000,0x0,0x0,0x0,0x0,0x6c108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0x6c108088,0x6c008088,0x8,0x0,0x20000000,0x2,0xc000000,0x8,0x66800,0x0,0x200,0x6c108088,0x2,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x66800,0x0,0x200,0x6c108088,0x6c108088,0x400000,0x0,0x6c108088,0x8080,0x0,0x8,0x2,0x24000000,0x200000,0x24000000,0x20080000,0x2,0xc0000000,0x20000000,0x1800,0x66000,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0xd8108088,0x1,0xd8108088,0xd8108088,0x1,0xd8108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x40000000,0x0,0x20,0x40000000,0x80000,0xd8108088,0x0,0x8,0x2,0xd81080a8,0x40000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0xc0000008,0x0,0x4066a20,0x4066a20,0x0,0x0,0x4066a20,0x4066a20,0xd8108088,0xd8108088,0xd8108088,0xd8108088,0xd8108088,0x66820,0x4000000,0x2,0x200,0x2000000,0x0,0x0,0x0,0x0,0xd8108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0xd8108088,0xd8008088,0x8,0x0,0x40000000,0x2,0x18000000,0x8,0x66800,0x0,0x200,0xd8108088,0x2,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x66800,0x0,0x200,0x400000,0xd8108088,0x0,0xd8108088,0x8080,0x0,0x8,0x2,0x48000000,0x200000,0x48000000,0x40080000,0x2,0x80000000,0x40000000,0x1800,0x66000,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,}; } - static final private JJCalls[] jj_2_rtns = new JJCalls[21]; + static final private JJCalls[] jj_2_rtns = new JJCalls[23]; static private boolean jj_rescan = false; static private int jj_gc = 0; @@ -5952,7 +6177,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 104; i++) jj_la1[i] = -1; + for (int i = 0; i < 108; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5967,7 +6192,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 104; i++) jj_la1[i] = -1; + for (int i = 0; i < 108; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5985,7 +6210,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 104; i++) jj_la1[i] = -1; + for (int i = 0; i < 108; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5996,7 +6221,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 104; i++) jj_la1[i] = -1; + for (int i = 0; i < 108; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6013,7 +6238,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 104; i++) jj_la1[i] = -1; + for (int i = 0; i < 108; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6023,7 +6248,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 104; i++) jj_la1[i] = -1; + for (int i = 0; i < 108; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6149,12 +6374,12 @@ fl.setLHS(s); /** Generate ParseException. */ static public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[98]; + boolean[] la1tokens = new boolean[99]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 104; i++) { + for (int i = 0; i < 108; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<", "", "", diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java index fec19d04..5e53f5ab 100644 --- a/prism/src/parser/PrismParserTokenManager.java +++ b/prism/src/parser/PrismParserTokenManager.java @@ -24,13 +24,13 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac switch (pos) { case 0: + if ((active0 & 0x18f01c409400908L) != 0L) + return 31; if ((active0 & 0x70fe3bf6bff6f0L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; return 31; } - if ((active0 & 0x18f01c409400908L) != 0L) - return 31; if ((active1 & 0x400000L) != 0L) return 1; if ((active1 & 0x4L) != 0L) @@ -41,7 +41,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { if (jjmatchedPos != 1) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 1; } return 31; @@ -52,7 +52,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac return 31; if ((active0 & 0x73defa26bff6f0L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 2; return 31; } @@ -64,46 +64,46 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { if (jjmatchedPos != 3) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 3; } return 31; } return -1; case 4: + if ((active0 & 0x60020040060L) != 0L) + return 31; if ((active0 & 0x30883a049bf200L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 4; return 31; } - if ((active0 & 0x60020040060L) != 0L) - return 31; return -1; case 5: if ((active0 & 0x20000200900200L) != 0L) return 31; if ((active0 & 0x108838040bf000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 5; return 31; } return -1; case 6: + if ((active0 & 0x800000081000L) != 0L) + return 31; if ((active0 & 0x1008380403e000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 6; return 31; } - if ((active0 & 0x800000081000L) != 0L) - return 31; return -1; case 7: if ((active0 & 0x1008380403e000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 7; return 31; } @@ -113,7 +113,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac return 31; if ((active0 & 0x1008380001a000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 8; return 31; } @@ -125,7 +125,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { if (jjmatchedPos != 9) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 9; } return 31; @@ -136,7 +136,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac return 31; if ((active0 & 0x8080000a000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 10; return 31; } @@ -146,7 +146,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac return 31; if ((active0 & 0x80800008000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 11; return 31; } @@ -156,7 +156,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac return 31; if ((active0 & 0x800008000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 12; return 31; } @@ -166,7 +166,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac return 31; if ((active0 & 0x800000000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 13; return 31; } @@ -174,7 +174,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac case 14: if ((active0 & 0x800000000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 14; return 31; } @@ -266,6 +266,8 @@ static private int jjMoveStringLiteralDfa0_0(){ case 93: jjmatchedKind = 70; return jjMoveStringLiteralDfa1_0(0x0L, 0x100L); + case 94: + return jjStopAtPos(0, 90); case 98: return jjMoveStringLiteralDfa1_0(0x10L, 0x0L); case 99: @@ -911,14 +913,14 @@ static private int jjMoveNfa_0(int startState, int curPos) case 31: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; { jjCheckNAdd(22); } } else if (curChar == 39) { - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; } if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(20, 21); } @@ -926,8 +928,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 0: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; { jjCheckNAddStates(0, 3); } } else if ((0x100002600L & l) != 0L) @@ -945,14 +947,14 @@ static private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 90) - kind = 90; + if (kind > 91) + kind = 91; { jjCheckNAdd(8); } } else if (curChar == 48) { - if (kind > 90) - kind = 90; + if (kind > 91) + kind = 91; } break; case 1: @@ -988,20 +990,20 @@ static private int jjMoveNfa_0(int startState, int curPos) case 7: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; + if (kind > 91) + kind = 91; { jjCheckNAdd(8); } break; case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; + if (kind > 91) + kind = 91; { jjCheckNAdd(8); } break; case 9: - if (curChar == 48 && kind > 90) - kind = 90; + if (curChar == 48 && kind > 91) + kind = 91; break; case 10: if (curChar == 46) @@ -1010,8 +1012,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; { jjCheckNAddTwoStates(11, 12); } break; case 13: @@ -1021,8 +1023,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; { jjCheckNAdd(14); } break; case 15: @@ -1034,14 +1036,14 @@ static private int jjMoveNfa_0(int startState, int curPos) { jjCheckNAddTwoStates(16, 17); } break; case 17: - if (curChar == 35 && kind > 96) - kind = 96; + if (curChar == 35 && kind > 97) + kind = 97; break; case 18: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; { jjCheckNAddStates(0, 3); } break; case 20: @@ -1049,14 +1051,14 @@ static private int jjMoveNfa_0(int startState, int curPos) { jjCheckNAddTwoStates(20, 21); } break; case 21: - if (curChar == 39 && kind > 92) - kind = 92; + if (curChar == 39 && kind > 93) + kind = 93; break; case 22: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; { jjCheckNAdd(22); } break; case 23: @@ -1068,8 +1070,8 @@ static private int jjMoveNfa_0(int startState, int curPos) { jjAddStates(11, 12); } break; case 26: - if (curChar == 34 && kind > 94) - kind = 94; + if (curChar == 34 && kind > 95) + kind = 95; break; case 28: { jjCheckNAddStates(13, 15); } @@ -1079,8 +1081,8 @@ static private int jjMoveNfa_0(int startState, int curPos) { jjCheckNAddStates(13, 15); } break; case 30: - if (curChar == 34 && kind > 95) - kind = 95; + if (curChar == 34 && kind > 96) + kind = 96; break; default : break; } @@ -1096,8 +1098,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 31: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; { jjCheckNAdd(22); } } if ((0x7fffffe87fffffeL & l) != 0L) @@ -1106,8 +1108,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 0: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; { jjCheckNAddStates(16, 18); } break; case 2: @@ -1129,8 +1131,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 22: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; { jjCheckNAdd(22); } break; case 24: @@ -1234,7 +1236,7 @@ public static final String[] jjstrLiteralImages = { "\174", "\75\76", "\74\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", "\133", "\135", "\133\133", "\135\135", "\173", "\175", "\75", "\41\75", "\74", "\76", "\74\74", "\76\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", -"\77", null, null, null, null, null, null, null, null, }; +"\77", "\136", null, null, null, null, null, null, null, null, }; static protected Token jjFillToken() { final Token t; @@ -1292,9 +1294,9 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 97) + if (jjmatchedPos == 0 && jjmatchedKind > 98) { - jjmatchedKind = 97; + jjmatchedKind = 98; } if (jjmatchedKind != 0x7fffffff) { @@ -1427,7 +1429,7 @@ public static final String[] lexStateNames = { "DEFAULT", }; static final long[] jjtoToken = { - 0xfffffffffffffff9L, 0x3ffffffffL, + 0xfffffffffffffff9L, 0x7ffffffffL, }; static final long[] jjtoSkip = { 0x6L, 0x0L,