From d845082799cf5832fd662c249609ae85425f28b6 Mon Sep 17 00:00:00 2001 From: kpouer Date: Mon, 11 Aug 2003 21:30:29 +0000 Subject: [PATCH] some bugfixes --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 872 ++++++++++---------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 14 +- .../src/test/PHPParserConstants.java | 2 +- .../src/test/PHPParserTokenManager.java | 12 +- 4 files changed, 473 insertions(+), 427 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 712dbc0..bd8c4a3 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -949,32 +949,50 @@ Variable Variable(): } static final public Variable Var(final Token dollar) throws ParseException { - Variable variable; + Variable variable = null; final Token token; ConstantIdentifier constant; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR_ID: token = jj_consume_token(DOLLAR_ID); - variable = Var(token); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLAR: + case IDENTIFIER: + case LBRACE: + case DOLLAR_ID: + variable = Var(token); + break; + default: + jj_la1[14] = jj_gen; + ; + } + if (variable == null) { + {if (true) return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd);} + } final StringBuffer buff = new StringBuffer(); buff.append(token.image.substring(1)); buff.append(variable.toStringExpression()); {if (true) return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);} break; - case DOLLAR: - token = jj_consume_token(DOLLAR); - variable = Var(token); + default: + jj_la1[15] = jj_gen; + if (jj_2_2(2147483647)) { + token = jj_consume_token(DOLLAR); + variable = Var(token); {if (true) return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} - break; - case IDENTIFIER: - case LBRACE: - constant = VariableName(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + case LBRACE: + constant = VariableName(); {if (true) return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);} - break; - default: - jj_la1[14] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + break; + default: + jj_la1[16] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } } throw new Error("Missing return statement in function"); } @@ -1016,7 +1034,7 @@ Variable Variable(): token2 = jj_consume_token(RBRACE); break; default: - jj_la1[15] = jj_gen; + jj_la1[17] = jj_gen; ; } if (expression == null) { @@ -1036,7 +1054,7 @@ Variable Variable(): token2.sourceEnd);} break; default: - jj_la1[16] = jj_gen; + jj_la1[18] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1066,7 +1084,7 @@ Variable Variable(): token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[17] = jj_gen; + jj_la1[19] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1084,7 +1102,7 @@ Variable Variable(): token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[18] = jj_gen; + jj_la1[20] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1101,7 +1119,7 @@ Variable Variable(): {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[19] = jj_gen; + jj_la1[21] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1118,7 +1136,7 @@ final Expression expr,expr2; {if (true) return new ArrayVariableDeclaration(expr,expr2);} break; default: - jj_la1[20] = jj_gen; + jj_la1[22] = jj_gen; ; } {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} @@ -1155,7 +1173,7 @@ final Expression expr,expr2; list.add(expr); label_6: while (true) { - if (jj_2_2(2)) { + if (jj_2_3(2)) { ; } else { break label_6; @@ -1166,7 +1184,7 @@ final Expression expr,expr2; } break; default: - jj_la1[21] = jj_gen; + jj_la1[23] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1175,7 +1193,7 @@ final Expression expr,expr2; list.add(null); break; default: - jj_la1[22] = jj_gen; + jj_la1[24] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1230,7 +1248,7 @@ final Expression expr,expr2; reference = jj_consume_token(BIT_AND); break; default: - jj_la1[23] = jj_gen; + jj_la1[25] = jj_gen; ; } try { @@ -1297,7 +1315,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[24] = jj_gen; + jj_la1[26] = jj_gen; break label_7; } jj_consume_token(COMMA); @@ -1306,7 +1324,7 @@ final Expression expr,expr2; } break; default: - jj_la1[25] = jj_gen; + jj_la1[27] = jj_gen; ; } try { @@ -1336,7 +1354,7 @@ final Expression expr,expr2; token = jj_consume_token(BIT_AND); break; default: - jj_la1[26] = jj_gen; + jj_la1[28] = jj_gen; ; } variableDeclaration = VariableDeclaratorNoSuffix(); @@ -1387,7 +1405,7 @@ final Expression expr,expr2; {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[27] = jj_gen; + jj_la1[29] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1447,7 +1465,7 @@ final Expression expr,expr2; } break; default: - jj_la1[28] = jj_gen; + jj_la1[30] = jj_gen; ; } if (assignOperator != -1) {// todo : change this, very very bad :( @@ -1474,7 +1492,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[29] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1496,7 +1514,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[30] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1515,7 +1533,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[31] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1581,7 +1599,7 @@ final Expression expr,expr2; {if (true) return VariableDeclaration.TILDE_EQUAL;} break; default: - jj_la1[32] = jj_gen; + jj_la1[34] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1601,7 +1619,7 @@ final Expression expr,expr2; expr3 = ConditionalExpression(); break; default: - jj_la1[33] = jj_gen; + jj_la1[35] = jj_gen; ; } if (expr3 == null) { @@ -1623,7 +1641,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[34] = jj_gen; + jj_la1[36] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1636,7 +1654,7 @@ final Expression expr,expr2; operator = OperatorIds.ORL; break; default: - jj_la1[35] = jj_gen; + jj_la1[37] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1659,7 +1677,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[36] = jj_gen; + jj_la1[38] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1672,7 +1690,7 @@ final Expression expr,expr2; operator = OperatorIds.ANDL; break; default: - jj_la1[37] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1693,7 +1711,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[38] = jj_gen; + jj_la1[40] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1714,7 +1732,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[39] = jj_gen; + jj_la1[41] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1735,7 +1753,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[40] = jj_gen; + jj_la1[42] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1756,7 +1774,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[41] = jj_gen; + jj_la1[43] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1782,7 +1800,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[42] = jj_gen; + jj_la1[44] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1807,7 +1825,7 @@ final Expression expr,expr2; operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: - jj_la1[43] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1843,7 +1861,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[44] = jj_gen; + jj_la1[46] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1864,7 +1882,7 @@ final Expression expr,expr2; operator = OperatorIds.GREATER_EQUAL; break; default: - jj_la1[45] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1888,7 +1906,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[46] = jj_gen; + jj_la1[48] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1905,7 +1923,7 @@ final Expression expr,expr2; operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; break; default: - jj_la1[47] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1928,7 +1946,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[48] = jj_gen; + jj_la1[50] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1941,7 +1959,7 @@ final Expression expr,expr2; operator = OperatorIds.MINUS; break; default: - jj_la1[49] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1974,7 +1992,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[50] = jj_gen; + jj_la1[52] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1991,7 +2009,7 @@ final Expression expr,expr2; operator = OperatorIds.REMAINDER; break; default: - jj_la1[51] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2054,7 +2072,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[52] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2101,7 +2119,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[53] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2122,7 +2140,7 @@ final Token token; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[54] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2133,7 +2151,7 @@ final Token token; static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { final Expression expr; - if (jj_2_3(2147483647)) { + if (jj_2_4(2147483647)) { expr = CastExpression(); {if (true) return expr;} } else { @@ -2171,7 +2189,7 @@ final Token token; {if (true) return expr;} break; default: - jj_la1[55] = jj_gen; + jj_la1[57] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2201,7 +2219,7 @@ final Token token,token1; type = new ConstantIdentifier(token); break; default: - jj_la1[56] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2229,13 +2247,13 @@ final Token token,token1; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[57] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[58] = jj_gen; + jj_la1[60] = jj_gen; ; } if (operator == -1) { @@ -2259,7 +2277,7 @@ final Token token,token1; token = jj_consume_token(BIT_AND); break; default: - jj_la1[59] = jj_gen; + jj_la1[61] = jj_gen; ; } expr = refPrimaryExpression(token); @@ -2270,7 +2288,7 @@ final Token token,token1; {if (true) return expr;} break; default: - jj_la1[60] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2294,7 +2312,7 @@ final Token token,token1; ; break; default: - jj_la1[61] = jj_gen; + jj_la1[63] = jj_gen; break label_19; } jj_consume_token(STATICCLASSACCESS); @@ -2308,7 +2326,7 @@ final Token token,token1; expr2 = Arguments(expr); break; default: - jj_la1[62] = jj_gen; + jj_la1[64] = jj_gen; ; } if (expr2 == null) { @@ -2332,7 +2350,7 @@ final Token token,token1; expr = Arguments(expr); break; default: - jj_la1[63] = jj_gen; + jj_la1[65] = jj_gen; ; } {if (true) return expr;} @@ -2354,13 +2372,13 @@ final Token token,token1; expr = Arguments(expr); break; default: - jj_la1[64] = jj_gen; + jj_la1[66] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[65] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2408,7 +2426,7 @@ final Token token,token1; {if (true) return expr;} break; default: - jj_la1[66] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2507,13 +2525,13 @@ final Token token,token1; expression = Type(); break; default: - jj_la1[67] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[68] = jj_gen; + jj_la1[70] = jj_gen; ; } try { @@ -2528,7 +2546,7 @@ final Token token,token1; {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} break; default: - jj_la1[69] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2563,7 +2581,7 @@ final Token token,token1; {if (true) return new NullLiteral(token);} break; default: - jj_la1[70] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2599,7 +2617,7 @@ final Token token; args = ArgumentList(); break; default: - jj_la1[71] = jj_gen; + jj_la1[73] = jj_gen; ; } try { @@ -2632,7 +2650,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[72] = jj_gen; + jj_la1[74] = jj_gen; break label_20; } jj_consume_token(COMMA); @@ -2660,7 +2678,7 @@ final ArrayList list = new ArrayList(); static final public Statement StatementNoBreak() throws ParseException { final Statement statement; Token token = null; - if (jj_2_4(2)) { + if (jj_2_5(2)) { statement = expressionStatement(); {if (true) return statement;} } else { @@ -2723,7 +2741,7 @@ final ArrayList list = new ArrayList(); token = jj_consume_token(AT); break; default: - jj_la1[73] = jj_gen; + jj_la1[75] = jj_gen; ; } statement = IncludeStatement(); @@ -2746,7 +2764,7 @@ final ArrayList list = new ArrayList(); currentSegment.add((Outlineable)statement);{if (true) return statement;} break; default: - jj_la1[74] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2889,7 +2907,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[75] = jj_gen; + jj_la1[77] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2911,7 +2929,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[76] = jj_gen; + jj_la1[78] = jj_gen; break label_21; } phpEchoBlock(); @@ -2925,7 +2943,7 @@ final ArrayList list = new ArrayList(); jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[77] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2970,7 +2988,7 @@ final ArrayList list = new ArrayList(); keyword = InclusionStatement.INCLUDE_ONCE; break; default: - jj_la1[78] = jj_gen; + jj_la1[80] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3036,7 +3054,7 @@ final ArrayList list = new ArrayList(); list.add(expr); break; default: - jj_la1[79] = jj_gen; + jj_la1[81] = jj_gen; ; } if (expr == null) list.add(null); @@ -3047,7 +3065,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[80] = jj_gen; + jj_la1[82] = jj_gen; break label_22; } try { @@ -3066,7 +3084,7 @@ final ArrayList list = new ArrayList(); list.add(expr); break; default: - jj_la1[81] = jj_gen; + jj_la1[83] = jj_gen; ; } } @@ -3091,7 +3109,7 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[82] = jj_gen; + jj_la1[84] = jj_gen; ; } final Variable[] vars = new Variable[list.size()]; @@ -3119,7 +3137,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[83] = jj_gen; + jj_la1[85] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -3161,7 +3179,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[84] = jj_gen; + jj_la1[86] = jj_gen; break label_24; } jj_consume_token(COMMA); @@ -3202,7 +3220,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[85] = jj_gen; + jj_la1[87] = jj_gen; break label_25; } jj_consume_token(COMMA); @@ -3305,7 +3323,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[86] = jj_gen; + jj_la1[88] = jj_gen; break label_26; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3359,7 +3377,7 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[87] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3446,7 +3464,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[88] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3512,7 +3530,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[89] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3534,7 +3552,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[90] = jj_gen; + jj_la1[92] = jj_gen; break label_27; } jj_consume_token(COMMA); @@ -3560,7 +3578,7 @@ final ArrayList list = new ArrayList(); initializer = Expression(); break; default: - jj_la1[91] = jj_gen; + jj_la1[93] = jj_gen; ; } if (initializer == null) { @@ -3620,19 +3638,19 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[92] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[93] = jj_gen; + jj_la1[95] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[94] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3682,7 +3700,7 @@ final ArrayList list = new ArrayList(); cases = switchStatementColon(pos, pos + 6); break; default: - jj_la1[95] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3702,7 +3720,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[96] = jj_gen; + jj_la1[98] = jj_gen; break label_28; } cas = switchLabel0(); @@ -3750,7 +3768,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[97] = jj_gen; + jj_la1[99] = jj_gen; break label_29; } cas = switchLabel0(); @@ -3834,7 +3852,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[98] = jj_gen; + jj_la1[100] = jj_gen; break label_30; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3887,7 +3905,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[99] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3898,7 +3916,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[100] = jj_gen; + jj_la1[102] = jj_gen; ; } final Statement[] stmtsArray = new Statement[stmts.size()]; @@ -3956,7 +3974,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[101] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3992,7 +4010,7 @@ final ArrayList list = new ArrayList(); expression = Expression(); break; default: - jj_la1[102] = jj_gen; + jj_la1[104] = jj_gen; ; } try { @@ -4108,7 +4126,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[103] = jj_gen; + jj_la1[105] = jj_gen; break label_31; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4160,7 +4178,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[104] = jj_gen; + jj_la1[106] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4173,7 +4191,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[105] = jj_gen; + jj_la1[107] = jj_gen; break label_32; } elseifStatement = ElseIfStatementColon(); @@ -4184,7 +4202,7 @@ final ArrayList list = new ArrayList(); elseStatement = ElseStatementColon(); break; default: - jj_la1[106] = jj_gen; + jj_la1[108] = jj_gen; ; } try { @@ -4323,7 +4341,7 @@ final ArrayList list = new ArrayList(); stmt = htmlBlock(); break; default: - jj_la1[107] = jj_gen; + jj_la1[109] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4334,7 +4352,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[108] = jj_gen; + jj_la1[110] = jj_gen; break label_33; } elseifStatement = ElseIfStatement(); @@ -4359,7 +4377,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[109] = jj_gen; + jj_la1[111] = jj_gen; ; } elseIfs = new ElseIf[elseIfList.size()]; @@ -4372,7 +4390,7 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[110] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4434,7 +4452,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[111] = jj_gen; + jj_la1[113] = jj_gen; break label_34; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4486,7 +4504,7 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4550,7 +4568,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[113] = jj_gen; + jj_la1[115] = jj_gen; break label_35; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4602,7 +4620,7 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4692,7 +4710,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[115] = jj_gen; + jj_la1[117] = jj_gen; break label_36; } statement = Statement(); @@ -4774,7 +4792,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[116] = jj_gen; + jj_la1[118] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4902,7 +4920,7 @@ final int startBlock, endBlock; initializations = ForInit(); break; default: - jj_la1[117] = jj_gen; + jj_la1[119] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4931,7 +4949,7 @@ final int startBlock, endBlock; condition = Expression(); break; default: - jj_la1[118] = jj_gen; + jj_la1[120] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4947,7 +4965,7 @@ final int startBlock, endBlock; increments = StatementExpressionList(); break; default: - jj_la1[119] = jj_gen; + jj_la1[121] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5049,7 +5067,7 @@ final int startBlock, endBlock; ; break; default: - jj_la1[120] = jj_gen; + jj_la1[122] = jj_gen; break label_37; } action = Statement(); @@ -5096,7 +5114,7 @@ final int startBlock, endBlock; } break; default: - jj_la1[121] = jj_gen; + jj_la1[123] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5105,7 +5123,7 @@ final int startBlock, endBlock; static final public Expression[] ForInit() throws ParseException { final Expression[] exprs; - if (jj_2_5(2147483647)) { + if (jj_2_6(2147483647)) { exprs = LocalVariableDeclaration(); {if (true) return exprs;} } else { @@ -5122,7 +5140,7 @@ final int startBlock, endBlock; {if (true) return exprs;} break; default: - jj_la1[122] = jj_gen; + jj_la1[124] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5142,7 +5160,7 @@ final int startBlock, endBlock; ; break; default: - jj_la1[123] = jj_gen; + jj_la1[125] = jj_gen; break label_38; } jj_consume_token(COMMA); @@ -5184,7 +5202,7 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[124] = jj_gen; + jj_la1[126] = jj_gen; ; } try { @@ -5229,7 +5247,7 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[125] = jj_gen; + jj_la1[127] = jj_gen; ; } try { @@ -5280,16 +5298,11 @@ final int startBlock, endBlock; return retval; } - static final private boolean jj_3R_116() { - if (jj_3R_118()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_119()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; + static final private boolean jj_2_6(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + boolean retval = !jj_3_6(); + jj_save(5, xla); + return retval; } static final private boolean jj_3R_46() { @@ -5304,21 +5317,21 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_117() { + static final private boolean jj_3R_118() { if (jj_scan_token(XOR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_116()) return true; + if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_113() { - if (jj_3R_116()) return true; + static final private boolean jj_3R_114() { + if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_117()) { jj_scanpos = xsp; break; } + if (jj_3R_118()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -5343,60 +5356,60 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_114() { + static final private boolean jj_3R_115() { if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_113()) return true; + if (jj_3R_114()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_107() { - if (jj_3R_113()) return true; + static final private boolean jj_3R_108() { + if (jj_3R_114()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_114()) { jj_scanpos = xsp; break; } + if (jj_3R_115()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_203() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_204() { + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_110() { + static final private boolean jj_3R_111() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_107()) return true; + if (jj_3R_108()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_202() { + static final private boolean jj_3R_203() { if (jj_3R_48()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_201() { + static final private boolean jj_3R_202() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_196() { + static final private boolean jj_3R_197() { Token xsp; xsp = jj_scanpos; - if (jj_3R_201()) { - jj_scanpos = xsp; if (jj_3R_202()) { jj_scanpos = xsp; - if (jj_3R_203()) return true; + if (jj_3R_203()) { + jj_scanpos = xsp; + if (jj_3R_204()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5404,32 +5417,32 @@ final int startBlock, endBlock; } static final private boolean jj_3R_101() { - if (jj_3R_107()) return true; + if (jj_3R_108()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_110()) { jj_scanpos = xsp; break; } + if (jj_3R_111()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_112() { + static final private boolean jj_3R_113() { if (jj_scan_token(_ANDL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_183() { + static final private boolean jj_3R_184() { if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_192()) return true; + if (jj_3R_193()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { + static final private boolean jj_3R_112() { if (jj_scan_token(AND_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -5438,9 +5451,9 @@ final int startBlock, endBlock; static final private boolean jj_3R_104() { Token xsp; xsp = jj_scanpos; - if (jj_3R_111()) { + if (jj_3R_112()) { jj_scanpos = xsp; - if (jj_3R_112()) return true; + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_101()) return true; @@ -5448,7 +5461,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_122() { + static final private boolean jj_3R_123() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -5456,7 +5469,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_115() { + static final private boolean jj_3R_116() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -5495,19 +5508,19 @@ final int startBlock, endBlock; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_115()) jj_scanpos = xsp; + if (jj_3R_116()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_197() { - if (jj_3R_200()) return true; + static final private boolean jj_3R_198() { + if (jj_3R_201()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_126() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_127() { + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5558,12 +5571,12 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_121() { + static final private boolean jj_3R_122() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_126()) jj_scanpos = xsp; + if (jj_3R_127()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5580,40 +5593,54 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_189() { + static final private boolean jj_3R_190() { if (jj_scan_token(NEW)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_196()) return true; + if (jj_3R_197()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_197()) jj_scanpos = xsp; + if (jj_3R_198()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_195() { - if (jj_3R_200()) return true; + static final private boolean jj_3R_196() { + if (jj_3R_201()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_120() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_121() { + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_188() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_189() { + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_195()) jj_scanpos = xsp; + if (jj_3R_196()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_107() { + if (jj_3R_81()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_2() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_100() { if (jj_3R_51()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5630,24 +5657,24 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_108() { + static final private boolean jj_3R_109() { if (jj_scan_token(LIST)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_120()) jj_scanpos = xsp; + if (jj_3R_121()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; while (true) { xsp = jj_scanpos; - if (jj_3R_121()) { jj_scanpos = xsp; break; } + if (jj_3R_122()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; xsp = jj_scanpos; - if (jj_3R_122()) jj_scanpos = xsp; + if (jj_3R_123()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5660,31 +5687,9 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_194() { - if (jj_3R_200()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_98() { - if (jj_scan_token(DOLLAR_ID)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_81()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_81() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_98()) { - jj_scanpos = xsp; - if (jj_3R_99()) { - jj_scanpos = xsp; - if (jj_3R_100()) return true; + static final private boolean jj_3R_195() { + if (jj_3R_201()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5694,10 +5699,10 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_193() { + static final private boolean jj_3R_194() { if (jj_scan_token(STATICCLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_196()) return true; + if (jj_3R_197()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5720,7 +5725,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_109() { + static final private boolean jj_3R_110() { if (jj_scan_token(PRINT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -5728,9 +5733,27 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_80() { - if (jj_3R_81()) return true; + static final private boolean jj_3R_98() { + if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_107()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_81() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_98()) { + jj_scanpos = xsp; + if (jj_3R_99()) { + jj_scanpos = xsp; + if (jj_3R_100()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5758,35 +5781,41 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_187() { + static final private boolean jj_3R_188() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_193()) { jj_scanpos = xsp; break; } + if (jj_3R_194()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; + if (jj_3R_195()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_182() { + static final private boolean jj_3R_183() { 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_3R_189()) { + jj_scanpos = xsp; + if (jj_3R_190()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_80() { + if (jj_3R_81()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_89() { if (jj_scan_token(PLUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5869,26 +5898,26 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_174() { - if (jj_3R_183()) return true; + static final private boolean jj_3R_175() { + if (jj_3R_184()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_103() { - if (jj_3R_109()) return true; + if (jj_3R_110()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { + static final private boolean jj_3R_182() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_102() { - if (jj_3R_108()) return true; + if (jj_3R_109()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5904,23 +5933,23 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_169() { + static final private boolean jj_3R_170() { Token xsp; xsp = jj_scanpos; - if (jj_3R_173()) { + if (jj_3R_174()) { jj_scanpos = xsp; - if (jj_3R_174()) return true; + if (jj_3R_175()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_173() { + static final private boolean jj_3R_174() { Token xsp; xsp = jj_scanpos; - if (jj_3R_181()) jj_scanpos = xsp; + if (jj_3R_182()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_182()) return true; + if (jj_3R_183()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5971,24 +6000,24 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_191() { + static final private boolean jj_3R_192() { if (jj_scan_token(MINUS_MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_190() { + static final private boolean jj_3R_191() { if (jj_scan_token(PLUS_PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_186() { + static final private boolean jj_3R_187() { Token xsp; xsp = jj_scanpos; - if (jj_3R_190()) { + if (jj_3R_191()) { jj_scanpos = xsp; - if (jj_3R_191()) return true; + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6000,23 +6029,23 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_171() { - if (jj_3R_169()) return true; + static final private boolean jj_3R_172() { + if (jj_3R_170()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_186()) jj_scanpos = xsp; + if (jj_3R_187()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_185() { + static final private boolean jj_3R_186() { if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_184() { + static final private boolean jj_3R_185() { if (jj_3R_48()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6028,19 +6057,19 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_170() { + static final private boolean jj_3R_171() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_184()) { + if (jj_3R_185()) { jj_scanpos = xsp; - if (jj_3R_185()) return true; + if (jj_3R_186()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_145()) return true; + if (jj_3R_146()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6059,7 +6088,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_3() { + static final private boolean jj_3_4() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -6095,13 +6124,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_1() { - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_168() { + static final private boolean jj_3R_169() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -6111,28 +6134,34 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_168() { + if (jj_3R_173()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_167() { if (jj_3R_172()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_166() { - if (jj_3R_171()) return true; + static final private boolean jj_3_1() { + if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_162() { + static final private boolean jj_3R_163() { Token xsp; xsp = jj_scanpos; - if (jj_3R_165()) { - jj_scanpos = xsp; if (jj_3R_166()) { jj_scanpos = xsp; if (jj_3R_167()) { jj_scanpos = xsp; - if (jj_3R_168()) return true; + if (jj_3R_168()) { + jj_scanpos = xsp; + if (jj_3R_169()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6140,8 +6169,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_165() { - if (jj_3R_170()) return true; + static final private boolean jj_3R_166() { + if (jj_3R_171()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6154,18 +6183,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_125() { - if (jj_3R_64()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - static final private boolean jj_3R_63() { if (jj_scan_token(OBJECT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6184,6 +6201,18 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_126() { + if (jj_3R_64()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_1()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + static final private boolean jj_3R_60() { if (jj_scan_token(FLOAT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6196,7 +6225,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_164() { + static final private boolean jj_3R_165() { if (jj_scan_token(MINUS_MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6214,7 +6243,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_163() { + static final private boolean jj_3R_164() { if (jj_scan_token(PLUS_PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6264,15 +6293,15 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_161() { + static final private boolean jj_3R_162() { Token xsp; xsp = jj_scanpos; - if (jj_3R_163()) { + if (jj_3R_164()) { jj_scanpos = xsp; - if (jj_3R_164()) return true; + if (jj_3R_165()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_169()) return true; + if (jj_3R_170()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6287,36 +6316,36 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_160() { - if (jj_3R_162()) return true; + static final private boolean jj_3R_161() { + if (jj_3R_163()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_159() { - if (jj_3R_161()) return true; + static final private boolean jj_3R_160() { + if (jj_3R_162()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_158() { + static final private boolean jj_3R_159() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_156() { + static final private boolean jj_3R_157() { Token xsp; xsp = jj_scanpos; - 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()) return true; + if (jj_3R_160()) { + jj_scanpos = xsp; + if (jj_3R_161()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6324,10 +6353,10 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_157() { + static final private boolean jj_3R_158() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6352,61 +6381,61 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_155() { - if (jj_3R_156()) return true; + static final private boolean jj_3R_156() { + if (jj_3R_157()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_154() { + static final private boolean jj_3R_155() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_149() { + static final private boolean jj_3R_150() { Token xsp; xsp = jj_scanpos; - if (jj_3R_153()) { - jj_scanpos = xsp; if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_155()) return true; + if (jj_3R_155()) { + jj_scanpos = xsp; + if (jj_3R_156()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_153() { + static final private boolean jj_3R_154() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_145() { - if (jj_3R_149()) return true; + static final private boolean jj_3R_146() { + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_152() { + static final private boolean jj_3R_153() { if (jj_scan_token(REMAINDER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_151() { + static final private boolean jj_3R_152() { if (jj_scan_token(SLASH)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_150() { + static final private boolean jj_3R_151() { if (jj_scan_token(STAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6420,142 +6449,142 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_146() { + static final private boolean jj_3R_147() { Token xsp; xsp = jj_scanpos; - if (jj_3R_150()) { - jj_scanpos = xsp; if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_152()) return true; + if (jj_3R_152()) { + jj_scanpos = xsp; + if (jj_3R_153()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_145()) return true; + if (jj_3R_146()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_140() { - if (jj_3R_145()) return true; + static final private boolean jj_3R_141() { + if (jj_3R_146()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_146()) { jj_scanpos = xsp; break; } + if (jj_3R_147()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3_5() { + static final private boolean jj_3_6() { if (jj_3R_44()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_148() { + static final private boolean jj_3R_149() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { + static final private boolean jj_3R_148() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_141() { + static final private boolean jj_3R_142() { Token xsp; xsp = jj_scanpos; - if (jj_3R_147()) { + if (jj_3R_148()) { jj_scanpos = xsp; - if (jj_3R_148()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_140()) return true; + if (jj_3R_141()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_134() { - if (jj_3R_140()) return true; + static final private boolean jj_3R_135() { + if (jj_3R_141()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_141()) { jj_scanpos = xsp; break; } + if (jj_3R_142()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3_4() { + static final private boolean jj_3_5() { if (jj_3R_43()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_144() { + static final private boolean jj_3R_145() { if (jj_scan_token(RUNSIGNEDSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_143() { + static final private boolean jj_3R_144() { if (jj_scan_token(RSIGNEDSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_142() { + static final private boolean jj_3R_143() { if (jj_scan_token(LSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_135() { + static final private boolean jj_3R_136() { Token xsp; xsp = jj_scanpos; - if (jj_3R_142()) { - jj_scanpos = xsp; if (jj_3R_143()) { jj_scanpos = xsp; - if (jj_3R_144()) return true; + if (jj_3R_144()) { + jj_scanpos = xsp; + if (jj_3R_145()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_134()) return true; + if (jj_3R_135()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_127() { - if (jj_3R_134()) return true; + static final private boolean jj_3R_128() { + if (jj_3R_135()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_135()) { jj_scanpos = xsp; break; } + if (jj_3R_136()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_139() { + static final private boolean jj_3R_140() { if (jj_scan_token(GE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_138() { + static final private boolean jj_3R_139() { if (jj_scan_token(LE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_207() { + static final private boolean jj_3R_208() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -6563,68 +6592,68 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_137() { + static final private boolean jj_3R_138() { if (jj_scan_token(GT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_136() { + static final private boolean jj_3R_137() { if (jj_scan_token(LT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_128() { + static final private boolean jj_3R_129() { 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()) return true; + if (jj_3R_139()) { + jj_scanpos = xsp; + if (jj_3R_140()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_127()) return true; + if (jj_3R_128()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_206() { + static final private boolean jj_3R_207() { if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_207()) { jj_scanpos = xsp; break; } + if (jj_3R_208()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_123() { - if (jj_3R_127()) return true; + static final private boolean jj_3R_124() { + if (jj_3R_128()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_128()) { jj_scanpos = xsp; break; } + if (jj_3R_129()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_199() { + static final private boolean jj_3R_200() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_2() { + static final private boolean jj_3_3() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_40()) return true; @@ -6632,8 +6661,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_204() { - if (jj_3R_206()) return true; + static final private boolean jj_3R_205() { + if (jj_3R_207()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6644,76 +6673,76 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_198() { + static final private boolean jj_3R_199() { if (jj_3R_40()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_2()) { jj_scanpos = xsp; break; } + if (jj_3_3()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_192() { + static final private boolean jj_3R_193() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_198()) jj_scanpos = xsp; + if (jj_3R_199()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; xsp = jj_scanpos; - if (jj_3R_199()) jj_scanpos = xsp; + if (jj_3R_200()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_200() { + static final private boolean jj_3R_201() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_204()) jj_scanpos = xsp; + if (jj_3R_205()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_133() { + static final private boolean jj_3R_134() { if (jj_scan_token(TRIPLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_132() { + static final private boolean jj_3R_133() { if (jj_scan_token(BANGDOUBLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_131() { + static final private boolean jj_3R_132() { if (jj_scan_token(NOT_EQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_130() { + static final private boolean jj_3R_131() { if (jj_scan_token(DIF)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_129() { + static final private boolean jj_3R_130() { if (jj_scan_token(EQUAL_EQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_205() { + static final private boolean jj_3R_206() { if (jj_scan_token(ARRAYASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -6721,59 +6750,59 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_124() { + static final private boolean jj_3R_125() { Token xsp; xsp = jj_scanpos; - if (jj_3R_129()) { - jj_scanpos = xsp; if (jj_3R_130()) { jj_scanpos = xsp; if (jj_3R_131()) { jj_scanpos = xsp; if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_133()) return true; + if (jj_3R_133()) { + jj_scanpos = xsp; + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_123()) return true; + if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_180() { + static final private boolean jj_3R_181() { if (jj_scan_token(NULL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_179() { + static final private boolean jj_3R_180() { if (jj_scan_token(FALSE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_118() { - if (jj_3R_123()) return true; + static final private boolean jj_3R_119() { + if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_124()) { jj_scanpos = xsp; break; } + if (jj_3R_125()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_178() { + static final private boolean jj_3R_179() { if (jj_scan_token(TRUE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_177() { + static final private boolean jj_3R_178() { if (jj_scan_token(STRING_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6784,22 +6813,26 @@ final int startBlock, endBlock; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_205()) jj_scanpos = xsp; + if (jj_3R_206()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_176() { + static final private boolean jj_3R_177() { if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_172() { + static final private boolean jj_3R_176() { + if (jj_scan_token(INTEGER_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_173() { Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) { - jj_scanpos = xsp; if (jj_3R_176()) { jj_scanpos = xsp; if (jj_3R_177()) { @@ -6808,7 +6841,9 @@ final int startBlock, endBlock; jj_scanpos = xsp; if (jj_3R_179()) { jj_scanpos = xsp; - if (jj_3R_180()) return true; + if (jj_3R_180()) { + jj_scanpos = xsp; + if (jj_3R_181()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6818,8 +6853,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_175() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_68() { + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6835,17 +6870,23 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_68() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_120() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_119() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_118()) return true; + static final private boolean jj_3R_117() { + if (jj_3R_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_120()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } @@ -6859,7 +6900,7 @@ final int startBlock, endBlock; static public boolean lookingAhead = false; static private boolean jj_semLA; static private int jj_gen; - static final private int[] jj_la1 = new int[126]; + static final private int[] jj_la1 = new int[128]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -6873,21 +6914,21 @@ final int startBlock, endBlock; jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x81000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x8000000,0x68000000,0x8000000,0xf9000000,0xf9000000,0x8000000,0x0,0x68000000,0x68000000,}; + jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x81000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x8000000,0x68000000,0x8000000,0xf9000000,0xf9000000,0x8000000,0x0,0x68000000,0x68000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x40000,0x100,0x0,0x0,0x0,0x40000,0x0,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8451507f,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x40000,0x30c0000,0x40000,0x875d507f,0x875d507f,0x40000,0x0,0x30c0000,0x30c0000,}; + jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x40000,0x100,0x0,0x0,0x0,0x40000,0x0,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8451507f,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x40000,0x30c0000,0x40000,0x875d507f,0x875d507f,0x40000,0x0,0x30c0000,0x30c0000,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x0,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000000,0x1000000,0x3fe,0x0,0x13c1c00,0x1000,0x0,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c1c00,0x13c0800,0xc0000,0x1000800,0x3fe,0xc0000,0xc0000,0x1000000,0x1000800,0x0,0x0,0x0,0x0,0x800,0xbfe,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0x400,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0x10c0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0x10c0800,0x13c1c00,0x10c0800,0x13c1c00,0x13c9c00,0x10c0800,0x0,0x13c1c00,0x13c1c00,}; + jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000000,0x1000000,0x3fe,0x0,0x13c1c00,0x1000,0x0,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c1c00,0x13c0800,0xc0000,0x1000800,0x3fe,0xc0000,0xc0000,0x1000000,0x1000800,0x0,0x0,0x0,0x0,0x800,0xbfe,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0x400,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0x10c0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0x10c0800,0x13c1c00,0x10c0800,0x13c1c00,0x13c9c00,0x10c0800,0x0,0x13c1c00,0x13c1c00,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x0,0x20800,0x0,0x20800,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x0,0x0,0x800,0x0,0x8000,0x8000,0x8000,0x800,0x800,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x800,0x88a2,0x800,0x2288a2,0x2288a2,0x800,0x400000,0x88a2,0x88a2,}; + jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x0,0x20800,0x0,0x20800,0x0,0x20800,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x0,0x0,0x800,0x0,0x8000,0x8000,0x8000,0x800,0x800,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x800,0x88a2,0x800,0x2288a2,0x2288a2,0x800,0x400000,0x88a2,0x88a2,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x2,0x4000,0x4000,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x3ffe,0x4000,0x0,0x0,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,}; + jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x2,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x3ffe,0x4000,0x0,0x0,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,}; } - static final private JJCalls[] jj_2_rtns = new JJCalls[5]; + static final private JJCalls[] jj_2_rtns = new JJCalls[6]; static private boolean jj_rescan = false; static private int jj_gc = 0; @@ -6904,7 +6945,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 126; i++) jj_la1[i] = -1; + for (int i = 0; i < 128; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6914,7 +6955,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 126; i++) jj_la1[i] = -1; + for (int i = 0; i < 128; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6931,7 +6972,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 126; i++) jj_la1[i] = -1; + for (int i = 0; i < 128; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6941,7 +6982,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 126; i++) jj_la1[i] = -1; + for (int i = 0; i < 128; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6957,7 +6998,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 126; i++) jj_la1[i] = -1; + for (int i = 0; i < 128; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6966,7 +7007,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 126; i++) jj_la1[i] = -1; + for (int i = 0; i < 128; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7081,7 +7122,7 @@ final int startBlock, endBlock; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 126; i++) { + for (int i = 0; i < 128; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< jj_gen) { @@ -7138,6 +7179,7 @@ final int startBlock, endBlock; case 2: jj_3_3(); break; case 3: jj_3_4(); break; case 4: jj_3_5(); break; + case 5: jj_3_6(); break; } } p = p.next; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index 7648721..205b380 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -369,7 +369,7 @@ TOKEN_MGR_DECLS: | "> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT } @@ -403,7 +403,7 @@ TOKEN_MGR_DECLS: SPECIAL_TOKEN : { : PHPPARSING -| "?>" : DEFAULT +| < ~[] > } SPECIAL_TOKEN : @@ -1040,18 +1040,22 @@ Variable Variable() : Variable Var(final Token dollar) : { - Variable variable; + Variable variable = null; final Token token; ConstantIdentifier constant; } { - token = variable = Var(token) - {final StringBuffer buff = new StringBuffer(); + token = [variable = Var(token)] + {if (variable == null) { + return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd); + } + final StringBuffer buff = new StringBuffer(); buff.append(token.image.substring(1)); buff.append(variable.toStringExpression()); return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd); } | + LOOKAHEAD( ) token = variable = Var(token) {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} | diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index 888a8b9..33e3a98 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -155,7 +155,7 @@ public interface PHPParserConstants { "", "\"/*\"", "", - "\"?>\"", + "", "\"todo\"", "\"*/\"", "\"*/\"", diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index d823935..9dd366b 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -219,7 +219,7 @@ static private final int jjMoveStringLiteralDfa0_2() switch(curChar) { case 63: - return jjMoveStringLiteralDfa1_2(0x10000L); + return jjMoveStringLiteralDfa1_2(0x10L); case 84: case 116: return jjMoveStringLiteralDfa1_2(0x20000L); @@ -237,8 +237,8 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) switch(curChar) { case 62: - if ((active0 & 0x10000L) != 0L) - return jjStopAtPos(1, 16); + if ((active0 & 0x10L) != 0L) + return jjStopAtPos(1, 4); break; case 79: case 111: @@ -1932,7 +1932,7 @@ public static final String[] lexStateNames = { "IN_MULTI_LINE_COMMENT", }; public static final int[] jjnewLexState = { - -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, 0, -1, 1, 1, -1, -1, -1, -1, -1, + -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, -1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2068,9 +2068,9 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 20) + if (jjmatchedPos == 0 && jjmatchedKind > 16) { - jjmatchedKind = 20; + jjmatchedKind = 16; } break; case 3: -- 1.7.1