From a32c0527b92faf86099a59fff7d6e836d3314f3c Mon Sep 17 00:00:00 2001 From: Fabio Zadrozny Date: Fri, 17 Jan 2025 07:02:07 -0300 Subject: [PATCH] Support having an additional comma in the end of multi-line with statements. --- .../parser/grammar310/PythonGrammar310.java | 698 +++++++++-------- .../python/pydev/parser/grammar310/python.jjt | 4 +- .../parser/grammar310/python.jjt_template | 4 +- .../parser/grammar311/PythonGrammar311.java | 710 +++++++++-------- .../python/pydev/parser/grammar311/python.jjt | 4 +- .../parser/grammar311/python.jjt_template | 4 +- .../parser/grammar312/PythonGrammar312.java | 714 ++++++++++-------- .../python/pydev/parser/grammar312/python.jjt | 4 +- .../parser/grammar312/python.jjt_template | 4 +- .../python/pydev/parser/PyParser311Test.java | 35 + 10 files changed, 1262 insertions(+), 919 deletions(-) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/PythonGrammar310.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/PythonGrammar310.java index dc1cb314b2..17dab6fa90 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/PythonGrammar310.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/PythonGrammar310.java @@ -5834,7 +5834,51 @@ final public void with_stmt() throws ParseException { } grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); - with_item(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + case LBRACE: + case LBRACKET: + case DOT: + case PLUS: + case MINUS: + case NOT: + case NOT_BOOL: + case LAMBDA: + case AWAIT: + case FALSE: + case TRUE: + case NONE: + case MATCH: + case CASE: + case NAME: + case DECNUMBER: + case HEXNUMBER: + case OCTNUMBER: + case BINNUMBER: + case FLOAT: + case COMPLEX: + case SINGLE_STRING: + case SINGLE_STRING2: + case TRIPLE_STRING: + case TRIPLE_STRING2: + case SINGLE_BSTRING: + case SINGLE_BSTRING2: + case TRIPLE_BSTRING: + case TRIPLE_BSTRING2: + case SINGLE_FSTRING: + case SINGLE_FSTRING2: + case TRIPLE_FSTRING: + case TRIPLE_FSTRING2: + case SINGLE_USTRING: + case SINGLE_USTRING2: + case TRIPLE_USTRING: + case TRIPLE_USTRING2: + with_item(); + break; + default: + jj_la1[125] = jj_gen; + ; + } } } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5848,17 +5892,61 @@ final public void with_stmt() throws ParseException { ; break; default: - jj_la1[125] = jj_gen; + jj_la1[126] = jj_gen; break label_29; } grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); - with_item(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + case LBRACE: + case LBRACKET: + case DOT: + case PLUS: + case MINUS: + case NOT: + case NOT_BOOL: + case LAMBDA: + case AWAIT: + case FALSE: + case TRUE: + case NONE: + case MATCH: + case CASE: + case NAME: + case DECNUMBER: + case HEXNUMBER: + case OCTNUMBER: + case BINNUMBER: + case FLOAT: + case COMPLEX: + case SINGLE_STRING: + case SINGLE_STRING2: + case TRIPLE_STRING: + case TRIPLE_STRING2: + case SINGLE_BSTRING: + case SINGLE_BSTRING2: + case TRIPLE_BSTRING: + case TRIPLE_BSTRING2: + case SINGLE_FSTRING: + case SINGLE_FSTRING2: + case TRIPLE_FSTRING: + case TRIPLE_FSTRING2: + case SINGLE_USTRING: + case SINGLE_USTRING2: + case TRIPLE_USTRING: + case TRIPLE_USTRING2: + with_item(); + break; + default: + jj_la1[127] = jj_gen; + ; + } } jj_consume_token(RPAREN); break; default: - jj_la1[126] = jj_gen; + jj_la1[128] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5905,7 +5993,7 @@ final public void with_item() throws ParseException { expr(); break; default: - jj_la1[127] = jj_gen; + jj_la1[129] = jj_gen; ; } } catch (Throwable jjte000) { @@ -6075,7 +6163,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[128] = jj_gen; + jj_la1[130] = jj_gen; break label_30; } } @@ -6159,7 +6247,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[129] = jj_gen; + jj_la1[131] = jj_gen; break label_31; } } @@ -6170,7 +6258,7 @@ final public void suite() throws ParseException { } break; default: - jj_la1[130] = jj_gen; + jj_la1[132] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6256,12 +6344,12 @@ final public void test() throws ParseException { if_exp(); break; default: - jj_la1[131] = jj_gen; + jj_la1[133] = jj_gen; ; } break; default: - jj_la1[132] = jj_gen; + jj_la1[134] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6333,7 +6421,7 @@ final public void test_nocond() throws ParseException { lambdef_nocond(); break; default: - jj_la1[133] = jj_gen; + jj_la1[135] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6391,7 +6479,7 @@ final public void or_test() throws ParseException { ; break; default: - jj_la1[134] = jj_gen; + jj_la1[136] = jj_gen; break label_32; } jj_consume_token(OR_BOOL); @@ -6435,7 +6523,7 @@ final public void and_test() throws ParseException { ; break; default: - jj_la1[135] = jj_gen; + jj_la1[137] = jj_gen; break label_33; } jj_consume_token(AND_BOOL); @@ -6534,7 +6622,7 @@ final public void not_test() throws ParseException { comparison(); break; default: - jj_la1[136] = jj_gen; + jj_la1[138] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6563,7 +6651,7 @@ final public void comparison() throws ParseException { ; break; default: - jj_la1[137] = jj_gen; + jj_la1[139] = jj_gen; break label_34; } comp_op(); @@ -6708,7 +6796,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[138] = jj_gen; + jj_la1[140] = jj_gen; if (jj_2_18(2)) { jj_consume_token(IS); SimpleNode jjtn009 = builder.openNode( JJTIS_NOT_CMP); @@ -6740,7 +6828,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[139] = jj_gen; + jj_la1[141] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6758,7 +6846,7 @@ final public void expr() throws ParseException { ; break; default: - jj_la1[140] = jj_gen; + jj_la1[142] = jj_gen; break label_35; } jj_consume_token(OR); @@ -6801,7 +6889,7 @@ final public void xor_expr() throws ParseException { ; break; default: - jj_la1[141] = jj_gen; + jj_la1[143] = jj_gen; break label_36; } jj_consume_token(XOR); @@ -6844,7 +6932,7 @@ final public void and_expr() throws ParseException { ; break; default: - jj_la1[142] = jj_gen; + jj_la1[144] = jj_gen; break label_37; } jj_consume_token(AND); @@ -6888,7 +6976,7 @@ final public void shift_expr() throws ParseException { ; break; default: - jj_la1[143] = jj_gen; + jj_la1[145] = jj_gen; break label_38; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -6951,7 +7039,7 @@ final public void shift_expr() throws ParseException { } break; default: - jj_la1[144] = jj_gen; + jj_la1[146] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6969,7 +7057,7 @@ final public void arith_expr() throws ParseException { ; break; default: - jj_la1[145] = jj_gen; + jj_la1[147] = jj_gen; break label_39; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7032,7 +7120,7 @@ final public void arith_expr() throws ParseException { } break; default: - jj_la1[146] = jj_gen; + jj_la1[148] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7053,7 +7141,7 @@ final public void term() throws ParseException { ; break; default: - jj_la1[147] = jj_gen; + jj_la1[149] = jj_gen; break label_40; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7203,7 +7291,7 @@ final public void term() throws ParseException { } break; default: - jj_la1[148] = jj_gen; + jj_la1[150] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7336,7 +7424,7 @@ final public void factor() throws ParseException { power(); break; default: - jj_la1[149] = jj_gen; + jj_la1[151] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7432,14 +7520,14 @@ final public void atom_expr() throws ParseException { ; break; default: - jj_la1[150] = jj_gen; + jj_la1[152] = jj_gen; break label_42; } trailer(); } break; default: - jj_la1[151] = jj_gen; + jj_la1[153] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7463,7 +7551,7 @@ final public void await_atom_expr() throws ParseException { ; break; default: - jj_la1[152] = jj_gen; + jj_la1[154] = jj_gen; break label_43; } trailer(); @@ -7550,7 +7638,7 @@ final public void trailer() throws ParseException { arglist(); break; default: - jj_la1[153] = jj_gen; + jj_la1[155] = jj_gen; ; } jj_consume_token(RPAREN); @@ -7646,7 +7734,7 @@ final public void trailer() throws ParseException { } break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7729,7 +7817,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[155] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7809,7 +7897,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[156] = jj_gen; + jj_la1[158] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("]", false); @@ -7888,7 +7976,7 @@ final public void atom() throws ParseException { dictorsetmaker(); break; default: - jj_la1[157] = jj_gen; + jj_la1[159] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("}", false); @@ -8025,7 +8113,7 @@ final public void atom() throws ParseException { ; break; default: - jj_la1[158] = jj_gen; + jj_la1[160] = jj_gen; break label_44; } SimpleNode jjtn009 = builder.openNode( JJTSTRJOIN); @@ -8057,7 +8145,7 @@ final public void atom() throws ParseException { } break; default: - jj_la1[159] = jj_gen; + jj_la1[161] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8085,7 +8173,7 @@ final public void lambdef() throws ParseException { hasArgs=true; break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8137,7 +8225,7 @@ final public void lambdef_nocond() throws ParseException { hasArgs=true; break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8193,7 +8281,7 @@ final public void subscriptlist() throws ParseException { Comma(); break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8285,7 +8373,7 @@ final public void subscript() throws ParseException { slice(); break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; ; } } catch (Throwable jjte002) { @@ -8338,7 +8426,7 @@ final public void subscript() throws ParseException { } break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8389,7 +8477,7 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -8437,12 +8525,12 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; ; } break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; ; } } @@ -8530,7 +8618,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8586,7 +8674,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[169] = jj_gen; + jj_la1[171] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8596,7 +8684,7 @@ final public void exprlist() throws ParseException { Comma(); break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8645,7 +8733,7 @@ final public void SmartTestList() throws ParseException { Comma(); break; default: - jj_la1[171] = jj_gen; + jj_la1[173] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8690,7 +8778,7 @@ final public void testlist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[172] = jj_gen; + jj_la1[174] = jj_gen; ; } } @@ -8747,7 +8835,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[173] = jj_gen; + jj_la1[175] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8805,7 +8893,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8815,7 +8903,7 @@ final public void testlist_star_expr() throws ParseException { Comma(); break; default: - jj_la1[175] = jj_gen; + jj_la1[177] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8941,7 +9029,7 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[178] = jj_gen; + jj_la1[180] = jj_gen; label_50: while (true) { if (jj_2_27(2)) { @@ -9000,7 +9088,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[176] = jj_gen; + jj_la1[178] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9011,13 +9099,13 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[177] = jj_gen; + jj_la1[179] = jj_gen; ; } } break; default: - jj_la1[181] = jj_gen; + jj_la1[183] = jj_gen; if (jj_2_29(2)) { comp_for(); } else { @@ -9082,7 +9170,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[179] = jj_gen; + jj_la1[181] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9114,7 +9202,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[180] = jj_gen; + jj_la1[182] = jj_gen; ; } } @@ -9128,7 +9216,7 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; label_52: while (true) { if (jj_2_30(2)) { @@ -9187,7 +9275,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[182] = jj_gen; + jj_la1[184] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9198,7 +9286,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[183] = jj_gen; + jj_la1[185] = jj_gen; ; } } @@ -9271,7 +9359,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[185] = jj_gen; + jj_la1[187] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9303,12 +9391,12 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[186] = jj_gen; + jj_la1[188] = jj_gen; ; } break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9363,7 +9451,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[188] = jj_gen; + jj_la1[190] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9377,7 +9465,7 @@ final public void testlist_comp() throws ParseException { ; break; default: - jj_la1[189] = jj_gen; + jj_la1[191] = jj_gen; break label_54; } } @@ -9438,7 +9526,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[190] = jj_gen; + jj_la1[192] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9453,7 +9541,7 @@ final public void testlist_comp() throws ParseException { Comma(); break; default: - jj_la1[191] = jj_gen; + jj_la1[193] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9490,7 +9578,7 @@ final public void comp_iter() throws ParseException { comp_if(); break; default: - jj_la1[192] = jj_gen; + jj_la1[194] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9509,7 +9597,7 @@ final public void comp_for() throws ParseException { jj_consume_token(ASYNC); break; default: - jj_la1[193] = jj_gen; + jj_la1[195] = jj_gen; ; } grammarActions.findTokenAndAdd("for"); @@ -9527,7 +9615,7 @@ final public void comp_for() throws ParseException { comp_iter(); break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; ; } } catch (Throwable jjte000) { @@ -9564,7 +9652,7 @@ final public void comp_if() throws ParseException { comp_iter(); break; default: - jj_la1[195] = jj_gen; + jj_la1[197] = jj_gen; ; } } @@ -9589,7 +9677,7 @@ final public void decorated() throws ParseException { async_funcdef(); break; default: - jj_la1[196] = jj_gen; + jj_la1[198] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9686,7 +9774,7 @@ final public void classdef() throws ParseException { arglist(); break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; ; } try { @@ -9697,7 +9785,7 @@ final public void classdef() throws ParseException { } break; default: - jj_la1[198] = jj_gen; + jj_la1[200] = jj_gen; ; } ISpecialStr s = grammarActions.findTokenAndAdd(":"); if(s != null){grammarActions.markEndDefColon(s, jjtn000);} @@ -9745,7 +9833,7 @@ final public void arglist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[199] = jj_gen; + jj_la1[201] = jj_gen; ; } } @@ -9845,14 +9933,14 @@ final public void argument() throws ParseException { test(); break; default: - jj_la1[201] = jj_gen; + jj_la1[203] = jj_gen; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FOR: case ASYNC: comp_for(); break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; ; } } @@ -9866,7 +9954,7 @@ final public void argument() throws ParseException { ExtraArgValueList(); break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9982,7 +10070,7 @@ final public void Number() throws ParseException { break; default: - jj_la1[203] = jj_gen; + jj_la1[205] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10029,7 +10117,7 @@ final public Token Name() throws ParseException { t = jj_consume_token(CASE); break; default: - jj_la1[204] = jj_gen; + jj_la1[206] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10357,7 +10445,7 @@ final public void String() throws ParseException { } break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10664,7 +10752,7 @@ private boolean jj_3R_125() { return false; } - private boolean jj_3R_512() { + private boolean jj_3R_514() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_61()) return true; return false; @@ -10724,7 +10812,7 @@ private boolean jj_3R_97() { return false; } - private boolean jj_3R_521() { + private boolean jj_3R_523() { if (jj_scan_token(COMMA)) return true; return false; } @@ -10760,7 +10848,7 @@ private boolean jj_3R_259() { return false; } - private boolean jj_3R_503() { + private boolean jj_3R_505() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_61()) return true; return false; @@ -10770,11 +10858,11 @@ private boolean jj_3R_58() { if (jj_3R_97()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_512()) jj_scanpos = xsp; + if (jj_3R_514()) jj_scanpos = xsp; return false; } - private boolean jj_3R_491() { + private boolean jj_3R_493() { if (jj_scan_token(COMMA)) return true; return false; } @@ -10825,7 +10913,7 @@ private boolean jj_3R_96() { if (jj_3R_97()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_503()) jj_scanpos = xsp; + if (jj_3R_505()) jj_scanpos = xsp; return false; } @@ -10863,11 +10951,11 @@ private boolean jj_3R_221() { return false; } - private boolean jj_3R_520() { + private boolean jj_3R_522() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_529()) jj_scanpos = xsp; + if (jj_3R_531()) jj_scanpos = xsp; return false; } @@ -10875,7 +10963,7 @@ private boolean jj_3R_139() { if (jj_scan_token(MULTIPLY)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_504()) jj_scanpos = xsp; + if (jj_3R_506()) jj_scanpos = xsp; return false; } @@ -10900,7 +10988,7 @@ private boolean jj_3R_99() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_521()) jj_scanpos = xsp; + if (jj_3R_523()) jj_scanpos = xsp; return false; } @@ -10934,7 +11022,7 @@ private boolean jj_3R_98() { if (jj_3_2()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_520()) jj_scanpos = xsp; + if (jj_3R_522()) jj_scanpos = xsp; return false; } @@ -10959,15 +11047,15 @@ private boolean jj_3R_211() { return false; } - private boolean jj_3R_476() { + private boolean jj_3R_478() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_491()) jj_scanpos = xsp; + if (jj_3R_493()) jj_scanpos = xsp; return false; } - private boolean jj_3R_475() { + private boolean jj_3R_477() { if (jj_3R_139()) return true; Token xsp; while (true) { @@ -11022,7 +11110,7 @@ private boolean jj_3R_325() { return false; } - private boolean jj_3R_474() { + private boolean jj_3R_476() { if (jj_3R_96()) return true; Token xsp; while (true) { @@ -11037,11 +11125,11 @@ private boolean jj_3R_474() { private boolean jj_3R_454() { Token xsp; xsp = jj_scanpos; - if (jj_3R_474()) { + if (jj_3R_476()) { jj_scanpos = xsp; - if (jj_3R_475()) { + if (jj_3R_477()) { jj_scanpos = xsp; - if (jj_3R_476()) return true; + if (jj_3R_478()) return true; } } return false; @@ -11183,6 +11271,11 @@ private boolean jj_3R_210() { return false; } + private boolean jj_3R_456() { + if (jj_3R_71()) return true; + return false; + } + private boolean jj_3R_168() { if (jj_3R_190()) return true; Token xsp; @@ -11193,8 +11286,13 @@ private boolean jj_3R_168() { return false; } - private boolean jj_3R_549() { - if (jj_3R_550()) return true; + private boolean jj_3R_551() { + if (jj_3R_552()) return true; + return false; + } + + private boolean jj_3R_455() { + if (jj_3R_71()) return true; return false; } @@ -11224,26 +11322,26 @@ private boolean jj_3R_189() { return false; } - private boolean jj_3R_548() { + private boolean jj_3R_550() { if (jj_3R_141()) return true; return false; } - private boolean jj_3R_546() { + private boolean jj_3R_548() { Token xsp; xsp = jj_scanpos; - if (jj_3R_548()) { + if (jj_3R_550()) { jj_scanpos = xsp; - if (jj_3R_549()) return true; + if (jj_3R_551()) return true; } return false; } - private boolean jj_3R_496() { + private boolean jj_3R_498() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_508()) jj_scanpos = xsp; + if (jj_3R_510()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -11263,7 +11361,7 @@ private boolean jj_3R_101() { return false; } - private boolean jj_3R_514() { + private boolean jj_3R_516() { if (jj_scan_token(AS)) return true; if (jj_3R_61()) return true; return false; @@ -11283,15 +11381,15 @@ private boolean jj_3R_394() { return false; } - private boolean jj_3R_506() { + private boolean jj_3R_508() { if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_514()) jj_scanpos = xsp; + if (jj_3R_516()) jj_scanpos = xsp; return false; } - private boolean jj_3R_495() { + private boolean jj_3R_497() { if (jj_scan_token(AT)) return true; if (jj_3R_135()) return true; return false; @@ -11302,21 +11400,21 @@ private boolean jj_3R_216() { return false; } - private boolean jj_3R_484() { - if (jj_3R_495()) return true; + private boolean jj_3R_486() { + if (jj_3R_497()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_496()) jj_scanpos = xsp; + if (jj_3R_498()) jj_scanpos = xsp; if (jj_scan_token(NEWLINE)) return true; return false; } - private boolean jj_3R_463() { + private boolean jj_3R_465() { Token xsp; - if (jj_3R_484()) return true; + if (jj_3R_486()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_484()) { jj_scanpos = xsp; break; } + if (jj_3R_486()) { jj_scanpos = xsp; break; } } return false; } @@ -11370,13 +11468,17 @@ private boolean jj_3R_196() { private boolean jj_3R_429() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_71()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_456()) jj_scanpos = xsp; return false; } private boolean jj_3R_428() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_71()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_455()) jj_scanpos = xsp; return false; } @@ -11447,73 +11549,73 @@ private boolean jj_3R_146() { return false; } - private boolean jj_3R_505() { + private boolean jj_3R_507() { if (jj_scan_token(EXCEPT)) return true; return false; } - private boolean jj_3R_492() { - if (jj_3R_505()) return true; + private boolean jj_3R_494() { + if (jj_3R_507()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_506()) jj_scanpos = xsp; + if (jj_3R_508()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_482() { + private boolean jj_3R_484() { if (jj_scan_token(FINALLY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_493() { + private boolean jj_3R_495() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_461() { - if (jj_3R_482()) return true; + private boolean jj_3R_463() { + if (jj_3R_484()) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_459() { + private boolean jj_3R_461() { if (jj_scan_token(TRY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_481() { - if (jj_3R_482()) return true; + private boolean jj_3R_483() { + if (jj_3R_484()) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_480() { - if (jj_3R_493()) return true; + private boolean jj_3R_482() { + if (jj_3R_495()) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_479() { - if (jj_3R_492()) return true; + private boolean jj_3R_481() { + if (jj_3R_494()) return true; return false; } - private boolean jj_3R_460() { + private boolean jj_3R_462() { Token xsp; - if (jj_3R_479()) return true; + if (jj_3R_481()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_479()) { jj_scanpos = xsp; break; } + if (jj_3R_481()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_480()) jj_scanpos = xsp; + if (jj_3R_482()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_481()) jj_scanpos = xsp; + if (jj_3R_483()) jj_scanpos = xsp; return false; } @@ -11523,13 +11625,13 @@ private boolean jj_3R_449() { } private boolean jj_3R_433() { - if (jj_3R_459()) return true; + if (jj_3R_461()) return true; if (jj_3R_173()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_460()) { + if (jj_3R_462()) { jj_scanpos = xsp; - if (jj_3R_461()) return true; + if (jj_3R_463()) return true; } return false; } @@ -11564,31 +11666,31 @@ private boolean jj_3R_111() { return false; } - private boolean jj_3R_478() { + private boolean jj_3R_480() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_457() { + private boolean jj_3R_459() { if (jj_scan_token(WHILE)) return true; return false; } - private boolean jj_3R_458() { - if (jj_3R_478()) return true; + private boolean jj_3R_460() { + if (jj_3R_480()) return true; if (jj_3R_173()) return true; return false; } private boolean jj_3R_432() { - if (jj_3R_457()) return true; + if (jj_3R_459()) return true; if (jj_3R_135()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_458()) jj_scanpos = xsp; + if (jj_3R_460()) jj_scanpos = xsp; return false; } @@ -11614,13 +11716,13 @@ private boolean jj_3R_444() { return false; } - private boolean jj_3R_477() { + private boolean jj_3R_479() { if (jj_scan_token(ELIF)) return true; return false; } - private boolean jj_3R_456() { - if (jj_3R_478()) return true; + private boolean jj_3R_458() { + if (jj_3R_480()) return true; if (jj_3R_173()) return true; return false; } @@ -11633,8 +11735,8 @@ private boolean jj_3R_135() { return false; } - private boolean jj_3R_455() { - if (jj_3R_477()) return true; + private boolean jj_3R_457() { + if (jj_3R_479()) return true; if (jj_3R_135()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; @@ -11654,10 +11756,10 @@ private boolean jj_3R_431() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_455()) { jj_scanpos = xsp; break; } + if (jj_3R_457()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_456()) jj_scanpos = xsp; + if (jj_3R_458()) jj_scanpos = xsp; return false; } @@ -11692,19 +11794,19 @@ private boolean jj_3R_195() { return false; } - private boolean jj_3R_490() { + private boolean jj_3R_492() { if (jj_scan_token(POWER)) return true; if (jj_3R_70()) return true; return false; } - private boolean jj_3R_489() { + private boolean jj_3R_491() { if (jj_3R_327()) return true; return false; } - private boolean jj_3R_471() { - if (jj_3R_490()) return true; + private boolean jj_3R_473() { + if (jj_3R_492()) return true; return false; } @@ -11713,17 +11815,17 @@ private boolean jj_3R_305() { return false; } - private boolean jj_3R_488() { + private boolean jj_3R_490() { if (jj_3R_326()) return true; return false; } - private boolean jj_3R_470() { + private boolean jj_3R_472() { Token xsp; xsp = jj_scanpos; - if (jj_3R_488()) { + if (jj_3R_490()) { jj_scanpos = xsp; - if (jj_3R_489()) return true; + if (jj_3R_491()) return true; } if (jj_scan_token(COLON)) return true; if (jj_3R_227()) return true; @@ -11733,9 +11835,9 @@ private boolean jj_3R_470() { private boolean jj_3R_447() { Token xsp; xsp = jj_scanpos; - if (jj_3R_470()) { + if (jj_3R_472()) { jj_scanpos = xsp; - if (jj_3R_471()) return true; + if (jj_3R_473()) return true; } return false; } @@ -11771,7 +11873,7 @@ private boolean jj_3R_330() { return false; } - private boolean jj_3R_469() { + private boolean jj_3R_471() { if (jj_3R_171()) return true; return false; } @@ -11779,7 +11881,7 @@ private boolean jj_3R_469() { private boolean jj_3R_445() { Token xsp; xsp = jj_scanpos; - if (jj_3R_469()) jj_scanpos = xsp; + if (jj_3R_471()) jj_scanpos = xsp; return false; } @@ -11805,7 +11907,7 @@ private boolean jj_3R_415() { return false; } - private boolean jj_3R_468() { + private boolean jj_3R_470() { if (jj_scan_token(COMMA)) return true; if (jj_3R_227()) return true; return false; @@ -11856,7 +11958,7 @@ private boolean jj_3R_442() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_468()) { jj_scanpos = xsp; break; } + if (jj_3R_470()) { jj_scanpos = xsp; break; } } return false; } @@ -11884,8 +11986,8 @@ private boolean jj_3R_373() { return false; } - private boolean jj_3R_483() { - if (jj_3R_494()) return true; + private boolean jj_3R_485() { + if (jj_3R_496()) return true; return false; } @@ -11960,8 +12062,8 @@ private boolean jj_3R_170() { return false; } - private boolean jj_3R_537() { - if (jj_3R_541()) return true; + private boolean jj_3R_539() { + if (jj_3R_543()) return true; return false; } @@ -12146,7 +12248,7 @@ private boolean jj_3R_227() { return false; } - private boolean jj_3R_528() { + private boolean jj_3R_530() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12190,7 +12292,7 @@ private boolean jj_3R_281() { return false; } - private boolean jj_3R_533() { + private boolean jj_3R_535() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12428,7 +12530,7 @@ private boolean jj_3R_95() { return false; } - private boolean jj_3R_507() { + private boolean jj_3R_509() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12488,7 +12590,7 @@ private boolean jj_3R_70() { return false; } - private boolean jj_3R_534() { + private boolean jj_3R_536() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12501,7 +12603,7 @@ private boolean jj_3R_255() { return false; } - private boolean jj_3R_538() { + private boolean jj_3R_540() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12664,11 +12766,11 @@ private boolean jj_3R_426() { return false; } - private boolean jj_3R_462() { + private boolean jj_3R_464() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_483()) jj_scanpos = xsp; + if (jj_3R_485()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -12727,8 +12829,8 @@ private boolean jj_3R_390() { return false; } - private boolean jj_3R_547() { - if (jj_3R_541()) return true; + private boolean jj_3R_549() { + if (jj_3R_543()) return true; return false; } @@ -12811,8 +12913,8 @@ private boolean jj_3_35() { return false; } - private boolean jj_3R_466() { - if (jj_3R_485()) return true; + private boolean jj_3R_468() { + if (jj_3R_487()) return true; return false; } @@ -12850,12 +12952,12 @@ private boolean jj_3R_166() { return false; } - private boolean jj_3R_465() { + private boolean jj_3R_467() { if (jj_3R_145()) return true; return false; } - private boolean jj_3R_494() { + private boolean jj_3R_496() { if (jj_3R_92()) return true; Token xsp; while (true) { @@ -12863,7 +12965,7 @@ private boolean jj_3R_494() { if (jj_3_35()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_507()) jj_scanpos = xsp; + if (jj_3R_509()) jj_scanpos = xsp; return false; } @@ -12889,7 +12991,7 @@ private boolean jj_3R_434() { if (jj_3R_70()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_462()) jj_scanpos = xsp; + if (jj_3R_464()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; return false; @@ -12906,14 +13008,14 @@ private boolean jj_3_33() { return false; } - private boolean jj_3R_515() { + private boolean jj_3R_517() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_33()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_522()) jj_scanpos = xsp; + if (jj_3R_524()) jj_scanpos = xsp; return false; } @@ -12937,17 +13039,17 @@ private boolean jj_3R_90() { return false; } - private boolean jj_3R_473() { + private boolean jj_3R_475() { if (jj_3R_174()) return true; return false; } - private boolean jj_3R_464() { + private boolean jj_3R_466() { if (jj_3R_434()) return true; return false; } - private boolean jj_3R_472() { + private boolean jj_3R_474() { if (jj_scan_token(FROM)) return true; if (jj_3R_61()) return true; return false; @@ -12958,7 +13060,7 @@ private boolean jj_3R_331() { return false; } - private boolean jj_3R_485() { + private boolean jj_3R_487() { if (jj_scan_token(ASYNC)) return true; if (jj_3R_145()) return true; return false; @@ -12967,9 +13069,9 @@ private boolean jj_3R_485() { private boolean jj_3R_450() { Token xsp; xsp = jj_scanpos; - if (jj_3R_472()) { + if (jj_3R_474()) { jj_scanpos = xsp; - if (jj_3R_473()) return true; + if (jj_3R_475()) return true; } return false; } @@ -12980,14 +13082,14 @@ private boolean jj_3R_91() { } private boolean jj_3R_435() { - if (jj_3R_463()) return true; + if (jj_3R_465()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_464()) { + if (jj_3R_466()) { jj_scanpos = xsp; - if (jj_3R_465()) { + if (jj_3R_467()) { jj_scanpos = xsp; - if (jj_3R_466()) return true; + if (jj_3R_468()) return true; } } return false; @@ -13008,12 +13110,12 @@ private boolean jj_3R_89() { return false; } - private boolean jj_3R_544() { - if (jj_3R_545()) return true; + private boolean jj_3R_546() { + if (jj_3R_547()) return true; return false; } - private boolean jj_3R_522() { + private boolean jj_3R_524() { if (jj_3R_379()) return true; return false; } @@ -13023,12 +13125,12 @@ private boolean jj_3R_360() { return false; } - private boolean jj_3R_545() { + private boolean jj_3R_547() { if (jj_scan_token(IF)) return true; - if (jj_3R_546()) return true; + if (jj_3R_548()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_547()) jj_scanpos = xsp; + if (jj_3R_549()) jj_scanpos = xsp; return false; } @@ -13037,7 +13139,7 @@ private boolean jj_3R_79() { return false; } - private boolean jj_3R_527() { + private boolean jj_3R_529() { Token xsp; while (true) { xsp = jj_scanpos; @@ -13066,7 +13168,7 @@ private boolean jj_3R_84() { if (jj_scan_token(IN)) return true; if (jj_3R_141()) return true; xsp = jj_scanpos; - if (jj_3R_537()) jj_scanpos = xsp; + if (jj_3R_539()) jj_scanpos = xsp; return false; } @@ -13093,17 +13195,17 @@ private boolean jj_3R_78() { return false; } - private boolean jj_3R_543() { + private boolean jj_3R_545() { if (jj_3R_84()) return true; return false; } - private boolean jj_3R_541() { + private boolean jj_3R_543() { Token xsp; xsp = jj_scanpos; - if (jj_3R_543()) { + if (jj_3R_545()) { jj_scanpos = xsp; - if (jj_3R_544()) return true; + if (jj_3R_546()) return true; } return false; } @@ -13118,7 +13220,7 @@ private boolean jj_3R_159() { return false; } - private boolean jj_3R_532() { + private boolean jj_3R_534() { Token xsp; while (true) { xsp = jj_scanpos; @@ -13176,7 +13278,7 @@ private boolean jj_3R_128() { xsp = jj_scanpos; if (jj_3_34()) { jj_scanpos = xsp; - if (jj_3R_515()) return true; + if (jj_3R_517()) return true; } return false; } @@ -13255,14 +13357,14 @@ private boolean jj_3_30() { return false; } - private boolean jj_3R_526() { + private boolean jj_3R_528() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_30()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_534()) jj_scanpos = xsp; + if (jj_3R_536()) jj_scanpos = xsp; return false; } @@ -13290,16 +13392,16 @@ private boolean jj_3R_176() { return false; } - private boolean jj_3R_518() { + private boolean jj_3R_520() { if (jj_3R_133()) return true; Token xsp; xsp = jj_scanpos; if (jj_3_32()) { jj_scanpos = xsp; - if (jj_3R_527()) return true; + if (jj_3R_529()) return true; } xsp = jj_scanpos; - if (jj_3R_528()) jj_scanpos = xsp; + if (jj_3R_530()) jj_scanpos = xsp; return false; } @@ -13308,7 +13410,7 @@ private boolean jj_3R_358() { return false; } - private boolean jj_3R_525() { + private boolean jj_3R_527() { if (jj_3R_84()) return true; return false; } @@ -13329,18 +13431,18 @@ private boolean jj_3_27() { return false; } - private boolean jj_3R_531() { + private boolean jj_3R_533() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_27()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_538()) jj_scanpos = xsp; + if (jj_3R_540()) jj_scanpos = xsp; return false; } - private boolean jj_3R_519() { + private boolean jj_3R_521() { if (jj_3R_379()) return true; return false; } @@ -13360,7 +13462,7 @@ private boolean jj_3R_352() { return false; } - private boolean jj_3R_530() { + private boolean jj_3R_532() { if (jj_3R_84()) return true; return false; } @@ -13375,15 +13477,15 @@ private boolean jj_3R_348() { return false; } - private boolean jj_3R_524() { + private boolean jj_3R_526() { Token xsp; xsp = jj_scanpos; if (jj_3_29()) { jj_scanpos = xsp; - if (jj_3R_532()) return true; + if (jj_3R_534()) return true; } xsp = jj_scanpos; - if (jj_3R_533()) jj_scanpos = xsp; + if (jj_3R_535()) jj_scanpos = xsp; return false; } @@ -13413,14 +13515,14 @@ private boolean jj_3R_344() { return false; } - private boolean jj_3R_517() { + private boolean jj_3R_519() { if (jj_scan_token(POWER)) return true; if (jj_3R_132()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_525()) { + if (jj_3R_527()) { jj_scanpos = xsp; - if (jj_3R_526()) return true; + if (jj_3R_528()) return true; } return false; } @@ -13501,14 +13603,14 @@ private boolean jj_3R_345() { return false; } - private boolean jj_3R_523() { + private boolean jj_3R_525() { if (jj_scan_token(COLON)) return true; if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_530()) { + if (jj_3R_532()) { jj_scanpos = xsp; - if (jj_3R_531()) return true; + if (jj_3R_533()) return true; } return false; } @@ -13588,25 +13690,25 @@ private boolean jj_3R_302() { return false; } - private boolean jj_3R_516() { + private boolean jj_3R_518() { if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_523()) { + if (jj_3R_525()) { jj_scanpos = xsp; - if (jj_3R_524()) return true; + if (jj_3R_526()) return true; } return false; } - private boolean jj_3R_509() { + private boolean jj_3R_511() { Token xsp; xsp = jj_scanpos; - if (jj_3R_516()) { + if (jj_3R_518()) { jj_scanpos = xsp; - if (jj_3R_517()) { + if (jj_3R_519()) { jj_scanpos = xsp; - if (jj_3R_518()) return true; + if (jj_3R_520()) return true; } } return false; @@ -13834,7 +13936,7 @@ private boolean jj_3R_200() { return false; } - private boolean jj_3R_542() { + private boolean jj_3R_544() { if (jj_3R_61()) return true; return false; } @@ -13845,7 +13947,7 @@ private boolean jj_3R_133() { return false; } - private boolean jj_3R_513() { + private boolean jj_3R_515() { if (jj_scan_token(COMMA)) return true; return false; } @@ -13946,11 +14048,11 @@ private boolean jj_3R_117() { return false; } - private boolean jj_3R_540() { + private boolean jj_3R_542() { if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_542()) jj_scanpos = xsp; + if (jj_3R_544()) jj_scanpos = xsp; return false; } @@ -14047,7 +14149,7 @@ private boolean jj_3R_134() { return false; } - private boolean jj_3R_539() { + private boolean jj_3R_541() { if (jj_3R_61()) return true; return false; } @@ -14070,7 +14172,7 @@ private boolean jj_3R_214() { return false; } - private boolean jj_3R_535() { + private boolean jj_3R_537() { if (jj_3R_161()) return true; return false; } @@ -14079,7 +14181,7 @@ private boolean jj_3R_60() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_513()) jj_scanpos = xsp; + if (jj_3R_515()) jj_scanpos = xsp; return false; } @@ -14101,9 +14203,9 @@ private boolean jj_3R_161() { if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_539()) jj_scanpos = xsp; + if (jj_3R_541()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_540()) jj_scanpos = xsp; + if (jj_3R_542()) jj_scanpos = xsp; return false; } @@ -14141,7 +14243,7 @@ private boolean jj_3R_130() { if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_535()) jj_scanpos = xsp; + if (jj_3R_537()) jj_scanpos = xsp; return false; } @@ -14170,7 +14272,7 @@ private boolean jj_3R_244() { return false; } - private boolean jj_3R_511() { + private boolean jj_3R_513() { if (jj_3R_75()) return true; Token xsp; while (true) { @@ -14178,11 +14280,11 @@ private boolean jj_3R_511() { if (jj_3_22()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_519()) jj_scanpos = xsp; + if (jj_3R_521()) jj_scanpos = xsp; return false; } - private boolean jj_3R_551() { + private boolean jj_3R_553() { if (jj_3R_208()) return true; return false; } @@ -14210,13 +14312,13 @@ private boolean jj_3R_229() { return false; } - private boolean jj_3R_550() { + private boolean jj_3R_552() { if (jj_scan_token(LAMBDA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_551()) jj_scanpos = xsp; + if (jj_3R_553()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_546()) return true; + if (jj_3R_548()) return true; return false; } @@ -14236,7 +14338,7 @@ private boolean jj_3R_367() { return false; } - private boolean jj_3R_499() { + private boolean jj_3R_501() { if (jj_3R_250()) return true; return false; } @@ -14313,7 +14415,7 @@ private boolean jj_3R_239() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_499()) { jj_scanpos = xsp; break; } + if (jj_3R_501()) { jj_scanpos = xsp; break; } } return false; } @@ -14371,8 +14473,8 @@ private boolean jj_3R_63() { return false; } - private boolean jj_3R_498() { - if (jj_3R_509()) return true; + private boolean jj_3R_500() { + if (jj_3R_511()) return true; return false; } @@ -14429,7 +14531,7 @@ private boolean jj_3R_232() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_498()) jj_scanpos = xsp; + if (jj_3R_500()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } @@ -14442,7 +14544,7 @@ private boolean jj_3R_142() { return false; } - private boolean jj_3R_497() { + private boolean jj_3R_499() { if (jj_3R_128()) return true; return false; } @@ -14481,7 +14583,7 @@ private boolean jj_3R_231() { if (jj_scan_token(LBRACKET)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_497()) jj_scanpos = xsp; + if (jj_3R_499()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } @@ -14599,7 +14701,7 @@ private boolean jj_3R_222() { return false; } - private boolean jj_3R_504() { + private boolean jj_3R_506() { if (jj_3R_97()) return true; return false; } @@ -14609,71 +14711,71 @@ private boolean jj_3R_57() { return false; } - private boolean jj_3R_536() { + private boolean jj_3R_538() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_502() { + private boolean jj_3R_504() { if (jj_scan_token(DOT)) return true; if (jj_3R_70()) return true; return false; } - private boolean jj_3R_486() { - if (jj_3R_487()) return true; + private boolean jj_3R_488() { + if (jj_3R_489()) return true; return false; } - private boolean jj_3R_501() { + private boolean jj_3R_503() { if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_511()) return true; + if (jj_3R_513()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_510() { - if (jj_3R_494()) return true; + private boolean jj_3R_512() { + if (jj_3R_496()) return true; return false; } - private boolean jj_3R_508() { - if (jj_3R_494()) return true; + private boolean jj_3R_510() { + if (jj_3R_496()) return true; return false; } - private boolean jj_3R_500() { + private boolean jj_3R_502() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_510()) jj_scanpos = xsp; + if (jj_3R_512()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_487() { + private boolean jj_3R_489() { Token xsp; xsp = jj_scanpos; - if (jj_3R_500()) { + if (jj_3R_502()) { jj_scanpos = xsp; - if (jj_3R_501()) { + if (jj_3R_503()) { jj_scanpos = xsp; - if (jj_3R_502()) return true; + if (jj_3R_504()) return true; } } return false; } - private boolean jj_3R_467() { - if (jj_3R_487()) return true; + private boolean jj_3R_469() { + if (jj_3R_489()) return true; return false; } - private boolean jj_3R_529() { + private boolean jj_3R_531() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_536()) jj_scanpos = xsp; + if (jj_3R_538()) jj_scanpos = xsp; return false; } @@ -14683,7 +14785,7 @@ private boolean jj_3R_219() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_486()) { jj_scanpos = xsp; break; } + if (jj_3R_488()) { jj_scanpos = xsp; break; } } return false; } @@ -14699,7 +14801,7 @@ private boolean jj_3R_206() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_467()) { jj_scanpos = xsp; break; } + if (jj_3R_469()) { jj_scanpos = xsp; break; } } return false; } @@ -14714,7 +14816,7 @@ private boolean jj_3R_206() { private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[206]; + final private int[] jj_la1 = new int[208]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -14730,22 +14832,22 @@ private boolean jj_3R_206() { jj_la1_init_5(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x20000000,0x5a2a0000,0x20000,0x0,0x40000000,0x80000000,0x1000000,0x0,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x40000000,0x0,0x0,0x0,0x80020000,0x1000000,0x40000000,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x40000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x4000000,0x1a2a0000,0x0,0x0,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x40000000,0x5a2a0000,0x40000000,0x0,0x1000000,0x1000000,0x582a0000,0x0,0x0,0x20000,0x182a0000,0x18000000,0x18000000,0x18000000,0x18000000,0x1000000,0x182a0000,0x2000000,0x0,0x1000000,0x220000,0x582a0000,0x582a0000,0x18000000,0x1000000,0x1000000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x1000000,0x20000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x22a0000,0x2220000,0x5a2a0000,0x2220000,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x4000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x5a2a0000,0x5a2a0000,0x0,0x5a2a0000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x5a2a0000,0x20000,0x1000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x20000000,0x5a2a0000,0x20000,0x0,0x40000000,0x80000000,0x1000000,0x0,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x40000000,0x0,0x0,0x0,0x80020000,0x1000000,0x40000000,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x40000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x4000000,0x1a2a0000,0x0,0x0,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x40000000,0x5a2a0000,0x40000000,0x0,0x1000000,0x1000000,0x582a0000,0x0,0x0,0x20000,0x182a0000,0x18000000,0x18000000,0x18000000,0x18000000,0x1000000,0x182a0000,0x2000000,0x0,0x1000000,0x220000,0x582a0000,0x582a0000,0x18000000,0x1000000,0x1000000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x1a2a0000,0x1000000,0x1a2a0000,0x20000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x22a0000,0x2220000,0x5a2a0000,0x2220000,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x4000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x5a2a0000,0x5a2a0000,0x0,0x5a2a0000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x5a2a0000,0x20000,0x1000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x22,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x200,0x200,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x20,0x20,0x0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x200,0x20,0x1fff0000,0x20,0x200,0x0,0x20,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x2,0x22,0x2,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x40000000,0x80000000,0x20,0xfc00,0xfc00,0x0,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x0,0x0,0x22,0x0,0x20,0x20,0x22,0x0,0x0,0x2,0x2,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x20,0x20,0x0,0x22,0x0,0x0,0x20,0x0,0x0,0x22,0x0,0x0,0x20,0x0,0x22,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x20000000,0x2,0x0,0x0,0x0,}; + jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x22,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x200,0x200,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x20,0x20,0x0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x200,0x20,0x1fff0000,0x20,0x200,0x0,0x20,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x2,0x22,0x2,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x20,0x0,0x20,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x40000000,0x80000000,0x20,0xfc00,0xfc00,0x0,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x0,0x0,0x22,0x0,0x20,0x20,0x22,0x0,0x0,0x2,0x2,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x20,0x20,0x0,0x22,0x0,0x0,0x20,0x0,0x0,0x22,0x0,0x0,0x20,0x0,0x22,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x20000000,0x2,0x0,0x0,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0xefff7b99,0xefff7b99,0x0,0x0,0xc0002009,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xefff6b99,0xefff6b99,0x0,0xcfff2009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0x0,0xc0102009,0x0,0xc0102009,0x0,0x11e0000,0xc0002009,0xc0402009,0xc0402009,0x400000,0xc0002009,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x10000000,0x0,0x0,0x0,0x0,0x20004b90,0x0,0x0,0xc0002009,0x0,0x10,0x0,0x0,0xc0000000,0x10000000,0x0,0x0,0xc0000000,0x0,0x0,0xc0000000,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0xc0000000,0xc0000000,0xc0000000,0x0,0x0,0xc0000000,0xc0000000,0x20000900,0x40,0x20,0x0,0x20,0x20,0x400,0x20,0x8000,0x8400,0x10000000,0xc0002009,0x0,0x0,0x0,0x10000000,0xefff7b99,0xefff7b99,0xcfff2009,0x10,0xc0002009,0xc0002009,0x0,0x0,0xc0002001,0x7,0x5,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0002000,0x0,0xc0002000,0x0,0xc0002009,0x0,0xc0102009,0xc0002009,0xc0002009,0x0,0xc0000000,0x0,0x0,0x0,0x0,0xc0002009,0xc0002009,0xc0002009,0x0,0xc0002000,0xc0002000,0x0,0x0,0x0,0xc0002009,0xc0002009,0x0,0xc0002009,0x0,0x1100,0xc0002009,0x0,0x0,0xc0002009,0x0,0x1100,0xc0002009,0x0,0xc0002009,0xc0002009,0x1100,0xc0002009,0x0,0x1110,0x1000,0x1110,0x1110,0x5800,0xc0002009,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_2 = new int[] {0xefff7b99,0xefff7b99,0x0,0x0,0xc0002009,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xefff6b99,0xefff6b99,0x0,0xcfff2009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0xc0102009,0x0,0xc0102009,0x0,0xc0102009,0x0,0x11e0000,0xc0002009,0xc0402009,0xc0402009,0x400000,0xc0002009,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x10000000,0x0,0x0,0x0,0x0,0x20004b90,0x0,0x0,0xc0002009,0x0,0x10,0x0,0x0,0xc0000000,0x10000000,0x0,0x0,0xc0000000,0x0,0x0,0xc0000000,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0xc0000000,0xc0000000,0xc0000000,0x0,0x0,0xc0000000,0xc0000000,0x20000900,0x40,0x20,0x0,0x20,0x20,0x400,0x20,0x8000,0x8400,0x10000000,0xc0002009,0x0,0xc0002009,0x0,0xc0002009,0x0,0x10000000,0xefff7b99,0xefff7b99,0xcfff2009,0x10,0xc0002009,0xc0002009,0x0,0x0,0xc0002001,0x7,0x5,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0002000,0x0,0xc0002000,0x0,0xc0002009,0x0,0xc0102009,0xc0002009,0xc0002009,0x0,0xc0000000,0x0,0x0,0x0,0x0,0xc0002009,0xc0002009,0xc0002009,0x0,0xc0002000,0xc0002000,0x0,0x0,0x0,0xc0002009,0xc0002009,0x0,0xc0002009,0x0,0x1100,0xc0002009,0x0,0x0,0xc0002009,0x0,0x1100,0xc0002009,0x0,0xc0002009,0xc0002009,0x1100,0xc0002009,0x0,0x1110,0x1000,0x1110,0x1110,0x5800,0xc0002009,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0xfdf,0xfdf,0x0,0x0,0xfdd,0x0,0x2,0x1c,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0x1c,0x0,0x0,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0x1c,0x0,0x0,0x0,0x1c,0x0,0xfdf,0xfdf,0x0,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0x0,0xfdd,0x0,0x0,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0x0,0x0,0x0,0x1c,0x0,0x0,0x1c,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x8,0x0,0xfdd,0x0,0x0,0x0,0x0,0xfdd,0x0,0x0,0x0,0xfdd,0x0,0x0,0xfc1,0xfc0,0x0,0xfdd,0x0,0x0,0x0,0x0,0xfdd,0xfdd,0xfdd,0x0,0x0,0xfdd,0xfdd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfdd,0x0,0x0,0x0,0x0,0xfdf,0xfdf,0xfdd,0x0,0xfdd,0xfdd,0x0,0x0,0xfdd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0xfdd,0x0,0xfdd,0x0,0xfdd,0x0,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0x1c,0x1c,0x0,0x0,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0xfdd,0x0,0x0,0x0,0xfdd,0xfdd,0x0,0xfdd,0x0,0x0,0xfdd,0x0,0x0,0xfdd,0x0,0x0,0xfdd,0x0,0xfdd,0xfdd,0x0,0xfdd,0x0,0x0,0x0,0x0,0x0,0x0,0xfdd,0x0,0x0,0x0,0x0,0x0,0xfc0,0x1c,0x0,}; + jj_la1_3 = new int[] {0xfdf,0xfdf,0x0,0x0,0xfdd,0x0,0x2,0x1c,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0x1c,0x0,0x0,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0x1c,0x0,0x0,0x0,0x1c,0x0,0xfdf,0xfdf,0x0,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0x0,0xfdd,0x0,0x0,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0x0,0x0,0x0,0x1c,0x0,0x0,0x1c,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x8,0x0,0xfdd,0x0,0x0,0x0,0x0,0xfdd,0x0,0x0,0x0,0xfdd,0x0,0x0,0xfc1,0xfc0,0x0,0xfdd,0x0,0x0,0x0,0x0,0xfdd,0xfdd,0xfdd,0x0,0x0,0xfdd,0xfdd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfdd,0x0,0xfdd,0x0,0xfdd,0x0,0x0,0xfdf,0xfdf,0xfdd,0x0,0xfdd,0xfdd,0x0,0x0,0xfdd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0xfdd,0x0,0xfdd,0x0,0xfdd,0x0,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0x1c,0x1c,0x0,0x0,0xfdd,0xfdd,0xfdd,0x0,0xfdd,0xfdd,0x0,0x0,0x0,0xfdd,0xfdd,0x0,0xfdd,0x0,0x0,0xfdd,0x0,0x0,0xfdd,0x0,0x0,0xfdd,0x0,0xfdd,0xfdd,0x0,0xfdd,0x0,0x0,0x0,0x0,0x0,0x0,0xfdd,0x0,0x0,0x0,0x0,0x0,0xfc0,0x1c,0x0,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0x3fffc0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x0,0x3fffc0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,}; + jj_la1_4 = new int[] {0x3fffc0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x0,0x3fffc0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x0,0x0,0x0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x0,0x3fffc0,0x0,0x3fffc0,0x3fffc0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc0,}; } private static void jj_la1_init_5() { - jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[37]; private boolean jj_rescan = false; @@ -14759,7 +14861,7 @@ public PythonGrammar310(boolean generateTree, FastCharStream stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 206; i++) jj_la1[i] = -1; + for (int i = 0; i < 208; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -14774,7 +14876,7 @@ public PythonGrammar310(boolean generateTree, PythonGrammar310TokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 206; i++) jj_la1[i] = -1; + for (int i = 0; i < 208; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -14894,7 +14996,7 @@ public ParseException generateParseException() { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 206; i++) { + for (int i = 0; i < 208; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< with_item())* + ({grammarActions.findTokenAndAdd(",");} [with_item()])* ) | ( with_item() - ({grammarActions.findTokenAndAdd(",");} with_item())* + ({grammarActions.findTokenAndAdd(",");} [with_item()])* ) ) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt_template b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt_template index 34282d6443..3ab5a1fd71 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt_template +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt_template @@ -1175,13 +1175,13 @@ void with_stmt(): {} LOOKAHEAD(with_item()) ( with_item() - ($COMMA with_item())* + ($COMMA [with_item()])* ) | ( with_item() - ($COMMA with_item())* + ($COMMA [with_item()])* ) ) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/PythonGrammar311.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/PythonGrammar311.java index f3a42ef1dc..b56827f689 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/PythonGrammar311.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/PythonGrammar311.java @@ -5864,7 +5864,51 @@ final public void with_stmt() throws ParseException { } grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); - with_item(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + case LBRACE: + case LBRACKET: + case DOT: + case PLUS: + case MINUS: + case NOT: + case NOT_BOOL: + case LAMBDA: + case AWAIT: + case FALSE: + case TRUE: + case NONE: + case MATCH: + case CASE: + case NAME: + case DECNUMBER: + case HEXNUMBER: + case OCTNUMBER: + case BINNUMBER: + case FLOAT: + case COMPLEX: + case SINGLE_STRING: + case SINGLE_STRING2: + case TRIPLE_STRING: + case TRIPLE_STRING2: + case SINGLE_BSTRING: + case SINGLE_BSTRING2: + case TRIPLE_BSTRING: + case TRIPLE_BSTRING2: + case SINGLE_FSTRING: + case SINGLE_FSTRING2: + case TRIPLE_FSTRING: + case TRIPLE_FSTRING2: + case SINGLE_USTRING: + case SINGLE_USTRING2: + case TRIPLE_USTRING: + case TRIPLE_USTRING2: + with_item(); + break; + default: + jj_la1[126] = jj_gen; + ; + } } } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5878,17 +5922,61 @@ final public void with_stmt() throws ParseException { ; break; default: - jj_la1[126] = jj_gen; + jj_la1[127] = jj_gen; break label_29; } grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); - with_item(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + case LBRACE: + case LBRACKET: + case DOT: + case PLUS: + case MINUS: + case NOT: + case NOT_BOOL: + case LAMBDA: + case AWAIT: + case FALSE: + case TRUE: + case NONE: + case MATCH: + case CASE: + case NAME: + case DECNUMBER: + case HEXNUMBER: + case OCTNUMBER: + case BINNUMBER: + case FLOAT: + case COMPLEX: + case SINGLE_STRING: + case SINGLE_STRING2: + case TRIPLE_STRING: + case TRIPLE_STRING2: + case SINGLE_BSTRING: + case SINGLE_BSTRING2: + case TRIPLE_BSTRING: + case TRIPLE_BSTRING2: + case SINGLE_FSTRING: + case SINGLE_FSTRING2: + case TRIPLE_FSTRING: + case TRIPLE_FSTRING2: + case SINGLE_USTRING: + case SINGLE_USTRING2: + case TRIPLE_USTRING: + case TRIPLE_USTRING2: + with_item(); + break; + default: + jj_la1[128] = jj_gen; + ; + } } jj_consume_token(RPAREN); break; default: - jj_la1[127] = jj_gen; + jj_la1[129] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5935,7 +6023,7 @@ final public void with_item() throws ParseException { expr(); break; default: - jj_la1[128] = jj_gen; + jj_la1[130] = jj_gen; ; } } catch (Throwable jjte000) { @@ -6105,7 +6193,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[129] = jj_gen; + jj_la1[131] = jj_gen; break label_30; } } @@ -6189,7 +6277,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[130] = jj_gen; + jj_la1[132] = jj_gen; break label_31; } } @@ -6200,7 +6288,7 @@ final public void suite() throws ParseException { } break; default: - jj_la1[131] = jj_gen; + jj_la1[133] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6286,12 +6374,12 @@ final public void test() throws ParseException { if_exp(); break; default: - jj_la1[132] = jj_gen; + jj_la1[134] = jj_gen; ; } break; default: - jj_la1[133] = jj_gen; + jj_la1[135] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6363,7 +6451,7 @@ final public void test_nocond() throws ParseException { lambdef_nocond(); break; default: - jj_la1[134] = jj_gen; + jj_la1[136] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6421,7 +6509,7 @@ final public void or_test() throws ParseException { ; break; default: - jj_la1[135] = jj_gen; + jj_la1[137] = jj_gen; break label_32; } jj_consume_token(OR_BOOL); @@ -6465,7 +6553,7 @@ final public void and_test() throws ParseException { ; break; default: - jj_la1[136] = jj_gen; + jj_la1[138] = jj_gen; break label_33; } jj_consume_token(AND_BOOL); @@ -6564,7 +6652,7 @@ final public void not_test() throws ParseException { comparison(); break; default: - jj_la1[137] = jj_gen; + jj_la1[139] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6593,7 +6681,7 @@ final public void comparison() throws ParseException { ; break; default: - jj_la1[138] = jj_gen; + jj_la1[140] = jj_gen; break label_34; } comp_op(); @@ -6738,7 +6826,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[139] = jj_gen; + jj_la1[141] = jj_gen; if (jj_2_18(2)) { jj_consume_token(IS); SimpleNode jjtn009 = builder.openNode( JJTIS_NOT_CMP); @@ -6770,7 +6858,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[140] = jj_gen; + jj_la1[142] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6788,7 +6876,7 @@ final public void expr() throws ParseException { ; break; default: - jj_la1[141] = jj_gen; + jj_la1[143] = jj_gen; break label_35; } jj_consume_token(OR); @@ -6831,7 +6919,7 @@ final public void xor_expr() throws ParseException { ; break; default: - jj_la1[142] = jj_gen; + jj_la1[144] = jj_gen; break label_36; } jj_consume_token(XOR); @@ -6874,7 +6962,7 @@ final public void and_expr() throws ParseException { ; break; default: - jj_la1[143] = jj_gen; + jj_la1[145] = jj_gen; break label_37; } jj_consume_token(AND); @@ -6918,7 +7006,7 @@ final public void shift_expr() throws ParseException { ; break; default: - jj_la1[144] = jj_gen; + jj_la1[146] = jj_gen; break label_38; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -6981,7 +7069,7 @@ final public void shift_expr() throws ParseException { } break; default: - jj_la1[145] = jj_gen; + jj_la1[147] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6999,7 +7087,7 @@ final public void arith_expr() throws ParseException { ; break; default: - jj_la1[146] = jj_gen; + jj_la1[148] = jj_gen; break label_39; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7062,7 +7150,7 @@ final public void arith_expr() throws ParseException { } break; default: - jj_la1[147] = jj_gen; + jj_la1[149] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7083,7 +7171,7 @@ final public void term() throws ParseException { ; break; default: - jj_la1[148] = jj_gen; + jj_la1[150] = jj_gen; break label_40; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7233,7 +7321,7 @@ final public void term() throws ParseException { } break; default: - jj_la1[149] = jj_gen; + jj_la1[151] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7366,7 +7454,7 @@ final public void factor() throws ParseException { power(); break; default: - jj_la1[150] = jj_gen; + jj_la1[152] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7462,14 +7550,14 @@ final public void atom_expr() throws ParseException { ; break; default: - jj_la1[151] = jj_gen; + jj_la1[153] = jj_gen; break label_42; } trailer(); } break; default: - jj_la1[152] = jj_gen; + jj_la1[154] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7493,7 +7581,7 @@ final public void await_atom_expr() throws ParseException { ; break; default: - jj_la1[153] = jj_gen; + jj_la1[155] = jj_gen; break label_43; } trailer(); @@ -7580,7 +7668,7 @@ final public void trailer() throws ParseException { arglist(); break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; ; } jj_consume_token(RPAREN); @@ -7676,7 +7764,7 @@ final public void trailer() throws ParseException { } break; default: - jj_la1[155] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7759,7 +7847,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[156] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7839,7 +7927,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[157] = jj_gen; + jj_la1[159] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("]", false); @@ -7918,7 +8006,7 @@ final public void atom() throws ParseException { dictorsetmaker(); break; default: - jj_la1[158] = jj_gen; + jj_la1[160] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("}", false); @@ -8055,7 +8143,7 @@ final public void atom() throws ParseException { ; break; default: - jj_la1[159] = jj_gen; + jj_la1[161] = jj_gen; break label_44; } SimpleNode jjtn009 = builder.openNode( JJTSTRJOIN); @@ -8087,7 +8175,7 @@ final public void atom() throws ParseException { } break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8115,7 +8203,7 @@ final public void lambdef() throws ParseException { hasArgs=true; break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8167,7 +8255,7 @@ final public void lambdef_nocond() throws ParseException { hasArgs=true; break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8223,7 +8311,7 @@ final public void subscriptlist() throws ParseException { Comma(); break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8315,7 +8403,7 @@ final public void subscript() throws ParseException { slice(); break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; ; } } catch (Throwable jjte002) { @@ -8368,7 +8456,7 @@ final public void subscript() throws ParseException { } break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8419,7 +8507,7 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -8467,12 +8555,12 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; ; } break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; ; } } @@ -8560,7 +8648,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[169] = jj_gen; + jj_la1[171] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8616,7 +8704,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8626,7 +8714,7 @@ final public void exprlist() throws ParseException { Comma(); break; default: - jj_la1[171] = jj_gen; + jj_la1[173] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8675,7 +8763,7 @@ final public void SmartTestList() throws ParseException { Comma(); break; default: - jj_la1[172] = jj_gen; + jj_la1[174] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8720,7 +8808,7 @@ final public void testlist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[173] = jj_gen; + jj_la1[175] = jj_gen; ; } } @@ -8777,7 +8865,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8835,7 +8923,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[175] = jj_gen; + jj_la1[177] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8845,7 +8933,7 @@ final public void testlist_star_expr() throws ParseException { Comma(); break; default: - jj_la1[176] = jj_gen; + jj_la1[178] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8971,7 +9059,7 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[179] = jj_gen; + jj_la1[181] = jj_gen; label_50: while (true) { if (jj_2_27(2)) { @@ -9030,7 +9118,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[177] = jj_gen; + jj_la1[179] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9041,13 +9129,13 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[178] = jj_gen; + jj_la1[180] = jj_gen; ; } } break; default: - jj_la1[182] = jj_gen; + jj_la1[184] = jj_gen; if (jj_2_29(2)) { comp_for(); } else { @@ -9112,7 +9200,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[180] = jj_gen; + jj_la1[182] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9144,7 +9232,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[181] = jj_gen; + jj_la1[183] = jj_gen; ; } } @@ -9158,7 +9246,7 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[185] = jj_gen; + jj_la1[187] = jj_gen; label_52: while (true) { if (jj_2_30(2)) { @@ -9217,7 +9305,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[183] = jj_gen; + jj_la1[185] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9228,7 +9316,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; ; } } @@ -9301,7 +9389,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[186] = jj_gen; + jj_la1[188] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9333,12 +9421,12 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; ; } break; default: - jj_la1[188] = jj_gen; + jj_la1[190] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9393,7 +9481,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[189] = jj_gen; + jj_la1[191] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9407,7 +9495,7 @@ final public void testlist_comp() throws ParseException { ; break; default: - jj_la1[190] = jj_gen; + jj_la1[192] = jj_gen; break label_54; } } @@ -9468,7 +9556,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[191] = jj_gen; + jj_la1[193] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9483,7 +9571,7 @@ final public void testlist_comp() throws ParseException { Comma(); break; default: - jj_la1[192] = jj_gen; + jj_la1[194] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9520,7 +9608,7 @@ final public void comp_iter() throws ParseException { comp_if(); break; default: - jj_la1[193] = jj_gen; + jj_la1[195] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9539,7 +9627,7 @@ final public void comp_for() throws ParseException { jj_consume_token(ASYNC); break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; ; } grammarActions.findTokenAndAdd("for"); @@ -9557,7 +9645,7 @@ final public void comp_for() throws ParseException { comp_iter(); break; default: - jj_la1[195] = jj_gen; + jj_la1[197] = jj_gen; ; } } catch (Throwable jjte000) { @@ -9594,7 +9682,7 @@ final public void comp_if() throws ParseException { comp_iter(); break; default: - jj_la1[196] = jj_gen; + jj_la1[198] = jj_gen; ; } } @@ -9619,7 +9707,7 @@ final public void decorated() throws ParseException { async_funcdef(); break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9716,7 +9804,7 @@ final public void classdef() throws ParseException { arglist(); break; default: - jj_la1[198] = jj_gen; + jj_la1[200] = jj_gen; ; } try { @@ -9727,7 +9815,7 @@ final public void classdef() throws ParseException { } break; default: - jj_la1[199] = jj_gen; + jj_la1[201] = jj_gen; ; } ISpecialStr s = grammarActions.findTokenAndAdd(":"); if(s != null){grammarActions.markEndDefColon(s, jjtn000);} @@ -9775,7 +9863,7 @@ final public void arglist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; ; } } @@ -9875,14 +9963,14 @@ final public void argument() throws ParseException { test(); break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FOR: case ASYNC: comp_for(); break; default: - jj_la1[201] = jj_gen; + jj_la1[203] = jj_gen; ; } } @@ -9896,7 +9984,7 @@ final public void argument() throws ParseException { ExtraArgValueList(); break; default: - jj_la1[203] = jj_gen; + jj_la1[205] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10012,7 +10100,7 @@ final public void Number() throws ParseException { break; default: - jj_la1[204] = jj_gen; + jj_la1[206] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10059,7 +10147,7 @@ final public Token Name() throws ParseException { t = jj_consume_token(CASE); break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10387,7 +10475,7 @@ final public void String() throws ParseException { } break; default: - jj_la1[206] = jj_gen; + jj_la1[208] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10746,7 +10834,7 @@ private boolean jj_3_6() { return false; } - private boolean jj_3R_513() { + private boolean jj_3R_515() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_61()) return true; return false; @@ -10802,12 +10890,12 @@ private boolean jj_3R_247() { return false; } - private boolean jj_3R_524() { + private boolean jj_3R_526() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_503() { + private boolean jj_3R_505() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_61()) return true; return false; @@ -10823,7 +10911,7 @@ private boolean jj_3R_58() { if (jj_3R_97()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_513()) jj_scanpos = xsp; + if (jj_3R_515()) jj_scanpos = xsp; return false; } @@ -10843,7 +10931,7 @@ private boolean jj_3R_221() { return false; } - private boolean jj_3R_491() { + private boolean jj_3R_493() { if (jj_scan_token(COMMA)) return true; return false; } @@ -10852,7 +10940,7 @@ private boolean jj_3R_96() { if (jj_3R_97()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_503()) jj_scanpos = xsp; + if (jj_3R_505()) jj_scanpos = xsp; return false; } @@ -10911,11 +10999,11 @@ private boolean jj_3R_186() { return false; } - private boolean jj_3R_523() { + private boolean jj_3R_525() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_532()) jj_scanpos = xsp; + if (jj_3R_534()) jj_scanpos = xsp; return false; } @@ -10923,7 +11011,7 @@ private boolean jj_3R_139() { if (jj_scan_token(MULTIPLY)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_504()) jj_scanpos = xsp; + if (jj_3R_506()) jj_scanpos = xsp; return false; } @@ -10948,7 +11036,7 @@ private boolean jj_3R_99() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_524()) jj_scanpos = xsp; + if (jj_3R_526()) jj_scanpos = xsp; return false; } @@ -10970,7 +11058,7 @@ private boolean jj_3R_98() { if (jj_3_2()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_523()) jj_scanpos = xsp; + if (jj_3R_525()) jj_scanpos = xsp; return false; } @@ -10984,11 +11072,11 @@ private boolean jj_3R_59() { return false; } - private boolean jj_3R_476() { + private boolean jj_3R_478() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_491()) jj_scanpos = xsp; + if (jj_3R_493()) jj_scanpos = xsp; return false; } @@ -11002,7 +11090,7 @@ private boolean jj_3R_132() { return false; } - private boolean jj_3R_475() { + private boolean jj_3R_477() { if (jj_3R_139()) return true; Token xsp; while (true) { @@ -11114,7 +11202,7 @@ private boolean jj_3R_284() { return false; } - private boolean jj_3R_474() { + private boolean jj_3R_476() { if (jj_3R_96()) return true; Token xsp; while (true) { @@ -11129,11 +11217,11 @@ private boolean jj_3R_474() { private boolean jj_3R_454() { Token xsp; xsp = jj_scanpos; - if (jj_3R_474()) { + if (jj_3R_476()) { jj_scanpos = xsp; - if (jj_3R_475()) { + if (jj_3R_477()) { jj_scanpos = xsp; - if (jj_3R_476()) return true; + if (jj_3R_478()) return true; } } return false; @@ -11188,6 +11276,11 @@ private boolean jj_3R_210() { return false; } + private boolean jj_3R_456() { + if (jj_3R_71()) return true; + return false; + } + private boolean jj_3R_168() { if (jj_3R_190()) return true; Token xsp; @@ -11198,8 +11291,13 @@ private boolean jj_3R_168() { return false; } - private boolean jj_3R_552() { - if (jj_3R_553()) return true; + private boolean jj_3R_554() { + if (jj_3R_555()) return true; + return false; + } + + private boolean jj_3R_455() { + if (jj_3R_71()) return true; return false; } @@ -11229,17 +11327,17 @@ private boolean jj_3R_189() { return false; } - private boolean jj_3R_551() { + private boolean jj_3R_553() { if (jj_3R_141()) return true; return false; } - private boolean jj_3R_549() { + private boolean jj_3R_551() { Token xsp; xsp = jj_scanpos; - if (jj_3R_551()) { + if (jj_3R_553()) { jj_scanpos = xsp; - if (jj_3R_552()) return true; + if (jj_3R_554()) return true; } return false; } @@ -11259,11 +11357,11 @@ private boolean jj_3R_101() { return false; } - private boolean jj_3R_496() { + private boolean jj_3R_498() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_509()) jj_scanpos = xsp; + if (jj_3R_511()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -11304,7 +11402,7 @@ private boolean jj_3R_215() { return false; } - private boolean jj_3R_495() { + private boolean jj_3R_497() { if (jj_scan_token(AT)) return true; if (jj_3R_135()) return true; return false; @@ -11323,11 +11421,11 @@ private boolean jj_3R_197() { return false; } - private boolean jj_3R_484() { - if (jj_3R_495()) return true; + private boolean jj_3R_486() { + if (jj_3R_497()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_496()) jj_scanpos = xsp; + if (jj_3R_498()) jj_scanpos = xsp; if (jj_scan_token(NEWLINE)) return true; return false; } @@ -11337,25 +11435,29 @@ private boolean jj_3R_196() { return false; } - private boolean jj_3R_463() { + private boolean jj_3R_465() { Token xsp; - if (jj_3R_484()) return true; + if (jj_3R_486()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_484()) { jj_scanpos = xsp; break; } + if (jj_3R_486()) { jj_scanpos = xsp; break; } } return false; } private boolean jj_3R_429() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_71()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_456()) jj_scanpos = xsp; return false; } private boolean jj_3R_428() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_71()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_455()) jj_scanpos = xsp; return false; } @@ -11438,106 +11540,106 @@ private boolean jj_3R_146() { return false; } - private boolean jj_3R_517() { + private boolean jj_3R_519() { if (jj_scan_token(AS)) return true; if (jj_3R_61()) return true; return false; } - private boolean jj_3R_516() { + private boolean jj_3R_518() { if (jj_scan_token(EXCEPT_MULTIPLY)) return true; return false; } - private boolean jj_3R_507() { + private boolean jj_3R_509() { if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_517()) jj_scanpos = xsp; + if (jj_3R_519()) jj_scanpos = xsp; return false; } - private boolean jj_3R_515() { + private boolean jj_3R_517() { if (jj_scan_token(EXCEPT)) return true; return false; } - private boolean jj_3R_506() { - if (jj_3R_516()) return true; + private boolean jj_3R_508() { + if (jj_3R_518()) return true; return false; } - private boolean jj_3R_505() { - if (jj_3R_515()) return true; + private boolean jj_3R_507() { + if (jj_3R_517()) return true; return false; } - private boolean jj_3R_492() { + private boolean jj_3R_494() { Token xsp; xsp = jj_scanpos; - if (jj_3R_505()) { + if (jj_3R_507()) { jj_scanpos = xsp; - if (jj_3R_506()) return true; + if (jj_3R_508()) return true; } xsp = jj_scanpos; - if (jj_3R_507()) jj_scanpos = xsp; + if (jj_3R_509()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_482() { + private boolean jj_3R_484() { if (jj_scan_token(FINALLY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_493() { + private boolean jj_3R_495() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_461() { - if (jj_3R_482()) return true; + private boolean jj_3R_463() { + if (jj_3R_484()) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_459() { + private boolean jj_3R_461() { if (jj_scan_token(TRY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_481() { - if (jj_3R_482()) return true; + private boolean jj_3R_483() { + if (jj_3R_484()) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_480() { - if (jj_3R_493()) return true; + private boolean jj_3R_482() { + if (jj_3R_495()) return true; if (jj_3R_173()) return true; return false; } - private boolean jj_3R_479() { - if (jj_3R_492()) return true; + private boolean jj_3R_481() { + if (jj_3R_494()) return true; return false; } - private boolean jj_3R_460() { + private boolean jj_3R_462() { Token xsp; - if (jj_3R_479()) return true; + if (jj_3R_481()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_479()) { jj_scanpos = xsp; break; } + if (jj_3R_481()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_480()) jj_scanpos = xsp; + if (jj_3R_482()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_481()) jj_scanpos = xsp; + if (jj_3R_483()) jj_scanpos = xsp; return false; } @@ -11547,13 +11649,13 @@ private boolean jj_3R_449() { } private boolean jj_3R_433() { - if (jj_3R_459()) return true; + if (jj_3R_461()) return true; if (jj_3R_173()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_460()) { + if (jj_3R_462()) { jj_scanpos = xsp; - if (jj_3R_461()) return true; + if (jj_3R_463()) return true; } return false; } @@ -11588,31 +11690,31 @@ private boolean jj_3R_111() { return false; } - private boolean jj_3R_478() { + private boolean jj_3R_480() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_457() { + private boolean jj_3R_459() { if (jj_scan_token(WHILE)) return true; return false; } - private boolean jj_3R_458() { - if (jj_3R_478()) return true; + private boolean jj_3R_460() { + if (jj_3R_480()) return true; if (jj_3R_173()) return true; return false; } private boolean jj_3R_432() { - if (jj_3R_457()) return true; + if (jj_3R_459()) return true; if (jj_3R_135()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_458()) jj_scanpos = xsp; + if (jj_3R_460()) jj_scanpos = xsp; return false; } @@ -11638,13 +11740,13 @@ private boolean jj_3R_444() { return false; } - private boolean jj_3R_477() { + private boolean jj_3R_479() { if (jj_scan_token(ELIF)) return true; return false; } - private boolean jj_3R_456() { - if (jj_3R_478()) return true; + private boolean jj_3R_458() { + if (jj_3R_480()) return true; if (jj_3R_173()) return true; return false; } @@ -11657,8 +11759,8 @@ private boolean jj_3R_135() { return false; } - private boolean jj_3R_455() { - if (jj_3R_477()) return true; + private boolean jj_3R_457() { + if (jj_3R_479()) return true; if (jj_3R_135()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; @@ -11678,10 +11780,10 @@ private boolean jj_3R_431() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_455()) { jj_scanpos = xsp; break; } + if (jj_3R_457()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_456()) jj_scanpos = xsp; + if (jj_3R_458()) jj_scanpos = xsp; return false; } @@ -11716,19 +11818,19 @@ private boolean jj_3R_195() { return false; } - private boolean jj_3R_490() { + private boolean jj_3R_492() { if (jj_scan_token(POWER)) return true; if (jj_3R_70()) return true; return false; } - private boolean jj_3R_489() { + private boolean jj_3R_491() { if (jj_3R_327()) return true; return false; } - private boolean jj_3R_471() { - if (jj_3R_490()) return true; + private boolean jj_3R_473() { + if (jj_3R_492()) return true; return false; } @@ -11737,17 +11839,17 @@ private boolean jj_3R_305() { return false; } - private boolean jj_3R_488() { + private boolean jj_3R_490() { if (jj_3R_326()) return true; return false; } - private boolean jj_3R_470() { + private boolean jj_3R_472() { Token xsp; xsp = jj_scanpos; - if (jj_3R_488()) { + if (jj_3R_490()) { jj_scanpos = xsp; - if (jj_3R_489()) return true; + if (jj_3R_491()) return true; } if (jj_scan_token(COLON)) return true; if (jj_3R_227()) return true; @@ -11757,9 +11859,9 @@ private boolean jj_3R_470() { private boolean jj_3R_447() { Token xsp; xsp = jj_scanpos; - if (jj_3R_470()) { + if (jj_3R_472()) { jj_scanpos = xsp; - if (jj_3R_471()) return true; + if (jj_3R_473()) return true; } return false; } @@ -11795,7 +11897,7 @@ private boolean jj_3R_330() { return false; } - private boolean jj_3R_469() { + private boolean jj_3R_471() { if (jj_3R_171()) return true; return false; } @@ -11803,7 +11905,7 @@ private boolean jj_3R_469() { private boolean jj_3R_445() { Token xsp; xsp = jj_scanpos; - if (jj_3R_469()) jj_scanpos = xsp; + if (jj_3R_471()) jj_scanpos = xsp; return false; } @@ -11829,7 +11931,7 @@ private boolean jj_3R_415() { return false; } - private boolean jj_3R_468() { + private boolean jj_3R_470() { if (jj_scan_token(COMMA)) return true; if (jj_3R_227()) return true; return false; @@ -11849,8 +11951,8 @@ private boolean jj_3R_377() { return false; } - private boolean jj_3R_483() { - if (jj_3R_494()) return true; + private boolean jj_3R_485() { + if (jj_3R_496()) return true; return false; } @@ -11885,7 +11987,7 @@ private boolean jj_3R_442() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_468()) { jj_scanpos = xsp; break; } + if (jj_3R_470()) { jj_scanpos = xsp; break; } } return false; } @@ -11934,8 +12036,8 @@ private boolean jj_3R_172() { return false; } - private boolean jj_3R_540() { - if (jj_3R_544()) return true; + private boolean jj_3R_542() { + if (jj_3R_546()) return true; return false; } @@ -12129,7 +12231,7 @@ private boolean jj_3R_242() { return false; } - private boolean jj_3R_531() { + private boolean jj_3R_533() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12182,7 +12284,7 @@ private boolean jj_3R_281() { return false; } - private boolean jj_3R_536() { + private boolean jj_3R_538() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12452,7 +12554,7 @@ private boolean jj_3R_400() { return false; } - private boolean jj_3R_508() { + private boolean jj_3R_510() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12470,12 +12572,12 @@ private boolean jj_3R_70() { return false; } - private boolean jj_3R_537() { + private boolean jj_3R_539() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_541() { + private boolean jj_3R_543() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12672,11 +12774,11 @@ private boolean jj_3_36() { return false; } - private boolean jj_3R_462() { + private boolean jj_3R_464() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_483()) jj_scanpos = xsp; + if (jj_3R_485()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -12718,8 +12820,8 @@ private boolean jj_3R_426() { return false; } - private boolean jj_3R_550() { - if (jj_3R_544()) return true; + private boolean jj_3R_552() { + if (jj_3R_546()) return true; return false; } @@ -12810,8 +12912,8 @@ private boolean jj_3_35() { return false; } - private boolean jj_3R_466() { - if (jj_3R_485()) return true; + private boolean jj_3R_468() { + if (jj_3R_487()) return true; return false; } @@ -12852,12 +12954,12 @@ private boolean jj_3R_166() { return false; } - private boolean jj_3R_465() { + private boolean jj_3R_467() { if (jj_3R_145()) return true; return false; } - private boolean jj_3R_494() { + private boolean jj_3R_496() { if (jj_3R_92()) return true; Token xsp; while (true) { @@ -12865,7 +12967,7 @@ private boolean jj_3R_494() { if (jj_3_35()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_508()) jj_scanpos = xsp; + if (jj_3R_510()) jj_scanpos = xsp; return false; } @@ -12897,7 +12999,7 @@ private boolean jj_3R_434() { if (jj_3R_70()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_462()) jj_scanpos = xsp; + if (jj_3R_464()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_173()) return true; return false; @@ -12920,14 +13022,14 @@ private boolean jj_3_33() { return false; } - private boolean jj_3R_518() { + private boolean jj_3R_520() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_33()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_525()) jj_scanpos = xsp; + if (jj_3R_527()) jj_scanpos = xsp; return false; } @@ -12943,7 +13045,7 @@ private boolean jj_3R_90() { return false; } - private boolean jj_3R_464() { + private boolean jj_3R_466() { if (jj_3R_434()) return true; return false; } @@ -12963,7 +13065,7 @@ private boolean jj_3R_331() { return false; } - private boolean jj_3R_485() { + private boolean jj_3R_487() { if (jj_scan_token(ASYNC)) return true; if (jj_3R_145()) return true; return false; @@ -12977,12 +13079,12 @@ private boolean jj_3R_203() { return false; } - private boolean jj_3R_473() { + private boolean jj_3R_475() { if (jj_3R_174()) return true; return false; } - private boolean jj_3R_472() { + private boolean jj_3R_474() { if (jj_scan_token(FROM)) return true; if (jj_3R_61()) return true; return false; @@ -12994,14 +13096,14 @@ private boolean jj_3R_91() { } private boolean jj_3R_435() { - if (jj_3R_463()) return true; + if (jj_3R_465()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_464()) { + if (jj_3R_466()) { jj_scanpos = xsp; - if (jj_3R_465()) { + if (jj_3R_467()) { jj_scanpos = xsp; - if (jj_3R_466()) return true; + if (jj_3R_468()) return true; } } return false; @@ -13012,12 +13114,12 @@ private boolean jj_3R_89() { return false; } - private boolean jj_3R_547() { - if (jj_3R_548()) return true; + private boolean jj_3R_549() { + if (jj_3R_550()) return true; return false; } - private boolean jj_3R_525() { + private boolean jj_3R_527() { if (jj_3R_379()) return true; return false; } @@ -13027,12 +13129,12 @@ private boolean jj_3R_360() { return false; } - private boolean jj_3R_548() { + private boolean jj_3R_550() { if (jj_scan_token(IF)) return true; - if (jj_3R_549()) return true; + if (jj_3R_551()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_550()) jj_scanpos = xsp; + if (jj_3R_552()) jj_scanpos = xsp; return false; } @@ -13044,14 +13146,14 @@ private boolean jj_3R_79() { private boolean jj_3R_450() { Token xsp; xsp = jj_scanpos; - if (jj_3R_472()) { + if (jj_3R_474()) { jj_scanpos = xsp; - if (jj_3R_473()) return true; + if (jj_3R_475()) return true; } return false; } - private boolean jj_3R_530() { + private boolean jj_3R_532() { Token xsp; while (true) { xsp = jj_scanpos; @@ -13085,7 +13187,7 @@ private boolean jj_3R_84() { if (jj_scan_token(IN)) return true; if (jj_3R_141()) return true; xsp = jj_scanpos; - if (jj_3R_540()) jj_scanpos = xsp; + if (jj_3R_542()) jj_scanpos = xsp; return false; } @@ -13109,17 +13211,17 @@ private boolean jj_3R_78() { return false; } - private boolean jj_3R_546() { + private boolean jj_3R_548() { if (jj_3R_84()) return true; return false; } - private boolean jj_3R_544() { + private boolean jj_3R_546() { Token xsp; xsp = jj_scanpos; - if (jj_3R_546()) { + if (jj_3R_548()) { jj_scanpos = xsp; - if (jj_3R_547()) return true; + if (jj_3R_549()) return true; } return false; } @@ -13134,7 +13236,7 @@ private boolean jj_3R_159() { return false; } - private boolean jj_3R_535() { + private boolean jj_3R_537() { Token xsp; while (true) { xsp = jj_scanpos; @@ -13177,7 +13279,7 @@ private boolean jj_3R_128() { xsp = jj_scanpos; if (jj_3_34()) { jj_scanpos = xsp; - if (jj_3R_518()) return true; + if (jj_3R_520()) return true; } return false; } @@ -13249,31 +13351,31 @@ private boolean jj_3_30() { return false; } - private boolean jj_3R_529() { + private boolean jj_3R_531() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_30()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_537()) jj_scanpos = xsp; + if (jj_3R_539()) jj_scanpos = xsp; return false; } - private boolean jj_3R_521() { + private boolean jj_3R_523() { if (jj_3R_133()) return true; Token xsp; xsp = jj_scanpos; if (jj_3_32()) { jj_scanpos = xsp; - if (jj_3R_530()) return true; + if (jj_3R_532()) return true; } xsp = jj_scanpos; - if (jj_3R_531()) jj_scanpos = xsp; + if (jj_3R_533()) jj_scanpos = xsp; return false; } - private boolean jj_3R_528() { + private boolean jj_3R_530() { if (jj_3R_84()) return true; return false; } @@ -13289,18 +13391,18 @@ private boolean jj_3_27() { return false; } - private boolean jj_3R_534() { + private boolean jj_3R_536() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_27()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_541()) jj_scanpos = xsp; + if (jj_3R_543()) jj_scanpos = xsp; return false; } - private boolean jj_3R_522() { + private boolean jj_3R_524() { if (jj_3R_379()) return true; return false; } @@ -13310,20 +13412,20 @@ private boolean jj_3_29() { return false; } - private boolean jj_3R_533() { + private boolean jj_3R_535() { if (jj_3R_84()) return true; return false; } - private boolean jj_3R_527() { + private boolean jj_3R_529() { Token xsp; xsp = jj_scanpos; if (jj_3_29()) { jj_scanpos = xsp; - if (jj_3R_535()) return true; + if (jj_3R_537()) return true; } xsp = jj_scanpos; - if (jj_3R_536()) jj_scanpos = xsp; + if (jj_3R_538()) jj_scanpos = xsp; return false; } @@ -13337,14 +13439,14 @@ private boolean jj_3R_179() { return false; } - private boolean jj_3R_520() { + private boolean jj_3R_522() { if (jj_scan_token(POWER)) return true; if (jj_3R_132()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_528()) { + if (jj_3R_530()) { jj_scanpos = xsp; - if (jj_3R_529()) return true; + if (jj_3R_531()) return true; } return false; } @@ -13454,14 +13556,14 @@ private boolean jj_3R_342() { return false; } - private boolean jj_3R_526() { + private boolean jj_3R_528() { if (jj_scan_token(COLON)) return true; if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_533()) { + if (jj_3R_535()) { jj_scanpos = xsp; - if (jj_3R_534()) return true; + if (jj_3R_536()) return true; } return false; } @@ -13537,25 +13639,25 @@ private boolean jj_3R_345() { return false; } - private boolean jj_3R_519() { + private boolean jj_3R_521() { if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_526()) { + if (jj_3R_528()) { jj_scanpos = xsp; - if (jj_3R_527()) return true; + if (jj_3R_529()) return true; } return false; } - private boolean jj_3R_510() { + private boolean jj_3R_512() { Token xsp; xsp = jj_scanpos; - if (jj_3R_519()) { + if (jj_3R_521()) { jj_scanpos = xsp; - if (jj_3R_520()) { + if (jj_3R_522()) { jj_scanpos = xsp; - if (jj_3R_521()) return true; + if (jj_3R_523()) return true; } } return false; @@ -13759,7 +13861,7 @@ private boolean jj_3R_294() { return false; } - private boolean jj_3R_545() { + private boolean jj_3R_547() { if (jj_3R_61()) return true; return false; } @@ -13912,11 +14014,11 @@ private boolean jj_3R_185() { return false; } - private boolean jj_3R_543() { + private boolean jj_3R_545() { if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_545()) jj_scanpos = xsp; + if (jj_3R_547()) jj_scanpos = xsp; return false; } @@ -13937,7 +14039,7 @@ private boolean jj_3R_363() { return false; } - private boolean jj_3R_514() { + private boolean jj_3R_516() { if (jj_scan_token(COMMA)) return true; return false; } @@ -14012,7 +14114,7 @@ private boolean jj_3R_134() { return false; } - private boolean jj_3R_542() { + private boolean jj_3R_544() { if (jj_3R_61()) return true; return false; } @@ -14076,7 +14178,7 @@ private boolean jj_3R_69() { return false; } - private boolean jj_3R_538() { + private boolean jj_3R_540() { if (jj_3R_161()) return true; return false; } @@ -14091,9 +14193,9 @@ private boolean jj_3R_161() { if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_542()) jj_scanpos = xsp; + if (jj_3R_544()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_543()) jj_scanpos = xsp; + if (jj_3R_545()) jj_scanpos = xsp; return false; } @@ -14111,7 +14213,7 @@ private boolean jj_3R_130() { if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_538()) jj_scanpos = xsp; + if (jj_3R_540()) jj_scanpos = xsp; return false; } @@ -14152,7 +14254,7 @@ private boolean jj_3R_60() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_514()) jj_scanpos = xsp; + if (jj_3R_516()) jj_scanpos = xsp; return false; } @@ -14164,7 +14266,7 @@ private boolean jj_3R_409() { return false; } - private boolean jj_3R_512() { + private boolean jj_3R_514() { if (jj_3R_75()) return true; Token xsp; while (true) { @@ -14172,11 +14274,11 @@ private boolean jj_3R_512() { if (jj_3_22()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_522()) jj_scanpos = xsp; + if (jj_3R_524()) jj_scanpos = xsp; return false; } - private boolean jj_3R_554() { + private boolean jj_3R_556() { if (jj_3R_208()) return true; return false; } @@ -14211,13 +14313,13 @@ private boolean jj_3R_244() { return false; } - private boolean jj_3R_553() { + private boolean jj_3R_555() { if (jj_scan_token(LAMBDA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_554()) jj_scanpos = xsp; + if (jj_3R_556()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_549()) return true; + if (jj_3R_551()) return true; return false; } @@ -14231,7 +14333,7 @@ private boolean jj_3R_243() { return false; } - private boolean jj_3R_499() { + private boolean jj_3R_501() { if (jj_3R_250()) return true; return false; } @@ -14280,7 +14382,7 @@ private boolean jj_3R_239() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_499()) { jj_scanpos = xsp; break; } + if (jj_3R_501()) { jj_scanpos = xsp; break; } } return false; } @@ -14352,8 +14454,8 @@ private boolean jj_3R_257() { return false; } - private boolean jj_3R_498() { - if (jj_3R_510()) return true; + private boolean jj_3R_500() { + if (jj_3R_512()) return true; return false; } @@ -14367,7 +14469,7 @@ private boolean jj_3R_232() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_498()) jj_scanpos = xsp; + if (jj_3R_500()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } @@ -14393,7 +14495,7 @@ private boolean jj_3R_66() { return false; } - private boolean jj_3R_497() { + private boolean jj_3R_499() { if (jj_3R_128()) return true; return false; } @@ -14410,7 +14512,7 @@ private boolean jj_3R_231() { if (jj_scan_token(LBRACKET)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_497()) jj_scanpos = xsp; + if (jj_3R_499()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } @@ -14598,14 +14700,14 @@ private boolean jj_3_9() { return false; } - private boolean jj_3R_502() { + private boolean jj_3R_504() { if (jj_scan_token(DOT)) return true; if (jj_3R_70()) return true; return false; } - private boolean jj_3R_486() { - if (jj_3R_487()) return true; + private boolean jj_3R_488() { + if (jj_3R_489()) return true; return false; } @@ -14634,20 +14736,20 @@ private boolean jj_3R_222() { return false; } - private boolean jj_3R_501() { + private boolean jj_3R_503() { if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_512()) return true; + if (jj_3R_514()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_504() { + private boolean jj_3R_506() { if (jj_3R_97()) return true; return false; } - private boolean jj_3R_511() { - if (jj_3R_494()) return true; + private boolean jj_3R_513() { + if (jj_3R_496()) return true; return false; } @@ -14656,35 +14758,35 @@ private boolean jj_3R_57() { return false; } - private boolean jj_3R_539() { + private boolean jj_3R_541() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_500() { + private boolean jj_3R_502() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_511()) jj_scanpos = xsp; + if (jj_3R_513()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_487() { + private boolean jj_3R_489() { Token xsp; xsp = jj_scanpos; - if (jj_3R_500()) { + if (jj_3R_502()) { jj_scanpos = xsp; - if (jj_3R_501()) { + if (jj_3R_503()) { jj_scanpos = xsp; - if (jj_3R_502()) return true; + if (jj_3R_504()) return true; } } return false; } - private boolean jj_3R_467() { - if (jj_3R_487()) return true; + private boolean jj_3R_469() { + if (jj_3R_489()) return true; return false; } @@ -14694,13 +14796,13 @@ private boolean jj_3R_219() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_486()) { jj_scanpos = xsp; break; } + if (jj_3R_488()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_509() { - if (jj_3R_494()) return true; + private boolean jj_3R_511() { + if (jj_3R_496()) return true; return false; } @@ -14715,16 +14817,16 @@ private boolean jj_3R_206() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_467()) { jj_scanpos = xsp; break; } + if (jj_3R_469()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_532() { + private boolean jj_3R_534() { if (jj_3R_100()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_539()) jj_scanpos = xsp; + if (jj_3R_541()) jj_scanpos = xsp; return false; } @@ -14763,7 +14865,7 @@ private boolean jj_3R_158() { private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[207]; + final private int[] jj_la1 = new int[209]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -14779,22 +14881,22 @@ private boolean jj_3R_158() { jj_la1_init_5(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x20000000,0x5a2a0000,0x20000,0x0,0x40000000,0x80000000,0x1000000,0x0,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x40000000,0x0,0x0,0x0,0x80020000,0x1000000,0x40000000,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x40000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x4000000,0x1a2a0000,0x0,0x0,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x40000000,0x5a2a0000,0x40000000,0x0,0x1000000,0x1000000,0x582a0000,0x0,0x0,0x20000,0x182a0000,0x18000000,0x18000000,0x18000000,0x18000000,0x1000000,0x182a0000,0x2000000,0x0,0x1000000,0x220000,0x582a0000,0x582a0000,0x18000000,0x1000000,0x1000000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x1000000,0x20000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x22a0000,0x2220000,0x5a2a0000,0x2220000,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x4000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x5a2a0000,0x5a2a0000,0x0,0x5a2a0000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x5a2a0000,0x20000,0x1000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x20000000,0x5a2a0000,0x20000,0x0,0x40000000,0x80000000,0x1000000,0x0,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x40000000,0x0,0x0,0x0,0x80020000,0x1000000,0x40000000,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x40000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x4000000,0x1a2a0000,0x0,0x0,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x40000000,0x5a2a0000,0x40000000,0x0,0x1000000,0x1000000,0x582a0000,0x0,0x0,0x20000,0x182a0000,0x18000000,0x18000000,0x18000000,0x18000000,0x1000000,0x182a0000,0x2000000,0x0,0x1000000,0x220000,0x582a0000,0x582a0000,0x18000000,0x1000000,0x1000000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x1a2a0000,0x1000000,0x1a2a0000,0x20000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x22a0000,0x2220000,0x5a2a0000,0x2220000,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x4000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x5a2a0000,0x5a2a0000,0x0,0x5a2a0000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x5a2a0000,0x20000,0x1000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x22,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x200,0x200,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x20,0x20,0x0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x200,0x20,0x1fff0000,0x20,0x200,0x0,0x20,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x2,0x22,0x2,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x40000000,0x80000000,0x20,0xfc00,0xfc00,0x0,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x0,0x0,0x22,0x0,0x20,0x20,0x22,0x0,0x0,0x2,0x2,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x20,0x20,0x0,0x22,0x0,0x0,0x20,0x0,0x0,0x22,0x0,0x0,0x20,0x0,0x22,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x20000000,0x2,0x0,0x0,0x0,}; + jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x22,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x200,0x200,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x20,0x20,0x0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x200,0x20,0x1fff0000,0x20,0x200,0x0,0x20,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x2,0x22,0x2,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x20,0x0,0x20,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x40000000,0x80000000,0x20,0xfc00,0xfc00,0x0,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x0,0x0,0x22,0x0,0x20,0x20,0x22,0x0,0x0,0x2,0x2,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x20,0x20,0x0,0x22,0x0,0x0,0x20,0x0,0x0,0x22,0x0,0x0,0x20,0x0,0x22,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x20000000,0x2,0x0,0x0,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0xdffef399,0xdffef399,0x0,0x0,0x80004009,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdffed399,0xdffed399,0x0,0x9ffe4009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x0,0x80204009,0x0,0x80204009,0x0,0x23c0000,0x80004009,0x80804009,0x80804009,0x800000,0x80004009,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x20000000,0x0,0x0,0x0,0x0,0x40009390,0x0,0x0,0x80004009,0x0,0x10,0x0,0x0,0x80000000,0x20000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x80000000,0x0,0x0,0x80000000,0x80000000,0x40001100,0x40,0x20,0x0,0x20,0x20,0xc00,0x20,0x10000,0x10c00,0xc00,0x20000000,0x80004009,0x0,0x0,0x0,0x20000000,0xdffef399,0xdffef399,0x9ffe4009,0x10,0x80004009,0x80004009,0x0,0x0,0x80004001,0x7,0x5,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x80004009,0x0,0x80204009,0x80004009,0x80004009,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004009,0x80004009,0x80004009,0x0,0x80004000,0x80004000,0x0,0x0,0x0,0x80004009,0x80004009,0x0,0x80004009,0x0,0x2100,0x80004009,0x0,0x0,0x80004009,0x0,0x2100,0x80004009,0x0,0x80004009,0x80004009,0x2100,0x80004009,0x0,0x2110,0x2000,0x2110,0x2110,0xb000,0x80004009,0x0,0x0,0x2100,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_2 = new int[] {0xdffef399,0xdffef399,0x0,0x0,0x80004009,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdffed399,0xdffed399,0x0,0x9ffe4009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x80204009,0x0,0x80204009,0x0,0x80204009,0x0,0x23c0000,0x80004009,0x80804009,0x80804009,0x800000,0x80004009,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x20000000,0x0,0x0,0x0,0x0,0x40009390,0x0,0x0,0x80004009,0x0,0x10,0x0,0x0,0x80000000,0x20000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x80000000,0x0,0x0,0x80000000,0x80000000,0x40001100,0x40,0x20,0x0,0x20,0x20,0xc00,0x20,0x10000,0x10c00,0xc00,0x20000000,0x80004009,0x0,0x80004009,0x0,0x80004009,0x0,0x20000000,0xdffef399,0xdffef399,0x9ffe4009,0x10,0x80004009,0x80004009,0x0,0x0,0x80004001,0x7,0x5,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x80004009,0x0,0x80204009,0x80004009,0x80004009,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004009,0x80004009,0x80004009,0x0,0x80004000,0x80004000,0x0,0x0,0x0,0x80004009,0x80004009,0x0,0x80004009,0x0,0x2100,0x80004009,0x0,0x0,0x80004009,0x0,0x2100,0x80004009,0x0,0x80004009,0x80004009,0x2100,0x80004009,0x0,0x2110,0x2000,0x2110,0x2110,0xb000,0x80004009,0x0,0x0,0x2100,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x1fbf,0x1fbf,0x0,0x0,0x1fbb,0x0,0x4,0x38,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x0,0x38,0x0,0x1fbf,0x1fbf,0x0,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x0,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x0,0x0,0x38,0x0,0x0,0x38,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x10,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x1f83,0x1f80,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x0,0x1fbb,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x1fbf,0x1fbf,0x1fbb,0x0,0x1fbb,0x1fbb,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x38,0x38,0x0,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x1fbb,0x0,0x0,0x0,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x0,0x1fbb,0x0,0x0,0x1fbb,0x0,0x0,0x1fbb,0x0,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x1f80,0x38,0x0,}; + jj_la1_3 = new int[] {0x1fbf,0x1fbf,0x0,0x0,0x1fbb,0x0,0x4,0x38,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x0,0x38,0x0,0x1fbf,0x1fbf,0x0,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x0,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x0,0x0,0x38,0x0,0x0,0x38,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x10,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x1f83,0x1f80,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x0,0x1fbb,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x0,0x0,0x1fbf,0x1fbf,0x1fbb,0x0,0x1fbb,0x1fbb,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x38,0x38,0x0,0x0,0x1fbb,0x1fbb,0x1fbb,0x0,0x1fbb,0x1fbb,0x0,0x0,0x0,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x0,0x1fbb,0x0,0x0,0x1fbb,0x0,0x0,0x1fbb,0x0,0x1fbb,0x1fbb,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x1f80,0x38,0x0,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0x7fff80,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x0,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x0,0x7fff80,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x7fff80,0x0,0x0,0x0,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,}; + jj_la1_4 = new int[] {0x7fff80,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x0,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x0,0x7fff80,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x0,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x7fff80,0x0,0x0,0x0,0x0,0x7fff80,0x7fff80,0x7fff80,0x0,0x7fff80,0x7fff80,0x0,0x0,0x0,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x0,0x7fff80,0x0,0x7fff80,0x7fff80,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,}; } private static void jj_la1_init_5() { - jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[37]; private boolean jj_rescan = false; @@ -14808,7 +14910,7 @@ public PythonGrammar311(boolean generateTree, FastCharStream stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 207; i++) jj_la1[i] = -1; + for (int i = 0; i < 209; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -14823,7 +14925,7 @@ public PythonGrammar311(boolean generateTree, PythonGrammar311TokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 207; i++) jj_la1[i] = -1; + for (int i = 0; i < 209; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -14943,7 +15045,7 @@ public ParseException generateParseException() { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 207; i++) { + for (int i = 0; i < 209; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< with_item())* + ({grammarActions.findTokenAndAdd(",");} [with_item()])* ) | ( with_item() - ({grammarActions.findTokenAndAdd(",");} with_item())* + ({grammarActions.findTokenAndAdd(",");} [with_item()])* ) ) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/python.jjt_template b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/python.jjt_template index b8f2f5e580..201c12faad 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/python.jjt_template +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/python.jjt_template @@ -1187,13 +1187,13 @@ void with_stmt(): {} LOOKAHEAD(with_item()) ( with_item() - ($COMMA with_item())* + ($COMMA [with_item()])* ) | ( with_item() - ($COMMA with_item())* + ($COMMA [with_item()])* ) ) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312.java index c162cc546a..36b16750d9 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312.java @@ -6160,7 +6160,52 @@ final public void with_stmt() throws ParseException { } grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); - with_item(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + case LBRACE: + case LBRACKET: + case DOT: + case PLUS: + case MINUS: + case NOT: + case NOT_BOOL: + case LAMBDA: + case AWAIT: + case TYPE: + case FALSE: + case TRUE: + case NONE: + case MATCH: + case CASE: + case NAME: + case DECNUMBER: + case HEXNUMBER: + case OCTNUMBER: + case BINNUMBER: + case FLOAT: + case COMPLEX: + case SINGLE_STRING: + case SINGLE_STRING2: + case TRIPLE_STRING: + case TRIPLE_STRING2: + case SINGLE_BSTRING: + case SINGLE_BSTRING2: + case TRIPLE_BSTRING: + case TRIPLE_BSTRING2: + case SINGLE_FSTRING: + case SINGLE_FSTRING2: + case TRIPLE_FSTRING: + case TRIPLE_FSTRING2: + case SINGLE_USTRING: + case SINGLE_USTRING2: + case TRIPLE_USTRING: + case TRIPLE_USTRING2: + with_item(); + break; + default: + jj_la1[131] = jj_gen; + ; + } } } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -6174,17 +6219,62 @@ final public void with_stmt() throws ParseException { ; break; default: - jj_la1[131] = jj_gen; + jj_la1[132] = jj_gen; break label_30; } grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); - with_item(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + case LBRACE: + case LBRACKET: + case DOT: + case PLUS: + case MINUS: + case NOT: + case NOT_BOOL: + case LAMBDA: + case AWAIT: + case TYPE: + case FALSE: + case TRUE: + case NONE: + case MATCH: + case CASE: + case NAME: + case DECNUMBER: + case HEXNUMBER: + case OCTNUMBER: + case BINNUMBER: + case FLOAT: + case COMPLEX: + case SINGLE_STRING: + case SINGLE_STRING2: + case TRIPLE_STRING: + case TRIPLE_STRING2: + case SINGLE_BSTRING: + case SINGLE_BSTRING2: + case TRIPLE_BSTRING: + case TRIPLE_BSTRING2: + case SINGLE_FSTRING: + case SINGLE_FSTRING2: + case TRIPLE_FSTRING: + case TRIPLE_FSTRING2: + case SINGLE_USTRING: + case SINGLE_USTRING2: + case TRIPLE_USTRING: + case TRIPLE_USTRING2: + with_item(); + break; + default: + jj_la1[133] = jj_gen; + ; + } } jj_consume_token(RPAREN); break; default: - jj_la1[132] = jj_gen; + jj_la1[134] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6231,7 +6321,7 @@ final public void with_item() throws ParseException { expr(); break; default: - jj_la1[133] = jj_gen; + jj_la1[135] = jj_gen; ; } } catch (Throwable jjte000) { @@ -6403,7 +6493,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[134] = jj_gen; + jj_la1[136] = jj_gen; break label_31; } } @@ -6488,7 +6578,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[135] = jj_gen; + jj_la1[137] = jj_gen; break label_32; } } @@ -6499,7 +6589,7 @@ final public void suite() throws ParseException { } break; default: - jj_la1[136] = jj_gen; + jj_la1[138] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6586,12 +6676,12 @@ final public void test() throws ParseException { if_exp(); break; default: - jj_la1[137] = jj_gen; + jj_la1[139] = jj_gen; ; } break; default: - jj_la1[138] = jj_gen; + jj_la1[140] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6664,7 +6754,7 @@ final public void test_nocond() throws ParseException { lambdef_nocond(); break; default: - jj_la1[139] = jj_gen; + jj_la1[141] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6722,7 +6812,7 @@ final public void or_test() throws ParseException { ; break; default: - jj_la1[140] = jj_gen; + jj_la1[142] = jj_gen; break label_33; } jj_consume_token(OR_BOOL); @@ -6766,7 +6856,7 @@ final public void and_test() throws ParseException { ; break; default: - jj_la1[141] = jj_gen; + jj_la1[143] = jj_gen; break label_34; } jj_consume_token(AND_BOOL); @@ -6866,7 +6956,7 @@ final public void not_test() throws ParseException { comparison(); break; default: - jj_la1[142] = jj_gen; + jj_la1[144] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6895,7 +6985,7 @@ final public void comparison() throws ParseException { ; break; default: - jj_la1[143] = jj_gen; + jj_la1[145] = jj_gen; break label_35; } comp_op(); @@ -7040,7 +7130,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[144] = jj_gen; + jj_la1[146] = jj_gen; if (jj_2_21(2)) { jj_consume_token(IS); SimpleNode jjtn009 = builder.openNode( JJTIS_NOT_CMP); @@ -7072,7 +7162,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[145] = jj_gen; + jj_la1[147] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7090,7 +7180,7 @@ final public void expr() throws ParseException { ; break; default: - jj_la1[146] = jj_gen; + jj_la1[148] = jj_gen; break label_36; } jj_consume_token(OR); @@ -7133,7 +7223,7 @@ final public void xor_expr() throws ParseException { ; break; default: - jj_la1[147] = jj_gen; + jj_la1[149] = jj_gen; break label_37; } jj_consume_token(XOR); @@ -7176,7 +7266,7 @@ final public void and_expr() throws ParseException { ; break; default: - jj_la1[148] = jj_gen; + jj_la1[150] = jj_gen; break label_38; } jj_consume_token(AND); @@ -7220,7 +7310,7 @@ final public void shift_expr() throws ParseException { ; break; default: - jj_la1[149] = jj_gen; + jj_la1[151] = jj_gen; break label_39; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7283,7 +7373,7 @@ final public void shift_expr() throws ParseException { } break; default: - jj_la1[150] = jj_gen; + jj_la1[152] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7301,7 +7391,7 @@ final public void arith_expr() throws ParseException { ; break; default: - jj_la1[151] = jj_gen; + jj_la1[153] = jj_gen; break label_40; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7364,7 +7454,7 @@ final public void arith_expr() throws ParseException { } break; default: - jj_la1[152] = jj_gen; + jj_la1[154] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7385,7 +7475,7 @@ final public void term() throws ParseException { ; break; default: - jj_la1[153] = jj_gen; + jj_la1[155] = jj_gen; break label_41; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7535,7 +7625,7 @@ final public void term() throws ParseException { } break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7669,7 +7759,7 @@ final public void factor() throws ParseException { power(); break; default: - jj_la1[155] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7766,14 +7856,14 @@ final public void atom_expr() throws ParseException { ; break; default: - jj_la1[156] = jj_gen; + jj_la1[158] = jj_gen; break label_43; } trailer(); } break; default: - jj_la1[157] = jj_gen; + jj_la1[159] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7797,7 +7887,7 @@ final public void await_atom_expr() throws ParseException { ; break; default: - jj_la1[158] = jj_gen; + jj_la1[160] = jj_gen; break label_44; } trailer(); @@ -7885,7 +7975,7 @@ final public void trailer() throws ParseException { arglist(); break; default: - jj_la1[159] = jj_gen; + jj_la1[161] = jj_gen; ; } jj_consume_token(RPAREN); @@ -7981,7 +8071,7 @@ final public void trailer() throws ParseException { } break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8065,7 +8155,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8146,7 +8236,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("]", false); @@ -8226,7 +8316,7 @@ final public void atom() throws ParseException { dictorsetmaker(); break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("}", false); @@ -8364,7 +8454,7 @@ final public void atom() throws ParseException { ; break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; break label_45; } SimpleNode jjtn009 = builder.openNode( JJTSTRJOIN); @@ -8396,7 +8486,7 @@ final public void atom() throws ParseException { } break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8425,7 +8515,7 @@ final public void lambdef() throws ParseException { hasArgs=true; break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8478,7 +8568,7 @@ final public void lambdef_nocond() throws ParseException { hasArgs=true; break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8534,7 +8624,7 @@ final public void subscriptlist() throws ParseException { Comma(); break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8627,7 +8717,7 @@ final public void subscript() throws ParseException { slice(); break; default: - jj_la1[169] = jj_gen; + jj_la1[171] = jj_gen; ; } } catch (Throwable jjte002) { @@ -8680,7 +8770,7 @@ final public void subscript() throws ParseException { } break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8732,7 +8822,7 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[171] = jj_gen; + jj_la1[173] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -8781,12 +8871,12 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[172] = jj_gen; + jj_la1[174] = jj_gen; ; } break; default: - jj_la1[173] = jj_gen; + jj_la1[175] = jj_gen; ; } } @@ -8875,7 +8965,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8932,7 +9022,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[175] = jj_gen; + jj_la1[177] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8942,7 +9032,7 @@ final public void exprlist() throws ParseException { Comma(); break; default: - jj_la1[176] = jj_gen; + jj_la1[178] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8991,7 +9081,7 @@ final public void SmartTestList() throws ParseException { Comma(); break; default: - jj_la1[177] = jj_gen; + jj_la1[179] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9036,7 +9126,7 @@ final public void testlist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[178] = jj_gen; + jj_la1[180] = jj_gen; ; } } @@ -9094,7 +9184,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[179] = jj_gen; + jj_la1[181] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9153,7 +9243,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[180] = jj_gen; + jj_la1[182] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9163,7 +9253,7 @@ final public void testlist_star_expr() throws ParseException { Comma(); break; default: - jj_la1[181] = jj_gen; + jj_la1[183] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9290,7 +9380,7 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; label_51: while (true) { if (jj_2_30(2)) { @@ -9350,7 +9440,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[182] = jj_gen; + jj_la1[184] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9361,13 +9451,13 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[183] = jj_gen; + jj_la1[185] = jj_gen; ; } } break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; if (jj_2_32(2)) { comp_for(); } else { @@ -9433,7 +9523,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[185] = jj_gen; + jj_la1[187] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9465,7 +9555,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[186] = jj_gen; + jj_la1[188] = jj_gen; ; } } @@ -9479,7 +9569,7 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[190] = jj_gen; + jj_la1[192] = jj_gen; label_53: while (true) { if (jj_2_33(2)) { @@ -9539,7 +9629,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[188] = jj_gen; + jj_la1[190] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9550,7 +9640,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[189] = jj_gen; + jj_la1[191] = jj_gen; ; } } @@ -9624,7 +9714,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[191] = jj_gen; + jj_la1[193] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9656,12 +9746,12 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[192] = jj_gen; + jj_la1[194] = jj_gen; ; } break; default: - jj_la1[193] = jj_gen; + jj_la1[195] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9717,7 +9807,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9731,7 +9821,7 @@ final public void testlist_comp() throws ParseException { ; break; default: - jj_la1[195] = jj_gen; + jj_la1[197] = jj_gen; break label_55; } } @@ -9793,7 +9883,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[196] = jj_gen; + jj_la1[198] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9808,7 +9898,7 @@ final public void testlist_comp() throws ParseException { Comma(); break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9845,7 +9935,7 @@ final public void comp_iter() throws ParseException { comp_if(); break; default: - jj_la1[198] = jj_gen; + jj_la1[200] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9864,7 +9954,7 @@ final public void comp_for() throws ParseException { jj_consume_token(ASYNC); break; default: - jj_la1[199] = jj_gen; + jj_la1[201] = jj_gen; ; } grammarActions.findTokenAndAdd("for"); @@ -9882,7 +9972,7 @@ final public void comp_for() throws ParseException { comp_iter(); break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; ; } } catch (Throwable jjte000) { @@ -9919,7 +10009,7 @@ final public void comp_if() throws ParseException { comp_iter(); break; default: - jj_la1[201] = jj_gen; + jj_la1[203] = jj_gen; ; } } @@ -9944,7 +10034,7 @@ final public void decorated() throws ParseException { async_funcdef(); break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9997,7 +10087,7 @@ final public void classdef() throws ParseException { type_params(); break; default: - jj_la1[203] = jj_gen; + jj_la1[205] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -10050,7 +10140,7 @@ final public void classdef() throws ParseException { arglist(); break; default: - jj_la1[204] = jj_gen; + jj_la1[206] = jj_gen; ; } try { @@ -10061,7 +10151,7 @@ final public void classdef() throws ParseException { } break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; ; } ISpecialStr s = grammarActions.findTokenAndAdd(":"); if(s != null){grammarActions.markEndDefColon(s, jjtn000);} @@ -10109,7 +10199,7 @@ final public void arglist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[206] = jj_gen; + jj_la1[208] = jj_gen; ; } } @@ -10209,14 +10299,14 @@ final public void argument() throws ParseException { test(); break; default: - jj_la1[208] = jj_gen; + jj_la1[210] = jj_gen; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FOR: case ASYNC: comp_for(); break; default: - jj_la1[207] = jj_gen; + jj_la1[209] = jj_gen; ; } } @@ -10230,7 +10320,7 @@ final public void argument() throws ParseException { ExtraArgValueList(); break; default: - jj_la1[209] = jj_gen; + jj_la1[211] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10346,7 +10436,7 @@ final public void Number() throws ParseException { break; default: - jj_la1[210] = jj_gen; + jj_la1[212] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10396,7 +10486,7 @@ final public Token Name() throws ParseException { t = jj_consume_token(TYPE); break; default: - jj_la1[211] = jj_gen; + jj_la1[213] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10724,7 +10814,7 @@ final public void String() throws ParseException { } break; default: - jj_la1[212] = jj_gen; + jj_la1[214] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -11084,7 +11174,7 @@ private boolean jj_3R_223() { return false; } - private boolean jj_3R_493() { + private boolean jj_3R_495() { if (jj_3R_104()) return true; Token xsp; while (true) { @@ -11099,11 +11189,11 @@ private boolean jj_3R_493() { private boolean jj_3R_471() { Token xsp; xsp = jj_scanpos; - if (jj_3R_493()) { + if (jj_3R_495()) { jj_scanpos = xsp; - if (jj_3R_494()) { + if (jj_3R_496()) { jj_scanpos = xsp; - if (jj_3R_495()) return true; + if (jj_3R_497()) return true; } } return false; @@ -11146,6 +11236,11 @@ private boolean jj_3R_224() { return false; } + private boolean jj_3R_473() { + if (jj_3R_74()) return true; + return false; + } + private boolean jj_3R_180() { if (jj_3R_203()) return true; Token xsp; @@ -11156,8 +11251,13 @@ private boolean jj_3R_180() { return false; } - private boolean jj_3R_569() { - if (jj_3R_570()) return true; + private boolean jj_3R_571() { + if (jj_3R_572()) return true; + return false; + } + + private boolean jj_3R_472() { + if (jj_3R_74()) return true; return false; } @@ -11187,17 +11287,17 @@ private boolean jj_3R_202() { return false; } - private boolean jj_3R_568() { + private boolean jj_3R_570() { if (jj_3R_150()) return true; return false; } - private boolean jj_3R_566() { + private boolean jj_3R_568() { Token xsp; xsp = jj_scanpos; - if (jj_3R_568()) { + if (jj_3R_570()) { jj_scanpos = xsp; - if (jj_3R_569()) return true; + if (jj_3R_571()) return true; } return false; } @@ -11291,7 +11391,9 @@ private boolean jj_3R_209() { private boolean jj_3R_445() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_74()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_473()) jj_scanpos = xsp; return false; } @@ -11311,7 +11413,9 @@ private boolean jj_3R_146() { private boolean jj_3R_444() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_74()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_472()) jj_scanpos = xsp; return false; } @@ -11425,11 +11529,11 @@ private boolean jj_3R_212() { return false; } - private boolean jj_3R_519() { + private boolean jj_3R_521() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_529()) jj_scanpos = xsp; + if (jj_3R_531()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -11472,74 +11576,74 @@ private boolean jj_3R_156() { return false; } - private boolean jj_3R_539() { + private boolean jj_3R_541() { if (jj_scan_token(AS)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_518() { + private boolean jj_3R_520() { if (jj_scan_token(AT)) return true; if (jj_3R_142()) return true; return false; } - private boolean jj_3R_538() { + private boolean jj_3R_540() { if (jj_scan_token(EXCEPT_MULTIPLY)) return true; return false; } - private boolean jj_3R_527() { + private boolean jj_3R_529() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_539()) jj_scanpos = xsp; + if (jj_3R_541()) jj_scanpos = xsp; return false; } - private boolean jj_3R_503() { - if (jj_3R_518()) return true; + private boolean jj_3R_505() { + if (jj_3R_520()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_519()) jj_scanpos = xsp; + if (jj_3R_521()) jj_scanpos = xsp; if (jj_scan_token(NEWLINE)) return true; return false; } - private boolean jj_3R_537() { + private boolean jj_3R_539() { if (jj_scan_token(EXCEPT)) return true; return false; } - private boolean jj_3R_481() { + private boolean jj_3R_483() { Token xsp; - if (jj_3R_503()) return true; + if (jj_3R_505()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_503()) { jj_scanpos = xsp; break; } + if (jj_3R_505()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_526() { - if (jj_3R_538()) return true; + private boolean jj_3R_528() { + if (jj_3R_540()) return true; return false; } - private boolean jj_3R_525() { - if (jj_3R_537()) return true; + private boolean jj_3R_527() { + if (jj_3R_539()) return true; return false; } - private boolean jj_3R_515() { + private boolean jj_3R_517() { Token xsp; xsp = jj_scanpos; - if (jj_3R_525()) { + if (jj_3R_527()) { jj_scanpos = xsp; - if (jj_3R_526()) return true; + if (jj_3R_528()) return true; } xsp = jj_scanpos; - if (jj_3R_527()) jj_scanpos = xsp; + if (jj_3R_529()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_185()) return true; return false; @@ -11559,58 +11663,58 @@ private boolean jj_3R_155() { return false; } - private boolean jj_3R_501() { + private boolean jj_3R_503() { if (jj_scan_token(FINALLY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_516() { + private boolean jj_3R_518() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_478() { - if (jj_3R_501()) return true; + private boolean jj_3R_480() { + if (jj_3R_503()) return true; if (jj_3R_185()) return true; return false; } - private boolean jj_3R_476() { + private boolean jj_3R_478() { if (jj_scan_token(TRY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_500() { - if (jj_3R_501()) return true; + private boolean jj_3R_502() { + if (jj_3R_503()) return true; if (jj_3R_185()) return true; return false; } - private boolean jj_3R_499() { - if (jj_3R_516()) return true; + private boolean jj_3R_501() { + if (jj_3R_518()) return true; if (jj_3R_185()) return true; return false; } - private boolean jj_3R_498() { - if (jj_3R_515()) return true; + private boolean jj_3R_500() { + if (jj_3R_517()) return true; return false; } - private boolean jj_3R_477() { + private boolean jj_3R_479() { Token xsp; - if (jj_3R_498()) return true; + if (jj_3R_500()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_498()) { jj_scanpos = xsp; break; } + if (jj_3R_500()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_499()) jj_scanpos = xsp; + if (jj_3R_501()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_500()) jj_scanpos = xsp; + if (jj_3R_502()) jj_scanpos = xsp; return false; } @@ -11620,13 +11724,13 @@ private boolean jj_3R_466() { } private boolean jj_3R_449() { - if (jj_3R_476()) return true; + if (jj_3R_478()) return true; if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_477()) { + if (jj_3R_479()) { jj_scanpos = xsp; - if (jj_3R_478()) return true; + if (jj_3R_480()) return true; } return false; } @@ -11661,31 +11765,31 @@ private boolean jj_3R_117() { return false; } - private boolean jj_3R_497() { + private boolean jj_3R_499() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_474() { + private boolean jj_3R_476() { if (jj_scan_token(WHILE)) return true; return false; } - private boolean jj_3R_475() { - if (jj_3R_497()) return true; + private boolean jj_3R_477() { + if (jj_3R_499()) return true; if (jj_3R_185()) return true; return false; } private boolean jj_3R_448() { - if (jj_3R_474()) return true; + if (jj_3R_476()) return true; if (jj_3R_142()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_475()) jj_scanpos = xsp; + if (jj_3R_477()) jj_scanpos = xsp; return false; } @@ -11711,13 +11815,13 @@ private boolean jj_3R_461() { return false; } - private boolean jj_3R_496() { + private boolean jj_3R_498() { if (jj_scan_token(ELIF)) return true; return false; } - private boolean jj_3R_473() { - if (jj_3R_497()) return true; + private boolean jj_3R_475() { + if (jj_3R_499()) return true; if (jj_3R_185()) return true; return false; } @@ -11730,8 +11834,8 @@ private boolean jj_3R_142() { return false; } - private boolean jj_3R_472() { - if (jj_3R_496()) return true; + private boolean jj_3R_474() { + if (jj_3R_498()) return true; if (jj_3R_142()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_185()) return true; @@ -11751,10 +11855,10 @@ private boolean jj_3R_447() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_472()) { jj_scanpos = xsp; break; } + if (jj_3R_474()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_473()) jj_scanpos = xsp; + if (jj_3R_475()) jj_scanpos = xsp; return false; } @@ -11789,19 +11893,19 @@ private boolean jj_3R_208() { return false; } - private boolean jj_3R_513() { + private boolean jj_3R_515() { if (jj_scan_token(POWER)) return true; if (jj_3R_73()) return true; return false; } - private boolean jj_3R_512() { + private boolean jj_3R_514() { if (jj_3R_342()) return true; return false; } - private boolean jj_3R_490() { - if (jj_3R_513()) return true; + private boolean jj_3R_492() { + if (jj_3R_515()) return true; return false; } @@ -11810,17 +11914,17 @@ private boolean jj_3R_325() { return false; } - private boolean jj_3R_511() { + private boolean jj_3R_513() { if (jj_3R_341()) return true; return false; } - private boolean jj_3R_489() { + private boolean jj_3R_491() { Token xsp; xsp = jj_scanpos; - if (jj_3R_511()) { + if (jj_3R_513()) { jj_scanpos = xsp; - if (jj_3R_512()) return true; + if (jj_3R_514()) return true; } if (jj_scan_token(COLON)) return true; if (jj_3R_242()) return true; @@ -11830,9 +11934,9 @@ private boolean jj_3R_489() { private boolean jj_3R_464() { Token xsp; xsp = jj_scanpos; - if (jj_3R_489()) { + if (jj_3R_491()) { jj_scanpos = xsp; - if (jj_3R_490()) return true; + if (jj_3R_492()) return true; } return false; } @@ -11868,12 +11972,12 @@ private boolean jj_3R_345() { return false; } - private boolean jj_3R_502() { - if (jj_3R_517()) return true; + private boolean jj_3R_504() { + if (jj_3R_519()) return true; return false; } - private boolean jj_3R_488() { + private boolean jj_3R_490() { if (jj_3R_183()) return true; return false; } @@ -11881,7 +11985,7 @@ private boolean jj_3R_488() { private boolean jj_3R_462() { Token xsp; xsp = jj_scanpos; - if (jj_3R_488()) jj_scanpos = xsp; + if (jj_3R_490()) jj_scanpos = xsp; return false; } @@ -11907,7 +12011,7 @@ private boolean jj_3R_431() { return false; } - private boolean jj_3R_487() { + private boolean jj_3R_489() { if (jj_scan_token(COMMA)) return true; if (jj_3R_242()) return true; return false; @@ -11958,7 +12062,7 @@ private boolean jj_3R_459() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_487()) { jj_scanpos = xsp; break; } + if (jj_3R_489()) { jj_scanpos = xsp; break; } } return false; } @@ -12007,8 +12111,8 @@ private boolean jj_3R_184() { return false; } - private boolean jj_3R_556() { - if (jj_3R_561()) return true; + private boolean jj_3R_558() { + if (jj_3R_563()) return true; return false; } @@ -12202,7 +12306,7 @@ private boolean jj_3R_259() { return false; } - private boolean jj_3R_546() { + private boolean jj_3R_548() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12265,7 +12369,7 @@ private boolean jj_3R_299() { return false; } - private boolean jj_3R_552() { + private boolean jj_3R_554() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12525,7 +12629,7 @@ private boolean jj_3R_416() { return false; } - private boolean jj_3R_528() { + private boolean jj_3R_530() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12546,12 +12650,12 @@ private boolean jj_3R_73() { return false; } - private boolean jj_3R_553() { + private boolean jj_3R_555() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_557() { + private boolean jj_3R_559() { if (jj_scan_token(COMMA)) return true; return false; } @@ -12653,11 +12757,11 @@ private boolean jj_3R_284() { return false; } - private boolean jj_3R_480() { + private boolean jj_3R_482() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_502()) jj_scanpos = xsp; + if (jj_3R_504()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -12757,7 +12861,7 @@ private boolean jj_3_39() { return false; } - private boolean jj_3R_479() { + private boolean jj_3R_481() { if (jj_3R_161()) return true; return false; } @@ -12799,8 +12903,8 @@ private boolean jj_3R_442() { return false; } - private boolean jj_3R_567() { - if (jj_3R_561()) return true; + private boolean jj_3R_569() { + if (jj_3R_563()) return true; return false; } @@ -12891,8 +12995,8 @@ private boolean jj_3_38() { return false; } - private boolean jj_3R_484() { - if (jj_3R_504()) return true; + private boolean jj_3R_486() { + if (jj_3R_506()) return true; return false; } @@ -12933,12 +13037,12 @@ private boolean jj_3R_178() { return false; } - private boolean jj_3R_483() { + private boolean jj_3R_485() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_517() { + private boolean jj_3R_519() { if (jj_3R_95()) return true; Token xsp; while (true) { @@ -12946,7 +13050,7 @@ private boolean jj_3R_517() { if (jj_3_38()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_528()) jj_scanpos = xsp; + if (jj_3R_530()) jj_scanpos = xsp; return false; } @@ -12978,9 +13082,9 @@ private boolean jj_3R_450() { if (jj_3R_73()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_479()) jj_scanpos = xsp; + if (jj_3R_481()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_480()) jj_scanpos = xsp; + if (jj_3R_482()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_185()) return true; return false; @@ -13003,14 +13107,14 @@ private boolean jj_3_36() { return false; } - private boolean jj_3R_530() { + private boolean jj_3R_532() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_36()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_540()) jj_scanpos = xsp; + if (jj_3R_542()) jj_scanpos = xsp; return false; } @@ -13026,7 +13130,7 @@ private boolean jj_3R_83() { return false; } - private boolean jj_3R_482() { + private boolean jj_3R_484() { if (jj_3R_450()) return true; return false; } @@ -13046,7 +13150,7 @@ private boolean jj_3R_346() { return false; } - private boolean jj_3R_504() { + private boolean jj_3R_506() { if (jj_scan_token(ASYNC)) return true; if (jj_3R_155()) return true; return false; @@ -13060,12 +13164,12 @@ private boolean jj_3R_219() { return false; } - private boolean jj_3R_492() { + private boolean jj_3R_494() { if (jj_3R_189()) return true; return false; } - private boolean jj_3R_491() { + private boolean jj_3R_493() { if (jj_scan_token(FROM)) return true; if (jj_3R_59()) return true; return false; @@ -13077,14 +13181,14 @@ private boolean jj_3R_94() { } private boolean jj_3R_451() { - if (jj_3R_481()) return true; + if (jj_3R_483()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_482()) { + if (jj_3R_484()) { jj_scanpos = xsp; - if (jj_3R_483()) { + if (jj_3R_485()) { jj_scanpos = xsp; - if (jj_3R_484()) return true; + if (jj_3R_486()) return true; } } return false; @@ -13095,12 +13199,12 @@ private boolean jj_3R_92() { return false; } - private boolean jj_3R_564() { - if (jj_3R_565()) return true; + private boolean jj_3R_566() { + if (jj_3R_567()) return true; return false; } - private boolean jj_3R_540() { + private boolean jj_3R_542() { if (jj_3R_394()) return true; return false; } @@ -13110,12 +13214,12 @@ private boolean jj_3R_375() { return false; } - private boolean jj_3R_565() { + private boolean jj_3R_567() { if (jj_scan_token(IF)) return true; - if (jj_3R_566()) return true; + if (jj_3R_568()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_567()) jj_scanpos = xsp; + if (jj_3R_569()) jj_scanpos = xsp; return false; } @@ -13127,14 +13231,14 @@ private boolean jj_3R_82() { private boolean jj_3R_467() { Token xsp; xsp = jj_scanpos; - if (jj_3R_491()) { + if (jj_3R_493()) { jj_scanpos = xsp; - if (jj_3R_492()) return true; + if (jj_3R_494()) return true; } return false; } - private boolean jj_3R_545() { + private boolean jj_3R_547() { Token xsp; while (true) { xsp = jj_scanpos; @@ -13168,7 +13272,7 @@ private boolean jj_3R_87() { if (jj_scan_token(IN)) return true; if (jj_3R_150()) return true; xsp = jj_scanpos; - if (jj_3R_556()) jj_scanpos = xsp; + if (jj_3R_558()) jj_scanpos = xsp; return false; } @@ -13192,17 +13296,17 @@ private boolean jj_3R_81() { return false; } - private boolean jj_3R_563() { + private boolean jj_3R_565() { if (jj_3R_87()) return true; return false; } - private boolean jj_3R_561() { + private boolean jj_3R_563() { Token xsp; xsp = jj_scanpos; - if (jj_3R_563()) { + if (jj_3R_565()) { jj_scanpos = xsp; - if (jj_3R_564()) return true; + if (jj_3R_566()) return true; } return false; } @@ -13217,7 +13321,7 @@ private boolean jj_3R_172() { return false; } - private boolean jj_3R_551() { + private boolean jj_3R_553() { Token xsp; while (true) { xsp = jj_scanpos; @@ -13260,7 +13364,7 @@ private boolean jj_3R_136() { xsp = jj_scanpos; if (jj_3_37()) { jj_scanpos = xsp; - if (jj_3R_530()) return true; + if (jj_3R_532()) return true; } return false; } @@ -13332,31 +13436,31 @@ private boolean jj_3_33() { return false; } - private boolean jj_3R_544() { + private boolean jj_3R_546() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_33()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_553()) jj_scanpos = xsp; + if (jj_3R_555()) jj_scanpos = xsp; return false; } - private boolean jj_3R_533() { + private boolean jj_3R_535() { if (jj_3R_140()) return true; Token xsp; xsp = jj_scanpos; if (jj_3_35()) { jj_scanpos = xsp; - if (jj_3R_545()) return true; + if (jj_3R_547()) return true; } xsp = jj_scanpos; - if (jj_3R_546()) jj_scanpos = xsp; + if (jj_3R_548()) jj_scanpos = xsp; return false; } - private boolean jj_3R_543() { + private boolean jj_3R_545() { if (jj_3R_87()) return true; return false; } @@ -13372,18 +13476,18 @@ private boolean jj_3_30() { return false; } - private boolean jj_3R_550() { + private boolean jj_3R_552() { Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_30()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_557()) jj_scanpos = xsp; + if (jj_3R_559()) jj_scanpos = xsp; return false; } - private boolean jj_3R_534() { + private boolean jj_3R_536() { if (jj_3R_394()) return true; return false; } @@ -13393,20 +13497,20 @@ private boolean jj_3_32() { return false; } - private boolean jj_3R_549() { + private boolean jj_3R_551() { if (jj_3R_87()) return true; return false; } - private boolean jj_3R_542() { + private boolean jj_3R_544() { Token xsp; xsp = jj_scanpos; if (jj_3_32()) { jj_scanpos = xsp; - if (jj_3R_551()) return true; + if (jj_3R_553()) return true; } xsp = jj_scanpos; - if (jj_3R_552()) jj_scanpos = xsp; + if (jj_3R_554()) jj_scanpos = xsp; return false; } @@ -13420,14 +13524,14 @@ private boolean jj_3R_194() { return false; } - private boolean jj_3R_532() { + private boolean jj_3R_534() { if (jj_scan_token(POWER)) return true; if (jj_3R_121()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_543()) { + if (jj_3R_545()) { jj_scanpos = xsp; - if (jj_3R_544()) return true; + if (jj_3R_546()) return true; } return false; } @@ -13537,14 +13641,14 @@ private boolean jj_3R_357() { return false; } - private boolean jj_3R_541() { + private boolean jj_3R_543() { if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_549()) { + if (jj_3R_551()) { jj_scanpos = xsp; - if (jj_3R_550()) return true; + if (jj_3R_552()) return true; } return false; } @@ -13620,25 +13724,25 @@ private boolean jj_3R_360() { return false; } - private boolean jj_3R_531() { + private boolean jj_3R_533() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_541()) { + if (jj_3R_543()) { jj_scanpos = xsp; - if (jj_3R_542()) return true; + if (jj_3R_544()) return true; } return false; } - private boolean jj_3R_520() { + private boolean jj_3R_522() { Token xsp; xsp = jj_scanpos; - if (jj_3R_531()) { + if (jj_3R_533()) { jj_scanpos = xsp; - if (jj_3R_532()) { + if (jj_3R_534()) { jj_scanpos = xsp; - if (jj_3R_533()) return true; + if (jj_3R_535()) return true; } } return false; @@ -13842,7 +13946,7 @@ private boolean jj_3_13() { return false; } - private boolean jj_3R_562() { + private boolean jj_3R_564() { if (jj_3R_59()) return true; return false; } @@ -13995,11 +14099,11 @@ private boolean jj_3R_199() { return false; } - private boolean jj_3R_559() { + private boolean jj_3R_561() { if (jj_3R_199()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_562()) jj_scanpos = xsp; + if (jj_3R_564()) jj_scanpos = xsp; return false; } @@ -14038,7 +14142,7 @@ private boolean jj_3R_129() { return false; } - private boolean jj_3R_536() { + private boolean jj_3R_538() { if (jj_scan_token(COMMA)) return true; return false; } @@ -14090,7 +14194,7 @@ private boolean jj_3R_141() { return false; } - private boolean jj_3R_558() { + private boolean jj_3R_560() { if (jj_3R_59()) return true; return false; } @@ -14159,7 +14263,7 @@ private boolean jj_3R_72() { return false; } - private boolean jj_3R_554() { + private boolean jj_3R_556() { if (jj_3R_174()) return true; return false; } @@ -14174,9 +14278,9 @@ private boolean jj_3R_174() { if (jj_3R_199()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_558()) jj_scanpos = xsp; + if (jj_3R_560()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_559()) jj_scanpos = xsp; + if (jj_3R_561()) jj_scanpos = xsp; return false; } @@ -14194,7 +14298,7 @@ private boolean jj_3R_138() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_554()) jj_scanpos = xsp; + if (jj_3R_556()) jj_scanpos = xsp; return false; } @@ -14235,7 +14339,7 @@ private boolean jj_3R_63() { if (jj_3R_108()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_536()) jj_scanpos = xsp; + if (jj_3R_538()) jj_scanpos = xsp; return false; } @@ -14247,7 +14351,7 @@ private boolean jj_3R_425() { return false; } - private boolean jj_3R_522() { + private boolean jj_3R_524() { if (jj_3R_78()) return true; Token xsp; while (true) { @@ -14255,11 +14359,11 @@ private boolean jj_3R_522() { if (jj_3_25()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_534()) jj_scanpos = xsp; + if (jj_3R_536()) jj_scanpos = xsp; return false; } - private boolean jj_3R_571() { + private boolean jj_3R_573() { if (jj_3R_222()) return true; return false; } @@ -14299,13 +14403,13 @@ private boolean jj_3R_262() { return false; } - private boolean jj_3R_570() { + private boolean jj_3R_572() { if (jj_scan_token(LAMBDA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_571()) jj_scanpos = xsp; + if (jj_3R_573()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_566()) return true; + if (jj_3R_568()) return true; return false; } @@ -14319,7 +14423,7 @@ private boolean jj_3R_261() { return false; } - private boolean jj_3R_507() { + private boolean jj_3R_509() { if (jj_3R_268()) return true; return false; } @@ -14365,7 +14469,7 @@ private boolean jj_3R_257() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_507()) { jj_scanpos = xsp; break; } + if (jj_3R_509()) { jj_scanpos = xsp; break; } } return false; } @@ -14425,8 +14529,8 @@ private boolean jj_3R_251() { return false; } - private boolean jj_3R_506() { - if (jj_3R_520()) return true; + private boolean jj_3R_508() { + if (jj_3R_522()) return true; return false; } @@ -14457,7 +14561,7 @@ private boolean jj_3R_250() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_506()) jj_scanpos = xsp; + if (jj_3R_508()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } @@ -14468,7 +14572,7 @@ private boolean jj_3R_330() { return false; } - private boolean jj_3R_505() { + private boolean jj_3R_507() { if (jj_3R_136()) return true; return false; } @@ -14498,7 +14602,7 @@ private boolean jj_3R_249() { if (jj_scan_token(LBRACKET)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_505()) jj_scanpos = xsp; + if (jj_3R_507()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } @@ -14694,20 +14798,20 @@ private boolean jj_3_11() { return false; } - private boolean jj_3R_510() { + private boolean jj_3R_512() { if (jj_scan_token(DOT)) return true; if (jj_3R_73()) return true; return false; } - private boolean jj_3R_485() { - if (jj_3R_486()) return true; + private boolean jj_3R_487() { + if (jj_3R_488()) return true; return false; } - private boolean jj_3R_509() { + private boolean jj_3R_511() { if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_522()) return true; + if (jj_3R_524()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } @@ -14737,33 +14841,33 @@ private boolean jj_3R_237() { return false; } - private boolean jj_3R_524() { + private boolean jj_3R_526() { if (jj_3R_105()) return true; return false; } - private boolean jj_3R_521() { - if (jj_3R_517()) return true; + private boolean jj_3R_523() { + if (jj_3R_519()) return true; return false; } - private boolean jj_3R_508() { + private boolean jj_3R_510() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_521()) jj_scanpos = xsp; + if (jj_3R_523()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_486() { + private boolean jj_3R_488() { Token xsp; xsp = jj_scanpos; - if (jj_3R_508()) { + if (jj_3R_510()) { jj_scanpos = xsp; - if (jj_3R_509()) { + if (jj_3R_511()) { jj_scanpos = xsp; - if (jj_3R_510()) return true; + if (jj_3R_512()) return true; } } return false; @@ -14774,13 +14878,13 @@ private boolean jj_3R_60() { return false; } - private boolean jj_3R_560() { + private boolean jj_3R_562() { if (jj_scan_token(COMMA)) return true; return false; } private boolean jj_3R_452() { - if (jj_3R_486()) return true; + if (jj_3R_488()) return true; return false; } @@ -14790,7 +14894,7 @@ private boolean jj_3R_235() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_485()) { jj_scanpos = xsp; break; } + if (jj_3R_487()) { jj_scanpos = xsp; break; } } return false; } @@ -14826,11 +14930,11 @@ private boolean jj_3R_220() { return false; } - private boolean jj_3R_555() { + private boolean jj_3R_557() { if (jj_3R_108()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_560()) jj_scanpos = xsp; + if (jj_3R_562()) jj_scanpos = xsp; return false; } @@ -14980,7 +15084,7 @@ private boolean jj_3R_247() { return false; } - private boolean jj_3R_535() { + private boolean jj_3R_537() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_59()) return true; return false; @@ -14994,12 +15098,12 @@ private boolean jj_3R_105() { return false; } - private boolean jj_3R_548() { + private boolean jj_3R_550() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_523() { + private boolean jj_3R_525() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_59()) return true; return false; @@ -15031,11 +15135,11 @@ private boolean jj_3R_61() { if (jj_3R_105()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_535()) jj_scanpos = xsp; + if (jj_3R_537()) jj_scanpos = xsp; return false; } - private boolean jj_3R_514() { + private boolean jj_3R_516() { if (jj_scan_token(COMMA)) return true; return false; } @@ -15066,7 +15170,7 @@ private boolean jj_3R_104() { if (jj_3R_105()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_523()) jj_scanpos = xsp; + if (jj_3R_525()) jj_scanpos = xsp; return false; } @@ -15093,8 +15197,8 @@ private boolean jj_3R_108() { return false; } - private boolean jj_3R_529() { - if (jj_3R_517()) return true; + private boolean jj_3R_531() { + if (jj_3R_519()) return true; return false; } @@ -15108,11 +15212,11 @@ private boolean jj_3R_187() { return false; } - private boolean jj_3R_547() { + private boolean jj_3R_549() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_555()) jj_scanpos = xsp; + if (jj_3R_557()) jj_scanpos = xsp; return false; } @@ -15120,7 +15224,7 @@ private boolean jj_3R_151() { if (jj_scan_token(MULTIPLY)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_524()) jj_scanpos = xsp; + if (jj_3R_526()) jj_scanpos = xsp; return false; } @@ -15155,7 +15259,7 @@ private boolean jj_3R_107() { if (jj_3R_108()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_548()) jj_scanpos = xsp; + if (jj_3R_550()) jj_scanpos = xsp; return false; } @@ -15182,7 +15286,7 @@ private boolean jj_3R_106() { if (jj_3_4()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_547()) jj_scanpos = xsp; + if (jj_3R_549()) jj_scanpos = xsp; return false; } @@ -15196,11 +15300,11 @@ private boolean jj_3R_62() { return false; } - private boolean jj_3R_495() { + private boolean jj_3R_497() { if (jj_3R_108()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_514()) jj_scanpos = xsp; + if (jj_3R_516()) jj_scanpos = xsp; return false; } @@ -15210,7 +15314,7 @@ private boolean jj_3_21() { return false; } - private boolean jj_3R_494() { + private boolean jj_3R_496() { if (jj_3R_151()) return true; Token xsp; while (true) { @@ -15258,7 +15362,7 @@ private boolean jj_3R_335() { private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[213]; + final private int[] jj_la1 = new int[215]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -15274,22 +15378,22 @@ private boolean jj_3R_335() { jj_la1_init_5(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x200000,0x20000000,0x5a2a0000,0x20000,0x0,0x200000,0x40000000,0x1000000,0x40000000,0x40000000,0x80000000,0x1000000,0x0,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x40000000,0x0,0x0,0x0,0x80020000,0x1000000,0x40000000,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x40000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x4000000,0x1a2a0000,0x0,0x0,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x40000000,0x5a2a0000,0x40000000,0x0,0x1000000,0x1000000,0x582a0000,0x0,0x0,0x20000,0x182a0000,0x18000000,0x18000000,0x18000000,0x18000000,0x1000000,0x182a0000,0x2000000,0x0,0x1000000,0x220000,0x582a0000,0x582a0000,0x18000000,0x1000000,0x1000000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x1000000,0x20000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x22a0000,0x2220000,0x5a2a0000,0x2220000,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x4000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x5a2a0000,0x5a2a0000,0x0,0x5a2a0000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x200000,0x5a2a0000,0x20000,0x1000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x200000,0x20000000,0x5a2a0000,0x20000,0x0,0x200000,0x40000000,0x1000000,0x40000000,0x40000000,0x80000000,0x1000000,0x0,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x40000000,0x0,0x0,0x0,0x80020000,0x1000000,0x40000000,0x1000000,0x1000000,0x40000000,0x40000000,0x1000000,0x40000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x4000000,0x1a2a0000,0x0,0x0,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x40000000,0x5a2a0000,0x40000000,0x0,0x1000000,0x1000000,0x582a0000,0x0,0x0,0x20000,0x182a0000,0x18000000,0x18000000,0x18000000,0x18000000,0x1000000,0x182a0000,0x2000000,0x0,0x1000000,0x220000,0x582a0000,0x582a0000,0x18000000,0x1000000,0x1000000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x1a2a0000,0x1000000,0x1a2a0000,0x20000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x22a0000,0x2220000,0x5a2a0000,0x2220000,0x5a2a0000,0x5a2a0000,0x5a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x4000000,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x1000000,0x5a2a0000,0x5a2a0000,0x0,0x5a2a0000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x200000,0x5a2a0000,0x20000,0x1000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x2,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x200,0x200,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x20,0x20,0x0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x200,0x20,0x1fff0000,0x20,0x200,0x0,0x20,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x2,0x22,0x2,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x40000000,0x80000000,0x20,0xfc00,0xfc00,0x0,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x0,0x0,0x22,0x0,0x20,0x20,0x22,0x0,0x0,0x2,0x2,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x20,0x20,0x0,0x22,0x0,0x0,0x20,0x0,0x0,0x22,0x0,0x0,0x20,0x0,0x22,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x20000000,0x2,0x0,0x0,0x0,}; + jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x2,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x200,0x200,0x0,0x0,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x20,0x20,0x0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x200,0x20,0x1fff0000,0x20,0x200,0x0,0x20,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x2,0x22,0x2,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x20,0x0,0x20,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x40000000,0x80000000,0x20,0xfc00,0xfc00,0x0,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x0,0x0,0x22,0x0,0x20,0x20,0x22,0x0,0x0,0x2,0x2,0x0,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x20,0x20,0x0,0x22,0x0,0x0,0x20,0x0,0x0,0x22,0x0,0x0,0x20,0x0,0x22,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x0,0x0,0x0,0x20000000,0x2,0x0,0x0,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0xbffef399,0xbffef399,0x0,0x0,0x0,0x10004009,0x0,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x0,0x10000000,0x0,0xbffed399,0xbffed399,0x0,0x3ffe4009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x0,0x10204009,0x0,0x10204009,0x0,0x23c0000,0x10004009,0x10804009,0x10804009,0x800000,0x10004009,0xc00000,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x10000000,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x0,0x80009390,0x0,0x0,0x10004009,0x0,0x10,0x0,0x0,0x10000000,0x40000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x10000000,0x0,0x0,0x10000000,0x10000000,0x80001100,0x40,0x20,0x0,0x20,0x20,0xc00,0x20,0x10000,0x10c00,0xc00,0x40000000,0x10004009,0x0,0x0,0x0,0x40000000,0xbffef399,0xbffef399,0x3ffe4009,0x10,0x10004009,0x10004009,0x0,0x0,0x10004001,0x7,0x5,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10004000,0x0,0x10004000,0x0,0x10004009,0x0,0x10204009,0x10004009,0x10004009,0x0,0x10000000,0x10000000,0x10000000,0x0,0x0,0x10004009,0x10004009,0x10004009,0x0,0x10004000,0x10004000,0x0,0x0,0x0,0x10004009,0x10004009,0x0,0x10004009,0x0,0x2100,0x10004009,0x0,0x0,0x10004009,0x0,0x2100,0x10004009,0x0,0x10004009,0x10004009,0x2100,0x10004009,0x0,0x2110,0x2000,0x2110,0x2110,0xb000,0x0,0x10004009,0x0,0x0,0x2100,0x0,0x0,0x0,0x10000000,0x0,}; + jj_la1_2 = new int[] {0xbffef399,0xbffef399,0x0,0x0,0x0,0x10004009,0x0,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x0,0x10000000,0x0,0xbffed399,0xbffed399,0x0,0x3ffe4009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x10204009,0x0,0x10204009,0x0,0x10204009,0x0,0x23c0000,0x10004009,0x10804009,0x10804009,0x800000,0x10004009,0xc00000,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x10000000,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x0,0x80009390,0x0,0x0,0x10004009,0x0,0x10,0x0,0x0,0x10000000,0x40000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x10000000,0x0,0x0,0x10000000,0x10000000,0x80001100,0x40,0x20,0x0,0x20,0x20,0xc00,0x20,0x10000,0x10c00,0xc00,0x40000000,0x10004009,0x0,0x10004009,0x0,0x10004009,0x0,0x40000000,0xbffef399,0xbffef399,0x3ffe4009,0x10,0x10004009,0x10004009,0x0,0x0,0x10004001,0x7,0x5,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10004000,0x0,0x10004000,0x0,0x10004009,0x0,0x10204009,0x10004009,0x10004009,0x0,0x10000000,0x10000000,0x10000000,0x0,0x0,0x10004009,0x10004009,0x10004009,0x0,0x10004000,0x10004000,0x0,0x0,0x0,0x10004009,0x10004009,0x0,0x10004009,0x0,0x2100,0x10004009,0x0,0x0,0x10004009,0x0,0x2100,0x10004009,0x0,0x10004009,0x10004009,0x2100,0x10004009,0x0,0x2110,0x2000,0x2110,0x2110,0xb000,0x0,0x10004009,0x0,0x0,0x2100,0x0,0x0,0x0,0x10000000,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x3f7f,0x3f7f,0x0,0x0,0x0,0x3f77,0x0,0x8,0x0,0x70,0x0,0x70,0x70,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70,0x70,0x0,0x0,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70,0x70,0x0,0x0,0x0,0x70,0x0,0x3f7f,0x3f7f,0x0,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x0,0x3f77,0x0,0x0,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x0,0x0,0x0,0x70,0x0,0x0,0x70,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x20,0x0,0x3f77,0x0,0x0,0x0,0x0,0x3f77,0x0,0x0,0x0,0x3f77,0x0,0x0,0x3f07,0x3f00,0x0,0x3f77,0x0,0x0,0x0,0x0,0x3f77,0x3f77,0x3f77,0x0,0x0,0x3f77,0x3f77,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f77,0x0,0x0,0x0,0x0,0x3f7f,0x3f7f,0x3f77,0x0,0x3f77,0x3f77,0x0,0x0,0x3f77,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x8,0x3f77,0x0,0x3f77,0x0,0x3f77,0x0,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x70,0x70,0x0,0x0,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x3f77,0x0,0x0,0x0,0x3f77,0x3f77,0x0,0x3f77,0x0,0x0,0x3f77,0x0,0x0,0x3f77,0x0,0x0,0x3f77,0x0,0x3f77,0x3f77,0x0,0x3f77,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f77,0x0,0x0,0x0,0x0,0x0,0x3f00,0x70,0x0,}; + jj_la1_3 = new int[] {0x3f7f,0x3f7f,0x0,0x0,0x0,0x3f77,0x0,0x8,0x0,0x70,0x0,0x70,0x70,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70,0x70,0x0,0x0,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70,0x70,0x0,0x0,0x0,0x70,0x0,0x3f7f,0x3f7f,0x0,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x0,0x3f77,0x0,0x0,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x0,0x0,0x0,0x70,0x0,0x0,0x70,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x20,0x0,0x3f77,0x0,0x0,0x0,0x0,0x3f77,0x0,0x0,0x0,0x3f77,0x0,0x0,0x3f07,0x3f00,0x0,0x3f77,0x0,0x0,0x0,0x0,0x3f77,0x3f77,0x3f77,0x0,0x0,0x3f77,0x3f77,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f77,0x0,0x3f77,0x0,0x3f77,0x0,0x0,0x3f7f,0x3f7f,0x3f77,0x0,0x3f77,0x3f77,0x0,0x0,0x3f77,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x8,0x3f77,0x0,0x3f77,0x0,0x3f77,0x0,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x70,0x70,0x0,0x0,0x3f77,0x3f77,0x3f77,0x0,0x3f77,0x3f77,0x0,0x0,0x0,0x3f77,0x3f77,0x0,0x3f77,0x0,0x0,0x3f77,0x0,0x0,0x3f77,0x0,0x0,0x3f77,0x0,0x3f77,0x3f77,0x0,0x3f77,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f77,0x0,0x0,0x0,0x0,0x0,0x3f00,0x70,0x0,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0xffff00,0xffff00,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0x0,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0x0,0xffff00,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0x0,0xffff00,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0xffff00,0x0,0xffff00,0x0,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0xffff00,0x0,0x0,0x0,0xffff00,0xffff00,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0xffff00,0xffff00,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,}; + jj_la1_4 = new int[] {0xffff00,0xffff00,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0x0,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0x0,0xffff00,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0x0,0xffff00,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0xffff00,0x0,0xffff00,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0xffff00,0x0,0xffff00,0x0,0xffff00,0xffff00,0xffff00,0xffff00,0xffff00,0x0,0x0,0x0,0x0,0xffff00,0xffff00,0xffff00,0x0,0xffff00,0xffff00,0x0,0x0,0x0,0xffff00,0xffff00,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0x0,0xffff00,0x0,0xffff00,0xffff00,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff00,}; } private static void jj_la1_init_5() { - jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[40]; private boolean jj_rescan = false; @@ -15303,7 +15407,7 @@ public PythonGrammar312(boolean generateTree, FastCharStream stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 213; i++) jj_la1[i] = -1; + for (int i = 0; i < 215; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -15318,7 +15422,7 @@ public PythonGrammar312(boolean generateTree, PythonGrammar312TokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 213; i++) jj_la1[i] = -1; + for (int i = 0; i < 215; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -15438,7 +15542,7 @@ public ParseException generateParseException() { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 213; i++) { + for (int i = 0; i < 215; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< with_item())* + ({grammarActions.findTokenAndAdd(",");} [with_item()])* ) | ( with_item() - ({grammarActions.findTokenAndAdd(",");} with_item())* + ({grammarActions.findTokenAndAdd(",");} [with_item()])* ) ) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt_template b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt_template index 0b427672b6..cf6c5742d6 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt_template +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt_template @@ -1241,13 +1241,13 @@ void with_stmt(): {} LOOKAHEAD(with_item()) ( with_item() - ($COMMA with_item())* + ($COMMA [with_item()])* ) | ( with_item() - ($COMMA with_item())* + ($COMMA [with_item()])* ) ) diff --git a/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser311Test.java b/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser311Test.java index d190499581..cc62350588 100644 --- a/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser311Test.java +++ b/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser311Test.java @@ -49,4 +49,39 @@ public void testMatchExceptionGroups() { assertTrue(t.handlers[0].isExceptionGroup); } + public void testWithStatement() { + String s = """ + with foo as a, bar as b: + pass + """; + + parseLegalDocStr(s); + } + + public void testWithStatementMultiLinesAndCommaAtEnd() { + String s = """ + with ( + foo as a, + bar as b, + ): + pass + """; + + parseLegalDocStr(s); + } + + public void testWithStatementMultiLinesAndCommaAtEnd2() { + String s = """ + def test_get_tools_success() -> None: + with ( + a as b, + c as d, + e as f, + ): + pass + """; + + parseLegalDocStr(s); + } + }