From 06beb1d978ee57bc57accbbb11bd62237799c693 Mon Sep 17 00:00:00 2001 From: kpouer Date: Fri, 21 Mar 2003 16:16:10 +0000 Subject: [PATCH] *** empty log message *** --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 1100 +++++++++++--------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 31 + .../src/test/PHPParserConstants.java | 200 ++-- .../src/test/PHPParserTokenManager.java | 612 ++++++------ 4 files changed, 1040 insertions(+), 903 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index da360a9..21a701e 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -250,6 +250,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -325,6 +326,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -415,6 +417,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -784,6 +787,7 @@ final StringBuffer buff = new StringBuffer("("); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: + case LIST: case NEW: case NULL: case TRUE: @@ -982,6 +986,10 @@ final StringBuffer buff = new StringBuffer("("); expr = PrintExpression(); {if (true) return expr;} break; + case LIST: + expr = ListExpression(); + {if (true) return expr;} + break; case ARRAY: case NEW: case NULL: @@ -1872,6 +1880,7 @@ final String type, expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: + case LIST: case NEW: case NULL: case TRUE: @@ -1979,6 +1988,7 @@ String expr = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: + case LIST: case NEW: case NULL: case TRUE: @@ -2170,8 +2180,8 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: jj_la1[71] = jj_gen; @@ -2195,8 +2205,8 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: jj_la1[72] = jj_gen; @@ -2220,8 +2230,8 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: jj_la1[73] = jj_gen; @@ -2245,8 +2255,8 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: jj_la1[74] = jj_gen; @@ -2276,6 +2286,39 @@ final StringBuffer buff = new StringBuffer(); throw new Error("Missing return statement in function"); } + static final public String ListExpression() throws ParseException { + final StringBuffer buff = new StringBuffer("list("); + String expr; + jj_consume_token(LIST); + jj_consume_token(LPAREN); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLAR: + case DOLLAR_ID: + expr = VariableDeclaratorId(); + buff.append(expr); + break; + default: + jj_la1[76] = jj_gen; + ; + } + jj_consume_token(COMMA); + buff.append(","); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLAR: + case DOLLAR_ID: + expr = VariableDeclaratorId(); + buff.append(expr); + break; + default: + jj_la1[77] = jj_gen; + ; + } + jj_consume_token(RPAREN); + buff.append(")"); + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); + } + static final public void EchoStatement() throws ParseException { jj_consume_token(ECHO); Expression(); @@ -2286,7 +2329,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[76] = jj_gen; + jj_la1[78] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -2297,11 +2340,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: - jj_la1[77] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2322,7 +2365,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[78] = jj_gen; + jj_la1[80] = jj_gen; break label_24; } jj_consume_token(COMMA); @@ -2333,11 +2376,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: - jj_la1[79] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2358,7 +2401,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[80] = jj_gen; + jj_la1[82] = jj_gen; break label_25; } jj_consume_token(COMMA); @@ -2369,11 +2412,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: - jj_la1[81] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2414,6 +2457,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2444,7 +2488,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[82] = jj_gen; + jj_la1[84] = jj_gen; break label_26; } BlockStatement(); @@ -2465,6 +2509,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2501,7 +2546,7 @@ final StringBuffer buff = new StringBuffer(); MethodDeclaration(); break; default: - jj_la1[83] = jj_gen; + jj_la1[85] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2516,7 +2561,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[84] = jj_gen; + jj_la1[86] = jj_gen; break label_27; } jj_consume_token(COMMA); @@ -2532,7 +2577,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[85] = jj_gen; + jj_la1[87] = jj_gen; ; } } @@ -2595,18 +2640,18 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[86] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[87] = jj_gen; + jj_la1[89] = jj_gen; ; } break; default: - jj_la1[88] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2626,7 +2671,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[89] = jj_gen; + jj_la1[91] = jj_gen; break label_28; } SwitchLabel(); @@ -2646,6 +2691,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2676,7 +2722,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[90] = jj_gen; + jj_la1[92] = jj_gen; break label_29; } BlockStatement(); @@ -2697,7 +2743,7 @@ final StringBuffer buff = new StringBuffer(); jj_consume_token(COLON); break; default: - jj_la1[91] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2747,6 +2793,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2777,7 +2824,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[92] = jj_gen; + jj_la1[94] = jj_gen; break label_30; } Statement(); @@ -2789,7 +2836,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[93] = jj_gen; + jj_la1[95] = jj_gen; break label_31; } ElseIfStatementColon(); @@ -2799,7 +2846,7 @@ final StringBuffer buff = new StringBuffer(); ElseStatementColon(); break; default: - jj_la1[94] = jj_gen; + jj_la1[96] = jj_gen; ; } try { @@ -2838,6 +2885,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2873,7 +2921,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[95] = jj_gen; + jj_la1[97] = jj_gen; break label_32; } ElseIfStatement(); @@ -2884,12 +2932,12 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[96] = jj_gen; + jj_la1[98] = jj_gen; ; } break; default: - jj_la1[97] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2913,6 +2961,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2943,7 +2992,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[98] = jj_gen; + jj_la1[100] = jj_gen; break label_33; } Statement(); @@ -2967,6 +3016,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -2997,7 +3047,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[99] = jj_gen; + jj_la1[101] = jj_gen; break label_34; } Statement(); @@ -3036,6 +3086,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -3066,7 +3117,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[100] = jj_gen; + jj_la1[102] = jj_gen; break label_35; } Statement(); @@ -3093,11 +3144,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: - jj_la1[101] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3118,6 +3169,7 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -3148,7 +3200,7 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[102] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3164,11 +3216,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 137: - jj_consume_token(137); + case 138: + jj_consume_token(138); break; default: - jj_la1[103] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3201,7 +3253,7 @@ final StringBuffer buff = new StringBuffer(); VariableSuffix(); break; default: - jj_la1[104] = jj_gen; + jj_la1[106] = jj_gen; ; } try { @@ -3224,7 +3276,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[105] = jj_gen; + jj_la1[107] = jj_gen; ; } try { @@ -3266,13 +3318,14 @@ final int pos = jj_input_stream.bufpos; ForInit(); break; default: - jj_la1[106] = jj_gen; + jj_la1[108] = jj_gen; ; } jj_consume_token(SEMICOLON); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: + case LIST: case NEW: case NULL: case TRUE: @@ -3294,7 +3347,7 @@ final int pos = jj_input_stream.bufpos; Expression(); break; default: - jj_la1[107] = jj_gen; + jj_la1[109] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3309,7 +3362,7 @@ final int pos = jj_input_stream.bufpos; ForUpdate(); break; default: - jj_la1[108] = jj_gen; + jj_la1[110] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3325,6 +3378,7 @@ final int pos = jj_input_stream.bufpos; case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -3370,6 +3424,7 @@ final int pos = jj_input_stream.bufpos; case REQUIRE_ONCE: case GLOBAL: case STATIC: + case LIST: case CONTINUE: case DO: case FOR: @@ -3400,7 +3455,7 @@ final int pos = jj_input_stream.bufpos; ; break; default: - jj_la1[109] = jj_gen; + jj_la1[111] = jj_gen; break label_36; } Statement(); @@ -3431,7 +3486,7 @@ final int pos = jj_input_stream.bufpos; } break; default: - jj_la1[110] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3452,7 +3507,7 @@ final int pos = jj_input_stream.bufpos; StatementExpressionList(); break; default: - jj_la1[111] = jj_gen; + jj_la1[113] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3468,7 +3523,7 @@ final int pos = jj_input_stream.bufpos; ; break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -3487,7 +3542,7 @@ final int pos = jj_input_stream.bufpos; jj_consume_token(IDENTIFIER); break; default: - jj_la1[113] = jj_gen; + jj_la1[115] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3500,7 +3555,7 @@ final int pos = jj_input_stream.bufpos; jj_consume_token(IDENTIFIER); break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3511,6 +3566,7 @@ final int pos = jj_input_stream.bufpos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: + case LIST: case NEW: case NULL: case TRUE: @@ -3532,7 +3588,7 @@ final int pos = jj_input_stream.bufpos; Expression(); break; default: - jj_la1[115] = jj_gen; + jj_la1[117] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3587,45 +3643,7 @@ final int pos = jj_input_stream.bufpos; return retval; } - static final private boolean jj_3R_70() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_61()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_42() { - if (jj_scan_token(SEMICOLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_118() { - 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_117() { - 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_116() { - if (jj_scan_token(NE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_115() { - 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_114() { if (jj_scan_token(EQ)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -3644,7 +3662,29 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_97() { + static final private boolean jj_3R_115() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_118()) { + jj_scanpos = xsp; + if (jj_3R_119()) { + jj_scanpos = xsp; + if (jj_3R_120()) { + jj_scanpos = xsp; + if (jj_3R_121()) { + jj_scanpos = xsp; + if (jj_3R_122()) 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_114()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_99() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; @@ -3654,39 +3694,29 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_69() { + static final private boolean jj_3R_71() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_104()) jj_scanpos = xsp; + if (jj_3R_108()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_114()) { - jj_scanpos = xsp; - if (jj_3R_115()) { - jj_scanpos = xsp; - if (jj_3R_116()) { - jj_scanpos = xsp; - if (jj_3R_117()) { - jj_scanpos = xsp; - if (jj_3R_118()) 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_110()) return true; + static final private boolean jj_3R_112() { + 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_115()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_68() { + static final private boolean jj_3R_70() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; @@ -3696,16 +3726,16 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_61() { + static final private boolean jj_3R_62() { Token xsp; xsp = jj_scanpos; - if (jj_3R_68()) { + if (jj_3R_70()) { jj_scanpos = xsp; - if (jj_3R_69()) { + if (jj_3R_71()) { jj_scanpos = xsp; - if (jj_3R_70()) { + if (jj_3R_72()) { jj_scanpos = xsp; - if (jj_3R_71()) return true; + if (jj_3R_73()) 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; @@ -3713,35 +3743,23 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_108() { - if (jj_3R_110()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - 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_92() { + static final private boolean jj_3R_94() { if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_61()) return true; + if (jj_3R_62()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_109() { + static final private boolean jj_3R_113() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_108()) return true; + if (jj_3R_112()) return true; 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_196() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; @@ -3749,53 +3767,53 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_91() { + static final private boolean jj_3R_195() { + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_196()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3R_93() { 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_97()) jj_scanpos = xsp; + if (jj_3R_99()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_75() { + static final private boolean jj_3R_77() { Token xsp; xsp = jj_scanpos; - if (jj_3R_91()) { + if (jj_3R_93()) { jj_scanpos = xsp; - if (jj_3R_92()) return true; + if (jj_3R_94()) 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_191() { - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_192()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_106() { - if (jj_3R_108()) return true; + static final private boolean jj_3R_110() { + if (jj_3R_112()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_109()) { jj_scanpos = xsp; break; } + if (jj_3R_113()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_189() { - if (jj_3R_191()) return true; + static final private boolean jj_3R_193() { + if (jj_3R_195()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3806,16 +3824,16 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_107() { + static final private boolean jj_3R_111() { if (jj_scan_token(XOR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_106()) 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_66() { - if (jj_3R_75()) return true; + static final private boolean jj_3R_68() { + if (jj_3R_77()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { @@ -3826,141 +3844,141 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_187() { + static final private boolean jj_3R_191() { 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_189()) jj_scanpos = xsp; + if (jj_3R_193()) 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_102() { - if (jj_3R_106()) return true; + static final private boolean jj_3R_106() { + if (jj_3R_110()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_107()) { 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_170() { + static final private boolean jj_3R_174() { 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_103() { + static final private boolean jj_3R_107() { if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_102()) return true; + if (jj_3R_106()) 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_181() { 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_98() { - if (jj_3R_102()) return true; + static final private boolean jj_3R_100() { + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_103()) { jj_scanpos = xsp; break; } + if (jj_3R_107()) { jj_scanpos = xsp; break; } 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_180() { 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_169() { + static final private boolean jj_3R_173() { Token xsp; xsp = jj_scanpos; - if (jj_3R_176()) { + if (jj_3R_180()) { jj_scanpos = xsp; - if (jj_3R_177()) return true; + 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; return false; } - static final private boolean jj_3R_101() { + static final private boolean jj_3R_103() { 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_165() { - if (jj_3R_170()) return true; + static final private boolean jj_3R_169() { + if (jj_3R_174()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_99() { + static final private boolean jj_3R_101() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_98()) return true; + if (jj_3R_100()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_164() { - if (jj_3R_169()) return true; + 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_93() { - if (jj_3R_98()) return true; + static final private boolean jj_3R_95() { + if (jj_3R_100()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_99()) { jj_scanpos = xsp; break; } + if (jj_3R_101()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_163() { + static final private boolean jj_3R_167() { if (jj_scan_token(STRING_LITERAL)) 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_166() { 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_158() { + static final private boolean jj_3R_162() { Token xsp; xsp = jj_scanpos; - if (jj_3R_161()) { + if (jj_3R_165()) { jj_scanpos = xsp; - if (jj_3R_162()) { + if (jj_3R_166()) { jj_scanpos = xsp; - if (jj_3R_163()) { + if (jj_3R_167()) { jj_scanpos = xsp; - if (jj_3R_164()) { + if (jj_3R_168()) { jj_scanpos = xsp; - if (jj_3R_165()) return true; + 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; @@ -3969,63 +3987,63 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_161() { + static final private boolean jj_3R_165() { 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_96() { + static final private boolean jj_3R_98() { if (jj_scan_token(_ORL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_100() { + static final private boolean jj_3R_102() { if (jj_scan_token(SC_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_94() { + static final private boolean jj_3R_96() { Token xsp; xsp = jj_scanpos; - if (jj_3R_100()) { + if (jj_3R_102()) { jj_scanpos = xsp; - if (jj_3R_101()) return true; + if (jj_3R_103()) 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_93()) return true; + if (jj_3R_95()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_62() { + static final private boolean jj_3R_63() { if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_76() { - if (jj_3R_93()) return true; + static final private boolean jj_3R_78() { + if (jj_3R_95()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_94()) { jj_scanpos = xsp; break; } + if (jj_3R_96()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_73() { + static final private boolean jj_3R_75() { if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(COLON)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_64()) return true; + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4035,7 +4053,7 @@ final int pos = jj_input_stream.bufpos; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_62()) jj_scanpos = xsp; + if (jj_3R_63()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4045,7 +4063,7 @@ final int pos = jj_input_stream.bufpos; static final private boolean jj_3R_46() { if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_61()) return true; + if (jj_3R_62()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4061,242 +4079,260 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_95() { + static final private boolean jj_3R_97() { if (jj_scan_token(SC_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_77() { + static final private boolean jj_3R_79() { Token xsp; xsp = jj_scanpos; - if (jj_3R_95()) { + if (jj_3R_97()) { jj_scanpos = xsp; - if (jj_3R_96()) return true; + if (jj_3R_98()) 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_76()) return true; + if (jj_3R_78()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_72() { - if (jj_3R_76()) return true; + static final private boolean jj_3R_74() { + if (jj_3R_78()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_77()) { jj_scanpos = xsp; break; } + if (jj_3R_79()) { jj_scanpos = xsp; break; } 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_188() { if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_183() { - if (jj_3R_187()) return true; + static final private boolean jj_3R_187() { + if (jj_3R_191()) 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_183() { Token xsp; xsp = jj_scanpos; - if (jj_3R_183()) { + if (jj_3R_187()) { jj_scanpos = xsp; - if (jj_3R_184()) return true; + if (jj_3R_188()) 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_186() { - if (jj_3R_66()) return true; + static final private boolean jj_3R_69() { + if (jj_scan_token(ASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; 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_61() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_60()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_190() { + if (jj_3R_68()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_189() { 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_181() { + static final private boolean jj_3R_185() { Token xsp; xsp = jj_scanpos; - if (jj_3R_185()) { + if (jj_3R_189()) { jj_scanpos = xsp; - if (jj_3R_186()) return true; + 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; return false; } - static final private boolean jj_3R_64() { - if (jj_3R_72()) return true; + static final private boolean jj_3R_66() { + if (jj_3R_74()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_73()) jj_scanpos = xsp; + if (jj_3R_75()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_173() { - if (jj_3R_66()) return true; + static final private boolean jj_3R_177() { + if (jj_3R_68()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_90() { + static final private boolean jj_3R_92() { if (jj_scan_token(TILDEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_89() { + static final private boolean jj_3R_91() { if (jj_scan_token(DOTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_67() { - if (jj_scan_token(ASSIGN)) return true; + static final private boolean jj_3R_176() { + if (jj_scan_token(NEW)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + if (jj_3R_185()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_88() { + static final private boolean jj_3R_90() { if (jj_scan_token(ORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_172() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_181()) return true; + static final private boolean jj_3R_60() { + if (jj_3R_68()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_69()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_175() { + static final private boolean jj_3R_179() { if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_87() { + static final private boolean jj_3R_89() { if (jj_scan_token(XORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_60() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_59()) return true; + static final private boolean jj_3R_175() { + 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_166() { + static final private boolean jj_3R_170() { Token xsp; xsp = jj_scanpos; - if (jj_3R_171()) { + if (jj_3R_175()) { jj_scanpos = xsp; - if (jj_3R_172()) { + if (jj_3R_176()) { jj_scanpos = xsp; - if (jj_3R_173()) return true; + if (jj_3R_177()) 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_171() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_88() { + if (jj_scan_token(ANDASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_86() { - if (jj_scan_token(ANDASSIGN)) return true; + static final private boolean jj_3R_87() { + if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_85() { - if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; + static final private boolean jj_3R_45() { + if (jj_3R_60()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_61()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_84() { + static final private boolean jj_3R_86() { if (jj_scan_token(LSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_83() { + static final private boolean jj_3R_85() { if (jj_scan_token(MINUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_82() { + static final private boolean jj_3R_84() { if (jj_scan_token(PLUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_167() { + static final private boolean jj_3R_171() { if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_180()) return true; + if (jj_3R_184()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_81() { + static final private boolean jj_3R_83() { if (jj_scan_token(REMASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_80() { + static final private boolean jj_3R_82() { if (jj_scan_token(SLASHASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_79() { + static final private boolean jj_3R_81() { if (jj_scan_token(STARASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_78() { + static final private boolean jj_3R_80() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_74() { + static final private boolean jj_3R_76() { Token xsp; xsp = jj_scanpos; - if (jj_3R_78()) { - jj_scanpos = xsp; - if (jj_3R_79()) { - jj_scanpos = xsp; if (jj_3R_80()) { jj_scanpos = xsp; if (jj_3R_81()) { @@ -4317,7 +4353,11 @@ final int pos = jj_input_stream.bufpos; jj_scanpos = xsp; if (jj_3R_89()) { jj_scanpos = xsp; - if (jj_3R_90()) return true; + if (jj_3R_90()) { + jj_scanpos = xsp; + if (jj_3R_91()) { + jj_scanpos = xsp; + if (jj_3R_92()) 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; @@ -4334,77 +4374,55 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_174() { + static final private boolean jj_3R_178() { if (jj_scan_token(INCR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_160() { - if (jj_3R_167()) return true; + static final private boolean jj_3R_164() { + if (jj_3R_171()) 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_172() { Token xsp; xsp = jj_scanpos; - if (jj_3R_174()) { + if (jj_3R_178()) { jj_scanpos = xsp; - 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_178() { if (jj_3R_179()) 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_59() { - if (jj_3R_66()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_67()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_159() { - if (jj_3R_166()) return true; + static final private boolean jj_3R_182() { + if (jj_3R_183()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_178()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_45() { - if (jj_3R_59()) return true; + static final private boolean jj_3R_163() { + if (jj_3R_170()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_60()) { jj_scanpos = xsp; break; } + if (jj_3R_182()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_182() { - if (jj_3R_179()) return true; + static final private boolean jj_3R_186() { + if (jj_3R_183()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_65() { - if (jj_3R_74()) return true; + static final private boolean jj_3R_67() { + if (jj_3R_76()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4416,64 +4434,81 @@ final int pos = jj_input_stream.bufpos; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(STATICCLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_182()) { jj_scanpos = xsp; break; } + if (jj_3R_186()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_155() { + static final private boolean jj_3R_159() { Token xsp; xsp = jj_scanpos; if (jj_3_4()) { jj_scanpos = xsp; - if (jj_3R_159()) { + if (jj_3R_163()) { jj_scanpos = xsp; - if (jj_3R_160()) return true; + if (jj_3R_164()) 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_58() { - if (jj_3R_64()) return true; + static final private boolean jj_3R_44() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_59() { + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_65()) jj_scanpos = xsp; + if (jj_3R_67()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_58() { + if (jj_3R_65()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_41() { Token xsp; xsp = jj_scanpos; if (jj_3R_57()) { jj_scanpos = xsp; - if (jj_3R_58()) return true; + if (jj_3R_58()) { + jj_scanpos = xsp; + if (jj_3R_59()) 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_57() { - if (jj_3R_63()) return true; + if (jj_3R_64()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_157() { - if (jj_3R_155()) return true; + static final private boolean jj_3R_161() { + if (jj_3R_159()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_168()) jj_scanpos = xsp; + if (jj_3R_172()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4496,10 +4531,14 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_44() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_160() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; + if (jj_3R_40()) return true; + 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_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4510,21 +4549,19 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_156() { + static final private boolean jj_3R_52() { + if (jj_scan_token(DOUBLE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_3() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_40()) return true; 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_130()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_52() { - if (jj_scan_token(DOUBLE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4534,10 +4571,10 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3_3() { + static final private boolean jj_3R_158() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_40()) return true; + if (jj_3R_41()) return true; 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; @@ -4550,12 +4587,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_154() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + static final private boolean jj_3R_157() { + if (jj_3R_162()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4566,8 +4599,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_153() { - if (jj_3R_158()) return true; + static final private boolean jj_3R_156() { + if (jj_3R_161()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4610,30 +4643,24 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_152() { - if (jj_3R_157()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_151() { - if (jj_3R_156()) return true; + static final private boolean jj_3R_155() { + if (jj_3R_160()) 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_153() { Token xsp; xsp = jj_scanpos; - if (jj_3R_150()) { + if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_151()) { + if (jj_3R_155()) { jj_scanpos = xsp; - if (jj_3R_152()) { + if (jj_3R_156()) { jj_scanpos = xsp; - if (jj_3R_153()) { + if (jj_3R_157()) { jj_scanpos = xsp; - if (jj_3R_154()) return true; + if (jj_3R_158()) 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; @@ -4642,90 +4669,121 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_150() { + static final private boolean jj_3R_154() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_130()) return true; + if (jj_3R_134()) 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_105() { + if (jj_3R_68()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_152() { if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_155()) return true; + if (jj_3R_159()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { - if (jj_scan_token(INCR)) return true; + static final private boolean jj_3R_104() { + if (jj_3R_68()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_155()) return true; + return false; + } + + static final private boolean jj_3_7() { + if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_146() { - if (jj_scan_token(MINUS)) return true; + static final private boolean jj_3R_65() { + 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_104()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + xsp = jj_scanpos; + if (jj_3R_105()) 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_63() { - if (jj_scan_token(PRINT)) return true; + static final private boolean jj_3R_151() { + if (jj_scan_token(INCR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + if (jj_3R_159()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_144() { - if (jj_3R_149()) return true; + static final private boolean jj_3R_150() { + 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_143() { - if (jj_3R_148()) return true; + static final private boolean jj_3R_64() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_138() { - if (jj_scan_token(REM)) return true; + static final private boolean jj_3R_148() { + if (jj_3R_153()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_147() { + if (jj_3R_152()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_142() { - if (jj_3R_147()) return true; + if (jj_scan_token(REM)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_7() { - if (jj_3R_45()) return true; + static final private boolean jj_3R_146() { + if (jj_3R_151()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_145() { + static final private boolean jj_3R_149() { 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_139() { + static final private boolean jj_3R_143() { Token xsp; xsp = jj_scanpos; - if (jj_3R_141()) { + if (jj_3R_145()) { jj_scanpos = xsp; - if (jj_3R_142()) { + if (jj_3R_146()) { jj_scanpos = xsp; - if (jj_3R_143()) { + if (jj_3R_147()) { jj_scanpos = xsp; - if (jj_3R_144()) return true; + if (jj_3R_148()) 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; @@ -4733,123 +4791,123 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_141() { + static final private boolean jj_3R_145() { Token xsp; xsp = jj_scanpos; - if (jj_3R_145()) { + if (jj_3R_149()) { jj_scanpos = xsp; - if (jj_3R_146()) return true; + if (jj_3R_150()) 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_130()) return true; + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_140() { + static final private boolean jj_3R_144() { if (jj_scan_token(AT)) 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_139() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_140()) { jj_scanpos = xsp; break; } + if (jj_3R_144()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - if (jj_3R_139()) return true; + if (jj_3R_143()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_137() { + static final private boolean jj_3R_141() { 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_130() { + static final private boolean jj_3R_134() { Token xsp; xsp = jj_scanpos; - if (jj_3R_134()) { + if (jj_3R_138()) { jj_scanpos = xsp; - if (jj_3R_135()) return true; + if (jj_3R_139()) 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_134() { + static final private boolean jj_3R_138() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_139()) return true; + if (jj_3R_143()) 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_133() { 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_133() { + static final private boolean jj_3R_137() { 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_124() { + static final private boolean jj_3R_128() { 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_136() { + static final private boolean jj_3R_140() { if (jj_scan_token(STAR)) 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_135() { Token xsp; xsp = jj_scanpos; - if (jj_3R_136()) { + if (jj_3R_140()) { jj_scanpos = xsp; - if (jj_3R_137()) { + if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_138()) return true; + if (jj_3R_142()) 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_130()) return true; + if (jj_3R_134()) 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(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_125() { - if (jj_3R_130()) return true; + static final private boolean jj_3R_129() { + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_131()) { jj_scanpos = xsp; break; } + if (jj_3R_135()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_188() { + static final private boolean jj_3_2() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_39()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_192() { if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -4861,62 +4919,62 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_128() { + static final private boolean jj_3R_132() { 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_123() { + static final private boolean jj_3R_127() { 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_132() { + static final private boolean jj_3R_136() { 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_180() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + static final private boolean jj_3R_130() { Token xsp; xsp = jj_scanpos; - if (jj_3R_188()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + if (jj_3R_136()) { + jj_scanpos = xsp; + if (jj_3R_137()) 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_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_126() { + static final private boolean jj_3R_184() { + 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_132()) { - jj_scanpos = xsp; - if (jj_3R_133()) 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_125()) return true; + if (jj_3R_192()) 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_119() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_123() { + if (jj_3R_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_126()) { jj_scanpos = xsp; break; } + if (jj_3R_130()) { jj_scanpos = xsp; break; } 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_194() { if (jj_scan_token(ARRAYASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; @@ -4929,99 +4987,89 @@ final int pos = jj_input_stream.bufpos; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_190()) jj_scanpos = xsp; + if (jj_3R_194()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_122() { + static final private boolean jj_3R_126() { 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_127() { + static final private boolean jj_3R_131() { 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_120() { + static final private boolean jj_3R_124() { Token xsp; xsp = jj_scanpos; - if (jj_3R_127()) { + if (jj_3R_131()) { jj_scanpos = xsp; - if (jj_3R_128()) { + if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_129()) return true; + if (jj_3R_133()) 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_119()) return true; + if (jj_3R_123()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_112() { - if (jj_3R_119()) return true; + static final private boolean jj_3R_116() { + if (jj_3R_123()) 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_3R_124()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_105() { - if (jj_3R_61()) return true; + static final private boolean jj_3R_109() { + if (jj_3R_62()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_121() { + static final private boolean jj_3R_125() { 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_113() { + static final private boolean jj_3R_117() { Token xsp; xsp = jj_scanpos; - if (jj_3R_121()) { + if (jj_3R_125()) { jj_scanpos = xsp; - if (jj_3R_122()) { + if (jj_3R_126()) { jj_scanpos = xsp; - if (jj_3R_123()) { + if (jj_3R_127()) { jj_scanpos = xsp; - if (jj_3R_124()) return true; + if (jj_3R_128()) 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_112()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_104() { - if (jj_scan_token(LBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_110() { - if (jj_3R_112()) return true; + static final private boolean jj_3R_114() { + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_113()) { jj_scanpos = xsp; break; } + if (jj_3R_117()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -5033,18 +5081,66 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_71() { + static final private boolean jj_3R_108() { + if (jj_scan_token(LBRACE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + 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_73() { 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_105()) jj_scanpos = xsp; + if (jj_3R_109()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_6() { - if (jj_3R_44()) return true; + static final private boolean jj_3R_122() { + 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_42() { + if (jj_scan_token(SEMICOLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_121() { + 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_72() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_62()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_120() { + if (jj_scan_token(NE)) 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(DIF)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5059,7 +5155,7 @@ final int pos = jj_input_stream.bufpos; static public boolean lookingAhead = false; static private boolean jj_semLA; static private int jj_gen; - static final private int[] jj_la1 = new int[116]; + static final private int[] jj_la1 = new int[118]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -5073,19 +5169,19 @@ final int pos = jj_input_stream.bufpos; jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0xfe58001e,0x0,0x6,0x6,0xfe58001e,0xfe580000,0x0,0x300000,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x0,0x2000000,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0xa000000,0x0,0x10,0x0,0xf6400000,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0xfe580000,0xfe580000,0x0,0x0,0x0,0x0,0x2000000,0x0,0xfe580000,0x0,0xfe400000,0x800000,0x1000000,0x800000,0x1000000,0xfe400000,0xfe400000,0xfe400000,0xfe400000,0x0,0xfe400000,0x0,0x0,0x0,0x2000000,0xa000000,0x2000000,0xfe400000,0xfe400000,0x2000000,0x0,0x0,0x0,0xa000000,}; + jj_la1_0 = new int[] {0xfe58001e,0x0,0x6,0x6,0xfe58001e,0xfe580000,0x0,0x300000,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x0,0x2000000,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0xa000000,0x0,0x10,0x0,0xf6400000,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe580000,0xfe580000,0x0,0x0,0x0,0x0,0x2000000,0x0,0xfe580000,0x0,0xfe400000,0x800000,0x1000000,0x800000,0x1000000,0xfe400000,0xfe400000,0xfe400000,0xfe400000,0x0,0xfe400000,0x0,0x0,0x0,0x2000000,0xa000000,0x2000000,0xfe400000,0xfe400000,0x2000000,0x0,0x0,0x0,0xa000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x475d507,0x0,0x0,0x0,0x475d507,0x475d507,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x308000,0x20,0x30c000,0x0,0x0,0x0,0x0,0xf0000000,0x0,0x30c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c000,0x0,0x30c000,0x0,0x30c000,0x0,0x0,0x8,0x8,0x4000,0x4000,0x0,0x8,0x30c000,0x8,0x308000,0x300000,0x30c000,0x0,0x0,0x0,0x4455507,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x475d507,0x475d507,0x0,0x0,0x0,0x0,0x4000,0x240,0x475d507,0x240,0x475d507,0x0,0x0,0x0,0x0,0x475d507,0x475d507,0x475d507,0x475d507,0x0,0x475d507,0x0,0x8,0x20,0x4000,0x30c000,0x4000,0x475d507,0x475d507,0x4000,0x0,0x0,0x0,0x30c000,}; + jj_la1_1 = new int[] {0x8ebaa47,0x0,0x0,0x0,0x8ebaa47,0x8ebaa47,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x610000,0x20,0x618040,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x618040,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x618000,0x0,0x618000,0x0,0x618000,0x0,0x0,0x8,0x8,0x8000,0x8000,0x0,0x8,0x618040,0x8,0x610000,0x600000,0x618040,0x0,0x0,0x0,0x88aaa07,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8ebaa47,0x8ebaa47,0x0,0x0,0x0,0x0,0x8000,0x480,0x8ebaa47,0x480,0x8ebaa47,0x0,0x0,0x0,0x0,0x8ebaa47,0x8ebaa47,0x8ebaa47,0x8ebaa47,0x0,0x8ebaa47,0x0,0x8,0x20,0x8000,0x618040,0x8000,0x8ebaa47,0x8ebaa47,0x8000,0x0,0x0,0x0,0x618040,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x8a22880,0x8000000,0x0,0x0,0x8a22880,0x8a22880,0x0,0x0,0x0,0x10000000,0x0,0x800000,0x0,0x800000,0x820000,0x820000,0x880,0x880,0x22880,0x0,0x222880,0x0,0x10000000,0x0,0x0,0x1f,0x0,0x222880,0x0,0x0,0x20,0x20,0x40,0x40,0x20000000,0x0,0x0,0x0,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x222880,0x0,0x222880,0x0,0x222880,0x0,0x0,0x2200000,0x2200000,0x20000,0x20000,0x20000,0x2200000,0x222880,0x2000000,0x2880,0x0,0x222880,0x10000000,0x8000000,0x0,0x8820000,0x8000000,0x8000000,0x8000000,0x8000000,0x0,0x10000000,0x8000000,0x10000000,0x8000000,0x10000000,0x8000000,0x8a22880,0x8a22880,0x10000000,0x0,0x0,0x0,0x20000,0x0,0x8a22880,0x0,0x8a22880,0x0,0x0,0x0,0x0,0x8a22880,0x8a22880,0x8a22880,0x8a22880,0x8000000,0x8a22880,0x8000000,0x2000000,0x0,0x20000,0x222880,0x20000,0x8a22880,0x8a22880,0x20000,0x10000000,0x20000,0x20000,0x222880,}; + jj_la1_2 = new int[] {0x11445100,0x10000000,0x0,0x0,0x11445100,0x11445100,0x0,0x0,0x0,0x20000000,0x0,0x1000000,0x0,0x1000000,0x1040000,0x1040000,0x1100,0x1100,0x45100,0x0,0x445100,0x0,0x20000000,0x0,0x0,0x3f,0x0,0x445100,0x0,0x0,0x40,0x40,0x80,0x80,0x40000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x445100,0x0,0x445100,0x0,0x445100,0x0,0x0,0x4400000,0x4400000,0x40000,0x40000,0x40000,0x4400000,0x445100,0x4000000,0x5100,0x0,0x445100,0x20000000,0x10000000,0x0,0x11040000,0x10000000,0x10000000,0x10000000,0x10000000,0x0,0x0,0x0,0x20000000,0x10000000,0x20000000,0x10000000,0x20000000,0x10000000,0x11445100,0x11445100,0x20000000,0x0,0x0,0x0,0x40000,0x0,0x11445100,0x0,0x11445100,0x0,0x0,0x0,0x0,0x11445100,0x11445100,0x11445100,0x11445100,0x10000000,0x11445100,0x10000000,0x4000000,0x0,0x40000,0x445100,0x40000,0x11445100,0x11445100,0x40000,0x20000000,0x40000,0x40000,0x445100,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x9e1c0000,0x0,0x0,0x0,0x9e1c0000,0x9e1c0000,0x0,0x0,0x0,0x0,0x80,0x0,0x80000,0x0,0x80000,0x80000,0x0,0x0,0x18000000,0x0,0x9e1c0000,0x80000000,0x0,0x80080000,0x80000000,0x0,0x3ff80,0x9e1c0000,0x3ff80,0x200000,0x800000,0x800000,0x1000000,0x1000000,0x0,0x0,0x0,0x80000000,0x79,0x79,0x6,0x6,0x0,0x0,0x18000000,0x18000000,0x60000000,0x60000000,0x40000,0x9e1c0000,0x18000000,0x1e180000,0x100000,0x80000,0x6000000,0x6000000,0x0,0x0,0x80000,0x80000,0x80000,0x0,0x9e1c0000,0x0,0x0,0x0,0x9e1c0000,0x0,0x0,0x40000,0x60c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e1c0000,0x9e1c0000,0x0,0x80,0x603ff80,0x603ff80,0x6080000,0x0,0x9e1c0000,0x0,0x9e1c0000,0x0,0x0,0x0,0x0,0x9e5c0000,0x9e1c0000,0x9e1c0000,0x9e1c0000,0x0,0x9e5c0000,0x0,0x0,0x0,0x6080000,0x9e1c0000,0x6080000,0x9e1c0000,0x9e5c0000,0x6080000,0x0,0x0,0x0,0x9e1c0000,}; + jj_la1_3 = new int[] {0x3c380000,0x0,0x0,0x0,0x3c380000,0x3c380000,0x0,0x0,0x0,0x0,0x100,0x0,0x100000,0x0,0x100000,0x100000,0x0,0x0,0x30000000,0x0,0x3c380000,0x0,0x0,0x100000,0x0,0x0,0x7ff00,0x3c380000,0x7ff00,0x400000,0x1000000,0x1000000,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0xf2,0xf2,0xd,0xd,0x0,0x0,0x30000000,0x30000000,0xc0000000,0xc0000000,0x80000,0x3c380000,0x30000000,0x3c300000,0x200000,0x100000,0xc000000,0xc000000,0x0,0x0,0x100000,0x100000,0x100000,0x0,0x3c380000,0x0,0x0,0x0,0x3c380000,0x0,0x0,0x80000,0xc180000,0x0,0x0,0x0,0x0,0x0,0x100000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x3c380000,0x3c380000,0x0,0x100,0xc07ff00,0xc07ff00,0xc100000,0x0,0x3c380000,0x0,0x3c380000,0x0,0x0,0x0,0x0,0x3cb80000,0x3c380000,0x3c380000,0x3c380000,0x0,0x3cb80000,0x0,0x0,0x0,0xc100000,0x3c380000,0xc100000,0x3c380000,0x3cb80000,0xc100000,0x0,0x0,0x0,0x3c380000,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x100,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0xc0,0x100,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x2,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x4,0x4,0x0,0x100,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x200,0x200,0x200,0x200,0x0,0x0,0x200,0x0,0x200,0x0,0x200,0x100,0x100,0x0,0x0,0xc0,0xc0,0x100,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x200,0x100,0x200,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x100,}; + jj_la1_4 = new int[] {0x201,0x0,0x0,0x0,0x201,0x201,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x201,0x1,0x0,0x201,0x1,0x0,0x180,0x201,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x1,0x0,0x0,0x0,0x0,0x70,0x70,0x0,0x0,0x8,0x8,0x0,0x201,0x0,0x200,0x0,0x200,0x0,0x0,0x0,0x0,0x200,0x200,0x200,0x0,0x201,0x0,0x0,0x0,0x201,0x0,0x0,0x0,0x200,0x400,0x400,0x400,0x400,0x0,0x200,0x200,0x0,0x400,0x0,0x400,0x0,0x400,0x201,0x201,0x0,0x0,0x180,0x180,0x200,0x0,0x201,0x0,0x201,0x0,0x0,0x0,0x0,0x201,0x201,0x201,0x201,0x400,0x201,0x400,0x0,0x0,0x200,0x201,0x200,0x201,0x201,0x200,0x0,0x0,0x0,0x201,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; @@ -5104,7 +5200,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 116; i++) jj_la1[i] = -1; + for (int i = 0; i < 118; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5114,7 +5210,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 116; i++) jj_la1[i] = -1; + for (int i = 0; i < 118; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5131,7 +5227,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 116; i++) jj_la1[i] = -1; + for (int i = 0; i < 118; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5141,7 +5237,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 116; i++) jj_la1[i] = -1; + for (int i = 0; i < 118; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5157,7 +5253,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 116; i++) jj_la1[i] = -1; + for (int i = 0; i < 118; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5166,7 +5262,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 116; i++) jj_la1[i] = -1; + for (int i = 0; i < 118; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5273,15 +5369,15 @@ final int pos = jj_input_stream.bufpos; static public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[138]; - for (int i = 0; i < 138; i++) { + boolean[] la1tokens = new boolean[139]; + for (int i = 0; i < 139; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 116; i++) { + for (int i = 0; i < 118; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<"> } + TOKEN : +{ + +} /* RESERVED WORDS AND LITERALS */ TOKEN : @@ -947,6 +951,9 @@ String Expression() : expr = PrintExpression() {return expr;} | + expr = ListExpression() + {return expr;} +| expr = ConditionalExpression() [ assignOperator = AssignmentOperator() @@ -1649,6 +1656,30 @@ String PrintExpression() : } } +String ListExpression() : +{ + final StringBuffer buff = new StringBuffer("list("); + String expr; +} +{ + + [ + expr = VariableDeclaratorId() + {buff.append(expr);} + ] + + {buff.append(",");} + [ + expr = VariableDeclaratorId() + {buff.append(expr);} + ] + + { + buff.append(")"); + return buff.toString(); + } +} + void EchoStatement() : {} { diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index e481eff..f83035d 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -31,105 +31,106 @@ public interface PHPParserConstants { int CLASSACCESS = 35; int STATICCLASSACCESS = 36; int ARRAYASSIGN = 37; - int CASE = 38; - int CONST = 39; - int CONTINUE = 40; - int _DEFAULT = 41; - int DO = 42; - int EXTENDS = 43; - int FOR = 44; - int GOTO = 45; - int NEW = 46; - int NULL = 47; - int RETURN = 48; - int SUPER = 49; - int SWITCH = 50; - int THIS = 51; - int TRUE = 52; - int FALSE = 53; - int WHILE = 54; - int ENDWHILE = 55; - int ENDIF = 56; - int ENDFOR = 57; - int FOREACH = 58; - int AS = 59; - int STRING = 60; - int OBJECT = 61; - int BOOL = 62; - int BOOLEAN = 63; - int REAL = 64; - int DOUBLE = 65; - int FLOAT = 66; - int INT = 67; - int INTEGER = 68; - int _ORL = 69; - int _ANDL = 70; - int INTEGER_LITERAL = 71; - int DECIMAL_LITERAL = 72; - int HEX_LITERAL = 73; - int OCTAL_LITERAL = 74; - int FLOATING_POINT_LITERAL = 75; - int EXPONENT = 76; - int STRING_LITERAL = 77; - int STRING_1 = 78; - int STRING_2 = 79; - int STRING_3 = 80; - int IDENTIFIER = 81; - int LETTER = 82; - int DIGIT = 83; - int SPECIAL = 84; - int LPAREN = 85; - int RPAREN = 86; - int LBRACE = 87; - int RBRACE = 88; - int LBRACKET = 89; - int RBRACKET = 90; - int SEMICOLON = 91; - int COMMA = 92; - int DOT = 93; - int GT = 94; - int LT = 95; - int EQ = 96; - int LE = 97; - int GE = 98; - int NE = 99; - int DIF = 100; - int BANGDOUBLEEQUAL = 101; - int TRIPLEEQUAL = 102; - int ASSIGN = 103; - int PLUSASSIGN = 104; - int MINUSASSIGN = 105; - int STARASSIGN = 106; - int SLASHASSIGN = 107; - int ANDASSIGN = 108; - int ORASSIGN = 109; - int XORASSIGN = 110; - int DOTASSIGN = 111; - int REMASSIGN = 112; - int TILDEEQUAL = 113; - int AT = 114; - int DOLLAR = 115; - int BANG = 116; - int HOOK = 117; - int COLON = 118; - int SC_OR = 119; - int SC_AND = 120; - int INCR = 121; - int DECR = 122; - int PLUS = 123; - int MINUS = 124; - int STAR = 125; - int SLASH = 126; - int BIT_AND = 127; - int BIT_OR = 128; - int XOR = 129; - int REM = 130; - int LSHIFT = 131; - int RSIGNEDSHIFT = 132; - int RUNSIGNEDSHIFT = 133; - int LSHIFTASSIGN = 134; - int RSIGNEDSHIFTASSIGN = 135; - int DOLLAR_ID = 136; + int LIST = 38; + int CASE = 39; + int CONST = 40; + int CONTINUE = 41; + int _DEFAULT = 42; + int DO = 43; + int EXTENDS = 44; + int FOR = 45; + int GOTO = 46; + int NEW = 47; + int NULL = 48; + int RETURN = 49; + int SUPER = 50; + int SWITCH = 51; + int THIS = 52; + int TRUE = 53; + int FALSE = 54; + int WHILE = 55; + int ENDWHILE = 56; + int ENDIF = 57; + int ENDFOR = 58; + int FOREACH = 59; + int AS = 60; + int STRING = 61; + int OBJECT = 62; + int BOOL = 63; + int BOOLEAN = 64; + int REAL = 65; + int DOUBLE = 66; + int FLOAT = 67; + int INT = 68; + int INTEGER = 69; + int _ORL = 70; + int _ANDL = 71; + int INTEGER_LITERAL = 72; + int DECIMAL_LITERAL = 73; + int HEX_LITERAL = 74; + int OCTAL_LITERAL = 75; + int FLOATING_POINT_LITERAL = 76; + int EXPONENT = 77; + int STRING_LITERAL = 78; + int STRING_1 = 79; + int STRING_2 = 80; + int STRING_3 = 81; + int IDENTIFIER = 82; + int LETTER = 83; + int DIGIT = 84; + int SPECIAL = 85; + int LPAREN = 86; + int RPAREN = 87; + int LBRACE = 88; + int RBRACE = 89; + int LBRACKET = 90; + int RBRACKET = 91; + int SEMICOLON = 92; + int COMMA = 93; + int DOT = 94; + int GT = 95; + int LT = 96; + int EQ = 97; + int LE = 98; + int GE = 99; + int NE = 100; + int DIF = 101; + int BANGDOUBLEEQUAL = 102; + int TRIPLEEQUAL = 103; + int ASSIGN = 104; + int PLUSASSIGN = 105; + int MINUSASSIGN = 106; + int STARASSIGN = 107; + int SLASHASSIGN = 108; + int ANDASSIGN = 109; + int ORASSIGN = 110; + int XORASSIGN = 111; + int DOTASSIGN = 112; + int REMASSIGN = 113; + int TILDEEQUAL = 114; + int AT = 115; + int DOLLAR = 116; + int BANG = 117; + int HOOK = 118; + int COLON = 119; + int SC_OR = 120; + int SC_AND = 121; + int INCR = 122; + int DECR = 123; + int PLUS = 124; + int MINUS = 125; + int STAR = 126; + int SLASH = 127; + int BIT_AND = 128; + int BIT_OR = 129; + int XOR = 130; + int REM = 131; + int LSHIFT = 132; + int RSIGNEDSHIFT = 133; + int RUNSIGNEDSHIFT = 134; + int LSHIFTASSIGN = 135; + int RSIGNEDSHIFTASSIGN = 136; + int DOLLAR_ID = 137; int DEFAULT = 0; int PHPPARSING = 1; @@ -176,6 +177,7 @@ public interface PHPParserConstants { "\"->\"", "\"::\"", "\"=>\"", + "\"list\"", "\"case\"", "\"const\"", "\"continue\"", diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index e6b45da..a5546f7 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -34,7 +34,7 @@ static private final int jjMoveStringLiteralDfa0_0() case 60: return jjMoveStringLiteralDfa1_0(0xeL, 0x0L); case 63: - return jjMoveStringLiteralDfa1_0(0x0L, 0x200L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x400L); default : return 1; } @@ -48,8 +48,8 @@ static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) switch(curChar) { case 62: - if ((active2 & 0x200L) != 0L) - return jjStopAtPos(1, 137); + if ((active2 & 0x400L) != 0L) + return jjStopAtPos(1, 138); break; case 63: if ((active0 & 0x2L) != 0L) @@ -308,87 +308,87 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x2800L) != 0L || (active1 & 0x4000080000000000L) != 0L) + if ((active0 & 0x2800L) != 0L || (active1 & 0x8000100000000000L) != 0L) return 2; - if ((active1 & 0x8000000000000L) != 0L) + if ((active1 & 0x10000000000000L) != 0L) return 16; - if ((active1 & 0x800020000000L) != 0L) + if ((active1 & 0x1000040000000L) != 0L) return 8; - if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0x7fL) != 0L) + if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0xffL) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; return 14; } return -1; case 1: if ((active0 & 0x2000L) != 0L) return 0; - if ((active0 & 0x800040000400000L) != 0L || (active1 & 0x22L) != 0L) + if ((active0 & 0x1000080000400000L) != 0L || (active1 & 0x44L) != 0L) return 14; - if ((active0 & 0xf7fffbc7ffb80000L) != 0L || (active1 & 0x5dL) != 0L) + if ((active0 & 0xeffff7c7ffb80000L) != 0L || (active1 & 0xbbL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 1; } return 14; } return -1; case 2: - if ((active0 & 0x400500000200000L) != 0L || (active1 & 0x58L) != 0L) + if ((active0 & 0x800a00000200000L) != 0L || (active1 & 0xb0L) != 0L) return 14; - if ((active0 & 0xf3ffabc7ff980000L) != 0L || (active1 & 0x7L) != 0L) + if ((active0 & 0xe7ff57c7ff980000L) != 0L || (active1 & 0xfL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0xc018a04011800000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0x803140c011800000L) != 0L || (active1 & 0x3L) != 0L) return 14; - if ((active0 & 0x37e70b87ee180000L) != 0L || (active1 & 0x16L) != 0L) + if ((active0 & 0x6fce1707ee180000L) != 0L || (active1 & 0x2cL) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0xb6850b07e0900000L) != 0L || (active1 & 0x12L) != 0L) + if ((active0 & 0x6d0a1607e0900000L) != 0L || (active1 & 0x25L) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 4; return 14; } - if ((active0 & 0x16200800e080000L) != 0L || (active1 & 0x4L) != 0L) + if ((active0 & 0x2c401000e080000L) != 0L || (active1 & 0x8L) != 0L) return 14; return -1; case 5: - if ((active0 & 0x3205000600800000L) != 0L || (active1 & 0x2L) != 0L) + if ((active0 & 0x640a000600800000L) != 0L || (active1 & 0x4L) != 0L) return 14; - if ((active0 & 0x84800b01e0100000L) != 0L || (active1 & 0x10L) != 0L) + if ((active0 & 0x9001601e0100000L) != 0L || (active1 & 0x21L) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x84000a01e0000000L) != 0L || (active1 & 0x10L) != 0L) + if ((active0 & 0x8001401e0000000L) != 0L || (active1 & 0x21L) != 0L) return 14; - if ((active0 & 0x80010000100000L) != 0L) + if ((active0 & 0x100020000100000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 6; } return 14; @@ -397,17 +397,17 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 7: if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 7; return 14; } - if ((active0 & 0x80010000100000L) != 0L) + if ((active0 & 0x100020000100000L) != 0L) return 14; return -1; case 8: if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 8; return 14; } @@ -415,7 +415,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 9: if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 9; return 14; } @@ -423,7 +423,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 10: if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 81; + jjmatchedKind = 82; jjmatchedPos = 10; return 14; } @@ -449,120 +449,123 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 116; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2800000000L, 0x0L); + jjmatchedKind = 117; + return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000L, 0x0L); case 36: - return jjStartNfaWithStates_1(0, 115, 16); + return jjStartNfaWithStates_1(0, 116, 16); case 37: - jjmatchedKind = 130; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L); + jjmatchedKind = 131; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); case 38: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x0L, 0x100100000000000L, 0x0L); + jjmatchedKind = 128; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200200000000000L, 0x0L); case 40: - return jjStopAtPos(0, 85); - case 41: return jjStopAtPos(0, 86); + case 41: + return jjStopAtPos(0, 87); case 42: - jjmatchedKind = 125; - return jjMoveStringLiteralDfa1_1(0x0L, 0x40000000000L, 0x0L); + jjmatchedKind = 126; + return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000L, 0x0L); case 43: - jjmatchedKind = 123; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200010000000000L, 0x0L); + jjmatchedKind = 124; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400020000000000L, 0x0L); case 44: - return jjStopAtPos(0, 92); + return jjStopAtPos(0, 93); case 45: - jjmatchedKind = 124; - return jjMoveStringLiteralDfa1_1(0x800000000L, 0x400020000000000L, 0x0L); + jjmatchedKind = 125; + return jjMoveStringLiteralDfa1_1(0x800000000L, 0x800040000000000L, 0x0L); case 46: - jjmatchedKind = 93; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L); + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L); case 47: - jjmatchedKind = 126; - return jjMoveStringLiteralDfa1_1(0x2800L, 0x80000000000L, 0x0L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x2800L, 0x100000000000L, 0x0L); case 58: - jjmatchedKind = 118; + jjmatchedKind = 119; return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 91); + return jjStopAtPos(0, 92); case 60: - jjmatchedKind = 95; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1200000000L, 0x48L); + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000000L, 0x90L); case 61: - jjmatchedKind = 103; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4100000000L, 0x0L); + jjmatchedKind = 104; + return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x8200000000L, 0x0L); case 62: - jjmatchedKind = 94; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000L, 0xb0L); + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000L, 0x160L); case 63: - jjmatchedKind = 117; + jjmatchedKind = 118; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 114); + return jjStopAtPos(0, 115); case 91: - return jjStopAtPos(0, 89); - case 93: return jjStopAtPos(0, 90); + case 93: + return jjStopAtPos(0, 91); case 94: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000L, 0x0L); + jjmatchedKind = 130; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x800000002000000L, 0x40L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1000000002000000L, 0x80L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0xc000000004000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000004000000L, 0x1L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x1c000080000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x38000080000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x60000000000L, 0x2L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xc0000000000L, 0x4L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x380080011800000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x700100011800000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x420100000100000L, 0x4L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x840200000100000L, 0x8L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x200200000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400200000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x18L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x30L, 0x0L); + case 76: + case 108: + return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0xc00000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1800000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x2000000000000000L, 0x20L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000000000000000L, 0x40L, 0x0L); case 80: case 112: return jjMoveStringLiteralDfa1_1(0x8000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x1000140000000L, 0x1L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x2000140000000L, 0x2L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x1006000400000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200c000400000000L, 0x0L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0x18000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x30000000000000L, 0x0L, 0x0L); case 86: case 118: return jjMoveStringLiteralDfa1_1(0x200000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x40000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x80000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 87); + return jjStopAtPos(0, 88); case 124: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x0L, 0x80200000000000L, 0x0L); + jjmatchedKind = 129; + return jjMoveStringLiteralDfa1_1(0x0L, 0x100400000000000L, 0x0L); case 125: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 89); case 126: - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); default : return jjMoveNfa_1(3, 0); } @@ -577,21 +580,21 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x100000000000000L) != 0L) - return jjStopAtPos(1, 120); + if ((active1 & 0x200000000000000L) != 0L) + return jjStopAtPos(1, 121); break; case 42: if ((active0 & 0x2000L) != 0L) return jjStartNfaWithStates_1(1, 13, 0); break; case 43: - if ((active1 & 0x200000000000000L) != 0L) - return jjStopAtPos(1, 121); - break; - case 45: if ((active1 & 0x400000000000000L) != 0L) return jjStopAtPos(1, 122); break; + case 45: + if ((active1 & 0x800000000000000L) != 0L) + return jjStopAtPos(1, 123); + break; case 47: if ((active0 & 0x800L) != 0L) return jjStopAtPos(1, 11); @@ -601,29 +604,27 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 36); break; case 60: - if ((active2 & 0x8L) != 0L) + if ((active2 & 0x10L) != 0L) { - jjmatchedKind = 131; + jjmatchedKind = 132; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x80L); case 61: - if ((active1 & 0x100000000L) != 0L) + if ((active1 & 0x200000000L) != 0L) { - jjmatchedKind = 96; + jjmatchedKind = 97; jjmatchedPos = 1; } - else if ((active1 & 0x200000000L) != 0L) - return jjStopAtPos(1, 97); else if ((active1 & 0x400000000L) != 0L) return jjStopAtPos(1, 98); else if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(1, 99); + else if ((active1 & 0x1000000000L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 100; jjmatchedPos = 1; } - else if ((active1 & 0x10000000000L) != 0L) - return jjStopAtPos(1, 104); else if ((active1 & 0x20000000000L) != 0L) return jjStopAtPos(1, 105); else if ((active1 & 0x40000000000L) != 0L) @@ -642,7 +643,9 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 112); else if ((active1 & 0x2000000000000L) != 0L) return jjStopAtPos(1, 113); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000L, active2, 0L); + else if ((active1 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 114); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000L, active2, 0L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); @@ -650,26 +653,26 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 35); else if ((active0 & 0x2000000000L) != 0L) return jjStopAtPos(1, 37); - else if ((active1 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 100); - else if ((active2 & 0x10L) != 0L) + else if ((active1 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 101); + else if ((active2 & 0x20L) != 0L) { - jjmatchedKind = 132; + jjmatchedKind = 133; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x140L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x20004000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40008000200000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L); case 67: case 99: return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x1420140000000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2840140000000L, active1, 0x2L, active2, 0L); case 70: case 102: if ((active0 & 0x400000L) != 0L) @@ -677,46 +680,49 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x48000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x90000000000000L, active1, 0L, active2, 0L); + case 73: + case 105: + return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x8L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x3800000a0000000L, active1, 0x58L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x7000000a0000000L, active1, 0xb0L, active2, 0L); case 79: case 111: - if ((active0 & 0x40000000000L) != 0L) + if ((active0 & 0x80000000000L) != 0L) { - jjmatchedKind = 42; + jjmatchedKind = 43; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0xc400318000000000L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8800630000000000L, active1, 0x5L, active2, 0L); case 82: case 114: - if ((active1 & 0x20L) != 0L) - return jjStartNfaWithStates_1(1, 69, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x1000000e000000L, active1, 0L, active2, 0L); + if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(1, 70, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000e000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 59, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 60, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x1000000400000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000400000000L, active1, 0L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0x2800000100000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x5000000100000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x80000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x80000000000000L) != 0L) - return jjStopAtPos(1, 119); + if ((active1 & 0x100000000000000L) != 0L) + return jjStopAtPos(1, 120); break; default : break; @@ -735,57 +741,57 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x2000000000L) != 0L) - return jjStopAtPos(2, 101); - else if ((active1 & 0x4000000000L) != 0L) + if ((active1 & 0x4000000000L) != 0L) return jjStopAtPos(2, 102); - else if ((active2 & 0x40L) != 0L) - return jjStopAtPos(2, 134); + else if ((active1 & 0x8000000000L) != 0L) + return jjStopAtPos(2, 103); else if ((active2 & 0x80L) != 0L) return jjStopAtPos(2, 135); + else if ((active2 & 0x100L) != 0L) + return jjStopAtPos(2, 136); break; case 62: - if ((active2 & 0x20L) != 0L) - return jjStopAtPos(2, 133); + if ((active2 & 0x40L) != 0L) + return jjStopAtPos(2, 134); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x2L, active2, 0L); case 67: case 99: return jjMoveStringLiteralDfa3_1(active0, 0xa0000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x40L) != 0L) - return jjStartNfaWithStates_1(2, 70, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x380000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x80L) != 0L) + return jjStartNfaWithStates_1(2, 71, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x700000000000000L, active1, 0L, active2, 0L); case 69: case 101: return jjMoveStringLiteralDfa3_1(active0, 0x4000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x20000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0L, active2, 0L); case 72: case 104: return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x4c000008000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x98000008000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0x2000000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x20800000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x41000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x18000100000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x30000100000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0xc000000200000000L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8000000200000000L, active1, 0x9L, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x2000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000L, active1, 0L, active2, 0L); case 81: case 113: return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L); @@ -793,30 +799,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long case 114: if ((active0 & 0x200000L) != 0L) return jjStartNfaWithStates_1(2, 21, 14); - else if ((active0 & 0x100000000000L) != 0L) + else if ((active0 & 0x200000000000L) != 0L) { - jjmatchedKind = 44; + jjmatchedKind = 45; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x1400000002000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2800000002000000L, active1, 0L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x4001800000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xc001800000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x8L) != 0L) + if ((active1 & 0x10L) != 0L) { - jjmatchedKind = 67; + jjmatchedKind = 68; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x1280000000000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2500000000000L, active1, 0x20L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0x4L, active2, 0L); case 87: case 119: - if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_1(2, 46, 14); + if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_1(2, 47, 14); break; default : break; @@ -836,10 +842,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x20006000000L, active1, 0x4L); + return jjMoveStringLiteralDfa4_1(active0, 0x40006000000L, active1, 0x8L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x2L); + return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x4L); case 67: case 99: return jjMoveStringLiteralDfa4_1(active0, 0x100000L, active1, 0L); @@ -850,29 +856,29 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long jjmatchedKind = 24; jjmatchedPos = 3; } - else if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_1(3, 38, 14); - else if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 52, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x2402080000800000L, active1, 0x10L); + else if ((active0 & 0x8000000000L) != 0L) + return jjStartNfaWithStates_1(3, 39, 14); + else if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 53, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x4804100000800000L, active1, 0x20L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x1100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x2200000000000000L, active1, 0L); case 76: case 108: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(3, 47, 14); - else if ((active0 & 0x4000000000000000L) != 0L) + if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 48, 14); + else if ((active0 & 0x8000000000000000L) != 0L) { - jjmatchedKind = 62; + jjmatchedKind = 63; jjmatchedPos = 3; } - else if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(3, 64, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x80400000a0000000L, active1, 0L); + else if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(3, 65, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x800000a0000000L, active1, 0x1L); case 78: case 110: return jjMoveStringLiteralDfa4_1(active0, 0x8000000L, active1, 0L); @@ -880,23 +886,25 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long case 111: if ((active0 & 0x10000000L) != 0L) return jjStartNfaWithStates_1(3, 28, 14); - else if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(3, 45, 14); + else if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_1(3, 46, 14); break; case 83: case 115: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 51, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x20008000080000L, active1, 0L); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 52, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x40010000080000L, active1, 0L); case 84: case 116: - return jjMoveStringLiteralDfa4_1(active0, 0x4010400000000L, active1, 0L); + if ((active0 & 0x4000000000L) != 0L) + return jjStartNfaWithStates_1(3, 38, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x8020400000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x1000140000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x2000140000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L); default : break; } @@ -915,31 +923,31 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x400000200000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x800000200000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x2004000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x4008000000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 53, 14); - else if ((active0 & 0x40000000000000L) != 0L) + if ((active0 & 0x40000000000000L) != 0L) return jjStartNfaWithStates_1(4, 54, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000000L, active1, 0L); + else if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 55, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L); case 70: case 102: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 56, 14); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 57, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x10540800000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x20540800000L, active1, 0L); case 75: case 107: if ((active0 & 0x4000000L) != 0L) @@ -947,18 +955,18 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x1000080000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000100000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 49, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000L, active1, 0L); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 50, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000L, active1, 0L); case 83: case 115: if ((active0 & 0x80000L) != 0L) @@ -968,14 +976,14 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long case 116: if ((active0 & 0x8000000L) != 0L) return jjStartNfaWithStates_1(4, 27, 14); - else if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_1(4, 39, 14); - else if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(4, 66, 14); + else if ((active0 & 0x10000000000L) != 0L) + return jjStartNfaWithStates_1(4, 40, 14); + else if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(4, 67, 14); return jjMoveStringLiteralDfa5_1(active0, 0x100000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x200a0000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400a0000000L, active1, 0L); case 89: case 121: if ((active0 & 0x2000000L) != 0L) @@ -999,20 +1007,20 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L); case 67: case 99: if ((active0 & 0x400000000L) != 0L) return jjStartNfaWithStates_1(5, 34, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x800a0000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x1000a0000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_1(5, 65, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(5, 66, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L); case 70: case 102: if ((active0 & 0x800000L) != 0L) @@ -1020,36 +1028,36 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long break; case 71: case 103: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 60, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 61, 14); break; case 72: case 104: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 50, 14); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 51, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x80000000100000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x100000000100000L, active1, 0L); case 76: case 108: if ((active0 & 0x200000000L) != 0L) return jjStartNfaWithStates_1(5, 33, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 48, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x10000000000L, active1, 0L); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 49, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 57, 14); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 58, 14); return jjMoveStringLiteralDfa6_1(active0, 0x140000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 61, 14); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 62, 14); break; default : break; @@ -1082,38 +1090,38 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long return jjMoveStringLiteralDfa7_1(active0, 0x180000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 58, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 59, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x100000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 63, 14); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(6, 64, 14); break; case 79: case 111: return jjMoveStringLiteralDfa7_1(active0, 0x100000L, active1, 0L); case 82: case 114: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(6, 68, 14); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(6, 69, 14); break; case 83: case 115: - if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_1(6, 43, 14); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(6, 44, 14); break; case 84: case 116: - if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(6, 41, 14); + if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(6, 42, 14); break; case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x10000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x20000000000L, active1, 0L); default : break; } @@ -1134,10 +1142,10 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long return jjMoveStringLiteralDfa8_1(active0, 0x180000000L); case 69: case 101: - if ((active0 & 0x10000000000L) != 0L) - return jjStartNfaWithStates_1(7, 40, 14); - else if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 55, 14); + if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(7, 41, 14); + else if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 56, 14); break; case 78: case 110: @@ -1266,14 +1274,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(19, 21); } break; @@ -1292,15 +1300,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1310,8 +1318,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(22, 24); break; case 10: @@ -1321,15 +1329,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1339,8 +1347,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 136) - kind = 136; + if (kind > 137) + kind = 137; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1354,15 +1362,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(25, 27); break; case 23: @@ -1372,8 +1380,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1387,8 +1395,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(28, 12); break; case 29: @@ -1406,22 +1414,22 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddTwoStates(36, 6); break; case 37: @@ -1437,8 +1445,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(31, 33); break; case 41: - if (curChar == 34 && kind > 77) - kind = 77; + if (curChar == 34 && kind > 78) + kind = 78; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) @@ -1449,8 +1457,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(34, 36); break; case 45: - if (curChar == 34 && kind > 78) - kind = 78; + if (curChar == 34 && kind > 79) + kind = 79; break; case 46: if (curChar == 39) @@ -1465,8 +1473,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(37, 39); break; case 50: - if (curChar == 39 && kind > 77) - kind = 77; + if (curChar == 39 && kind > 78) + kind = 78; break; case 51: if ((0xffffff7fffffffffL & l) != 0L) @@ -1477,8 +1485,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(40, 42); break; case 54: - if (curChar == 39 && kind > 79) - kind = 79; + if (curChar == 39 && kind > 80) + kind = 80; break; case 56: jjAddStates(43, 45); @@ -1500,8 +1508,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAdd(14); } else if (curChar == 96) @@ -1512,31 +1520,31 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 12; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 71) - kind = 71; + if ((0x100000001000L & l) != 0L && kind > 72) + kind = 72; break; case 9: if ((0x2000000020L & l) != 0L) jjAddStates(55, 56); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 75) - kind = 75; + if ((0x5000000050L & l) != 0L && kind > 76) + kind = 76; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 136) - kind = 136; + if (kind > 137) + kind = 137; jjCheckNAdd(17); break; case 22: @@ -1558,8 +1566,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddTwoStates(35, 6); break; case 38: @@ -1607,8 +1615,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 57; break; case 59: - if (curChar == 96 && kind > 77) - kind = 77; + if (curChar == 96 && kind > 78) + kind = 78; break; case 60: if ((0xfffffffeffffffffL & l) != 0L) @@ -1623,8 +1631,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 61; break; case 63: - if (curChar == 96 && kind > 80) - kind = 80; + if (curChar == 96 && kind > 81) + kind = 81; break; default : break; } @@ -1642,8 +1650,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 81) - kind = 81; + if (kind > 82) + kind = 82; jjCheckNAdd(14); break; case 1: @@ -1654,8 +1662,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 136) - kind = 136; + if (kind > 137) + kind = 137; jjCheckNAdd(17); break; case 38: @@ -1739,13 +1747,13 @@ null, null, null, null, null, null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", -"\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", -"\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", -"\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", "\41", "\77", "\72", -"\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", -"\136", "\45", "\74\74", "\76\76", "\76\76\76", "\74\74\75", "\76\76\75", null, -"\77\76", }; +null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", +"\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", +"\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", +"\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", "\41", +"\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", +"\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\74\74\75", +"\76\76\75", null, "\77\76", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1759,10 +1767,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffff8001fL, 0xffffffffffe3e8ffL, 0x3ffL, + 0xfffffffffff8001fL, 0xffffffffffc7d1ffL, 0x7ffL, }; static final long[] jjtoSkip = { 0x3ffe0L, 0x0L, 0x0L, -- 1.7.1