From: <dal...@us...> - 2014-04-18 20:47:18
|
Revision: 23498 http://sourceforge.net/p/jedit/svn/23498 Author: daleanson Date: 2014-04-18 20:47:14 +0000 (Fri, 18 Apr 2014) Log Message: ----------- Fixed issue with detection of assignment operators. Modified Paths: -------------- plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$JJCalls.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$LookaheadSuccess.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$JJCalls.class =================================================================== (Binary files differ) Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$LookaheadSuccess.class =================================================================== (Binary files differ) Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.class =================================================================== (Binary files differ) Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-04-18 20:41:39 UTC (rev 23497) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-04-18 20:47:14 UTC (rev 23498) @@ -5395,19 +5395,12 @@ trace_call("AssignmentExpression"); try { if (jj_2_156(2147483647)) { + Assignment(); + } else if (jj_2_157(2147483647)) { ConditionalExpression(); } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SUPER: - case THIS: - case IDENTIFIER: - Assignment(); - break; - default: - jj_la1[178] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(-1); + throw new ParseException(); } } finally { trace_return("AssignmentExpression"); @@ -5428,9 +5421,9 @@ final public void LeftHandSide() throws ParseException { trace_call("LeftHandSide"); try { - if (jj_2_157(2147483647)) { + if (jj_2_158(2147483647)) { ArrayAccess(); - } else if (jj_2_158(2147483647)) { + } else if (jj_2_159(2147483647)) { FieldAccess(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5439,7 +5432,7 @@ ExpressionName(); break; default: - jj_la1[179] = jj_gen; + jj_la1[178] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5490,7 +5483,7 @@ jj_consume_token(ORASSIGN); break; default: - jj_la1[180] = jj_gen; + jj_la1[179] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5503,7 +5496,7 @@ trace_call("ConditionalExpression"); try { ConditionalOrExpression(); - if (jj_2_159(2)) { + if (jj_2_160(2)) { jj_consume_token(HOOK); Expression(); jj_consume_token(COLON); @@ -5522,7 +5515,7 @@ ConditionalAndExpression(); label_81: while (true) { - if (jj_2_160(2)) { + if (jj_2_161(2)) { ; } else { break label_81; @@ -5541,7 +5534,7 @@ InclusiveOrExpression(); label_82: while (true) { - if (jj_2_161(2)) { + if (jj_2_162(2)) { ; } else { break label_82; @@ -5560,7 +5553,7 @@ ExclusiveOrExpression(); label_83: while (true) { - if (jj_2_162(2)) { + if (jj_2_163(2)) { ; } else { break label_83; @@ -5579,7 +5572,7 @@ AndExpression(); label_84: while (true) { - if (jj_2_163(2)) { + if (jj_2_164(2)) { ; } else { break label_84; @@ -5598,7 +5591,7 @@ EqualityExpression(); label_85: while (true) { - if (jj_2_164(2)) { + if (jj_2_165(2)) { ; } else { break label_85; @@ -5617,7 +5610,7 @@ RelationalExpression(); label_86: while (true) { - if (jj_2_165(2)) { + if (jj_2_166(2)) { ; } else { break label_86; @@ -5630,7 +5623,7 @@ jj_consume_token(NE); break; default: - jj_la1[181] = jj_gen; + jj_la1[180] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5647,7 +5640,7 @@ ShiftExpression(); label_87: while (true) { - if (jj_2_166(2)) { + if (jj_2_167(2)) { ; } else { break label_87; @@ -5669,7 +5662,7 @@ jj_consume_token(INSTANCEOF); break; default: - jj_la1[182] = jj_gen; + jj_la1[181] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5686,7 +5679,7 @@ AdditiveExpression(); label_88: while (true) { - if (jj_2_167(2)) { + if (jj_2_168(2)) { ; } else { break label_88; @@ -5702,7 +5695,7 @@ jj_consume_token(129); break; default: - jj_la1[183] = jj_gen; + jj_la1[182] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5719,7 +5712,7 @@ MultiplicativeExpression(); label_89: while (true) { - if (jj_2_168(2)) { + if (jj_2_169(2)) { ; } else { break label_89; @@ -5732,7 +5725,7 @@ jj_consume_token(MINUS); break; default: - jj_la1[184] = jj_gen; + jj_la1[183] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5749,7 +5742,7 @@ UnaryExpression(); label_90: while (true) { - if (jj_2_169(2)) { + if (jj_2_170(2)) { ; } else { break label_90; @@ -5765,7 +5758,7 @@ jj_consume_token(REM); break; default: - jj_la1[185] = jj_gen; + jj_la1[184] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5820,7 +5813,7 @@ UnaryExpressionNotPlusMinus(); break; default: - jj_la1[186] = jj_gen; + jj_la1[185] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5863,15 +5856,15 @@ jj_consume_token(BANG); break; default: - jj_la1[187] = jj_gen; + jj_la1[186] = jj_gen; jj_consume_token(-1); throw new ParseException(); } UnaryExpression(); break; default: - jj_la1[188] = jj_gen; - if (jj_2_170(2147483647)) { + jj_la1[187] = jj_gen; + if (jj_2_171(2147483647)) { CastExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5899,7 +5892,7 @@ PostfixExpression(); break; default: - jj_la1[189] = jj_gen; + jj_la1[188] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5913,11 +5906,11 @@ final public void PostfixExpression() throws ParseException { trace_call("PostfixExpression"); try { - if (jj_2_173(2)) { + if (jj_2_174(2)) { Primary(); label_91: while (true) { - if (jj_2_171(2)) { + if (jj_2_172(2)) { ; } else { break label_91; @@ -5930,7 +5923,7 @@ jj_consume_token(DECR); break; default: - jj_la1[190] = jj_gen; + jj_la1[189] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5942,7 +5935,7 @@ ExpressionName(); label_92: while (true) { - if (jj_2_172(2)) { + if (jj_2_173(2)) { ; } else { break label_92; @@ -5955,14 +5948,14 @@ jj_consume_token(DECR); break; default: - jj_la1[191] = jj_gen; + jj_la1[190] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } break; default: - jj_la1[192] = jj_gen; + jj_la1[191] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5996,10 +5989,10 @@ final public void CastLookahead() throws ParseException { trace_call("CastLookahead"); try { - if (jj_2_174(2)) { + if (jj_2_175(2)) { jj_consume_token(LPAREN); PrimitiveType(); - } else if (jj_2_175(2147483647)) { + } else if (jj_2_176(2147483647)) { jj_consume_token(LPAREN); Type(); jj_consume_token(LBRACKET); @@ -6041,13 +6034,13 @@ Literal(); break; default: - jj_la1[193] = jj_gen; + jj_la1[192] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[194] = jj_gen; + jj_la1[193] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6060,7 +6053,7 @@ final public void CastExpression() throws ParseException { trace_call("CastExpression"); try { - if (jj_2_177(3)) { + if (jj_2_178(3)) { jj_consume_token(LPAREN); PrimitiveType(); jj_consume_token(RPAREN); @@ -6077,13 +6070,13 @@ ; break; default: - jj_la1[195] = jj_gen; + jj_la1[194] = jj_gen; break label_93; } AdditionalBound(); } jj_consume_token(RPAREN); - if (jj_2_176(3)) { + if (jj_2_177(3)) { UnaryExpressionNotPlusMinus(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -6092,14 +6085,14 @@ LambdaExpression(); break; default: - jj_la1[196] = jj_gen; + jj_la1[195] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } break; default: - jj_la1[197] = jj_gen; + jj_la1[196] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7348,6 +7341,13 @@ finally { jj_save(176, xla); } } + private boolean jj_2_178(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_178(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(177, xla); } + } + private boolean jj_3R_161() { Token xsp; xsp = jj_scanpos; @@ -9319,7 +9319,7 @@ return false; } - private boolean jj_3_176() { + private boolean jj_3_177() { if (jj_3R_217()) return true; return false; } @@ -9406,21 +9406,21 @@ } if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; - if (jj_3_176()) { + if (jj_3_177()) { jj_scanpos = xsp; if (jj_3R_468()) return true; } return false; } - private boolean jj_3_175() { + private boolean jj_3_176() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_216()) return true; if (jj_scan_token(LBRACKET)) return true; return false; } - private boolean jj_3_177() { + private boolean jj_3_178() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_94()) return true; if (jj_scan_token(RPAREN)) return true; @@ -9431,7 +9431,7 @@ private boolean jj_3R_393() { Token xsp; xsp = jj_scanpos; - if (jj_3_177()) { + if (jj_3_178()) { jj_scanpos = xsp; if (jj_3R_430()) return true; } @@ -9475,12 +9475,6 @@ return false; } - private boolean jj_3_22() { - if (jj_scan_token(DOT)) return true; - if (jj_scan_token(76)) return true; - return false; - } - private boolean jj_3R_324() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_216()) return true; @@ -9489,6 +9483,12 @@ return false; } + private boolean jj_3_22() { + if (jj_scan_token(DOT)) return true; + if (jj_scan_token(76)) return true; + return false; + } + private boolean jj_3R_194() { if (jj_3R_138()) return true; return false; @@ -9500,7 +9500,7 @@ return false; } - private boolean jj_3_174() { + private boolean jj_3_175() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_94()) return true; return false; @@ -9509,7 +9509,7 @@ private boolean jj_3R_215() { Token xsp; xsp = jj_scanpos; - if (jj_3_174()) { + if (jj_3_175()) { jj_scanpos = xsp; if (jj_3R_324()) { jj_scanpos = xsp; @@ -9524,12 +9524,7 @@ return false; } - private boolean jj_3_10() { - if (jj_3R_101()) return true; - return false; - } - - private boolean jj_3_172() { + private boolean jj_3_173() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(101)) { @@ -9539,6 +9534,11 @@ return false; } + private boolean jj_3_10() { + if (jj_3R_101()) return true; + return false; + } + private boolean jj_3R_254() { if (jj_scan_token(THIS)) return true; Token xsp; @@ -9576,7 +9576,7 @@ return false; } - private boolean jj_3_171() { + private boolean jj_3_172() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(101)) { @@ -9616,12 +9616,12 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_172()) { jj_scanpos = xsp; break; } + if (jj_3_173()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_170() { + private boolean jj_3_171() { if (jj_3R_215()) return true; return false; } @@ -9631,12 +9631,12 @@ return false; } - private boolean jj_3_173() { + private boolean jj_3_174() { if (jj_3R_119()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_171()) { jj_scanpos = xsp; break; } + if (jj_3_172()) { jj_scanpos = xsp; break; } } return false; } @@ -9644,13 +9644,18 @@ private boolean jj_3R_287() { Token xsp; xsp = jj_scanpos; - if (jj_3_173()) { + if (jj_3_174()) { jj_scanpos = xsp; if (jj_3R_379()) return true; } return false; } + private boolean jj_3R_329() { + if (jj_3R_287()) return true; + return false; + } + private boolean jj_3R_333() { Token xsp; xsp = jj_scanpos; @@ -9662,8 +9667,8 @@ return false; } - private boolean jj_3R_329() { - if (jj_3R_287()) return true; + private boolean jj_3R_328() { + if (jj_3R_393()) return true; return false; } @@ -9672,11 +9677,6 @@ return false; } - private boolean jj_3R_328() { - if (jj_3R_393()) return true; - return false; - } - private boolean jj_3R_217() { Token xsp; xsp = jj_scanpos; @@ -9730,17 +9730,7 @@ return false; } - private boolean jj_3R_104() { - if (jj_3R_155()) return true; - return false; - } - - private boolean jj_3_17() { - if (jj_3R_107()) return true; - return false; - } - - private boolean jj_3_168() { + private boolean jj_3_169() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(103)) { @@ -9751,33 +9741,23 @@ return false; } - private boolean jj_3_16() { - if (jj_3R_106()) return true; + private boolean jj_3R_104() { + if (jj_3R_155()) return true; return false; } - private boolean jj_3R_332() { - Token xsp; - xsp = jj_scanpos; - if (jj_3_16()) { - jj_scanpos = xsp; - if (jj_3_17()) return true; - } + private boolean jj_3_17() { + if (jj_3R_107()) return true; return false; } - private boolean jj_3R_459() { - if (jj_3R_464()) return true; - return false; - } - private boolean jj_3R_168() { if (jj_scan_token(INCR)) return true; if (jj_3R_214()) return true; return false; } - private boolean jj_3_169() { + private boolean jj_3_170() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(105)) { @@ -9791,6 +9771,26 @@ return false; } + private boolean jj_3R_459() { + if (jj_3R_464()) return true; + return false; + } + + private boolean jj_3_16() { + if (jj_3R_106()) return true; + return false; + } + + private boolean jj_3R_332() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_16()) { + jj_scanpos = xsp; + if (jj_3_17()) return true; + } + return false; + } + private boolean jj_3_9() { if (jj_scan_token(DOT)) return true; Token xsp; @@ -9804,6 +9804,11 @@ return false; } + private boolean jj_3R_323() { + if (jj_3R_217()) return true; + return false; + } + private boolean jj_3R_223() { if (jj_3R_332()) return true; Token xsp; @@ -9814,18 +9819,13 @@ return false; } - private boolean jj_3R_323() { - if (jj_3R_217()) return true; - return false; - } - private boolean jj_3R_322() { if (jj_scan_token(MINUS)) return true; if (jj_3R_214()) return true; return false; } - private boolean jj_3_167() { + private boolean jj_3_168() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(111)) { @@ -9856,6 +9856,11 @@ return false; } + private boolean jj_3R_320() { + if (jj_3R_169()) return true; + return false; + } + private boolean jj_3R_101() { if (jj_scan_token(LT)) return true; if (jj_3R_223()) return true; @@ -9863,11 +9868,6 @@ return false; } - private boolean jj_3R_320() { - if (jj_3R_169()) return true; - return false; - } - private boolean jj_3_15() { if (jj_3R_96()) return true; Token xsp; @@ -9902,7 +9902,7 @@ return false; } - private boolean jj_3_166() { + private boolean jj_3_167() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(90)) { @@ -9922,13 +9922,7 @@ return false; } - private boolean jj_3R_225() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_3R_100()) return true; - return false; - } - - private boolean jj_3_165() { + private boolean jj_3_166() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(95)) { @@ -9939,12 +9933,18 @@ return false; } + private boolean jj_3R_225() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_3R_100()) return true; + return false; + } + private boolean jj_3R_213() { if (jj_3R_214()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_169()) { jj_scanpos = xsp; break; } + if (jj_3_170()) { jj_scanpos = xsp; break; } } return false; } @@ -9965,12 +9965,12 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_168()) { jj_scanpos = xsp; break; } + if (jj_3_169()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_164() { + private boolean jj_3_165() { if (jj_scan_token(BIT_AND)) return true; if (jj_3R_209()) return true; return false; @@ -9993,32 +9993,32 @@ return false; } - private boolean jj_3_126() { - if (jj_3R_192()) return true; - return false; - } - private boolean jj_3R_211() { if (jj_3R_212()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_167()) { jj_scanpos = xsp; break; } + if (jj_3_168()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_224() { - if (jj_3R_155()) return true; + private boolean jj_3_126() { + if (jj_3R_192()) return true; return false; } - private boolean jj_3_162() { + private boolean jj_3_163() { if (jj_scan_token(BIT_OR)) return true; if (jj_3R_207()) return true; return false; } + private boolean jj_3R_224() { + if (jj_3R_155()) return true; + return false; + } + private boolean jj_3R_103() { Token xsp; while (true) { @@ -10039,7 +10039,7 @@ return false; } - private boolean jj_3_163() { + private boolean jj_3_164() { if (jj_scan_token(XOR)) return true; if (jj_3R_208()) return true; return false; @@ -10050,34 +10050,34 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_166()) { jj_scanpos = xsp; break; } + if (jj_3_167()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_161() { + private boolean jj_3_162() { if (jj_scan_token(SC_AND)) return true; if (jj_3R_206()) return true; return false; } - private boolean jj_3_13() { - if (jj_3R_97()) return true; - if (jj_3R_103()) return true; - return false; - } - private boolean jj_3R_209() { if (jj_3R_210()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_165()) { jj_scanpos = xsp; break; } + if (jj_3_166()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_160() { + private boolean jj_3_13() { + if (jj_3R_97()) return true; + if (jj_3R_103()) return true; + return false; + } + + private boolean jj_3_161() { if (jj_scan_token(SC_OR)) return true; if (jj_3R_205()) return true; return false; @@ -10089,6 +10089,16 @@ return false; } + private boolean jj_3R_208() { + if (jj_3R_209()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_165()) { jj_scanpos = xsp; break; } + } + return false; + } + private boolean jj_3R_98() { Token xsp; xsp = jj_scanpos; @@ -10108,17 +10118,7 @@ return false; } - private boolean jj_3R_208() { - if (jj_3R_209()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_164()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3_159() { + private boolean jj_3_160() { if (jj_scan_token(HOOK)) return true; if (jj_3R_118()) return true; if (jj_scan_token(COLON)) return true; @@ -10136,6 +10136,16 @@ return false; } + private boolean jj_3R_207() { + if (jj_3R_208()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_164()) { jj_scanpos = xsp; break; } + } + return false; + } + private boolean jj_3R_97() { Token xsp; while (true) { @@ -10146,8 +10156,8 @@ return false; } - private boolean jj_3R_207() { - if (jj_3R_208()) return true; + private boolean jj_3R_206() { + if (jj_3R_207()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -10161,8 +10171,13 @@ return false; } - private boolean jj_3R_206() { - if (jj_3R_207()) return true; + private boolean jj_3R_222() { + if (jj_3R_155()) return true; + return false; + } + + private boolean jj_3R_205() { + if (jj_3R_206()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -10171,11 +10186,6 @@ return false; } - private boolean jj_3R_222() { - if (jj_3R_155()) return true; - return false; - } - private boolean jj_3R_99() { Token xsp; while (true) { @@ -10192,22 +10202,12 @@ return false; } - private boolean jj_3R_205() { - if (jj_3R_206()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_161()) { jj_scanpos = xsp; break; } - } - return false; - } - private boolean jj_3R_263() { if (jj_3R_205()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_160()) { jj_scanpos = xsp; break; } + if (jj_3_161()) { jj_scanpos = xsp; break; } } return false; } @@ -10236,7 +10236,7 @@ if (jj_3R_263()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3_159()) jj_scanpos = xsp; + if (jj_3_160()) jj_scanpos = xsp; return false; } @@ -10283,7 +10283,7 @@ return false; } - private boolean jj_3_158() { + private boolean jj_3_159() { if (jj_3R_188()) return true; return false; } @@ -10333,7 +10333,7 @@ return false; } - private boolean jj_3_157() { + private boolean jj_3_158() { if (jj_3R_187()) return true; return false; } @@ -10377,46 +10377,58 @@ return false; } - private boolean jj_3R_95() { + private boolean jj_3R_284() { Token xsp; xsp = jj_scanpos; - if (jj_3R_219()) { + if (jj_3R_375()) { jj_scanpos = xsp; - if (jj_3R_220()) return true; + if (jj_3R_376()) { + jj_scanpos = xsp; + if (jj_3R_377()) return true; } + } return false; } - private boolean jj_3R_219() { - if (jj_3R_330()) return true; + private boolean jj_3R_375() { + if (jj_3R_187()) return true; return false; } - private boolean jj_3R_284() { + private boolean jj_3R_95() { Token xsp; xsp = jj_scanpos; - if (jj_3R_375()) { + if (jj_3R_219()) { jj_scanpos = xsp; - if (jj_3R_376()) { - jj_scanpos = xsp; - if (jj_3R_377()) return true; + if (jj_3R_220()) return true; } - } return false; } - private boolean jj_3R_375() { - if (jj_3R_187()) return true; + private boolean jj_3R_219() { + if (jj_3R_330()) return true; return false; } + private boolean jj_3_157() { + if (jj_3R_154()) return true; + return false; + } + private boolean jj_3R_218() { if (jj_3R_155()) return true; return false; } + private boolean jj_3R_166() { + if (jj_3R_284()) return true; + if (jj_3R_285()) return true; + if (jj_3R_118()) return true; + return false; + } + private boolean jj_3_156() { - if (jj_3R_154()) return true; + if (jj_3R_166()) return true; return false; } @@ -10434,13 +10446,6 @@ return false; } - private boolean jj_3R_166() { - if (jj_3R_284()) return true; - if (jj_3R_285()) return true; - if (jj_3R_118()) return true; - return false; - } - private boolean jj_3R_420() { if (jj_3R_101()) return true; return false; @@ -10452,7 +10457,7 @@ } private boolean jj_3R_316() { - if (jj_3R_166()) return true; + if (jj_3R_154()) return true; return false; } @@ -10482,7 +10487,7 @@ } private boolean jj_3R_315() { - if (jj_3R_154()) return true; + if (jj_3R_166()) return true; return false; } @@ -11267,13 +11272,13 @@ return false; } - private boolean jj_3R_305() { - if (jj_3R_172()) return true; + private boolean jj_3R_458() { + if (jj_3R_456()) return true; return false; } - private boolean jj_3R_458() { - if (jj_3R_456()) return true; + private boolean jj_3R_305() { + if (jj_3R_172()) return true; return false; } @@ -11297,6 +11302,11 @@ return false; } + private boolean jj_3R_457() { + if (jj_3R_180()) return true; + return false; + } + private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; @@ -11341,11 +11351,6 @@ return false; } - private boolean jj_3R_457() { - if (jj_3R_180()) return true; - return false; - } - private boolean jj_3_112() { if (jj_3R_185()) return true; return false; @@ -11736,11 +11741,6 @@ return false; } - private boolean jj_3_104() { - if (jj_3R_177()) return true; - return false; - } - private boolean jj_3R_454() { Token xsp; xsp = jj_scanpos; @@ -11751,6 +11751,11 @@ return false; } + private boolean jj_3_104() { + if (jj_3R_177()) return true; + return false; + } + private boolean jj_3R_413() { if (jj_3R_437()) return true; return false; @@ -12062,7 +12067,7 @@ private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[198]; + final private int[] jj_la1 = new int[197]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -12076,21 +12081,21 @@ jj_la1_init_4(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x4128000,0x0,0x8000,0x4120000,0x120000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x0,0x0,0x0,0x90202000,0x0,0x0,0x0,0x0,0x80002000,0x0,0x20000000,0x0,0x80002000,0x0,0x0,0x9432a000,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x4128000,0x4128000,0x0,0x0,0x0,0x0,0x4128000,0x80002000,0x80002000,0x0,0x0,0x0,0x4128000,0x4128000,0x84128000,0x0,0x0,0x80000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84128000,0x0,0x4128000,0x0,0x4128000,0x0,0x4128000,0x0,0x4128000,0x80002000,0x0,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x9432a000,0x20000000,0x2000,0x0,0x80000000,0x80000000,0x1002000,0x1002000,0x0,0x2000,0x0,0x1000000,0x2000,0x0,0x0,0x0,0x4128000,0x0,0x4128000,0x0,0x96b3e000,0x80000000,0x0,0x0,0x0,0x693c000,0x40000,0x0,0x0,0x0,0x84128000,0x4128000,0x4128000,0x84128000,0x4128000,0x4128000,0x0,0x80000000,0x80000000,0x0,0x0,0x4128000,0x80000,0x80000,0x80000,0x80000000,0x0,0x80000,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84128000,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x0,0x4128000,0x0,0x8000,0x4120000,0x120000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x0,0x0,0x0,0x90202000,0x0,0x0,0x0,0x0,0x80002000,0x0,0x20000000,0x0,0x80002000,0x0,0x0,0x9432a000,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x4128000,0x4128000,0x0,0x0,0x0,0x0,0x4128000,0x80002000,0x80002000,0x0,0x0,0x0,0x4128000,0x4128000,0x84128000,0x0,0x0,0x80000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84128000,0x0,0x4128000,0x0,0x4128000,0x0,0x4128000,0x0,0x4128000,0x80002000,0x0,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x9432a000,0x20000000,0x2000,0x0,0x80000000,0x80000000,0x1002000,0x1002000,0x0,0x2000,0x0,0x1000000,0x2000,0x0,0x0,0x0,0x4128000,0x0,0x4128000,0x0,0x96b3e000,0x80000000,0x0,0x0,0x0,0x693c000,0x40000,0x0,0x0,0x0,0x84128000,0x4128000,0x4128000,0x84128000,0x4128000,0x4128000,0x0,0x80000000,0x80000000,0x0,0x0,0x4128000,0x80000,0x80000,0x80000,0x80000000,0x0,0x80000,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84128000,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4128000,0x0,0x0,0x4128000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x2000,0x80502,0x0,0x0,0x80502,0x80500,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x2000000,0x40,0x338200,0x0,0x100000,0x0,0x0,0x338000,0x0,0x0,0x20,0x338000,0x0,0x0,0x913b8f02,0x100000,0x0,0x10138000,0x10138000,0x0,0x0,0x0,0x80502,0x80502,0x0,0x0,0x0,0x0,0x80502,0x1338800,0x1338800,0x0,0x8000000,0x8000000,0x80080502,0x80080502,0x80502,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38000,0x8000000,0x38000,0x0,0x80502,0x0,0x82483502,0x0,0x82483502,0x0,0x82483502,0x0,0x82483502,0x338000,0x20,0x0,0x0,0x0,0x0,0x82483502,0x0,0x0,0x913b8f02,0x0,0x338000,0x0,0x120000,0x120000,0x320000,0x320000,0x0,0x20000,0x0,0x0,0x20000,0x0,0x0,0x0,0x82483502,0x0,0x82483502,0x0,0xc7ffb516,0x0,0x4,0x0,0x14,0xc7cc3502,0x0,0x0,0x4,0x4,0x82483502,0x82483502,0x82483502,0x82483502,0x82483502,0x82483502,0x0,0x0,0x0,0x0,0x0,0x82483502,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x2000,0x80000000,0x0,0x0,0x0,0x82483502,0x0,0x0,0x0,0x82483502,0x0,0x0,0x0,0x82483502,0x2001000,0x0,0x400000,0x0,0x82483502,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x80502,0x0,0x0,0x82483502,0x2400000,0x2000000,0x0,0x0,0x80,0x0,0x0,0x0,0x82483502,0x0,0x0,0x82483502,0x0,0x0,0x2000000,0x2403000,0x0,0x0,0x0,0x0,}; + jj_la1_1 = new int[] {0x2000,0x80502,0x0,0x0,0x80502,0x80500,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x2000000,0x40,0x338200,0x0,0x100000,0x0,0x0,0x338000,0x0,0x0,0x20,0x338000,0x0,0x0,0x913b8f02,0x100000,0x0,0x10138000,0x10138000,0x0,0x0,0x0,0x80502,0x80502,0x0,0x0,0x0,0x0,0x80502,0x1338800,0x1338800,0x0,0x8000000,0x8000000,0x80080502,0x80080502,0x80502,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38000,0x8000000,0x38000,0x0,0x80502,0x0,0x82483502,0x0,0x82483502,0x0,0x82483502,0x0,0x82483502,0x338000,0x20,0x0,0x0,0x0,0x0,0x82483502,0x0,0x0,0x913b8f02,0x0,0x338000,0x0,0x120000,0x120000,0x320000,0x320000,0x0,0x20000,0x0,0x0,0x20000,0x0,0x0,0x0,0x82483502,0x0,0x82483502,0x0,0xc7ffb516,0x0,0x4,0x0,0x14,0xc7cc3502,0x0,0x0,0x4,0x4,0x82483502,0x82483502,0x82483502,0x82483502,0x82483502,0x82483502,0x0,0x0,0x0,0x0,0x0,0x82483502,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x2000,0x80000000,0x0,0x0,0x0,0x82483502,0x0,0x0,0x0,0x82483502,0x0,0x0,0x0,0x82483502,0x2001000,0x0,0x400000,0x0,0x82483502,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x80502,0x0,0x0,0x82483502,0x2000000,0x0,0x0,0x80,0x0,0x0,0x0,0x82483502,0x0,0x0,0x82483502,0x0,0x0,0x2000000,0x2403000,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0xe84,0x1001000,0x1000000,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x0,0x1001000,0x400000,0x1000000,0x0,0x0,0x800000,0x1000,0x0,0x1200000,0x1000000,0x0,0x800000,0x200000,0x1000000,0x4000000,0x0,0x0,0x1000000,0x400000,0x400000,0x5221001,0x20000,0x200000,0x1000001,0x1000001,0x400000,0x2000000,0x1080000,0x0,0x0,0x4000000,0x800000,0x1000000,0x4000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x4001000,0x1000,0x1001000,0x1080000,0x400000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000,0x400000,0x220000,0x1000000,0x0,0x1000000,0x4000000,0x1001000,0x4000000,0x19009e84,0x4000000,0x19009e84,0x4000000,0x19009e84,0x4000000,0x19009e84,0x1000000,0x0,0x1001000,0x400000,0x200000,0x1000000,0x19009e84,0x8000,0x20000,0x5221001,0x0,0x1000000,0x200000,0x1000000,0x1000000,0x1000000,0x1000000,0x200000,0x1000000,0x1080000,0x0,0x1000000,0x1000,0x400000,0x20000,0x19029e84,0x400000,0x19029e84,0x400000,0x1229e86,0x1000000,0x0,0x2,0x2,0x1229e84,0x0,0x1000,0x0,0x0,0x1009e84,0x19009e84,0x1009e84,0x1009e84,0x19009e84,0x1009e84,0x400000,0x1000000,0x1000000,0x1000,0x1000,0x19009e84,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x200000,0x1000000,0x80000,0x800000,0xe84,0x0,0x4000000,0x1000000,0x4000000,0x19009e84,0x4000000,0x1000000,0x4000000,0x19009e84,0x4000000,0x1000000,0x4000000,0x19009e84,0x1000,0x4000000,0x1000,0x80000,0x19009e84,0x0,0x800000,0x0,0x400000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x0,0x1000000,0x9000,0x1001000,0x1000,0x400000,0x19029e84,0x1000,0x1000,0x2000000,0x80000000,0x4000000,0x0,0x0,0x0,0x19009e84,0x18000000,0x18000000,0x1009e84,0x0,0x0,0x1000,0x18009e84,0x8000,0x0,0x9000,0x8000,}; + jj_la1_2 = new int[] {0xe84,0x1001000,0x1000000,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x0,0x1001000,0x400000,0x1000000,0x0,0x0,0x800000,0x1000,0x0,0x1200000,0x1000000,0x0,0x800000,0x200000,0x1000000,0x4000000,0x0,0x0,0x1000000,0x400000,0x400000,0x5221001,0x20000,0x200000,0x1000001,0x1000001,0x400000,0x2000000,0x1080000,0x0,0x0,0x4000000,0x800000,0x1000000,0x4000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x4001000,0x1000,0x1001000,0x1080000,0x400000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000,0x400000,0x220000,0x1000000,0x0,0x1000000,0x4000000,0x1001000,0x4000000,0x19009e84,0x4000000,0x19009e84,0x4000000,0x19009e84,0x4000000,0x19009e84,0x1000000,0x0,0x1001000,0x400000,0x200000,0x1000000,0x19009e84,0x8000,0x20000,0x5221001,0x0,0x1000000,0x200000,0x1000000,0x1000000,0x1000000,0x1000000,0x200000,0x1000000,0x1080000,0x0,0x1000000,0x1000,0x400000,0x20000,0x19029e84,0x400000,0x19029e84,0x400000,0x1229e86,0x1000000,0x0,0x2,0x2,0x1229e84,0x0,0x1000,0x0,0x0,0x1009e84,0x19009e84,0x1009e84,0x1009e84,0x19009e84,0x1009e84,0x400000,0x1000000,0x1000000,0x1000,0x1000,0x19009e84,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x200000,0x1000000,0x80000,0x800000,0xe84,0x0,0x4000000,0x1000000,0x4000000,0x19009e84,0x4000000,0x1000000,0x4000000,0x19009e84,0x4000000,0x1000000,0x4000000,0x19009e84,0x1000,0x4000000,0x1000,0x80000,0x19009e84,0x0,0x800000,0x0,0x400000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x0,0x1000000,0x9000,0x1001000,0x1000,0x400000,0x19029e84,0x1000,0x2000000,0x80000000,0x4000000,0x0,0x0,0x0,0x19009e84,0x18000000,0x18000000,0x1009e84,0x0,0x0,0x1000,0x18009e84,0x8000,0x0,0x9000,0x8000,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x1e0,0x0,0x1e0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x1e0,0x0,0x60,0x0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x60,0x1e0,0x60,0x60,0x1e0,0x60,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x1e0,0x0,0x0,0x20000000,0x1e0,0x0,0x0,0x20000000,0x1e0,0x0,0x20000000,0x0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x0,0x7ff0000,0x4,0x10000003,0x8000,0x180,0x4600,0x1e0,0x0,0x0,0x0,0x60,0x60,0x0,0x0,0x0,0x800,0x0,0x0,}; + jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x1e0,0x0,0x1e0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x1e0,0x0,0x60,0x0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x60,0x1e0,0x60,0x60,0x1e0,0x60,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x1e0,0x0,0x0,0x20000000,0x1e0,0x0,0x0,0x20000000,0x1e0,0x0,0x20000000,0x0,0x0,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x7ff0000,0x4,0x10000003,0x8000,0x180,0x4600,0x1e0,0x0,0x0,0x0,0x60,0x60,0x0,0x0,0x0,0x800,0x0,0x0,}; } private static void jj_la1_init_4() { - jj_la1_4 = 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,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_4 = 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,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[177]; + final private JJCalls[] jj_2_rtns = new JJCalls[178]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -12105,7 +12110,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 198; i++) jj_la1[i] = -1; + for (int i = 0; i < 197; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -12120,7 +12125,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 198; i++) jj_la1[i] = -1; + for (int i = 0; i < 197; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -12131,7 +12136,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 198; i++) jj_la1[i] = -1; + for (int i = 0; i < 197; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -12142,7 +12147,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 198; i++) jj_la1[i] = -1; + for (int i = 0; i < 197; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -12152,7 +12157,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 198; i++) jj_la1[i] = -1; + for (int i = 0; i < 197; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -12162,7 +12167,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 198; i++) jj_la1[i] = -1; + for (int i = 0; i < 197; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -12281,7 +12286,7 @@ la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 198; i++) { + for (int i = 0; i < 197; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { @@ -12372,7 +12377,7 @@ private void jj_rescan_token() { jj_rescan = true; - for (int i = 0; i < 177; i++) { + for (int i = 0; i < 178; i++) { try { JJCalls p = jj_2_rtns[i]; do { @@ -12556,6 +12561,7 @@ case 174: jj_3_175(); break; case 175: jj_3_176(); break; case 176: jj_3_177(); break; + case 177: jj_3_178(); break; } } p = p.next; Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-04-18 20:41:39 UTC (rev 23497) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-04-18 20:47:14 UTC (rev 23498) @@ -2036,10 +2036,11 @@ void AssignmentExpression(): {} { + LOOKAHEAD(Assignment()) + Assignment() + | LOOKAHEAD(ConditionalExpression()) ConditionalExpression() - | - Assignment() } void Assignment(): Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java 2014-04-18 20:41:39 UTC (rev 23497) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java 2014-04-18 20:47:14 UTC (rev 23498) @@ -5,7 +5,7 @@ // System.out.println(hello == ("Hel"+lo).intern()); System.out.print("gradual underflow: " + d + "\n "); for (int i = 0; i < 4; i++) { - System.out.print(" " + (d += 100000)); + System.out.print(" " + (d /= 100000)); } // System.out.print(" " + (d /= 100000)); // int cn = rw.myNumbers(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |