From 17618c396a711b4ac9439af3953fa59231a34863 Mon Sep 17 00:00:00 2001 From: Fabio Zadrozny Date: Sat, 19 Oct 2024 21:05:29 -0300 Subject: [PATCH] Add support for type alias syntax. --- .../AbstractScopeAnalyzerVisitor.java | 3 +- .../visitors/FindDuplicatesVisitor.java | 10 + .../parser/grammar312/PythonGrammar312.java | 3665 +++++++++-------- .../grammar312/PythonGrammar312Constants.java | 95 +- .../PythonGrammar312TokenManager.java | 1346 +++--- .../parser/grammar312/TreeBuilder312.java | 14 + .../python/pydev/parser/grammar312/python.jjt | 15 +- .../parser/grammar312/python.jjt_template | 15 +- .../parser/grammarcommon/ITreeConstants.java | 2 + .../parser/jython/ast/ISimpleNodeSwitch.java | 1 + .../pydev/parser/jython/ast/Python.asdl | 4 +- .../pydev/parser/jython/ast/TypeAlias.java | 105 + .../pydev/parser/jython/ast/VisitorBase.java | 6 + .../pydev/parser/jython/ast/VisitorIF.java | 1 + .../parser/jython/ast/name_contextType.java | 2 + .../MakeAstValidForPrettyPrintingVisitor.java | 9 + .../PrettyPrinterVisitorV2.java | 21 + .../python/pydev/parser/PyParser312Test.java | 13 + .../prettyprinter/PrettyPrinter312Test.java | 7 + .../OccurrencesAnalyzerPy312Test.java | 10 + 20 files changed, 2874 insertions(+), 2470 deletions(-) create mode 100644 plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/TypeAlias.java diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/AbstractScopeAnalyzerVisitor.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/AbstractScopeAnalyzerVisitor.java index ddd133f798..d213887122 100644 --- a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/AbstractScopeAnalyzerVisitor.java +++ b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/AbstractScopeAnalyzerVisitor.java @@ -576,7 +576,8 @@ public Object visitLambda(org.python.pydev.parser.jython.ast.Lambda node) throws @Override public Object visitNameTok(NameTok nameTok) throws Exception { unhandled_node(nameTok); - if (nameTok.ctx == NameTok.VarArg || nameTok.ctx == NameTok.KwArg || nameTok.ctx == NameTok.TypeVarName) { + if (nameTok.ctx == NameTok.VarArg || nameTok.ctx == NameTok.KwArg || nameTok.ctx == NameTok.TypeVarName + || nameTok.ctx == NameTok.TypeAliasName) { SourceToken token = AbstractVisitor.makeToken(nameTok, moduleName, nature, this.current); scope.addToken(token, token, (nameTok).id); if (checkCurrentScopeForAssignmentsToBuiltins()) { diff --git a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/FindDuplicatesVisitor.java b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/FindDuplicatesVisitor.java index fd0742387f..4f24a5f5e5 100644 --- a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/FindDuplicatesVisitor.java +++ b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/FindDuplicatesVisitor.java @@ -77,6 +77,7 @@ import org.python.pydev.parser.jython.ast.Suite; import org.python.pydev.parser.jython.ast.TryExcept; import org.python.pydev.parser.jython.ast.TryFinally; +import org.python.pydev.parser.jython.ast.TypeAlias; import org.python.pydev.parser.jython.ast.TypeParamsSuite; import org.python.pydev.parser.jython.ast.TypeVar; import org.python.pydev.parser.jython.ast.TypeVarTuple; @@ -886,4 +887,13 @@ public Object visitTypeParamsSuite(TypeParamsSuite node) throws Exception { } return null; } + + @Override + public Object visitTypeAlias(TypeAlias node) throws Exception { + boolean ret = unhandled_node(node); + if (ret) { + traverse(node); + } + return null; + } } 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 767116c1ee..c162cc546a 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 @@ -151,6 +151,7 @@ final public modType file_input() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case WITH: case FALSE: @@ -225,6 +226,7 @@ final public modType file_input() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case WITH: case FALSE: @@ -455,6 +457,7 @@ final public void decorators() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -568,6 +571,50 @@ final public void begin_decorator() throws ParseException { } } +// type_alias: +// | "type" NAME [type_params] '=' expression + final public void type_alias() throws ParseException { + /*@bgen(jjtree) type_alias */ + SimpleNode jjtn000 = builder.openNode( JJTTYPE_ALIAS); + boolean jjtc000 = true; + jjtree.openNodeScope(jjtn000); + jjtreeOpenNodeScope(jjtn000); + try { + jj_consume_token(TYPE); + Name(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACKET: + type_params(); + break; + default: + jj_la1[8] = jj_gen; + ; + } + grammarActions.addSpecialToken("=", STRATEGY_BEFORE_NEXT); + jj_consume_token(EQUAL); + expr(); + } catch (Throwable jjte000) { + if (jjtc000) { + jjtree.clearNodeScope(jjtn000); + jjtc000 = false; + } else { + jjtree.popNode(); + } + if (jjte000 instanceof RuntimeException) { + {if (true) throw (RuntimeException)jjte000;} + } + if (jjte000 instanceof ParseException) { + {if (true) throw (ParseException)jjte000;} + } + {if (true) throw (Error)jjte000;} + } finally { + if (jjtc000) { + jjtree.closeNodeScope(jjtn000, true); + jjtreeCloseNodeScope(jjtn000); + } + } + } + // type_params: '[' type_param_seq ']' final public void type_params() throws ParseException { /*@bgen(jjtree) type_params */ @@ -581,13 +628,14 @@ final public void type_params() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case MULTIPLY: case POWER: + case TYPE: case MATCH: case CASE: case NAME: type_param_seq(); break; default: - jj_la1[8] = jj_gen; + jj_la1[9] = jj_gen; ; } grammarActions.findTokenAndAdd("]"); @@ -634,7 +682,7 @@ final public void type_param_seq() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[9] = jj_gen; + jj_la1[10] = jj_gen; ; } } @@ -645,6 +693,7 @@ final public void type_param_seq() throws ParseException { // | '**' NAME //ParamSpec final public void type_param() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: @@ -657,7 +706,7 @@ final public void type_param() throws ParseException { type_var_param_spec(); break; default: - jj_la1[10] = jj_gen; + jj_la1[11] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -769,13 +818,14 @@ final public void parameters() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case MULTIPLY: case POWER: + case TYPE: case MATCH: case CASE: case NAME: typedargslist(); break; default: - jj_la1[11] = jj_gen; + jj_la1[12] = jj_gen; ; } try { @@ -828,6 +878,7 @@ final public void parameters() throws ParseException { // after the first default arg). final public void typedargslist() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: @@ -845,13 +896,14 @@ final public void typedargslist() throws ParseException { case DIVIDE: jj_consume_token(DIVIDE); break; + case TYPE: case MATCH: case CASE: case NAME: defaultarg2(); break; default: - jj_la1[12] = jj_gen; + jj_la1[13] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -889,17 +941,17 @@ final public void typedargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[13] = jj_gen; + jj_la1[14] = jj_gen; ; } break; default: - jj_la1[14] = jj_gen; + jj_la1[15] = jj_gen; ; } break; default: - jj_la1[15] = jj_gen; + jj_la1[16] = jj_gen; ; } break; @@ -911,18 +963,18 @@ final public void typedargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[16] = jj_gen; + jj_la1[17] = jj_gen; ; } break; default: - jj_la1[17] = jj_gen; + jj_la1[18] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[18] = jj_gen; + jj_la1[19] = jj_gen; ; } } else { @@ -954,12 +1006,12 @@ final public void typedargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[19] = jj_gen; + jj_la1[20] = jj_gen; ; } break; default: - jj_la1[20] = jj_gen; + jj_la1[21] = jj_gen; ; } } else { @@ -974,12 +1026,12 @@ final public void typedargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[21] = jj_gen; + jj_la1[22] = jj_gen; ; } break; default: - jj_la1[22] = jj_gen; + jj_la1[23] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -996,13 +1048,14 @@ final public void ExtraArgList2() throws ParseException { jj_consume_token(MULTIPLY); grammarActions.addSpecialToken("*", STRATEGY_BEFORE_NEXT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: tfpdef(); break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1076,7 +1129,7 @@ final public void defaultarg2() throws ParseException { test(); break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1117,7 +1170,7 @@ final public void onlykeywordarg2() throws ParseException { test(); break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1232,6 +1285,7 @@ final public void tfpdef() throws ParseException { final public void varargslist() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: + case TYPE: case MATCH: case CASE: case NAME: @@ -1250,13 +1304,14 @@ final public void varargslist() throws ParseException { jj_consume_token(DIVIDE); break; case LPAREN: + case TYPE: case MATCH: case CASE: case NAME: defaultarg(); break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1295,17 +1350,17 @@ final public void varargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[27] = jj_gen; + jj_la1[28] = jj_gen; ; } break; default: - jj_la1[28] = jj_gen; + jj_la1[29] = jj_gen; ; } break; default: - jj_la1[29] = jj_gen; + jj_la1[30] = jj_gen; ; } break; @@ -1317,18 +1372,18 @@ final public void varargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[30] = jj_gen; + jj_la1[31] = jj_gen; ; } break; default: - jj_la1[31] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[32] = jj_gen; + jj_la1[33] = jj_gen; ; } } else { @@ -1361,12 +1416,12 @@ final public void varargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[33] = jj_gen; + jj_la1[34] = jj_gen; ; } break; default: - jj_la1[34] = jj_gen; + jj_la1[35] = jj_gen; ; } } else { @@ -1381,12 +1436,12 @@ final public void varargslist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[35] = jj_gen; + jj_la1[36] = jj_gen; ; } break; default: - jj_la1[36] = jj_gen; + jj_la1[37] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1402,13 +1457,14 @@ final public void ExtraArgList() throws ParseException { jj_consume_token(MULTIPLY); grammarActions.addSpecialToken("*", STRATEGY_BEFORE_NEXT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: Name(); break; default: - jj_la1[37] = jj_gen; + jj_la1[38] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1452,7 +1508,7 @@ final public void ExtraKeywordList() throws ParseException { jj_consume_token(MULTIPLY); break; default: - jj_la1[38] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1494,7 +1550,7 @@ final public void onlykeywordarg() throws ParseException { test(); break; default: - jj_la1[39] = jj_gen; + jj_la1[40] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1534,7 +1590,7 @@ final public void defaultarg() throws ParseException { test(); break; default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1562,6 +1618,7 @@ final public void defaultarg() throws ParseException { //fpdef: NAME | '(' fplist ')' final public void fpdef() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: @@ -1580,7 +1637,7 @@ final public void fpdef() throws ParseException { } break; default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1611,7 +1668,7 @@ final public void fplist() throws ParseException { Comma(); break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; ; } } catch (Throwable jjte000) { @@ -1642,6 +1699,8 @@ final public void stmt() throws ParseException { async_stmt(); } else if (jj_2_16(2147483647)) { match_stmt(); + } else if (jj_2_17(2147483647)) { + type_alias(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: @@ -1672,6 +1731,7 @@ final public void stmt() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case WITH: case FALSE: @@ -1706,7 +1766,7 @@ final public void stmt() throws ParseException { non_async_stmt(); break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1737,6 +1797,7 @@ final public void non_async_stmt() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case FALSE: case TRUE: @@ -1783,7 +1844,7 @@ final public void non_async_stmt() throws ParseException { } break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1794,7 +1855,7 @@ final public void simple_stmt() throws ParseException { small_stmt(); label_12: while (true) { - if (jj_2_17(2)) { + if (jj_2_18(2)) { ; } else { break label_12; @@ -1809,7 +1870,7 @@ final public void simple_stmt() throws ParseException { grammarActions.addSpecialToken(temporaryToken); break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; ; } try { @@ -1819,7 +1880,7 @@ final public void simple_stmt() throws ParseException { } } -//small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt +//small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt | type_alias final public void small_stmt() throws ParseException { SimpleNode simpleNode;Token spStr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1834,6 +1895,7 @@ final public void small_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -1894,7 +1956,7 @@ final public void small_stmt() throws ParseException { grammarActions.addToPeek(temporaryToken, false); break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1958,6 +2020,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -1989,7 +2052,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2035,6 +2098,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2066,7 +2130,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2112,6 +2176,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2143,7 +2208,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2189,6 +2254,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2220,7 +2286,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2266,6 +2332,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2297,7 +2364,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2343,6 +2410,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2374,7 +2442,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2420,6 +2488,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2451,7 +2520,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2497,6 +2566,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2528,7 +2598,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2574,6 +2644,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2605,7 +2676,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2651,6 +2722,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2682,7 +2754,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2728,6 +2800,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2759,7 +2832,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2805,6 +2878,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2836,7 +2910,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[58] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2882,6 +2956,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -2913,7 +2988,7 @@ final public void expr_stmt() throws ParseException { SmartTestList(); break; default: - jj_la1[59] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2939,7 +3014,7 @@ final public void expr_stmt() throws ParseException { } break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; SimpleNode jjtn015 = builder.openNode( JJTEXPR_STMT); boolean jjtc015 = true; jjtree.openNodeScope(jjtn015); @@ -2952,7 +3027,7 @@ final public void expr_stmt() throws ParseException { ; break; default: - jj_la1[60] = jj_gen; + jj_la1[61] = jj_gen; break label_13; } jj_consume_token(EQUAL); @@ -2971,6 +3046,7 @@ final public void expr_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -3004,7 +3080,7 @@ final public void expr_stmt() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3053,6 +3129,7 @@ final public void annassign() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -3084,13 +3161,13 @@ final public void annassign() throws ParseException { testlist(); break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[64] = jj_gen; + jj_la1[65] = jj_gen; ; } } @@ -3218,7 +3295,7 @@ final public void flow_stmt() throws ParseException { raise_stmt(); break; default: - jj_la1[65] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3245,6 +3322,7 @@ final public void return_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -3278,7 +3356,7 @@ final public void return_stmt() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[66] = jj_gen; + jj_la1[67] = jj_gen; ; } } catch (Throwable jjte000) { @@ -3377,6 +3455,7 @@ final public void yield_expr() throws ParseException { case LAMBDA: case AWAIT: case FROM: + case TYPE: case FALSE: case TRUE: case NONE: @@ -3408,7 +3487,7 @@ final public void yield_expr() throws ParseException { isYieldFrom = yield_arg(); break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; ; } jjtree.closeNodeScope(jjtn000, true); @@ -3458,6 +3537,7 @@ final public boolean yield_arg() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -3492,7 +3572,7 @@ final public boolean yield_arg() throws ParseException { isYieldFrom=false; break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3522,6 +3602,7 @@ final public void raise_stmt() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -3558,12 +3639,12 @@ final public void raise_stmt() throws ParseException { test(); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; ; } break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; ; } } catch (Throwable jjte000) { @@ -3605,7 +3686,7 @@ final public void import_stmt() throws ParseException { ImportFrom(); break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3629,7 +3710,7 @@ final public Import Import() throws ParseException { ; break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; break label_14; } grammarActions.findTokenAndAdd(","); @@ -3679,20 +3760,21 @@ final public void ImportFrom() throws ParseException { ; break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; break label_15; } jj_consume_token(DOT); level++;markLastImportLevelPos(); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: fromName = dotted_name(); break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; ; } if(fromName==null && level==0){{if (true) throw new ParseException("Expecting to find '.' or name in import.");}} @@ -3703,6 +3785,7 @@ final public void ImportFrom() throws ParseException { jj_consume_token(MULTIPLY); grammarActions.addSpecialToken("*",STRATEGY_ADD_AFTER_PREV); break; + case TYPE: case MATCH: case CASE: case NAME: @@ -3715,7 +3798,7 @@ final public void ImportFrom() throws ParseException { ; break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; break label_16; } grammarActions.findTokenAndAdd(","); @@ -3737,7 +3820,7 @@ final public void ImportFrom() throws ParseException { ; break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; break label_17; } if(state!=0){ @@ -3747,6 +3830,7 @@ final public void ImportFrom() throws ParseException { grammarActions.findTokenAndAdd(","); jj_consume_token(COMMA); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TYPE: case MATCH: case CASE: case NAME: @@ -3755,7 +3839,7 @@ final public void ImportFrom() throws ParseException { if(fromName != null && fromName.equals("__future__"))handleFutureImports(importName); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; ; } } @@ -3767,7 +3851,7 @@ final public void ImportFrom() throws ParseException { } break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3813,7 +3897,7 @@ final public void dotted_as_name() throws ParseException { Name(); break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; ; } } catch (Throwable jjte000) { @@ -3855,7 +3939,7 @@ final public String dotted_name() throws ParseException { ; break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; break label_18; } jj_consume_token(DOT); @@ -3905,7 +3989,7 @@ final public String import_as_name() throws ParseException { Name(); break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; ; } jjtree.closeNodeScope(jjtn000, true); @@ -3953,7 +4037,7 @@ final public void global_stmt() throws ParseException { ; break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; break label_19; } grammarActions.findTokenAndAdd(","); @@ -3995,7 +4079,7 @@ final public void nonlocal_stmt() throws ParseException { Name(); label_20: while (true) { - if (jj_2_18(2)) { + if (jj_2_19(2)) { ; } else { break label_20; @@ -4010,7 +4094,7 @@ final public void nonlocal_stmt() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4021,7 +4105,7 @@ final public void nonlocal_stmt() throws ParseException { testlist(); break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; ; } } catch (Throwable jjte000) { @@ -4062,7 +4146,7 @@ final public void assert_stmt() throws ParseException { test(); break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; ; } } catch (Throwable jjte000) { @@ -4118,7 +4202,7 @@ final public void compound_stmt() throws ParseException { match_stmt(); break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4149,7 +4233,7 @@ final public void match_stmt() throws ParseException { ; break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; break label_21; } } @@ -4195,7 +4279,7 @@ final public void subject_expr() throws ParseException { star_named_expr(); break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; ; } break; @@ -4209,6 +4293,7 @@ final public void subject_expr() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -4240,7 +4325,7 @@ final public void subject_expr() throws ParseException { namedexpr_test(); break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4275,7 +4360,7 @@ final public void star_named_expr() throws ParseException { jj_consume_token(POWER); break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4297,7 +4382,7 @@ final public void case_block() throws ParseException { guard(); break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; ; } grammarActions.findTokenAndAdd(":"); @@ -4340,7 +4425,7 @@ final public void open_sequence_pattern() throws ParseException { ; break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; break label_22; } grammarActions.findTokenAndAdd(","); @@ -4353,7 +4438,7 @@ final public void open_sequence_pattern() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; ; } } catch (Throwable jjte000) { @@ -4388,6 +4473,7 @@ final public void maybe_star_pattern() throws ParseException { case LBRACKET: case PLUS: case MINUS: + case TYPE: case FALSE: case TRUE: case NONE: @@ -4419,7 +4505,7 @@ final public void maybe_star_pattern() throws ParseException { pattern(); break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4469,7 +4555,7 @@ final public void pattern() throws ParseException { as_pattern(); break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; ; } } catch (Throwable jjte000) { @@ -4515,7 +4601,7 @@ final public void or_pattern() throws ParseException { ; break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; break label_23; } jj_consume_token(OR); @@ -4580,6 +4666,7 @@ final public void closed_pattern() throws ParseException { case TRIPLE_USTRING2: literal_pattern(); break; + case TYPE: case MATCH: case CASE: case NAME: @@ -4589,7 +4676,7 @@ final public void closed_pattern() throws ParseException { class_pattern(); break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; ; } break; @@ -4601,7 +4688,7 @@ final public void closed_pattern() throws ParseException { mapping_pattern(); break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4707,13 +4794,13 @@ final public void literal_pattern() throws ParseException { } break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; ; } break; @@ -4778,7 +4865,7 @@ final public void literal_pattern() throws ParseException { } break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4873,7 +4960,7 @@ final public void signed_number() throws ParseException { } break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4893,6 +4980,7 @@ final public void class_pattern() throws ParseException { case LBRACKET: case PLUS: case MINUS: + case TYPE: case FALSE: case TRUE: case NONE: @@ -4928,12 +5016,12 @@ final public void class_pattern() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; ; } break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4973,7 +5061,7 @@ final public void attr() throws ParseException { pattern(); break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; label_24: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4981,7 +5069,7 @@ final public void attr() throws ParseException { ; break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; break label_24; } jj_consume_token(DOT); @@ -5019,7 +5107,7 @@ final public void pattern_arguments() throws ParseException { ; break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; break label_25; } grammarActions.findTokenAndAdd(","); @@ -5037,7 +5125,7 @@ final public void sequence_pattern() throws ParseException { tuple_pattern(); break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5059,6 +5147,7 @@ final public void list_pattern() throws ParseException { case PLUS: case MINUS: case MULTIPLY: + case TYPE: case FALSE: case TRUE: case NONE: @@ -5090,7 +5179,7 @@ final public void list_pattern() throws ParseException { open_sequence_pattern(); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; ; } grammarActions.addSpecialToken("]",STRATEGY_ADD_AFTER_PREV); @@ -5133,6 +5222,7 @@ final public void tuple_pattern() throws ParseException { case PLUS: case MINUS: case MULTIPLY: + case TYPE: case FALSE: case TRUE: case NONE: @@ -5164,7 +5254,7 @@ final public void tuple_pattern() throws ParseException { open_sequence_pattern(); break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; ; } grammarActions.addSpecialToken(")",STRATEGY_ADD_AFTER_PREV); @@ -5203,6 +5293,7 @@ final public void mapping_pattern() throws ParseException { case PLUS: case MINUS: case POWER: + case TYPE: case FALSE: case TRUE: case NONE: @@ -5234,7 +5325,7 @@ final public void mapping_pattern() throws ParseException { items_pattern(); break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; ; } jj_consume_token(RBRACE); @@ -5269,7 +5360,7 @@ final public void items_pattern() throws ParseException { ; break; default: - jj_la1[112] = jj_gen; + jj_la1[113] = jj_gen; break label_26; } grammarActions.findTokenAndAdd(","); @@ -5282,7 +5373,7 @@ final public void items_pattern() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; ; } } @@ -5297,6 +5388,7 @@ final public void key_value_pattern() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case MINUS: + case TYPE: case FALSE: case TRUE: case NONE: @@ -5355,13 +5447,14 @@ final public void key_value_pattern() throws ParseException { case TRIPLE_USTRING2: literal_pattern(); break; + case TYPE: case MATCH: case CASE: case NAME: attr(); break; default: - jj_la1[114] = jj_gen; + jj_la1[115] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5373,7 +5466,7 @@ final public void key_value_pattern() throws ParseException { double_star_pattern(); break; default: - jj_la1[115] = jj_gen; + jj_la1[116] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5425,7 +5518,7 @@ final public void async_stmt() throws ParseException { for_stmt(); break; default: - jj_la1[116] = jj_gen; + jj_la1[117] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5456,7 +5549,7 @@ final public void if_stmt() throws ParseException { ; break; default: - jj_la1[117] = jj_gen; + jj_la1[118] = jj_gen; break label_27; } begin_elif_stmt(); @@ -5472,7 +5565,7 @@ final public void if_stmt() throws ParseException { grammarActions.addToPeek(elseToks[0], false, Suite.class);grammarActions.addToPeek(elseToks[1], false, Suite.class); break; default: - jj_la1[118] = jj_gen; + jj_la1[119] = jj_gen; ; } } catch (Throwable jjte000) { @@ -5512,7 +5605,7 @@ final public void namedexpr_test() throws ParseException { test(); break; default: - jj_la1[119] = jj_gen; + jj_la1[120] = jj_gen; ; } } catch (Throwable jjte000) { @@ -5577,7 +5670,7 @@ final public void while_stmt() throws ParseException { grammarActions.addToPeek(elseToks[0], false, Suite.class);grammarActions.addToPeek(elseToks[1], false, Suite.class); break; default: - jj_la1[120] = jj_gen; + jj_la1[121] = jj_gen; ; } } catch (Throwable jjte000) { @@ -5671,7 +5764,7 @@ final public void for_stmt() throws ParseException { suite(); break; default: - jj_la1[121] = jj_gen; + jj_la1[122] = jj_gen; ; } } catch (Throwable jjte000) { @@ -5735,7 +5828,7 @@ final public void try_stmt() throws ParseException { ; break; default: - jj_la1[122] = jj_gen; + jj_la1[123] = jj_gen; break label_28; } } @@ -5760,7 +5853,7 @@ final public void try_stmt() throws ParseException { } break; default: - jj_la1[123] = jj_gen; + jj_la1[124] = jj_gen; ; } SimpleNode jjtn003 = builder.openNode( JJTTRY_STMT); @@ -5789,7 +5882,7 @@ final public void try_stmt() throws ParseException { } break; default: - jj_la1[124] = jj_gen; + jj_la1[125] = jj_gen; ; } } catch (Throwable jjte003) { @@ -5843,7 +5936,7 @@ final public void try_stmt() throws ParseException { } break; default: - jj_la1[125] = jj_gen; + jj_la1[126] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5926,7 +6019,7 @@ final public void except_clause(SimpleNode tryNode) throws ParseException { this.grammarActions.addToPeek("except*",false); break; default: - jj_la1[126] = jj_gen; + jj_la1[127] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5941,6 +6034,7 @@ final public void except_clause(SimpleNode tryNode) throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -5977,12 +6071,12 @@ final public void except_clause(SimpleNode tryNode) throws ParseException { test(); break; default: - jj_la1[127] = jj_gen; + jj_la1[128] = jj_gen; ; } break; default: - jj_la1[128] = jj_gen; + jj_la1[129] = jj_gen; ; } grammarActions.findTokenAndAdd(":"); @@ -6052,7 +6146,7 @@ final public void with_stmt() throws ParseException { try { jj_consume_token(WITH); grammarActions.addSpecialToken("with ", STRATEGY_BEFORE_NEXT); - if (jj_2_19(2147483647)) { + if (jj_2_20(2147483647)) { with_item(); label_29: while (true) { @@ -6061,7 +6155,7 @@ final public void with_stmt() throws ParseException { ; break; default: - jj_la1[129] = jj_gen; + jj_la1[130] = jj_gen; break label_29; } grammarActions.findTokenAndAdd(","); @@ -6080,7 +6174,7 @@ final public void with_stmt() throws ParseException { ; break; default: - jj_la1[130] = jj_gen; + jj_la1[131] = jj_gen; break label_30; } grammarActions.findTokenAndAdd(","); @@ -6090,7 +6184,7 @@ final public void with_stmt() throws ParseException { jj_consume_token(RPAREN); break; default: - jj_la1[131] = jj_gen; + jj_la1[132] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6137,7 +6231,7 @@ final public void with_item() throws ParseException { expr(); break; default: - jj_la1[132] = jj_gen; + jj_la1[133] = jj_gen; ; } } catch (Throwable jjte000) { @@ -6194,6 +6288,7 @@ final public void suite() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case FALSE: case TRUE: @@ -6273,6 +6368,7 @@ final public void suite() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case WITH: case FALSE: @@ -6307,7 +6403,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[133] = jj_gen; + jj_la1[134] = jj_gen; break label_31; } } @@ -6357,6 +6453,7 @@ final public void suite() throws ParseException { case RAISE: case GLOBAL: case NONLOCAL: + case TYPE: case ASSERT: case WITH: case FALSE: @@ -6391,7 +6488,7 @@ final public void suite() throws ParseException { ; break; default: - jj_la1[134] = jj_gen; + jj_la1[135] = jj_gen; break label_32; } } @@ -6402,7 +6499,7 @@ final public void suite() throws ParseException { } break; default: - jj_la1[135] = jj_gen; + jj_la1[136] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6454,6 +6551,7 @@ final public void test() throws ParseException { case NOT: case NOT_BOOL: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -6488,12 +6586,12 @@ final public void test() throws ParseException { if_exp(); break; default: - jj_la1[136] = jj_gen; + jj_la1[137] = jj_gen; ; } break; default: - jj_la1[137] = jj_gen; + jj_la1[138] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6531,6 +6629,7 @@ final public void test_nocond() throws ParseException { case NOT: case NOT_BOOL: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -6565,7 +6664,7 @@ final public void test_nocond() throws ParseException { lambdef_nocond(); break; default: - jj_la1[138] = jj_gen; + jj_la1[139] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6623,7 +6722,7 @@ final public void or_test() throws ParseException { ; break; default: - jj_la1[139] = jj_gen; + jj_la1[140] = jj_gen; break label_33; } jj_consume_token(OR_BOOL); @@ -6667,7 +6766,7 @@ final public void and_test() throws ParseException { ; break; default: - jj_la1[140] = jj_gen; + jj_la1[141] = jj_gen; break label_34; } jj_consume_token(AND_BOOL); @@ -6735,6 +6834,7 @@ final public void not_test() throws ParseException { case MINUS: case NOT: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -6766,7 +6866,7 @@ final public void not_test() throws ParseException { comparison(); break; default: - jj_la1[141] = jj_gen; + jj_la1[142] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6795,7 +6895,7 @@ final public void comparison() throws ParseException { ; break; default: - jj_la1[142] = jj_gen; + jj_la1[143] = jj_gen; break label_35; } comp_op(); @@ -6940,8 +7040,8 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[143] = jj_gen; - if (jj_2_20(2)) { + jj_la1[144] = jj_gen; + if (jj_2_21(2)) { jj_consume_token(IS); SimpleNode jjtn009 = builder.openNode( JJTIS_NOT_CMP); boolean jjtc009 = true; @@ -6972,7 +7072,7 @@ final public void comp_op() throws ParseException { } break; default: - jj_la1[144] = jj_gen; + jj_la1[145] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6990,7 +7090,7 @@ final public void expr() throws ParseException { ; break; default: - jj_la1[145] = jj_gen; + jj_la1[146] = jj_gen; break label_36; } jj_consume_token(OR); @@ -7033,7 +7133,7 @@ final public void xor_expr() throws ParseException { ; break; default: - jj_la1[146] = jj_gen; + jj_la1[147] = jj_gen; break label_37; } jj_consume_token(XOR); @@ -7076,7 +7176,7 @@ final public void and_expr() throws ParseException { ; break; default: - jj_la1[147] = jj_gen; + jj_la1[148] = jj_gen; break label_38; } jj_consume_token(AND); @@ -7120,7 +7220,7 @@ final public void shift_expr() throws ParseException { ; break; default: - jj_la1[148] = jj_gen; + jj_la1[149] = jj_gen; break label_39; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7183,7 +7283,7 @@ final public void shift_expr() throws ParseException { } break; default: - jj_la1[149] = jj_gen; + jj_la1[150] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7201,7 +7301,7 @@ final public void arith_expr() throws ParseException { ; break; default: - jj_la1[150] = jj_gen; + jj_la1[151] = jj_gen; break label_40; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7264,7 +7364,7 @@ final public void arith_expr() throws ParseException { } break; default: - jj_la1[151] = jj_gen; + jj_la1[152] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7285,7 +7385,7 @@ final public void term() throws ParseException { ; break; default: - jj_la1[152] = jj_gen; + jj_la1[153] = jj_gen; break label_41; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7435,7 +7535,7 @@ final public void term() throws ParseException { } break; default: - jj_la1[153] = jj_gen; + jj_la1[154] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7537,6 +7637,7 @@ final public void factor() throws ParseException { case LBRACKET: case DOT: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -7568,7 +7669,7 @@ final public void factor() throws ParseException { power(); break; default: - jj_la1[154] = jj_gen; + jj_la1[155] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7581,7 +7682,7 @@ final public void power() throws ParseException { atom_expr(); label_42: while (true) { - if (jj_2_21(2)) { + if (jj_2_22(2)) { ; } else { break label_42; @@ -7626,6 +7727,7 @@ final public void atom_expr() throws ParseException { case LBRACE: case LBRACKET: case DOT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -7664,14 +7766,14 @@ final public void atom_expr() throws ParseException { ; break; default: - jj_la1[155] = jj_gen; + jj_la1[156] = jj_gen; break label_43; } trailer(); } break; default: - jj_la1[156] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7695,7 +7797,7 @@ final public void await_atom_expr() throws ParseException { ; break; default: - jj_la1[157] = jj_gen; + jj_la1[158] = jj_gen; break label_44; } trailer(); @@ -7751,6 +7853,7 @@ final public void trailer() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -7782,7 +7885,7 @@ final public void trailer() throws ParseException { arglist(); break; default: - jj_la1[158] = jj_gen; + jj_la1[159] = jj_gen; ; } jj_consume_token(RPAREN); @@ -7878,7 +7981,7 @@ final public void trailer() throws ParseException { } break; default: - jj_la1[159] = jj_gen; + jj_la1[160] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7890,7 +7993,7 @@ final public void trailer() throws ParseException { // NAME | NUMBER | STRING+ | '...' | 'None' | 'True' | 'False') final public void atom() throws ParseException { Object spStr;Object spStr2; - if (jj_2_22(2)) { + if (jj_2_23(2)) { SimpleNode jjtn001 = builder.openNode( JJTTUPLE); boolean jjtc001 = true; jjtree.openNodeScope(jjtn001); @@ -7907,7 +8010,7 @@ final public void atom() throws ParseException { } } grammarActions.addToPeek(spStr, false); grammarActions.addToPeek(spStr2, true); - } else if (jj_2_23(2)) { + } else if (jj_2_24(2)) { SimpleNode jjtn002 = builder.openNode( JJTTUPLE); boolean jjtc002 = true; jjtree.openNodeScope(jjtn002); @@ -7930,6 +8033,7 @@ final public void atom() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -7961,7 +8065,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[160] = jj_gen; + jj_la1[161] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8010,6 +8114,7 @@ final public void atom() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8041,7 +8146,7 @@ final public void atom() throws ParseException { testlist_comp(); break; default: - jj_la1[161] = jj_gen; + jj_la1[162] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("]", false); @@ -8089,6 +8194,7 @@ final public void atom() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8120,7 +8226,7 @@ final public void atom() throws ParseException { dictorsetmaker(); break; default: - jj_la1[162] = jj_gen; + jj_la1[163] = jj_gen; ; } spStr2 = grammarActions.createSpecialStr("}", false); @@ -8205,6 +8311,7 @@ final public void atom() throws ParseException { } } break; + case TYPE: case MATCH: case CASE: case NAME: @@ -8257,7 +8364,7 @@ final public void atom() throws ParseException { ; break; default: - jj_la1[163] = jj_gen; + jj_la1[164] = jj_gen; break label_45; } SimpleNode jjtn009 = builder.openNode( JJTSTRJOIN); @@ -8289,7 +8396,7 @@ final public void atom() throws ParseException { } break; default: - jj_la1[164] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8310,6 +8417,7 @@ final public void lambdef() throws ParseException { case LPAREN: case MULTIPLY: case POWER: + case TYPE: case MATCH: case CASE: case NAME: @@ -8317,7 +8425,7 @@ final public void lambdef() throws ParseException { hasArgs=true; break; default: - jj_la1[165] = jj_gen; + jj_la1[166] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8362,6 +8470,7 @@ final public void lambdef_nocond() throws ParseException { case LPAREN: case MULTIPLY: case POWER: + case TYPE: case MATCH: case CASE: case NAME: @@ -8369,7 +8478,7 @@ final public void lambdef_nocond() throws ParseException { hasArgs=true; break; default: - jj_la1[166] = jj_gen; + jj_la1[167] = jj_gen; ; } temporaryToken=grammarActions.createSpecialStr(":"); @@ -8411,7 +8520,7 @@ final public void subscriptlist() throws ParseException { subscript(); label_46: while (true) { - if (jj_2_24(2)) { + if (jj_2_25(2)) { ; } else { break label_46; @@ -8425,7 +8534,7 @@ final public void subscriptlist() throws ParseException { Comma(); break; default: - jj_la1[167] = jj_gen; + jj_la1[168] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8478,6 +8587,7 @@ final public void subscript() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8517,7 +8627,7 @@ final public void subscript() throws ParseException { slice(); break; default: - jj_la1[168] = jj_gen; + jj_la1[169] = jj_gen; ; } } catch (Throwable jjte002) { @@ -8570,7 +8680,7 @@ final public void subscript() throws ParseException { } break; default: - jj_la1[169] = jj_gen; + jj_la1[170] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8590,6 +8700,7 @@ final public void slice() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8621,7 +8732,7 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[170] = jj_gen; + jj_la1[171] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -8638,6 +8749,7 @@ final public void slice() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8669,12 +8781,12 @@ final public void slice() throws ParseException { test(); break; default: - jj_la1[171] = jj_gen; + jj_la1[172] = jj_gen; ; } break; default: - jj_la1[172] = jj_gen; + jj_la1[173] = jj_gen; ; } } @@ -8728,6 +8840,7 @@ final public void exprlist() throws ParseException { case MINUS: case NOT: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8762,13 +8875,13 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[173] = jj_gen; + jj_la1[174] = jj_gen; jj_consume_token(-1); throw new ParseException(); } label_47: while (true) { - if (jj_2_25(2)) { + if (jj_2_26(2)) { ; } else { break label_47; @@ -8784,6 +8897,7 @@ final public void exprlist() throws ParseException { case MINUS: case NOT: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8818,7 +8932,7 @@ final public void exprlist() throws ParseException { star_expr(); break; default: - jj_la1[174] = jj_gen; + jj_la1[175] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8828,7 +8942,7 @@ final public void exprlist() throws ParseException { Comma(); break; default: - jj_la1[175] = jj_gen; + jj_la1[176] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8863,7 +8977,7 @@ final public void SmartTestList() throws ParseException { test(); label_48: while (true) { - if (jj_2_26(2)) { + if (jj_2_27(2)) { ; } else { break label_48; @@ -8877,7 +8991,7 @@ final public void SmartTestList() throws ParseException { Comma(); break; default: - jj_la1[176] = jj_gen; + jj_la1[177] = jj_gen; ; } } catch (Throwable jjte001) { @@ -8907,7 +9021,7 @@ final public void testlist() throws ParseException { test(); label_49: while (true) { - if (jj_2_27(2)) { + if (jj_2_28(2)) { ; } else { break label_49; @@ -8922,7 +9036,7 @@ final public void testlist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[177] = jj_gen; + jj_la1[178] = jj_gen; ; } } @@ -8945,6 +9059,7 @@ final public void testlist_star_expr() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -8979,13 +9094,13 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[178] = jj_gen; + jj_la1[179] = jj_gen; jj_consume_token(-1); throw new ParseException(); } label_50: while (true) { - if (jj_2_28(2)) { + if (jj_2_29(2)) { ; } else { break label_50; @@ -9003,6 +9118,7 @@ final public void testlist_star_expr() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9037,7 +9153,7 @@ final public void testlist_star_expr() throws ParseException { star_expr(); break; default: - jj_la1[179] = jj_gen; + jj_la1[180] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9047,7 +9163,7 @@ final public void testlist_star_expr() throws ParseException { Comma(); break; default: - jj_la1[180] = jj_gen; + jj_la1[181] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9129,6 +9245,7 @@ final public void dictorsetmaker() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9173,10 +9290,10 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[183] = jj_gen; + jj_la1[184] = jj_gen; label_51: while (true) { - if (jj_2_29(2)) { + if (jj_2_30(2)) { ; } else { break label_51; @@ -9194,6 +9311,7 @@ final public void dictorsetmaker() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9232,7 +9350,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[181] = jj_gen; + jj_la1[182] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9243,14 +9361,14 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[182] = jj_gen; + jj_la1[183] = jj_gen; ; } } break; default: - jj_la1[186] = jj_gen; - if (jj_2_31(2)) { + jj_la1[187] = jj_gen; + if (jj_2_32(2)) { comp_for(); } else { SimpleNode jjtn001 = builder.openNode( JJTSET); @@ -9260,7 +9378,7 @@ final public void dictorsetmaker() throws ParseException { try { label_52: while (true) { - if (jj_2_30(2)) { + if (jj_2_31(2)) { ; } else { break label_52; @@ -9278,6 +9396,7 @@ final public void dictorsetmaker() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9314,7 +9433,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[184] = jj_gen; + jj_la1[185] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9346,7 +9465,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[185] = jj_gen; + jj_la1[186] = jj_gen; ; } } @@ -9360,10 +9479,10 @@ final public void dictorsetmaker() throws ParseException { comp_for(); break; default: - jj_la1[189] = jj_gen; + jj_la1[190] = jj_gen; label_53: while (true) { - if (jj_2_32(2)) { + if (jj_2_33(2)) { ; } else { break label_53; @@ -9381,6 +9500,7 @@ final public void dictorsetmaker() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9419,7 +9539,7 @@ final public void dictorsetmaker() throws ParseException { expr(); break; default: - jj_la1[187] = jj_gen; + jj_la1[188] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9430,7 +9550,7 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[188] = jj_gen; + jj_la1[189] = jj_gen; ; } } @@ -9439,7 +9559,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.pushStarExpr(Starred.Load); star_expr(); grammarActions.popStarExpr(); - if (jj_2_34(2)) { + if (jj_2_35(2)) { comp_for(); } else { SimpleNode jjtn002 = builder.openNode( JJTSET); @@ -9449,7 +9569,7 @@ final public void dictorsetmaker() throws ParseException { try { label_54: while (true) { - if (jj_2_33(2)) { + if (jj_2_34(2)) { ; } else { break label_54; @@ -9467,6 +9587,7 @@ final public void dictorsetmaker() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9503,7 +9624,7 @@ final public void dictorsetmaker() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[190] = jj_gen; + jj_la1[191] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9535,12 +9656,12 @@ final public void dictorsetmaker() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[191] = jj_gen; + jj_la1[192] = jj_gen; ; } break; default: - jj_la1[192] = jj_gen; + jj_la1[193] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9559,6 +9680,7 @@ final public void testlist_comp() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9595,11 +9717,11 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[193] = jj_gen; + jj_la1[194] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - if (jj_2_36(2)) { + if (jj_2_37(2)) { label_55: while (true) { comp_for(); @@ -9609,14 +9731,14 @@ final public void testlist_comp() throws ParseException { ; break; default: - jj_la1[194] = jj_gen; + jj_la1[195] = jj_gen; break label_55; } } } else { label_56: while (true) { - if (jj_2_35(2)) { + if (jj_2_36(2)) { ; } else { break label_56; @@ -9634,6 +9756,7 @@ final public void testlist_comp() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9670,7 +9793,7 @@ final public void testlist_comp() throws ParseException { grammarActions.popStarExpr(); break; default: - jj_la1[195] = jj_gen; + jj_la1[196] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9685,7 +9808,7 @@ final public void testlist_comp() throws ParseException { Comma(); break; default: - jj_la1[196] = jj_gen; + jj_la1[197] = jj_gen; ; } } catch (Throwable jjte001) { @@ -9722,7 +9845,7 @@ final public void comp_iter() throws ParseException { comp_if(); break; default: - jj_la1[197] = jj_gen; + jj_la1[198] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9741,7 +9864,7 @@ final public void comp_for() throws ParseException { jj_consume_token(ASYNC); break; default: - jj_la1[198] = jj_gen; + jj_la1[199] = jj_gen; ; } grammarActions.findTokenAndAdd("for"); @@ -9759,7 +9882,7 @@ final public void comp_for() throws ParseException { comp_iter(); break; default: - jj_la1[199] = jj_gen; + jj_la1[200] = jj_gen; ; } } catch (Throwable jjte000) { @@ -9796,7 +9919,7 @@ final public void comp_if() throws ParseException { comp_iter(); break; default: - jj_la1[200] = jj_gen; + jj_la1[201] = jj_gen; ; } } @@ -9821,7 +9944,7 @@ final public void decorated() throws ParseException { async_funcdef(); break; default: - jj_la1[201] = jj_gen; + jj_la1[202] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9874,7 +9997,7 @@ final public void classdef() throws ParseException { type_params(); break; default: - jj_la1[202] = jj_gen; + jj_la1[203] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -9895,6 +10018,7 @@ final public void classdef() throws ParseException { case NOT_BOOL: case LAMBDA: case AWAIT: + case TYPE: case FALSE: case TRUE: case NONE: @@ -9926,7 +10050,7 @@ final public void classdef() throws ParseException { arglist(); break; default: - jj_la1[203] = jj_gen; + jj_la1[204] = jj_gen; ; } try { @@ -9937,7 +10061,7 @@ final public void classdef() throws ParseException { } break; default: - jj_la1[204] = jj_gen; + jj_la1[205] = jj_gen; ; } ISpecialStr s = grammarActions.findTokenAndAdd(":"); if(s != null){grammarActions.markEndDefColon(s, jjtn000);} @@ -9970,7 +10094,7 @@ final public void arglist() throws ParseException { argument(); label_57: while (true) { - if (jj_2_37(2)) { + if (jj_2_38(2)) { ; } else { break label_57; @@ -9985,7 +10109,7 @@ final public void arglist() throws ParseException { jj_consume_token(COMMA); break; default: - jj_la1[205] = jj_gen; + jj_la1[206] = jj_gen; ; } } @@ -10074,9 +10198,9 @@ final public void argument() throws ParseException { jjtree.openNodeScope(jjtn000); jjtreeOpenNodeScope(jjtn000); try { - if (jj_2_39(2)) { + if (jj_2_40(2)) { test(); - if (jj_2_38(2)) { + if (jj_2_39(2)) { Keyword(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -10085,14 +10209,14 @@ final public void argument() throws ParseException { test(); break; default: - jj_la1[207] = jj_gen; + jj_la1[208] = jj_gen; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FOR: case ASYNC: comp_for(); break; default: - jj_la1[206] = jj_gen; + jj_la1[207] = jj_gen; ; } } @@ -10106,7 +10230,7 @@ final public void argument() throws ParseException { ExtraArgValueList(); break; default: - jj_la1[208] = jj_gen; + jj_la1[209] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10222,7 +10346,7 @@ final public void Number() throws ParseException { break; default: - jj_la1[209] = jj_gen; + jj_la1[210] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10268,8 +10392,11 @@ final public Token Name() throws ParseException { case CASE: t = jj_consume_token(CASE); break; + case TYPE: + t = jj_consume_token(TYPE); + break; default: - jj_la1[210] = jj_gen; + jj_la1[211] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10597,7 +10724,7 @@ final public void String() throws ParseException { } break; default: - jj_la1[211] = jj_gen; + jj_la1[212] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -10876,151 +11003,69 @@ private boolean jj_2_39(int xla) { finally { jj_save(38, xla); } } - private boolean jj_3R_105() { - if (jj_3R_149()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_4()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3R_537()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_62() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_105()) { - jj_scanpos = xsp; - if (jj_3R_106()) return true; - } - return false; + private boolean jj_2_40(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_40(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(39, xla); } } - private boolean jj_3R_489() { - if (jj_3R_107()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_505()) jj_scanpos = xsp; + private boolean jj_3R_334() { + if (jj_scan_token(EQEQUAL)) return true; return false; } - private boolean jj_3R_137() { - if (jj_3R_170()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_191()) { jj_scanpos = xsp; break; } - } + private boolean jj_3R_333() { + if (jj_scan_token(GREATER)) return true; return false; } - private boolean jj_3R_488() { - if (jj_3R_149()) return true; + private boolean jj_3_5() { + if (jj_scan_token(COMMA)) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_6()) { jj_scanpos = xsp; break; } - } xsp = jj_scanpos; - if (jj_3_7()) jj_scanpos = xsp; + if (jj_3R_62()) jj_scanpos = xsp; return false; } - private boolean jj_3R_333() { - if (jj_scan_token(IS)) return true; + private boolean jj_3R_231() { + if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3_20() { - if (jj_scan_token(IS)) return true; - if (jj_scan_token(NOT_BOOL)) return true; + private boolean jj_3R_269() { + if (jj_3R_304()) return true; + if (jj_3R_121()) return true; return false; } private boolean jj_3R_332() { - if (jj_scan_token(NOT_BOOL)) return true; - if (jj_scan_token(IN)) return true; - return false; - } - - private boolean jj_3R_331() { - if (jj_scan_token(IN)) return true; - return false; - } - - private boolean jj_3R_330() { - if (jj_scan_token(NOTEQUAL)) return true; - return false; - } - - private boolean jj_3R_329() { - if (jj_scan_token(EQLESS)) return true; - return false; - } - - private boolean jj_3R_504() { - if (jj_scan_token(COMMA)) return true; + if (jj_scan_token(LESS)) return true; return false; } - private boolean jj_3R_328() { - if (jj_scan_token(EQGREATER)) return true; - return false; - } - - private boolean jj_3_5() { - if (jj_scan_token(COMMA)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_62()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_327() { - if (jj_scan_token(EQEQUAL)) return true; - return false; - } - - private boolean jj_3R_326() { - if (jj_scan_token(GREATER)) return true; - return false; - } - - private boolean jj_3R_259() { - if (jj_3R_292()) return true; - if (jj_3R_137()) return true; - return false; - } - - private boolean jj_3R_325() { - if (jj_scan_token(LESS)) return true; - return false; - } - - private boolean jj_3R_292() { + private boolean jj_3R_304() { Token xsp; xsp = jj_scanpos; - if (jj_3R_325()) { + if (jj_3R_332()) { jj_scanpos = xsp; - if (jj_3R_326()) { + if (jj_3R_333()) { jj_scanpos = xsp; - if (jj_3R_327()) { + if (jj_3R_334()) { jj_scanpos = xsp; - if (jj_3R_328()) { + if (jj_3R_335()) { jj_scanpos = xsp; - if (jj_3R_329()) { + if (jj_3R_336()) { jj_scanpos = xsp; - if (jj_3R_330()) { + if (jj_3R_337()) { jj_scanpos = xsp; - if (jj_3R_331()) { + if (jj_3R_338()) { jj_scanpos = xsp; - if (jj_3R_332()) { + if (jj_3R_339()) { jj_scanpos = xsp; - if (jj_3_20()) { + if (jj_3_21()) { jj_scanpos = xsp; - if (jj_3R_333()) return true; + if (jj_3R_340()) return true; } } } @@ -11033,8 +11078,14 @@ private boolean jj_3R_292() { return false; } - private boolean jj_3R_487() { - if (jj_3R_103()) return true; + private boolean jj_3R_223() { + if (jj_scan_token(AND_BOOL)) return true; + if (jj_3R_203()) return true; + return false; + } + + private boolean jj_3R_493() { + if (jj_3R_104()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -11045,114 +11096,108 @@ private boolean jj_3R_487() { return false; } - private boolean jj_3R_465() { + private boolean jj_3R_471() { Token xsp; xsp = jj_scanpos; - if (jj_3R_487()) { + if (jj_3R_493()) { jj_scanpos = xsp; - if (jj_3R_488()) { + if (jj_3R_494()) { jj_scanpos = xsp; - if (jj_3R_489()) return true; + if (jj_3R_495()) return true; } } return false; } - private boolean jj_3R_217() { - if (jj_scan_token(AND_BOOL)) return true; - if (jj_3R_198()) return true; - return false; - } - - private boolean jj_3R_233() { - if (jj_3R_137()) return true; + private boolean jj_3R_240() { + if (jj_3R_121()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_259()) { jj_scanpos = xsp; break; } + if (jj_3R_269()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_175() { - if (jj_3R_197()) return true; + private boolean jj_3R_179() { + if (jj_3R_202()) return true; return false; } - private boolean jj_3R_196() { + private boolean jj_3R_201() { if (jj_scan_token(OR_BOOL)) return true; - if (jj_3R_176()) return true; + if (jj_3R_180()) return true; return false; } - private boolean jj_3R_198() { + private boolean jj_3R_203() { Token xsp; xsp = jj_scanpos; - if (jj_3R_218()) { + if (jj_3R_224()) { jj_scanpos = xsp; - if (jj_3R_219()) return true; + if (jj_3R_225()) return true; } return false; } - private boolean jj_3R_218() { + private boolean jj_3R_224() { if (jj_scan_token(NOT_BOOL)) return true; - if (jj_3R_198()) return true; + if (jj_3R_203()) return true; return false; } - private boolean jj_3R_176() { - if (jj_3R_198()) return true; + private boolean jj_3R_180() { + if (jj_3R_203()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_217()) { jj_scanpos = xsp; break; } + if (jj_3R_223()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_566() { - if (jj_3R_567()) return true; + private boolean jj_3R_569() { + if (jj_3R_570()) return true; return false; } - private boolean jj_3R_148() { - if (jj_3R_176()) return true; + private boolean jj_3R_150() { + if (jj_3R_180()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_196()) { jj_scanpos = xsp; break; } + if (jj_3R_201()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_102() { - if (jj_3R_148()) return true; + private boolean jj_3R_103() { + if (jj_3R_150()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) jj_scanpos = xsp; + if (jj_3R_179()) jj_scanpos = xsp; return false; } - private boolean jj_3R_197() { + private boolean jj_3R_202() { if (jj_scan_token(IF)) return true; - if (jj_3R_148()) return true; + if (jj_3R_150()) return true; if (jj_scan_token(ELSE)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_565() { - if (jj_3R_148()) return true; + private boolean jj_3R_568() { + if (jj_3R_150()) return true; return false; } - private boolean jj_3R_563() { + private boolean jj_3R_566() { Token xsp; xsp = jj_scanpos; - if (jj_3R_565()) { + if (jj_3R_568()) { jj_scanpos = xsp; - if (jj_3R_566()) return true; + if (jj_3R_569()) return true; } return false; } @@ -11160,219 +11205,215 @@ private boolean jj_3R_563() { private boolean jj_3R_59() { Token xsp; xsp = jj_scanpos; - if (jj_3R_101()) { + if (jj_3R_102()) { jj_scanpos = xsp; - if (jj_3R_102()) return true; + if (jj_3R_103()) return true; } return false; } - private boolean jj_3R_101() { - if (jj_3R_147()) return true; + private boolean jj_3R_102() { + if (jj_3R_149()) return true; return false; } - private boolean jj_3R_404() { - if (jj_scan_token(MINUS_GREATER)) return true; - if (jj_3R_59()) return true; + private boolean jj_3R_230() { + if (jj_3R_244()) return true; return false; } - private boolean jj_3R_224() { - if (jj_3R_237()) return true; + private boolean jj_3R_411() { + if (jj_scan_token(MINUS_GREATER)) return true; + if (jj_3R_59()) return true; return false; } - private boolean jj_3R_206() { + private boolean jj_3R_211() { if (jj_scan_token(INDENT)) return true; Token xsp; - if (jj_3R_224()) return true; + if (jj_3R_230()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_224()) { jj_scanpos = xsp; break; } + if (jj_3R_230()) { jj_scanpos = xsp; break; } } if (jj_scan_token(DEDENT)) return true; return false; } - private boolean jj_3R_437() { - if (jj_3R_465()) return true; + private boolean jj_3R_443() { + if (jj_3R_471()) return true; return false; } - private boolean jj_3R_403() { + private boolean jj_3R_229() { + if (jj_3R_244()) return true; + return false; + } + + private boolean jj_3R_410() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_437()) jj_scanpos = xsp; + if (jj_3R_443()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_146() { + private boolean jj_3R_148() { if (jj_scan_token(POWER)) return true; - if (jj_3R_72()) return true; - return false; - } - - private boolean jj_3R_223() { - if (jj_3R_237()) return true; - return false; - } - - private boolean jj_3_2() { - if (jj_scan_token(COLON)) return true; - if (jj_3R_59()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_205() { + private boolean jj_3R_210() { if (jj_scan_token(NEWLINE)) return true; if (jj_scan_token(INDENT)) return true; Token xsp; - if (jj_3R_223()) return true; + if (jj_3R_229()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_223()) { jj_scanpos = xsp; break; } + if (jj_3R_229()) { jj_scanpos = xsp; break; } } if (jj_scan_token(DEDENT)) return true; return false; } - private boolean jj_3R_145() { - if (jj_scan_token(MULTIPLY)) return true; - if (jj_3R_72()) return true; + private boolean jj_3_2() { + if (jj_scan_token(COLON)) return true; + if (jj_3R_59()) return true; return false; } - private boolean jj_3R_204() { - if (jj_3R_222()) return true; + private boolean jj_3R_209() { + if (jj_3R_228()) return true; return false; } - private boolean jj_3R_439() { + private boolean jj_3R_445() { if (jj_scan_token(COMMA)) return true; + if (jj_3R_74()) return true; + return false; + } + + private boolean jj_3R_147() { + if (jj_scan_token(MULTIPLY)) return true; if (jj_3R_73()) return true; return false; } - private boolean jj_3R_144() { - if (jj_3R_72()) return true; + private boolean jj_3R_146() { + if (jj_3R_73()) return true; Token xsp; xsp = jj_scanpos; if (jj_3_2()) jj_scanpos = xsp; return false; } - private boolean jj_3R_438() { + private boolean jj_3R_444() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_73()) return true; + if (jj_3R_74()) return true; return false; } - private boolean jj_3R_127() { + private boolean jj_3R_130() { if (jj_scan_token(AS)) return true; - if (jj_3R_137()) return true; + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_402() { - if (jj_3R_436()) return true; - return false; - } - - private boolean jj_3_19() { - if (jj_3R_73()) return true; + private boolean jj_3_20() { + if (jj_3R_74()) return true; return false; } - private boolean jj_3R_181() { + private boolean jj_3R_185() { Token xsp; xsp = jj_scanpos; - if (jj_3R_204()) { + if (jj_3R_209()) { jj_scanpos = xsp; - if (jj_3R_205()) { + if (jj_3R_210()) { jj_scanpos = xsp; - if (jj_3R_206()) return true; + if (jj_3R_211()) return true; } } return false; } - private boolean jj_3R_100() { - if (jj_3R_146()) return true; + private boolean jj_3R_413() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_74()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_445()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3_1() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_58()) return true; + private boolean jj_3R_101() { + if (jj_3R_148()) return true; return false; } - private boolean jj_3R_99() { - if (jj_3R_145()) return true; + private boolean jj_3_1() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_58()) return true; return false; } - private boolean jj_3R_406() { - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_73()) return true; + private boolean jj_3R_74() { + if (jj_3R_59()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_439()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RPAREN)) return true; + xsp = jj_scanpos; + if (jj_3R_130()) jj_scanpos = xsp; return false; } - private boolean jj_3R_73() { - if (jj_3R_59()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_127()) jj_scanpos = xsp; + private boolean jj_3R_100() { + if (jj_3R_147()) return true; return false; } - private boolean jj_3R_98() { - if (jj_3R_144()) return true; + private boolean jj_3R_99() { + if (jj_3R_146()) return true; return false; } private boolean jj_3R_58() { Token xsp; xsp = jj_scanpos; - if (jj_3R_98()) { - jj_scanpos = xsp; if (jj_3R_99()) { jj_scanpos = xsp; - if (jj_3R_100()) return true; + if (jj_3R_100()) { + jj_scanpos = xsp; + if (jj_3R_101()) return true; } } return false; } - private boolean jj_3R_405() { - if (jj_3R_73()) return true; + private boolean jj_3R_412() { + if (jj_3R_74()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_438()) { jj_scanpos = xsp; break; } + if (jj_3R_444()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_510() { - if (jj_scan_token(LPAREN)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_523()) jj_scanpos = xsp; - if (jj_scan_token(RPAREN)) return true; + private boolean jj_3R_409() { + if (jj_3R_161()) return true; return false; } - private boolean jj_3R_486() { + private boolean jj_3R_120() { + if (jj_3R_161()) return true; + return false; + } + + private boolean jj_3R_212() { if (jj_3R_58()) return true; Token xsp; while (true) { @@ -11380,320 +11421,340 @@ private boolean jj_3R_486() { if (jj_3_1()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_504()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_464() { - if (jj_3R_486()) return true; + if (jj_3R_231()) jj_scanpos = xsp; return false; } - private boolean jj_3R_436() { - if (jj_scan_token(LBRACKET)) return true; + private boolean jj_3R_519() { + if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_464()) jj_scanpos = xsp; - if (jj_scan_token(RBRACKET)) return true; + if (jj_3R_529()) jj_scanpos = xsp; + if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_509() { - if (jj_scan_token(AT)) return true; - if (jj_3R_140()) return true; + private boolean jj_3R_186() { + if (jj_3R_212()) return true; return false; } - private boolean jj_3R_154() { - if (jj_scan_token(WITH)) return true; + private boolean jj_3R_71() { + if (jj_scan_token(TYPE)) return true; + if (jj_3R_73()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_405()) { - jj_scanpos = xsp; - if (jj_3R_406()) return true; - } - if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_120()) jj_scanpos = xsp; + if (jj_scan_token(EQUAL)) return true; + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_497() { - if (jj_3R_509()) return true; + private boolean jj_3R_161() { + if (jj_scan_token(LBRACKET)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_510()) jj_scanpos = xsp; - if (jj_scan_token(NEWLINE)) return true; + if (jj_3R_186()) jj_scanpos = xsp; + if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_531() { + private boolean jj_3R_156() { + if (jj_scan_token(WITH)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_412()) { + jj_scanpos = xsp; + if (jj_3R_413()) return true; + } + if (jj_scan_token(COLON)) return true; + if (jj_3R_185()) return true; + return false; + } + + private boolean jj_3R_539() { if (jj_scan_token(AS)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_475() { - Token xsp; - if (jj_3R_497()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_497()) { jj_scanpos = xsp; break; } - } + private boolean jj_3R_518() { + if (jj_scan_token(AT)) return true; + if (jj_3R_142()) return true; return false; } - private boolean jj_3R_530() { + private boolean jj_3R_538() { if (jj_scan_token(EXCEPT_MULTIPLY)) return true; return false; } - private boolean jj_3R_521() { + private boolean jj_3R_527() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_531()) jj_scanpos = xsp; + if (jj_3R_539()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_503() { + if (jj_3R_518()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_519()) jj_scanpos = xsp; + if (jj_scan_token(NEWLINE)) return true; return false; } - private boolean jj_3R_529() { + private boolean jj_3R_537() { if (jj_scan_token(EXCEPT)) return true; return false; } - private boolean jj_3R_153() { - if (jj_scan_token(DEF)) return true; - if (jj_3R_72()) return true; + private boolean jj_3R_481() { Token xsp; - xsp = jj_scanpos; - if (jj_3R_402()) jj_scanpos = xsp; - if (jj_3R_403()) return true; - xsp = jj_scanpos; - if (jj_3R_404()) jj_scanpos = xsp; - if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_503()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_503()) { jj_scanpos = xsp; break; } + } return false; } - private boolean jj_3R_520() { - if (jj_3R_530()) return true; + private boolean jj_3R_526() { + if (jj_3R_538()) return true; return false; } - private boolean jj_3R_519() { - if (jj_3R_529()) return true; + private boolean jj_3R_525() { + if (jj_3R_537()) return true; return false; } - private boolean jj_3R_506() { + private boolean jj_3R_515() { Token xsp; xsp = jj_scanpos; - if (jj_3R_519()) { + if (jj_3R_525()) { jj_scanpos = xsp; - if (jj_3R_520()) return true; + if (jj_3R_526()) return true; } xsp = jj_scanpos; - if (jj_3R_521()) jj_scanpos = xsp; + if (jj_3R_527()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_495() { + private boolean jj_3R_155() { + if (jj_scan_token(DEF)) return true; + if (jj_3R_73()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_409()) jj_scanpos = xsp; + if (jj_3R_410()) return true; + xsp = jj_scanpos; + if (jj_3R_411()) jj_scanpos = xsp; + if (jj_scan_token(COLON)) return true; + if (jj_3R_185()) return true; + return false; + } + + private boolean jj_3R_501() { if (jj_scan_token(FINALLY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_507() { + private boolean jj_3R_516() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_472() { - if (jj_3R_495()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_478() { + if (jj_3R_501()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_470() { + private boolean jj_3R_476() { if (jj_scan_token(TRY)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_494() { - if (jj_3R_495()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_500() { + if (jj_3R_501()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_493() { - if (jj_3R_507()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_499() { + if (jj_3R_516()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_492() { - if (jj_3R_506()) return true; + private boolean jj_3R_498() { + if (jj_3R_515()) return true; return false; } - private boolean jj_3R_471() { + private boolean jj_3R_477() { Token xsp; - if (jj_3R_492()) return true; + if (jj_3R_498()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_492()) { jj_scanpos = xsp; break; } + if (jj_3R_498()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_493()) jj_scanpos = xsp; + if (jj_3R_499()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_494()) jj_scanpos = xsp; + if (jj_3R_500()) jj_scanpos = xsp; return false; } - private boolean jj_3R_459() { + private boolean jj_3R_466() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_443() { - if (jj_3R_470()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_449() { + if (jj_3R_476()) return true; + if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_471()) { + if (jj_3R_477()) { jj_scanpos = xsp; - if (jj_3R_472()) return true; + if (jj_3R_478()) return true; } return false; } - private boolean jj_3R_440() { + private boolean jj_3R_446() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_407() { - if (jj_3R_440()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_414() { + if (jj_3R_446()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_155() { + private boolean jj_3R_157() { if (jj_scan_token(FOR)) return true; - if (jj_3R_139()) return true; + if (jj_3R_141()) return true; if (jj_scan_token(IN)) return true; - if (jj_3R_389()) return true; + if (jj_3R_396()) return true; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_407()) jj_scanpos = xsp; + if (jj_3R_414()) jj_scanpos = xsp; return false; } - private boolean jj_3R_116() { - if (jj_3R_155()) return true; + private boolean jj_3R_117() { + if (jj_3R_157()) return true; return false; } - private boolean jj_3R_491() { + private boolean jj_3R_497() { if (jj_scan_token(ELSE)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_468() { + private boolean jj_3R_474() { if (jj_scan_token(WHILE)) return true; return false; } - private boolean jj_3R_469() { - if (jj_3R_491()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_475() { + if (jj_3R_497()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_442() { - if (jj_3R_468()) return true; - if (jj_3R_140()) return true; + private boolean jj_3R_448() { + if (jj_3R_474()) return true; + if (jj_3R_142()) return true; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_469()) jj_scanpos = xsp; + if (jj_3R_475()) jj_scanpos = xsp; return false; } - private boolean jj_3R_314() { + private boolean jj_3R_326() { if (jj_scan_token(EQUAL)) return true; - if (jj_3R_371()) return true; + if (jj_3R_378()) return true; return false; } - private boolean jj_3R_115() { - if (jj_3R_154()) return true; + private boolean jj_3R_116() { + if (jj_3R_156()) return true; return false; } - private boolean jj_3R_199() { + private boolean jj_3R_204() { if (jj_scan_token(COLONEQUAL)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_454() { - if (jj_3R_179()) return true; + private boolean jj_3R_461() { + if (jj_3R_183()) return true; return false; } - private boolean jj_3R_490() { + private boolean jj_3R_496() { if (jj_scan_token(ELIF)) return true; return false; } - private boolean jj_3R_467() { - if (jj_3R_491()) return true; - if (jj_3R_181()) return true; + private boolean jj_3R_473() { + if (jj_3R_497()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_140() { + private boolean jj_3R_142() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_199()) jj_scanpos = xsp; + if (jj_3R_204()) jj_scanpos = xsp; return false; } - private boolean jj_3R_466() { - if (jj_3R_490()) return true; - if (jj_3R_140()) return true; + private boolean jj_3R_472() { + if (jj_3R_496()) return true; + if (jj_3R_142()) return true; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_114() { - if (jj_3R_153()) return true; + private boolean jj_3R_115() { + if (jj_3R_155()) return true; return false; } - private boolean jj_3R_441() { + private boolean jj_3R_447() { if (jj_scan_token(IF)) return true; - if (jj_3R_140()) return true; + if (jj_3R_142()) return true; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_466()) { jj_scanpos = xsp; break; } + if (jj_3R_472()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_467()) jj_scanpos = xsp; + if (jj_3R_473()) jj_scanpos = xsp; return false; } @@ -11701,390 +11762,390 @@ private boolean jj_3R_69() { if (jj_scan_token(ASYNC)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_114()) { - jj_scanpos = xsp; if (jj_3R_115()) { jj_scanpos = xsp; - if (jj_3R_116()) return true; + if (jj_3R_116()) { + jj_scanpos = xsp; + if (jj_3R_117()) return true; } } return false; } - private boolean jj_3R_458() { + private boolean jj_3R_465() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_457()) return true; + if (jj_3R_464()) return true; return false; } - private boolean jj_3R_118() { - if (jj_3R_158()) return true; + private boolean jj_3R_119() { + if (jj_3R_160()) return true; return false; } - private boolean jj_3R_203() { + private boolean jj_3R_208() { if (jj_scan_token(IF)) return true; - if (jj_3R_140()) return true; + if (jj_3R_142()) return true; return false; } - private boolean jj_3R_503() { + private boolean jj_3R_513() { if (jj_scan_token(POWER)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_502() { - if (jj_3R_335()) return true; + private boolean jj_3R_512() { + if (jj_3R_342()) return true; return false; } - private boolean jj_3R_483() { - if (jj_3R_503()) return true; + private boolean jj_3R_490() { + if (jj_3R_513()) return true; return false; } - private boolean jj_3R_313() { + private boolean jj_3R_325() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_501() { - if (jj_3R_334()) return true; + private boolean jj_3R_511() { + if (jj_3R_341()) return true; return false; } - private boolean jj_3R_482() { + private boolean jj_3R_489() { Token xsp; xsp = jj_scanpos; - if (jj_3R_501()) { + if (jj_3R_511()) { jj_scanpos = xsp; - if (jj_3R_502()) return true; + if (jj_3R_512()) return true; } if (jj_scan_token(COLON)) return true; - if (jj_3R_235()) return true; + if (jj_3R_242()) return true; return false; } - private boolean jj_3R_457() { + private boolean jj_3R_464() { Token xsp; xsp = jj_scanpos; - if (jj_3R_482()) { + if (jj_3R_489()) { jj_scanpos = xsp; - if (jj_3R_483()) return true; + if (jj_3R_490()) return true; } return false; } - private boolean jj_3R_386() { - if (jj_3R_425()) return true; + private boolean jj_3R_393() { + if (jj_3R_432()) return true; return false; } - private boolean jj_3R_425() { - if (jj_3R_457()) return true; + private boolean jj_3R_432() { + if (jj_3R_464()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_458()) { jj_scanpos = xsp; break; } + if (jj_3R_465()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_459()) jj_scanpos = xsp; + if (jj_3R_466()) jj_scanpos = xsp; return false; } - private boolean jj_3R_456() { - if (jj_3R_235()) return true; + private boolean jj_3R_463() { + if (jj_3R_242()) return true; return false; } - private boolean jj_3R_338() { + private boolean jj_3R_345() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_386()) jj_scanpos = xsp; + if (jj_3R_393()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_496() { - if (jj_3R_508()) return true; + private boolean jj_3R_502() { + if (jj_3R_517()) return true; return false; } - private boolean jj_3R_481() { - if (jj_3R_179()) return true; + private boolean jj_3R_488() { + if (jj_3R_183()) return true; return false; } - private boolean jj_3R_455() { + private boolean jj_3R_462() { Token xsp; xsp = jj_scanpos; - if (jj_3R_481()) jj_scanpos = xsp; + if (jj_3R_488()) jj_scanpos = xsp; return false; } - private boolean jj_3R_202() { + private boolean jj_3R_207() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_453() { + private boolean jj_3R_460() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_424() { + private boolean jj_3R_431() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_455()) { + if (jj_3R_462()) { jj_scanpos = xsp; - if (jj_3R_456()) return true; + if (jj_3R_463()) return true; } if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_480() { + private boolean jj_3R_487() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_235()) return true; + if (jj_3R_242()) return true; return false; } - private boolean jj_3R_423() { + private boolean jj_3R_430() { if (jj_scan_token(LBRACKET)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_454()) jj_scanpos = xsp; + if (jj_3R_461()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_385() { - if (jj_3R_424()) return true; + private boolean jj_3R_392() { + if (jj_3R_431()) return true; return false; } - private boolean jj_3R_416() { + private boolean jj_3R_423() { if (jj_3R_70()) return true; return false; } - private boolean jj_3R_384() { - if (jj_3R_423()) return true; + private boolean jj_3R_391() { + if (jj_3R_430()) return true; return false; } - private boolean jj_3R_337() { + private boolean jj_3R_344() { Token xsp; xsp = jj_scanpos; - if (jj_3R_384()) { + if (jj_3R_391()) { jj_scanpos = xsp; - if (jj_3R_385()) return true; + if (jj_3R_392()) return true; } return false; } - private boolean jj_3R_421() { + private boolean jj_3R_428() { if (jj_scan_token(DOT)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_452() { - if (jj_3R_235()) return true; + private boolean jj_3R_459() { + if (jj_3R_242()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_480()) { jj_scanpos = xsp; break; } + if (jj_3R_487()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_382() { + private boolean jj_3R_389() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_421()) { jj_scanpos = xsp; break; } + if (jj_3R_428()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_422() { - if (jj_3R_452()) return true; + private boolean jj_3R_429() { + if (jj_3R_459()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_453()) jj_scanpos = xsp; + if (jj_3R_460()) jj_scanpos = xsp; return false; } - private boolean jj_3R_381() { + private boolean jj_3R_388() { if (jj_scan_token(EQUAL)) return true; - if (jj_3R_235()) return true; + if (jj_3R_242()) return true; return false; } - private boolean jj_3R_335() { - if (jj_3R_72()) return true; + private boolean jj_3R_342() { + if (jj_3R_73()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_381()) { + if (jj_3R_388()) { jj_scanpos = xsp; - if (jj_3R_382()) return true; + if (jj_3R_389()) return true; } return false; } - private boolean jj_3R_415() { - if (jj_3R_445()) return true; + private boolean jj_3R_422() { + if (jj_3R_451()) return true; return false; } - private boolean jj_3R_180() { - if (jj_3R_203()) return true; + private boolean jj_3R_184() { + if (jj_3R_208()) return true; return false; } - private boolean jj_3R_554() { - if (jj_3R_558()) return true; + private boolean jj_3R_556() { + if (jj_3R_561()) return true; return false; } - private boolean jj_3R_383() { + private boolean jj_3R_390() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_422()) jj_scanpos = xsp; + if (jj_3R_429()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_449() { + private boolean jj_3R_456() { if (jj_scan_token(MINUS)) return true; - if (jj_3R_257()) return true; + if (jj_3R_267()) return true; return false; } - private boolean jj_3R_447() { - if (jj_3R_257()) return true; + private boolean jj_3R_454() { + if (jj_3R_267()) return true; return false; } - private boolean jj_3R_419() { + private boolean jj_3R_426() { Token xsp; xsp = jj_scanpos; - if (jj_3R_447()) { + if (jj_3R_454()) { jj_scanpos = xsp; - if (jj_3R_448()) { + if (jj_3R_455()) { jj_scanpos = xsp; - if (jj_3R_449()) return true; + if (jj_3R_456()) return true; } } return false; } - private boolean jj_3R_448() { + private boolean jj_3R_455() { if (jj_scan_token(PLUS)) return true; - if (jj_3R_257()) return true; + if (jj_3R_267()) return true; return false; } - private boolean jj_3R_312() { + private boolean jj_3R_324() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_178() { - if (jj_3R_177()) return true; + private boolean jj_3R_182() { + if (jj_3R_181()) return true; return false; } - private boolean jj_3R_380() { + private boolean jj_3R_387() { if (jj_scan_token(NONE)) return true; return false; } - private boolean jj_3R_414() { - if (jj_3R_444()) return true; + private boolean jj_3R_421() { + if (jj_3R_450()) return true; return false; } - private boolean jj_3R_379() { + private boolean jj_3R_386() { if (jj_scan_token(TRUE)) return true; return false; } - private boolean jj_3R_451() { + private boolean jj_3R_458() { if (jj_scan_token(MINUS)) return true; - if (jj_3R_419()) return true; + if (jj_3R_426()) return true; return false; } - private boolean jj_3R_378() { + private boolean jj_3R_385() { if (jj_scan_token(FALSE)) return true; return false; } - private boolean jj_3R_377() { - if (jj_3R_258()) return true; + private boolean jj_3R_384() { + if (jj_3R_268()) return true; return false; } - private boolean jj_3R_450() { + private boolean jj_3R_457() { if (jj_scan_token(PLUS)) return true; - if (jj_3R_419()) return true; + if (jj_3R_426()) return true; return false; } - private boolean jj_3R_420() { + private boolean jj_3R_427() { Token xsp; xsp = jj_scanpos; - if (jj_3R_450()) { + if (jj_3R_457()) { jj_scanpos = xsp; - if (jj_3R_451()) return true; + if (jj_3R_458()) return true; } return false; } - private boolean jj_3R_261() { + private boolean jj_3R_271() { if (jj_scan_token(OR)) return true; - if (jj_3R_260()) return true; + if (jj_3R_270()) return true; return false; } - private boolean jj_3_18() { + private boolean jj_3_19() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_336() { - if (jj_3R_383()) return true; + private boolean jj_3R_343() { + if (jj_3R_390()) return true; return false; } - private boolean jj_3R_376() { - if (jj_3R_419()) return true; + private boolean jj_3R_383() { + if (jj_3R_426()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_420()) jj_scanpos = xsp; + if (jj_3R_427()) jj_scanpos = xsp; return false; } - private boolean jj_3R_334() { + private boolean jj_3R_341() { Token xsp; xsp = jj_scanpos; - if (jj_3R_376()) { + if (jj_3R_383()) { jj_scanpos = xsp; - if (jj_3R_377()) { + if (jj_3R_384()) { jj_scanpos = xsp; - if (jj_3R_378()) { + if (jj_3R_385()) { jj_scanpos = xsp; - if (jj_3R_379()) { + if (jj_3R_386()) { jj_scanpos = xsp; - if (jj_3R_380()) return true; + if (jj_3R_387()) return true; } } } @@ -12092,254 +12153,254 @@ private boolean jj_3R_334() { return false; } - private boolean jj_3R_413() { - if (jj_3R_153()) return true; + private boolean jj_3R_420() { + if (jj_3R_155()) return true; return false; } - private boolean jj_3R_296() { - if (jj_3R_338()) return true; + private boolean jj_3R_308() { + if (jj_3R_345()) return true; return false; } - private boolean jj_3R_295() { - if (jj_3R_337()) return true; + private boolean jj_3R_307() { + if (jj_3R_344()) return true; return false; } - private boolean jj_3R_294() { - if (jj_3R_335()) return true; + private boolean jj_3R_306() { + if (jj_3R_342()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_336()) jj_scanpos = xsp; + if (jj_3R_343()) jj_scanpos = xsp; return false; } - private boolean jj_3R_260() { + private boolean jj_3R_305() { + if (jj_3R_341()) return true; + return false; + } + + private boolean jj_3R_270() { Token xsp; xsp = jj_scanpos; - if (jj_3R_293()) { + if (jj_3R_305()) { jj_scanpos = xsp; - if (jj_3R_294()) { + if (jj_3R_306()) { jj_scanpos = xsp; - if (jj_3R_295()) { + if (jj_3R_307()) { jj_scanpos = xsp; - if (jj_3R_296()) return true; + if (jj_3R_308()) return true; } } } return false; } - private boolean jj_3R_293() { - if (jj_3R_334()) return true; - return false; - } - - private boolean jj_3R_250() { - if (jj_3R_262()) return true; + private boolean jj_3R_259() { + if (jj_3R_272()) return true; return false; } - private boolean jj_3R_545() { + private boolean jj_3R_546() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_249() { - if (jj_3R_260()) return true; + private boolean jj_3R_258() { + if (jj_3R_270()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_261()) { jj_scanpos = xsp; break; } + if (jj_3R_271()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_262() { + private boolean jj_3R_272() { if (jj_scan_token(AS)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_412() { - if (jj_3R_154()) return true; + private boolean jj_3R_419() { + if (jj_3R_156()) return true; return false; } - private boolean jj_3R_201() { + private boolean jj_3R_206() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_200()) return true; + if (jj_3R_205()) return true; return false; } - private boolean jj_3R_430() { + private boolean jj_3R_437() { if (jj_scan_token(FROM)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_291() { + private boolean jj_3R_303() { if (jj_scan_token(TRIPLE_FSTRING2)) return true; return false; } - private boolean jj_3R_290() { + private boolean jj_3R_302() { if (jj_scan_token(TRIPLE_FSTRING)) return true; return false; } - private boolean jj_3R_289() { + private boolean jj_3R_301() { if (jj_scan_token(SINGLE_FSTRING2)) return true; return false; } - private boolean jj_3R_550() { - if (jj_scan_token(COMMA)) return true; - return false; - } - - private boolean jj_3R_235() { - if (jj_3R_249()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_250()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_288() { + private boolean jj_3R_300() { if (jj_scan_token(SINGLE_FSTRING)) return true; return false; } - private boolean jj_3R_287() { + private boolean jj_3R_299() { if (jj_scan_token(TRIPLE_BSTRING2)) return true; return false; } - private boolean jj_3R_286() { - if (jj_scan_token(TRIPLE_BSTRING)) return true; + private boolean jj_3R_552() { + if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_393() { - if (jj_3R_59()) return true; + private boolean jj_3R_242() { + if (jj_3R_258()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_430()) jj_scanpos = xsp; + if (jj_3R_259()) jj_scanpos = xsp; return false; } - private boolean jj_3R_285() { + private boolean jj_3R_298() { + if (jj_scan_token(TRIPLE_BSTRING)) return true; + return false; + } + + private boolean jj_3R_297() { if (jj_scan_token(SINGLE_BSTRING2)) return true; return false; } - private boolean jj_3R_284() { + private boolean jj_3R_296() { if (jj_scan_token(SINGLE_BSTRING)) return true; return false; } - private boolean jj_3R_234() { - if (jj_scan_token(MULTIPLY)) return true; - if (jj_3R_72()) return true; + private boolean jj_3R_400() { + if (jj_3R_59()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_437()) jj_scanpos = xsp; return false; } - private boolean jj_3R_283() { + private boolean jj_3R_295() { if (jj_scan_token(TRIPLE_USTRING2)) return true; return false; } - private boolean jj_3R_411() { - if (jj_3R_443()) return true; + private boolean jj_3R_294() { + if (jj_scan_token(TRIPLE_USTRING)) return true; return false; } - private boolean jj_3R_282() { - if (jj_scan_token(TRIPLE_USTRING)) return true; + private boolean jj_3R_241() { + if (jj_scan_token(MULTIPLY)) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_281() { + private boolean jj_3R_293() { if (jj_scan_token(SINGLE_USTRING2)) return true; return false; } - private boolean jj_3R_221() { - if (jj_3R_235()) return true; + private boolean jj_3R_418() { + if (jj_3R_449()) return true; return false; } - private boolean jj_3R_280() { + private boolean jj_3R_292() { if (jj_scan_token(SINGLE_USTRING)) return true; return false; } - private boolean jj_3R_279() { + private boolean jj_3R_291() { if (jj_scan_token(TRIPLE_STRING2)) return true; return false; } - private boolean jj_3R_278() { + private boolean jj_3R_227() { + if (jj_3R_242()) return true; + return false; + } + + private boolean jj_3R_290() { if (jj_scan_token(TRIPLE_STRING)) return true; return false; } - private boolean jj_3R_200() { + private boolean jj_3R_289() { + if (jj_scan_token(SINGLE_STRING2)) return true; + return false; + } + + private boolean jj_3R_205() { Token xsp; xsp = jj_scanpos; - if (jj_3R_220()) { + if (jj_3R_226()) { jj_scanpos = xsp; - if (jj_3R_221()) return true; + if (jj_3R_227()) return true; } return false; } - private boolean jj_3R_220() { - if (jj_3R_234()) return true; - return false; - } - - private boolean jj_3R_277() { - if (jj_scan_token(SINGLE_STRING2)) return true; + private boolean jj_3R_226() { + if (jj_3R_241()) return true; return false; } - private boolean jj_3R_258() { + private boolean jj_3R_268() { Token xsp; xsp = jj_scanpos; - if (jj_3R_276()) { + if (jj_3R_288()) { jj_scanpos = xsp; - if (jj_3R_277()) { + if (jj_3R_289()) { jj_scanpos = xsp; - if (jj_3R_278()) { + if (jj_3R_290()) { jj_scanpos = xsp; - if (jj_3R_279()) { + if (jj_3R_291()) { jj_scanpos = xsp; - if (jj_3R_280()) { + if (jj_3R_292()) { jj_scanpos = xsp; - if (jj_3R_281()) { + if (jj_3R_293()) { jj_scanpos = xsp; - if (jj_3R_282()) { + if (jj_3R_294()) { jj_scanpos = xsp; - if (jj_3R_283()) { + if (jj_3R_295()) { jj_scanpos = xsp; - if (jj_3R_284()) { + if (jj_3R_296()) { jj_scanpos = xsp; - if (jj_3R_285()) { + if (jj_3R_297()) { jj_scanpos = xsp; - if (jj_3R_286()) { + if (jj_3R_298()) { jj_scanpos = xsp; - if (jj_3R_287()) { + if (jj_3R_299()) { jj_scanpos = xsp; - if (jj_3R_288()) { + if (jj_3R_300()) { jj_scanpos = xsp; - if (jj_3R_289()) { + if (jj_3R_301()) { jj_scanpos = xsp; - if (jj_3R_290()) { + if (jj_3R_302()) { jj_scanpos = xsp; - if (jj_3R_291()) return true; + if (jj_3R_303()) return true; } } } @@ -12358,165 +12419,168 @@ private boolean jj_3R_258() { return false; } - private boolean jj_3R_276() { + private boolean jj_3R_288() { if (jj_scan_token(SINGLE_STRING)) return true; return false; } - private boolean jj_3R_179() { - if (jj_3R_200()) return true; + private boolean jj_3R_183() { + if (jj_3R_205()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_201()) { jj_scanpos = xsp; break; } + if (jj_3R_206()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_202()) jj_scanpos = xsp; + if (jj_3R_207()) jj_scanpos = xsp; return false; } - private boolean jj_3R_158() { + private boolean jj_3R_160() { if (jj_scan_token(CASE)) return true; - if (jj_3R_179()) return true; + if (jj_3R_183()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_180()) jj_scanpos = xsp; + if (jj_3R_184()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_410() { - if (jj_3R_155()) return true; - return false; + private boolean jj_3R_417() { + if (jj_3R_157()) return true; + return false; } - private boolean jj_3R_177() { + private boolean jj_3R_181() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(30)) { jj_scanpos = xsp; if (jj_scan_token(33)) return true; } - if (jj_3R_140()) return true; + if (jj_3R_142()) return true; return false; } - private boolean jj_3R_156() { - if (jj_3R_177()) return true; + private boolean jj_3R_158() { + if (jj_3R_181()) return true; if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_178()) jj_scanpos = xsp; + if (jj_3R_182()) jj_scanpos = xsp; return false; } - private boolean jj_3R_117() { + private boolean jj_3R_118() { Token xsp; xsp = jj_scanpos; - if (jj_3R_156()) { + if (jj_3R_158()) { jj_scanpos = xsp; - if (jj_3R_157()) return true; + if (jj_3R_159()) return true; } return false; } - private boolean jj_3R_157() { - if (jj_3R_140()) return true; + private boolean jj_3R_159() { + if (jj_3R_142()) return true; return false; } - private boolean jj_3R_143() { - if (jj_3R_86()) return true; + private boolean jj_3R_145() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_97() { + private boolean jj_3R_98() { Token xsp; xsp = jj_scanpos; - if (jj_3R_143()) jj_scanpos = xsp; + if (jj_3R_145()) jj_scanpos = xsp; return false; } private boolean jj_3R_70() { if (jj_scan_token(MATCH)) return true; - if (jj_3R_117()) return true; + if (jj_3R_118()) return true; if (jj_scan_token(COLON)) return true; if (jj_scan_token(NEWLINE)) return true; if (jj_scan_token(INDENT)) return true; Token xsp; - if (jj_3R_118()) return true; + if (jj_3R_119()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_118()) { jj_scanpos = xsp; break; } + if (jj_3R_119()) { jj_scanpos = xsp; break; } } if (jj_scan_token(DEDENT)) return true; return false; } - private boolean jj_3R_463() { - if (jj_3R_433()) return true; + private boolean jj_3R_470() { + if (jj_3R_440()) return true; return false; } - private boolean jj_3R_409() { - if (jj_3R_442()) return true; + private boolean jj_3R_416() { + if (jj_3R_448()) return true; return false; } - private boolean jj_3R_522() { + private boolean jj_3R_528() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_72() { + private boolean jj_3R_73() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(101)) { + if (jj_scan_token(102)) { + jj_scanpos = xsp; + if (jj_scan_token(100)) { jj_scanpos = xsp; - if (jj_scan_token(99)) { + if (jj_scan_token(101)) { jj_scanpos = xsp; - if (jj_scan_token(100)) return true; + if (jj_scan_token(92)) return true; + } } } return false; } - private boolean jj_3R_551() { + private boolean jj_3R_553() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_555() { + private boolean jj_3R_557() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_408() { - if (jj_3R_441()) return true; + private boolean jj_3R_415() { + if (jj_3R_447()) return true; return false; } - private boolean jj_3R_372() { + private boolean jj_3R_379() { Token xsp; xsp = jj_scanpos; - if (jj_3R_408()) { + if (jj_3R_415()) { jj_scanpos = xsp; - if (jj_3R_409()) { + if (jj_3R_416()) { jj_scanpos = xsp; - if (jj_3R_410()) { + if (jj_3R_417()) { jj_scanpos = xsp; - if (jj_3R_411()) { + if (jj_3R_418()) { jj_scanpos = xsp; - if (jj_3R_412()) { + if (jj_3R_419()) { jj_scanpos = xsp; - if (jj_3R_413()) { + if (jj_3R_420()) { jj_scanpos = xsp; - if (jj_3R_414()) { + if (jj_3R_421()) { jj_scanpos = xsp; - if (jj_3R_415()) { + if (jj_3R_422()) { jj_scanpos = xsp; - if (jj_3R_416()) return true; + if (jj_3R_423()) return true; } } } @@ -12528,143 +12592,143 @@ private boolean jj_3R_372() { return false; } - private boolean jj_3R_315() { + private boolean jj_3R_327() { if (jj_scan_token(COMMA)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_96() { + private boolean jj_3R_97() { if (jj_scan_token(COLONEQUAL)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_275() { + private boolean jj_3R_287() { if (jj_scan_token(COMPLEX)) return true; return false; } - private boolean jj_3R_263() { + private boolean jj_3R_273() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_315()) jj_scanpos = xsp; + if (jj_3R_327()) jj_scanpos = xsp; return false; } - private boolean jj_3R_274() { + private boolean jj_3R_286() { if (jj_scan_token(FLOAT)) return true; return false; } - private boolean jj_3R_273() { + private boolean jj_3R_285() { if (jj_scan_token(DECNUMBER)) return true; return false; } - private boolean jj_3R_462() { + private boolean jj_3R_469() { if (jj_scan_token(AS)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_165() { + private boolean jj_3R_170() { if (jj_scan_token(NONLOCAL)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_18()) { jj_scanpos = xsp; break; } + if (jj_3_19()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_313()) jj_scanpos = xsp; + if (jj_3R_325()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_314()) jj_scanpos = xsp; + if (jj_3R_326()) jj_scanpos = xsp; return false; } - private boolean jj_3R_272() { + private boolean jj_3R_284() { if (jj_scan_token(OCTNUMBER)) return true; return false; } - private boolean jj_3R_474() { + private boolean jj_3R_480() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_496()) jj_scanpos = xsp; + if (jj_3R_502()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_164() { + private boolean jj_3R_169() { if (jj_scan_token(GLOBAL)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_312()) { jj_scanpos = xsp; break; } + if (jj_3R_324()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_88() { + private boolean jj_3R_89() { if (jj_scan_token(POWER)) return true; - if (jj_3R_137()) return true; + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_397() { - if (jj_3R_431()) return true; + private boolean jj_3R_404() { + if (jj_3R_438()) return true; return false; } - private boolean jj_3R_432() { + private boolean jj_3R_439() { if (jj_scan_token(AS)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_83() { + private boolean jj_3R_84() { if (jj_scan_token(POWER)) return true; - if (jj_3R_137()) return true; + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_271() { + private boolean jj_3R_283() { if (jj_scan_token(BINNUMBER)) return true; return false; } - private boolean jj_3R_433() { - if (jj_3R_72()) return true; + private boolean jj_3R_440() { + if (jj_3R_73()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_462()) jj_scanpos = xsp; + if (jj_3R_469()) jj_scanpos = xsp; return false; } - private boolean jj_3R_461() { + private boolean jj_3R_468() { if (jj_scan_token(DOT)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_257() { + private boolean jj_3R_267() { Token xsp; xsp = jj_scanpos; - if (jj_3R_270()) { + if (jj_3R_282()) { jj_scanpos = xsp; - if (jj_3R_271()) { + if (jj_3R_283()) { jj_scanpos = xsp; - if (jj_3R_272()) { + if (jj_3R_284()) { jj_scanpos = xsp; - if (jj_3R_273()) { + if (jj_3R_285()) { jj_scanpos = xsp; - if (jj_3R_274()) { + if (jj_3R_286()) { jj_scanpos = xsp; - if (jj_3R_275()) return true; + if (jj_3R_287()) return true; } } } @@ -12673,733 +12737,733 @@ private boolean jj_3R_257() { return false; } - private boolean jj_3R_270() { + private boolean jj_3R_282() { if (jj_scan_token(HEXNUMBER)) return true; return false; } - private boolean jj_3R_431() { - if (jj_3R_72()) return true; + private boolean jj_3R_438() { + if (jj_3R_73()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_461()) { jj_scanpos = xsp; break; } + if (jj_3R_468()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_38() { - if (jj_3R_95()) return true; + private boolean jj_3_39() { + if (jj_3R_96()) return true; return false; } - private boolean jj_3R_473() { - if (jj_3R_436()) return true; + private boolean jj_3R_479() { + if (jj_3R_161()) return true; return false; } - private boolean jj_3R_394() { - if (jj_3R_431()) return true; + private boolean jj_3R_401() { + if (jj_3R_438()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_432()) jj_scanpos = xsp; + if (jj_3R_439()) jj_scanpos = xsp; return false; } - private boolean jj_3R_95() { + private boolean jj_3R_96() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_142() { - if (jj_3R_174()) return true; + private boolean jj_3R_144() { + if (jj_3R_178()) return true; return false; } - private boolean jj_3R_141() { - if (jj_3R_173()) return true; + private boolean jj_3R_143() { + if (jj_3R_177()) return true; return false; } - private boolean jj_3R_90() { - if (jj_3R_138()) return true; + private boolean jj_3R_91() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_435() { + private boolean jj_3R_442() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_463()) jj_scanpos = xsp; + if (jj_3R_470()) jj_scanpos = xsp; return false; } - private boolean jj_3R_564() { - if (jj_3R_558()) return true; + private boolean jj_3R_567() { + if (jj_3R_561()) return true; return false; } - private boolean jj_3R_400() { + private boolean jj_3R_407() { if (jj_scan_token(LPAREN)) return true; - if (jj_3R_433()) return true; + if (jj_3R_440()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_435()) { jj_scanpos = xsp; break; } + if (jj_3R_442()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3_39() { + private boolean jj_3_40() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3_38()) { + if (jj_3_39()) { jj_scanpos = xsp; - if (jj_3R_96()) { + if (jj_3R_97()) { jj_scanpos = xsp; - if (jj_3R_97()) return true; + if (jj_3R_98()) return true; } } return false; } - private boolean jj_3R_434() { + private boolean jj_3R_441() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_433()) return true; + if (jj_3R_440()) return true; return false; } - private boolean jj_3R_94() { + private boolean jj_3R_95() { Token xsp; xsp = jj_scanpos; - if (jj_3_39()) { + if (jj_3_40()) { jj_scanpos = xsp; - if (jj_3R_141()) { + if (jj_3R_143()) { jj_scanpos = xsp; - if (jj_3R_142()) return true; + if (jj_3R_144()) return true; } } return false; } - private boolean jj_3R_89() { + private boolean jj_3R_90() { if (jj_3R_59()) return true; return false; } - private boolean jj_3R_85() { - if (jj_3R_138()) return true; + private boolean jj_3R_86() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_399() { - if (jj_3R_433()) return true; + private boolean jj_3R_406() { + if (jj_3R_440()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_434()) { jj_scanpos = xsp; break; } + if (jj_3R_441()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_398() { + private boolean jj_3R_405() { if (jj_scan_token(MULTIPLY)) return true; return false; } - private boolean jj_3R_84() { + private boolean jj_3R_85() { if (jj_3R_59()) return true; return false; } - private boolean jj_3R_395() { + private boolean jj_3R_402() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_394()) return true; + if (jj_3R_401()) return true; return false; } - private boolean jj_3_37() { + private boolean jj_3_38() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_94()) return true; + if (jj_3R_95()) return true; return false; } - private boolean jj_3R_478() { - if (jj_3R_498()) return true; + private boolean jj_3R_484() { + if (jj_3R_504()) return true; return false; } - private boolean jj_3R_396() { + private boolean jj_3R_403() { if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_370() { + private boolean jj_3R_377() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_396()) { jj_scanpos = xsp; break; } + if (jj_3R_403()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_397()) jj_scanpos = xsp; + if (jj_3R_404()) jj_scanpos = xsp; if (jj_scan_token(IMPORT)) return true; xsp = jj_scanpos; - if (jj_3R_398()) { + if (jj_3R_405()) { jj_scanpos = xsp; - if (jj_3R_399()) { + if (jj_3R_406()) { jj_scanpos = xsp; - if (jj_3R_400()) return true; + if (jj_3R_407()) return true; } } return false; } - private boolean jj_3R_173() { + private boolean jj_3R_177() { if (jj_scan_token(POWER)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_174() { + private boolean jj_3R_178() { if (jj_scan_token(MULTIPLY)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_477() { - if (jj_3R_153()) return true; + private boolean jj_3R_483() { + if (jj_3R_155()) return true; return false; } - private boolean jj_3R_508() { - if (jj_3R_94()) return true; + private boolean jj_3R_517() { + if (jj_3R_95()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_37()) { jj_scanpos = xsp; break; } + if (jj_3_38()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_522()) jj_scanpos = xsp; + if (jj_3R_528()) jj_scanpos = xsp; return false; } - private boolean jj_3R_369() { - if (jj_3R_394()) return true; + private boolean jj_3R_376() { + if (jj_3R_401()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_395()) { jj_scanpos = xsp; break; } + if (jj_3R_402()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_190() { + private boolean jj_3R_197() { if (jj_scan_token(FROM)) return true; - if (jj_3R_370()) return true; + if (jj_3R_377()) return true; return false; } - private boolean jj_3R_87() { + private boolean jj_3R_88() { if (jj_3R_59()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_444() { + private boolean jj_3R_450() { if (jj_scan_token(CLASS)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_473()) jj_scanpos = xsp; + if (jj_3R_479()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_474()) jj_scanpos = xsp; + if (jj_3R_480()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_181()) return true; + if (jj_3R_185()) return true; return false; } - private boolean jj_3R_189() { + private boolean jj_3R_196() { if (jj_scan_token(IMPORT)) return true; - if (jj_3R_369()) return true; + if (jj_3R_376()) return true; return false; } - private boolean jj_3_35() { + private boolean jj_3_36() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_91()) { + if (jj_3R_92()) { jj_scanpos = xsp; - if (jj_3R_92()) return true; + if (jj_3R_93()) return true; } return false; } - private boolean jj_3R_532() { + private boolean jj_3R_530() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_35()) { jj_scanpos = xsp; break; } + if (jj_3_36()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_539()) jj_scanpos = xsp; + if (jj_3R_540()) jj_scanpos = xsp; return false; } - private boolean jj_3R_92() { - if (jj_3R_138()) return true; + private boolean jj_3R_93() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_82() { + private boolean jj_3R_83() { if (jj_3R_59()) return true; if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_476() { - if (jj_3R_444()) return true; + private boolean jj_3R_482() { + if (jj_3R_450()) return true; return false; } - private boolean jj_3R_163() { + private boolean jj_3R_168() { Token xsp; xsp = jj_scanpos; - if (jj_3R_189()) { + if (jj_3R_196()) { jj_scanpos = xsp; - if (jj_3R_190()) return true; + if (jj_3R_197()) return true; } return false; } - private boolean jj_3R_339() { - if (jj_3R_387()) return true; + private boolean jj_3R_346() { + if (jj_3R_394()) return true; return false; } - private boolean jj_3R_498() { + private boolean jj_3R_504() { if (jj_scan_token(ASYNC)) return true; - if (jj_3R_153()) return true; + if (jj_3R_155()) return true; return false; } - private boolean jj_3R_211() { + private boolean jj_3R_219() { if (jj_scan_token(RAISE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_393()) jj_scanpos = xsp; + if (jj_3R_400()) jj_scanpos = xsp; return false; } - private boolean jj_3R_485() { - if (jj_3R_182()) return true; + private boolean jj_3R_492() { + if (jj_3R_189()) return true; return false; } - private boolean jj_3R_484() { + private boolean jj_3R_491() { if (jj_scan_token(FROM)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_93() { - if (jj_3R_86()) return true; + private boolean jj_3R_94() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_445() { - if (jj_3R_475()) return true; + private boolean jj_3R_451() { + if (jj_3R_481()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_476()) { + if (jj_3R_482()) { jj_scanpos = xsp; - if (jj_3R_477()) { + if (jj_3R_483()) { jj_scanpos = xsp; - if (jj_3R_478()) return true; + if (jj_3R_484()) return true; } } return false; } - private boolean jj_3R_91() { - if (jj_3R_140()) return true; + private boolean jj_3R_92() { + if (jj_3R_142()) return true; return false; } - private boolean jj_3R_561() { - if (jj_3R_562()) return true; + private boolean jj_3R_564() { + if (jj_3R_565()) return true; return false; } - private boolean jj_3R_539() { - if (jj_3R_387()) return true; + private boolean jj_3R_540() { + if (jj_3R_394()) return true; return false; } - private boolean jj_3R_368() { - if (jj_3R_387()) return true; + private boolean jj_3R_375() { + if (jj_3R_394()) return true; return false; } - private boolean jj_3R_562() { + private boolean jj_3R_565() { if (jj_scan_token(IF)) return true; - if (jj_3R_563()) return true; + if (jj_3R_566()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_564()) jj_scanpos = xsp; + if (jj_3R_567()) jj_scanpos = xsp; return false; } - private boolean jj_3R_81() { - if (jj_3R_138()) return true; + private boolean jj_3R_82() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_460() { + private boolean jj_3R_467() { Token xsp; xsp = jj_scanpos; - if (jj_3R_484()) { + if (jj_3R_491()) { jj_scanpos = xsp; - if (jj_3R_485()) return true; + if (jj_3R_492()) return true; } return false; } - private boolean jj_3R_544() { + private boolean jj_3R_545() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_33()) { jj_scanpos = xsp; break; } + if (jj_3_34()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_33() { + private boolean jj_3_34() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_89()) { + if (jj_3R_90()) { jj_scanpos = xsp; - if (jj_3R_90()) return true; + if (jj_3R_91()) return true; } return false; } - private boolean jj_3R_428() { - if (jj_3R_460()) return true; + private boolean jj_3R_435() { + if (jj_3R_467()) return true; return false; } - private boolean jj_3R_86() { + private boolean jj_3R_87() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(77)) jj_scanpos = xsp; if (jj_scan_token(FOR)) return true; - if (jj_3R_139()) return true; + if (jj_3R_141()) return true; if (jj_scan_token(IN)) return true; - if (jj_3R_148()) return true; + if (jj_3R_150()) return true; xsp = jj_scanpos; - if (jj_3R_554()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_319() { - if (jj_scan_token(COMMA)) return true; + if (jj_3R_556()) jj_scanpos = xsp; return false; } - private boolean jj_3_36() { + private boolean jj_3_37() { Token xsp; - if (jj_3R_93()) return true; + if (jj_3R_94()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_93()) { jj_scanpos = xsp; break; } + if (jj_3R_94()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_80() { + private boolean jj_3R_331() { + if (jj_scan_token(COMMA)) return true; + return false; + } + + private boolean jj_3R_81() { if (jj_3R_59()) return true; return false; } - private boolean jj_3R_560() { - if (jj_3R_86()) return true; + private boolean jj_3R_563() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_558() { + private boolean jj_3R_561() { Token xsp; xsp = jj_scanpos; - if (jj_3R_560()) { + if (jj_3R_563()) { jj_scanpos = xsp; - if (jj_3R_561()) return true; + if (jj_3R_564()) return true; } return false; } - private boolean jj_3R_168() { - if (jj_3R_138()) return true; + private boolean jj_3R_173() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_167() { - if (jj_3R_140()) return true; + private boolean jj_3R_172() { + if (jj_3R_142()) return true; return false; } - private boolean jj_3R_549() { + private boolean jj_3R_551() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_30()) { jj_scanpos = xsp; break; } + if (jj_3_31()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_30() { + private boolean jj_3_31() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_84()) { + if (jj_3R_85()) { jj_scanpos = xsp; - if (jj_3R_85()) return true; + if (jj_3R_86()) return true; } return false; } - private boolean jj_3R_79() { - if (jj_3R_138()) return true; + private boolean jj_3R_80() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_132() { + private boolean jj_3R_135() { if (jj_scan_token(YIELD)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_428()) jj_scanpos = xsp; + if (jj_3R_435()) jj_scanpos = xsp; return false; } - private boolean jj_3R_133() { + private boolean jj_3R_136() { Token xsp; xsp = jj_scanpos; - if (jj_3R_167()) { + if (jj_3R_172()) { jj_scanpos = xsp; - if (jj_3R_168()) return true; + if (jj_3R_173()) return true; } xsp = jj_scanpos; - if (jj_3_36()) { + if (jj_3_37()) { jj_scanpos = xsp; - if (jj_3R_532()) return true; + if (jj_3R_530()) return true; } return false; } - private boolean jj_3R_401() { + private boolean jj_3R_408() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_78() { - if (jj_3R_137()) return true; + private boolean jj_3R_79() { + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_429() { - if (jj_3R_387()) return true; + private boolean jj_3R_436() { + if (jj_3R_394()) return true; return false; } - private boolean jj_3R_392() { - if (jj_3R_182()) return true; + private boolean jj_3R_399() { + if (jj_3R_189()) return true; return false; } - private boolean jj_3R_210() { - if (jj_3R_132()) return true; + private boolean jj_3R_218() { + if (jj_3R_135()) return true; return false; } private boolean jj_3R_67() { - if (jj_3R_111()) return true; + if (jj_3R_112()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_319()) jj_scanpos = xsp; + if (jj_3R_331()) jj_scanpos = xsp; return false; } - private boolean jj_3R_225() { + private boolean jj_3R_234() { if (jj_scan_token(RETURN)) return true; return false; } - private boolean jj_3_34() { - if (jj_3R_86()) return true; + private boolean jj_3_35() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_427() { - if (jj_3R_371()) return true; + private boolean jj_3R_434() { + if (jj_3R_378()) return true; return false; } - private boolean jj_3R_209() { - if (jj_3R_225()) return true; + private boolean jj_3R_217() { + if (jj_3R_234()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_392()) jj_scanpos = xsp; + if (jj_3R_399()) jj_scanpos = xsp; return false; } - private boolean jj_3_32() { + private boolean jj_3_33() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_87()) { + if (jj_3R_88()) { jj_scanpos = xsp; - if (jj_3R_88()) return true; + if (jj_3R_89()) return true; } return false; } - private boolean jj_3R_543() { + private boolean jj_3R_544() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_32()) { jj_scanpos = xsp; break; } + if (jj_3_33()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_551()) jj_scanpos = xsp; + if (jj_3R_553()) jj_scanpos = xsp; return false; } - private boolean jj_3R_535() { - if (jj_3R_138()) return true; + private boolean jj_3R_533() { + if (jj_3R_140()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3_34()) { + if (jj_3_35()) { jj_scanpos = xsp; - if (jj_3R_544()) return true; + if (jj_3R_545()) return true; } xsp = jj_scanpos; - if (jj_3R_545()) jj_scanpos = xsp; + if (jj_3R_546()) jj_scanpos = xsp; return false; } - private boolean jj_3R_542() { - if (jj_3R_86()) return true; + private boolean jj_3R_543() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3_29() { + private boolean jj_3_30() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_82()) { + if (jj_3R_83()) { jj_scanpos = xsp; - if (jj_3R_83()) return true; + if (jj_3R_84()) return true; } return false; } - private boolean jj_3R_548() { + private boolean jj_3R_550() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_29()) { jj_scanpos = xsp; break; } + if (jj_3_30()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_555()) jj_scanpos = xsp; + if (jj_3R_557()) jj_scanpos = xsp; return false; } - private boolean jj_3R_536() { - if (jj_3R_387()) return true; + private boolean jj_3R_534() { + if (jj_3R_394()) return true; return false; } - private boolean jj_3_31() { - if (jj_3R_86()) return true; + private boolean jj_3_32() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_547() { - if (jj_3R_86()) return true; + private boolean jj_3R_549() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_541() { + private boolean jj_3R_542() { Token xsp; xsp = jj_scanpos; - if (jj_3_31()) { + if (jj_3_32()) { jj_scanpos = xsp; - if (jj_3R_549()) return true; + if (jj_3R_551()) return true; } xsp = jj_scanpos; - if (jj_3R_550()) jj_scanpos = xsp; + if (jj_3R_552()) jj_scanpos = xsp; return false; } - private boolean jj_3R_188() { - if (jj_3R_211()) return true; + private boolean jj_3R_195() { + if (jj_3R_219()) return true; return false; } - private boolean jj_3R_187() { - if (jj_3R_210()) return true; + private boolean jj_3R_194() { + if (jj_3R_218()) return true; return false; } - private boolean jj_3R_534() { + private boolean jj_3R_532() { if (jj_scan_token(POWER)) return true; - if (jj_3R_137()) return true; + if (jj_3R_121()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_542()) { + if (jj_3R_543()) { jj_scanpos = xsp; - if (jj_3R_543()) return true; + if (jj_3R_544()) return true; } return false; } - private boolean jj_3R_426() { - if (jj_3R_132()) return true; + private boolean jj_3R_433() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_186() { - if (jj_3R_209()) return true; + private boolean jj_3R_193() { + if (jj_3R_217()) return true; return false; } - private boolean jj_3R_391() { - if (jj_3R_182()) return true; + private boolean jj_3R_398() { + if (jj_3R_189()) return true; return false; } - private boolean jj_3R_185() { + private boolean jj_3R_192() { if (jj_scan_token(CONTINUE)) return true; return false; } - private boolean jj_3R_162() { + private boolean jj_3R_167() { Token xsp; xsp = jj_scanpos; - if (jj_3R_184()) { + if (jj_3R_191()) { jj_scanpos = xsp; - if (jj_3R_185()) { + if (jj_3R_192()) { jj_scanpos = xsp; - if (jj_3R_186()) { + if (jj_3R_193()) { jj_scanpos = xsp; - if (jj_3R_187()) { + if (jj_3R_194()) { jj_scanpos = xsp; - if (jj_3R_188()) return true; + if (jj_3R_195()) return true; } } } @@ -13407,502 +13471,502 @@ private boolean jj_3R_162() { return false; } - private boolean jj_3R_184() { + private boolean jj_3R_191() { if (jj_scan_token(BREAK)) return true; return false; } - private boolean jj_3R_366() { - if (jj_3R_389()) return true; + private boolean jj_3R_373() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_364() { - if (jj_3R_389()) return true; + private boolean jj_3R_371() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_362() { - if (jj_3R_389()) return true; + private boolean jj_3R_369() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_360() { - if (jj_3R_389()) return true; + private boolean jj_3R_367() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_358() { - if (jj_3R_389()) return true; + private boolean jj_3R_365() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_356() { - if (jj_3R_389()) return true; + private boolean jj_3R_363() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_388() { + private boolean jj_3R_395() { if (jj_scan_token(EQUAL)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_426()) { + if (jj_3R_433()) { jj_scanpos = xsp; - if (jj_3R_427()) return true; + if (jj_3R_434()) return true; } return false; } - private boolean jj_3R_354() { - if (jj_3R_389()) return true; + private boolean jj_3R_361() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_161() { + private boolean jj_3R_166() { if (jj_scan_token(PASS)) return true; return false; } - private boolean jj_3R_352() { - if (jj_3R_389()) return true; + private boolean jj_3R_359() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_350() { - if (jj_3R_389()) return true; + private boolean jj_3R_357() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_540() { + private boolean jj_3R_541() { if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_547()) { + if (jj_3R_549()) { jj_scanpos = xsp; - if (jj_3R_548()) return true; + if (jj_3R_550()) return true; } return false; } - private boolean jj_3R_348() { - if (jj_3R_389()) return true; + private boolean jj_3R_355() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_346() { - if (jj_3R_389()) return true; + private boolean jj_3R_353() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_344() { - if (jj_3R_389()) return true; + private boolean jj_3R_351() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_390() { - if (jj_3R_132()) return true; + private boolean jj_3R_397() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_342() { - if (jj_3R_389()) return true; + private boolean jj_3R_349() { + if (jj_3R_396()) return true; return false; } - private boolean jj_3R_365() { - if (jj_3R_132()) return true; + private boolean jj_3R_372() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_183() { + private boolean jj_3R_190() { if (jj_scan_token(DEL)) return true; return false; } - private boolean jj_3R_363() { - if (jj_3R_132()) return true; + private boolean jj_3R_370() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_361() { - if (jj_3R_132()) return true; + private boolean jj_3R_368() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_359() { - if (jj_3R_132()) return true; + private boolean jj_3R_366() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_160() { - if (jj_3R_183()) return true; - if (jj_3R_139()) return true; + private boolean jj_3R_165() { + if (jj_3R_190()) return true; + if (jj_3R_141()) return true; return false; } - private boolean jj_3R_357() { - if (jj_3R_132()) return true; + private boolean jj_3R_364() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_355() { - if (jj_3R_132()) return true; + private boolean jj_3R_362() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_353() { - if (jj_3R_132()) return true; + private boolean jj_3R_360() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_533() { + private boolean jj_3R_531() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_540()) { + if (jj_3R_541()) { jj_scanpos = xsp; - if (jj_3R_541()) return true; + if (jj_3R_542()) return true; } return false; } - private boolean jj_3R_524() { + private boolean jj_3R_520() { Token xsp; xsp = jj_scanpos; - if (jj_3R_533()) { + if (jj_3R_531()) { jj_scanpos = xsp; - if (jj_3R_534()) { + if (jj_3R_532()) { jj_scanpos = xsp; - if (jj_3R_535()) return true; + if (jj_3R_533()) return true; } } return false; } - private boolean jj_3R_351() { - if (jj_3R_132()) return true; + private boolean jj_3R_358() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3_28() { + private boolean jj_3_29() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_80()) { + if (jj_3R_81()) { jj_scanpos = xsp; - if (jj_3R_81()) return true; + if (jj_3R_82()) return true; } return false; } - private boolean jj_3R_349() { - if (jj_3R_132()) return true; + private boolean jj_3R_356() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_347() { - if (jj_3R_132()) return true; + private boolean jj_3R_354() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_340() { + private boolean jj_3R_347() { if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_388()) jj_scanpos = xsp; + if (jj_3R_395()) jj_scanpos = xsp; return false; } - private boolean jj_3R_345() { - if (jj_3R_132()) return true; + private boolean jj_3R_352() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_343() { - if (jj_3R_132()) return true; + private boolean jj_3R_350() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_341() { - if (jj_3R_132()) return true; + private boolean jj_3R_348() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_367() { + private boolean jj_3R_374() { if (jj_scan_token(EQUAL)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_390()) { + if (jj_3R_397()) { jj_scanpos = xsp; - if (jj_3R_391()) return true; + if (jj_3R_398()) return true; } return false; } - private boolean jj_3R_311() { + private boolean jj_3R_323() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_367()) { jj_scanpos = xsp; break; } + if (jj_3R_374()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_417() { - if (jj_3R_387()) return true; - return false; - } - - private boolean jj_3R_310() { + private boolean jj_3R_322() { if (jj_scan_token(POWEREQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_365()) { + if (jj_3R_372()) { jj_scanpos = xsp; - if (jj_3R_366()) return true; + if (jj_3R_373()) return true; } return false; } - private boolean jj_3R_309() { + private boolean jj_3R_321() { if (jj_scan_token(RSHIFTEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_363()) { + if (jj_3R_370()) { jj_scanpos = xsp; - if (jj_3R_364()) return true; + if (jj_3R_371()) return true; } return false; } - private boolean jj_3R_308() { + private boolean jj_3R_320() { if (jj_scan_token(LSHIFTEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_361()) { + if (jj_3R_368()) { jj_scanpos = xsp; - if (jj_3R_362()) return true; + if (jj_3R_369()) return true; } return false; } - private boolean jj_3R_307() { + private boolean jj_3R_424() { + if (jj_3R_394()) return true; + return false; + } + + private boolean jj_3R_319() { if (jj_scan_token(XOREQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_359()) { + if (jj_3R_366()) { jj_scanpos = xsp; - if (jj_3R_360()) return true; + if (jj_3R_367()) return true; } return false; } - private boolean jj_3R_306() { + private boolean jj_3R_318() { if (jj_scan_token(OREQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_357()) { + if (jj_3R_364()) { jj_scanpos = xsp; - if (jj_3R_358()) return true; + if (jj_3R_365()) return true; } return false; } - private boolean jj_3_25() { + private boolean jj_3_26() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_78()) { + if (jj_3R_79()) { jj_scanpos = xsp; - if (jj_3R_79()) return true; + if (jj_3R_80()) return true; } return false; } - private boolean jj_3R_208() { - if (jj_3R_138()) return true; + private boolean jj_3R_216() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_305() { + private boolean jj_3R_317() { if (jj_scan_token(ANDEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_355()) { + if (jj_3R_362()) { jj_scanpos = xsp; - if (jj_3R_356()) return true; + if (jj_3R_363()) return true; } return false; } - private boolean jj_3_13() { - if (jj_scan_token(COMMA)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_67()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_304() { + private boolean jj_3R_316() { if (jj_scan_token(MODULOEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_353()) { + if (jj_3R_360()) { jj_scanpos = xsp; - if (jj_3R_354()) return true; + if (jj_3R_361()) return true; } return false; } - private boolean jj_3R_303() { + private boolean jj_3R_315() { if (jj_scan_token(FLOORDIVIDEEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_351()) { + if (jj_3R_358()) { jj_scanpos = xsp; - if (jj_3R_352()) return true; + if (jj_3R_359()) return true; } return false; } - private boolean jj_3R_302() { + private boolean jj_3R_314() { if (jj_scan_token(DIVIDEEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_349()) { + if (jj_3R_356()) { jj_scanpos = xsp; - if (jj_3R_350()) return true; + if (jj_3R_357()) return true; } return false; } - private boolean jj_3R_559() { + private boolean jj_3_13() { + if (jj_scan_token(COMMA)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_67()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_562() { if (jj_3R_59()) return true; return false; } - private boolean jj_3R_301() { + private boolean jj_3R_313() { if (jj_scan_token(DOTEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_347()) { + if (jj_3R_354()) { jj_scanpos = xsp; - if (jj_3R_348()) return true; + if (jj_3R_355()) return true; } return false; } - private boolean jj_3R_300() { + private boolean jj_3R_312() { if (jj_scan_token(MULTIPLYEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_345()) { + if (jj_3R_352()) { jj_scanpos = xsp; - if (jj_3R_346()) return true; + if (jj_3R_353()) return true; } return false; } - private boolean jj_3R_138() { + private boolean jj_3R_140() { if (jj_scan_token(MULTIPLY)) return true; - if (jj_3R_137()) return true; + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_299() { + private boolean jj_3R_311() { if (jj_scan_token(MINUSEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_343()) { + if (jj_3R_350()) { jj_scanpos = xsp; - if (jj_3R_344()) return true; + if (jj_3R_351()) return true; } return false; } - private boolean jj_3_27() { + private boolean jj_3_28() { if (jj_scan_token(COMMA)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_207() { + private boolean jj_3R_215() { if (jj_3R_59()) return true; return false; } - private boolean jj_3R_298() { + private boolean jj_3R_310() { if (jj_scan_token(PLUSEQ)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_341()) { + if (jj_3R_348()) { jj_scanpos = xsp; - if (jj_3R_342()) return true; + if (jj_3R_349()) return true; } return false; } - private boolean jj_3R_297() { - if (jj_3R_340()) return true; + private boolean jj_3R_309() { + if (jj_3R_347()) return true; return false; } - private boolean jj_3R_182() { + private boolean jj_3R_189() { Token xsp; xsp = jj_scanpos; - if (jj_3R_207()) { + if (jj_3R_215()) { jj_scanpos = xsp; - if (jj_3R_208()) return true; + if (jj_3R_216()) return true; } while (true) { xsp = jj_scanpos; - if (jj_3_28()) { jj_scanpos = xsp; break; } + if (jj_3_29()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_339()) jj_scanpos = xsp; + if (jj_3R_346()) jj_scanpos = xsp; return false; } - private boolean jj_3R_387() { + private boolean jj_3R_394() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_159() { - if (jj_3R_182()) return true; + private boolean jj_3R_164() { + if (jj_3R_189()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_297()) { + if (jj_3R_309()) { jj_scanpos = xsp; - if (jj_3R_298()) { + if (jj_3R_310()) { jj_scanpos = xsp; - if (jj_3R_299()) { + if (jj_3R_311()) { jj_scanpos = xsp; - if (jj_3R_300()) { + if (jj_3R_312()) { jj_scanpos = xsp; - if (jj_3R_301()) { + if (jj_3R_313()) { jj_scanpos = xsp; - if (jj_3R_302()) { + if (jj_3R_314()) { jj_scanpos = xsp; - if (jj_3R_303()) { + if (jj_3R_315()) { jj_scanpos = xsp; - if (jj_3R_304()) { + if (jj_3R_316()) { jj_scanpos = xsp; - if (jj_3R_305()) { + if (jj_3R_317()) { jj_scanpos = xsp; - if (jj_3R_306()) { + if (jj_3R_318()) { jj_scanpos = xsp; - if (jj_3R_307()) { + if (jj_3R_319()) { jj_scanpos = xsp; - if (jj_3R_308()) { + if (jj_3R_320()) { jj_scanpos = xsp; - if (jj_3R_309()) { + if (jj_3R_321()) { jj_scanpos = xsp; - if (jj_3R_310()) { + if (jj_3R_322()) { jj_scanpos = xsp; - if (jj_3R_311()) return true; + if (jj_3R_323()) return true; } } } @@ -13920,162 +13984,156 @@ private boolean jj_3R_159() { return false; } - private boolean jj_3_26() { + private boolean jj_3_27() { if (jj_scan_token(COMMA)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_193() { + private boolean jj_3R_199() { if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_557() { - if (jj_3R_193()) return true; + private boolean jj_3R_559() { + if (jj_3R_199()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_559()) jj_scanpos = xsp; + if (jj_3R_562()) jj_scanpos = xsp; return false; } - private boolean jj_3R_172() { - if (jj_3R_138()) return true; + private boolean jj_3R_176() { + if (jj_3R_140()) return true; return false; } - private boolean jj_3R_371() { + private boolean jj_3R_378() { if (jj_3R_59()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_27()) { jj_scanpos = xsp; break; } + if (jj_3_28()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_401()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_528() { - if (jj_scan_token(COMMA)) return true; + if (jj_3R_408()) jj_scanpos = xsp; return false; } - private boolean jj_3R_389() { + private boolean jj_3R_396() { if (jj_3R_59()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_26()) { jj_scanpos = xsp; break; } + if (jj_3_27()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_429()) jj_scanpos = xsp; + if (jj_3R_436()) jj_scanpos = xsp; return false; } - private boolean jj_3R_152() { - if (jj_scan_token(MULTIPLY)) return true; - if (jj_scan_token(MULTIPLY)) return true; + private boolean jj_3R_129() { + if (jj_scan_token(ASSERT)) return true; + if (jj_3R_273()) return true; return false; } - private boolean jj_3R_64() { - if (jj_3R_108()) return true; + private boolean jj_3R_536() { + if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_266() { - if (jj_3R_72()) return true; + private boolean jj_3R_128() { + if (jj_3R_170()) return true; return false; } - private boolean jj_3R_446() { - if (jj_scan_token(COMMA)) return true; + private boolean jj_3R_175() { + if (jj_3R_121()) return true; return false; } - private boolean jj_3R_126() { - if (jj_scan_token(ASSERT)) return true; - if (jj_3R_263()) return true; + private boolean jj_3R_154() { + if (jj_scan_token(MULTIPLY)) return true; + if (jj_scan_token(MULTIPLY)) return true; return false; } - private boolean jj_3R_125() { - if (jj_3R_165()) return true; + private boolean jj_3R_127() { + if (jj_3R_169()) return true; return false; } - private boolean jj_3R_171() { - if (jj_3R_137()) return true; + private boolean jj_3R_64() { + if (jj_3R_109()) return true; return false; } - private boolean jj_3R_124() { - if (jj_3R_164()) return true; + private boolean jj_3R_281() { + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_139() { + private boolean jj_3R_141() { Token xsp; xsp = jj_scanpos; - if (jj_3R_171()) { + if (jj_3R_175()) { jj_scanpos = xsp; - if (jj_3R_172()) return true; + if (jj_3R_176()) return true; } while (true) { xsp = jj_scanpos; - if (jj_3_25()) { jj_scanpos = xsp; break; } + if (jj_3_26()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_368()) jj_scanpos = xsp; + if (jj_3R_375()) jj_scanpos = xsp; return false; } - private boolean jj_3R_556() { + private boolean jj_3R_558() { if (jj_3R_59()) return true; return false; } - private boolean jj_3R_123() { - if (jj_3R_163()) return true; + private boolean jj_3R_453() { + if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3_17() { + private boolean jj_3R_126() { + if (jj_3R_168()) return true; + return false; + } + + private boolean jj_3_18() { if (jj_scan_token(SEMICOLON)) return true; - if (jj_3R_71()) return true; + if (jj_3R_72()) return true; return false; } - private boolean jj_3R_122() { - if (jj_3R_162()) return true; + private boolean jj_3R_125() { + if (jj_3R_167()) return true; return false; } - private boolean jj_3R_121() { - if (jj_3R_161()) return true; + private boolean jj_3R_124() { + if (jj_3R_166()) return true; return false; } - private boolean jj_3R_120() { - if (jj_3R_160()) return true; + private boolean jj_3R_123() { + if (jj_3R_165()) return true; return false; } - private boolean jj_3R_119() { - if (jj_3R_159()) return true; + private boolean jj_3R_122() { + if (jj_3R_164()) return true; return false; } - private boolean jj_3R_71() { + private boolean jj_3R_72() { Token xsp; xsp = jj_scanpos; - if (jj_3R_119()) { - jj_scanpos = xsp; - if (jj_3R_120()) { - jj_scanpos = xsp; - if (jj_3R_121()) { - jj_scanpos = xsp; if (jj_3R_122()) { jj_scanpos = xsp; if (jj_3R_123()) { @@ -14084,7 +14142,13 @@ private boolean jj_3R_71() { jj_scanpos = xsp; if (jj_3R_125()) { jj_scanpos = xsp; - if (jj_3R_126()) return true; + if (jj_3R_126()) { + jj_scanpos = xsp; + if (jj_3R_127()) { + jj_scanpos = xsp; + if (jj_3R_128()) { + jj_scanpos = xsp; + if (jj_3R_129()) return true; } } } @@ -14095,163 +14159,173 @@ private boolean jj_3R_71() { return false; } - private boolean jj_3R_552() { - if (jj_3R_169()) return true; + private boolean jj_3R_554() { + if (jj_3R_174()) return true; return false; } - private boolean jj_3_24() { + private boolean jj_3_25() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_77()) return true; + if (jj_3R_78()) return true; return false; } - private boolean jj_3R_169() { - if (jj_3R_193()) return true; + private boolean jj_3R_174() { + if (jj_3R_199()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_556()) jj_scanpos = xsp; + if (jj_3R_558()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_557()) jj_scanpos = xsp; + if (jj_3R_559()) jj_scanpos = xsp; return false; } - private boolean jj_3R_236() { + private boolean jj_3R_243() { if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_136() { - if (jj_3R_169()) return true; + private boolean jj_3R_139() { + if (jj_3R_174()) return true; return false; } - private boolean jj_3R_135() { + private boolean jj_3R_138() { if (jj_3R_59()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_552()) jj_scanpos = xsp; + if (jj_3R_554()) jj_scanpos = xsp; return false; } - private boolean jj_3R_222() { - if (jj_3R_71()) return true; + private boolean jj_3R_228() { + if (jj_3R_72()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_17()) { jj_scanpos = xsp; break; } + if (jj_3_18()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_236()) jj_scanpos = xsp; + if (jj_3R_243()) jj_scanpos = xsp; if (jj_scan_token(NEWLINE)) return true; return false; } - private boolean jj_3R_134() { + private boolean jj_3R_137() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_77() { + private boolean jj_3R_78() { Token xsp; xsp = jj_scanpos; - if (jj_3R_134()) { + if (jj_3R_137()) { jj_scanpos = xsp; - if (jj_3R_135()) { + if (jj_3R_138()) { jj_scanpos = xsp; - if (jj_3R_136()) return true; + if (jj_3R_139()) return true; } } return false; } private boolean jj_3R_63() { - if (jj_3R_107()) return true; + if (jj_3R_108()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_528()) jj_scanpos = xsp; + if (jj_3R_536()) jj_scanpos = xsp; return false; } - private boolean jj_3R_418() { - if (jj_3R_111()) return true; + private boolean jj_3R_425() { + if (jj_3R_112()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_446()) jj_scanpos = xsp; + if (jj_3R_453()) jj_scanpos = xsp; return false; } - private boolean jj_3R_526() { - if (jj_3R_77()) return true; + private boolean jj_3R_522() { + if (jj_3R_78()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_24()) { jj_scanpos = xsp; break; } + if (jj_3_25()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_536()) jj_scanpos = xsp; + if (jj_3R_534()) jj_scanpos = xsp; return false; } - private boolean jj_3R_568() { - if (jj_3R_216()) return true; + private boolean jj_3R_571() { + if (jj_3R_222()) return true; return false; } - private boolean jj_3R_317() { - if (jj_3R_372()) return true; + private boolean jj_3R_329() { + if (jj_3R_379()) return true; return false; } - private boolean jj_3_16() { - if (jj_3R_70()) return true; + private boolean jj_3_17() { + if (jj_3R_71()) return true; return false; } - private boolean jj_3R_316() { - if (jj_3R_222()) return true; + private boolean jj_3R_328() { + if (jj_3R_228()) return true; return false; } - private boolean jj_3R_264() { + private boolean jj_3R_274() { Token xsp; xsp = jj_scanpos; - if (jj_3R_316()) { + if (jj_3R_328()) { jj_scanpos = xsp; - if (jj_3R_317()) return true; + if (jj_3R_329()) return true; } return false; } - private boolean jj_3R_252() { - if (jj_3R_264()) return true; + private boolean jj_3_16() { + if (jj_3R_70()) return true; return false; } - private boolean jj_3R_567() { + private boolean jj_3R_262() { + if (jj_3R_274()) return true; + return false; + } + + private boolean jj_3R_570() { if (jj_scan_token(LAMBDA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_568()) jj_scanpos = xsp; + if (jj_3R_571()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; - if (jj_3R_563()) return true; + if (jj_3R_566()) return true; return false; } - private boolean jj_3R_195() { - if (jj_3R_216()) return true; + private boolean jj_3R_200() { + if (jj_3R_222()) return true; return false; } - private boolean jj_3R_251() { - if (jj_3R_70()) return true; + private boolean jj_3R_261() { + if (jj_3R_71()) return true; return false; } - private boolean jj_3R_513() { - if (jj_3R_258()) return true; + private boolean jj_3R_507() { + if (jj_3R_268()) return true; + return false; + } + + private boolean jj_3R_260() { + if (jj_3R_70()) return true; return false; } @@ -14260,95 +14334,103 @@ private boolean jj_3_15() { return false; } - private boolean jj_3R_237() { + private boolean jj_3R_244() { Token xsp; xsp = jj_scanpos; if (jj_3_15()) { jj_scanpos = xsp; - if (jj_3R_251()) { + if (jj_3R_260()) { + jj_scanpos = xsp; + if (jj_3R_261()) { jj_scanpos = xsp; - if (jj_3R_252()) return true; + if (jj_3R_262()) return true; + } } } return false; } - private boolean jj_3R_147() { + private boolean jj_3R_149() { if (jj_scan_token(LAMBDA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_195()) jj_scanpos = xsp; + if (jj_3R_200()) jj_scanpos = xsp; if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3_14() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_68()) return true; - return false; - } - - private boolean jj_3R_375() { - if (jj_scan_token(COMMA)) return true; - return false; - } - - private boolean jj_3R_247() { - if (jj_3R_258()) return true; + private boolean jj_3R_257() { + if (jj_3R_268()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_513()) { jj_scanpos = xsp; break; } + if (jj_3R_507()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_246() { - if (jj_3R_257()) return true; + private boolean jj_3_14() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_68()) return true; return false; } - private boolean jj_3R_113() { - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_373()) return true; - if (jj_scan_token(RPAREN)) return true; + private boolean jj_3R_256() { + if (jj_3R_267()) return true; return false; } - private boolean jj_3R_244() { + private boolean jj_3R_382() { + if (jj_scan_token(COMMA)) return true; + return false; + } + + private boolean jj_3R_254() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_245() { - if (jj_3R_72()) return true; + private boolean jj_3R_255() { + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_243() { + private boolean jj_3R_253() { if (jj_scan_token(NONE)) return true; return false; } - private boolean jj_3R_76() { - if (jj_3R_133()) return true; + private boolean jj_3R_77() { + if (jj_3R_136()) return true; return false; } - private boolean jj_3R_242() { + private boolean jj_3R_252() { if (jj_scan_token(TRUE)) return true; return false; } - private boolean jj_3R_241() { + private boolean jj_3R_114() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_380()) return true; + if (jj_scan_token(RPAREN)) return true; + return false; + } + + private boolean jj_3R_251() { if (jj_scan_token(FALSE)) return true; return false; } - private boolean jj_3R_373() { + private boolean jj_3R_506() { + if (jj_3R_520()) return true; + return false; + } + + private boolean jj_3R_380() { if (jj_3R_68()) return true; Token xsp; while (true) { @@ -14356,43 +14438,43 @@ private boolean jj_3R_373() { if (jj_3_14()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_417()) jj_scanpos = xsp; + if (jj_3R_424()) jj_scanpos = xsp; return false; } - private boolean jj_3R_253() { + private boolean jj_3R_266() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_265() { + private boolean jj_3R_280() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_512() { - if (jj_3R_524()) return true; + 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_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_318() { + private boolean jj_3R_330() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_240() { - if (jj_scan_token(LBRACE)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_512()) jj_scanpos = xsp; - if (jj_scan_token(RBRACE)) return true; + private boolean jj_3R_505() { + if (jj_3R_136()) return true; return false; } - private boolean jj_3R_112() { - if (jj_3R_72()) return true; + private boolean jj_3R_113() { + if (jj_3R_73()) return true; return false; } @@ -14405,32 +14487,32 @@ private boolean jj_3_12() { private boolean jj_3R_68() { Token xsp; xsp = jj_scanpos; - if (jj_3R_112()) { + if (jj_3R_113()) { jj_scanpos = xsp; - if (jj_3R_113()) return true; + if (jj_3R_114()) return true; } return false; } - private boolean jj_3R_511() { - if (jj_3R_133()) return true; + 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_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_108() { + private boolean jj_3R_109() { if (jj_3R_68()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_265()) jj_scanpos = xsp; + if (jj_3R_280()) jj_scanpos = xsp; return false; } - private boolean jj_3R_239() { - if (jj_scan_token(LBRACKET)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_511()) jj_scanpos = xsp; - if (jj_scan_token(RBRACKET)) return true; + private boolean jj_3R_76() { + if (jj_3R_135()) return true; return false; } @@ -14438,36 +14520,31 @@ private boolean jj_3R_65() { if (jj_3R_68()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_318()) jj_scanpos = xsp; + if (jj_3R_330()) jj_scanpos = xsp; return false; } - private boolean jj_3R_374() { + private boolean jj_3R_381() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_418()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_75() { - if (jj_3R_132()) return true; + if (jj_3R_425()) jj_scanpos = xsp; return false; } - private boolean jj_3R_151() { + private boolean jj_3R_153() { if (jj_scan_token(POWER)) return true; return false; } - private boolean jj_3R_111() { + private boolean jj_3R_112() { Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) { + if (jj_3R_153()) { jj_scanpos = xsp; - if (jj_3R_152()) return true; + if (jj_3R_154()) return true; } - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } @@ -14477,11 +14554,11 @@ private boolean jj_3_10() { return false; } - private boolean jj_3R_110() { - if (jj_3R_111()) return true; + private boolean jj_3R_111() { + if (jj_3R_112()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_375()) jj_scanpos = xsp; + if (jj_3R_382()) jj_scanpos = xsp; return false; } @@ -14496,98 +14573,86 @@ private boolean jj_3_9() { return false; } - private boolean jj_3R_150() { - if (jj_scan_token(MULTIPLY)) return true; + private boolean jj_3_24() { + if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_266()) jj_scanpos = xsp; + if (jj_3R_76()) { + jj_scanpos = xsp; + if (jj_3R_77()) return true; + } + if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3_23() { - if (jj_scan_token(LPAREN)) return true; + private boolean jj_3R_152() { + if (jj_scan_token(MULTIPLY)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_75()) { - jj_scanpos = xsp; - if (jj_3R_76()) return true; - } - if (jj_scan_token(RPAREN)) return true; + if (jj_3R_281()) jj_scanpos = xsp; return false; } - private boolean jj_3R_109() { - if (jj_3R_150()) return true; + private boolean jj_3R_110() { + if (jj_3R_152()) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_3_10()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_374()) jj_scanpos = xsp; + if (jj_3R_381()) jj_scanpos = xsp; return false; } private boolean jj_3R_66() { Token xsp; xsp = jj_scanpos; - if (jj_3R_109()) { + if (jj_3R_110()) { jj_scanpos = xsp; - if (jj_3R_110()) return true; - } - return false; - } - - private boolean jj_3R_232() { if (jj_3R_111()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_253()) jj_scanpos = xsp; + } return false; } - private boolean jj_3R_231() { - if (jj_3R_150()) return true; + private boolean jj_3R_239() { + if (jj_3R_112()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_12()) { jj_scanpos = xsp; break; } - } xsp = jj_scanpos; - if (jj_3_13()) jj_scanpos = xsp; + if (jj_3R_266()) jj_scanpos = xsp; return false; } - private boolean jj_3_22() { + private boolean jj_3_23() { if (jj_scan_token(LPAREN)) return true; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_228() { + private boolean jj_3R_236() { Token xsp; xsp = jj_scanpos; - if (jj_3_22()) { - jj_scanpos = xsp; if (jj_3_23()) { jj_scanpos = xsp; - if (jj_3R_239()) { + if (jj_3_24()) { jj_scanpos = xsp; - if (jj_3R_240()) { + if (jj_3R_249()) { jj_scanpos = xsp; - if (jj_3R_241()) { + if (jj_3R_250()) { jj_scanpos = xsp; - if (jj_3R_242()) { + if (jj_3R_251()) { + jj_scanpos = xsp; + if (jj_3R_252()) { jj_scanpos = xsp; - if (jj_3R_243()) { + if (jj_3R_253()) { jj_scanpos = xsp; - if (jj_3R_244()) { + if (jj_3R_254()) { jj_scanpos = xsp; - if (jj_3R_245()) { + if (jj_3R_255()) { jj_scanpos = xsp; - if (jj_3R_246()) { + if (jj_3R_256()) { jj_scanpos = xsp; - if (jj_3R_247()) return true; + if (jj_3R_257()) return true; } } } @@ -14601,6 +14666,18 @@ private boolean jj_3R_228() { return false; } + private boolean jj_3R_238() { + if (jj_3R_152()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_12()) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_3_13()) jj_scanpos = xsp; + return false; + } + private boolean jj_3_7() { if (jj_scan_token(COMMA)) return true; Token xsp; @@ -14617,32 +14694,39 @@ private boolean jj_3_11() { return false; } - private boolean jj_3R_516() { + private boolean jj_3R_510() { if (jj_scan_token(DOT)) return true; - if (jj_3R_72()) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_499() { - if (jj_3R_500()) return true; + private boolean jj_3R_485() { + if (jj_3R_486()) return true; return false; } - private boolean jj_3R_216() { + private boolean jj_3R_509() { + if (jj_scan_token(LBRACKET)) return true; + if (jj_3R_522()) return true; + if (jj_scan_token(RBRACKET)) return true; + return false; + } + + private boolean jj_3R_222() { Token xsp; xsp = jj_scanpos; - if (jj_3R_230()) { + if (jj_3R_237()) { jj_scanpos = xsp; - if (jj_3R_231()) { + if (jj_3R_238()) { jj_scanpos = xsp; - if (jj_3R_232()) return true; + if (jj_3R_239()) return true; } } return false; } - private boolean jj_3R_230() { - if (jj_3R_108()) return true; + private boolean jj_3R_237() { + if (jj_3R_109()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -14653,201 +14737,188 @@ private boolean jj_3R_230() { return false; } - private boolean jj_3R_515() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_526()) return true; - if (jj_scan_token(RBRACKET)) return true; - return false; - } - - private boolean jj_3R_518() { - if (jj_3R_104()) return true; - return false; - } - - private boolean jj_3R_525() { - if (jj_3R_508()) return true; - return false; - } - - private boolean jj_3R_60() { - if (jj_3R_103()) return true; + private boolean jj_3R_524() { + if (jj_3R_105()) return true; return false; } - private boolean jj_3R_553() { - if (jj_scan_token(COMMA)) return true; + private boolean jj_3R_521() { + if (jj_3R_517()) return true; return false; } - private boolean jj_3R_514() { + private boolean jj_3R_508() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_525()) jj_scanpos = xsp; + if (jj_3R_521()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_500() { + private boolean jj_3R_486() { Token xsp; xsp = jj_scanpos; - if (jj_3R_514()) { + if (jj_3R_508()) { jj_scanpos = xsp; - if (jj_3R_515()) { + if (jj_3R_509()) { jj_scanpos = xsp; - if (jj_3R_516()) return true; + if (jj_3R_510()) return true; } } return false; } - private boolean jj_3R_479() { - if (jj_3R_500()) return true; + private boolean jj_3R_60() { + if (jj_3R_104()) return true; return false; } - private boolean jj_3R_227() { - if (jj_scan_token(AWAIT)) return true; - if (jj_3R_228()) return true; + private boolean jj_3R_560() { + if (jj_scan_token(COMMA)) return true; + return false; + } + + private boolean jj_3R_452() { + if (jj_3R_486()) return true; + return false; + } + + private boolean jj_3R_235() { + if (jj_scan_token(AWAIT)) return true; + if (jj_3R_236()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_499()) { jj_scanpos = xsp; break; } + if (jj_3R_485()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_21() { + private boolean jj_3_22() { if (jj_scan_token(POWER)) return true; - if (jj_3R_74()) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_214() { - if (jj_3R_228()) return true; + private boolean jj_3R_221() { + if (jj_3R_236()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_479()) { jj_scanpos = xsp; break; } + if (jj_3R_452()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_546() { - if (jj_3R_107()) return true; + private boolean jj_3R_198() { Token xsp; xsp = jj_scanpos; - if (jj_3R_553()) jj_scanpos = xsp; + if (jj_3R_220()) { + jj_scanpos = xsp; + if (jj_3R_221()) return true; + } return false; } - private boolean jj_3R_192() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_213()) { - jj_scanpos = xsp; - if (jj_3R_214()) return true; - } + private boolean jj_3R_220() { + if (jj_3R_235()) return true; return false; } - private boolean jj_3R_213() { - if (jj_3R_227()) return true; + private boolean jj_3R_555() { + if (jj_3R_108()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_560()) jj_scanpos = xsp; return false; } - private boolean jj_3R_166() { - if (jj_3R_192()) return true; + private boolean jj_3R_171() { + if (jj_3R_198()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_21()) { jj_scanpos = xsp; break; } + if (jj_3_22()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_131() { - if (jj_3R_166()) return true; + private boolean jj_3R_134() { + if (jj_3R_171()) return true; return false; } - private boolean jj_3R_130() { + private boolean jj_3R_133() { if (jj_scan_token(NOT)) return true; - if (jj_3R_74()) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_324() { - if (jj_scan_token(FLOORDIVIDE)) return true; - if (jj_3R_74()) return true; - return false; - } - - private boolean jj_3R_129() { + private boolean jj_3R_132() { if (jj_scan_token(MINUS)) return true; - if (jj_3R_74()) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_323() { - if (jj_scan_token(MODULO)) return true; - if (jj_3R_74()) return true; + private boolean jj_3R_279() { + if (jj_scan_token(FLOORDIVIDE)) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_128() { + private boolean jj_3R_131() { if (jj_scan_token(PLUS)) return true; - if (jj_3R_74()) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_74() { + private boolean jj_3R_75() { Token xsp; xsp = jj_scanpos; - if (jj_3R_128()) { + if (jj_3R_131()) { jj_scanpos = xsp; - if (jj_3R_129()) { + if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_130()) { + if (jj_3R_133()) { jj_scanpos = xsp; - if (jj_3R_131()) return true; + if (jj_3R_134()) return true; } } } return false; } - private boolean jj_3R_322() { - if (jj_scan_token(DIVIDE)) return true; - if (jj_3R_74()) return true; + private boolean jj_3R_278() { + if (jj_scan_token(MODULO)) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_321() { - if (jj_scan_token(AT)) return true; - if (jj_3R_74()) return true; + private boolean jj_3R_277() { + if (jj_scan_token(DIVIDE)) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_320() { - if (jj_scan_token(MULTIPLY)) return true; - if (jj_3R_74()) return true; + private boolean jj_3R_276() { + if (jj_scan_token(AT)) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_267() { + private boolean jj_3R_263() { Token xsp; xsp = jj_scanpos; - if (jj_3R_320()) { + if (jj_3R_275()) { jj_scanpos = xsp; - if (jj_3R_321()) { + if (jj_3R_276()) { jj_scanpos = xsp; - if (jj_3R_322()) { + if (jj_3R_277()) { jj_scanpos = xsp; - if (jj_3R_323()) { + if (jj_3R_278()) { jj_scanpos = xsp; - if (jj_3R_324()) return true; + if (jj_3R_279()) return true; } } } @@ -14855,195 +14926,211 @@ private boolean jj_3R_267() { return false; } - private boolean jj_3_8() { - if (jj_scan_token(COLON)) return true; - if (jj_3R_59()) return true; + private boolean jj_3R_275() { + if (jj_scan_token(MULTIPLY)) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_527() { - if (jj_scan_token(EQUAL)) return true; + private boolean jj_3_8() { + if (jj_scan_token(COLON)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_254() { + private boolean jj_3R_246() { Token xsp; xsp = jj_scanpos; - if (jj_3R_268()) { + if (jj_3R_264()) { jj_scanpos = xsp; - if (jj_3R_269()) return true; + if (jj_3R_265()) return true; } return false; } - private boolean jj_3R_268() { + private boolean jj_3R_264() { if (jj_scan_token(PLUS)) return true; - if (jj_3R_248()) return true; + if (jj_3R_245()) return true; return false; } - private boolean jj_3R_104() { - if (jj_3R_72()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3_8()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_238() { + private boolean jj_3R_233() { Token xsp; xsp = jj_scanpos; - if (jj_3R_255()) { + if (jj_3R_247()) { jj_scanpos = xsp; - if (jj_3R_256()) return true; + if (jj_3R_248()) return true; } return false; } - private boolean jj_3R_248() { - if (jj_3R_74()) return true; + private boolean jj_3R_245() { + if (jj_3R_75()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_267()) { jj_scanpos = xsp; break; } + if (jj_3R_263()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_255() { + private boolean jj_3R_247() { if (jj_scan_token(LSHIFT)) return true; - if (jj_3R_229()) return true; + if (jj_3R_232()) return true; return false; } - private boolean jj_3R_538() { + private boolean jj_3R_535() { + if (jj_scan_token(EQUAL)) return true; + if (jj_3R_59()) return true; + return false; + } + + private boolean jj_3R_105() { + if (jj_3R_73()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3_8()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_548() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_517() { + private boolean jj_3R_523() { if (jj_scan_token(EQUAL)) return true; if (jj_3R_59()) return true; return false; } - private boolean jj_3R_269() { + private boolean jj_3R_265() { if (jj_scan_token(MINUS)) return true; - if (jj_3R_248()) return true; + if (jj_3R_245()) return true; return false; } - private boolean jj_3R_61() { - if (jj_3R_104()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_527()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_226() { + private boolean jj_3R_214() { if (jj_scan_token(AND)) return true; - if (jj_3R_215()) return true; + if (jj_3R_213()) return true; return false; } - private boolean jj_3R_229() { - if (jj_3R_248()) return true; + private boolean jj_3R_232() { + if (jj_3R_245()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_254()) { jj_scanpos = xsp; break; } + if (jj_3R_246()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_505() { - if (jj_scan_token(COMMA)) return true; - return false; - } - - private boolean jj_3R_523() { - if (jj_3R_508()) return true; - return false; - } - - private boolean jj_3R_103() { - if (jj_3R_104()) return true; + private boolean jj_3R_61() { + if (jj_3R_105()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_517()) jj_scanpos = xsp; + if (jj_3R_535()) jj_scanpos = xsp; return false; } - private boolean jj_3_6() { + private boolean jj_3R_514() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_61()) return true; return false; } - private boolean jj_3R_212() { + private boolean jj_3R_188() { if (jj_scan_token(XOR)) return true; - if (jj_3R_194()) return true; + if (jj_3R_187()) return true; return false; } - private boolean jj_3R_256() { + private boolean jj_3R_248() { if (jj_scan_token(RSHIFT)) return true; - if (jj_3R_229()) return true; + if (jj_3R_232()) return true; return false; } - private boolean jj_3R_215() { - if (jj_3R_229()) return true; + private boolean jj_3R_213() { + if (jj_3R_232()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_238()) { jj_scanpos = xsp; break; } + if (jj_3R_233()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_107() { - if (jj_scan_token(POWER)) return true; - if (jj_3R_104()) return true; + private boolean jj_3R_104() { + if (jj_3R_105()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_523()) jj_scanpos = xsp; return false; } - private boolean jj_3R_191() { + private boolean jj_3_6() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_61()) return true; + return false; + } + + private boolean jj_3R_163() { if (jj_scan_token(OR)) return true; - if (jj_3R_170()) return true; + if (jj_3R_162()) return true; return false; } - private boolean jj_3R_219() { - if (jj_3R_233()) return true; + private boolean jj_3R_225() { + if (jj_3R_240()) return true; return false; } - private boolean jj_3R_194() { - if (jj_3R_215()) return true; + private boolean jj_3R_108() { + if (jj_scan_token(POWER)) return true; + if (jj_3R_105()) return true; + return false; + } + + private boolean jj_3R_529() { + if (jj_3R_517()) return true; + return false; + } + + private boolean jj_3R_187() { + if (jj_3R_213()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_226()) { jj_scanpos = xsp; break; } + if (jj_3R_214()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_537() { + private boolean jj_3R_547() { if (jj_scan_token(COMMA)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_546()) jj_scanpos = xsp; + if (jj_3R_555()) jj_scanpos = xsp; return false; } - private boolean jj_3R_149() { + private boolean jj_3R_151() { if (jj_scan_token(MULTIPLY)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_518()) jj_scanpos = xsp; + if (jj_3R_524()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_162() { + if (jj_3R_187()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_188()) { jj_scanpos = xsp; break; } + } return false; } @@ -15064,21 +15151,100 @@ private boolean jj_3_3() { return false; } + private boolean jj_3R_107() { + if (jj_3R_108()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_548()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_121() { + if (jj_3R_162()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_163()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_340() { + if (jj_scan_token(IS)) return true; + return false; + } + private boolean jj_3R_106() { + if (jj_3R_151()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_4()) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_3R_547()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_62() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_106()) { + jj_scanpos = xsp; if (jj_3R_107()) return true; + } + return false; + } + + private boolean jj_3R_495() { + if (jj_3R_108()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_538()) jj_scanpos = xsp; + if (jj_3R_514()) jj_scanpos = xsp; return false; } - private boolean jj_3R_170() { - if (jj_3R_194()) return true; + private boolean jj_3_21() { + if (jj_scan_token(IS)) return true; + if (jj_scan_token(NOT_BOOL)) return true; + return false; + } + + private boolean jj_3R_494() { + if (jj_3R_151()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_212()) { jj_scanpos = xsp; break; } + if (jj_3_6()) { jj_scanpos = xsp; break; } } + xsp = jj_scanpos; + if (jj_3_7()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_339() { + if (jj_scan_token(NOT_BOOL)) return true; + if (jj_scan_token(IN)) return true; + return false; + } + + private boolean jj_3R_338() { + if (jj_scan_token(IN)) return true; + return false; + } + + private boolean jj_3R_337() { + if (jj_scan_token(NOTEQUAL)) return true; + return false; + } + + private boolean jj_3R_336() { + if (jj_scan_token(EQLESS)) return true; + return false; + } + + private boolean jj_3R_335() { + if (jj_scan_token(EQGREATER)) return true; return false; } @@ -15092,7 +15258,7 @@ private boolean jj_3R_170() { private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[212]; + final private int[] jj_la1 = new int[213]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -15108,24 +15274,24 @@ private boolean jj_3R_170() { jj_la1_init_5(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x40,0x200000,0x20000000,0x5a2a0000,0x20000,0x0,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,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,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x20,0x20,0x0,0x0,0x0,0x22,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,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,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0xdffef399,0xdffef399,0x0,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,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,0x0,0x80004009,0x0,0x0,0x2100,0x0,0x0,0x0,0x0,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,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,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x1fbf,0x1fbf,0x0,0x0,0x0,0x1fbb,0x0,0x4,0x38,0x0,0x38,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,0x0,0x1fbb,0x0,0x0,0x0,0x0,0x0,0x1f80,0x38,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,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,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0x7fff80,0x7fff80,0x0,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,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,0x0,0x7fff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fff80,}; + 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,}; } 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,}; + 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,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[39]; + final private JJCalls[] jj_2_rtns = new JJCalls[40]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -15137,7 +15303,7 @@ public PythonGrammar312(boolean generateTree, FastCharStream stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 212; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -15152,7 +15318,7 @@ public PythonGrammar312(boolean generateTree, PythonGrammar312TokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 212; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -15267,12 +15433,12 @@ private void jj_add_error_token(int kind, int pos) { /** Generate ParseException. */ public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[182]; + boolean[] la1tokens = new boolean[183]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 212; i++) { + for (int i = 0; i < 213; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<", "", "", - "", "", "", "", @@ -449,6 +451,7 @@ public interface PythonGrammar312Constants { "", "", "", + "", "\"\\\'\"", "\"\\\"\"", "\"\\\'\\\'\\\'\"", @@ -466,21 +469,21 @@ public interface PythonGrammar312Constants { "\"\\\'\\\'\\\'\"", "\"\\\"\\\"\\\"\"", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\\\\\\r\\n\"", - "", + "", "\"\"", "\"\"", "\"\"", @@ -489,13 +492,13 @@ public interface PythonGrammar312Constants { "\"\"", "\"\"", "\"\"", - "", "", + "", "\"\\r\\n\"", "\"\\n\"", "\"\\r\"", - "", "", + "", }; } diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312TokenManager.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312TokenManager.java index 53d188e8ca..eb55384756 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312TokenManager.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/PythonGrammar312TokenManager.java @@ -224,18 +224,18 @@ private final int jjStopStringLiteralDfa_20(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x200000L) != 0L) + if ((active2 & 0x400000L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x200000L) != 0L) + if ((active2 & 0x400000L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -254,12 +254,12 @@ private int jjMoveStringLiteralDfa0_20() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_20(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_20(0x4000000000000L); case 39: - return jjMoveStringLiteralDfa1_20(0x200000L); + return jjMoveStringLiteralDfa1_20(0x400000L); default : return jjMoveNfa_20(0, 0); } @@ -274,11 +274,11 @@ private int jjMoveStringLiteralDfa1_20(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 39: - return jjMoveStringLiteralDfa2_20(active2, 0x200000L); + return jjMoveStringLiteralDfa2_20(active2, 0x400000L); default : break; } @@ -296,8 +296,8 @@ private int jjMoveStringLiteralDfa2_20(long old2, long active2) switch(curChar) { case 39: - if ((active2 & 0x200000L) != 0L) - return jjStopAtPos(2, 149); + if ((active2 & 0x400000L) != 0L) + return jjStopAtPos(2, 150); break; default : break; @@ -323,13 +323,13 @@ private int jjMoveNfa_20(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -342,8 +342,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -352,8 +352,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -371,13 +371,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -400,16 +400,16 @@ private final int jjStopStringLiteralDfa_18(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x8000000L) != 0L) + if ((active2 & 0x10000000L) != 0L) { - jjmatchedKind = 175; + jjmatchedKind = 176; return 2; } return -1; case 1: - if ((active2 & 0x8000000L) != 0L) + if ((active2 & 0x10000000L) != 0L) { - jjmatchedKind = 156; + jjmatchedKind = 157; jjmatchedPos = 1; return -1; } @@ -427,9 +427,9 @@ private int jjMoveStringLiteralDfa0_18() switch(curChar) { case 39: - return jjStopAtPos(0, 147); + return jjStopAtPos(0, 148); case 92: - return jjMoveStringLiteralDfa1_18(0x8000000L); + return jjMoveStringLiteralDfa1_18(0x10000000L); default : return jjMoveNfa_18(0, 0); } @@ -444,7 +444,7 @@ private int jjMoveStringLiteralDfa1_18(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_18(active2, 0x8000000L); + return jjMoveStringLiteralDfa2_18(active2, 0x10000000L); default : break; } @@ -462,8 +462,8 @@ private int jjMoveStringLiteralDfa2_18(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x8000000L) != 0L) - return jjStopAtPos(2, 155); + if ((active2 & 0x10000000L) != 0L) + return jjStopAtPos(2, 156); break; default : break; @@ -489,24 +489,24 @@ private int jjMoveNfa_18(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 175) - kind = 175; + if ((0xffffffffffffdbffL & l) != 0L && kind > 176) + kind = 176; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 156) - kind = 156; + if (kind > 157) + kind = 157; } else if (curChar == 39) { - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; } break; case 3: - if (curChar == 39 && kind > 175) - kind = 175; + if (curChar == 39 && kind > 176) + kind = 176; break; default : break; } @@ -520,14 +520,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 175) - kind = 175; + if (curChar == 92 && kind > 176) + kind = 176; break; case 1: if (curChar == 92) @@ -549,8 +549,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 175) - kind = 175; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) + kind = 176; break; default : break; } @@ -578,18 +578,18 @@ private final int jjStopStringLiteralDfa_9(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x400L) != 0L) + if ((active2 & 0x800L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x400L) != 0L) + if ((active2 & 0x800L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -608,12 +608,12 @@ private int jjMoveStringLiteralDfa0_9() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_9(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_9(0x4000000000000L); case 34: - return jjMoveStringLiteralDfa1_9(0x400L); + return jjMoveStringLiteralDfa1_9(0x800L); default : return jjMoveNfa_9(0, 0); } @@ -628,11 +628,11 @@ private int jjMoveStringLiteralDfa1_9(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 34: - return jjMoveStringLiteralDfa2_9(active2, 0x400L); + return jjMoveStringLiteralDfa2_9(active2, 0x800L); default : break; } @@ -650,8 +650,8 @@ private int jjMoveStringLiteralDfa2_9(long old2, long active2) switch(curChar) { case 34: - if ((active2 & 0x400L) != 0L) - return jjStopAtPos(2, 138); + if ((active2 & 0x800L) != 0L) + return jjStopAtPos(2, 139); break; default : break; @@ -677,13 +677,13 @@ private int jjMoveNfa_9(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -696,8 +696,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -706,8 +706,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -725,13 +725,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -754,16 +754,16 @@ private final int jjStopStringLiteralDfa_7(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x2000000L) != 0L) + if ((active2 & 0x4000000L) != 0L) { - jjmatchedKind = 176; + jjmatchedKind = 177; return 2; } return -1; case 1: - if ((active2 & 0x2000000L) != 0L) + if ((active2 & 0x4000000L) != 0L) { - jjmatchedKind = 154; + jjmatchedKind = 155; jjmatchedPos = 1; return -1; } @@ -781,9 +781,9 @@ private int jjMoveStringLiteralDfa0_7() switch(curChar) { case 34: - return jjStopAtPos(0, 136); + return jjStopAtPos(0, 137); case 92: - return jjMoveStringLiteralDfa1_7(0x2000000L); + return jjMoveStringLiteralDfa1_7(0x4000000L); default : return jjMoveNfa_7(0, 0); } @@ -798,7 +798,7 @@ private int jjMoveStringLiteralDfa1_7(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_7(active2, 0x2000000L); + return jjMoveStringLiteralDfa2_7(active2, 0x4000000L); default : break; } @@ -816,8 +816,8 @@ private int jjMoveStringLiteralDfa2_7(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000L) != 0L) - return jjStopAtPos(2, 153); + if ((active2 & 0x4000000L) != 0L) + return jjStopAtPos(2, 154); break; default : break; @@ -843,24 +843,24 @@ private int jjMoveNfa_7(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 176) - kind = 176; + if ((0xffffffffffffdbffL & l) != 0L && kind > 177) + kind = 177; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 154) - kind = 154; + if (kind > 155) + kind = 155; } else if (curChar == 34) { - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; } break; case 3: - if (curChar == 34 && kind > 176) - kind = 176; + if (curChar == 34 && kind > 177) + kind = 177; break; default : break; } @@ -874,14 +874,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 176) - kind = 176; + if (curChar == 92 && kind > 177) + kind = 177; break; case 1: if (curChar == 92) @@ -903,8 +903,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) - kind = 176; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 177) + kind = 177; break; default : break; } @@ -932,18 +932,18 @@ private final int jjStopStringLiteralDfa_16(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x20000L) != 0L) + if ((active2 & 0x40000L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x20000L) != 0L) + if ((active2 & 0x40000L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -962,12 +962,12 @@ private int jjMoveStringLiteralDfa0_16() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_16(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_16(0x4000000000000L); case 39: - return jjMoveStringLiteralDfa1_16(0x20000L); + return jjMoveStringLiteralDfa1_16(0x40000L); default : return jjMoveNfa_16(0, 0); } @@ -982,11 +982,11 @@ private int jjMoveStringLiteralDfa1_16(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 39: - return jjMoveStringLiteralDfa2_16(active2, 0x20000L); + return jjMoveStringLiteralDfa2_16(active2, 0x40000L); default : break; } @@ -1004,8 +1004,8 @@ private int jjMoveStringLiteralDfa2_16(long old2, long active2) switch(curChar) { case 39: - if ((active2 & 0x20000L) != 0L) - return jjStopAtPos(2, 145); + if ((active2 & 0x40000L) != 0L) + return jjStopAtPos(2, 146); break; default : break; @@ -1031,13 +1031,13 @@ private int jjMoveNfa_16(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -1050,8 +1050,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -1060,8 +1060,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -1079,13 +1079,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -1108,18 +1108,18 @@ private final int jjStopStringLiteralDfa_21(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x400000L) != 0L) + if ((active2 & 0x800000L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x400000L) != 0L) + if ((active2 & 0x800000L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -1138,12 +1138,12 @@ private int jjMoveStringLiteralDfa0_21() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_21(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_21(0x4000000000000L); case 34: - return jjMoveStringLiteralDfa1_21(0x400000L); + return jjMoveStringLiteralDfa1_21(0x800000L); default : return jjMoveNfa_21(0, 0); } @@ -1158,11 +1158,11 @@ private int jjMoveStringLiteralDfa1_21(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 34: - return jjMoveStringLiteralDfa2_21(active2, 0x400000L); + return jjMoveStringLiteralDfa2_21(active2, 0x800000L); default : break; } @@ -1180,8 +1180,8 @@ private int jjMoveStringLiteralDfa2_21(long old2, long active2) switch(curChar) { case 34: - if ((active2 & 0x400000L) != 0L) - return jjStopAtPos(2, 150); + if ((active2 & 0x800000L) != 0L) + return jjStopAtPos(2, 151); break; default : break; @@ -1207,13 +1207,13 @@ private int jjMoveNfa_21(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -1226,8 +1226,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -1236,8 +1236,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -1255,13 +1255,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -1288,16 +1288,16 @@ private final int jjStopStringLiteralDfa_14(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x800000000L) != 0L) + if ((active2 & 0x1000000000L) != 0L) { - jjmatchedKind = 175; + jjmatchedKind = 176; return 2; } return -1; case 1: - if ((active2 & 0x800000000L) != 0L) + if ((active2 & 0x1000000000L) != 0L) { - jjmatchedKind = 164; + jjmatchedKind = 165; jjmatchedPos = 1; return -1; } @@ -1315,9 +1315,9 @@ private int jjMoveStringLiteralDfa0_14() switch(curChar) { case 39: - return jjStopAtPos(0, 143); + return jjStopAtPos(0, 144); case 92: - return jjMoveStringLiteralDfa1_14(0x800000000L); + return jjMoveStringLiteralDfa1_14(0x1000000000L); default : return jjMoveNfa_14(0, 0); } @@ -1332,7 +1332,7 @@ private int jjMoveStringLiteralDfa1_14(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_14(active2, 0x800000000L); + return jjMoveStringLiteralDfa2_14(active2, 0x1000000000L); default : break; } @@ -1350,8 +1350,8 @@ private int jjMoveStringLiteralDfa2_14(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x800000000L) != 0L) - return jjStopAtPos(2, 163); + if ((active2 & 0x1000000000L) != 0L) + return jjStopAtPos(2, 164); break; default : break; @@ -1377,24 +1377,24 @@ private int jjMoveNfa_14(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 175) - kind = 175; + if ((0xffffffffffffdbffL & l) != 0L && kind > 176) + kind = 176; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 164) - kind = 164; + if (kind > 165) + kind = 165; } else if (curChar == 39) { - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; } break; case 3: - if (curChar == 39 && kind > 175) - kind = 175; + if (curChar == 39 && kind > 176) + kind = 176; break; default : break; } @@ -1408,14 +1408,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 175) - kind = 175; + if (curChar == 92 && kind > 176) + kind = 176; break; case 1: if (curChar == 92) @@ -1437,8 +1437,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 175) - kind = 175; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) + kind = 176; break; default : break; } @@ -1462,18 +1462,18 @@ private final int jjStopStringLiteralDfa_12(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x2000L) != 0L) + if ((active2 & 0x4000L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x2000L) != 0L) + if ((active2 & 0x4000L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -1492,12 +1492,12 @@ private int jjMoveStringLiteralDfa0_12() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_12(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_12(0x4000000000000L); case 39: - return jjMoveStringLiteralDfa1_12(0x2000L); + return jjMoveStringLiteralDfa1_12(0x4000L); default : return jjMoveNfa_12(0, 0); } @@ -1512,11 +1512,11 @@ private int jjMoveStringLiteralDfa1_12(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 39: - return jjMoveStringLiteralDfa2_12(active2, 0x2000L); + return jjMoveStringLiteralDfa2_12(active2, 0x4000L); default : break; } @@ -1534,8 +1534,8 @@ private int jjMoveStringLiteralDfa2_12(long old2, long active2) switch(curChar) { case 39: - if ((active2 & 0x2000L) != 0L) - return jjStopAtPos(2, 141); + if ((active2 & 0x4000L) != 0L) + return jjStopAtPos(2, 142); break; default : break; @@ -1561,13 +1561,13 @@ private int jjMoveNfa_12(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -1580,8 +1580,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -1590,8 +1590,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -1609,13 +1609,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -1638,16 +1638,16 @@ private final int jjStopStringLiteralDfa_19(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x20000000L) != 0L) + if ((active2 & 0x40000000L) != 0L) { - jjmatchedKind = 176; + jjmatchedKind = 177; return 2; } return -1; case 1: - if ((active2 & 0x20000000L) != 0L) + if ((active2 & 0x40000000L) != 0L) { - jjmatchedKind = 158; + jjmatchedKind = 159; jjmatchedPos = 1; return -1; } @@ -1665,9 +1665,9 @@ private int jjMoveStringLiteralDfa0_19() switch(curChar) { case 34: - return jjStopAtPos(0, 148); + return jjStopAtPos(0, 149); case 92: - return jjMoveStringLiteralDfa1_19(0x20000000L); + return jjMoveStringLiteralDfa1_19(0x40000000L); default : return jjMoveNfa_19(0, 0); } @@ -1682,7 +1682,7 @@ private int jjMoveStringLiteralDfa1_19(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_19(active2, 0x20000000L); + return jjMoveStringLiteralDfa2_19(active2, 0x40000000L); default : break; } @@ -1700,8 +1700,8 @@ private int jjMoveStringLiteralDfa2_19(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x20000000L) != 0L) - return jjStopAtPos(2, 157); + if ((active2 & 0x40000000L) != 0L) + return jjStopAtPos(2, 158); break; default : break; @@ -1727,24 +1727,24 @@ private int jjMoveNfa_19(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 176) - kind = 176; + if ((0xffffffffffffdbffL & l) != 0L && kind > 177) + kind = 177; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 158) - kind = 158; + if (kind > 159) + kind = 159; } else if (curChar == 34) { - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; } break; case 3: - if (curChar == 34 && kind > 176) - kind = 176; + if (curChar == 34 && kind > 177) + kind = 177; break; default : break; } @@ -1758,14 +1758,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 176) - kind = 176; + if (curChar == 92 && kind > 177) + kind = 177; break; case 1: if (curChar == 92) @@ -1787,8 +1787,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) - kind = 176; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 177) + kind = 177; break; default : break; } @@ -1812,16 +1812,16 @@ private final int jjStopStringLiteralDfa_10(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x80000000L) != 0L) + if ((active2 & 0x100000000L) != 0L) { - jjmatchedKind = 175; + jjmatchedKind = 176; return 2; } return -1; case 1: - if ((active2 & 0x80000000L) != 0L) + if ((active2 & 0x100000000L) != 0L) { - jjmatchedKind = 160; + jjmatchedKind = 161; jjmatchedPos = 1; return -1; } @@ -1839,9 +1839,9 @@ private int jjMoveStringLiteralDfa0_10() switch(curChar) { case 39: - return jjStopAtPos(0, 139); + return jjStopAtPos(0, 140); case 92: - return jjMoveStringLiteralDfa1_10(0x80000000L); + return jjMoveStringLiteralDfa1_10(0x100000000L); default : return jjMoveNfa_10(0, 0); } @@ -1856,7 +1856,7 @@ private int jjMoveStringLiteralDfa1_10(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_10(active2, 0x80000000L); + return jjMoveStringLiteralDfa2_10(active2, 0x100000000L); default : break; } @@ -1874,8 +1874,8 @@ private int jjMoveStringLiteralDfa2_10(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x80000000L) != 0L) - return jjStopAtPos(2, 159); + if ((active2 & 0x100000000L) != 0L) + return jjStopAtPos(2, 160); break; default : break; @@ -1901,24 +1901,24 @@ private int jjMoveNfa_10(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 175) - kind = 175; + if ((0xffffffffffffdbffL & l) != 0L && kind > 176) + kind = 176; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 160) - kind = 160; + if (kind > 161) + kind = 161; } else if (curChar == 39) { - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; } break; case 3: - if (curChar == 39 && kind > 175) - kind = 175; + if (curChar == 39 && kind > 176) + kind = 176; break; default : break; } @@ -1932,14 +1932,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 175) - kind = 175; + if (curChar == 92 && kind > 176) + kind = 176; break; case 1: if (curChar == 92) @@ -1961,8 +1961,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 175) - kind = 175; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) + kind = 176; break; default : break; } @@ -2258,18 +2258,18 @@ private final int jjStopStringLiteralDfa_17(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x40000L) != 0L) + if ((active2 & 0x80000L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x40000L) != 0L) + if ((active2 & 0x80000L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -2288,12 +2288,12 @@ private int jjMoveStringLiteralDfa0_17() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_17(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_17(0x4000000000000L); case 34: - return jjMoveStringLiteralDfa1_17(0x40000L); + return jjMoveStringLiteralDfa1_17(0x80000L); default : return jjMoveNfa_17(0, 0); } @@ -2308,11 +2308,11 @@ private int jjMoveStringLiteralDfa1_17(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 34: - return jjMoveStringLiteralDfa2_17(active2, 0x40000L); + return jjMoveStringLiteralDfa2_17(active2, 0x80000L); default : break; } @@ -2330,8 +2330,8 @@ private int jjMoveStringLiteralDfa2_17(long old2, long active2) switch(curChar) { case 34: - if ((active2 & 0x40000L) != 0L) - return jjStopAtPos(2, 146); + if ((active2 & 0x80000L) != 0L) + return jjStopAtPos(2, 147); break; default : break; @@ -2357,13 +2357,13 @@ private int jjMoveNfa_17(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -2376,8 +2376,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -2386,8 +2386,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -2405,13 +2405,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -2434,98 +2434,98 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) switch (pos) { case 0: - if ((active1 & 0x80810100L) != 0L) - { - jjmatchedKind = 101; - return 111; - } if ((active1 & 0x2100000L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; return 76; } + if ((active1 & 0x100810100L) != 0L) + { + jjmatchedKind = 102; + return 111; + } if ((active1 & 0x40000L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; return 63; } - if ((active0 & 0xc000000000000000L) != 0L || (active1 & 0x1b7d6afeffL) != 0L) + if ((active0 & 0xc000000000000000L) != 0L || (active1 & 0x36fd6afeffL) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; return 10; } if ((active0 & 0x2000000L) != 0L) return 154; return -1; case 1: - if ((active0 & 0x4000000000000000L) != 0L || (active1 & 0x30002016L) != 0L) - return 10; - if ((active0 & 0x8000000000000000L) != 0L || (active1 & 0x1bcf7bdfe9L) != 0L) + if ((active1 & 0x800000L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 1; } - return 10; + return 155; } - if ((active1 & 0x800000L) != 0L) + if ((active0 & 0x4000000000000000L) != 0L || (active1 & 0x60002016L) != 0L) + return 10; + if ((active1 & 0x40000L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 1; } - return 155; + return 156; } - if ((active1 & 0x40000L) != 0L) + if ((active0 & 0x8000000000000000L) != 0L || (active1 & 0x379f7bdfe9L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 1; } - return 156; + return 10; } return -1; case 2: if ((active0 & 0x8000000000000000L) != 0L || (active1 & 0x1001301L) != 0L) return 10; - if ((active1 & 0x1bdeffece8L) != 0L) + if ((active1 & 0x37beffece8L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 2; return 10; } return -1; case 3: - if ((active1 & 0x1340820060L) != 0L) + if ((active1 & 0x2690820060L) != 0L) return 10; - if ((active1 & 0x89e7dec88L) != 0L) + if ((active1 & 0x112e7dec88L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 3; return 10; } return -1; case 4: - if ((active1 & 0x88224e080L) != 0L) + if ((active1 & 0x110224e080L) != 0L) return 10; - if ((active1 & 0x1c590c08L) != 0L) + if ((active1 & 0x2c590c08L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 4; return 10; } return -1; case 5: - if ((active1 & 0x14500c08L) != 0L) + if ((active1 & 0x24500c08L) != 0L) return 10; if ((active1 & 0x8090000L) != 0L) { if (jjmatchedPos != 5) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 5; } return 10; @@ -2536,7 +2536,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) return 10; if ((active1 & 0x8080000L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 6; return 10; } @@ -2596,14 +2596,14 @@ private int jjMoveStringLiteralDfa0_0() jjmatchedKind = 42; return jjMoveStringLiteralDfa1_0(0x800400800000000L, 0x0L); case 64: - jjmatchedKind = 98; + jjmatchedKind = 99; return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x0L); case 70: - return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000L); case 78: - return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000L); case 84: - return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000L); case 91: return jjStopAtPos(0, 21); case 93: @@ -2612,11 +2612,11 @@ private int jjMoveStringLiteralDfa0_0() jjmatchedKind = 38; return jjMoveStringLiteralDfa1_0(0x200000000000000L, 0x0L); case 97: - return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x30006000L); + return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x60006000L); case 98: return jjMoveStringLiteralDfa1_0(0x0L, 0x40000L); case 99: - return jjMoveStringLiteralDfa1_0(0x0L, 0x1000088000L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x2000088000L); case 100: return jjMoveStringLiteralDfa1_0(0x0L, 0x1001000L); case 101: @@ -2630,7 +2630,7 @@ private int jjMoveStringLiteralDfa0_0() case 108: return jjMoveStringLiteralDfa1_0(0x0L, 0x8L); case 109: - return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000L); case 110: return jjMoveStringLiteralDfa1_0(0x0L, 0x8000001L); case 111: @@ -2640,9 +2640,9 @@ private int jjMoveStringLiteralDfa0_0() case 114: return jjMoveStringLiteralDfa1_0(0x0L, 0x2100000L); case 116: - return jjMoveStringLiteralDfa1_0(0x0L, 0x200L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x10000200L); case 119: - return jjMoveStringLiteralDfa1_0(0x0L, 0x40000080L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x80000080L); case 121: return jjMoveStringLiteralDfa1_0(0x0L, 0x200000L); case 123: @@ -2728,7 +2728,7 @@ else if ((active0 & 0x800000000L) != 0L) } return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, active1, 0L); case 97: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1882020008L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3102020008L); case 101: return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1101000L); case 102: @@ -2738,7 +2738,7 @@ else if ((active0 & 0x800000000L) != 0L) case 104: return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80L); case 105: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40210000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80210000L); case 108: return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4008060L); case 109: @@ -2748,24 +2748,26 @@ else if ((active0 & 0x800000000L) != 0L) return jjStartNfaWithStates_0(1, 66, 10); return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000000L, active1, 0L); case 111: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x208080101L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x408080101L); case 114: if ((active0 & 0x4000000000000000L) != 0L) return jjStartNfaWithStates_0(1, 62, 10); - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100840200L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200840200L); case 115: if ((active1 & 0x2L) != 0L) return jjStartNfaWithStates_0(1, 65, 10); - else if ((active1 & 0x20000000L) != 0L) + else if ((active1 & 0x40000000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 94; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10002000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20002000L); case 119: return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000L); case 120: return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc00L); + case 121: + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10000000L); default : break; } @@ -2811,27 +2813,27 @@ else if ((active0 & 0x1000000000000000L) != 0L) case 108: if ((active1 & 0x1000000L) != 0L) return jjStartNfaWithStates_0(2, 88, 10); - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x100000000L); case 109: return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8L); case 110: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x208090000L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x408090000L); case 111: return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4800000L); case 112: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400000L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10400000L); case 114: if ((active1 & 0x100L) != 0L) return jjStartNfaWithStates_0(2, 72, 10); break; case 115: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1010020020L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2020020020L); case 116: if ((active1 & 0x1L) != 0L) return jjStartNfaWithStates_0(2, 64, 10); - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x840100000L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1080100000L); case 117: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000000L); case 121: if ((active1 & 0x200L) != 0L) return jjStartNfaWithStates_0(2, 73, 10); @@ -2857,24 +2859,26 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a case 98: return jjMoveStringLiteralDfa4_0(active1, 0x4000008L); case 99: - return jjMoveStringLiteralDfa4_0(active1, 0x800000000L); + return jjMoveStringLiteralDfa4_0(active1, 0x1000000000L); case 101: if ((active1 & 0x20L) != 0L) return jjStartNfaWithStates_0(3, 69, 10); - else if ((active1 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(3, 96, 10); + else if ((active1 & 0x10000000L) != 0L) + return jjStartNfaWithStates_0(3, 92, 10); else if ((active1 & 0x200000000L) != 0L) return jjStartNfaWithStates_0(3, 97, 10); - else if ((active1 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_0(3, 100, 10); - return jjMoveStringLiteralDfa4_0(active1, 0x10000c00L); + else if ((active1 & 0x400000000L) != 0L) + return jjStartNfaWithStates_0(3, 98, 10); + else if ((active1 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_0(3, 101, 10); + return jjMoveStringLiteralDfa4_0(active1, 0x20000c00L); case 102: if ((active1 & 0x40L) != 0L) return jjStartNfaWithStates_0(3, 70, 10); break; case 104: - if ((active1 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(3, 94, 10); + if ((active1 & 0x80000000L) != 0L) + return jjStartNfaWithStates_0(3, 95, 10); break; case 105: return jjMoveStringLiteralDfa4_0(active1, 0x4000L); @@ -2891,7 +2895,7 @@ else if ((active1 & 0x1000000000L) != 0L) case 115: if ((active1 & 0x20000L) != 0L) return jjStartNfaWithStates_0(3, 81, 10); - return jjMoveStringLiteralDfa4_0(active1, 0x82008000L); + return jjMoveStringLiteralDfa4_0(active1, 0x102008000L); case 116: return jjMoveStringLiteralDfa4_0(active1, 0x80000L); case 117: @@ -2927,12 +2931,12 @@ private int jjMoveStringLiteralDfa4_0(long old1, long active1) return jjStartNfaWithStates_0(4, 71, 10); else if ((active1 & 0x2000000L) != 0L) return jjStartNfaWithStates_0(4, 89, 10); - else if ((active1 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(4, 95, 10); + else if ((active1 & 0x100000000L) != 0L) + return jjStartNfaWithStates_0(4, 96, 10); break; case 104: - if ((active1 & 0x800000000L) != 0L) - return jjStartNfaWithStates_0(4, 99, 10); + if ((active1 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_0(4, 100, 10); break; case 105: return jjMoveStringLiteralDfa5_0(active1, 0x80000L); @@ -2947,7 +2951,7 @@ else if ((active1 & 0x80000000L) != 0L) case 112: return jjMoveStringLiteralDfa5_0(active1, 0xc00L); case 114: - return jjMoveStringLiteralDfa5_0(active1, 0x10500000L); + return jjMoveStringLiteralDfa5_0(active1, 0x20500000L); case 115: if ((active1 & 0x8000L) != 0L) return jjStartNfaWithStates_0(4, 79, 10); @@ -2994,8 +2998,8 @@ private int jjMoveStringLiteralDfa5_0(long old1, long active1) } else if ((active1 & 0x400000L) != 0L) return jjStartNfaWithStates_0(5, 86, 10); - else if ((active1 & 0x10000000L) != 0L) - return jjStartNfaWithStates_0(5, 92, 10); + else if ((active1 & 0x20000000L) != 0L) + return jjStartNfaWithStates_0(5, 93, 10); return jjMoveStringLiteralDfa6_0(active1, 0x400L); default : break; @@ -3083,8 +3087,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 155: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } else if (curChar == 34) @@ -3093,57 +3097,57 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 117; if (curChar == 34) { - if (kind > 124) - kind = 124; + if (kind > 125) + kind = 125; } else if (curChar == 39) { - if (kind > 123) - kind = 123; + if (kind > 124) + kind = 124; } break; - case 76: + case 111: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } else if (curChar == 34) - jjCheckNAdd(106); + jjstateSet[jjnewStateCnt++] = 121; else if (curChar == 39) - jjCheckNAdd(103); + jjstateSet[jjnewStateCnt++] = 117; if (curChar == 34) { - if (kind > 132) - kind = 132; + if (kind > 125) + kind = 125; } else if (curChar == 39) { - if (kind > 131) - kind = 131; + if (kind > 124) + kind = 124; } break; - case 111: + case 76: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } else if (curChar == 34) - jjstateSet[jjnewStateCnt++] = 121; + jjCheckNAdd(106); else if (curChar == 39) - jjstateSet[jjnewStateCnt++] = 117; + jjCheckNAdd(103); if (curChar == 34) { - if (kind > 124) - kind = 124; + if (kind > 133) + kind = 133; } else if (curChar == 39) { - if (kind > 123) - kind = 123; + if (kind > 132) + kind = 132; } break; case 154: @@ -3151,16 +3155,16 @@ else if (curChar == 39) jjCheckNAddStates(5, 8); if ((0x3ff000000000000L & l) != 0L) { - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddStates(9, 11); } break; case 156: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } else if (curChar == 34) @@ -3169,13 +3173,13 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 69; if (curChar == 34) { - if (kind > 116) - kind = 116; + if (kind > 117) + kind = 117; } else if (curChar == 39) { - if (kind > 115) - kind = 115; + if (kind > 116) + kind = 116; } break; case 0: @@ -3200,24 +3204,24 @@ else if (curChar == 35) } if ((0x3fe000000000000L & l) != 0L) { - if (kind > 103) - kind = 103; + if (kind > 104) + kind = 104; jjCheckNAddStates(30, 36); } else if (curChar == 34) { - if (kind > 120) - kind = 120; + if (kind > 121) + kind = 121; } else if (curChar == 39) { - if (kind > 119) - kind = 119; + if (kind > 120) + kind = 120; } else if (curChar == 48) { - if (kind > 103) - kind = 103; + if (kind > 104) + kind = 104; jjCheckNAddStates(37, 45); } else if (curChar == 13) @@ -3226,8 +3230,8 @@ else if (curChar == 13) case 63: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } else if (curChar == 34) @@ -3236,13 +3240,13 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 69; if (curChar == 34) { - if (kind > 116) - kind = 116; + if (kind > 117) + kind = 117; } else if (curChar == 39) { - if (kind > 115) - kind = 115; + if (kind > 116) + kind = 116; } break; case 1: @@ -3286,22 +3290,22 @@ else if (curChar == 39) case 10: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 11: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 103) - kind = 103; + if (kind > 104) + kind = 104; jjCheckNAddStates(30, 36); break; case 13: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 103) - kind = 103; + if (kind > 104) + kind = 104; jjCheckNAddStates(46, 48); break; case 16: @@ -3311,29 +3315,29 @@ else if (curChar == 39) case 19: if (curChar != 48) break; - if (kind > 103) - kind = 103; + if (kind > 104) + kind = 104; jjCheckNAddStates(37, 45); break; case 22: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 104) - kind = 104; + if (kind > 105) + kind = 105; jjAddStates(53, 55); break; case 26: if ((0xff000000000000L & l) == 0L) break; - if (kind > 105) - kind = 105; + if (kind > 106) + kind = 106; jjAddStates(56, 58); break; case 30: if ((0x3000000000000L & l) == 0L) break; - if (kind > 106) - kind = 106; + if (kind > 107) + kind = 107; jjCheckNAddStates(59, 61); break; case 32: @@ -3355,8 +3359,8 @@ else if (curChar == 39) case 37: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddStates(9, 11); break; case 40: @@ -3366,8 +3370,8 @@ else if (curChar == 39) case 41: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddTwoStates(42, 41); break; case 43: @@ -3383,16 +3387,16 @@ else if (curChar == 39) jjCheckNAddStates(66, 68); break; case 51: - if (curChar == 39 && kind > 111) - kind = 111; + if (curChar == 39 && kind > 112) + kind = 112; break; case 53: - if (curChar == 34 && kind > 112) - kind = 112; + if (curChar == 34 && kind > 113) + kind = 113; break; case 55: - if (curChar == 39 && kind > 113) - kind = 113; + if (curChar == 39 && kind > 114) + kind = 114; break; case 56: if (curChar == 39) @@ -3403,8 +3407,8 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 56; break; case 59: - if (curChar == 34 && kind > 114) - kind = 114; + if (curChar == 34 && kind > 115) + kind = 115; break; case 60: if (curChar == 34) @@ -3415,16 +3419,16 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 60; break; case 64: - if (curChar == 39 && kind > 115) - kind = 115; + if (curChar == 39 && kind > 116) + kind = 116; break; case 66: - if (curChar == 34 && kind > 116) - kind = 116; + if (curChar == 34 && kind > 117) + kind = 117; break; case 68: - if (curChar == 39 && kind > 117) - kind = 117; + if (curChar == 39 && kind > 118) + kind = 118; break; case 69: if (curChar == 39) @@ -3435,8 +3439,8 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 69; break; case 72: - if (curChar == 34 && kind > 118) - kind = 118; + if (curChar == 34 && kind > 119) + kind = 119; break; case 73: if (curChar == 34) @@ -3447,16 +3451,16 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 73; break; case 77: - if (curChar == 39 && kind > 119) - kind = 119; + if (curChar == 39 && kind > 120) + kind = 120; break; case 79: - if (curChar == 34 && kind > 120) - kind = 120; + if (curChar == 34 && kind > 121) + kind = 121; break; case 81: - if (curChar == 39 && kind > 121) - kind = 121; + if (curChar == 39 && kind > 122) + kind = 122; break; case 82: if (curChar == 39) @@ -3467,8 +3471,8 @@ else if (curChar == 39) jjCheckNAdd(82); break; case 85: - if (curChar == 34 && kind > 122) - kind = 122; + if (curChar == 34 && kind > 123) + kind = 123; break; case 86: if (curChar == 34) @@ -3479,16 +3483,16 @@ else if (curChar == 39) jjCheckNAdd(86); break; case 89: - if (curChar == 39 && kind > 127) - kind = 127; + if (curChar == 39 && kind > 128) + kind = 128; break; case 91: - if (curChar == 34 && kind > 128) - kind = 128; + if (curChar == 34 && kind > 129) + kind = 129; break; case 93: - if (curChar == 39 && kind > 129) - kind = 129; + if (curChar == 39 && kind > 130) + kind = 130; break; case 94: if (curChar == 39) @@ -3499,8 +3503,8 @@ else if (curChar == 39) jjCheckNAdd(94); break; case 97: - if (curChar == 34 && kind > 130) - kind = 130; + if (curChar == 34 && kind > 131) + kind = 131; break; case 98: if (curChar == 34) @@ -3511,16 +3515,16 @@ else if (curChar == 39) jjCheckNAdd(98); break; case 100: - if (curChar == 39 && kind > 131) - kind = 131; + if (curChar == 39 && kind > 132) + kind = 132; break; case 101: - if (curChar == 34 && kind > 132) - kind = 132; + if (curChar == 34 && kind > 133) + kind = 133; break; case 102: - if (curChar == 39 && kind > 133) - kind = 133; + if (curChar == 39 && kind > 134) + kind = 134; break; case 103: if (curChar == 39) @@ -3531,8 +3535,8 @@ else if (curChar == 39) jjCheckNAdd(103); break; case 105: - if (curChar == 34 && kind > 134) - kind = 134; + if (curChar == 34 && kind > 135) + kind = 135; break; case 106: if (curChar == 34) @@ -3551,16 +3555,16 @@ else if (curChar == 39) jjCheckNAddStates(24, 26); break; case 112: - if (curChar == 39 && kind > 123) - kind = 123; + if (curChar == 39 && kind > 124) + kind = 124; break; case 114: - if (curChar == 34 && kind > 124) - kind = 124; + if (curChar == 34 && kind > 125) + kind = 125; break; case 116: - if (curChar == 39 && kind > 125) - kind = 125; + if (curChar == 39 && kind > 126) + kind = 126; break; case 117: if (curChar == 39) @@ -3571,8 +3575,8 @@ else if (curChar == 39) jjstateSet[jjnewStateCnt++] = 117; break; case 120: - if (curChar == 34 && kind > 126) - kind = 126; + if (curChar == 34 && kind > 127) + kind = 127; break; case 121: if (curChar == 34) @@ -3593,15 +3597,15 @@ else if (curChar == 39) case 126: if (curChar != 46) break; - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddStates(72, 74); break; case 128: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddStates(72, 74); break; case 130: @@ -3611,8 +3615,8 @@ else if (curChar == 39) case 131: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddTwoStates(132, 131); break; case 134: @@ -3626,8 +3630,8 @@ else if (curChar == 39) case 137: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 108) + kind = 108; jjCheckNAddTwoStates(138, 137); break; case 140: @@ -3677,15 +3681,31 @@ else if (curChar < 128) case 10: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; + case 111: + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 102) + kind = 102; + jjCheckNAdd(10); + } + if ((0x4000000040000L & l) != 0L) + jjCheckNAdd(122); + if ((0x4000000040000L & l) != 0L) + jjCheckNAdd(118); + if ((0x4000000040000L & l) != 0L) + jjCheckNAdd(114); + if ((0x4000000040000L & l) != 0L) + jjCheckNAdd(112); + break; case 76: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } if ((0x4000000040L & l) != 0L) @@ -3705,34 +3725,18 @@ else if ((0x400000004L & l) != 0L) else if ((0x400000004L & l) != 0L) jjstateSet[jjnewStateCnt++] = 77; break; - case 111: - if ((0x7fffffe87fffffeL & l) != 0L) - { - if (kind > 101) - kind = 101; - jjCheckNAdd(10); - } - if ((0x4000000040000L & l) != 0L) - jjCheckNAdd(122); - if ((0x4000000040000L & l) != 0L) - jjCheckNAdd(118); - if ((0x4000000040000L & l) != 0L) - jjCheckNAdd(114); - if ((0x4000000040000L & l) != 0L) - jjCheckNAdd(112); - break; case 156: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 0: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } else if (curChar == 92) @@ -3749,8 +3753,8 @@ else if ((0x20000000200000L & l) != 0L) case 63: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); } if ((0x4000000040000L & l) != 0L) @@ -3770,8 +3774,8 @@ else if ((0x20000000200000L & l) != 0L) case 9: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 12: @@ -3779,8 +3783,8 @@ else if ((0x20000000200000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 13; break; case 14: - if ((0x100000001000L & l) != 0L && kind > 103) - kind = 103; + if ((0x100000001000L & l) != 0L && kind > 104) + kind = 104; break; case 15: if (curChar == 95) @@ -3791,8 +3795,8 @@ else if ((0x20000000200000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 18; break; case 18: - if ((0x40000000400L & l) != 0L && kind > 108) - kind = 108; + if ((0x40000000400L & l) != 0L && kind > 109) + kind = 109; break; case 20: if ((0x100000001000000L & l) != 0L) @@ -3805,19 +3809,19 @@ else if ((0x20000000200000L & l) != 0L) case 22: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 104) - kind = 104; + if (kind > 105) + kind = 105; jjCheckNAddStates(53, 55); break; case 23: - if ((0x100000001000L & l) != 0L && kind > 104) - kind = 104; + if ((0x100000001000L & l) != 0L && kind > 105) + kind = 105; break; case 24: if ((0x800000008000L & l) == 0L) break; - if (kind > 105) - kind = 105; + if (kind > 106) + kind = 106; jjCheckNAddStates(56, 58); break; case 25: @@ -3825,14 +3829,14 @@ else if ((0x20000000200000L & l) != 0L) jjCheckNAdd(26); break; case 27: - if ((0x100000001000L & l) != 0L && kind > 105) - kind = 105; + if ((0x100000001000L & l) != 0L && kind > 106) + kind = 106; break; case 28: if ((0x400000004L & l) == 0L) break; - if (kind > 106) - kind = 106; + if (kind > 107) + kind = 107; jjCheckNAddStates(59, 61); break; case 29: @@ -3840,8 +3844,8 @@ else if ((0x20000000200000L & l) != 0L) jjCheckNAdd(30); break; case 31: - if ((0x100000001000L & l) != 0L && kind > 106) - kind = 106; + if ((0x100000001000L & l) != 0L && kind > 107) + kind = 107; break; case 33: if (curChar == 95) @@ -4030,43 +4034,43 @@ else if ((0x20000000200000L & l) != 0L) case 10: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; - case 76: + case 111: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; - case 111: + case 76: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 156: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 0: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 63: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; - if (kind > 101) - kind = 101; + if (kind > 102) + kind = 102; jjCheckNAdd(10); break; case 8: @@ -4098,18 +4102,18 @@ private final int jjStopStringLiteralDfa_13(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x4000L) != 0L) + if ((active2 & 0x8000L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x4000L) != 0L) + if ((active2 & 0x8000L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -4128,12 +4132,12 @@ private int jjMoveStringLiteralDfa0_13() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_13(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_13(0x4000000000000L); case 34: - return jjMoveStringLiteralDfa1_13(0x4000L); + return jjMoveStringLiteralDfa1_13(0x8000L); default : return jjMoveNfa_13(0, 0); } @@ -4148,11 +4152,11 @@ private int jjMoveStringLiteralDfa1_13(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 34: - return jjMoveStringLiteralDfa2_13(active2, 0x4000L); + return jjMoveStringLiteralDfa2_13(active2, 0x8000L); default : break; } @@ -4170,8 +4174,8 @@ private int jjMoveStringLiteralDfa2_13(long old2, long active2) switch(curChar) { case 34: - if ((active2 & 0x4000L) != 0L) - return jjStopAtPos(2, 142); + if ((active2 & 0x8000L) != 0L) + return jjStopAtPos(2, 143); break; default : break; @@ -4197,13 +4201,13 @@ private int jjMoveNfa_13(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -4216,8 +4220,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -4226,8 +4230,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -4245,13 +4249,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -4274,16 +4278,16 @@ private final int jjStopStringLiteralDfa_15(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x2000000000L) != 0L) + if ((active2 & 0x4000000000L) != 0L) { - jjmatchedKind = 176; + jjmatchedKind = 177; return 2; } return -1; case 1: - if ((active2 & 0x2000000000L) != 0L) + if ((active2 & 0x4000000000L) != 0L) { - jjmatchedKind = 166; + jjmatchedKind = 167; jjmatchedPos = 1; return -1; } @@ -4301,9 +4305,9 @@ private int jjMoveStringLiteralDfa0_15() switch(curChar) { case 34: - return jjStopAtPos(0, 144); + return jjStopAtPos(0, 145); case 92: - return jjMoveStringLiteralDfa1_15(0x2000000000L); + return jjMoveStringLiteralDfa1_15(0x4000000000L); default : return jjMoveNfa_15(0, 0); } @@ -4318,7 +4322,7 @@ private int jjMoveStringLiteralDfa1_15(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_15(active2, 0x2000000000L); + return jjMoveStringLiteralDfa2_15(active2, 0x4000000000L); default : break; } @@ -4336,8 +4340,8 @@ private int jjMoveStringLiteralDfa2_15(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000L) != 0L) - return jjStopAtPos(2, 165); + if ((active2 & 0x4000000000L) != 0L) + return jjStopAtPos(2, 166); break; default : break; @@ -4363,24 +4367,24 @@ private int jjMoveNfa_15(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 176) - kind = 176; + if ((0xffffffffffffdbffL & l) != 0L && kind > 177) + kind = 177; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 166) - kind = 166; + if (kind > 167) + kind = 167; } else if (curChar == 34) { - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; } break; case 3: - if (curChar == 34 && kind > 176) - kind = 176; + if (curChar == 34 && kind > 177) + kind = 177; break; default : break; } @@ -4394,14 +4398,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 176) - kind = 176; + if (curChar == 92 && kind > 177) + kind = 177; break; case 1: if (curChar == 92) @@ -4423,8 +4427,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) - kind = 176; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 177) + kind = 177; break; default : break; } @@ -4448,16 +4452,16 @@ private final int jjStopStringLiteralDfa_11(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x200000000L) != 0L) + if ((active2 & 0x400000000L) != 0L) { - jjmatchedKind = 176; + jjmatchedKind = 177; return 2; } return -1; case 1: - if ((active2 & 0x200000000L) != 0L) + if ((active2 & 0x400000000L) != 0L) { - jjmatchedKind = 162; + jjmatchedKind = 163; jjmatchedPos = 1; return -1; } @@ -4475,9 +4479,9 @@ private int jjMoveStringLiteralDfa0_11() switch(curChar) { case 34: - return jjStopAtPos(0, 140); + return jjStopAtPos(0, 141); case 92: - return jjMoveStringLiteralDfa1_11(0x200000000L); + return jjMoveStringLiteralDfa1_11(0x400000000L); default : return jjMoveNfa_11(0, 0); } @@ -4492,7 +4496,7 @@ private int jjMoveStringLiteralDfa1_11(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_11(active2, 0x200000000L); + return jjMoveStringLiteralDfa2_11(active2, 0x400000000L); default : break; } @@ -4510,8 +4514,8 @@ private int jjMoveStringLiteralDfa2_11(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x200000000L) != 0L) - return jjStopAtPos(2, 161); + if ((active2 & 0x400000000L) != 0L) + return jjStopAtPos(2, 162); break; default : break; @@ -4537,24 +4541,24 @@ private int jjMoveNfa_11(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 176) - kind = 176; + if ((0xffffffffffffdbffL & l) != 0L && kind > 177) + kind = 177; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 162) - kind = 162; + if (kind > 163) + kind = 163; } else if (curChar == 34) { - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; } break; case 3: - if (curChar == 34 && kind > 176) - kind = 176; + if (curChar == 34 && kind > 177) + kind = 177; break; default : break; } @@ -4568,14 +4572,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 176) - kind = 176; + if (kind > 177) + kind = 177; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 176) - kind = 176; + if (curChar == 92 && kind > 177) + kind = 177; break; case 1: if (curChar == 92) @@ -4597,8 +4601,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) - kind = 176; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 177) + kind = 177; break; default : break; } @@ -4622,18 +4626,18 @@ private final int jjStopStringLiteralDfa_8(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x200L) != 0L) + if ((active2 & 0x400L) != 0L) { - jjmatchedKind = 180; + jjmatchedKind = 181; return -1; } return -1; case 1: - if ((active2 & 0x200L) != 0L) + if ((active2 & 0x400L) != 0L) { if (jjmatchedPos == 0) { - jjmatchedKind = 180; + jjmatchedKind = 181; jjmatchedPos = 0; } return -1; @@ -4652,12 +4656,12 @@ private int jjMoveStringLiteralDfa0_8() switch(curChar) { case 10: - return jjStopAtPos(0, 178); + return jjStopAtPos(0, 179); case 13: - jjmatchedKind = 179; - return jjMoveStringLiteralDfa1_8(0x2000000000000L); + jjmatchedKind = 180; + return jjMoveStringLiteralDfa1_8(0x4000000000000L); case 39: - return jjMoveStringLiteralDfa1_8(0x200L); + return jjMoveStringLiteralDfa1_8(0x400L); default : return jjMoveNfa_8(0, 0); } @@ -4672,11 +4676,11 @@ private int jjMoveStringLiteralDfa1_8(long active2) switch(curChar) { case 10: - if ((active2 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 177); + if ((active2 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 178); break; case 39: - return jjMoveStringLiteralDfa2_8(active2, 0x200L); + return jjMoveStringLiteralDfa2_8(active2, 0x400L); default : break; } @@ -4694,8 +4698,8 @@ private int jjMoveStringLiteralDfa2_8(long old2, long active2) switch(curChar) { case 39: - if ((active2 & 0x200L) != 0L) - return jjStopAtPos(2, 137); + if ((active2 & 0x400L) != 0L) + return jjStopAtPos(2, 138); break; default : break; @@ -4721,13 +4725,13 @@ private int jjMoveNfa_8(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 180) - kind = 180; - break; - case 2: if ((0xffffffffffffdbffL & l) != 0L && kind > 181) kind = 181; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -4740,8 +4744,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 180) - kind = 180; + if (kind > 181) + kind = 181; if (curChar == 92) jjstateSet[jjnewStateCnt++] = 2; break; @@ -4750,8 +4754,8 @@ else if (curChar < 128) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if (kind > 181) - kind = 181; + if (kind > 182) + kind = 182; break; default : break; } @@ -4769,13 +4773,13 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 180) - kind = 180; - break; - case 2: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 181) kind = 181; break; + case 2: + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 182) + kind = 182; + break; default : break; } } while(i != startsAt); @@ -4936,16 +4940,16 @@ private final int jjStopStringLiteralDfa_6(int pos, long active0, long active1, switch (pos) { case 0: - if ((active2 & 0x800000L) != 0L) + if ((active2 & 0x1000000L) != 0L) { - jjmatchedKind = 175; + jjmatchedKind = 176; return 2; } return -1; case 1: - if ((active2 & 0x800000L) != 0L) + if ((active2 & 0x1000000L) != 0L) { - jjmatchedKind = 152; + jjmatchedKind = 153; jjmatchedPos = 1; return -1; } @@ -4963,9 +4967,9 @@ private int jjMoveStringLiteralDfa0_6() switch(curChar) { case 39: - return jjStopAtPos(0, 135); + return jjStopAtPos(0, 136); case 92: - return jjMoveStringLiteralDfa1_6(0x800000L); + return jjMoveStringLiteralDfa1_6(0x1000000L); default : return jjMoveNfa_6(0, 0); } @@ -4980,7 +4984,7 @@ private int jjMoveStringLiteralDfa1_6(long active2) switch(curChar) { case 13: - return jjMoveStringLiteralDfa2_6(active2, 0x800000L); + return jjMoveStringLiteralDfa2_6(active2, 0x1000000L); default : break; } @@ -4998,8 +5002,8 @@ private int jjMoveStringLiteralDfa2_6(long old2, long active2) switch(curChar) { case 10: - if ((active2 & 0x800000L) != 0L) - return jjStopAtPos(2, 151); + if ((active2 & 0x1000000L) != 0L) + return jjStopAtPos(2, 152); break; default : break; @@ -5025,24 +5029,24 @@ private int jjMoveNfa_6(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((0xffffffffffffdbffL & l) != 0L && kind > 175) - kind = 175; + if ((0xffffffffffffdbffL & l) != 0L && kind > 176) + kind = 176; break; case 2: if ((0x2400L & l) != 0L) { - if (kind > 152) - kind = 152; + if (kind > 153) + kind = 153; } else if (curChar == 39) { - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; } break; case 3: - if (curChar == 39 && kind > 175) - kind = 175; + if (curChar == 39 && kind > 176) + kind = 176; break; default : break; } @@ -5056,14 +5060,14 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (kind > 175) - kind = 175; + if (kind > 176) + kind = 176; if (curChar == 92) jjAddStates(3, 4); break; case 2: - if (curChar == 92 && kind > 175) - kind = 175; + if (curChar == 92 && kind > 176) + kind = 176; break; case 1: if (curChar == 92) @@ -5085,8 +5089,8 @@ else if (curChar < 128) switch(jjstateSet[--i]) { case 0: - if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 175) - kind = 175; + if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 176) + kind = 176; break; default : break; } @@ -5145,14 +5149,14 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo "\142\162\145\141\153", "\143\157\156\164\151\156\165\145", "\162\145\164\165\162\156", "\171\151\145\154\144", "\151\155\160\157\162\164", "\146\162\157\155", "\144\145\154", "\162\141\151\163\145", "\147\154\157\142\141\154", "\156\157\156\154\157\143\141\154", -"\141\163\163\145\162\164", "\141\163", "\167\151\164\150", "\106\141\154\163\145", "\124\162\165\145", -"\116\157\156\145", "\100", "\155\141\164\143\150", "\143\141\163\145", null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, null, null, null, +"\164\171\160\145", "\141\163\163\145\162\164", "\141\163", "\167\151\164\150", +"\106\141\154\163\145", "\124\162\165\145", "\116\157\156\145", "\100", "\155\141\164\143\150", +"\143\141\163\145", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, }; +null, null, null, null, null, null, null, null, null, null, null, null, }; /** Lexer state names. */ public static final String[] lexStateNames = { @@ -5194,13 +5198,13 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, 19, 20, 21, 10, 11, 12, 13, 10, 11, 12, 13, 14, 15, - 16, 17, 14, 15, 16, 17, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 6, 7, 18, 19, 10, 11, 14, 15, - -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, 19, 20, 21, 10, 11, 12, 13, 10, 11, 12, 13, 14, + 15, 16, 17, 14, 15, 16, 17, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 6, 7, 18, 19, 10, 11, 14, + 15, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffffe60c1L, 0x1fbfffffffffL, 0x7fff80L, + 0xfffffffffffe60c1L, 0x3f7fffffffffL, 0xffff00L, }; static final long[] jjtoSkip = { 0x19f3eL, 0x0L, 0x0L, @@ -5209,7 +5213,7 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo 0x18000L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x0L, 0xffff800000000000L, 0x3fffffff80007fL, + 0x0L, 0xffff000000000000L, 0x7fffffff0000ffL, }; private final FastCharStream input_stream; private final int[] jjrounds = new int[154]; @@ -5438,49 +5442,49 @@ public Token getNextToken() curPos = jjMoveStringLiteralDfa0_21(); break; case 22: - jjmatchedKind = 167; + jjmatchedKind = 168; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_22(); break; case 23: - jjmatchedKind = 168; + jjmatchedKind = 169; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_23(); break; case 24: - jjmatchedKind = 169; + jjmatchedKind = 170; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_24(); break; case 25: - jjmatchedKind = 170; + jjmatchedKind = 171; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_25(); break; case 26: - jjmatchedKind = 171; + jjmatchedKind = 172; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_26(); break; case 27: - jjmatchedKind = 172; + jjmatchedKind = 173; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_27(); break; case 28: - jjmatchedKind = 173; + jjmatchedKind = 174; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_28(); break; case 29: - jjmatchedKind = 174; + jjmatchedKind = 175; jjmatchedPos = -1; curPos = 0; curPos = jjMoveStringLiteralDfa0_29(); @@ -5601,94 +5605,94 @@ void MoreLexicalActions() jjimageLen += (lengthOfMatch = jjmatchedPos + 1); switch(jjmatchedKind) { - case 151 : + case 152 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 152 : + case 153 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 153 : + case 154 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 154 : + case 155 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 155 : + case 156 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 156 : + case 157 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 157 : + case 158 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 158 : + case 159 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 159 : + case 160 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 160 : + case 161 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 161 : + case 162 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 162 : + case 163 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 163 : + case 164 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 164 : + case 165 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 165 : + case 166 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-3); break; - case 166 : + case 167 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setLength(image.length()-2); break; - case 177 : + case 178 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; int l = image.length(); image.setLength(l-1); image.setCharAt(l-2, '\u005cn'); break; - case 179 : + case 180 : input_stream.AppendSuffix(image, jjimageLen); jjimageLen = 0; image.setCharAt(image.length()-1, '\u005cn'); @@ -5756,10 +5760,6 @@ else if (indentation.level > 0) { lengthOfMatch = jjstrLiteralImages[22].length(); parens--; break; - case 135 : - input_stream.AppendSuffix(image, jjimageLen + (lengthOfMatch = jjmatchedPos + 1)); - matchedToken.image = image.toString(); - break; case 136 : input_stream.AppendSuffix(image, jjimageLen + (lengthOfMatch = jjmatchedPos + 1)); matchedToken.image = image.toString(); @@ -5818,6 +5818,10 @@ else if (indentation.level > 0) { break; case 150 : input_stream.AppendSuffix(image, jjimageLen + (lengthOfMatch = jjmatchedPos + 1)); + matchedToken.image = image.toString(); + break; + case 151 : + input_stream.AppendSuffix(image, jjimageLen + (lengthOfMatch = jjmatchedPos + 1)); matchedToken.image = image.toString(); break; default : diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/TreeBuilder312.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/TreeBuilder312.java index ea263bc302..5ed61e8bfe 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/TreeBuilder312.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/TreeBuilder312.java @@ -56,6 +56,7 @@ import org.python.pydev.parser.jython.ast.TryExcept; import org.python.pydev.parser.jython.ast.TryFinally; import org.python.pydev.parser.jython.ast.Tuple; +import org.python.pydev.parser.jython.ast.TypeAlias; import org.python.pydev.parser.jython.ast.TypeParamsSuite; import org.python.pydev.parser.jython.ast.TypeVar; import org.python.pydev.parser.jython.ast.TypeVarTuple; @@ -72,6 +73,7 @@ import org.python.pydev.parser.jython.ast.stmtType; import org.python.pydev.parser.jython.ast.suiteType; import org.python.pydev.parser.jython.ast.type_paramType; +import org.python.pydev.parser.jython.ast.type_params_suiteType; public final class TreeBuilder312 extends AbstractTreeBuilder implements ITreeBuilder, ITreeConstants { @@ -822,6 +824,18 @@ public final SimpleNode onCloseNode(SimpleNode n, int arity) throws Exception { Collections.reverse(typeParams); return new TypeParamsSuite(typeParams.toArray(new type_paramType[0])); + case JJTTYPE_ALIAS: + defaultValue = null; + if (arity >= 3) { + defaultValue = (exprType) stack.popNode(); + } + + type_params_suiteType t = null; + if (arity >= 2) { + t = (type_params_suiteType) stack.popNode(); + } + return new TypeAlias(makeNameTok(NameTok.TypeAliasName), t, defaultValue); + default: Log.log(("Error at TreeBuilder: default not treated:" + n.getId())); return null; diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt index f1c486a8f2..b549c33bba 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar312/python.jjt @@ -364,6 +364,7 @@ TOKEN : /* KEYWORDS */ | < RAISE: "raise" > | < GLOBAL: "global" > | < NONLOCAL: "nonlocal" > +| < TYPE: "type" > | < ASSERT: "assert" > | < AS: "as" > | < WITH: "with" > @@ -649,6 +650,13 @@ void begin_decorator(): {} { temporaryToken= {grammarActions.addSpecialToken(temporaryToken, STRATEGY_BEFORE_NEXT);} namedexpr_test() } +// type_alias: +// | "type" NAME [type_params] '=' expression +void type_alias(): {} +{ + Name() [type_params()] {grammarActions.addSpecialToken("=", STRATEGY_BEFORE_NEXT);} expr() +} + // type_params: '[' type_param_seq ']' void type_params(): {} { {grammarActions.findTokenAndAdd("[");} @@ -891,6 +899,9 @@ void stmt() #void: {} | LOOKAHEAD(match_stmt()) match_stmt() + | + LOOKAHEAD(type_alias()) + type_alias() | non_async_stmt() } @@ -919,7 +930,7 @@ void simple_stmt() #void: {} -//small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt +//small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt | type_alias void small_stmt() #void: {SimpleNode simpleNode;Token spStr;} { expr_stmt() @@ -1920,6 +1931,8 @@ Token Name() #Name: t = | t = + | + t = ) }catch(ParseException e){ t = handleErrorInName(e); 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 dcda30b900..0b427672b6 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 @@ -242,6 +242,7 @@ TOKEN : /* KEYWORDS */ | < RAISE: "raise" > | < GLOBAL: "global" > | < NONLOCAL: "nonlocal" > +| < TYPE: "type" > | < ASSERT: "assert" > | < AS: "as" > | < WITH: "with" > @@ -520,6 +521,13 @@ void begin_decorator(): {} { $AT namedexpr_test() } +// type_alias: +// | "type" NAME [type_params] '=' expression +void type_alias(): {} +{ + Name() [type_params()] {grammarActions.addSpecialToken("=", STRATEGY_BEFORE_NEXT);} expr() +} + // type_params: '[' type_param_seq ']' void type_params(): {} { {grammarActions.findTokenAndAdd("[");} @@ -762,6 +770,9 @@ void stmt() #void: {} | LOOKAHEAD(match_stmt()) match_stmt() + | + LOOKAHEAD(type_alias()) + type_alias() | non_async_stmt() } @@ -782,7 +793,7 @@ void non_async_stmt() #void: {} $SIMPLE_STMT -//small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt +//small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt | type_alias void small_stmt() #void: {SimpleNode simpleNode;Token spStr;} { expr_stmt() @@ -1678,6 +1689,8 @@ Token Name() #Name: t = | t = + | + t = ) }catch(ParseException e){ t = handleErrorInName(e); diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammarcommon/ITreeConstants.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammarcommon/ITreeConstants.java index 684a3cf2a3..521219d54f 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammarcommon/ITreeConstants.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammarcommon/ITreeConstants.java @@ -172,4 +172,6 @@ public interface ITreeConstants { public static final int JJTTYPE_VAR = 664; public static final int JJTTYPE_VAR_TUPLE = 665; public static final int JJTTYPE_VAR_PARAM_SPEC = 666; + public static final int JJTTYPE_ALIAS = 667; + } diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/ISimpleNodeSwitch.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/ISimpleNodeSwitch.java index 5b27512976..5bdcacb2ee 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/ISimpleNodeSwitch.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/ISimpleNodeSwitch.java @@ -16,6 +16,7 @@ public interface ISimpleNodeSwitch { public void visit(Delete node); public void visit(Assign node); public void visit(AugAssign node); + public void visit(TypeAlias node); public void visit(Print node); public void visit(For node); public void visit(While node); diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Python.asdl b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Python.asdl index 26f6af60fc..37f02a02f9 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Python.asdl +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Python.asdl @@ -16,7 +16,7 @@ module Python NameTok = NameTok(identifier id, name_context ctx) - name_context = ClassName | FunctionName | KeywordName | ImportName | VarArg | KwArg | ImportModule | Attrib | GlobalName | NonLocalName | TypeVarName + name_context = ClassName | FunctionName | KeywordName | ImportName | VarArg | KwArg | ImportModule | Attrib | GlobalName | NonLocalName | TypeVarName | TypeAliasName -- the body is an array of statements (this is not used for all constructs because initially the suite was 'inlined' -- in the constructs, but some information was lost in this way). @@ -34,6 +34,8 @@ module Python | Assign(expr* targets, expr value, expr? type) | AugAssign(expr target, operator op, expr value) + | TypeAlias(NameTok name, type_params_suite? type_params, expr value) + -- not sure if bool is allowed, can always use int | Print(expr? dest, expr* values, bool nl) diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/TypeAlias.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/TypeAlias.java new file mode 100644 index 0000000000..c85da1c9de --- /dev/null +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/TypeAlias.java @@ -0,0 +1,105 @@ +// Autogenerated AST node +package org.python.pydev.parser.jython.ast; + +import org.python.pydev.parser.jython.SimpleNode; +import java.util.Arrays; + +public final class TypeAlias extends stmtType { + public NameTokType name; + public type_params_suiteType type_params; + public exprType value; + + public TypeAlias(NameTokType name, type_params_suiteType type_params, exprType value) { + this.name = name; + this.type_params = type_params; + this.value = value; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((type_params == null) ? 0 : type_params.hashCode()); + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + TypeAlias other = (TypeAlias) obj; + if (name == null) { if (other.name != null) return false;} + else if (!name.equals(other.name)) return false; + if (type_params == null) { if (other.type_params != null) return false;} + else if (!type_params.equals(other.type_params)) return false; + if (value == null) { if (other.value != null) return false;} + else if (!value.equals(other.value)) return false; + return true; + } + @Override + public TypeAlias createCopy() { + return createCopy(true); + } + @Override + public TypeAlias createCopy(boolean copyComments) { + TypeAlias temp = new TypeAlias(name!=null?(NameTokType)name.createCopy(copyComments):null, + type_params!=null?(type_params_suiteType)type_params.createCopy(copyComments):null, + value!=null?(exprType)value.createCopy(copyComments):null); + temp.beginLine = this.beginLine; + temp.beginColumn = this.beginColumn; + if(this.specialsBefore != null && copyComments){ + for(Object o:this.specialsBefore){ + if(o instanceof commentType){ + commentType commentType = (commentType) o; + temp.getSpecialsBefore().add(commentType.createCopy(copyComments)); + } + } + } + if(this.specialsAfter != null && copyComments){ + for(Object o:this.specialsAfter){ + if(o instanceof commentType){ + commentType commentType = (commentType) o; + temp.getSpecialsAfter().add(commentType.createCopy(copyComments)); + } + } + } + return temp; + } + + @Override + public String toString() { + StringBuffer sb = new StringBuffer("TypeAlias["); + sb.append("name="); + sb.append(dumpThis(this.name)); + sb.append(", "); + sb.append("type_params="); + sb.append(dumpThis(this.type_params)); + sb.append(", "); + sb.append("value="); + sb.append(dumpThis(this.value)); + sb.append("]"); + return sb.toString(); + } + + @Override + public Object accept(VisitorIF visitor) throws Exception { + return visitor.visitTypeAlias(this); + } + + @Override + public void traverse(VisitorIF visitor) throws Exception { + if (name != null) { + name.accept(visitor); + } + if (type_params != null) { + type_params.accept(visitor); + } + if (value != null) { + value.accept(visitor); + } + } + +} diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorBase.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorBase.java index f8410706e2..fbcd6aad69 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorBase.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorBase.java @@ -83,6 +83,12 @@ public Object visitAugAssign(AugAssign node) throws Exception { return ret; } + public Object visitTypeAlias(TypeAlias node) throws Exception { + Object ret = unhandled_node(node); + traverse(node); + return ret; + } + public Object visitPrint(Print node) throws Exception { Object ret = unhandled_node(node); traverse(node); diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorIF.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorIF.java index 3c1fba52b7..cf251dd27d 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorIF.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorIF.java @@ -16,6 +16,7 @@ public interface VisitorIF { public Object visitDelete(Delete node) throws Exception; public Object visitAssign(Assign node) throws Exception; public Object visitAugAssign(AugAssign node) throws Exception; + public Object visitTypeAlias(TypeAlias node) throws Exception; public Object visitPrint(Print node) throws Exception; public Object visitFor(For node) throws Exception; public Object visitWhile(While node) throws Exception; diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/name_contextType.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/name_contextType.java index 7160d384d4..9cd0a86f34 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/name_contextType.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/name_contextType.java @@ -14,6 +14,7 @@ public interface name_contextType { public static final int GlobalName = 9; public static final int NonLocalName = 10; public static final int TypeVarName = 11; + public static final int TypeAliasName = 12; public static final String[] name_contextTypeNames = new String[] { "", @@ -28,5 +29,6 @@ public interface name_contextType { "GlobalName", "NonLocalName", "TypeVarName", + "TypeAliasName", }; } diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/MakeAstValidForPrettyPrintingVisitor.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/MakeAstValidForPrettyPrintingVisitor.java index 638b157274..31724bd605 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/MakeAstValidForPrettyPrintingVisitor.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/MakeAstValidForPrettyPrintingVisitor.java @@ -73,6 +73,7 @@ import org.python.pydev.parser.jython.ast.TryExcept; import org.python.pydev.parser.jython.ast.TryFinally; import org.python.pydev.parser.jython.ast.Tuple; +import org.python.pydev.parser.jython.ast.TypeAlias; import org.python.pydev.parser.jython.ast.TypeParamsSuite; import org.python.pydev.parser.jython.ast.TypeVar; import org.python.pydev.parser.jython.ast.TypeVarTuple; @@ -122,6 +123,14 @@ protected Object unhandled_node(SimpleNode node) throws Exception { throw new RuntimeException("Unhandled: " + node); } + @Override + public Object visitTypeAlias(TypeAlias node) throws Exception { + fixNode(node); + traverse(node); + fixAfterNode(node); + return null; + } + @Override public Object visitTypeVar(TypeVar node) throws Exception { fixNode(node); diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/PrettyPrinterVisitorV2.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/PrettyPrinterVisitorV2.java index 586c9d6c5d..cbaa05d663 100644 --- a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/PrettyPrinterVisitorV2.java +++ b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/PrettyPrinterVisitorV2.java @@ -70,6 +70,7 @@ import org.python.pydev.parser.jython.ast.TryExcept; import org.python.pydev.parser.jython.ast.TryFinally; import org.python.pydev.parser.jython.ast.Tuple; +import org.python.pydev.parser.jython.ast.TypeAlias; import org.python.pydev.parser.jython.ast.TypeParamsSuite; import org.python.pydev.parser.jython.ast.TypeVar; import org.python.pydev.parser.jython.ast.TypeVarTuple; @@ -383,6 +384,26 @@ public Object visitTypeParamsSuite(TypeParamsSuite node) throws Exception { return null; } + @Override + public Object visitTypeAlias(TypeAlias node) throws Exception { + beforeNode(node); + this.pushTupleNeedsParens(); + doc.addRequire("type ", node); + if (node.name != null) { + node.name.accept(this); + } + if (node.type_params != null) { + node.type_params.accept(this); + } + doc.addRequire("=", lastNode); + if (node.value != null) { + node.value.accept(this); + } + this.popTupleNeedsParens(); + afterNode(node); + return null; + } + @Override public Object visitTypeVar(TypeVar node) throws Exception { beforeNode(node); diff --git a/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser312Test.java b/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser312Test.java index 933d1e7847..19dde631d9 100644 --- a/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser312Test.java +++ b/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser312Test.java @@ -54,4 +54,17 @@ public void testTypeVarSyntax2() { parseLegalDocStr(s); } + public void testTypeSyntax() { + String s = """ + type Point[T, Y] = tuple[T, Y] + """; + parseLegalDocStr(s); + } + + public void testTypeNameStillValidSyntax() { + String s = """ + print(type(int)) + """; + parseLegalDocStr(s); + } } diff --git a/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/prettyprinter/PrettyPrinter312Test.java b/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/prettyprinter/PrettyPrinter312Test.java index 5751703b57..92e3d49557 100644 --- a/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/prettyprinter/PrettyPrinter312Test.java +++ b/plugins/org.python.pydev.parser/tests/org/python/pydev/parser/prettyprinter/PrettyPrinter312Test.java @@ -38,4 +38,11 @@ class f312[T,Y:str]: """; checkPrettyPrintEqual(s); } + + public void testTypeAlias() { + String s = """ + type Point[X,Y]=tuple[X,Y] + """; + checkPrettyPrintEqual(s); + } } \ No newline at end of file diff --git a/plugins/org.python.pydev/tests_analysis/com/python/pydev/analysis/OccurrencesAnalyzerPy312Test.java b/plugins/org.python.pydev/tests_analysis/com/python/pydev/analysis/OccurrencesAnalyzerPy312Test.java index c71703e614..97fcde9260 100644 --- a/plugins/org.python.pydev/tests_analysis/com/python/pydev/analysis/OccurrencesAnalyzerPy312Test.java +++ b/plugins/org.python.pydev/tests_analysis/com/python/pydev/analysis/OccurrencesAnalyzerPy312Test.java @@ -62,4 +62,14 @@ def method2(self) -> T3: checkNoError(); } + public void testTypeAlias() { + doc = new Document(""" + type Point[T, Y] = tuple[T, Y] + + def method(arg: Point[int, int]): + print(type(arg)) + """); + checkNoError(); + } + }