From: <dal...@us...> - 2010-06-01 15:26:33
|
Revision: 17943 http://jedit.svn.sourceforge.net/jedit/?rev=17943&view=rev Author: daleanson Date: 2010-06-01 15:26:21 +0000 (Tue, 01 Jun 2010) Log Message: ----------- More work on default beautifier. Modified Paths: -------------- plugins/Beauty/trunk/src/beauty/beautifiers/DefaultBeautifier.java plugins/Beauty/trunk/src/beauty/parsers/java/JavaParser.java plugins/Beauty/trunk/src/beauty/parsers/java/JavaParserConstants.java plugins/Beauty/trunk/src/beauty/parsers/java/JavaParserTokenManager.java plugins/Beauty/trunk/src/beauty/parsers/javacc/JavaCCParser.java plugins/Beauty/trunk/src/beauty/parsers/javacc/JavaCCParserConstants.java plugins/Beauty/trunk/src/beauty/parsers/javacc/JavaCCParserTokenManager.java plugins/Beauty/trunk/test/build.xml plugins/Beauty/trunk/test/resource/before/test_css3.css plugins/Beauty/trunk/test/test/beauty/beautifiers/DefaultBeautifierTest.java plugins/Beauty/trunk/test/test/classes/beauty/beautifiers/DefaultBeautifierTest.class Modified: plugins/Beauty/trunk/src/beauty/beautifiers/DefaultBeautifier.java =================================================================== --- plugins/Beauty/trunk/src/beauty/beautifiers/DefaultBeautifier.java 2010-06-01 15:03:39 UTC (rev 17942) +++ plugins/Beauty/trunk/src/beauty/beautifiers/DefaultBeautifier.java 2010-06-01 15:26:21 UTC (rev 17943) @@ -374,8 +374,8 @@ return sb; } String s = sb.toString(); - String regex = "(" + getLSString() + "){3,}"; - s = s.replaceAll( regex, getLineSeparator() + getLineSeparator() ); + String regex = "(([ ]|[\\t])*(" + getLSString() + ")){2,}"; + s = s.replaceAll( regex, getLineSeparator() ); return new StringBuilder( s ); } Modified: plugins/Beauty/trunk/src/beauty/parsers/java/JavaParser.java =================================================================== --- plugins/Beauty/trunk/src/beauty/parsers/java/JavaParser.java 2010-06-01 15:03:39 UTC (rev 17942) +++ plugins/Beauty/trunk/src/beauty/parsers/java/JavaParser.java 2010-06-01 15:26:21 UTC (rev 17943) @@ -852,6 +852,8 @@ } } +// TODO: try to capture line separators after commas. Long lines of array initializers +// are often split out by hand over several lines for readability. final public void ArrayInitializer() throws ParseException { jj_consume_token(LBRACE); add("{"); @@ -3584,304 +3586,299 @@ MemberValue(); } - final private boolean jj_2_1(int xla) { + private boolean jj_2_1(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_1(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(0, xla); } } - final private boolean jj_2_2(int xla) { + private boolean jj_2_2(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_2(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(1, xla); } } - final private boolean jj_2_3(int xla) { + private boolean jj_2_3(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_3(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(2, xla); } } - final private boolean jj_2_4(int xla) { + private boolean jj_2_4(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_4(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(3, xla); } } - final private boolean jj_2_5(int xla) { + private boolean jj_2_5(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_5(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(4, xla); } } - final private boolean jj_2_6(int xla) { + private boolean jj_2_6(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_6(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(5, xla); } } - final private boolean jj_2_7(int xla) { + private boolean jj_2_7(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_7(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(6, xla); } } - final private boolean jj_2_8(int xla) { + private boolean jj_2_8(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_8(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(7, xla); } } - final private boolean jj_2_9(int xla) { + private boolean jj_2_9(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_9(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(8, xla); } } - final private boolean jj_2_10(int xla) { + private boolean jj_2_10(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_10(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(9, xla); } } - final private boolean jj_2_11(int xla) { + private boolean jj_2_11(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_11(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(10, xla); } } - final private boolean jj_2_12(int xla) { + private boolean jj_2_12(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_12(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(11, xla); } } - final private boolean jj_2_13(int xla) { + private boolean jj_2_13(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_13(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(12, xla); } } - final private boolean jj_2_14(int xla) { + private boolean jj_2_14(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_14(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(13, xla); } } - final private boolean jj_2_15(int xla) { + private boolean jj_2_15(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_15(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(14, xla); } } - final private boolean jj_2_16(int xla) { + private boolean jj_2_16(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_16(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(15, xla); } } - final private boolean jj_2_17(int xla) { + private boolean jj_2_17(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_17(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(16, xla); } } - final private boolean jj_2_18(int xla) { + private boolean jj_2_18(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_18(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(17, xla); } } - final private boolean jj_2_19(int xla) { + private boolean jj_2_19(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_19(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(18, xla); } } - final private boolean jj_2_20(int xla) { + private boolean jj_2_20(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_20(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(19, xla); } } - final private boolean jj_2_21(int xla) { + private boolean jj_2_21(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_21(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(20, xla); } } - final private boolean jj_2_22(int xla) { + private boolean jj_2_22(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_22(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(21, xla); } } - final private boolean jj_2_23(int xla) { + private boolean jj_2_23(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_23(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(22, xla); } } - final private boolean jj_2_24(int xla) { + private boolean jj_2_24(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_24(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(23, xla); } } - final private boolean jj_2_25(int xla) { + private boolean jj_2_25(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_25(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(24, xla); } } - final private boolean jj_2_26(int xla) { + private boolean jj_2_26(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_26(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(25, xla); } } - final private boolean jj_2_27(int xla) { + private boolean jj_2_27(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_27(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(26, xla); } } - final private boolean jj_2_28(int xla) { + private boolean jj_2_28(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_28(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(27, xla); } } - final private boolean jj_2_29(int xla) { + private boolean jj_2_29(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_29(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(28, xla); } } - final private boolean jj_2_30(int xla) { + private boolean jj_2_30(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_30(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(29, xla); } } - final private boolean jj_2_31(int xla) { + private boolean jj_2_31(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_31(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(30, xla); } } - final private boolean jj_2_32(int xla) { + private boolean jj_2_32(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_32(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(31, xla); } } - final private boolean jj_2_33(int xla) { + private boolean jj_2_33(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_33(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(32, xla); } } - final private boolean jj_2_34(int xla) { + private boolean jj_2_34(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_34(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(33, xla); } } - final private boolean jj_2_35(int xla) { + private boolean jj_2_35(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_35(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(34, xla); } } - final private boolean jj_2_36(int xla) { + private boolean jj_2_36(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_36(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(35, xla); } } - final private boolean jj_2_37(int xla) { + private boolean jj_2_37(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_37(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(36, xla); } } - final private boolean jj_2_38(int xla) { + private boolean jj_2_38(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_38(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(37, xla); } } - final private boolean jj_2_39(int xla) { + private boolean jj_2_39(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_39(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(38, xla); } } - final private boolean jj_2_40(int xla) { + 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); } } - final private boolean jj_2_41(int xla) { + private boolean jj_2_41(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_41(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(40, xla); } } - final private boolean jj_3R_127() { - if (jj_scan_token(THIS)) return true; - return false; - } - - final private boolean jj_3R_126() { + private boolean jj_3R_126() { if (jj_3R_168()) return true; return false; } - final private boolean jj_3R_97() { + private boolean jj_3R_97() { Token xsp; xsp = jj_scanpos; if (jj_3R_126()) { @@ -3906,12 +3903,12 @@ return false; } - final private boolean jj_3R_336() { + private boolean jj_3R_336() { if (jj_scan_token(INCR)) return true; return false; } - final private boolean jj_3R_329() { + private boolean jj_3R_329() { Token xsp; xsp = jj_scanpos; if (jj_3R_336()) { @@ -3921,25 +3918,25 @@ return false; } - final private boolean jj_3R_80() { + private boolean jj_3R_80() { if (jj_scan_token(DOT)) return true; if (jj_3R_69()) return true; if (jj_scan_token(IDENTIFIER)) return true; return false; } - final private boolean jj_3_24() { + private boolean jj_3_24() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_76()) return true; return false; } - final private boolean jj_3R_270() { + private boolean jj_3R_270() { if (jj_scan_token(GE)) return true; return false; } - final private boolean jj_3R_66() { + private boolean jj_3R_66() { if (jj_3R_97()) return true; Token xsp; while (true) { @@ -3949,12 +3946,12 @@ return false; } - final private boolean jj_3R_310() { + private boolean jj_3R_310() { if (jj_scan_token(REM)) return true; return false; } - final private boolean jj_3R_324() { + private boolean jj_3R_324() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_61()) return true; if (jj_scan_token(RPAREN)) return true; @@ -3962,7 +3959,7 @@ return false; } - final private boolean jj_3R_323() { + private boolean jj_3R_323() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_61()) return true; if (jj_scan_token(RPAREN)) return true; @@ -3970,7 +3967,7 @@ return false; } - final private boolean jj_3R_313() { + private boolean jj_3R_313() { Token xsp; xsp = jj_scanpos; if (jj_3R_323()) { @@ -3980,14 +3977,14 @@ return false; } - final private boolean jj_3_23() { + private boolean jj_3_23() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_61()) return true; if (jj_scan_token(LBRACKET)) return true; return false; } - final private boolean jj_3R_314() { + private boolean jj_3R_314() { if (jj_3R_66()) return true; Token xsp; xsp = jj_scanpos; @@ -3995,17 +3992,17 @@ return false; } - final private boolean jj_3R_312() { + private boolean jj_3R_312() { if (jj_scan_token(BANG)) return true; return false; } - final private boolean jj_3_20() { + private boolean jj_3_20() { if (jj_3R_74()) return true; return false; } - final private boolean jj_3R_106() { + private boolean jj_3R_106() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_61()) return true; if (jj_scan_token(RPAREN)) return true; @@ -4036,17 +4033,17 @@ return false; } - final private boolean jj_3R_269() { + private boolean jj_3R_269() { if (jj_scan_token(LE)) return true; return false; } - final private boolean jj_3R_298() { + private boolean jj_3R_298() { if (jj_scan_token(MINUS)) return true; return false; } - final private boolean jj_3R_105() { + private boolean jj_3R_105() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_61()) return true; if (jj_scan_token(LBRACKET)) return true; @@ -4054,18 +4051,18 @@ return false; } - final private boolean jj_3R_309() { + private boolean jj_3R_309() { if (jj_scan_token(SLASH)) return true; return false; } - final private boolean jj_3_22() { + private boolean jj_3_22() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_76()) return true; return false; } - final private boolean jj_3R_75() { + private boolean jj_3R_75() { Token xsp; xsp = jj_scanpos; if (jj_3_22()) { @@ -4078,32 +4075,32 @@ return false; } - final private boolean jj_3_21() { + private boolean jj_3_21() { if (jj_3R_75()) return true; return false; } - final private boolean jj_3_19() { + private boolean jj_3_19() { if (jj_3R_73()) return true; return false; } - final private boolean jj_3R_301() { + private boolean jj_3R_301() { if (jj_3R_314()) return true; return false; } - final private boolean jj_3R_311() { + private boolean jj_3R_311() { if (jj_scan_token(TILDE)) return true; return false; } - final private boolean jj_3R_300() { + private boolean jj_3R_300() { if (jj_3R_313()) return true; return false; } - final private boolean jj_3R_299() { + private boolean jj_3R_299() { Token xsp; xsp = jj_scanpos; if (jj_3R_311()) { @@ -4114,7 +4111,7 @@ return false; } - final private boolean jj_3R_282() { + private boolean jj_3R_282() { Token xsp; xsp = jj_scanpos; if (jj_3R_299()) { @@ -4127,28 +4124,28 @@ return false; } - final private boolean jj_3R_281() { + private boolean jj_3R_281() { if (jj_scan_token(MINUS)) return true; return false; } - final private boolean jj_3R_268() { + private boolean jj_3R_268() { if (jj_scan_token(GT)) return true; return false; } - final private boolean jj_3R_297() { + private boolean jj_3R_297() { if (jj_scan_token(PLUS)) return true; return false; } - final private boolean jj_3R_213() { + private boolean jj_3R_213() { if (jj_scan_token(DECR)) return true; if (jj_3R_66()) return true; return false; } - final private boolean jj_3R_279() { + private boolean jj_3R_279() { Token xsp; xsp = jj_scanpos; if (jj_3R_297()) { @@ -4159,17 +4156,17 @@ return false; } - final private boolean jj_3R_308() { + private boolean jj_3R_308() { if (jj_scan_token(STAR)) return true; return false; } - final private boolean jj_3R_255() { + private boolean jj_3R_255() { if (jj_scan_token(NE)) return true; return false; } - final private boolean jj_3R_296() { + private boolean jj_3R_296() { Token xsp; xsp = jj_scanpos; if (jj_3R_308()) { @@ -4183,23 +4180,23 @@ return false; } - final private boolean jj_3R_212() { + private boolean jj_3R_212() { if (jj_scan_token(INCR)) return true; if (jj_3R_66()) return true; return false; } - final private boolean jj_3R_72() { + private boolean jj_3R_72() { if (jj_scan_token(LSHIFT)) return true; return false; } - final private boolean jj_3R_274() { + private boolean jj_3R_274() { if (jj_3R_282()) return true; return false; } - final private boolean jj_3_18() { + private boolean jj_3_18() { Token xsp; xsp = jj_scanpos; if (jj_3R_72()) { @@ -4213,22 +4210,22 @@ return false; } - final private boolean jj_3R_273() { + private boolean jj_3R_273() { if (jj_3R_213()) return true; return false; } - final private boolean jj_3R_280() { + private boolean jj_3R_280() { if (jj_scan_token(PLUS)) return true; return false; } - final private boolean jj_3R_272() { + private boolean jj_3R_272() { if (jj_3R_212()) return true; return false; } - final private boolean jj_3R_260() { + private boolean jj_3R_260() { Token xsp; xsp = jj_scanpos; if (jj_3R_271()) { @@ -4244,7 +4241,7 @@ return false; } - final private boolean jj_3R_271() { + private boolean jj_3R_271() { Token xsp; xsp = jj_scanpos; if (jj_3R_280()) { @@ -4255,12 +4252,12 @@ return false; } - final private boolean jj_3R_267() { + private boolean jj_3R_267() { if (jj_scan_token(LT)) return true; return false; } - final private boolean jj_3R_259() { + private boolean jj_3R_259() { Token xsp; xsp = jj_scanpos; if (jj_3R_267()) { @@ -4277,13 +4274,13 @@ return false; } - final private boolean jj_3R_253() { + private boolean jj_3R_253() { if (jj_scan_token(INSTANCEOF)) return true; if (jj_3R_61()) return true; return false; } - final private boolean jj_3R_256() { + private boolean jj_3R_256() { if (jj_3R_260()) return true; Token xsp; while (true) { @@ -4293,12 +4290,12 @@ return false; } - final private boolean jj_3R_254() { + private boolean jj_3R_254() { if (jj_scan_token(EQ)) return true; return false; } - final private boolean jj_3R_250() { + private boolean jj_3R_250() { Token xsp; xsp = jj_scanpos; if (jj_3R_254()) { @@ -4309,7 +4306,7 @@ return false; } - final private boolean jj_3R_251() { + private boolean jj_3R_251() { if (jj_3R_256()) return true; Token xsp; while (true) { @@ -4319,7 +4316,7 @@ return false; } - final private boolean jj_3R_244() { + private boolean jj_3R_244() { if (jj_3R_251()) return true; Token xsp; while (true) { @@ -4329,13 +4326,13 @@ return false; } - final private boolean jj_3R_243() { + private boolean jj_3R_243() { if (jj_scan_token(BIT_AND)) return true; if (jj_3R_226()) return true; return false; } - final private boolean jj_3R_240() { + private boolean jj_3R_240() { if (jj_3R_244()) return true; Token xsp; while (true) { @@ -4345,13 +4342,13 @@ return false; } - final private boolean jj_3R_233() { + private boolean jj_3R_233() { if (jj_scan_token(BIT_OR)) return true; if (jj_3R_211()) return true; return false; } - final private boolean jj_3R_234() { + private boolean jj_3R_234() { if (jj_3R_240()) return true; Token xsp; xsp = jj_scanpos; @@ -4359,19 +4356,19 @@ return false; } - final private boolean jj_3R_239() { + private boolean jj_3R_239() { if (jj_scan_token(XOR)) return true; if (jj_3R_219()) return true; return false; } - final private boolean jj_3R_225() { + private boolean jj_3R_225() { if (jj_scan_token(SC_AND)) return true; if (jj_3R_196()) return true; return false; } - final private boolean jj_3R_226() { + private boolean jj_3R_226() { if (jj_3R_234()) return true; Token xsp; while (true) { @@ -4381,13 +4378,13 @@ return false; } - final private boolean jj_3R_218() { + private boolean jj_3R_218() { if (jj_scan_token(SC_OR)) return true; if (jj_3R_170()) return true; return false; } - final private boolean jj_3R_210() { + private boolean jj_3R_210() { if (jj_scan_token(HOOK)) return true; if (jj_3R_71()) return true; if (jj_scan_token(COLON)) return true; @@ -4395,7 +4392,7 @@ return false; } - final private boolean jj_3R_219() { + private boolean jj_3R_219() { if (jj_3R_226()) return true; Token xsp; while (true) { @@ -4405,7 +4402,7 @@ return false; } - final private boolean jj_3R_211() { + private boolean jj_3R_211() { if (jj_3R_219()) return true; Token xsp; while (true) { @@ -4415,7 +4412,7 @@ return false; } - final private boolean jj_3R_196() { + private boolean jj_3R_196() { if (jj_3R_211()) return true; Token xsp; while (true) { @@ -4425,7 +4422,7 @@ return false; } - final private boolean jj_3R_170() { + private boolean jj_3R_170() { if (jj_3R_196()) return true; Token xsp; while (true) { @@ -4435,7 +4432,7 @@ return false; } - final private boolean jj_3R_137() { + private boolean jj_3R_137() { if (jj_3R_170()) return true; Token xsp; while (true) { @@ -4445,7 +4442,7 @@ return false; } - final private boolean jj_3R_102() { + private boolean jj_3R_102() { if (jj_3R_137()) return true; Token xsp; xsp = jj_scanpos; @@ -4453,7 +4450,7 @@ return false; } - final private boolean jj_3R_70() { + private boolean jj_3R_70() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(82)) { @@ -4493,13 +4490,13 @@ return false; } - final private boolean jj_3_17() { + private boolean jj_3_17() { if (jj_3R_70()) return true; if (jj_3R_71()) return true; return false; } - final private boolean jj_3R_71() { + private boolean jj_3R_71() { if (jj_3R_102()) return true; Token xsp; xsp = jj_scanpos; @@ -4507,23 +4504,23 @@ return false; } - final private boolean jj_3R_342() { + private boolean jj_3R_342() { if (jj_scan_token(COMMA)) return true; return false; } - final private boolean jj_3R_322() { + private boolean jj_3R_322() { if (jj_scan_token(COMMA)) return true; if (jj_3R_82()) return true; return false; } - final private boolean jj_3_15() { + private boolean jj_3_15() { if (jj_3R_69()) return true; return false; } - final private boolean jj_3R_306() { + private boolean jj_3R_306() { if (jj_3R_82()) return true; Token xsp; while (true) { @@ -4533,13 +4530,13 @@ return false; } - final private boolean jj_3_16() { + private boolean jj_3_16() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(IDENTIFIER)) return true; return false; } - final private boolean jj_3R_82() { + private boolean jj_3R_82() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; while (true) { @@ -4549,17 +4546,17 @@ return false; } - final private boolean jj_3R_111() { + private boolean jj_3R_111() { if (jj_3R_61()) return true; return false; } - final private boolean jj_3R_110() { + private boolean jj_3R_110() { if (jj_scan_token(VOID)) return true; return false; } - final private boolean jj_3R_78() { + private boolean jj_3R_78() { Token xsp; xsp = jj_scanpos; if (jj_3R_110()) { @@ -4569,36 +4566,36 @@ return false; } - final private boolean jj_3R_224() { + private boolean jj_3R_224() { if (jj_scan_token(COMMA)) return true; if (jj_3R_101()) return true; return false; } - final private boolean jj_3_40() { + private boolean jj_3_40() { if (jj_scan_token(COMMA)) return true; if (jj_3R_84()) return true; return false; } - final private boolean jj_3_41() { + private boolean jj_3_41() { if (jj_3R_61()) return true; if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(LPAREN)) return true; return false; } - final private boolean jj_3R_236() { + private boolean jj_3R_236() { if (jj_3R_241()) return true; return false; } - final private boolean jj_3_13() { + private boolean jj_3_13() { if (jj_3R_69()) return true; return false; } - final private boolean jj_3R_76() { + private boolean jj_3R_76() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(10)) { @@ -4626,25 +4623,25 @@ return false; } - final private boolean jj_3R_321() { + private boolean jj_3R_321() { if (jj_scan_token(COMMA)) return true; if (jj_3R_320()) return true; return false; } - final private boolean jj_3_12() { + private boolean jj_3_12() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - final private boolean jj_3R_246() { + private boolean jj_3R_246() { if (jj_scan_token(SUPER)) return true; if (jj_3R_68()) return true; return false; } - final private boolean jj_3R_241() { + private boolean jj_3R_241() { Token xsp; xsp = jj_scanpos; if (jj_3R_245()) { @@ -4654,18 +4651,18 @@ return false; } - final private boolean jj_3R_245() { + private boolean jj_3R_245() { if (jj_scan_token(EXTENDS)) return true; if (jj_3R_68()) return true; return false; } - final private boolean jj_3R_248() { + private boolean jj_3R_248() { if (jj_scan_token(COMMA)) return true; return false; } - final private boolean jj_3R_136() { + private boolean jj_3R_136() { if (jj_scan_token(HOOK)) return true; Token xsp; xsp = jj_scanpos; @@ -4673,12 +4670,12 @@ return false; } - final private boolean jj_3R_135() { + private boolean jj_3R_135() { if (jj_3R_68()) return true; return false; } - final private boolean jj_3R_101() { + private boolean jj_3R_101() { Token xsp; xsp = jj_scanpos; if (jj_3R_135()) { @@ -4688,18 +4685,18 @@ return false; } - final private boolean jj_3R_327() { + private boolean jj_3R_327() { if (jj_3R_328()) return true; return false; } - final private boolean jj_3_11() { + private boolean jj_3_11() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - final private boolean jj_3R_69() { + private boolean jj_3R_69() { if (jj_scan_token(LT)) return true; if (jj_3R_101()) return true; Token xsp; @@ -4711,7 +4708,7 @@ return false; } - final private boolean jj_3R_139() { + private boolean jj_3R_139() { if (jj_scan_token(LBRACE)) return true; if (jj_3R_84()) return true; Token xsp; @@ -4725,13 +4722,13 @@ return false; } - final private boolean jj_3R_335() { + private boolean jj_3R_335() { if (jj_scan_token(COMMA)) return true; if (jj_3R_334()) return true; return false; } - final private boolean jj_3_14() { + private boolean jj_3_14() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(IDENTIFIER)) return true; Token xsp; @@ -4740,13 +4737,13 @@ return false; } - final private boolean jj_3R_287() { + private boolean jj_3R_287() { if (jj_scan_token(THROWS)) return true; if (jj_3R_306()) return true; return false; } - final private boolean jj_3R_134() { + private boolean jj_3R_134() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; @@ -4758,22 +4755,22 @@ return false; } - final private boolean jj_3R_115() { + private boolean jj_3R_115() { if (jj_3R_102()) return true; return false; } - final private boolean jj_3R_114() { + private boolean jj_3R_114() { if (jj_3R_139()) return true; return false; } - final private boolean jj_3R_113() { + private boolean jj_3R_113() { if (jj_3R_88()) return true; return false; } - final private boolean jj_3R_84() { + private boolean jj_3R_84() { Token xsp; xsp = jj_scanpos; if (jj_3R_113()) { @@ -4786,7 +4783,7 @@ return false; } - final private boolean jj_3R_100() { + private boolean jj_3R_100() { if (jj_3R_134()) return true; Token xsp; while (true) { @@ -4796,7 +4793,7 @@ return false; } - final private boolean jj_3R_99() { + private boolean jj_3R_99() { if (jj_3R_76()) return true; Token xsp; if (jj_3_11()) return true; @@ -4807,7 +4804,7 @@ return false; } - final private boolean jj_3R_68() { + private boolean jj_3R_68() { Token xsp; xsp = jj_scanpos; if (jj_3R_99()) { @@ -4817,14 +4814,14 @@ return false; } - final private boolean jj_3R_334() { + private boolean jj_3R_334() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(ASSIGN)) return true; if (jj_3R_84()) return true; return false; } - final private boolean jj_3R_305() { + private boolean jj_3R_305() { if (jj_3R_320()) return true; Token xsp; while (true) { @@ -4834,22 +4831,22 @@ return false; } - final private boolean jj_3R_90() { + private boolean jj_3R_90() { if (jj_3R_76()) return true; return false; } - final private boolean jj_3R_326() { + private boolean jj_3R_326() { if (jj_scan_token(ELLIPSIS)) return true; return false; } - final private boolean jj_3_10() { + private boolean jj_3_10() { if (jj_3R_68()) return true; return false; } - final private boolean jj_3R_61() { + private boolean jj_3R_61() { Token xsp; xsp = jj_scanpos; if (jj_3_10()) { @@ -4859,7 +4856,7 @@ return false; } - final private boolean jj_3R_328() { + private boolean jj_3R_328() { if (jj_3R_334()) return true; Token xsp; while (true) { @@ -4869,19 +4866,19 @@ return false; } - final private boolean jj_3R_83() { + private boolean jj_3R_83() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(ASSIGN)) return true; return false; } - final private boolean jj_3R_307() { + private boolean jj_3R_307() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - final private boolean jj_3R_165() { + private boolean jj_3R_165() { if (jj_scan_token(AT)) return true; if (jj_3R_82()) return true; if (jj_scan_token(LPAREN)) return true; @@ -4890,19 +4887,19 @@ return false; } - final private boolean jj_3R_91() { + private boolean jj_3R_91() { if (jj_scan_token(STATIC)) return true; return false; } - final private boolean jj_3_9() { + private boolean jj_3_9() { if (jj_scan_token(THIS)) return true; if (jj_3R_67()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_63() { + private boolean jj_3R_63() { Token xsp; xsp = jj_scanpos; if (jj_3R_91()) jj_scanpos = xsp; @@ -4910,31 +4907,31 @@ return false; } - final private boolean jj_3R_166() { + private boolean jj_3R_166() { if (jj_scan_token(AT)) return true; if (jj_3R_82()) return true; return false; } - final private boolean jj_3_7() { + private boolean jj_3_7() { if (jj_3R_65()) return true; return false; } - final private boolean jj_3_8() { + private boolean jj_3_8() { if (jj_3R_66()) return true; if (jj_scan_token(DOT)) return true; return false; } - final private boolean jj_3_39() { + private boolean jj_3_39() { if (jj_scan_token(AT)) return true; if (jj_3R_82()) return true; if (jj_scan_token(LPAREN)) return true; return false; } - final private boolean jj_3R_96() { + private boolean jj_3R_96() { Token xsp; xsp = jj_scanpos; if (jj_3_8()) jj_scanpos = xsp; @@ -4944,7 +4941,7 @@ return false; } - final private boolean jj_3R_164() { + private boolean jj_3R_164() { if (jj_scan_token(AT)) return true; if (jj_3R_82()) return true; if (jj_scan_token(LPAREN)) return true; @@ -4955,7 +4952,7 @@ return false; } - final private boolean jj_3_38() { + private boolean jj_3_38() { if (jj_scan_token(AT)) return true; if (jj_3R_82()) return true; if (jj_scan_token(LPAREN)) return true; @@ -4968,14 +4965,14 @@ return false; } - final private boolean jj_3R_95() { + private boolean jj_3R_95() { if (jj_scan_token(THIS)) return true; if (jj_3R_67()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_65() { + private boolean jj_3R_65() { Token xsp; xsp = jj_scanpos; if (jj_3R_95()) { @@ -4985,47 +4982,47 @@ return false; } - final private boolean jj_3R_289() { + private boolean jj_3R_289() { if (jj_3R_47()) return true; return false; } - final private boolean jj_3R_288() { + private boolean jj_3R_288() { if (jj_3R_65()) return true; return false; } - final private boolean jj_3R_121() { + private boolean jj_3R_121() { if (jj_3R_166()) return true; return false; } - final private boolean jj_3_6() { + private boolean jj_3_6() { if (jj_scan_token(COMMA)) return true; if (jj_3R_64()) return true; return false; } - final private boolean jj_3R_120() { + private boolean jj_3R_120() { if (jj_3R_165()) return true; return false; } - final private boolean jj_3R_285() { + private boolean jj_3R_285() { if (jj_3R_89()) return true; return false; } - final private boolean jj_3R_119() { + private boolean jj_3R_119() { if (jj_3R_164()) return true; return false; } - final private boolean jj_3R_103() { + private boolean jj_3R_103() { return false; } - final private boolean jj_3R_88() { + private boolean jj_3R_88() { Token xsp; xsp = jj_scanpos; if (jj_3R_119()) { @@ -5038,7 +5035,7 @@ return false; } - final private boolean jj_3R_276() { + private boolean jj_3R_276() { Token xsp; xsp = jj_scanpos; if (jj_3R_285()) jj_scanpos = xsp; @@ -5057,12 +5054,12 @@ return false; } - final private boolean jj_3R_325() { + private boolean jj_3R_325() { if (jj_scan_token(FINAL)) return true; return false; } - final private boolean jj_3R_320() { + private boolean jj_3R_320() { Token xsp; xsp = jj_scanpos; if (jj_3R_325()) jj_scanpos = xsp; @@ -5073,28 +5070,28 @@ return false; } - final private boolean jj_3R_293() { + private boolean jj_3R_293() { if (jj_scan_token(THROWS)) return true; if (jj_3R_306()) return true; return false; } - final private boolean jj_3R_104() { + private boolean jj_3R_104() { return false; } - final private boolean jj_3R_73() { - lookingAhead = true; + private boolean jj_3R_73() { + jj_lookingAhead = true; jj_semLA = getToken(1).kind == GT && ((Token.GTToken)getToken(1)).realKind == RSIGNEDSHIFT; - lookingAhead = false; + jj_lookingAhead = false; if (!jj_semLA || jj_3R_103()) return true; if (jj_scan_token(GT)) return true; if (jj_scan_token(GT)) return true; return false; } - final private boolean jj_3R_286() { + private boolean jj_3R_286() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; @@ -5103,12 +5100,12 @@ return false; } - final private boolean jj_3R_295() { + private boolean jj_3R_295() { if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_247() { + private boolean jj_3R_247() { if (jj_3R_64()) return true; Token xsp; while (true) { @@ -5118,11 +5115,11 @@ return false; } - final private boolean jj_3R_74() { - lookingAhead = true; + private boolean jj_3R_74() { + jj_lookingAhead = true; jj_semLA = getToken(1).kind == GT && ((Token.GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT; - lookingAhead = false; + jj_lookingAhead = false; if (!jj_semLA || jj_3R_104()) return true; if (jj_scan_token(GT)) return true; if (jj_scan_token(GT)) return true; @@ -5130,7 +5127,7 @@ return false; } - final private boolean jj_3R_292() { + private boolean jj_3R_292() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_3R_286()) return true; Token xsp; @@ -5141,34 +5138,34 @@ return false; } - final private boolean jj_3R_206() { + private boolean jj_3R_206() { if (jj_3R_71()) return true; return false; } - final private boolean jj_3R_197() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_scan_token(RBRACKET)) return true; + private boolean jj_3R_294() { + if (jj_3R_92()) return true; return false; } - final private boolean jj_3R_294() { - if (jj_3R_92()) return true; + private boolean jj_3R_205() { + if (jj_scan_token(IDENTIFIER)) return true; return false; } - final private boolean jj_3R_205() { - if (jj_scan_token(IDENTIFIER)) return true; + private boolean jj_3R_197() { + if (jj_scan_token(LBRACKET)) return true; + if (jj_scan_token(RBRACKET)) return true; return false; } - final private boolean jj_3R_333() { + private boolean jj_3R_333() { if (jj_scan_token(FINALLY)) return true; if (jj_3R_92()) return true; return false; } - final private boolean jj_3R_332() { + private boolean jj_3R_332() { if (jj_scan_token(CATCH)) return true; if (jj_scan_token(LPAREN)) return true; if (jj_3R_320()) return true; @@ -5177,12 +5174,12 @@ return false; } - final private boolean jj_3R_291() { + private boolean jj_3R_291() { if (jj_3R_89()) return true; return false; } - final private boolean jj_3R_278() { + private boolean jj_3R_278() { Token xsp; xsp = jj_scanpos; if (jj_3R_291()) jj_scanpos = xsp; @@ -5198,7 +5195,7 @@ return false; } - final private boolean jj_3R_186() { + private boolean jj_3R_186() { if (jj_scan_token(TRY)) return true; if (jj_3R_92()) return true; Token xsp; @@ -5211,19 +5208,19 @@ return false; } - final private boolean jj_3R_172() { + private boolean jj_3R_172() { if (jj_scan_token(ASSIGN)) return true; if (jj_3R_64()) return true; return false; } - final private boolean jj_3R_290() { + private boolean jj_3R_290() { if (jj_scan_token(COMMA)) return true; if (jj_3R_141()) return true; return false; } - final private boolean jj_3R_125() { + private boolean jj_3R_125() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; @@ -5234,12 +5231,12 @@ return false; } - final private boolean jj_3R_204() { + private boolean jj_3R_204() { if (jj_scan_token(IDENTIFIER)) return true; return false; } - final private boolean jj_3R_185() { + private boolean jj_3R_185() { if (jj_scan_token(SYNCHRONIZED)) return true; if (jj_scan_token(LPAREN)) return true; if (jj_3R_71()) return true; @@ -5248,28 +5245,35 @@ return false; } - final private boolean jj_3R_341() { + private boolean jj_3R_341() { if (jj_3R_345()) return true; return false; } - final private boolean jj_3R_62() { + private boolean jj_3R_62() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - final private boolean jj_3R_94() { + private boolean jj_3R_94() { if (jj_3R_71()) return true; return false; } - final private boolean jj_3R_93() { + private boolean jj_3R_184() { + if (jj_scan_token(THROW)) return true; + if (jj_3R_71()) return true; + if (jj_scan_token(SEMICOLON)) return true; + return false; + } + + private boolean jj_3R_93() { if (jj_3R_125()) return true; return false; } - final private boolean jj_3R_64() { + private boolean jj_3R_64() { Token xsp; xsp = jj_scanpos; if (jj_3R_93()) { @@ -5279,20 +5283,22 @@ return false; } - final private boolean jj_3R_184() { - if (jj_scan_token(THROW)) return true; - if (jj_3R_71()) return true; - if (jj_scan_token(SEMICOLON)) return true; + private boolean jj_3R_346() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_175()) return true; return false; } - final private boolean jj_3R_346() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_175()) return true; + private boolean jj_3R_183() { + if (jj_scan_token(RETURN)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_206()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_171() { + private boolean jj_3R_171() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; while (true) { @@ -5302,27 +5308,27 @@ return false; } - final private boolean jj_3R_249() { + private boolean jj_3R_249() { if (jj_3R_252()) return true; return false; } - final private boolean jj_3R_183() { - if (jj_scan_token(RETURN)) return true; + private boolean jj_3R_207() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_3R_134()) return true; + return false; + } + + private boolean jj_3R_182() { + if (jj_scan_token(CONTINUE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_206()) jj_scanpos = xsp; + if (jj_3R_205()) jj_scanpos = xsp; if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_207() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_3R_134()) return true; - return false; - } - - final private boolean jj_3R_141() { + private boolean jj_3R_141() { if (jj_3R_171()) return true; Token xsp; xsp = jj_scanpos; @@ -5330,16 +5336,16 @@ return false; } - final private boolean jj_3R_182() { - if (jj_scan_token(CONTINUE)) return true; + private boolean jj_3R_181() { + if (jj_scan_token(BREAK)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_205()) jj_scanpos = xsp; + if (jj_3R_204()) jj_scanpos = xsp; if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_277() { + private boolean jj_3R_277() { if (jj_3R_61()) return true; if (jj_3R_141()) return true; Token xsp; @@ -5351,7 +5357,7 @@ return false; } - final private boolean jj_3_4() { + private boolean jj_3_4() { if (jj_3R_61()) return true; if (jj_scan_token(IDENTIFIER)) return true; Token xsp; @@ -5370,21 +5376,12 @@ return false; } - final private boolean jj_3R_181() { - if (jj_scan_token(BREAK)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_204()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - final private boolean jj_3R_60() { + private boolean jj_3R_60() { if (jj_3R_89()) return true; return false; } - final private boolean jj_3_3() { + private boolean jj_3_3() { Token xsp; xsp = jj_scanpos; if (jj_3R_60()) jj_scanpos = xsp; @@ -5393,22 +5390,17 @@ return false; } - final private boolean jj_3R_345() { + private boolean jj_3R_345() { if (jj_3R_235()) return true; return false; } - final private boolean jj_3R_266() { + private boolean jj_3R_266() { if (jj_3R_278()) return true; return false; } - final private boolean jj_3R_258() { - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - final private boolean jj_3_37() { + private boolean jj_3_37() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(26)) jj_scanpos = xsp; @@ -5417,12 +5409,12 @@ return false; } - final private boolean jj_3R_265() { - if (jj_3R_277()) return true; + private boolean jj_3R_258() { + if (jj_scan_token(SEMICOLON)) return true; return false; } - final private boolean jj_3R_235() { + private boolean jj_3R_235() { if (jj_3R_175()) return true; Token xsp; while (true) { @@ -5432,43 +5424,43 @@ return false; } - final private boolean jj_3R_340() { + private boolean jj_3R_340() { if (jj_3R_71()) return true; return false; } - final private boolean jj_3R_123() { + private boolean jj_3R_265() { + if (jj_3R_277()) return true; + return false; + } + + private boolean jj_3R_123() { if (jj_scan_token(COMMA)) return true; if (jj_3R_122()) return true; return false; } - final private boolean jj_3R_264() { + private boolean jj_3R_264() { if (jj_3R_276()) return true; return false; } - final private boolean jj_3R_263() { + private boolean jj_3R_263() { if (jj_3R_275()) return true; return false; } - final private boolean jj_3R_262() { - if (jj_3R_118()) return true; - return false; - } - - final private boolean jj_3R_228() { + private boolean jj_3R_228() { if (jj_3R_235()) return true; return false; } - final private boolean jj_3R_318() { - if (jj_3R_163()) return true; + private boolean jj_3R_262() { + if (jj_3R_118()) return true; return false; } - final private boolean jj_3R_223() { + private boolean jj_3R_223() { Token xsp; xsp = jj_scanpos; if (jj_3R_227()) { @@ -5478,17 +5470,22 @@ return false; } - final private boolean jj_3R_227() { + private boolean jj_3R_227() { if (jj_3R_116()) return true; return false; } - final private boolean jj_3R_167() { + private boolean jj_3R_318() { + if (jj_3R_163()) return true; + return false; + } + + private boolean jj_3R_167() { if (jj_3R_189()) return true; return false; } - final private boolean jj_3R_257() { + private boolean jj_3R_257() { if (jj_3R_261()) return true; Token xsp; xsp = jj_scanpos; @@ -5508,12 +5505,12 @@ return false; } - final private boolean jj_3_5() { + private boolean jj_3_5() { if (jj_3R_63()) return true; return false; } - final private boolean jj_3R_252() { + private boolean jj_3R_252() { Token xsp; xsp = jj_scanpos; if (jj_3_5()) { @@ -5526,12 +5523,19 @@ return false; } - final private boolean jj_3R_317() { + private boolean jj_3R_317() { if (jj_3R_67()) return true; return false; } - final private boolean jj_3R_163() { + private boolean jj_3_36() { + if (jj_3R_61()) return true; + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_scan_token(COLON)) return true; + return false; + } + + private boolean jj_3R_163() { if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { @@ -5542,19 +5546,17 @@ return false; } - final private boolean jj_3_36() { - if (jj_3R_61()) return true; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_scan_token(COLON)) return true; + private boolean jj_3R_319() { + if (jj_3R_252()) return true; return false; } - final private boolean jj_3R_319() { - if (jj_3R_252()) return true; + private boolean jj_3R_215() { + if (jj_3R_223()) return true; return false; } - final private boolean jj_3R_189() { + private boolean jj_3R_189() { if (jj_scan_token(EXTENDS)) return true; if (jj_3R_134()) return true; Token xsp; @@ -5565,12 +5567,7 @@ return false; } - final private boolean jj_3R_215() { - if (jj_3R_223()) return true; - return false; - } - - final private boolean jj_3R_203() { + private boolean jj_3R_203() { Token xsp; xsp = jj_scanpos; if (jj_3R_215()) jj_scanpos = xsp; @@ -5583,7 +5580,7 @@ return false; } - final private boolean jj_3R_202() { + private boolean jj_3R_202() { if (jj_3R_61()) return true; if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(COLON)) return true; @@ -5591,7 +5588,7 @@ return false; } - final private boolean jj_3R_122() { + private boolean jj_3R_122() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; @@ -5599,13 +5596,7 @@ return false; } - final private boolean jj_3R_303() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_302()) return true; - return false; - } - - final private boolean jj_3R_180() { + private boolean jj_3R_180() { if (jj_scan_token(FOR)) return true; if (jj_scan_token(LPAREN)) return true; Token xsp; @@ -5619,7 +5610,13 @@ return false; } - final private boolean jj_3R_89() { + private boolean jj_3R_303() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_302()) return true; + return false; + } + + private boolean jj_3R_89() { if (jj_scan_token(LT)) return true; if (jj_3R_122()) return true; Token xsp; @@ -5631,7 +5628,7 @@ return false; } - final private boolean jj_3R_179() { + private boolean jj_3R_179() { if (jj_scan_token(DO)) return true; if (jj_3R_117()) return true; if (jj_scan_token(WHILE)) return true; @@ -5642,7 +5639,7 @@ return false; } - final private boolean jj_3R_302() { + private boolean jj_3R_302() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; @@ -5652,7 +5649,7 @@ return false; } - final private boolean jj_3R_304() { + private boolean jj_3R_304() { if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { @@ -5662,7 +5659,7 @@ return false; } - final private boolean jj_3R_284() { + private boolean jj_3R_284() { if (jj_scan_token(LBRACE)) return true; if (jj_3R_302()) return true; Token xsp; @@ -5676,12 +5673,12 @@ return false; } - final private boolean jj_3R_283() { + private boolean jj_3R_283() { if (jj_3R_188()) return true; return false; } - final private boolean jj_3R_275() { + private boolean jj_3R_275() { if (jj_scan_token(ENUM)) return true; if (jj_scan_token(IDENTIFIER)) return true; Token xsp; @@ -5691,12 +5688,7 @@ return false; } - final private boolean jj_3R_159() { - if (jj_scan_token(INTERFACE)) return true; - return false; - } - - final private boolean jj_3R_178() { + private boolean jj_3R_178() { if (jj_scan_token(WHILE)) return true; if (jj_scan_token(LPAREN)) return true; if (jj_3R_71()) return true; @@ -5705,13 +5697,18 @@ return false; } - final private boolean jj_3R_316() { + private boolean jj_3R_159() { + if (jj_scan_token(INTERFACE)) return true; + return false; + } + + private boolean jj_3R_316() { if (jj_scan_token(COMMA)) return true; if (jj_3R_134()) return true; return false; } - final private boolean jj_3R_188() { + private boolean jj_3R_188() { if (jj_scan_token(IMPLEMENTS)) return true; if (jj_3R_134()) return true; Token xsp; @@ -5722,13 +5719,13 @@ return false; } - final private boolean jj_3R_315() { + private boolean jj_3R_315() { if (jj_scan_token(COMMA)) return true; if (jj_3R_134()) return true; return false; } - final private boolean jj_3R_187() { + private boolean jj_3R_187() { if (jj_scan_token(EXTENDS)) return true; if (jj_3R_134()) return true; Token xsp; @@ -5739,33 +5736,33 @@ return false; } - final private boolean jj_3R_162() { + private boolean jj_3R_162() { if (jj_3R_188()) return true; return false; } - final private boolean jj_3R_161() { + private boolean jj_3R_161() { if (jj_3R_187()) return true; return false; } - final private boolean jj_3R_160() { - if (jj_3R_89()) return true; + private boolean jj_3R_331() { + if (jj_scan_token(ELSE)) return true; + if (jj_3R_117()) return true; return false; } - final private boolean jj_3R_331() { - if (jj_scan_token(ELSE)) return true; - if (jj_3R_117()) return true; + private boolean jj_3R_160() { + if (jj_3R_89()) return true; return false; } - final private boolean jj_3R_158() { + private boolean jj_3R_158() { if (jj_scan_token(CLASS)) return true; return false; } - final private boolean jj_3R_118() { + private boolean jj_3R_118() { Token xsp; xsp = jj_scanpos; if (jj_3R_158()) { @@ -5783,18 +5780,18 @@ return false; } - final private boolean jj_3R_339() { + private boolean jj_3R_339() { if (jj_3R_47()) return true; return false; } - final private boolean jj_3R_142() { + private boolean jj_3R_142() { if (jj_scan_token(COMMA)) return true; if (jj_3R_141()) return true; return false; } - final private boolean jj_3R_177() { + private boolean jj_3R_177() { if (jj_scan_token(IF)) return true; if (jj_scan_token(LPAREN)) return true; if (jj_3R_71()) return true; @@ -5806,32 +5803,27 @@ return false; } - final private boolean jj_3R_59() { + private boolean jj_3R_59() { if (jj_3R_88()) return true; return false; } - final private boolean jj_3R_58() { + private boolean jj_3R_58() { if (jj_scan_token(STRICTFP)) return true; return false; } - final private boolean jj_3R_57() { + private boolean jj_3R_57() { if (jj_scan_token(VOLATILE)) return true; return false; } - final private boolean jj_3R_56() { + private boolean jj_3R_56() { if (jj_scan_token(TRANSIENT)) return true; return false; } - final private boolean jj_3R_55() { - if (jj_scan_token(NATIVE)) return true; - return false; - } - - final private boolean jj_3R_330() { + private boolean jj_3R_330() { if (jj_3R_338()) return true; Token xsp; while (true) { @@ -5841,25 +5833,25 @@ return false; } - final private boolean jj_3R_344() { + private boolean jj_3R_344() { if (jj_scan_token(_DEFAULT)) return true; if (jj_scan_token(COLON)) return true; return false; } - final private boolean jj_3R_54() { - if (jj_scan_token(SYNCHRONIZED)) return true; + private boolean jj_3R_55() { + if (jj_scan_token(NATIVE)) return true; return false; } - final private boolean jj_3R_343() { + private boolean jj_3R_343() { if (jj_scan_token(CASE)) return true; if (jj_3R_71()) return true; if (jj_scan_token(COLON)) return true; return false; } - final private boolean jj_3R_338() { + private boolean jj_3R_338() { Token xsp; xsp = jj_scanpos; if (jj_3R_343()) { @@ -5869,22 +5861,22 @@ return false; } - final private boolean jj_3R_53() { - if (jj_scan_token(ABSTRACT)) return true; + private boolean jj_3R_54() { + if (jj_scan_token(SYNCHRONIZED)) return true; return false; } - final private boolean jj_3R_52() { - if (jj_scan_token(FINAL)) return true; + private boolean jj_3R_53() { + if (jj_scan_token(ABSTRACT)) return true; return false; } - final private boolean jj_3R_51() { - if (jj_scan_token(PRIVATE)) return true; + private boolean jj_3R_52() { + if (jj_scan_token(FINAL)) return true; return false; } - final private boolean jj_3R_176() { + private boolean jj_3R_176() { if (jj_scan_token(SWITCH)) return true; if (jj_scan_token(LPAREN)) return true; if (jj_3R_71()) return true; @@ -5899,28 +5891,38 @@ return false; } - final private boolean jj_3R_50() { + private boolean jj_3R_51() { + if (jj_scan_token(PRIVATE)) return true; + return false; + } + + private boolean jj_3R_50() { if (jj_scan_token(PROTECTED)) return true; return false; } - final private boolean jj_3R_49() { + private boolean jj_3R_49() { if (jj_scan_token(STATIC)) return true; return false; } - final private boolean jj_3R_48() { + private boolean jj_3R_222() { + if (jj_3R_70()) return true; + if (jj_3R_71()) return true; + return false; + } + + private boolean jj_3R_48() { if (jj_scan_token(PUBLIC)) return true; return false; } - final private boolean jj_3R_222() { - if (jj_3R_70()) return true; - if (jj_3R_71()) return true; + private boolean jj_3R_221() { + if (jj_scan_token(DECR)) return true; return false; } - final private boolean jj_3_2() { + private boolean jj_3_2() { Token xsp; xsp = jj_scanpos; if (jj_3R_48()) { @@ -5960,7 +5962,7 @@ return false; } - final private boolean jj_3R_261() { + private boolean jj_3R_261() { Token xsp; while (true) { xsp = jj_scanpos; @@ -5969,12 +5971,7 @@ return false; } - final private boolean jj_3R_221() { - if (jj_scan_token(DECR)) return true; - return false; - } - ... [truncated message content] |