From: <dal...@us...> - 2014-04-18 14:41:52
|
Revision: 23494 http://sourceforge.net/p/jedit/svn/23494 Author: daleanson Date: 2014-04-18 14:41:49 +0000 (Fri, 18 Apr 2014) Log Message: ----------- adding test files and build file Modified Paths: -------------- plugins/JavaSideKick/trunk/clean_jj/1.8/JavaCharStream.class 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/JavaParserConstants.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserConstants.java plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserTokenManager.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserTokenManager.java plugins/JavaSideKick/trunk/clean_jj/1.8/ParseException.class plugins/JavaSideKick/trunk/clean_jj/1.8/Token.class plugins/JavaSideKick/trunk/clean_jj/1.8/Token.java plugins/JavaSideKick/trunk/clean_jj/1.8/TokenMgrError.class plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj Added Paths: ----------- plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/AmbiguousName.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ColoredPoint.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/FloatingPointOperations.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/FormalParamterList.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/GUITest.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/IntegerOperations.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/MembersOfATypeVariable.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/MethodDeclaration.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/MethodInvocation.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Move.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Point.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/RawTypes.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/RawTypes2.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/RawTypesAndInheritance.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/StringLiterals.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/TestConstructor.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/TestObjectCreation.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/TypeParameters.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/UnboundedWildcards.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/UsageOfAType.java Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaCharStream.class =================================================================== (Binary files differ) 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-17 16:54:45 UTC (rev 23493) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-04-18 14:41:49 UTC (rev 23494) @@ -28,10 +28,21 @@ try { parser.enable_tracing(); parser.CompilationUnit(); - System.out.println("JavaParser: input parsed successfully."); + if (args.length == 0) { + System.out.println("JavaParser: input parsed successfully."); + } + else if (args.length == 1) { + System.out.println("JavaParser: " + args[0] + " parsed successfully."); + } } catch (ParseException e) { - System.out.println("JavaParser: Encountered errors during parse."); - System.out.println(e.getMessage()); + if (args.length == 0) { + System.err.println("JavaParser: Encountered errors during parse."); + } + else if (args.length == 1) { + System.err.println("JavaParser: Encountered errors during parse of " + args[0]); + } + System.err.println(e.getMessage()); + System.exit(1); } } @@ -65,7 +76,26 @@ return true; } +/* >'s need special attention due to generics syntax. */ /* +TOKEN : +{ + < RUNSIGNEDSHIFT: ">>>" > + { + matchedToken.kind = GT; + ((Token.GTToken)matchedToken).realKind = RUNSIGNEDSHIFT; + input_stream.backup(2); + } +| < RSIGNEDSHIFT: ">>" > + { + matchedToken.kind = GT; + ((Token.GTToken)matchedToken).realKind = RSIGNEDSHIFT; + input_stream.backup(1); + } +| < GT: ">" > +} +*/ +/* -------------------------------------------------------------------------------- Literals */ @@ -201,40 +231,27 @@ final public void PrimitiveType() throws ParseException { trace_call("PrimitiveType"); try { - if (jj_2_2(3)) { - label_1: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AT: - ; - break; - default: - jj_la1[2] = jj_gen; - break label_1; - } - Annotation(); + label_1: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + ; + break; + default: + jj_la1[2] = jj_gen; + break label_1; } + Annotation(); + } + if (jj_2_2(2)) { NumericType(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BOOLEAN: - case AT: - label_2: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AT: - ; - break; - default: - jj_la1[3] = jj_gen; - break label_2; - } - Annotation(); - } jj_consume_token(BOOLEAN); break; default: - jj_la1[4] = jj_gen; + jj_la1[3] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -260,7 +277,7 @@ FloatingPointType(); break; default: - jj_la1[5] = jj_gen; + jj_la1[4] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -289,7 +306,7 @@ jj_consume_token(CHAR); break; default: - jj_la1[6] = jj_gen; + jj_la1[5] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -309,7 +326,7 @@ jj_consume_token(DOUBLE); break; default: - jj_la1[7] = jj_gen; + jj_la1[6] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -355,15 +372,15 @@ final public void ClassType() throws ParseException { trace_call("ClassType"); try { - label_3: + label_2: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[8] = jj_gen; - break label_3; + jj_la1[7] = jj_gen; + break label_2; } Annotation(); } @@ -373,23 +390,23 @@ } else { ; } - label_4: + label_3: while (true) { if (jj_2_9(2)) { ; } else { - break label_4; + break label_3; } jj_consume_token(DOT); - label_5: + label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[9] = jj_gen; - break label_5; + jj_la1[8] = jj_gen; + break label_4; } Annotation(); } @@ -417,15 +434,15 @@ final public void TypeVariable() throws ParseException { trace_call("TypeVariable"); try { - label_6: + label_5: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[10] = jj_gen; - break label_6; + jj_la1[9] = jj_gen; + break label_5; } Annotation(); } @@ -459,36 +476,36 @@ final public void Dims() throws ParseException { trace_call("Dims"); try { - label_7: + label_6: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[11] = jj_gen; - break label_7; + jj_la1[10] = jj_gen; + break label_6; } Annotation(); } jj_consume_token(LBRACKET); jj_consume_token(RBRACKET); - label_8: + label_7: while (true) { if (jj_2_14(2)) { ; } else { - break label_8; + break label_7; } - label_9: + label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[12] = jj_gen; - break label_9; + jj_la1[11] = jj_gen; + break label_8; } Annotation(); } @@ -503,17 +520,17 @@ final public void TypeParameter() throws ParseException { trace_call("TypeParameter"); try { - label_10: + label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[13] = jj_gen; - break label_10; + jj_la1[12] = jj_gen; + break label_9; } - TypeParameterModifier(); + Annotation(); } Identifier(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -521,7 +538,7 @@ TypeBound(); break; default: - jj_la1[14] = jj_gen; + jj_la1[13] = jj_gen; ; } } finally { @@ -529,39 +546,35 @@ } } - final public void TypeParameterModifier() throws ParseException { - trace_call("TypeParameterModifier"); - try { - Annotation(); - } finally { - trace_return("TypeParameterModifier"); - } - } - final public void TypeBound() throws ParseException { trace_call("TypeBound"); try { + jj_consume_token(EXTENDS); if (jj_2_15(3)) { - jj_consume_token(EXTENDS); - TypeVariable(); - } else if (jj_2_16(3)) { - jj_consume_token(EXTENDS); ClassOrInterfaceType(); - label_11: + label_10: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: ; break; default: - jj_la1[15] = jj_gen; - break label_11; + jj_la1[14] = jj_gen; + break label_10; } AdditionalBound(); } } else { - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + case AT: + TypeVariable(); + break; + default: + jj_la1[15] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } finally { trace_return("TypeBound"); @@ -583,7 +596,7 @@ try { jj_consume_token(LT); TypeArgumentList(); - jj_consume_token(GT); + jj_consume_token(124); } finally { trace_return("TypeArguments"); } @@ -593,7 +606,7 @@ trace_call("TypeArgumentList"); try { TypeArgument(); - label_12: + label_11: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -601,7 +614,7 @@ break; default: jj_la1[16] = jj_gen; - break label_12; + break label_11; } jj_consume_token(COMMA); TypeArgument(); @@ -614,9 +627,9 @@ final public void TypeArgument() throws ParseException { trace_call("TypeArgument"); try { - if (jj_2_17(3)) { + if (jj_2_16(3)) { ReferenceType(); - } else if (jj_2_18(3)) { + } else if (jj_2_17(3)) { Wildcard(); } else { jj_consume_token(-1); @@ -630,7 +643,7 @@ final public void Wildcard() throws ParseException { trace_call("Wildcard"); try { - label_13: + label_12: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: @@ -638,7 +651,7 @@ break; default: jj_la1[17] = jj_gen; - break label_13; + break label_12; } Annotation(); } @@ -663,17 +676,16 @@ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EXTENDS: jj_consume_token(EXTENDS); - ReferenceType(); break; case SUPER: jj_consume_token(SUPER); - ReferenceType(); break; default: jj_la1[19] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + ReferenceType(); } finally { trace_return("WildcardBounds"); } @@ -681,13 +693,14 @@ /* -------------------------------------------------------------------------------- -Productions() from §7 (Packages()) +Productions() from §7 (Packages()) -- this section is missing from Chapter 19 +see chapter 6 */ final public void PackageName() throws ParseException { trace_call("PackageName"); try { Identifier(); - label_14: + label_13: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOT: @@ -695,7 +708,7 @@ break; default: jj_la1[20] = jj_gen; - break label_14; + break label_13; } jj_consume_token(DOT); Identifier(); @@ -708,9 +721,9 @@ final public void TypeName() throws ParseException { trace_call("TypeName"); try { - if (jj_2_19(2)) { + if (jj_2_18(2)) { Identifier(); - } else if (jj_2_20(2)) { + } else if (jj_2_19(2)) { PackageOrTypeName(); jj_consume_token(DOT); Identifier(); @@ -727,12 +740,12 @@ trace_call("PackageOrTypeName"); try { Identifier(); - label_15: + label_14: while (true) { - if (jj_2_21(2)) { + if (jj_2_20(2)) { ; } else { - break label_15; + break label_14; } jj_consume_token(DOT); Identifier(); @@ -745,13 +758,54 @@ final public void ExpressionName() throws ParseException { trace_call("ExpressionName"); try { - if (jj_2_22(2)) { - AmbiguousName(); - jj_consume_token(DOT); - } else { - ; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + Identifier(); + label_15: + while (true) { + if (jj_2_21(2)) { + ; + } else { + break label_15; + } + jj_consume_token(DOT); + Identifier(); + } + if (jj_2_23(2)) { + jj_consume_token(DOT); + jj_consume_token(THIS); + label_16: + while (true) { + if (jj_2_22(2)) { + ; + } else { + break label_16; + } + jj_consume_token(DOT); + Identifier(); + } + } else { + ; + } + break; + case THIS: + jj_consume_token(THIS); + label_17: + while (true) { + if (jj_2_24(2)) { + ; + } else { + break label_17; + } + jj_consume_token(DOT); + Identifier(); + } + break; + default: + jj_la1[21] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - Identifier(); } finally { trace_return("ExpressionName"); } @@ -760,31 +814,12 @@ final public void MethodName() throws ParseException { trace_call("MethodName"); try { - Identifier(); + ExpressionName(); } finally { trace_return("MethodName"); } } - final public void AmbiguousName() throws ParseException { - trace_call("AmbiguousName"); - try { - Identifier(); - label_16: - while (true) { - if (jj_2_23(2)) { - ; - } else { - break label_16; - } - jj_consume_token(DOT); - Identifier(); - } - } finally { - trace_return("AmbiguousName"); - } - } - /* -------------------------------------------------------------------------------- Productions() from §7 (Packages()) @@ -794,24 +829,24 @@ final public void CompilationUnit() throws ParseException { trace_call("CompilationUnit"); try { - if (jj_2_24(2)) { + if (jj_2_25(2)) { PackageDeclaration(); } else { ; } - label_17: + label_18: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IMPORT: ; break; default: - jj_la1[21] = jj_gen; - break label_17; + jj_la1[22] = jj_gen; + break label_18; } ImportDeclaration(); } - label_18: + label_19: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ABSTRACT: @@ -829,8 +864,8 @@ ; break; default: - jj_la1[22] = jj_gen; - break label_18; + jj_la1[23] = jj_gen; + break label_19; } TypeDeclaration(); } @@ -842,33 +877,20 @@ final public void PackageDeclaration() throws ParseException { trace_call("PackageDeclaration"); try { - label_19: + label_20: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: ; break; default: - jj_la1[23] = jj_gen; - break label_19; + jj_la1[24] = jj_gen; + break label_20; } PackageModifier(); } jj_consume_token(PACKAGE); - Identifier(); - label_20: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOT: - ; - break; - default: - jj_la1[24] = jj_gen; - break label_20; - } - jj_consume_token(DOT); - Identifier(); - } + PackageName(); jj_consume_token(SEMICOLON); } finally { trace_return("PackageDeclaration"); @@ -887,13 +909,13 @@ final public void ImportDeclaration() throws ParseException { trace_call("ImportDeclaration"); try { - if (jj_2_25(3)) { + if (jj_2_26(3)) { SingleTypeImportDeclaration(); - } else if (jj_2_26(3)) { + } else if (jj_2_27(3)) { TypeImportOnDemandDeclaration(); - } else if (jj_2_27(3)) { + } else if (jj_2_28(3)) { SingleStaticImportDeclaration(); - } else if (jj_2_28(3)) { + } else if (jj_2_29(3)) { StaticImportOnDemandDeclaration(); } else { jj_consume_token(-1); @@ -959,9 +981,9 @@ final public void TypeDeclaration() throws ParseException { trace_call("TypeDeclaration"); try { - if (jj_2_29(3)) { + if (jj_2_30(3)) { ClassDeclaration(); - } else if (jj_2_30(3)) { + } else if (jj_2_31(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -986,9 +1008,9 @@ final public void ClassDeclaration() throws ParseException { trace_call("ClassDeclaration"); try { - if (jj_2_31(3)) { + if (jj_2_32(3)) { NormalClassDeclaration(); - } else if (jj_2_32(3)) { + } else if (jj_2_33(3)) { EnumDeclaration(); } else { jj_consume_token(-1); @@ -1096,7 +1118,7 @@ try { jj_consume_token(LT); TypeParameterList(); - jj_consume_token(GT); + jj_consume_token(124); } finally { trace_return("TypeParameters"); } @@ -1218,7 +1240,7 @@ final public void ClassBodyDeclaration() throws ParseException { trace_call("ClassBodyDeclaration"); try { - if (jj_2_33(10)) { + if (jj_2_34(3)) { ClassMemberDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1230,7 +1252,7 @@ break; default: jj_la1[34] = jj_gen; - if (jj_2_34(2)) { + if (jj_2_35(2)) { ConstructorDeclaration(); } else { jj_consume_token(-1); @@ -1246,13 +1268,13 @@ final public void ClassMemberDeclaration() throws ParseException { trace_call("ClassMemberDeclaration"); try { - if (jj_2_35(10)) { + if (jj_2_36(6)) { FieldDeclaration(); - } else if (jj_2_36(10)) { + } else if (jj_2_37(6)) { MethodDeclaration(); - } else if (jj_2_37(3)) { + } else if (jj_2_38(3)) { ClassDeclaration(); - } else if (jj_2_38(3)) { + } else if (jj_2_39(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1399,43 +1421,41 @@ final public void VariableInitializer() throws ParseException { trace_call("VariableInitializer"); try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BOOLEAN: - case BYTE: - case CHAR: - case DOUBLE: - case FLOAT: - case INT: - case LONG: - case NEW: - case NULL: - case SHORT: - case SUPER: - case THIS: - case VOID: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case CHARACTER_LITERAL: - case STRING_LITERAL: - case BOOLEAN_LITERAL: - case IDENTIFIER: - case LPAREN: - case AT: - case BANG: - case TILDE: - case INCR: - case DECR: - case PLUS: - case MINUS: + if (jj_2_40(3)) { Expression(); - break; - case LBRACE: - ArrayInitializer(); - break; - default: - jj_la1[41] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BOOLEAN: + case BYTE: + case CHAR: + case DOUBLE: + case FLOAT: + case INT: + case LONG: + case NEW: + case NULL: + case SHORT: + case SUPER: + case THIS: + case VOID: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case CHARACTER_LITERAL: + case STRING_LITERAL: + case BOOLEAN_LITERAL: + case IDENTIFIER: + case LPAREN: + case AT: + Primary(); + break; + case LBRACE: + ArrayInitializer(); + break; + default: + jj_la1[41] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } finally { trace_return("VariableInitializer"); @@ -1445,13 +1465,25 @@ final public void UnannType() throws ParseException { trace_call("UnannType"); try { - if (jj_2_39(3)) { - UnannPrimitiveType(); - } else if (jj_2_40(3)) { + if (jj_2_41(3)) { UnannReferenceType(); } else { - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BOOLEAN: + case BYTE: + case CHAR: + case DOUBLE: + case FLOAT: + case INT: + case LONG: + case SHORT: + UnannPrimitiveType(); + break; + default: + jj_la1[42] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } finally { trace_return("UnannType"); @@ -1475,7 +1507,7 @@ jj_consume_token(BOOLEAN); break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1487,12 +1519,12 @@ final public void UnannReferenceType() throws ParseException { trace_call("UnannReferenceType"); try { - if (jj_2_41(3)) { + if (jj_2_42(8)) { + UnannArrayType(); + } else if (jj_2_43(3)) { UnannClassOrInterfaceType(); - } else if (jj_2_42(3)) { + } else if (jj_2_44(3)) { UnannTypeVariable(); - } else if (jj_2_43(3)) { - UnannArrayType(); } else { jj_consume_token(-1); throw new ParseException(); @@ -1505,14 +1537,7 @@ final public void UnannClassOrInterfaceType() throws ParseException { trace_call("UnannClassOrInterfaceType"); try { - if (jj_2_44(3)) { - UnannClassType(); - } else if (jj_2_45(3)) { - UnannInterfaceType(); - } else { - jj_consume_token(-1); - throw new ParseException(); - } + UnannClassType(); } finally { trace_return("UnannClassOrInterfaceType"); } @@ -1527,7 +1552,7 @@ TypeArguments(); break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; ; } label_27: @@ -1537,7 +1562,7 @@ ; break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; break label_27; } jj_consume_token(DOT); @@ -1548,7 +1573,7 @@ ; break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; break label_28; } Annotation(); @@ -1559,7 +1584,7 @@ TypeArguments(); break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; ; } } @@ -1568,15 +1593,6 @@ } } - final public void UnannInterfaceType() throws ParseException { - trace_call("UnannInterfaceType"); - try { - UnannClassType(); - } finally { - trace_return("UnannInterfaceType"); - } - } - final public void UnannTypeVariable() throws ParseException { trace_call("UnannTypeVariable"); try { @@ -1602,11 +1618,11 @@ Dims(); break; default: - jj_la1[47] = jj_gen; - if (jj_2_46(3)) { + jj_la1[48] = jj_gen; + if (jj_2_45(3)) { UnannClassOrInterfaceType(); Dims(); - } else if (jj_2_47(3)) { + } else if (jj_2_46(3)) { UnannTypeVariable(); Dims(); } else { @@ -1638,7 +1654,7 @@ ; break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; break label_29; } MethodModifier(); @@ -1685,7 +1701,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1698,27 +1714,6 @@ trace_call("MethodHeader"); try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BOOLEAN: - case BYTE: - case CHAR: - case DOUBLE: - case FLOAT: - case INT: - case LONG: - case SHORT: - case VOID: - case IDENTIFIER: - Result(); - MethodDeclarator(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case THROWS: - Throws(); - break; - default: - jj_la1[50] = jj_gen; - ; - } - break; case LT: TypeParameters(); label_30: @@ -1744,8 +1739,29 @@ ; } break; + case BOOLEAN: + case BYTE: + case CHAR: + case DOUBLE: + case FLOAT: + case INT: + case LONG: + case SHORT: + case VOID: + case IDENTIFIER: + Result(); + MethodDeclarator(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case THROWS: + Throws(); + break; + default: + jj_la1[53] = jj_gen; + ; + } + break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1773,7 +1789,7 @@ jj_consume_token(VOID); break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1802,7 +1818,7 @@ FormalParameterList(); break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1812,7 +1828,7 @@ Dims(); break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; ; } } finally { @@ -1823,7 +1839,7 @@ final public void FormalParameterList() throws ParseException { trace_call("FormalParameterList"); try { - if (jj_2_48(3)) { + if (jj_2_47(6)) { FormalParameters(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -1831,10 +1847,10 @@ LastFormalParameter(); break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; ; } - } else if (jj_2_49(3)) { + } else if (jj_2_48(3)) { LastFormalParameter(); } else { jj_consume_token(-1); @@ -1848,11 +1864,11 @@ final public void FormalParameters() throws ParseException { trace_call("FormalParameters"); try { - if (jj_2_52(3)) { + if (jj_2_51(3)) { FormalParameter(); label_31: while (true) { - if (jj_2_50(2)) { + if (jj_2_49(2)) { ; } else { break label_31; @@ -1860,11 +1876,11 @@ jj_consume_token(COMMA); FormalParameter(); } - } else if (jj_2_53(3)) { + } else if (jj_2_52(3)) { ReceiverParameter(); label_32: while (true) { - if (jj_2_51(2)) { + if (jj_2_50(2)) { ; } else { break label_32; @@ -1892,7 +1908,7 @@ ; break; default: - jj_la1[58] = jj_gen; + jj_la1[59] = jj_gen; break label_33; } VariableModifier(); @@ -1915,7 +1931,7 @@ jj_consume_token(FINAL); break; default: - jj_la1[59] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1927,7 +1943,7 @@ final public void LastFormalParameter() throws ParseException { trace_call("LastFormalParameter"); try { - if (jj_2_54(3)) { + if (jj_2_53(3)) { label_34: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1936,7 +1952,7 @@ ; break; default: - jj_la1[60] = jj_gen; + jj_la1[61] = jj_gen; break label_34; } VariableModifier(); @@ -1949,14 +1965,14 @@ ; break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; break label_35; } Annotation(); } jj_consume_token(ELLIPSIS); VariableDeclaratorId(); - } else if (jj_2_55(3)) { + } else if (jj_2_54(3)) { FormalParameter(); } else { jj_consume_token(-1); @@ -1977,7 +1993,7 @@ ; break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; break label_36; } Annotation(); @@ -1989,7 +2005,7 @@ jj_consume_token(DOT); break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; ; } jj_consume_token(THIS); @@ -2019,7 +2035,7 @@ ; break; default: - jj_la1[64] = jj_gen; + jj_la1[65] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -2033,9 +2049,9 @@ final public void ExceptionType() throws ParseException { trace_call("ExceptionType"); try { - if (jj_2_56(3)) { + if (jj_2_55(3)) { ClassType(); - } else if (jj_2_57(3)) { + } else if (jj_2_56(3)) { TypeVariable(); } else { jj_consume_token(-1); @@ -2057,7 +2073,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[65] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2098,7 +2114,7 @@ ; break; default: - jj_la1[66] = jj_gen; + jj_la1[67] = jj_gen; break label_38; } ConstructorModifier(); @@ -2109,7 +2125,7 @@ Throws(); break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; ; } ConstructorBody(); @@ -2135,7 +2151,7 @@ jj_consume_token(PRIVATE); break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2152,7 +2168,7 @@ TypeParameters(); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; ; } SimpleTypeName(); @@ -2172,7 +2188,7 @@ FormalParameterList(); break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2194,12 +2210,12 @@ trace_call("ConstructorBody"); try { jj_consume_token(LBRACE); - if (jj_2_58(2147483647)) { + if (jj_2_57(2147483647)) { ExplicitConstructorInvocation(); } else { ; } - if (jj_2_59(10)) { + if (jj_2_58(2147483647)) { BlockStatements(); } else { ; @@ -2213,13 +2229,13 @@ final public void ExplicitConstructorInvocation() throws ParseException { trace_call("ExplicitConstructorInvocation"); try { - if (jj_2_60(3)) { + if (jj_2_59(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; ; } jj_consume_token(THIS); @@ -2255,18 +2271,18 @@ ArgumentList(); break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_61(3)) { + } else if (jj_2_60(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; ; } jj_consume_token(SUPER); @@ -2302,12 +2318,12 @@ ArgumentList(); break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_62(3)) { + } else if (jj_2_61(3)) { ExpressionName(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2315,7 +2331,7 @@ TypeArguments(); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; ; } jj_consume_token(SUPER); @@ -2351,12 +2367,12 @@ ArgumentList(); break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_63(3)) { + } else if (jj_2_62(3)) { Primary(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2364,7 +2380,7 @@ TypeArguments(); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; ; } jj_consume_token(SUPER); @@ -2400,7 +2416,7 @@ ArgumentList(); break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2431,7 +2447,7 @@ ; break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; break label_39; } ClassModifier(); @@ -2443,7 +2459,7 @@ Superinterfaces(); break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; ; } EnumBody(); @@ -2462,7 +2478,7 @@ EnumConstantList(); break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2470,7 +2486,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2478,7 +2494,7 @@ EnumBodyDeclarations(); break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; ; } jj_consume_token(RBRACE); @@ -2493,7 +2509,7 @@ EnumConstant(); label_40: while (true) { - if (jj_2_64(2)) { + if (jj_2_63(2)) { ; } else { break label_40; @@ -2516,7 +2532,7 @@ ; break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; break label_41; } EnumConstantModifier(); @@ -2556,13 +2572,13 @@ ArgumentList(); break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; ; } jj_consume_token(RPAREN); break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2570,7 +2586,7 @@ ClassBody(); break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; ; } } finally { @@ -2625,7 +2641,7 @@ ; break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; break label_42; } ClassBodyDeclaration(); @@ -2642,9 +2658,9 @@ final public void InterfaceDeclaration() throws ParseException { trace_call("InterfaceDeclaration"); try { - if (jj_2_65(3)) { + if (jj_2_64(3)) { NormalInterfaceDeclaration(); - } else if (jj_2_66(3)) { + } else if (jj_2_65(3)) { AnnotationTypeDeclaration(); } else { jj_consume_token(-1); @@ -2660,7 +2676,7 @@ try { label_43: while (true) { - if (jj_2_67(2)) { + if (jj_2_66(2)) { ; } else { break label_43; @@ -2669,7 +2685,7 @@ } jj_consume_token(INTERFACE); Identifier(); - if (jj_2_68(2)) { + if (jj_2_67(2)) { TypeParameters(); } else { ; @@ -2679,7 +2695,7 @@ ExtendsInterfaces(); break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; ; } InterfaceBody(); @@ -2714,7 +2730,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2739,7 +2755,7 @@ jj_consume_token(LBRACE); label_44: while (true) { - if (jj_2_69(2)) { + if (jj_2_68(2)) { ; } else { break label_44; @@ -2755,13 +2771,13 @@ final public void InterfaceMemberDeclaration() throws ParseException { trace_call("InterfaceMemberDeclaration"); try { - if (jj_2_70(3)) { + if (jj_2_69(3)) { ConstantDeclaration(); + } else if (jj_2_70(3)) { + InterfaceMethodDeclaration(); } else if (jj_2_71(3)) { - InterfaceMethodDeclaration(); + ClassDeclaration(); } else if (jj_2_72(3)) { - ClassDeclaration(); - } else if (jj_2_73(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2769,7 +2785,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2792,7 +2808,7 @@ ; break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; break label_45; } ConstantModifier(); @@ -2822,7 +2838,7 @@ jj_consume_token(FINAL); break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2846,7 +2862,7 @@ ; break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; break label_46; } InterfaceMethodModifier(); @@ -2881,7 +2897,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2895,7 +2911,7 @@ try { label_47: while (true) { - if (jj_2_74(2)) { + if (jj_2_73(2)) { ; } else { break label_47; @@ -2917,7 +2933,7 @@ jj_consume_token(LBRACE); label_48: while (true) { - if (jj_2_75(2)) { + if (jj_2_74(2)) { ; } else { break label_48; @@ -2933,13 +2949,13 @@ final public void AnnotationTypeMemberDeclaration() throws ParseException { trace_call("AnnotationTypeMemberDeclaration"); try { - if (jj_2_76(3)) { + if (jj_2_75(3)) { AnnotationTypeElementDeclaration(); + } else if (jj_2_76(3)) { + ConstantDeclaration(); } else if (jj_2_77(3)) { - ConstantDeclaration(); + ClassDeclaration(); } else if (jj_2_78(3)) { - ClassDeclaration(); - } else if (jj_2_79(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2947,7 +2963,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2969,7 +2985,7 @@ ; break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; break label_49; } AnnotationTypeElementModifier(); @@ -2984,7 +3000,7 @@ Dims(); break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2992,7 +3008,7 @@ DefaultValue(); break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3015,7 +3031,7 @@ jj_consume_token(ABSTRACT); break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3037,11 +3053,11 @@ final public void Annotation() throws ParseException { trace_call("Annotation"); try { - if (jj_2_80(3)) { + if (jj_2_79(3)) { NormalAnnotation(); + } else if (jj_2_80(3)) { + MarkerAnnotation(); } else if (jj_2_81(3)) { - MarkerAnnotation(); - } else if (jj_2_82(3)) { SingleElementAnnotation(); } else { jj_consume_token(-1); @@ -3063,7 +3079,7 @@ ElementValuePairList(); break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3083,7 +3099,7 @@ ; break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; break label_50; } jj_consume_token(COMMA); @@ -3108,7 +3124,7 @@ final public void ElementValue() throws ParseException { trace_call("ElementValue"); try { - if (jj_2_83(3)) { + if (jj_2_82(3)) { ConditionalExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3116,8 +3132,8 @@ ElementValueArrayInitializer(); break; default: - jj_la1[103] = jj_gen; - if (jj_2_84(3)) { + jj_la1[104] = jj_gen; + if (jj_2_83(3)) { Annotation(); } else { jj_consume_token(-1); @@ -3166,7 +3182,7 @@ ElementValueList(); break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3174,7 +3190,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3189,7 +3205,7 @@ ElementValue(); label_51: while (true) { - if (jj_2_85(2)) { + if (jj_2_84(2)) { ; } else { break label_51; @@ -3265,7 +3281,7 @@ VariableInitializerList(); break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3273,7 +3289,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3288,7 +3304,7 @@ VariableInitializer(); label_52: while (true) { - if (jj_2_86(2)) { + if (jj_2_85(2)) { ; } else { break label_52; @@ -3359,7 +3375,7 @@ BlockStatements(); break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3374,7 +3390,7 @@ BlockStatement(); label_53: while (true) { - if (jj_2_87(2)) { + if (jj_2_86(2)) { ; } else { break label_53; @@ -3389,12 +3405,12 @@ final public void BlockStatement() throws ParseException { trace_call("BlockStatement"); try { - if (jj_2_88(3)) { + if (jj_2_87(6)) { + Statement(); + } else if (jj_2_88(6)) { LocalVariableDeclarationStatement(); } else if (jj_2_89(3)) { ClassDeclaration(); - } else if (jj_2_90(4)) { - Statement(); } else { jj_consume_token(-1); throw new ParseException(); @@ -3425,7 +3441,7 @@ ; break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; break label_54; } VariableModifier(); @@ -3440,14 +3456,14 @@ final public void Statement() throws ParseException { trace_call("Statement"); try { - if (jj_2_91(2)) { + if (jj_2_90(6)) { StatementWithoutTrailingSubstatement(); - } else if (jj_2_92(2)) { + } else if (jj_2_91(2)) { LabeledStatement(); + } else if (jj_2_92(3)) { + IfThenElseStatement(); } else if (jj_2_93(3)) { IfThenStatement(); - } else if (jj_2_94(3)) { - IfThenElseStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case WHILE: @@ -3457,7 +3473,7 @@ ForStatement(); break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3470,9 +3486,9 @@ final public void StatementNoShortIf() throws ParseException { trace_call("StatementNoShortIf"); try { - if (jj_2_95(2)) { + if (jj_2_94(2)) { StatementWithoutTrailingSubstatement(); - } else if (jj_2_96(2)) { + } else if (jj_2_95(2)) { LabeledStatementNoShortIf(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3486,7 +3502,7 @@ ForStatementNoShortIf(); break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3559,7 +3575,7 @@ TryStatement(); break; default: - jj_la1[112] = jj_gen; + jj_la1[113] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3612,19 +3628,19 @@ final public void StatementExpression() throws ParseException { trace_call("StatementExpression"); try { - if (jj_2_97(3)) { + if (jj_2_96(6)) { Assignment(); - } else if (jj_2_98(3)) { + } else if (jj_2_97(6)) { + MethodInvocation(); + } else if (jj_2_98(6)) { PreIncrementExpression(); - } else if (jj_2_99(3)) { + } else if (jj_2_99(6)) { PreDecrementExpression(); - } else if (jj_2_100(3)) { + } else if (jj_2_100(6)) { PostIncrementExpression(); - } else if (jj_2_101(3)) { + } else if (jj_2_101(6)) { PostDecrementExpression(); } else if (jj_2_102(3)) { - MethodInvocation(); - } else if (jj_2_103(3)) { ClassInstanceCreationExpression(); } else { jj_consume_token(-1); @@ -3681,20 +3697,15 @@ final public void AssertStatement() throws ParseException { trace_call("AssertStatement"); try { - if (jj_2_104(3)) { - jj_consume_token(ASSERT); + jj_consume_token(ASSERT); + if (jj_2_103(2)) { Expression(); - jj_consume_token(SEMICOLON); - } else if (jj_2_105(3)) { - jj_consume_token(ASSERT); - Expression(); jj_consume_token(COLON); - Expression(); - jj_consume_token(SEMICOLON); } else { - jj_consume_token(-1); - throw new ParseException(); + ; } + Expression(); + jj_consume_token(SEMICOLON); } finally { trace_return("AssertStatement"); } @@ -3719,7 +3730,7 @@ jj_consume_token(LBRACE); label_55: while (true) { - if (jj_2_106(2)) { + if (jj_2_104(2)) { ; } else { break label_55; @@ -3728,7 +3739,7 @@ } label_56: while (true) { - if (jj_2_107(2)) { + if (jj_2_105(2)) { ; } else { break label_56; @@ -3754,18 +3765,17 @@ final public void SwitchLabels() throws ParseException { trace_call("SwitchLabels"); try { - SwitchLabel(); label_57: while (true) { + SwitchLabel(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CASE: ; break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; break label_57; } - SwitchLabel(); } } finally { trace_return("SwitchLabels"); @@ -3776,11 +3786,20 @@ trace_call("SwitchLabel"); try { jj_consume_token(CASE); - ConstantExpression(); + if (jj_2_106(2)) { + ConstantExpression(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + EnumConstantName(); + break; + default: + jj_la1[115] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } jj_consume_token(COLON); - jj_consume_token(CASE); - EnumConstantName(); - jj_consume_token(COLON); jj_consume_token(_DEFAULT); jj_consume_token(COLON); } finally { @@ -3841,13 +3860,18 @@ final public void ForStatement() throws ParseException { trace_call("ForStatement"); try { - if (jj_2_108(3)) { + if (jj_2_107(6)) { BasicForStatement(); - } else if (jj_2_109(3)) { - EnhancedForStatement(); } else { - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FOR: + EnhancedForStatement(); + break; + default: + jj_la1[116] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } finally { trace_return("ForStatement"); @@ -3857,13 +3881,18 @@ final public void ForStatementNoShortIf() throws ParseException { trace_call("ForStatementNoShortIf"); try { - if (jj_2_110(3)) { + if (jj_2_108(3)) { BasicForStatementNoShortIf(); - } else if (jj_2_111(3)) { - EnhancedForStatementNoShortIf(); } else { - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FOR: + EnhancedForStatementNoShortIf(); + break; + default: + jj_la1[117] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } finally { trace_return("ForStatementNoShortIf"); @@ -3903,7 +3932,7 @@ ForInit(); break; default: - jj_la1[114] = jj_gen; + jj_la1[118] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3938,7 +3967,7 @@ Expression(); break; default: - jj_la1[115] = jj_gen; + jj_la1[119] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3969,7 +3998,7 @@ ForUpdate(); break; default: - jj_la1[116] = jj_gen; + jj_la1[120] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4012,7 +4041,7 @@ ForInit(); break; default: - jj_la1[117] = jj_gen; + jj_la1[121] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4047,7 +4076,7 @@ Expression(); break; default: - jj_la1[118] = jj_gen; + jj_la1[122] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4078,7 +4107,7 @@ ForUpdate(); break; default: - jj_la1[119] = jj_gen; + jj_la1[123] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4091,9 +4120,9 @@ final public void ForInit() throws ParseException { trace_call("ForInit"); try { - if (jj_2_112(3)) { + if (jj_2_109(3)) { StatementExpressionList(); - } else if (jj_2_113(3)) { + } else if (jj_2_110(3)) { LocalVariableDeclaration(); } else { jj_consume_token(-1); @@ -4124,7 +4153,7 @@ ; break; default: - jj_la1[120] = jj_gen; + jj_la1[124] = jj_gen; break label_58; } jj_consume_token(COMMA); @@ -4148,7 +4177,7 @@ ; break; default: - jj_la1[121] = jj_gen; + jj_la1[125] = jj_gen; break label_59; } VariableModifier(); @@ -4177,7 +4206,7 @@ ; break; default: - jj_la1[122] = jj_gen; + jj_la1[126] = jj_gen; break label_60; } VariableModifier(); @@ -4202,7 +4231,7 @@ Identifier(); break; default: - jj_la1[123] = jj_gen; + jj_la1[127] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4220,7 +4249,7 @@ Identifier(); break; default: - jj_la1[124] = jj_gen; + jj_la1[128] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4264,7 +4293,7 @@ Expression(); break; default: - jj_la1[125] = jj_gen; + jj_la1[129] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4300,23 +4329,32 @@ final public void TryStatement() throws ParseException { trace_call("TryStatement"); try { - if (jj_2_114(2)) { + if (jj_2_112(2)) { jj_consume_token(TRY); Block(); - Catches(); - } else if (jj_2_115(2)) { - jj_consume_token(TRY); - Block(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CATCH: + if (jj_2_111(3)) { Catches(); - break; - default: - jj_la1[126] = jj_gen; - ; + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CATCH: + case FINALLY: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CATCH: + Catches(); + break; + default: + jj_la1[130] = jj_gen; + ; + } + Finally(); + break; + default: + jj_la1[131] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } - Finally(); - } else if (jj_2_116(2)) { + } else if (jj_2_113(2)) { TryWithResourcesStatement(); } else { jj_consume_token(-1); @@ -4330,18 +4368,17 @@ final public void Catches() throws ParseException { trace_call("Catches"); try { - CatchClause(); label_61: while (true) { + CatchClause(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CATCH: ; break; default: - jj_la1[127] = jj_gen; + jj_la1[132] = jj_gen; break label_61; } - CatchClause(); } } finally { trace_return("Catches"); @@ -4372,7 +4409,7 @@ ; break; default: - jj_la1[128] = jj_gen; + jj_la1[133] = jj_gen; break label_62; } VariableModifier(); @@ -4395,7 +4432,7 @@ ; break; default: - jj_la1[129] = jj_gen; + jj_la1[134] = jj_gen; break label_63; } jj_consume_token(BIT_OR); @@ -4427,7 +4464,7 @@ Catches(); break; default: - jj_la1[130] = jj_gen; + jj_la1[135] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4435,7 +4472,7 @@ Finally(); break; default: - jj_la1[131] = jj_gen; + jj_la1[136] = jj_gen; ; } } finally { @@ -4453,7 +4490,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[132] = jj_gen; + jj_la1[137] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4468,7 +4505,7 @@ Resource(); label_64: while (true) { - if (jj_2_117(2)) { + if (jj_2_114(2)) { ; } else { break label_64; @@ -4492,7 +4529,7 @@ ; break; default: - jj_la1[133] = jj_gen; + jj_la1[138] = jj_gen; break label_65; } VariableModifier(... [truncated message content] |
From: <dal...@us...> - 2014-04-18 20:41:43
|
Revision: 23497 http://sourceforge.net/p/jedit/svn/23497 Author: daleanson Date: 2014-04-18 20:41:39 +0000 (Fri, 18 Apr 2014) Log Message: ----------- more adjustments, still an issue with parenthesized statements. 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 plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ColoredPoint.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/FloatingPointOperations.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 19:40:18 UTC (rev 23496) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-04-18 20:41:39 UTC (rev 23497) @@ -721,28 +721,10 @@ final public void TypeName() throws ParseException { trace_call("TypeName"); try { - if (jj_2_18(2)) { - Identifier(); - } else if (jj_2_19(2)) { - PackageOrTypeName(); - jj_consume_token(DOT); - Identifier(); - } else { - jj_consume_token(-1); - throw new ParseException(); - } - } finally { - trace_return("TypeName"); - } - } - - final public void PackageOrTypeName() throws ParseException { - trace_call("PackageOrTypeName"); - try { Identifier(); label_14: while (true) { - if (jj_2_20(2)) { + if (jj_2_18(2)) { ; } else { break label_14; @@ -751,7 +733,7 @@ Identifier(); } } finally { - trace_return("PackageOrTypeName"); + trace_return("TypeName"); } } @@ -763,7 +745,7 @@ Identifier(); label_15: while (true) { - if (jj_2_21(2)) { + if (jj_2_19(2)) { ; } else { break label_15; @@ -771,12 +753,12 @@ jj_consume_token(DOT); Identifier(); } - if (jj_2_23(2)) { + if (jj_2_21(2)) { jj_consume_token(DOT); jj_consume_token(THIS); label_16: while (true) { - if (jj_2_22(2)) { + if (jj_2_20(2)) { ; } else { break label_16; @@ -792,7 +774,7 @@ jj_consume_token(THIS); label_17: while (true) { - if (jj_2_24(2)) { + if (jj_2_22(2)) { ; } else { break label_17; @@ -829,7 +811,7 @@ final public void CompilationUnit() throws ParseException { trace_call("CompilationUnit"); try { - if (jj_2_25(2)) { + if (jj_2_23(2)) { PackageDeclaration(); } else { ; @@ -909,81 +891,37 @@ final public void ImportDeclaration() throws ParseException { trace_call("ImportDeclaration"); try { - if (jj_2_26(3)) { - SingleTypeImportDeclaration(); - } else if (jj_2_27(3)) { - TypeImportOnDemandDeclaration(); - } else if (jj_2_28(3)) { - SingleStaticImportDeclaration(); - } else if (jj_2_29(3)) { - StaticImportOnDemandDeclaration(); - } else { - jj_consume_token(-1); - throw new ParseException(); + jj_consume_token(IMPORT); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STATIC: + jj_consume_token(STATIC); + break; + default: + jj_la1[25] = jj_gen; + ; } - } finally { - trace_return("ImportDeclaration"); - } - } - - final public void SingleTypeImportDeclaration() throws ParseException { - trace_call("SingleTypeImportDeclaration"); - try { - jj_consume_token(IMPORT); TypeName(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOT: + jj_consume_token(DOT); + jj_consume_token(STAR); + break; + default: + jj_la1[26] = jj_gen; + ; + } jj_consume_token(SEMICOLON); } finally { - trace_return("SingleTypeImportDeclaration"); + trace_return("ImportDeclaration"); } } - final public void TypeImportOnDemandDeclaration() throws ParseException { - trace_call("TypeImportOnDemandDeclaration"); - try { - jj_consume_token(IMPORT); - PackageOrTypeName(); - jj_consume_token(DOT); - jj_consume_token(STAR); - jj_consume_token(SEMICOLON); - } finally { - trace_return("TypeImportOnDemandDeclaration"); - } - } - - final public void SingleStaticImportDeclaration() throws ParseException { - trace_call("SingleStaticImportDeclaration"); - try { - jj_consume_token(IMPORT); - jj_consume_token(STATIC); - TypeName(); - jj_consume_token(DOT); - Identifier(); - jj_consume_token(SEMICOLON); - } finally { - trace_return("SingleStaticImportDeclaration"); - } - } - - final public void StaticImportOnDemandDeclaration() throws ParseException { - trace_call("StaticImportOnDemandDeclaration"); - try { - jj_consume_token(IMPORT); - jj_consume_token(STATIC); - TypeName(); - jj_consume_token(DOT); - jj_consume_token(STAR); - jj_consume_token(SEMICOLON); - } finally { - trace_return("StaticImportOnDemandDeclaration"); - } - } - final public void TypeDeclaration() throws ParseException { trace_call("TypeDeclaration"); try { - if (jj_2_30(3)) { + if (jj_2_24(3)) { ClassDeclaration(); - } else if (jj_2_31(3)) { + } else if (jj_2_25(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -991,7 +929,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[25] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1008,9 +946,9 @@ final public void ClassDeclaration() throws ParseException { trace_call("ClassDeclaration"); try { - if (jj_2_32(3)) { + if (jj_2_26(3)) { NormalClassDeclaration(); - } else if (jj_2_33(3)) { + } else if (jj_2_27(3)) { EnumDeclaration(); } else { jj_consume_token(-1); @@ -1038,7 +976,7 @@ ; break; default: - jj_la1[26] = jj_gen; + jj_la1[28] = jj_gen; break label_21; } ClassModifier(); @@ -1050,7 +988,7 @@ TypeParameters(); break; default: - jj_la1[27] = jj_gen; + jj_la1[29] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1058,7 +996,7 @@ Superclass(); break; default: - jj_la1[28] = jj_gen; + jj_la1[30] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1066,7 +1004,7 @@ Superinterfaces(); break; default: - jj_la1[29] = jj_gen; + jj_la1[31] = jj_gen; ; } ClassBody(); @@ -1104,7 +1042,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[30] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1135,7 +1073,7 @@ ; break; default: - jj_la1[31] = jj_gen; + jj_la1[33] = jj_gen; break label_22; } jj_consume_token(COMMA); @@ -1177,7 +1115,7 @@ ; break; default: - jj_la1[32] = jj_gen; + jj_la1[34] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -1226,7 +1164,7 @@ ; break; default: - jj_la1[33] = jj_gen; + jj_la1[35] = jj_gen; break label_24; } ClassBodyDeclaration(); @@ -1240,7 +1178,7 @@ final public void ClassBodyDeclaration() throws ParseException { trace_call("ClassBodyDeclaration"); try { - if (jj_2_34(3)) { + if (jj_2_28(3)) { ClassMemberDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1251,8 +1189,8 @@ StaticInitializer(); break; default: - jj_la1[34] = jj_gen; - if (jj_2_35(2)) { + jj_la1[36] = jj_gen; + if (jj_2_29(2)) { ConstructorDeclaration(); } else { jj_consume_token(-1); @@ -1268,13 +1206,13 @@ final public void ClassMemberDeclaration() throws ParseException { trace_call("ClassMemberDeclaration"); try { - if (jj_2_36(6)) { + if (jj_2_30(6)) { FieldDeclaration(); - } else if (jj_2_37(6)) { + } else if (jj_2_31(6)) { MethodDeclaration(); - } else if (jj_2_38(3)) { + } else if (jj_2_32(3)) { ClassDeclaration(); - } else if (jj_2_39(3)) { + } else if (jj_2_33(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1282,7 +1220,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[35] = jj_gen; + jj_la1[37] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1309,7 +1247,7 @@ ; break; default: - jj_la1[36] = jj_gen; + jj_la1[38] = jj_gen; break label_25; } FieldModifier(); @@ -1351,7 +1289,7 @@ jj_consume_token(VOLATILE); break; default: - jj_la1[37] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1371,7 +1309,7 @@ ; break; default: - jj_la1[38] = jj_gen; + jj_la1[40] = jj_gen; break label_26; } jj_consume_token(COMMA); @@ -1392,7 +1330,7 @@ VariableInitializer(); break; default: - jj_la1[39] = jj_gen; + jj_la1[41] = jj_gen; ; } } finally { @@ -1410,7 +1348,7 @@ Dims(); break; default: - jj_la1[40] = jj_gen; + jj_la1[42] = jj_gen; ; } } finally { @@ -1421,41 +1359,15 @@ final public void VariableInitializer() throws ParseException { trace_call("VariableInitializer"); try { - if (jj_2_40(3)) { + if (jj_2_34(2147483647)) { + ArrayInitializer(); + } else if (jj_2_35(2147483647)) { Expression(); + } else if (jj_2_36(2147483647)) { + Primary(); } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BOOLEAN: - case BYTE: - case CHAR: - case DOUBLE: - case FLOAT: - case INT: - case LONG: - case NEW: - case NULL: - case SHORT: - case SUPER: - case THIS: - case VOID: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case CHARACTER_LITERAL: - case STRING_LITERAL: - case BOOLEAN_LITERAL: - case IDENTIFIER: - case LPAREN: - case AT: - Primary(); - break; - case LBRACE: - ArrayInitializer(); - break; - default: - jj_la1[41] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(-1); + throw new ParseException(); } } finally { trace_return("VariableInitializer"); @@ -1465,7 +1377,7 @@ final public void UnannType() throws ParseException { trace_call("UnannType"); try { - if (jj_2_41(3)) { + if (jj_2_37(3)) { UnannReferenceType(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1480,7 +1392,7 @@ UnannPrimitiveType(); break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1507,7 +1419,7 @@ jj_consume_token(BOOLEAN); break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1519,11 +1431,11 @@ final public void UnannReferenceType() throws ParseException { trace_call("UnannReferenceType"); try { - if (jj_2_42(8)) { + if (jj_2_38(8)) { UnannArrayType(); - } else if (jj_2_43(3)) { + } else if (jj_2_39(3)) { UnannClassOrInterfaceType(); - } else if (jj_2_44(3)) { + } else if (jj_2_40(3)) { UnannTypeVariable(); } else { jj_consume_token(-1); @@ -1552,7 +1464,7 @@ TypeArguments(); break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; ; } label_27: @@ -1562,7 +1474,7 @@ ; break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; break label_27; } jj_consume_token(DOT); @@ -1573,7 +1485,7 @@ ; break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; break label_28; } Annotation(); @@ -1584,7 +1496,7 @@ TypeArguments(); break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; ; } } @@ -1618,11 +1530,11 @@ Dims(); break; default: - jj_la1[48] = jj_gen; - if (jj_2_45(3)) { + jj_la1[49] = jj_gen; + if (jj_2_41(3)) { UnannClassOrInterfaceType(); Dims(); - } else if (jj_2_46(3)) { + } else if (jj_2_42(3)) { UnannTypeVariable(); Dims(); } else { @@ -1654,7 +1566,7 @@ ; break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; break label_29; } MethodModifier(); @@ -1701,7 +1613,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1723,7 +1635,7 @@ ; break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; break label_30; } Annotation(); @@ -1735,7 +1647,7 @@ Throws(); break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; ; } break; @@ -1756,12 +1668,12 @@ Throws(); break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; ; } break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1789,7 +1701,7 @@ jj_consume_token(VOID); break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1818,7 +1730,7 @@ FormalParameterList(); break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1828,7 +1740,7 @@ Dims(); break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; ; } } finally { @@ -1839,7 +1751,7 @@ final public void FormalParameterList() throws ParseException { trace_call("FormalParameterList"); try { - if (jj_2_47(6)) { + if (jj_2_43(6)) { FormalParameters(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -1847,10 +1759,10 @@ LastFormalParameter(); break; default: - jj_la1[58] = jj_gen; + jj_la1[59] = jj_gen; ; } - } else if (jj_2_48(3)) { + } else if (jj_2_44(3)) { LastFormalParameter(); } else { jj_consume_token(-1); @@ -1864,11 +1776,11 @@ final public void FormalParameters() throws ParseException { trace_call("FormalParameters"); try { - if (jj_2_51(3)) { + if (jj_2_47(3)) { FormalParameter(); label_31: while (true) { - if (jj_2_49(2)) { + if (jj_2_45(2)) { ; } else { break label_31; @@ -1876,11 +1788,11 @@ jj_consume_token(COMMA); FormalParameter(); } - } else if (jj_2_52(3)) { + } else if (jj_2_48(3)) { ReceiverParameter(); label_32: while (true) { - if (jj_2_50(2)) { + if (jj_2_46(2)) { ; } else { break label_32; @@ -1908,7 +1820,7 @@ ; break; default: - jj_la1[59] = jj_gen; + jj_la1[60] = jj_gen; break label_33; } VariableModifier(); @@ -1931,7 +1843,7 @@ jj_consume_token(FINAL); break; default: - jj_la1[60] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1943,7 +1855,7 @@ final public void LastFormalParameter() throws ParseException { trace_call("LastFormalParameter"); try { - if (jj_2_53(3)) { + if (jj_2_49(3)) { label_34: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1952,7 +1864,7 @@ ; break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; break label_34; } VariableModifier(); @@ -1965,14 +1877,14 @@ ; break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; break label_35; } Annotation(); } jj_consume_token(ELLIPSIS); VariableDeclaratorId(); - } else if (jj_2_54(3)) { + } else if (jj_2_50(3)) { FormalParameter(); } else { jj_consume_token(-1); @@ -1993,7 +1905,7 @@ ; break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; break label_36; } Annotation(); @@ -2005,7 +1917,7 @@ jj_consume_token(DOT); break; default: - jj_la1[64] = jj_gen; + jj_la1[65] = jj_gen; ; } jj_consume_token(THIS); @@ -2035,7 +1947,7 @@ ; break; default: - jj_la1[65] = jj_gen; + jj_la1[66] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -2049,9 +1961,9 @@ final public void ExceptionType() throws ParseException { trace_call("ExceptionType"); try { - if (jj_2_55(3)) { + if (jj_2_51(3)) { ClassType(); - } else if (jj_2_56(3)) { + } else if (jj_2_52(3)) { TypeVariable(); } else { jj_consume_token(-1); @@ -2073,7 +1985,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[66] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2114,7 +2026,7 @@ ; break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; break label_38; } ConstructorModifier(); @@ -2125,7 +2037,7 @@ Throws(); break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; ; } ConstructorBody(); @@ -2151,7 +2063,7 @@ jj_consume_token(PRIVATE); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2168,7 +2080,7 @@ TypeParameters(); break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; ; } SimpleTypeName(); @@ -2188,7 +2100,7 @@ FormalParameterList(); break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2210,12 +2122,12 @@ trace_call("ConstructorBody"); try { jj_consume_token(LBRACE); - if (jj_2_57(2147483647)) { + if (jj_2_53(2147483647)) { ExplicitConstructorInvocation(); } else { ; } - if (jj_2_58(2147483647)) { + if (jj_2_54(2147483647)) { BlockStatements(); } else { ; @@ -2229,13 +2141,13 @@ final public void ExplicitConstructorInvocation() throws ParseException { trace_call("ExplicitConstructorInvocation"); try { - if (jj_2_59(3)) { + if (jj_2_55(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; ; } jj_consume_token(THIS); @@ -2271,18 +2183,18 @@ ArgumentList(); break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_60(3)) { + } else if (jj_2_56(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; ; } jj_consume_token(SUPER); @@ -2318,12 +2230,12 @@ ArgumentList(); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_61(3)) { + } else if (jj_2_57(3)) { ExpressionName(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2331,7 +2243,7 @@ TypeArguments(); break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; ; } jj_consume_token(SUPER); @@ -2367,12 +2279,12 @@ ArgumentList(); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_62(3)) { + } else if (jj_2_58(3)) { Primary(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2380,7 +2292,7 @@ TypeArguments(); break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; ; } jj_consume_token(SUPER); @@ -2416,7 +2328,7 @@ ArgumentList(); break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2447,7 +2359,7 @@ ; break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; break label_39; } ClassModifier(); @@ -2459,7 +2371,7 @@ Superinterfaces(); break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; ; } EnumBody(); @@ -2478,7 +2390,7 @@ EnumConstantList(); break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2486,7 +2398,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2494,7 +2406,7 @@ EnumBodyDeclarations(); break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; ; } jj_consume_token(RBRACE); @@ -2509,7 +2421,7 @@ EnumConstant(); label_40: while (true) { - if (jj_2_63(2)) { + if (jj_2_59(2)) { ; } else { break label_40; @@ -2532,7 +2444,7 @@ ; break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; break label_41; } EnumConstantModifier(); @@ -2572,13 +2484,13 @@ ArgumentList(); break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; ; } jj_consume_token(RPAREN); break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2586,7 +2498,7 @@ ClassBody(); break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; ; } } finally { @@ -2641,7 +2553,7 @@ ; break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; break label_42; } ClassBodyDeclaration(); @@ -2658,9 +2570,9 @@ final public void InterfaceDeclaration() throws ParseException { trace_call("InterfaceDeclaration"); try { - if (jj_2_64(3)) { + if (jj_2_60(3)) { NormalInterfaceDeclaration(); - } else if (jj_2_65(3)) { + } else if (jj_2_61(3)) { AnnotationTypeDeclaration(); } else { jj_consume_token(-1); @@ -2676,7 +2588,7 @@ try { label_43: while (true) { - if (jj_2_66(2)) { + if (jj_2_62(2)) { ; } else { break label_43; @@ -2685,7 +2597,7 @@ } jj_consume_token(INTERFACE); Identifier(); - if (jj_2_67(2)) { + if (jj_2_63(2)) { TypeParameters(); } else { ; @@ -2695,7 +2607,7 @@ ExtendsInterfaces(); break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; ; } InterfaceBody(); @@ -2730,7 +2642,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2755,7 +2667,7 @@ jj_consume_token(LBRACE); label_44: while (true) { - if (jj_2_68(2)) { + if (jj_2_64(2)) { ; } else { break label_44; @@ -2771,13 +2683,13 @@ final public void InterfaceMemberDeclaration() throws ParseException { trace_call("InterfaceMemberDeclaration"); try { - if (jj_2_69(3)) { + if (jj_2_65(3)) { ConstantDeclaration(); - } else if (jj_2_70(3)) { + } else if (jj_2_66(3)) { InterfaceMethodDeclaration(); - } else if (jj_2_71(3)) { + } else if (jj_2_67(3)) { ClassDeclaration(); - } else if (jj_2_72(3)) { + } else if (jj_2_68(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2785,7 +2697,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2808,7 +2720,7 @@ ; break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; break label_45; } ConstantModifier(); @@ -2838,7 +2750,7 @@ jj_consume_token(FINAL); break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2862,7 +2774,7 @@ ; break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; break label_46; } InterfaceMethodModifier(); @@ -2897,7 +2809,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2911,7 +2823,7 @@ try { label_47: while (true) { - if (jj_2_73(2)) { + if (jj_2_69(2)) { ; } else { break label_47; @@ -2933,7 +2845,7 @@ jj_consume_token(LBRACE); label_48: while (true) { - if (jj_2_74(2)) { + if (jj_2_70(2)) { ; } else { break label_48; @@ -2949,13 +2861,13 @@ final public void AnnotationTypeMemberDeclaration() throws ParseException { trace_call("AnnotationTypeMemberDeclaration"); try { - if (jj_2_75(3)) { + if (jj_2_71(3)) { AnnotationTypeElementDeclaration(); - } else if (jj_2_76(3)) { + } else if (jj_2_72(3)) { ConstantDeclaration(); - } else if (jj_2_77(3)) { + } else if (jj_2_73(3)) { ClassDeclaration(); - } else if (jj_2_78(3)) { + } else if (jj_2_74(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2963,7 +2875,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2985,7 +2897,7 @@ ; break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; break label_49; } AnnotationTypeElementModifier(); @@ -3000,7 +2912,7 @@ Dims(); break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3008,7 +2920,7 @@ DefaultValue(); break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3031,7 +2943,7 @@ jj_consume_token(ABSTRACT); break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3053,11 +2965,11 @@ final public void Annotation() throws ParseException { trace_call("Annotation"); try { - if (jj_2_79(3)) { + if (jj_2_75(3)) { NormalAnnotation(); - } else if (jj_2_80(3)) { + } else if (jj_2_76(3)) { MarkerAnnotation(); - } else if (jj_2_81(3)) { + } else if (jj_2_77(3)) { SingleElementAnnotation(); } else { jj_consume_token(-1); @@ -3079,7 +2991,7 @@ ElementValuePairList(); break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3099,7 +3011,7 @@ ; break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; break label_50; } jj_consume_token(COMMA); @@ -3124,7 +3036,7 @@ final public void ElementValue() throws ParseException { trace_call("ElementValue"); try { - if (jj_2_82(3)) { + if (jj_2_78(3)) { ConditionalExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3132,8 +3044,8 @@ ElementValueArrayInitializer(); break; default: - jj_la1[104] = jj_gen; - if (jj_2_83(3)) { + jj_la1[105] = jj_gen; + if (jj_2_79(3)) { Annotation(); } else { jj_consume_token(-1); @@ -3182,7 +3094,7 @@ ElementValueList(); break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3190,7 +3102,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3205,7 +3117,7 @@ ElementValue(); label_51: while (true) { - if (jj_2_84(2)) { + if (jj_2_80(2)) { ; } else { break label_51; @@ -3281,7 +3193,7 @@ VariableInitializerList(); break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3289,7 +3201,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3304,7 +3216,7 @@ VariableInitializer(); label_52: while (true) { - if (jj_2_85(2)) { + if (jj_2_81(2)) { ; } else { break label_52; @@ -3375,7 +3287,7 @@ BlockStatements(); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3390,7 +3302,7 @@ BlockStatement(); label_53: while (true) { - if (jj_2_86(2)) { + if (jj_2_82(2)) { ; } else { break label_53; @@ -3405,11 +3317,11 @@ final public void BlockStatement() throws ParseException { trace_call("BlockStatement"); try { - if (jj_2_87(6)) { + if (jj_2_83(2147483647)) { + LocalVariableDeclarationStatement(); + } else if (jj_2_84(2147483647)) { Statement(); - } else if (jj_2_88(6)) { - LocalVariableDeclarationStatement(); - } else if (jj_2_89(3)) { + } else if (jj_2_85(3)) { ClassDeclaration(); } else { jj_consume_token(-1); @@ -3441,7 +3353,7 @@ ; break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; break label_54; } VariableModifier(); @@ -3456,26 +3368,30 @@ final public void Statement() throws ParseException { trace_call("Statement"); try { - if (jj_2_90(6)) { - StatementWithoutTrailingSubstatement(); - } else if (jj_2_91(2)) { - LabeledStatement(); - } else if (jj_2_92(3)) { - IfThenElseStatement(); - } else if (jj_2_93(3)) { - IfThenStatement(); - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case WHILE: - WhileStatement(); - break; - case FOR: - ForStatement(); - break; - default: - jj_la1[111] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FOR: + ForStatement(); + break; + default: + jj_la1[112] = jj_gen; + if (jj_2_86(2147483647)) { + StatementWithoutTrailingSubstatement(); + } else if (jj_2_87(2)) { + LabeledStatement(); + } else if (jj_2_88(3)) { + IfThenElseStatement(); + } else if (jj_2_89(3)) { + IfThenStatement(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case WHILE: + WhileStatement(); + break; + default: + jj_la1[113] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } } finally { @@ -3486,9 +3402,9 @@ final public void StatementNoShortIf() throws ParseException { trace_call("StatementNoShortIf"); try { - if (jj_2_94(2)) { + if (jj_2_90(2)) { StatementWithoutTrailingSubstatement(); - } else if (jj_2_95(2)) { + } else if (jj_2_91(2)) { LabeledStatementNoShortIf(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3502,7 +3418,7 @@ ForStatementNoShortIf(); break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3575,7 +3491,7 @@ TryStatement(); break; default: - jj_la1[113] = jj_gen; + jj_la1[115] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3628,19 +3544,19 @@ final public void StatementExpression() throws ParseException { trace_call("StatementExpression"); try { - if (jj_2_96(6)) { + if (jj_2_92(6)) { Assignment(); - } else if (jj_2_97(6)) { + } else if (jj_2_93(6)) { MethodInvocation(); - } else if (jj_2_98(6)) { + } else if (jj_2_94(6)) { PreIncrementExpression(); - } else if (jj_2_99(6)) { + } else if (jj_2_95(6)) { PreDecrementExpression(); - } else if (jj_2_100(6)) { + } else if (jj_2_96(6)) { PostIncrementExpression(); - } else if (jj_2_101(6)) { + } else if (jj_2_97(6)) { PostDecrementExpression(); - } else if (jj_2_102(3)) { + } else if (jj_2_98(3)) { ClassInstanceCreationExpression(); } else { jj_consume_token(-1); @@ -3698,7 +3614,7 @@ trace_call("AssertStatement"); try { jj_consume_token(ASSERT); - if (jj_2_103(2)) { + if (jj_2_99(2)) { Expression(); jj_consume_token(COLON); } else { @@ -3730,7 +3646,7 @@ jj_consume_token(LBRACE); label_55: while (true) { - if (jj_2_104(2)) { + if (jj_2_100(2)) { ; } else { break label_55; @@ -3739,7 +3655,7 @@ } label_56: while (true) { - if (jj_2_105(2)) { + if (jj_2_101(2)) { ; } else { break label_56; @@ -3773,7 +3689,7 @@ ; break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; break label_57; } } @@ -3786,7 +3702,7 @@ trace_call("SwitchLabel"); try { jj_consume_token(CASE); - if (jj_2_106(2)) { + if (jj_2_102(2)) { ConstantExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3794,7 +3710,7 @@ EnumConstantName(); break; default: - jj_la1[115] = jj_gen; + jj_la1[117] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3860,7 +3776,7 @@ final public void ForStatement() throws ParseException { trace_call("ForStatement"); try { - if (jj_2_107(6)) { + if (jj_2_103(2147483647)) { BasicForStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3868,7 +3784,7 @@ EnhancedForStatement(); break; default: - jj_la1[116] = jj_gen; + jj_la1[118] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3881,7 +3797,7 @@ final public void ForStatementNoShortIf() throws ParseException { trace_call("ForStatementNoShortIf"); try { - if (jj_2_108(3)) { + if (jj_2_104(3)) { BasicForStatementNoShortIf(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3889,7 +3805,7 @@ EnhancedForStatementNoShortIf(); break; default: - jj_la1[117] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3932,7 +3848,7 @@ ForInit(); break; default: - jj_la1[118] = jj_gen; + jj_la1[120] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3967,7 +3883,7 @@ Expression(); break; default: - jj_la1[119] = jj_gen; + jj_la1[121] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3998,7 +3914,7 @@ ForUpdate(); break; default: - jj_la1[120] = jj_gen; + jj_la1[122] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4041,7 +3957,7 @@ ForInit(); break; default: - jj_la1[121] = jj_gen; + jj_la1[123] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4076,7 +3992,7 @@ Expression(); break; default: - jj_la1[122] = jj_gen; + jj_la1[124] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4107,7 +4023,7 @@ ForUpdate(); break; default: - jj_la1[123] = jj_gen; + jj_la1[125] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4120,9 +4036,9 @@ final public void ForInit() throws ParseException { trace_call("ForInit"); try { - if (jj_2_109(3)) { + if (jj_2_105(3)) { StatementExpressionList(); - } else if (jj_2_110(3)) { + } else if (jj_2_106(3)) { LocalVariableDeclaration(); } else { jj_consume_token(-1); @@ -4153,7 +4069,7 @@ ; break; default: - jj_la1[124] = jj_gen; + jj_la1[126] = jj_gen; break label_58; } jj_consume_token(COMMA); @@ -4177,7 +4093,7 @@ ; break; default: - jj_la1[125] = jj_gen; + jj_la1[127] = jj_gen; break label_59; } VariableModifier(); @@ -4206,7 +4122,7 @@ ; break; default: - jj_la1[126] = jj_gen; + jj_la1[128] = jj_gen; break label_60; } VariableModifier(); @@ -4231,7 +4147,7 @@ Identifier(); break; default: - jj_la1[127] = jj_gen; + jj_la1[129] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4249,7 +4165,7 @@ Identifier(); break; default: - jj_la1[128] = jj_gen; + jj_la1[130] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4293,7 +4209,7 @@ Expression(); break; default: - jj_la1[129] = jj_gen; + jj_la1[131] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4329,10 +4245,10 @@ final public void TryStatement() throws ParseException { trace_call("TryStatement"); try { - if (jj_2_112(2)) { + if (jj_2_108(2)) { jj_consume_token(TRY); Block(); - if (jj_2_111(3)) { + if (jj_2_107(3)) { Catches(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4343,18 +4259,18 @@ Catches(); break; default: - jj_la1[130] = jj_gen; + jj_la1[132] = jj_gen; ; } Finally(); break; default: - jj_la1[131] = jj_gen; + jj_la1[133] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - } else if (jj_2_113(2)) { + } else if (jj_2_109(2)) { TryWithResourcesStatement(); } else { jj_consume_token(-1); @@ -4376,7 +4292,7 @@ ; break; default: - jj_la1[132] = jj_gen; + jj_la1[134] = jj_gen; break label_61; } } @@ -4409,7 +4325,7 @@ ; break; default: - jj_la1[133] = jj_gen; + jj_la1[135] = jj_gen; break label_62; } VariableModifier(); @@ -4432,7 +4348,7 @@ ; break; default: - jj_la1[134] = jj_gen; + jj_la1[136] = jj_gen; break label_63; } jj_consume_token(BIT_OR); @@ -4464,7 +4380,7 @@ Catches(); break; default: - jj_la1[135] = jj_gen; + jj_la1[137] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4472,7 +4388,7 @@ Finally(); break; default: - jj_la1[136] = jj_gen; + jj_la1[138] = jj_gen; ; } } finally { @@ -4490,7 +4406,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[137] = jj_gen; + jj_la1[139] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4505,7 +4421,7 @@ Resource(); label_64: while (true) { - if (jj_2_114(2)) { + if (jj_2_110(2)) { ; } else { break label_64; @@ -4529,7 +4445,7 @@ ; break; default: - jj_la1[138] = jj_gen; + jj_la1[140] = jj_gen; break label_65; } VariableModifier(); @@ -4550,9 +4466,9 @@ final public void Primary() throws ParseException { trace_call("Primary"); try { - if (jj_2_115(3)) { + if (jj_2_111(3)) { PrimaryNoNewArray(); - } else if (jj_2_116(3)) { + } else if (jj_2_112(3)) { ArrayCreationExpression(); } else { jj_consume_token(-1); @@ -4566,11 +4482,11 @@ final public void PrimaryNoNewArray() throws ParseException { trace_call("PrimaryNoNewArray"); try { - if (jj_2_119(6)) { + if (jj_2_116(2147483647)) { MethodInvocation(); label_66: while (true) { - if (jj_2_117(2)) { + if (jj_2_113(2)) { ; } else { break label_66; @@ -4578,13 +4494,13 @@ jj_consume_token(DOT); MethodInvocation(); } - } else if (jj_2_120(3)) { + } else if (jj_2_117(2147483647)) { ArrayAccess(); - } else if (jj_2_121(3)) { + } else if (jj_2_118(2147483647)) { FieldAccess(); - } else if (jj_2_122(3)) { + } else if (jj_2_119(2147483647)) { MethodReference(); - } else if (jj_2_123(6)) { + } else if (jj_2_120(2147483647)) { ClassInstanceCreationExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4597,12 +4513,10 @@ Literal(); break; default: - jj_la1[141] = jj_gen; - if (jj_2_124(3)) { + jj_la1[143] = jj_gen; + if (jj_2_121(3)) { TypeName(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACKET: - case DOT: + if (jj_2_114(2)) { label_67: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4610,7 +4524,7 @@ ; break; default: - jj_la1[139] = jj_gen; + jj_la1[141] = jj_gen; break label_67; } jj_consume_token(LBRACKET); @@ -4618,22 +4532,25 @@ } jj_consume_token(DOT); jj_consume_token(CLASS); - break; - jj_consume_token(DOT); - jj_consume_token(THIS); - break; - default: - jj_la1[140] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOT: + jj_consume_token(DOT); + jj_consume_token(THIS); + break; + default: + jj_la1[142] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } - } else if (jj_2_125(3)) { + } else if (jj_2_122(3)) { jj_consume_token(LPAREN); Expression(); jj_consume_token(RPAREN); label_68: while (true) { - if (jj_2_118(2)) { + if (jj_2_115(2)) { ; } else { break label_68; @@ -4649,8 +4566,8 @@ jj_consume_token(CLASS); break; default: - jj_la1[142] = jj_gen; - if (jj_2_126(2)) { + jj_la1[144] = jj_gen; + if (jj_2_123(2)) { jj_consume_token(THIS); } else { jj_consume_token(-1); @@ -4676,7 +4593,7 @@ TypeArguments(); break; default: - jj_la1[143] = jj_gen; + jj_la1[145] = jj_gen; ; } label_69: @@ -4686,7 +4603,7 @@ ; break; default: - jj_la1[144] = jj_gen; + jj_la1[146] = jj_gen; break label_69; } Annotation(); @@ -4698,7 +4615,7 @@ TypeArgumentsOrDiamond(); break; default: - jj_la1[145] = jj_gen; + jj_la1[147] = jj_gen; ; } jj_consume_token(LPAREN); @@ -4733,18 +4650,18 @@ ArgumentList(); break; default: - jj_la1[146] = jj_gen; + jj_la1[148] = jj_gen; ; } jj_consume_token(RPAREN); - if (jj_2_127(2)) { + if (jj_2_124(2)) { ClassBody(); } else { ; } label_70: while (true) { - if (jj_2_128(2)) { + if (jj_2_125(2)) { ; } else { break label_70; @@ -4756,7 +4673,7 @@ TypeArguments(); break; default: - jj_la1[147] = jj_gen; + jj_la1[149] = jj_gen; ; } label_71: @@ -4766,7 +4683,7 @@ ; break; default: - jj_la1[148] = jj_gen; + jj_la1[150] = jj_gen; break label_71; } Annotation(); @@ -4778,7 +4695,7 @@ TypeArgumentsOrDiamond(); break; default: - jj_la1[149] = jj_gen; + jj_la1[151] = jj_gen; ; } jj_consume_token(LPAREN); @@ -4813,11 +4730,11 @@ ArgumentList(); break; default: - jj_la1[150] = jj_gen; + jj_la1[152] = jj_gen; ; } jj_consume_token(RPAREN); - if (jj_2_129(2)) { + if (jj_2_126(2)) { ClassBody(); } else { ; @@ -4829,7 +4746,7 @@ ExpressionName(); label_72: while (true) { - if (jj_2_130(2)) { + if (jj_2_127(2)) { ; } else { break label_72; @@ -4841,7 +4758,7 @@ TypeArguments(); break; default: - jj_la1[151] = jj_gen; + jj_la1[153] = jj_gen; ; } label_73: @@ -4851,7 +4768,7 @@ ; break; default: - jj_la1[152] = jj_gen; + jj_la1[154] = jj_gen; break label_73; } Annotation(); @@ -4863,7 +4780,7 @@ TypeArgumentsOrDiamond(); break; default: - jj_la1[153] = jj_gen; + jj_la1[155] = jj_gen; ; } jj_consume_token(LPAREN); @@ -4898,11 +4815,11 @@ ArgumentList(); break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; ; } jj_consume_token(RPAREN); - if (jj_2_131(2)) { + if (jj_2_128(2)) { ClassBody(); } else { ; @@ -4910,7 +4827,7 @@ } break; default: - jj_la1[155] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4930,7 +4847,7 @@ jj_consume_token(125); break; default: - jj_la1[156] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4942,11 +4859,11 @@ final public void FieldAccess() throws ParseException { trace_call("FieldAccess"); try { - if (jj_2_134(3)) { + if (jj_2_131(3)) { Identifier(); label_74: while (true) { - if (jj_2_132(2)) { + if (jj_2_129(2)) { ; } else { break label_74; @@ -4960,7 +4877,7 @@ jj_consume_token(SUPER); label_75: while (true) { - if (jj_2_133(2)) { + if (jj_2_130(2)) { ; } else { break label_75; @@ -4977,7 +4894,7 @@ Identifier(); break; default: - jj_la1[157] = jj_gen; + jj_la1[159] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5001,7 +4918,7 @@ ; break; default: - jj_la1[158] = jj_gen; + jj_la1[160] = jj_gen; break label_76; } jj_consume_token(LBRACKET); @@ -5016,7 +4933,7 @@ final public void MethodInvocation() throws ParseException { trace_call("MethodInvocation"); try { - if (jj_2_141(6)) { + if (jj_2_138(6)) { MethodName(); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5050,11 +4967,11 @@ ArgumentList(); break; default: - jj_la1[159] = jj_gen; + jj_la1[161] = jj_gen; ; } jj_consume_token(RPAREN); - } else if (jj_2_142(3)) { + } else if (jj_2_139(3)) { TypeName(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5063,33 +4980,33 @@ jj_consume_token(DOT); break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; ; } - if (jj_2_135(2)) { + if (jj_2_132(2)) { TypeArguments(); } else { ; } Identifier(); jj_consume_token(LPAREN); - if (jj_2_136(2)) { + if (jj_2_133(2)) { ArgumentList(); } else { ; } jj_consume_token(RPAREN); - } else if (jj_2_143(3)) { + } else if (jj_2_140(3)) { ExpressionName(); jj_consume_token(DOT); - if (jj_2_137(2)) { + if (jj_2_134(2)) { TypeArguments(); } else { ; } Identifier(); jj_consume_token(LPAREN); - if (jj_2_138(2)) { + if (jj_2_135(2)) { ArgumentList(); } else { ; @@ -5102,7 +5019,7 @@ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOT: jj_consume_token(DOT); - if (jj_2_139(2)) { + if (jj_2_136(2)) { TypeArguments(); } else { ; @@ -5110,11 +5027,11 @@ Identifier(); break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; ; } jj_consume_token(LPAREN); - if (jj_2_140(2)) { + if (jj_2_137(2)) { ArgumentList(); } else { ; @@ -5122,7 +5039,7 @@ jj_consume_token(RPAREN); break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5143,7 +5060,7 @@ ; break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; break label_77; } jj_consume_token(COMMA); @@ -5157,7 +5074,7 @@ final public void MethodReference() throws ParseException { trace_call("MethodReference"); try { - if (jj_2_144(3)) { + if (jj_2_141(3)) { ExpressionName(); jj_consume_token(126); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5165,11 +5082,11 @@ TypeArguments(); break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; ; } Identifier(); - } else if (jj_2_145(3)) { + } else if (jj_2_142(3)) { ReferenceType(); jj_consume_token(126); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5177,7 +5094,7 @@ TypeArguments(); break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; ; } Identifier(); @@ -5191,14 +5108,14 @@ TypeArguments(); break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; ; } Identifier(); break; default: - jj_la1[169] = jj_gen; - if (jj_2_146(3)) { + jj_la1[171] = jj_gen; + if (jj_2_143(3)) { TypeName(); jj_consume_token(DOT); jj_consume_token(SUPER); @@ -5208,11 +5125,11 @@ TypeArguments(); break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; ; } Identifier(); - } else if (jj_2_147(3)) { + } else if (jj_2_144(3)) { ClassType(); jj_consume_token(126); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5220,11 +5137,11 @@ TypeArguments(); break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; ; } jj_consume_token(NEW); - } else if (jj_2_148(3)) { + } else if (jj_2_145(3)) { ArrayType(); jj_consume_token(126); jj_consume_token(NEW); @@ -5242,30 +5159,30 @@ final public void ArrayCreationExpression() throws ParseException { trace_call("ArrayCreationExpression"); try { - if (jj_2_151(3)) { + if (jj_2_148(3)) { jj_consume_token(NEW); PrimitiveType(); DimExprs(); - if (jj_2_149(2)) { + if (jj_2_146(2)) { Dims(); } else { ; } - } else if (jj_2_152(3)) { + } else if (jj_2_149(3)) { jj_consume_token(NEW); ClassOrInterfaceType(); DimExprs(); - if (jj_2_150(2)) { + if (jj_2_147(2)) { Dims(); } else { ; } - } else if (jj_2_153(3)) { + } else if (jj_2_150(3)) { jj_consume_token(NEW); PrimitiveType(); Dims(); ArrayInitializer(); - } else if (jj_2_154(3)) { + } else if (jj_2_151(3)) { jj_consume_token(NEW); ClassOrInterfaceType(); Dims(); @@ -5285,7 +5202,7 @@ DimExpr(); label_78: while (true) { - if (jj_2_155(2)) { + if (jj_2_152(2)) { ; } else { break label_78; @@ -5307,7 +5224,7 @@ ; ... [truncated message content] |
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. |
From: <dal...@us...> - 2014-04-18 20:51:17
|
Revision: 23499 http://sourceforge.net/p/jedit/svn/23499 Author: daleanson Date: 2014-04-18 20:51:13 +0000 (Fri, 18 Apr 2014) Log Message: ----------- Adjusted detection of 'if' statements. All tests pass at the moment. 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:47:14 UTC (rev 23498) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-04-18 20:51:13 UTC (rev 23499) @@ -3378,9 +3378,9 @@ StatementWithoutTrailingSubstatement(); } else if (jj_2_87(2)) { LabeledStatement(); - } else if (jj_2_88(3)) { + } else if (jj_2_88(2147483647)) { IfThenElseStatement(); - } else if (jj_2_89(3)) { + } else if (jj_2_89(2147483647)) { IfThenStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7351,14 +7351,10 @@ private boolean jj_3R_161() { Token xsp; xsp = jj_scanpos; - if (jj_3R_273()) { + if (jj_3R_275()) { jj_scanpos = xsp; if (jj_scan_token(85)) { jj_scanpos = xsp; - if (jj_3R_274()) { - jj_scanpos = xsp; - if (jj_3R_275()) { - jj_scanpos = xsp; if (jj_3R_276()) { jj_scanpos = xsp; if (jj_3R_277()) { @@ -7373,7 +7369,11 @@ jj_scanpos = xsp; if (jj_3R_282()) { jj_scanpos = xsp; - if (jj_3R_283()) return true; + if (jj_3R_283()) { + jj_scanpos = xsp; + if (jj_3R_284()) { + jj_scanpos = xsp; + if (jj_3R_285()) return true; } } } @@ -7388,23 +7388,23 @@ return false; } - private boolean jj_3R_273() { + private boolean jj_3R_275() { if (jj_3R_181()) return true; return false; } - private boolean jj_3R_440() { - if (jj_3R_454()) return true; + private boolean jj_3R_380() { + if (jj_3R_425()) return true; return false; } - private boolean jj_3R_439() { - if (jj_3R_453()) return true; + private boolean jj_3R_379() { + if (jj_3R_424()) return true; return false; } - private boolean jj_3R_438() { - if (jj_3R_452()) return true; + private boolean jj_3R_378() { + if (jj_3R_423()) return true; return false; } @@ -7413,23 +7413,28 @@ return false; } + private boolean jj_3_89() { + if (jj_3R_164()) return true; + return false; + } + private boolean jj_3_90() { if (jj_3R_161()) return true; return false; } - private boolean jj_3R_414() { + private boolean jj_3R_286() { Token xsp; xsp = jj_scanpos; if (jj_3_90()) { jj_scanpos = xsp; if (jj_3_91()) { jj_scanpos = xsp; - if (jj_3R_438()) { + if (jj_3R_378()) { jj_scanpos = xsp; - if (jj_3R_439()) { + if (jj_3R_379()) { jj_scanpos = xsp; - if (jj_3R_440()) return true; + if (jj_3R_380()) return true; } } } @@ -7437,22 +7442,27 @@ return false; } - private boolean jj_3R_272() { - if (jj_3R_364()) return true; + private boolean jj_3_88() { + if (jj_3R_163()) return true; return false; } + private boolean jj_3R_274() { + if (jj_3R_367()) return true; + return false; + } + private boolean jj_3_86() { if (jj_3R_161()) return true; return false; } - private boolean jj_3_89() { + private boolean jj_3R_273() { if (jj_3R_164()) return true; return false; } - private boolean jj_3_88() { + private boolean jj_3R_272() { if (jj_3R_163()) return true; return false; } @@ -7476,11 +7486,11 @@ jj_scanpos = xsp; if (jj_3_87()) { jj_scanpos = xsp; - if (jj_3_88()) { + if (jj_3R_272()) { jj_scanpos = xsp; - if (jj_3_89()) { + if (jj_3R_273()) { jj_scanpos = xsp; - if (jj_3R_272()) return true; + if (jj_3R_274()) return true; } } } @@ -7490,11 +7500,11 @@ } private boolean jj_3R_270() { - if (jj_3R_363()) return true; + if (jj_3R_366()) return true; return false; } - private boolean jj_3R_297() { + private boolean jj_3R_300() { if (jj_3R_251()) return true; return false; } @@ -7503,7 +7513,7 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_297()) { jj_scanpos = xsp; break; } + if (jj_3R_300()) { jj_scanpos = xsp; break; } } if (jj_3R_129()) return true; if (jj_3R_240()) return true; @@ -7575,7 +7585,7 @@ return false; } - private boolean jj_3R_415() { + private boolean jj_3R_420() { if (jj_3R_133()) return true; return false; } @@ -7584,12 +7594,12 @@ if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_415()) jj_scanpos = xsp; + if (jj_3R_420()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_347() { + private boolean jj_3R_350() { if (jj_3R_157()) return true; Token xsp; while (true) { @@ -7600,7 +7610,7 @@ } private boolean jj_3R_244() { - if (jj_3R_347()) return true; + if (jj_3R_350()) return true; return false; } @@ -7630,8 +7640,8 @@ return false; } - private boolean jj_3R_496() { - if (jj_3R_497()) return true; + private boolean jj_3R_498() { + if (jj_3R_499()) return true; return false; } @@ -7641,7 +7651,7 @@ return false; } - private boolean jj_3R_490() { + private boolean jj_3R_492() { if (jj_3R_156()) return true; Token xsp; while (true) { @@ -7651,30 +7661,30 @@ return false; } - private boolean jj_3R_483() { - if (jj_3R_490()) return true; + private boolean jj_3R_485() { + if (jj_3R_492()) return true; return false; } - private boolean jj_3R_495() { + private boolean jj_3R_497() { if (jj_3R_103()) return true; return false; } - private boolean jj_3R_362() { + private boolean jj_3R_365() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_483()) jj_scanpos = xsp; + if (jj_3R_485()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(86)) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_478() { + private boolean jj_3R_480() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_477()) return true; + if (jj_3R_479()) return true; return false; } @@ -7684,12 +7694,12 @@ } private boolean jj_3R_264() { - if (jj_3R_362()) return true; + if (jj_3R_365()) return true; return false; } - private boolean jj_3R_463() { - if (jj_3R_469()) return true; + private boolean jj_3R_469() { + if (jj_3R_474()) return true; return false; } @@ -7711,19 +7721,19 @@ return false; } - private boolean jj_3R_477() { + private boolean jj_3R_479() { if (jj_scan_token(76)) return true; if (jj_scan_token(ASSIGN)) return true; if (jj_3R_156()) return true; return false; } - private boolean jj_3R_469() { - if (jj_3R_477()) return true; + private boolean jj_3R_474() { + if (jj_3R_479()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_478()) { jj_scanpos = xsp; break; } + if (jj_3R_480()) { jj_scanpos = xsp; break; } } return false; } @@ -7734,7 +7744,7 @@ if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_463()) jj_scanpos = xsp; + if (jj_3R_469()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -7767,16 +7777,16 @@ return false; } - private boolean jj_3R_497() { + private boolean jj_3R_499() { if (jj_scan_token(_DEFAULT)) return true; if (jj_3R_156()) return true; return false; } - private boolean jj_3R_361() { + private boolean jj_3R_364() { Token xsp; xsp = jj_scanpos; - if (jj_3R_411()) { + if (jj_3R_417()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -7786,13 +7796,13 @@ return false; } - private boolean jj_3R_411() { + private boolean jj_3R_417() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_262() { - if (jj_3R_361()) return true; + if (jj_3R_364()) return true; return false; } @@ -7807,9 +7817,9 @@ if (jj_scan_token(LPAREN)) return true; if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_495()) jj_scanpos = xsp; + if (jj_3R_497()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_496()) jj_scanpos = xsp; + if (jj_3R_498()) jj_scanpos = xsp; if (jj_scan_token(SEMICOLON)) return true; return false; } @@ -7858,7 +7868,7 @@ return false; } - private boolean jj_3R_494() { + private boolean jj_3R_496() { if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { @@ -7870,7 +7880,7 @@ } private boolean jj_3R_256() { - if (jj_3R_357()) return true; + if (jj_3R_360()) return true; return false; } @@ -7888,14 +7898,14 @@ if (jj_scan_token(AT)) return true; if (jj_scan_token(INTERFACE)) return true; if (jj_scan_token(76)) return true; - if (jj_3R_494()) return true; + if (jj_3R_496()) return true; return false; } - private boolean jj_3R_360() { + private boolean jj_3R_363() { Token xsp; xsp = jj_scanpos; - if (jj_3R_410()) { + if (jj_3R_416()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -7914,13 +7924,13 @@ return false; } - private boolean jj_3R_410() { + private boolean jj_3R_416() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_261() { - if (jj_3R_360()) return true; + if (jj_3R_363()) return true; return false; } @@ -7940,10 +7950,10 @@ return false; } - private boolean jj_3R_359() { + private boolean jj_3R_362() { Token xsp; xsp = jj_scanpos; - if (jj_3R_409()) { + if (jj_3R_415()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -7956,13 +7966,13 @@ return false; } - private boolean jj_3R_409() { + private boolean jj_3R_415() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_260() { - if (jj_3R_359()) return true; + if (jj_3R_362()) return true; return false; } @@ -7988,7 +7998,7 @@ return false; } - private boolean jj_3R_488() { + private boolean jj_3R_490() { if (jj_3R_192()) return true; return false; } @@ -8038,22 +8048,22 @@ return false; } - private boolean jj_3R_357() { + private boolean jj_3R_360() { if (jj_scan_token(EXTENDS)) return true; - if (jj_3R_471()) return true; + if (jj_3R_476()) return true; return false; } - private boolean jj_3R_491() { + private boolean jj_3R_493() { if (jj_3R_193()) return true; return false; } - private boolean jj_3R_487() { + private boolean jj_3R_489() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_491()) jj_scanpos = xsp; + if (jj_3R_493()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } @@ -8114,7 +8124,7 @@ return false; } - private boolean jj_3R_354() { + private boolean jj_3R_357() { if (jj_3R_193()) return true; return false; } @@ -8135,31 +8145,31 @@ } private boolean jj_3R_235() { - if (jj_3R_337()) return true; + if (jj_3R_340()) return true; return false; } - private boolean jj_3R_355() { + private boolean jj_3R_358() { if (jj_3R_193()) return true; return false; } - private boolean jj_3R_466() { - if (jj_3R_473()) return true; + private boolean jj_3R_472() { + if (jj_3R_478()) return true; return false; } - private boolean jj_3R_482() { - if (jj_3R_391()) return true; + private boolean jj_3R_484() { + if (jj_3R_397()) return true; return false; } - private boolean jj_3R_473() { + private boolean jj_3R_478() { if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_482()) { jj_scanpos = xsp; break; } + if (jj_3R_484()) { jj_scanpos = xsp; break; } } return false; } @@ -8170,13 +8180,13 @@ return false; } - private boolean jj_3R_356() { + private boolean jj_3R_359() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_255() { - if (jj_3R_356()) return true; + if (jj_3R_359()) return true; return false; } @@ -8193,9 +8203,9 @@ } if (jj_scan_token(76)) return true; xsp = jj_scanpos; - if (jj_3R_487()) jj_scanpos = xsp; + if (jj_3R_489()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_488()) jj_scanpos = xsp; + if (jj_3R_490()) jj_scanpos = xsp; return false; } @@ -8209,7 +8219,7 @@ return false; } - private boolean jj_3R_472() { + private boolean jj_3R_477() { if (jj_3R_141()) return true; Token xsp; while (true) { @@ -8219,8 +8229,8 @@ return false; } - private boolean jj_3R_465() { - if (jj_3R_472()) return true; + private boolean jj_3R_471() { + if (jj_3R_477()) return true; return false; } @@ -8233,22 +8243,22 @@ if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_465()) jj_scanpos = xsp; + if (jj_3R_471()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(86)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_466()) jj_scanpos = xsp; + if (jj_3R_472()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_484() { - if (jj_3R_317()) return true; + private boolean jj_3R_486() { + if (jj_3R_320()) return true; return false; } private boolean jj_3R_234() { - if (jj_3R_335()) return true; + if (jj_3R_338()) return true; return false; } @@ -8266,8 +8276,8 @@ return false; } - private boolean jj_3R_479() { - if (jj_3R_434()) return true; + private boolean jj_3R_481() { + if (jj_3R_442()) return true; return false; } @@ -8280,7 +8290,7 @@ if (jj_scan_token(SUPER)) return true; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_355()) jj_scanpos = xsp; + if (jj_3R_358()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; if (jj_scan_token(SEMICOLON)) return true; return false; @@ -8305,7 +8315,7 @@ if (jj_scan_token(SUPER)) return true; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_354()) jj_scanpos = xsp; + if (jj_3R_357()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; if (jj_scan_token(SEMICOLON)) return true; return false; @@ -8363,28 +8373,28 @@ return false; } - private boolean jj_3R_486() { + private boolean jj_3R_488() { if (jj_3R_133()) return true; return false; } - private boolean jj_3R_485() { + private boolean jj_3R_487() { if (jj_3R_132()) return true; return false; } - private boolean jj_3R_480() { + private boolean jj_3R_482() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_485()) jj_scanpos = xsp; + if (jj_3R_487()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_486()) jj_scanpos = xsp; + if (jj_3R_488()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_339() { + private boolean jj_3R_342() { if (jj_3R_145()) return true; return false; } @@ -8392,19 +8402,19 @@ private boolean jj_3R_238() { Token xsp; xsp = jj_scanpos; - if (jj_3R_339()) jj_scanpos = xsp; + if (jj_3R_342()) jj_scanpos = xsp; if (jj_scan_token(76)) return true; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_484()) jj_scanpos = xsp; + if (jj_3R_486()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_338() { + private boolean jj_3R_341() { Token xsp; xsp = jj_scanpos; - if (jj_3R_395()) { + if (jj_3R_401()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -8417,13 +8427,13 @@ return false; } - private boolean jj_3R_395() { + private boolean jj_3R_401() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_237() { - if (jj_3R_338()) return true; + if (jj_3R_341()) return true; return false; } @@ -8435,25 +8445,25 @@ } if (jj_3R_238()) return true; xsp = jj_scanpos; - if (jj_3R_479()) jj_scanpos = xsp; - if (jj_3R_480()) return true; + if (jj_3R_481()) jj_scanpos = xsp; + if (jj_3R_482()) return true; return false; } - private boolean jj_3R_446() { + private boolean jj_3R_452() { if (jj_scan_token(STATIC)) return true; if (jj_3R_181()) return true; return false; } - private boolean jj_3R_445() { + private boolean jj_3R_451() { if (jj_3R_181()) return true; return false; } - private boolean jj_3R_492() { + private boolean jj_3R_494() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_460()) return true; + if (jj_3R_464()) return true; return false; } @@ -8466,14 +8476,14 @@ private boolean jj_3R_243() { Token xsp; xsp = jj_scanpos; - if (jj_3R_346()) { + if (jj_3R_349()) { jj_scanpos = xsp; if (jj_scan_token(85)) return true; } return false; } - private boolean jj_3R_346() { + private boolean jj_3R_349() { if (jj_3R_181()) return true; return false; } @@ -8488,7 +8498,7 @@ return false; } - private boolean jj_3R_460() { + private boolean jj_3R_464() { Token xsp; xsp = jj_scanpos; if (jj_3_51()) { @@ -8503,19 +8513,19 @@ return false; } - private boolean jj_3R_449() { - if (jj_3R_460()) return true; + private boolean jj_3R_455() { + if (jj_3R_464()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_492()) { jj_scanpos = xsp; break; } + if (jj_3R_494()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_434() { + private boolean jj_3R_442() { if (jj_scan_token(THROWS)) return true; - if (jj_3R_449()) return true; + if (jj_3R_455()) return true; return false; } @@ -8537,12 +8547,12 @@ return false; } - private boolean jj_3R_493() { - if (jj_3R_434()) return true; + private boolean jj_3R_495() { + if (jj_3R_442()) return true; return false; } - private boolean jj_3R_433() { + private boolean jj_3R_441() { if (jj_3R_103()) return true; return false; } @@ -8598,14 +8608,14 @@ private boolean jj_3R_251() { Token xsp; xsp = jj_scanpos; - if (jj_3R_353()) { + if (jj_3R_356()) { jj_scanpos = xsp; if (jj_scan_token(31)) return true; } return false; } - private boolean jj_3R_353() { + private boolean jj_3R_356() { if (jj_3R_155()) return true; return false; } @@ -8642,8 +8652,8 @@ return false; } - private boolean jj_3R_432() { - if (jj_3R_317()) return true; + private boolean jj_3R_440() { + if (jj_3R_320()) return true; return false; } @@ -8667,8 +8677,8 @@ return false; } - private boolean jj_3R_402() { - if (jj_3R_434()) return true; + private boolean jj_3R_408() { + if (jj_3R_442()) return true; return false; } @@ -8685,7 +8695,7 @@ return false; } - private boolean jj_3R_317() { + private boolean jj_3R_320() { Token xsp; xsp = jj_scanpos; if (jj_3_43()) { @@ -8695,98 +8705,98 @@ return false; } - private boolean jj_3R_399() { + private boolean jj_3R_405() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_401() { + private boolean jj_3R_407() { if (jj_scan_token(76)) return true; if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_432()) jj_scanpos = xsp; + if (jj_3R_440()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_433()) jj_scanpos = xsp; + if (jj_3R_441()) jj_scanpos = xsp; return false; } - private boolean jj_3R_450() { + private boolean jj_3R_456() { if (jj_3R_101()) return true; return false; } - private boolean jj_3R_400() { + private boolean jj_3R_406() { Token xsp; xsp = jj_scanpos; - if (jj_3R_431()) { + if (jj_3R_439()) { jj_scanpos = xsp; if (jj_scan_token(63)) return true; } return false; } - private boolean jj_3R_431() { + private boolean jj_3R_439() { if (jj_3R_129()) return true; return false; } - private boolean jj_3R_345() { - if (jj_3R_400()) return true; - if (jj_3R_401()) return true; + private boolean jj_3R_348() { + if (jj_3R_406()) return true; + if (jj_3R_407()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_402()) jj_scanpos = xsp; + if (jj_3R_408()) jj_scanpos = xsp; return false; } private boolean jj_3R_242() { Token xsp; xsp = jj_scanpos; - if (jj_3R_344()) { + if (jj_3R_347()) { jj_scanpos = xsp; - if (jj_3R_345()) return true; + if (jj_3R_348()) return true; } return false; } - private boolean jj_3R_344() { + private boolean jj_3R_347() { if (jj_3R_145()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_399()) { jj_scanpos = xsp; break; } + if (jj_3R_405()) { jj_scanpos = xsp; break; } } - if (jj_3R_400()) return true; - if (jj_3R_401()) return true; + if (jj_3R_406()) return true; + if (jj_3R_407()) return true; xsp = jj_scanpos; - if (jj_3R_493()) jj_scanpos = xsp; + if (jj_3R_495()) jj_scanpos = xsp; return false; } - private boolean jj_3R_406() { + private boolean jj_3R_412() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_351() { + private boolean jj_3R_354() { if (jj_scan_token(DOT)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_406()) { jj_scanpos = xsp; break; } + if (jj_3R_412()) { jj_scanpos = xsp; break; } } if (jj_scan_token(76)) return true; xsp = jj_scanpos; - if (jj_3R_450()) jj_scanpos = xsp; + if (jj_3R_456()) jj_scanpos = xsp; return false; } - private boolean jj_3R_343() { + private boolean jj_3R_346() { Token xsp; xsp = jj_scanpos; - if (jj_3R_398()) { + if (jj_3R_404()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -8817,13 +8827,13 @@ return false; } - private boolean jj_3R_398() { + private boolean jj_3R_404() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_241() { - if (jj_3R_343()) return true; + if (jj_3R_346()) return true; return false; } @@ -8850,7 +8860,7 @@ return false; } - private boolean jj_3R_350() { + private boolean jj_3R_353() { if (jj_3R_101()) return true; return false; } @@ -8869,7 +8879,7 @@ } private boolean jj_3R_246() { - if (jj_3R_349()) return true; + if (jj_3R_352()) return true; if (jj_3R_103()) return true; return false; } @@ -8878,10 +8888,10 @@ if (jj_scan_token(76)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_350()) jj_scanpos = xsp; + if (jj_3R_353()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_351()) { jj_scanpos = xsp; break; } + if (jj_3R_354()) { jj_scanpos = xsp; break; } } return false; } @@ -8919,17 +8929,17 @@ return false; } - private boolean jj_3R_349() { + private boolean jj_3R_352() { Token xsp; xsp = jj_scanpos; - if (jj_3R_405()) { + if (jj_3R_411()) { jj_scanpos = xsp; if (jj_scan_token(15)) return true; } return false; } - private boolean jj_3R_405() { + private boolean jj_3R_411() { if (jj_3R_95()) return true; return false; } @@ -8940,7 +8950,7 @@ } private boolean jj_3R_252() { - if (jj_3R_349()) return true; + if (jj_3R_352()) return true; return false; } @@ -8964,7 +8974,7 @@ return false; } - private boolean jj_3R_397() { + private boolean jj_3R_403() { if (jj_scan_token(ASSIGN)) return true; if (jj_3R_157()) return true; return false; @@ -8975,7 +8985,7 @@ return false; } - private boolean jj_3R_352() { + private boolean jj_3R_355() { if (jj_3R_103()) return true; return false; } @@ -8990,9 +9000,9 @@ return false; } - private boolean jj_3R_342() { + private boolean jj_3R_345() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_341()) return true; + if (jj_3R_344()) return true; return false; } @@ -9018,32 +9028,32 @@ if (jj_scan_token(76)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_352()) jj_scanpos = xsp; + if (jj_3R_355()) jj_scanpos = xsp; return false; } - private boolean jj_3R_341() { + private boolean jj_3R_344() { if (jj_3R_131()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_397()) jj_scanpos = xsp; + if (jj_3R_403()) jj_scanpos = xsp; return false; } private boolean jj_3R_240() { - if (jj_3R_341()) return true; + if (jj_3R_344()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_342()) { jj_scanpos = xsp; break; } + if (jj_3R_345()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_340() { + private boolean jj_3R_343() { Token xsp; xsp = jj_scanpos; - if (jj_3R_396()) { + if (jj_3R_402()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -9068,13 +9078,13 @@ return false; } - private boolean jj_3R_396() { + private boolean jj_3R_402() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_239() { - if (jj_3R_340()) return true; + if (jj_3R_343()) return true; return false; } @@ -9130,7 +9140,7 @@ } private boolean jj_3R_233() { - if (jj_3R_337()) return true; + if (jj_3R_340()) return true; return false; } @@ -9139,19 +9149,19 @@ return false; } - private boolean jj_3R_481() { + private boolean jj_3R_483() { if (jj_scan_token(COMMA)) return true; if (jj_3R_100()) return true; return false; } - private boolean jj_3R_429() { - if (jj_3R_446()) return true; + private boolean jj_3R_437() { + if (jj_3R_452()) return true; return false; } - private boolean jj_3R_428() { - if (jj_3R_445()) return true; + private boolean jj_3R_436() { + if (jj_3R_451()) return true; return false; } @@ -9160,14 +9170,14 @@ return false; } - private boolean jj_3R_391() { + private boolean jj_3R_397() { Token xsp; xsp = jj_scanpos; if (jj_3_28()) { jj_scanpos = xsp; - if (jj_3R_428()) { + if (jj_3R_436()) { jj_scanpos = xsp; - if (jj_3R_429()) { + if (jj_3R_437()) { jj_scanpos = xsp; if (jj_3_29()) return true; } @@ -9177,12 +9187,12 @@ } private boolean jj_3R_232() { - if (jj_3R_336()) return true; + if (jj_3R_339()) return true; return false; } - private boolean jj_3R_312() { - if (jj_3R_391()) return true; + private boolean jj_3R_315() { + if (jj_3R_397()) return true; return false; } @@ -9191,36 +9201,36 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_312()) { jj_scanpos = xsp; break; } + if (jj_3R_315()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_471() { + private boolean jj_3R_476() { if (jj_3R_100()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_481()) { jj_scanpos = xsp; break; } + if (jj_3R_483()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_448() { + private boolean jj_3R_454() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_358()) return true; + if (jj_3R_361()) return true; return false; } - private boolean jj_3R_337() { + private boolean jj_3R_340() { if (jj_scan_token(IMPLEMENTS)) return true; - if (jj_3R_471()) return true; + if (jj_3R_476()) return true; return false; } - private boolean jj_3R_468() { - if (jj_3R_348()) return true; + private boolean jj_3R_473() { + if (jj_3R_351()) return true; return false; } @@ -9229,18 +9239,18 @@ return false; } - private boolean jj_3R_336() { + private boolean jj_3R_339() { if (jj_scan_token(EXTENDS)) return true; if (jj_3R_99()) return true; return false; } private boolean jj_3R_259() { - if (jj_3R_358()) return true; + if (jj_3R_361()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_448()) { jj_scanpos = xsp; break; } + if (jj_3R_454()) { jj_scanpos = xsp; break; } } return false; } @@ -9252,15 +9262,15 @@ return false; } - private boolean jj_3R_392() { - if (jj_3R_387()) return true; + private boolean jj_3R_398() { + if (jj_3R_393()) return true; return false; } - private boolean jj_3R_335() { + private boolean jj_3R_338() { Token xsp; xsp = jj_scanpos; - if (jj_3R_394()) { + if (jj_3R_400()) { jj_scanpos = xsp; if (jj_scan_token(49)) { jj_scanpos = xsp; @@ -9285,7 +9295,7 @@ return false; } - private boolean jj_3R_394() { + private boolean jj_3R_400() { if (jj_3R_155()) return true; return false; } @@ -9297,7 +9307,7 @@ } private boolean jj_3R_230() { - if (jj_3R_335()) return true; + if (jj_3R_338()) return true; return false; } @@ -9365,18 +9375,18 @@ return false; } - private boolean jj_3R_447() { + private boolean jj_3R_453() { if (jj_3R_225()) return true; return false; } - private boolean jj_3R_334() { + private boolean jj_3R_337() { if (jj_3R_155()) return true; return false; } private boolean jj_3R_228() { - if (jj_3R_334()) return true; + if (jj_3R_337()) return true; return false; } @@ -9396,19 +9406,19 @@ return false; } - private boolean jj_3R_430() { + private boolean jj_3R_438() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_106()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_447()) { jj_scanpos = xsp; break; } + if (jj_3R_453()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; if (jj_3_177()) { jj_scanpos = xsp; - if (jj_3R_468()) return true; + if (jj_3R_473()) return true; } return false; } @@ -9428,12 +9438,12 @@ return false; } - private boolean jj_3R_393() { + private boolean jj_3R_399() { Token xsp; xsp = jj_scanpos; if (jj_3_178()) { jj_scanpos = xsp; - if (jj_3R_430()) return true; + if (jj_3R_438()) return true; } return false; } @@ -9444,7 +9454,7 @@ return false; } - private boolean jj_3R_325() { + private boolean jj_3R_328() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_216()) return true; if (jj_scan_token(RPAREN)) return true; @@ -9464,7 +9474,7 @@ jj_scanpos = xsp; if (jj_scan_token(44)) { jj_scanpos = xsp; - if (jj_3R_392()) return true; + if (jj_3R_398()) return true; } } } @@ -9475,7 +9485,7 @@ return false; } - private boolean jj_3R_324() { + private boolean jj_3R_327() { if (jj_scan_token(LPAREN)) return true; if (jj_3R_216()) return true; if (jj_scan_token(LBRACKET)) return true; @@ -9511,15 +9521,15 @@ xsp = jj_scanpos; if (jj_3_175()) { jj_scanpos = xsp; - if (jj_3R_324()) { + if (jj_3R_327()) { jj_scanpos = xsp; - if (jj_3R_325()) return true; + if (jj_3R_328()) return true; } } return false; } - private boolean jj_3R_470() { + private boolean jj_3R_475() { if (jj_3R_97()) return true; return false; } @@ -9572,7 +9582,7 @@ } private boolean jj_3R_171() { - if (jj_3R_287()) return true; + if (jj_3R_290()) return true; return false; } @@ -9597,12 +9607,12 @@ } private boolean jj_3R_170() { - if (jj_3R_287()) return true; + if (jj_3R_290()) return true; return false; } private boolean jj_3R_227() { - if (jj_3R_333()) return true; + if (jj_3R_336()) return true; return false; } @@ -9611,7 +9621,7 @@ return false; } - private boolean jj_3R_379() { + private boolean jj_3R_385() { if (jj_3R_138()) return true; Token xsp; while (true) { @@ -9641,22 +9651,22 @@ return false; } - private boolean jj_3R_287() { + private boolean jj_3R_290() { Token xsp; xsp = jj_scanpos; if (jj_3_174()) { jj_scanpos = xsp; - if (jj_3R_379()) return true; + if (jj_3R_385()) return true; } return false; } - private boolean jj_3R_329() { - if (jj_3R_287()) return true; + private boolean jj_3R_332() { + if (jj_3R_290()) return true; return false; } - private boolean jj_3R_333() { + private boolean jj_3R_336() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(29)) { @@ -9667,8 +9677,8 @@ return false; } - private boolean jj_3R_328() { - if (jj_3R_393()) return true; + private boolean jj_3R_331() { + if (jj_3R_399()) return true; return false; } @@ -9680,17 +9690,17 @@ private boolean jj_3R_217() { Token xsp; xsp = jj_scanpos; - if (jj_3R_327()) { + if (jj_3R_330()) { jj_scanpos = xsp; - if (jj_3R_328()) { + if (jj_3R_331()) { jj_scanpos = xsp; - if (jj_3R_329()) return true; + if (jj_3R_332()) return true; } } return false; } - private boolean jj_3R_327() { + private boolean jj_3R_330() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(92)) { @@ -9718,9 +9728,9 @@ return false; } - private boolean jj_3R_407() { + private boolean jj_3R_413() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_332()) return true; + if (jj_3R_335()) return true; return false; } @@ -9771,8 +9781,8 @@ return false; } - private boolean jj_3R_459() { - if (jj_3R_464()) return true; + private boolean jj_3R_463() { + if (jj_3R_470()) return true; return false; } @@ -9781,7 +9791,7 @@ return false; } - private boolean jj_3R_332() { + private boolean jj_3R_335() { Token xsp; xsp = jj_scanpos; if (jj_3_16()) { @@ -9804,22 +9814,22 @@ return false; } - private boolean jj_3R_323() { + private boolean jj_3R_326() { if (jj_3R_217()) return true; return false; } private boolean jj_3R_223() { - if (jj_3R_332()) return true; + if (jj_3R_335()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_407()) { jj_scanpos = xsp; break; } + if (jj_3R_413()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_322() { + private boolean jj_3R_325() { if (jj_scan_token(MINUS)) return true; if (jj_3R_214()) return true; return false; @@ -9839,7 +9849,7 @@ return false; } - private boolean jj_3R_321() { + private boolean jj_3R_324() { if (jj_scan_token(PLUS)) return true; if (jj_3R_214()) return true; return false; @@ -9856,7 +9866,7 @@ return false; } - private boolean jj_3R_320() { + private boolean jj_3R_323() { if (jj_3R_169()) return true; return false; } @@ -9881,15 +9891,15 @@ private boolean jj_3R_214() { Token xsp; xsp = jj_scanpos; - if (jj_3R_319()) { + if (jj_3R_322()) { jj_scanpos = xsp; - if (jj_3R_320()) { + if (jj_3R_323()) { jj_scanpos = xsp; - if (jj_3R_321()) { + if (jj_3R_324()) { jj_scanpos = xsp; - if (jj_3R_322()) { + if (jj_3R_325()) { jj_scanpos = xsp; - if (jj_3R_323()) return true; + if (jj_3R_326()) return true; } } } @@ -9897,7 +9907,7 @@ return false; } - private boolean jj_3R_319() { + private boolean jj_3R_322() { if (jj_3R_168()) return true; return false; } @@ -9949,13 +9959,13 @@ return false; } - private boolean jj_3R_464() { + private boolean jj_3R_470() { if (jj_scan_token(EXTENDS)) return true; Token xsp; xsp = jj_scanpos; if (jj_3_15()) { jj_scanpos = xsp; - if (jj_3R_470()) return true; + if (jj_3R_475()) return true; } return false; } @@ -9976,20 +9986,20 @@ return false; } - private boolean jj_3R_408() { + private boolean jj_3R_414() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_358() { + private boolean jj_3R_361() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_408()) { jj_scanpos = xsp; break; } + if (jj_3R_414()) { jj_scanpos = xsp; break; } } if (jj_scan_token(76)) return true; xsp = jj_scanpos; - if (jj_3R_459()) jj_scanpos = xsp; + if (jj_3R_463()) jj_scanpos = xsp; return false; } @@ -10126,7 +10136,7 @@ return false; } - private boolean jj_3R_423() { + private boolean jj_3R_431() { if (jj_3R_193()) return true; return false; } @@ -10240,8 +10250,8 @@ return false; } - private boolean jj_3R_422() { - if (jj_3R_418()) return true; + private boolean jj_3R_430() { + if (jj_3R_426()) return true; return false; } @@ -10273,7 +10283,7 @@ return false; } - private boolean jj_3R_331() { + private boolean jj_3R_334() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(33)) { @@ -10288,7 +10298,7 @@ return false; } - private boolean jj_3R_285() { + private boolean jj_3R_288() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(89)) { @@ -10338,12 +10348,12 @@ return false; } - private boolean jj_3R_421() { + private boolean jj_3R_429() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_330() { + private boolean jj_3R_333() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(17)) { @@ -10362,35 +10372,35 @@ return false; } - private boolean jj_3R_377() { + private boolean jj_3R_383() { if (jj_3R_138()) return true; return false; } - private boolean jj_3R_376() { + private boolean jj_3R_382() { if (jj_3R_188()) return true; return false; } private boolean jj_3R_220() { - if (jj_3R_331()) return true; + if (jj_3R_334()) return true; return false; } - private boolean jj_3R_284() { + private boolean jj_3R_287() { Token xsp; xsp = jj_scanpos; - if (jj_3R_375()) { + if (jj_3R_381()) { jj_scanpos = xsp; - if (jj_3R_376()) { + if (jj_3R_382()) { jj_scanpos = xsp; - if (jj_3R_377()) return true; + if (jj_3R_383()) return true; } } return false; } - private boolean jj_3R_375() { + private boolean jj_3R_381() { if (jj_3R_187()) return true; return false; } @@ -10406,7 +10416,7 @@ } private boolean jj_3R_219() { - if (jj_3R_330()) return true; + if (jj_3R_333()) return true; return false; } @@ -10421,8 +10431,8 @@ } private boolean jj_3R_166() { - if (jj_3R_284()) return true; - if (jj_3R_285()) return true; + if (jj_3R_287()) return true; + if (jj_3R_288()) return true; if (jj_3R_118()) return true; return false; } @@ -10446,17 +10456,17 @@ return false; } - private boolean jj_3R_420() { + private boolean jj_3R_428() { if (jj_3R_101()) return true; return false; } - private boolean jj_3R_326() { + private boolean jj_3R_329() { if (jj_3R_106()) return true; return false; } - private boolean jj_3R_316() { + private boolean jj_3R_319() { if (jj_3R_154()) return true; return false; } @@ -10471,7 +10481,7 @@ xsp = jj_scanpos; if (jj_3_1()) { jj_scanpos = xsp; - if (jj_3R_326()) return true; + if (jj_3R_329()) return true; } return false; } @@ -10479,25 +10489,25 @@ private boolean jj_3R_202() { Token xsp; xsp = jj_scanpos; - if (jj_3R_315()) { + if (jj_3R_318()) { jj_scanpos = xsp; - if (jj_3R_316()) return true; + if (jj_3R_319()) return true; } return false; } - private boolean jj_3R_315() { + private boolean jj_3R_318() { if (jj_3R_166()) return true; return false; } - private boolean jj_3R_318() { + private boolean jj_3R_321() { if (jj_scan_token(COMMA)) return true; if (jj_scan_token(76)) return true; return false; } - private boolean jj_3R_436() { + private boolean jj_3R_444() { if (jj_3R_181()) return true; return false; } @@ -10507,17 +10517,17 @@ return false; } - private boolean jj_3R_404() { + private boolean jj_3R_410() { Token xsp; xsp = jj_scanpos; - if (jj_3R_435()) { + if (jj_3R_443()) { jj_scanpos = xsp; - if (jj_3R_436()) return true; + if (jj_3R_444()) return true; } return false; } - private boolean jj_3R_435() { + private boolean jj_3R_443() { if (jj_3R_118()) return true; return false; } @@ -10527,7 +10537,7 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_318()) { jj_scanpos = xsp; break; } + if (jj_3R_321()) { jj_scanpos = xsp; break; } } return false; } @@ -10537,17 +10547,17 @@ if (jj_scan_token(NEW)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_420()) jj_scanpos = xsp; + if (jj_3R_428()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_421()) { jj_scanpos = xsp; break; } + if (jj_3R_429()) { jj_scanpos = xsp; break; } } if (jj_scan_token(76)) return true; xsp = jj_scanpos; - if (jj_3R_422()) jj_scanpos = xsp; + if (jj_3R_430()) jj_scanpos = xsp; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_423()) jj_scanpos = xsp; + if (jj_3R_431()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; if (jj_3_126()) jj_scanpos = xsp; @@ -10555,7 +10565,7 @@ } private boolean jj_3R_203() { - if (jj_3R_317()) return true; + if (jj_3R_320()) return true; return false; } @@ -10575,7 +10585,7 @@ return false; } - private boolean jj_3R_403() { + private boolean jj_3R_409() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(76)) { @@ -10588,7 +10598,7 @@ return false; } - private boolean jj_3R_427() { + private boolean jj_3R_435() { if (jj_3R_193()) return true; return false; } @@ -10598,10 +10608,10 @@ return false; } - private boolean jj_3R_348() { - if (jj_3R_403()) return true; + private boolean jj_3R_351() { + if (jj_3R_409()) return true; if (jj_scan_token(127)) return true; - if (jj_3R_404()) return true; + if (jj_3R_410()) return true; return false; } @@ -10611,7 +10621,7 @@ } private boolean jj_3R_245() { - if (jj_3R_348()) return true; + if (jj_3R_351()) return true; return false; } @@ -10660,7 +10670,7 @@ return false; } - private boolean jj_3R_314() { + private boolean jj_3R_317() { if (jj_3R_155()) return true; return false; } @@ -10669,7 +10679,7 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_314()) { jj_scanpos = xsp; break; } + if (jj_3R_317()) { jj_scanpos = xsp; break; } } if (jj_scan_token(LBRACKET)) return true; if (jj_3R_118()) return true; @@ -10687,17 +10697,17 @@ return false; } - private boolean jj_3R_389() { + private boolean jj_3R_395() { if (jj_3R_101()) return true; return false; } - private boolean jj_3R_426() { - if (jj_3R_418()) return true; + private boolean jj_3R_434() { + if (jj_3R_426()) return true; return false; } - private boolean jj_3R_387() { + private boolean jj_3R_393() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(66)) { @@ -10727,7 +10737,7 @@ return false; } - private boolean jj_3R_390() { + private boolean jj_3R_396() { if (jj_3R_193()) return true; return false; } @@ -10791,7 +10801,7 @@ return false; } - private boolean jj_3R_388() { + private boolean jj_3R_394() { if (jj_3R_101()) return true; return false; } @@ -10808,7 +10818,7 @@ return false; } - private boolean jj_3R_308() { + private boolean jj_3R_311() { if (jj_scan_token(LBRACKET)) return true; if (jj_3R_118()) return true; if (jj_scan_token(RBRACKET)) return true; @@ -10837,28 +10847,28 @@ if (jj_scan_token(126)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_389()) jj_scanpos = xsp; + if (jj_3R_395()) jj_scanpos = xsp; if (jj_scan_token(76)) return true; return false; } - private boolean jj_3R_313() { + private boolean jj_3R_316() { if (jj_scan_token(COMMA)) return true; if (jj_3R_118()) return true; return false; } - private boolean jj_3R_425() { + private boolean jj_3R_433() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_311() { + private boolean jj_3R_314() { if (jj_scan_token(SUPER)) return true; if (jj_scan_token(126)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_388()) jj_scanpos = xsp; + if (jj_3R_394()) jj_scanpos = xsp; if (jj_scan_token(76)) return true; return false; } @@ -10885,7 +10895,7 @@ jj_scanpos = xsp; if (jj_3_142()) { jj_scanpos = xsp; - if (jj_3R_311()) { + if (jj_3R_314()) { jj_scanpos = xsp; if (jj_3_143()) { jj_scanpos = xsp; @@ -10910,8 +10920,8 @@ return false; } - private boolean jj_3R_382() { - if (jj_3R_418()) return true; + private boolean jj_3R_388() { + if (jj_3R_426()) return true; return false; } @@ -10926,7 +10936,7 @@ return false; } - private boolean jj_3R_378() { + private boolean jj_3R_384() { if (jj_scan_token(DOT)) return true; Token xsp; xsp = jj_scanpos; @@ -10940,21 +10950,21 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_313()) { jj_scanpos = xsp; break; } + if (jj_3R_316()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_424() { + private boolean jj_3R_432() { if (jj_3R_101()) return true; return false; } - private boolean jj_3R_286() { + private boolean jj_3R_289() { if (jj_scan_token(SUPER)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_378()) jj_scanpos = xsp; + if (jj_3R_384()) jj_scanpos = xsp; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; if (jj_3_137()) jj_scanpos = xsp; @@ -11007,7 +11017,7 @@ jj_scanpos = xsp; if (jj_3_140()) { jj_scanpos = xsp; - if (jj_3R_286()) return true; + if (jj_3R_289()) return true; } } } @@ -11044,17 +11054,17 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_308()) { jj_scanpos = xsp; break; } + if (jj_3R_311()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_381() { + private boolean jj_3R_387() { if (jj_3R_155()) return true; return false; } - private boolean jj_3R_310() { + private boolean jj_3R_313() { if (jj_3R_190()) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(SUPER)) return true; @@ -11068,24 +11078,24 @@ if (jj_scan_token(NEW)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_424()) jj_scanpos = xsp; + if (jj_3R_432()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_425()) { jj_scanpos = xsp; break; } + if (jj_3R_433()) { jj_scanpos = xsp; break; } } if (jj_scan_token(76)) return true; xsp = jj_scanpos; - if (jj_3R_426()) jj_scanpos = xsp; + if (jj_3R_434()) jj_scanpos = xsp; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_427()) jj_scanpos = xsp; + if (jj_3R_435()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; if (jj_3_128()) jj_scanpos = xsp; return false; } - private boolean jj_3R_309() { + private boolean jj_3R_312() { if (jj_scan_token(SUPER)) return true; Token xsp; while (true) { @@ -11100,9 +11110,9 @@ xsp = jj_scanpos; if (jj_3_131()) { jj_scanpos = xsp; - if (jj_3R_309()) { + if (jj_3R_312()) { jj_scanpos = xsp; - if (jj_3R_310()) return true; + if (jj_3R_313()) return true; } } return false; @@ -11130,27 +11140,27 @@ return false; } - private boolean jj_3R_418() { + private boolean jj_3R_426() { Token xsp; xsp = jj_scanpos; - if (jj_3R_442()) { + if (jj_3R_448()) { jj_scanpos = xsp; if (jj_scan_token(125)) return true; } return false; } - private boolean jj_3R_442() { + private boolean jj_3R_448() { if (jj_3R_101()) return true; return false; } - private boolean jj_3R_380() { + private boolean jj_3R_386() { if (jj_3R_101()) return true; return false; } - private boolean jj_3R_289() { + private boolean jj_3R_292() { if (jj_3R_138()) return true; Token xsp; while (true) { @@ -11163,28 +11173,28 @@ private boolean jj_3R_172() { Token xsp; xsp = jj_scanpos; - if (jj_3R_288()) { + if (jj_3R_291()) { jj_scanpos = xsp; - if (jj_3R_289()) return true; + if (jj_3R_292()) return true; } return false; } - private boolean jj_3R_288() { + private boolean jj_3R_291() { if (jj_scan_token(NEW)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_380()) jj_scanpos = xsp; + if (jj_3R_386()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_381()) { jj_scanpos = xsp; break; } + if (jj_3R_387()) { jj_scanpos = xsp; break; } } if (jj_scan_token(76)) return true; xsp = jj_scanpos; - if (jj_3R_382()) jj_scanpos = xsp; + if (jj_3R_388()) jj_scanpos = xsp; if (jj_scan_token(LPAREN)) return true; xsp = jj_scanpos; - if (jj_3R_390()) jj_scanpos = xsp; + if (jj_3R_396()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; xsp = jj_scanpos; if (jj_3_124()) jj_scanpos = xsp; @@ -11211,7 +11221,7 @@ return false; } - private boolean jj_3R_307() { + private boolean jj_3R_310() { if (jj_scan_token(VOID)) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(CLASS)) return true; @@ -11262,8 +11272,8 @@ return false; } - private boolean jj_3R_306() { - if (jj_3R_387()) return true; + private boolean jj_3R_309() { + if (jj_3R_393()) return true; return false; } @@ -11272,12 +11282,12 @@ return false; } - private boolean jj_3R_458() { - if (jj_3R_456()) return true; + private boolean jj_3R_461() { + if (jj_3R_459()) return true; return false; } - private boolean jj_3R_305() { + private boolean jj_3R_308() { if (jj_3R_172()) return true; return false; } @@ -11287,22 +11297,22 @@ return false; } - private boolean jj_3R_304() { + private boolean jj_3R_307() { if (jj_3R_189()) return true; return false; } - private boolean jj_3R_303() { + private boolean jj_3R_306() { if (jj_3R_188()) return true; return false; } - private boolean jj_3R_302() { + private boolean jj_3R_305() { if (jj_3R_187()) return true; return false; } - private boolean jj_3R_457() { + private boolean jj_3R_460() { if (jj_3R_180()) return true; return false; } @@ -11310,23 +11320,23 @@ private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; - if (jj_3R_301()) { - jj_scanpos = xsp; - if (jj_3R_302()) { - jj_scanpos = xsp; - if (jj_3R_303()) { - jj_scanpos = xsp; if (jj_3R_304()) { jj_scanpos = xsp; if (jj_3R_305()) { jj_scanpos = xsp; if (jj_3R_306()) { jj_scanpos = xsp; + if (jj_3R_307()) { + jj_scanpos = xsp; + if (jj_3R_308()) { + jj_scanpos = xsp; + if (jj_3R_309()) { + jj_scanpos = xsp; if (jj_3_121()) { jj_scanpos = xsp; if (jj_3_122()) { jj_scanpos = xsp; - if (jj_3R_307()) { + if (jj_3R_310()) { jj_scanpos = xsp; if (jj_3_123()) return true; } @@ -11341,7 +11351,7 @@ return false; } - private boolean jj_3R_301() { + private boolean jj_3R_304() { if (jj_3R_167()) return true; Token xsp; while (true) { @@ -11377,7 +11387,7 @@ return false; } - private boolean jj_3R_300() { + private boolean jj_3R_303() { if (jj_3R_251()) return true; return false; } @@ -11386,7 +11396,7 @@ Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_300()) { jj_scanpos = xsp; break; } + if (jj_3R_303()) { jj_scanpos = xsp; break; } } if (jj_3R_129()) return true; if (jj_3R_131()) return true; @@ -11395,7 +11405,7 @@ return false; } - private boolean jj_3R_462() { + private boolean jj_3R_465() { if (jj_3R_183()) return true; Token xsp; while (true) { @@ -11405,15 +11415,15 @@ return false; } - private boolean jj_3R_489() { + private boolean jj_3R_491() { if (jj_scan_token(BIT_OR)) return true; if (jj_3R_99()) return true; return false; } - private boolean jj_3R_299() { + private boolean jj_3R_302() { if (jj_scan_token(LPAREN)) return true; - if (jj_3R_462()) return true; + if (jj_3R_465()) return true; Token xsp; xsp = jj_scanpos; if (jj_scan_token(85)) jj_scanpos = xsp; @@ -11421,59 +11431,59 @@ return false; } - private boolean jj_3R_455() { + private boolean jj_3R_458() { if (jj_3R_180()) return true; return false; } - private boolean jj_3R_441() { + private boolean jj_3R_446() { Token xsp; xsp = jj_scanpos; - if (jj_3R_455()) jj_scanpos = xsp; - if (jj_3R_456()) return true; + if (jj_3R_458()) jj_scanpos = xsp; + if (jj_3R_459()) return true; return false; } private boolean jj_3R_182() { if (jj_scan_token(TRY)) return true; - if (jj_3R_299()) return true; + if (jj_3R_302()) return true; if (jj_3R_181()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_457()) jj_scanpos = xsp; + if (jj_3R_460()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_458()) jj_scanpos = xsp; + if (jj_3R_461()) jj_scanpos = xsp; return false; } - private boolean jj_3R_456() { + private boolean jj_3R_459() { if (jj_scan_token(FINALLY)) return true; if (jj_3R_181()) return true; return false; } - private boolean jj_3R_444() { + private boolean jj_3R_450() { if (jj_3R_247()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_489()) { jj_scanpos = xsp; break; } + if (jj_3R_491()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_443() { + private boolean jj_3R_449() { if (jj_3R_251()) return true; return false; } - private boolean jj_3R_419() { + private boolean jj_3R_427() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_443()) { jj_scanpos = xsp; break; } + if (jj_3R_449()) { jj_scanpos = xsp; break; } } - if (jj_3R_444()) return true; + if (jj_3R_450()) return true; if (jj_3R_131()) return true; return false; } @@ -11483,26 +11493,26 @@ return false; } - private boolean jj_3R_386() { + private boolean jj_3R_392() { if (jj_scan_token(CATCH)) return true; if (jj_scan_token(LPAREN)) return true; - if (jj_3R_419()) return true; + if (jj_3R_427()) return true; if (jj_scan_token(RPAREN)) return true; if (jj_3R_181()) return true; return false; } - private boolean jj_3R_298() { - if (jj_3R_386()) return true; + private boolean jj_3R_301() { + if (jj_3R_392()) return true; return false; } private boolean jj_3R_180() { Token xsp; - if (jj_3R_298()) return true; + if (jj_3R_301()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_298()) { jj_scanpos = xsp; break; } + if (jj_3R_301()) { jj_scanpos = xsp; break; } } return false; } @@ -11519,12 +11529,12 @@ xsp = jj_scanpos; if (jj_3_107()) { jj_scanpos = xsp; - if (jj_3R_441()) return true; + if (jj_3R_446()) return true; } return false; } - private boolean jj_3R_374() { + private boolean jj_3R_377() { Token xsp; xsp = jj_scanpos; if (jj_3_108()) { @@ -11534,7 +11544,7 @@ return false; } - private boolean jj_3R_372() { + private boolean jj_3R_375() { if (jj_scan_token(SYNCHRONIZED)) return true; if (jj_scan_token(LPAREN)) return true; if (jj_3R_118()) return true; @@ -11543,33 +11553,33 @@ return false; } - private boolean jj_3R_417() { + private boolean jj_3R_422() { if (jj_3R_118()) return true; return false; } - private boolean jj_3R_373() { + private boolean jj_3R_376() { if (jj_scan_token(THROW)) return true; if (jj_3R_118()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_371() { + private boolean jj_3R_374() { if (jj_scan_token(RETURN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_417()) jj_scanpos = xsp; + if (jj_3R_422()) jj_scanpos = xsp; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_475() { - if (jj_3R_385()) return true; + private boolean jj_3R_467() { + if (jj_3R_391()) return true; return false; } - private boolean jj_3R_370() { + private boolean jj_3R_373() { if (jj_scan_token(CONTINUE)) return true; Token xsp; xsp = jj_scanpos; @@ -11578,23 +11588,23 @@ return false; } - private boolean jj_3R_476() { + private boolean jj_3R_468() { if (jj_3R_251()) return true; return false; } - private boolean jj_3R_296() { + private boolean jj_3R_299() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_295()) return true; + if (jj_3R_298()) return true; return false; } - private boolean jj_3R_293(... [truncated message content] |
From: <dal...@us...> - 2014-04-18 21:06:35
|
Revision: 23500 http://sourceforge.net/p/jedit/svn/23500 Author: daleanson Date: 2014-04-18 21:06:32 +0000 (Fri, 18 Apr 2014) Log Message: ----------- Added tests for conversions. All tests pass. Modified Paths: -------------- 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/build.xml plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java Added Paths: ----------- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Conversions.java 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:51:13 UTC (rev 23499) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-04-18 21:06:32 UTC (rev 23500) @@ -339,11 +339,11 @@ trace_call("ReferenceType"); try { if (jj_2_3(3)) { - ClassOrInterfaceType(); + ArrayType(); } else if (jj_2_4(3)) { TypeVariable(); } else if (jj_2_5(3)) { - ArrayType(); + ClassOrInterfaceType(); } else { jj_consume_token(-1); throw new ParseException(); @@ -9879,7 +9879,7 @@ } private boolean jj_3_15() { - if (jj_3R_96()) return true; + if (jj_3R_98()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -10094,7 +10094,7 @@ } private boolean jj_3_12() { - if (jj_3R_96()) return true; + if (jj_3R_98()) return true; if (jj_3R_103()) return true; return false; } @@ -10109,7 +10109,7 @@ return false; } - private boolean jj_3R_98() { + private boolean jj_3R_96() { Token xsp; xsp = jj_scanpos; if (jj_3_11()) { @@ -10227,7 +10227,7 @@ return false; } - private boolean jj_3R_96() { + private boolean jj_3R_98() { Token xsp; xsp = jj_scanpos; if (jj_3_6()) { @@ -10348,11 +10348,6 @@ return false; } - private boolean jj_3R_429() { - if (jj_3R_155()) return true; - return false; - } - private boolean jj_3R_333() { Token xsp; xsp = jj_scanpos; @@ -10372,6 +10367,11 @@ return false; } + private boolean jj_3R_429() { + if (jj_3R_155()) return true; + return false; + } + private boolean jj_3R_383() { if (jj_3R_138()) return true; return false; @@ -10387,36 +10387,36 @@ return false; } - private boolean jj_3R_287() { + private boolean jj_3R_95() { Token xsp; xsp = jj_scanpos; - if (jj_3R_381()) { + if (jj_3R_219()) { jj_scanpos = xsp; - if (jj_3R_382()) { - jj_scanpos = xsp; - if (jj_3R_383()) return true; + if (jj_3R_220()) return true; } - } return false; } - private boolean jj_3R_381() { - if (jj_3R_187()) return true; + private boolean jj_3R_219() { + if (jj_3R_333()) return true; return false; } - private boolean jj_3R_95() { + private boolean jj_3R_287() { Token xsp; xsp = jj_scanpos; - if (jj_3R_219()) { + if (jj_3R_381()) { jj_scanpos = xsp; - if (jj_3R_220()) return true; + if (jj_3R_382()) { + jj_scanpos = xsp; + if (jj_3R_383()) return true; } + } return false; } - private boolean jj_3R_219() { - if (jj_3R_333()) return true; + private boolean jj_3R_381() { + if (jj_3R_187()) return true; return false; } @@ -10430,18 +10430,6 @@ return false; } - private boolean jj_3R_166() { - if (jj_3R_287()) return true; - if (jj_3R_288()) return true; - if (jj_3R_118()) return true; - return false; - } - - private boolean jj_3_156() { - if (jj_3R_166()) return true; - return false; - } - private boolean jj_3R_94() { Token xsp; while (true) { @@ -10456,6 +10444,18 @@ return false; } + private boolean jj_3R_166() { + if (jj_3R_287()) return true; + if (jj_3R_288()) return true; + if (jj_3R_118()) return true; + return false; + } + + private boolean jj_3_156() { + if (jj_3R_166()) return true; + return false; + } + private boolean jj_3R_428() { if (jj_3R_101()) return true; return false; @@ -10731,7 +10731,7 @@ private boolean jj_3_151() { if (jj_scan_token(NEW)) return true; - if (jj_3R_96()) return true; + if (jj_3R_98()) return true; if (jj_3R_103()) return true; if (jj_3R_117()) return true; return false; @@ -10762,7 +10762,7 @@ private boolean jj_3_149() { if (jj_scan_token(NEW)) return true; - if (jj_3R_96()) return true; + if (jj_3R_98()) return true; if (jj_3R_200()) return true; Token xsp; xsp = jj_scanpos; @@ -10807,7 +10807,7 @@ } private boolean jj_3_145() { - if (jj_3R_98()) return true; + if (jj_3R_96()) return true; if (jj_scan_token(126)) return true; if (jj_scan_token(NEW)) return true; return false; Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml 2014-04-18 20:51:13 UTC (rev 23499) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml 2014-04-18 21:06:32 UTC (rev 23500) @@ -74,6 +74,9 @@ <antcall target="FloatingPointOperations" inheritrefs="true"/> + <antcall + target="Conversions" + inheritrefs="true"/> </target> <!-- ======================================================================== @@ -395,6 +398,27 @@ </fail> </target> + <target + name="Conversions"> + <java + classname="JavaParser" + fork="true" + resultproperty="Conversionserror"> + <classpath + refid="classpathref"/> + <arg + value="test_files/Conversions.java"/> + </java> + <fail + message="Conversions failed: ${Conversionserror}"> + <condition> + <not> + <equals arg1="${Conversionserror}" arg2="0" trim="true"/> + </not> + </condition> + </fail> + </target> + <!-- ======================================================================== Target: javacc clean and create ========================================================================= --> 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:51:13 UTC (rev 23499) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-04-18 21:06:32 UTC (rev 23500) @@ -547,14 +547,13 @@ {} { LOOKAHEAD(3) - ClassOrInterfaceType() + ArrayType() | LOOKAHEAD(3) TypeVariable() | LOOKAHEAD(3) - ArrayType() - + ClassOrInterfaceType() } void ClassOrInterfaceType(): 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:51:13 UTC (rev 23499) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java 2014-04-18 21:06:32 UTC (rev 23500) @@ -11,10 +11,12 @@ // int cn = rw.myNumbers(); //int d = 7; //int a = b + c; - for (int i = 0; i < 100; i++) { - float z = 1.0f / i; - if (z * i != 1.0f) - System.out.print(" " + i); - } + // for (int i = 0; i < 100; i++) { + // float z = 1.0f / i; + // if (z * i != 1.0f) + // System.out.print(" " + i); + // } + ColoredPoint[] cpa = (ColoredPoint[])pa; + } } \ No newline at end of file Added: plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Conversions.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Conversions.java (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Conversions.java 2014-04-18 21:06:32 UTC (rev 23500) @@ -0,0 +1,199 @@ +// Chapter 5, conversions +class Test { + public static void main(String[] args) { + // Casting conversion (5.4) of a float literal to + // type int. Without the cast operator, this would + // be a compile-time error, because this is a + // narrowing conversion (5.1.3): + int i = (int)12.5f; + + // String conversion (5.4) of i's int value: + System.out.println("(int)12.5f==" + i); + + // Assignment conversion (5.2) of i's value to type + // float. This is a widening conversion (5.1.2): + float f = i; + + // String conversion of f's float value: + System.out.println("after float widening: " + f); + + // Numeric promotion (5.6) of i's value to type + // float. This is a binary numeric promotion. + // After promotion, the operation is float*float: + System.out.print(f); + f = f * i; + + // Two string conversions of i and f: + System.out.println("*" + i + "==" + f); + + // Invocation conversion (5.3) of f's value + // to type double, needed because the method Math.sin + // accepts only a double argument: + double d = Math.sin(f); + + // Two string conversions of f and d: + System.out.println("Math.sin(" + f + ")==" + d); + } + + public static void narrowingAndWidening() { + int big = 1234567890; + float approx = big; + System.out.println(big - (int)approx); + float fmin = Float.NEGATIVE_INFINITY; + float fmax = Float.POSITIVE_INFINITY; + System.out.println("long: " + (long)fmin + + ".." + (long)fmax); + System.out.println("int: " + (int)fmin + + ".." + (int)fmax); + System.out.println("short: " + (short)fmin + + ".." + (short)fmax); + System.out.println("char: " + (int)(char)fmin + + ".." + (int)(char)fmax); + System.out.println("byte: " + (byte)fmin + + ".." + (byte)fmax); + // A narrowing of int to short loses high bits: + System.out.println("(short)0x12345678==0x" + + Integer.toHexString((short)0x12345678)); + // An int value too big for byte changes sign and magnitude: + System.out.println("(byte)255==" + (byte)255); + // A float value too big to fit gives largest int value: + System.out.println("(int)1e20f==" + (int)1e20f); + // A NaN converted to int yields zero: + System.out.println("(int)NaN==" + (int)Float.NaN); + // A double value too large for float yields infinity: + System.out.println("(float)-1e100==" + (float)-1e100); + // A double value too small for float underflows to zero: + System.out.println("(float)1e-50==" + (float)1e-50); + } + + public static void reverse(List<?> list) { rev(list); } + private static <T> void rev(List<T> list) { + List<T> tmp = new ArrayList<T>(list); + for (int i = 0; i < list.size(); i++) { + list.set(i, tmp.get(list.size() - i - 1)); + } + } + + public static void assignmentConversions() { + short s = 12; // narrow 12 to short + float f = s; // widen short to float + System.out.println("f=" + f); + char c = '\u0123'; + long l = c; // widen char to long + System.out.println("l=0x" + Long.toString(l,16)); + f = 1.23f; + double d = f; // widen float to double + System.out.println("d=" + d); + } + + public static void referenceTypeConversions() { + // Assignments to variables of class type: + Point p = new Point(); + p = new Point3D(); + // OK because Point3D is a subclass of Point + Point3D p3d = p; + // Error: will require a cast because a Point + // might not be a Point3D (even though it is, + // dynamically, in this example.) + + // Assignments to variables of type Object: + Object o = p; // OK: any object to Object + int[] a = new int[3]; + Object o2 = a; // OK: an array to Object + + // Assignments to variables of interface type: + ColoredPoint cp = new ColoredPoint(); + Colorable c = cp; + // OK: ColoredPoint implements Colorable + + // Assignments to variables of array type: + byte[] b = new byte[4]; + a = b; + // Error: these are not arrays of the same primitive type + Point3D[] p3da = new Point3D[3]; + Point[] pa = p3da; + // OK: since we can assign a Point3D to a Point + p3da = pa; + // Error: (cast needed) since a Point + // can't be assigned to a Point3D + } + + public static void ArrayConversions() { + long[] veclong = new long[100]; + Object o = veclong; // okay + Long l = veclong; // compile-time error + short[] vecshort = veclong; // compile-time error + Point[] pvec = new Point[100]; + ColoredPoint[] cpvec = new ColoredPoint[100]; + pvec = cpvec; // okay + pvec[0] = new Point(); // okay at compile time, + // but would throw an + // exception at run time + cpvec = pvec; // compile-time error + } + + public static void castingConversions() { + Point p = new Point(); + ColoredPoint cp = new ColoredPoint(); + Colorable c; + // The following may cause errors at run time because + // we cannot be sure they will succeed; this possibility + // is suggested by the casts: + cp = (ColoredPoint)p; // p might not reference an + // object which is a ColoredPoint + // or a subclass of ColoredPoint + c = (Colorable)p; // p might not be Colorable + // The following are incorrect at compile time because + // they can never succeed as explained in the text: + Long l = (Long)p; // compile-time error #1 + EndPoint e = new EndPoint(); + c = (Colorable)e; // compile-time error #2 + } + + public static void castingConversionsForArrays() { + Point[] pa = new ColoredPoint[4]; + pa[0] = new ColoredPoint(2, 2, 12); + pa[1] = new ColoredPoint(4, 5, 24); + ColoredPoint[] cpa = (ColoredPoint[])pa; + System.out.print("cpa: {"); + for (int i = 0; i < cpa.length; i++) + System.out.print((i == 0 ? " " : ", ") + cpa[i]); + System.out.println(" }"); + } + + public static void unaryNumericPromotions() { + byte b = 2; + int a[] = new int[b]; // dimension expression promotion + char c = '\u0001'; + a[c] = 1; // index expression promotion + a[0] = -c; // unary - promotion + System.out.println("a: " + a[0] + "," + a[1]); + b = -1; + int i = ~b; // bitwise complement promotion + System.out.println("~0x" + Integer.toHexString(b) + + "==0x" + Integer.toHexString(i)); + i = b << 4L; // shift promotion (left operand) + System.out.println("0x" + Integer.toHexString(b) + + "<<4L==0x" + Integer.toHexString(i)); + } + + public static void binaryNumericPromotions() { + int i = 0; + float f = 1.0f; + double d = 2.0; + // First int*float is promoted to float*float, then + // float==double is promoted to double==double: + if (i * f == d) System.out.println("oops"); + + // A char&byte is promoted to int&int: + byte b = 0x1f; + char c = 'G'; + int control = c & b; + System.out.println(Integer.toHexString(control)); + + // Here int:float is promoted to float:float: + f = (b==0) ? i : 4.0f; + System.out.println(1.0/f); + } + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2014-04-19 03:28:38
|
Revision: 23501 http://sourceforge.net/p/jedit/svn/23501 Author: ezust Date: 2014-04-19 03:28:34 +0000 (Sat, 19 Apr 2014) Log Message: ----------- Removing class files. Removed Paths: ------------- plugins/JavaSideKick/trunk/clean_jj/1.8/JavaCharStream.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$1.class 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/JavaParserConstants.class plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserTokenManager.class plugins/JavaSideKick/trunk/clean_jj/1.8/ParseException.class plugins/JavaSideKick/trunk/clean_jj/1.8/Token$GTToken.class plugins/JavaSideKick/trunk/clean_jj/1.8/Token.class plugins/JavaSideKick/trunk/clean_jj/1.8/TokenMgrError.class Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaCharStream.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$1.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$JJCalls.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser$LookaheadSuccess.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserConstants.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserTokenManager.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/ParseException.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/Token$GTToken.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/Token.class =================================================================== (Binary files differ) Deleted: plugins/JavaSideKick/trunk/clean_jj/1.8/TokenMgrError.class =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dal...@us...> - 2014-05-01 23:33:52
|
Revision: 23533 http://sourceforge.net/p/jedit/svn/23533 Author: daleanson Date: 2014-05-01 23:33:49 +0000 (Thu, 01 May 2014) Log Message: ----------- Handling generics and array syntax. Modified Paths: -------------- plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserConstants.java plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParserTokenManager.java plugins/JavaSideKick/trunk/clean_jj/1.8/Token.java plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/ArrayTest.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/RawTypes2.java Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-05-01 15:22:59 UTC (rev 23532) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/JavaParser.java 2014-05-01 23:33:49 UTC (rev 23533) @@ -76,26 +76,7 @@ return true; } -/* >'s need special attention due to generics syntax. */ /* -TOKEN : -{ - < RUNSIGNEDSHIFT: ">>>" > - { - matchedToken.kind = GT; - ((Token.GTToken)matchedToken).realKind = RUNSIGNEDSHIFT; - input_stream.backup(2); - } -| < RSIGNEDSHIFT: ">>" > - { - matchedToken.kind = GT; - ((Token.GTToken)matchedToken).realKind = RSIGNEDSHIFT; - input_stream.backup(1); - } -| < GT: ">" > -} -*/ -/* -------------------------------------------------------------------------------- Literals */ @@ -189,15 +170,6 @@ -------------------------------------------------------------------------------- Types(), Values(), and Variables() */ - final public void Identifier() throws ParseException { - trace_call("Identifier"); - try { - jj_consume_token(IDENTIFIER); - } finally { - trace_return("Identifier"); - } - } - final public void Type() throws ParseException { trace_call("Type"); try { @@ -339,11 +311,11 @@ trace_call("ReferenceType"); try { if (jj_2_3(3)) { + ClassOrInterfaceType(); + } else if (jj_2_4(3)) { ArrayType(); - } else if (jj_2_4(3)) { + } else if (jj_2_5(3)) { TypeVariable(); - } else if (jj_2_5(3)) { - ClassOrInterfaceType(); } else { jj_consume_token(-1); throw new ParseException(); @@ -356,14 +328,7 @@ final public void ClassOrInterfaceType() throws ParseException { trace_call("ClassOrInterfaceType"); try { - if (jj_2_6(3)) { - ClassType(); - } else if (jj_2_7(3)) { - InterfaceType(); - } else { - jj_consume_token(-1); - throw new ParseException(); - } + ClassType(); } finally { trace_return("ClassOrInterfaceType"); } @@ -384,15 +349,15 @@ } Annotation(); } - Identifier(); - if (jj_2_8(2)) { + jj_consume_token(IDENTIFIER); + if (jj_2_6(6)) { TypeArguments(); } else { ; } label_3: while (true) { - if (jj_2_9(2)) { + if (jj_2_7(2)) { ; } else { break label_3; @@ -410,8 +375,8 @@ } Annotation(); } - Identifier(); - if (jj_2_10(2)) { + jj_consume_token(IDENTIFIER); + if (jj_2_8(2)) { TypeArguments(); } else { ; @@ -446,7 +411,7 @@ } Annotation(); } - Identifier(); + jj_consume_token(IDENTIFIER); } finally { trace_return("TypeVariable"); } @@ -455,13 +420,13 @@ final public void ArrayType() throws ParseException { trace_call("ArrayType"); try { - if (jj_2_11(3)) { + if (jj_2_9(3)) { PrimitiveType(); Dims(); - } else if (jj_2_12(3)) { + } else if (jj_2_10(3)) { ClassOrInterfaceType(); Dims(); - } else if (jj_2_13(3)) { + } else if (jj_2_11(3)) { TypeVariable(); Dims(); } else { @@ -492,7 +457,7 @@ jj_consume_token(RBRACKET); label_7: while (true) { - if (jj_2_14(2)) { + if (jj_2_12(2)) { ; } else { break label_7; @@ -532,7 +497,7 @@ } Annotation(); } - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EXTENDS: TypeBound(); @@ -550,7 +515,7 @@ trace_call("TypeBound"); try { jj_consume_token(EXTENDS); - if (jj_2_15(3)) { + if (jj_2_13(3)) { ClassOrInterfaceType(); label_10: while (true) { @@ -596,7 +561,7 @@ try { jj_consume_token(LT); TypeArgumentList(); - jj_consume_token(124); + jj_consume_token(GT); } finally { trace_return("TypeArguments"); } @@ -627,9 +592,9 @@ final public void TypeArgument() throws ParseException { trace_call("TypeArgument"); try { - if (jj_2_16(3)) { + if (jj_2_14(3)) { ReferenceType(); - } else if (jj_2_17(3)) { + } else if (jj_2_15(3)) { Wildcard(); } else { jj_consume_token(-1); @@ -699,7 +664,7 @@ final public void PackageName() throws ParseException { trace_call("PackageName"); try { - Identifier(); + jj_consume_token(IDENTIFIER); label_13: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -711,7 +676,7 @@ break label_13; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } } finally { trace_return("PackageName"); @@ -721,16 +686,16 @@ final public void TypeName() throws ParseException { trace_call("TypeName"); try { - Identifier(); + jj_consume_token(IDENTIFIER); label_14: while (true) { - if (jj_2_18(2)) { + if (jj_2_16(2)) { ; } else { break label_14; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } } finally { trace_return("TypeName"); @@ -742,29 +707,29 @@ try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - Identifier(); + jj_consume_token(IDENTIFIER); label_15: while (true) { - if (jj_2_19(2)) { + if (jj_2_17(2)) { ; } else { break label_15; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } - if (jj_2_21(2)) { + if (jj_2_19(2)) { jj_consume_token(DOT); jj_consume_token(THIS); label_16: while (true) { - if (jj_2_20(2)) { + if (jj_2_18(2)) { ; } else { break label_16; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } } else { ; @@ -774,13 +739,13 @@ jj_consume_token(THIS); label_17: while (true) { - if (jj_2_22(2)) { + if (jj_2_20(2)) { ; } else { break label_17; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } break; default: @@ -811,7 +776,7 @@ final public void CompilationUnit() throws ParseException { trace_call("CompilationUnit"); try { - if (jj_2_23(2)) { + if (jj_2_21(2)) { PackageDeclaration(); } else { ; @@ -869,7 +834,7 @@ jj_la1[24] = jj_gen; break label_20; } - PackageModifier(); + Annotation(); } jj_consume_token(PACKAGE); PackageName(); @@ -879,15 +844,6 @@ } } - final public void PackageModifier() throws ParseException { - trace_call("PackageModifier"); - try { - Annotation(); - } finally { - trace_return("PackageModifier"); - } - } - final public void ImportDeclaration() throws ParseException { trace_call("ImportDeclaration"); try { @@ -919,9 +875,9 @@ final public void TypeDeclaration() throws ParseException { trace_call("TypeDeclaration"); try { - if (jj_2_24(3)) { + if (jj_2_22(3)) { ClassDeclaration(); - } else if (jj_2_25(3)) { + } else if (jj_2_23(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -946,9 +902,9 @@ final public void ClassDeclaration() throws ParseException { trace_call("ClassDeclaration"); try { - if (jj_2_26(3)) { + if (jj_2_24(3)) { NormalClassDeclaration(); - } else if (jj_2_27(3)) { + } else if (jj_2_25(3)) { EnumDeclaration(); } else { jj_consume_token(-1); @@ -982,7 +938,7 @@ ClassModifier(); } jj_consume_token(CLASS); - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeParameters(); @@ -1056,7 +1012,7 @@ try { jj_consume_token(LT); TypeParameterList(); - jj_consume_token(124); + jj_consume_token(GT); } finally { trace_return("TypeParameters"); } @@ -1178,7 +1134,7 @@ final public void ClassBodyDeclaration() throws ParseException { trace_call("ClassBodyDeclaration"); try { - if (jj_2_28(3)) { + if (jj_2_26(3)) { ClassMemberDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1190,7 +1146,7 @@ break; default: jj_la1[36] = jj_gen; - if (jj_2_29(2)) { + if (jj_2_27(2)) { ConstructorDeclaration(); } else { jj_consume_token(-1); @@ -1206,13 +1162,13 @@ final public void ClassMemberDeclaration() throws ParseException { trace_call("ClassMemberDeclaration"); try { - if (jj_2_30(6)) { + if (jj_2_28(6)) { FieldDeclaration(); - } else if (jj_2_31(6)) { + } else if (jj_2_29(6)) { MethodDeclaration(); - } else if (jj_2_32(3)) { + } else if (jj_2_30(3)) { ClassDeclaration(); - } else if (jj_2_33(3)) { + } else if (jj_2_31(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1341,7 +1297,7 @@ final public void VariableDeclaratorId() throws ParseException { trace_call("VariableDeclaratorId"); try { - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: case AT: @@ -1359,11 +1315,11 @@ final public void VariableInitializer() throws ParseException { trace_call("VariableInitializer"); try { - if (jj_2_34(2147483647)) { + if (jj_2_32(2147483647)) { ArrayInitializer(); - } else if (jj_2_35(2147483647)) { + } else if (jj_2_33(2147483647)) { Expression(); - } else if (jj_2_36(2147483647)) { + } else if (jj_2_34(2147483647)) { Primary(); } else { jj_consume_token(-1); @@ -1377,7 +1333,7 @@ final public void UnannType() throws ParseException { trace_call("UnannType"); try { - if (jj_2_37(3)) { + if (jj_2_35(3)) { UnannReferenceType(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1431,15 +1387,18 @@ final public void UnannReferenceType() throws ParseException { trace_call("UnannReferenceType"); try { - if (jj_2_38(8)) { + if (jj_2_36(2)) { UnannArrayType(); - } else if (jj_2_39(3)) { - UnannClassOrInterfaceType(); - } else if (jj_2_40(3)) { - UnannTypeVariable(); } else { - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + jj_consume_token(IDENTIFIER); + break; + default: + jj_la1[45] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } finally { trace_return("UnannReferenceType"); @@ -1458,13 +1417,13 @@ final public void UnannClassType() throws ParseException { trace_call("UnannClassType"); try { - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; ; } label_27: @@ -1474,7 +1433,7 @@ ; break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; break label_27; } jj_consume_token(DOT); @@ -1485,18 +1444,18 @@ ; break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; break label_28; } Annotation(); } - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; ; } } @@ -1505,15 +1464,6 @@ } } - final public void UnannTypeVariable() throws ParseException { - trace_call("UnannTypeVariable"); - try { - Identifier(); - } finally { - trace_return("UnannTypeVariable"); - } - } - final public void UnannArrayType() throws ParseException { trace_call("UnannArrayType"); try { @@ -1530,13 +1480,17 @@ Dims(); break; default: - jj_la1[49] = jj_gen; - if (jj_2_41(3)) { + jj_la1[50] = jj_gen; + if (jj_2_38(3)) { UnannClassOrInterfaceType(); + if (jj_2_37(2)) { + Dims(); + } else { + ; + } + } else if (jj_2_39(3)) { + jj_consume_token(IDENTIFIER); Dims(); - } else if (jj_2_42(3)) { - UnannTypeVariable(); - Dims(); } else { jj_consume_token(-1); throw new ParseException(); @@ -1566,7 +1520,7 @@ ; break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; break label_29; } MethodModifier(); @@ -1613,7 +1567,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1635,7 +1589,7 @@ ; break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; break label_30; } Annotation(); @@ -1647,7 +1601,7 @@ Throws(); break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; ; } break; @@ -1668,12 +1622,12 @@ Throws(); break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; ; } break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1701,7 +1655,7 @@ jj_consume_token(VOID); break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1713,7 +1667,7 @@ final public void MethodDeclarator() throws ParseException { trace_call("MethodDeclarator"); try { - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BOOLEAN: @@ -1730,7 +1684,7 @@ FormalParameterList(); break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1740,7 +1694,7 @@ Dims(); break; default: - jj_la1[58] = jj_gen; + jj_la1[59] = jj_gen; ; } } finally { @@ -1751,7 +1705,7 @@ final public void FormalParameterList() throws ParseException { trace_call("FormalParameterList"); try { - if (jj_2_43(6)) { + if (jj_2_40(6)) { FormalParameters(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -1759,10 +1713,10 @@ LastFormalParameter(); break; default: - jj_la1[59] = jj_gen; + jj_la1[60] = jj_gen; ; } - } else if (jj_2_44(3)) { + } else if (jj_2_41(3)) { LastFormalParameter(); } else { jj_consume_token(-1); @@ -1776,11 +1730,11 @@ final public void FormalParameters() throws ParseException { trace_call("FormalParameters"); try { - if (jj_2_47(3)) { + if (jj_2_44(3)) { FormalParameter(); label_31: while (true) { - if (jj_2_45(2)) { + if (jj_2_42(2)) { ; } else { break label_31; @@ -1788,11 +1742,11 @@ jj_consume_token(COMMA); FormalParameter(); } - } else if (jj_2_48(3)) { + } else if (jj_2_45(3)) { ReceiverParameter(); label_32: while (true) { - if (jj_2_46(2)) { + if (jj_2_43(2)) { ; } else { break label_32; @@ -1820,7 +1774,7 @@ ; break; default: - jj_la1[60] = jj_gen; + jj_la1[61] = jj_gen; break label_33; } VariableModifier(); @@ -1843,7 +1797,7 @@ jj_consume_token(FINAL); break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1855,7 +1809,7 @@ final public void LastFormalParameter() throws ParseException { trace_call("LastFormalParameter"); try { - if (jj_2_49(3)) { + if (jj_2_46(3)) { label_34: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1864,7 +1818,7 @@ ; break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; break label_34; } VariableModifier(); @@ -1877,14 +1831,14 @@ ; break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; break label_35; } Annotation(); } jj_consume_token(ELLIPSIS); VariableDeclaratorId(); - } else if (jj_2_50(3)) { + } else if (jj_2_47(3)) { FormalParameter(); } else { jj_consume_token(-1); @@ -1905,7 +1859,7 @@ ; break; default: - jj_la1[64] = jj_gen; + jj_la1[65] = jj_gen; break label_36; } Annotation(); @@ -1913,11 +1867,11 @@ UnannType(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(DOT); break; default: - jj_la1[65] = jj_gen; + jj_la1[66] = jj_gen; ; } jj_consume_token(THIS); @@ -1947,7 +1901,7 @@ ; break; default: - jj_la1[66] = jj_gen; + jj_la1[67] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -1961,9 +1915,9 @@ final public void ExceptionType() throws ParseException { trace_call("ExceptionType"); try { - if (jj_2_51(3)) { + if (jj_2_48(3)) { ClassType(); - } else if (jj_2_52(3)) { + } else if (jj_2_49(3)) { TypeVariable(); } else { jj_consume_token(-1); @@ -1985,7 +1939,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2026,7 +1980,7 @@ ; break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; break label_38; } ConstructorModifier(); @@ -2037,7 +1991,7 @@ Throws(); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; ; } ConstructorBody(); @@ -2063,7 +2017,7 @@ jj_consume_token(PRIVATE); break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2080,10 +2034,10 @@ TypeParameters(); break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; ; } - SimpleTypeName(); + jj_consume_token(IDENTIFIER); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BOOLEAN: @@ -2100,7 +2054,7 @@ FormalParameterList(); break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2109,25 +2063,16 @@ } } - final public void SimpleTypeName() throws ParseException { - trace_call("SimpleTypeName"); - try { - Identifier(); - } finally { - trace_return("SimpleTypeName"); - } - } - final public void ConstructorBody() throws ParseException { trace_call("ConstructorBody"); try { jj_consume_token(LBRACE); - if (jj_2_53(2147483647)) { + if (jj_2_50(2147483647)) { ExplicitConstructorInvocation(); } else { ; } - if (jj_2_54(2147483647)) { + if (jj_2_51(2147483647)) { BlockStatements(); } else { ; @@ -2141,13 +2086,13 @@ final public void ExplicitConstructorInvocation() throws ParseException { trace_call("ExplicitConstructorInvocation"); try { - if (jj_2_55(3)) { + if (jj_2_52(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; ; } jj_consume_token(THIS); @@ -2183,18 +2128,18 @@ ArgumentList(); break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_56(3)) { + } else if (jj_2_53(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: TypeArguments(); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; ; } jj_consume_token(SUPER); @@ -2230,12 +2175,12 @@ ArgumentList(); break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_57(3)) { + } else if (jj_2_54(3)) { ExpressionName(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2243,7 +2188,7 @@ TypeArguments(); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; ; } jj_consume_token(SUPER); @@ -2279,12 +2224,12 @@ ArgumentList(); break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; ; } jj_consume_token(RPAREN); jj_consume_token(SEMICOLON); - } else if (jj_2_58(3)) { + } else if (jj_2_55(3)) { Primary(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2292,7 +2237,7 @@ TypeArguments(); break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; ; } jj_consume_token(SUPER); @@ -2328,7 +2273,7 @@ ArgumentList(); break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2359,19 +2304,19 @@ ; break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; break label_39; } ClassModifier(); } jj_consume_token(ENUM); - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IMPLEMENTS: Superinterfaces(); break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; ; } EnumBody(); @@ -2390,7 +2335,7 @@ EnumConstantList(); break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2398,7 +2343,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2406,7 +2351,7 @@ EnumBodyDeclarations(); break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; ; } jj_consume_token(RBRACE); @@ -2421,7 +2366,7 @@ EnumConstant(); label_40: while (true) { - if (jj_2_59(2)) { + if (jj_2_56(2)) { ; } else { break label_40; @@ -2444,12 +2389,12 @@ ; break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; break label_41; } EnumConstantModifier(); } - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: jj_consume_token(LPAREN); @@ -2484,13 +2429,13 @@ ArgumentList(); break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; ; } jj_consume_token(RPAREN); break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2498,7 +2443,7 @@ ClassBody(); break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; ; } } finally { @@ -2553,7 +2498,7 @@ ; break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; break label_42; } ClassBodyDeclaration(); @@ -2570,9 +2515,9 @@ final public void InterfaceDeclaration() throws ParseException { trace_call("InterfaceDeclaration"); try { - if (jj_2_60(3)) { + if (jj_2_57(3)) { NormalInterfaceDeclaration(); - } else if (jj_2_61(3)) { + } else if (jj_2_58(3)) { AnnotationTypeDeclaration(); } else { jj_consume_token(-1); @@ -2588,7 +2533,7 @@ try { label_43: while (true) { - if (jj_2_62(2)) { + if (jj_2_59(2)) { ; } else { break label_43; @@ -2596,8 +2541,8 @@ InterfaceModifier(); } jj_consume_token(INTERFACE); - Identifier(); - if (jj_2_63(2)) { + jj_consume_token(IDENTIFIER); + if (jj_2_60(2)) { TypeParameters(); } else { ; @@ -2607,7 +2552,7 @@ ExtendsInterfaces(); break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; ; } InterfaceBody(); @@ -2642,7 +2587,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2667,7 +2612,7 @@ jj_consume_token(LBRACE); label_44: while (true) { - if (jj_2_64(2)) { + if (jj_2_61(2)) { ; } else { break label_44; @@ -2683,13 +2628,13 @@ final public void InterfaceMemberDeclaration() throws ParseException { trace_call("InterfaceMemberDeclaration"); try { - if (jj_2_65(3)) { + if (jj_2_62(3)) { ConstantDeclaration(); - } else if (jj_2_66(3)) { + } else if (jj_2_63(3)) { InterfaceMethodDeclaration(); - } else if (jj_2_67(3)) { + } else if (jj_2_64(3)) { ClassDeclaration(); - } else if (jj_2_68(3)) { + } else if (jj_2_65(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2697,7 +2642,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2720,7 +2665,7 @@ ; break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; break label_45; } ConstantModifier(); @@ -2750,7 +2695,7 @@ jj_consume_token(FINAL); break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2774,7 +2719,7 @@ ; break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; break label_46; } InterfaceMethodModifier(); @@ -2809,7 +2754,7 @@ jj_consume_token(STRICTFP); break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2823,7 +2768,7 @@ try { label_47: while (true) { - if (jj_2_69(2)) { + if (jj_2_66(2)) { ; } else { break label_47; @@ -2832,7 +2777,7 @@ } jj_consume_token(AT); jj_consume_token(INTERFACE); - Identifier(); + jj_consume_token(IDENTIFIER); AnnotationTypeBody(); } finally { trace_return("AnnotationTypeDeclaration"); @@ -2845,7 +2790,7 @@ jj_consume_token(LBRACE); label_48: while (true) { - if (jj_2_70(2)) { + if (jj_2_67(2)) { ; } else { break label_48; @@ -2861,13 +2806,13 @@ final public void AnnotationTypeMemberDeclaration() throws ParseException { trace_call("AnnotationTypeMemberDeclaration"); try { - if (jj_2_71(3)) { + if (jj_2_68(3)) { AnnotationTypeElementDeclaration(); - } else if (jj_2_72(3)) { + } else if (jj_2_69(3)) { ConstantDeclaration(); - } else if (jj_2_73(3)) { + } else if (jj_2_70(3)) { ClassDeclaration(); - } else if (jj_2_74(3)) { + } else if (jj_2_71(3)) { InterfaceDeclaration(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2875,7 +2820,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2897,13 +2842,13 @@ ; break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; break label_49; } AnnotationTypeElementModifier(); } UnannType(); - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(LPAREN); jj_consume_token(RPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2912,7 +2857,7 @@ Dims(); break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2920,7 +2865,7 @@ DefaultValue(); break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2943,7 +2888,7 @@ jj_consume_token(ABSTRACT); break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2965,11 +2910,11 @@ final public void Annotation() throws ParseException { trace_call("Annotation"); try { - if (jj_2_75(3)) { + if (jj_2_72(3)) { NormalAnnotation(); - } else if (jj_2_76(3)) { + } else if (jj_2_73(3)) { MarkerAnnotation(); - } else if (jj_2_77(3)) { + } else if (jj_2_74(3)) { SingleElementAnnotation(); } else { jj_consume_token(-1); @@ -2991,7 +2936,7 @@ ElementValuePairList(); break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3011,7 +2956,7 @@ ; break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; break label_50; } jj_consume_token(COMMA); @@ -3025,7 +2970,7 @@ final public void ElementValuePair() throws ParseException { trace_call("ElementValuePair"); try { - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(ASSIGN); ElementValue(); } finally { @@ -3036,7 +2981,7 @@ final public void ElementValue() throws ParseException { trace_call("ElementValue"); try { - if (jj_2_78(3)) { + if (jj_2_75(3)) { ConditionalExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3044,8 +2989,8 @@ ElementValueArrayInitializer(); break; default: - jj_la1[105] = jj_gen; - if (jj_2_79(3)) { + jj_la1[106] = jj_gen; + if (jj_2_76(3)) { Annotation(); } else { jj_consume_token(-1); @@ -3094,7 +3039,7 @@ ElementValueList(); break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3102,7 +3047,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3117,7 +3062,7 @@ ElementValue(); label_51: while (true) { - if (jj_2_80(2)) { + if (jj_2_77(2)) { ; } else { break label_51; @@ -3193,7 +3138,7 @@ VariableInitializerList(); break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3201,7 +3146,7 @@ jj_consume_token(COMMA); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3216,7 +3161,7 @@ VariableInitializer(); label_52: while (true) { - if (jj_2_81(2)) { + if (jj_2_78(2)) { ; } else { break label_52; @@ -3287,7 +3232,7 @@ BlockStatements(); break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; ; } jj_consume_token(RBRACE); @@ -3302,7 +3247,7 @@ BlockStatement(); label_53: while (true) { - if (jj_2_82(2)) { + if (jj_2_79(2)) { ; } else { break label_53; @@ -3317,11 +3262,11 @@ final public void BlockStatement() throws ParseException { trace_call("BlockStatement"); try { - if (jj_2_83(2147483647)) { + if (jj_2_80(2147483647)) { LocalVariableDeclarationStatement(); - } else if (jj_2_84(2147483647)) { + } else if (jj_2_81(2147483647)) { Statement(); - } else if (jj_2_85(3)) { + } else if (jj_2_82(3)) { ClassDeclaration(); } else { jj_consume_token(-1); @@ -3353,7 +3298,7 @@ ; break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; break label_54; } VariableModifier(); @@ -3373,14 +3318,14 @@ ForStatement(); break; default: - jj_la1[112] = jj_gen; - if (jj_2_86(2147483647)) { + jj_la1[113] = jj_gen; + if (jj_2_83(2147483647)) { StatementWithoutTrailingSubstatement(); - } else if (jj_2_87(2)) { + } else if (jj_2_84(2)) { LabeledStatement(); - } else if (jj_2_88(2147483647)) { + } else if (jj_2_85(2147483647)) { IfThenElseStatement(); - } else if (jj_2_89(2147483647)) { + } else if (jj_2_86(2147483647)) { IfThenStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3388,7 +3333,7 @@ WhileStatement(); break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3402,9 +3347,9 @@ final public void StatementNoShortIf() throws ParseException { trace_call("StatementNoShortIf"); try { - if (jj_2_90(2)) { + if (jj_2_87(2)) { StatementWithoutTrailingSubstatement(); - } else if (jj_2_91(2)) { + } else if (jj_2_88(2)) { LabeledStatementNoShortIf(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3418,7 +3363,7 @@ ForStatementNoShortIf(); break; default: - jj_la1[114] = jj_gen; + jj_la1[115] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3491,7 +3436,7 @@ TryStatement(); break; default: - jj_la1[115] = jj_gen; + jj_la1[116] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3512,7 +3457,7 @@ final public void LabeledStatement() throws ParseException { trace_call("LabeledStatement"); try { - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(COLON); Statement(); } finally { @@ -3523,7 +3468,7 @@ final public void LabeledStatementNoShortIf() throws ParseException { trace_call("LabeledStatementNoShortIf"); try { - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(COLON); StatementNoShortIf(); } finally { @@ -3544,19 +3489,19 @@ final public void StatementExpression() throws ParseException { trace_call("StatementExpression"); try { - if (jj_2_92(6)) { + if (jj_2_89(6)) { Assignment(); - } else if (jj_2_93(6)) { + } else if (jj_2_90(6)) { MethodInvocation(); - } else if (jj_2_94(6)) { + } else if (jj_2_91(6)) { PreIncrementExpression(); - } else if (jj_2_95(6)) { + } else if (jj_2_92(6)) { PreDecrementExpression(); - } else if (jj_2_96(6)) { + } else if (jj_2_93(6)) { PostIncrementExpression(); - } else if (jj_2_97(6)) { + } else if (jj_2_94(6)) { PostDecrementExpression(); - } else if (jj_2_98(3)) { + } else if (jj_2_95(3)) { ClassInstanceCreationExpression(); } else { jj_consume_token(-1); @@ -3614,7 +3559,7 @@ trace_call("AssertStatement"); try { jj_consume_token(ASSERT); - if (jj_2_99(2)) { + if (jj_2_96(2)) { Expression(); jj_consume_token(COLON); } else { @@ -3646,7 +3591,7 @@ jj_consume_token(LBRACE); label_55: while (true) { - if (jj_2_100(2)) { + if (jj_2_97(2)) { ; } else { break label_55; @@ -3655,7 +3600,7 @@ } label_56: while (true) { - if (jj_2_101(2)) { + if (jj_2_98(2)) { ; } else { break label_56; @@ -3689,7 +3634,7 @@ ; break; default: - jj_la1[116] = jj_gen; + jj_la1[117] = jj_gen; break label_57; } } @@ -3702,15 +3647,15 @@ trace_call("SwitchLabel"); try { jj_consume_token(CASE); - if (jj_2_102(2)) { + if (jj_2_99(2)) { ConstantExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - EnumConstantName(); + jj_consume_token(IDENTIFIER); break; default: - jj_la1[117] = jj_gen; + jj_la1[118] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3723,15 +3668,6 @@ } } - final public void EnumConstantName() throws ParseException { - trace_call("EnumConstantName"); - try { - Identifier(); - } finally { - trace_return("EnumConstantName"); - } - } - final public void WhileStatement() throws ParseException { trace_call("WhileStatement"); try { @@ -3776,7 +3712,7 @@ final public void ForStatement() throws ParseException { trace_call("ForStatement"); try { - if (jj_2_103(2147483647)) { + if (jj_2_100(2147483647)) { BasicForStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3784,7 +3720,7 @@ EnhancedForStatement(); break; default: - jj_la1[118] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3797,7 +3733,7 @@ final public void ForStatementNoShortIf() throws ParseException { trace_call("ForStatementNoShortIf"); try { - if (jj_2_104(3)) { + if (jj_2_101(3)) { BasicForStatementNoShortIf(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3805,7 +3741,7 @@ EnhancedForStatementNoShortIf(); break; default: - jj_la1[119] = jj_gen; + jj_la1[120] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3848,7 +3784,7 @@ ForInit(); break; default: - jj_la1[120] = jj_gen; + jj_la1[121] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3883,7 +3819,7 @@ Expression(); break; default: - jj_la1[121] = jj_gen; + jj_la1[122] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3914,7 +3850,7 @@ ForUpdate(); break; default: - jj_la1[122] = jj_gen; + jj_la1[123] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3957,7 +3893,7 @@ ForInit(); break; default: - jj_la1[123] = jj_gen; + jj_la1[124] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3992,7 +3928,7 @@ Expression(); break; default: - jj_la1[124] = jj_gen; + jj_la1[125] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4023,7 +3959,7 @@ ForUpdate(); break; default: - jj_la1[125] = jj_gen; + jj_la1[126] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4036,9 +3972,9 @@ final public void ForInit() throws ParseException { trace_call("ForInit"); try { - if (jj_2_105(3)) { + if (jj_2_102(3)) { StatementExpressionList(); - } else if (jj_2_106(3)) { + } else if (jj_2_103(3)) { LocalVariableDeclaration(); } else { jj_consume_token(-1); @@ -4069,7 +4005,7 @@ ; break; default: - jj_la1[126] = jj_gen; + jj_la1[127] = jj_gen; break label_58; } jj_consume_token(COMMA); @@ -4093,7 +4029,7 @@ ; break; default: - jj_la1[127] = jj_gen; + jj_la1[128] = jj_gen; break label_59; } VariableModifier(); @@ -4122,7 +4058,7 @@ ; break; default: - jj_la1[128] = jj_gen; + jj_la1[129] = jj_gen; break label_60; } VariableModifier(); @@ -4144,10 +4080,10 @@ jj_consume_token(BREAK); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - Identifier(); + jj_consume_token(IDENTIFIER); break; default: - jj_la1[129] = jj_gen; + jj_la1[130] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4162,10 +4098,10 @@ jj_consume_token(CONTINUE); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - Identifier(); + jj_consume_token(IDENTIFIER); break; default: - jj_la1[130] = jj_gen; + jj_la1[131] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4209,7 +4145,7 @@ Expression(); break; default: - jj_la1[131] = jj_gen; + jj_la1[132] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4245,10 +4181,10 @@ final public void TryStatement() throws ParseException { trace_call("TryStatement"); try { - if (jj_2_108(2)) { + if (jj_2_105(2)) { jj_consume_token(TRY); Block(); - if (jj_2_107(3)) { + if (jj_2_104(3)) { Catches(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4259,18 +4195,18 @@ Catches(); break; default: - jj_la1[132] = jj_gen; + jj_la1[133] = jj_gen; ; } Finally(); break; default: - jj_la1[133] = jj_gen; + jj_la1[134] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - } else if (jj_2_109(2)) { + } else if (jj_2_106(2)) { TryWithResourcesStatement(); } else { jj_consume_token(-1); @@ -4292,7 +4228,7 @@ ; break; default: - jj_la1[134] = jj_gen; + jj_la1[135] = jj_gen; break label_61; } } @@ -4325,7 +4261,7 @@ ; break; default: - jj_la1[135] = jj_gen; + jj_la1[136] = jj_gen; break label_62; } VariableModifier(); @@ -4348,7 +4284,7 @@ ; break; default: - jj_la1[136] = jj_gen; + jj_la1[137] = jj_gen; break label_63; } jj_consume_token(BIT_OR); @@ -4380,7 +4316,7 @@ Catches(); break; default: - jj_la1[137] = jj_gen; + jj_la1[138] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4388,7 +4324,7 @@ Finally(); break; default: - jj_la1[138] = jj_gen; + jj_la1[139] = jj_gen; ; } } finally { @@ -4406,7 +4342,7 @@ jj_consume_token(SEMICOLON); break; default: - jj_la1[139] = jj_gen; + jj_la1[140] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4421,7 +4357,7 @@ Resource(); label_64: while (true) { - if (jj_2_110(2)) { + if (jj_2_107(2)) { ; } else { break label_64; @@ -4445,7 +4381,7 @@ ; break; default: - jj_la1[140] = jj_gen; + jj_la1[141] = jj_gen; break label_65; } VariableModifier(); @@ -4466,9 +4402,9 @@ final public void Primary() throws ParseException { trace_call("Primary"); try { - if (jj_2_111(3)) { + if (jj_2_108(3)) { PrimaryNoNewArray(); - } else if (jj_2_112(3)) { + } else if (jj_2_109(3)) { ArrayCreationExpression(); } else { jj_consume_token(-1); @@ -4482,11 +4418,11 @@ final public void PrimaryNoNewArray() throws ParseException { trace_call("PrimaryNoNewArray"); try { - if (jj_2_116(2147483647)) { + if (jj_2_113(2147483647)) { MethodInvocation(); label_66: while (true) { - if (jj_2_113(2)) { + if (jj_2_110(2)) { ; } else { break label_66; @@ -4494,13 +4430,13 @@ jj_consume_token(DOT); MethodInvocation(); } - } else if (jj_2_117(2147483647)) { + } else if (jj_2_114(2147483647)) { ArrayAccess(); - } else if (jj_2_118(2147483647)) { + } else if (jj_2_115(2147483647)) { FieldAccess(); - } else if (jj_2_119(2147483647)) { + } else if (jj_2_116(2147483647)) { MethodReference(); - } else if (jj_2_120(2147483647)) { + } else if (jj_2_117(2147483647)) { ClassInstanceCreationExpression(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4513,10 +4449,10 @@ Literal(); break; default: - jj_la1[143] = jj_gen; - if (jj_2_121(3)) { + jj_la1[144] = jj_gen; + if (jj_2_118(3)) { TypeName(); - if (jj_2_114(2)) { + if (jj_2_111(2)) { label_67: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4524,7 +4460,7 @@ ; break; default: - jj_la1[141] = jj_gen; + jj_la1[142] = jj_gen; break label_67; } jj_consume_token(LBRACKET); @@ -4539,18 +4475,18 @@ jj_consume_token(THIS); break; default: - jj_la1[142] = jj_gen; + jj_la1[143] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - } else if (jj_2_122(3)) { + } else if (jj_2_119(3)) { jj_consume_token(LPAREN); Expression(); jj_consume_token(RPAREN); label_68: while (true) { - if (jj_2_115(2)) { + if (jj_2_112(2)) { ; } else { break label_68; @@ -4566,8 +4502,8 @@ jj_consume_token(CLASS); break; default: - jj_la1[144] = jj_gen; - if (jj_2_123(2)) { + jj_la1[145] = jj_gen; + if (jj_2_120(2)) { jj_consume_token(THIS); } else { jj_consume_token(-1); @@ -4593,7 +4529,7 @@ TypeArguments(); break; default: - jj_la1[145] = jj_gen; + jj_la1[146] = jj_gen; ; } label_69: @@ -4603,19 +4539,19 @@ ; break; default: - jj_la1[146] = jj_gen; + jj_la1[147] = jj_gen; break label_69; } Annotation(); } - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: - case 125: + case DIAMOND: TypeArgumentsOrDiamond(); break; default: - jj_la1[147] = jj_gen; + jj_la1[148] = jj_gen; ; } jj_consume_token(LPAREN); @@ -4650,18 +4586,18 @@ ArgumentList(); break; default: - jj_la1[148] = jj_gen; + jj_la1[149] = jj_gen; ; } jj_consume_token(RPAREN); - if (jj_2_124(2)) { + if (jj_2_121(2)) { ClassBody(); } else { ; } label_70: while (true) { - if (jj_2_125(2)) { + if (jj_2_122(2)) { ; } else { break label_70; @@ -4673,7 +4609,7 @@ TypeArguments(); break; default: - jj_la1[149] = jj_gen; + jj_la1[150] = jj_gen; ; } label_71: @@ -4683,19 +4619,19 @@ ; break; default: - jj_la1[150] = jj_gen; + jj_la1[151] = jj_gen; break label_71; } Annotation(); } - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: - case 125: + case DIAMOND: TypeArgumentsOrDiamond(); break; default: - jj_la1[151] = jj_gen; + jj_la1[152] = jj_gen; ; } jj_consume_token(LPAREN); @@ -4730,11 +4666,11 @@ ArgumentList(); break; default: - jj_la1[152] = jj_gen; + jj_la1[153] = jj_gen; ; } jj_consume_token(RPAREN); - if (jj_2_126(2)) { + if (jj_2_123(2)) { ClassBody(); } else { ; @@ -4746,7 +4682,7 @@ ExpressionName(); label_72: while (true) { - if (jj_2_127(2)) { + if (jj_2_124(2)) { ; } else { break label_72; @@ -4758,7 +4694,7 @@ TypeArguments(); break; default: - jj_la1[153] = jj_gen; + jj_la1[154] = jj_gen; ; } label_73: @@ -4768,19 +4704,19 @@ ; break; default: - jj_la1[154] = jj_gen; + jj_la1[155] = jj_gen; break label_73; } Annotation(); } - Identifier(); + jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: - case 125: + case DIAMOND: TypeArgumentsOrDiamond(); break; default: - jj_la1[155] = jj_gen; + jj_la1[156] = jj_gen; ; } jj_consume_token(LPAREN); @@ -4815,11 +4751,11 @@ ArgumentList(); break; default: - jj_la1[156] = jj_gen; + jj_la1[157] = jj_gen; ; } jj_consume_token(RPAREN); - if (jj_2_128(2)) { + if (jj_2_125(2)) { ClassBody(); } else { ; @@ -4827,7 +4763,7 @@ } break; default: - jj_la1[157] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4843,11 +4779,11 @@ case LT: TypeArguments(); break; - case 125: - jj_consume_token(125); + case DIAMOND: + jj_consume_token(DIAMOND); break; default: - jj_la1[158] = jj_gen; + jj_la1[159] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4859,17 +4795,17 @@ final public void FieldAccess() throws ParseException { trace_call("FieldAccess"); try { - if (jj_2_131(3)) { - Identifier(); + if (jj_2_128(3)) { + jj_consume_token(IDENTIFIER); label_74: while (true) { - if (jj_2_129(2)) { + if (jj_2_126(2)) { ; } else { break label_74; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4877,13 +4813,13 @@ jj_consume_token(SUPER); label_75: while (true) { - if (jj_2_130(2)) { + if (jj_2_127(2)) { ; } else { break label_75; } jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); } break; case IDENTIFIER: @@ -4891,10 +4827,10 @@ jj_consume_token(DOT); jj_consume_token(SUPER); jj_consume_token(DOT); - Identifier(); + jj_consume_token(IDENTIFIER); break; default: - jj_la1[159] = jj_gen; + jj_la1[160] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4918,7 +4854,7 @@ ; break; default: - jj_la1[160] = jj_gen; + jj_la1[161] = jj_gen; break label_76; } jj_consume_token(LBRACKET); @@ -4933,7 +4869,7 @@ final public void MethodInvocation() throws ParseException { trace_call("MethodInvocation"); try { - if (jj_2_138(6)) { + if (jj_2_135(6)) { MethodName(); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4967,11 +4903,11 @@ ArgumentList(); break; default: - jj_la1[161] = jj_gen; + jj_la1[162] = jj_gen; ; } jj_consume_token(RPAREN); - } else if (jj_2_139(3)) { + } else if (jj_2_136(3)) { TypeName(); jj_consume_token(DOT); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4980,33 +4916,33 @@ jj_consume_token(DOT); break; default: - jj_la1[162] = jj_gen; + jj_la1[163] = jj_gen; ; } - if (jj_2_132(2)) { + if (jj_2_129(2)) { TypeArguments(); } else { ; } - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(LPAREN); - if (jj_2_133(2)) { + if (jj_2_130(2)) { ArgumentList(); } else { ; } jj_consume_token(RPAREN); - } else if (jj_2_140(3)) { + } else if (jj_2_137(3)) { ExpressionName(); jj_consume_token(DOT); - if (jj_2_134(2)) { + if (jj_2_131(2)) { TypeArguments(); } else { ; } - Identifier(); + jj_consume_token(IDENTIFIER); jj_consume_token(LPAREN); - if (jj_2_135(2)) { + if (jj_2_132(2)) { ArgumentList(); } else { ; @@ -5019,19 +4955,19 @@ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOT: jj_consume_token(DOT); - if (jj_2_136(2)) { + if (jj_2_133(2)) { TypeArguments(); } else { ; } - Identifier(); + jj_consume_token(IDENTIFIER); break; default: - jj_la1[163] = jj_gen; + jj_la1[164] = jj_gen; ; } jj_consume_token(LPAREN); - if (jj_2_137(2)) { + if (jj_2_134(2)) { ArgumentList(); } else { ; @@ -5039,7 +4975,7 @@ jj_consume_token(RPAREN); break; default: - jj_la1[164] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5060,7 +4996,7 @@ ; break; default: - jj_la1[165] = jj_gen; + jj_la1[166] = jj_gen; break label_77; } jj_consume_token(COMMA); @@ -5074,76 +5010,76 @@ final public void MethodReference() throws ParseException { trace_call("MethodReference"); ... [truncated message content] |
From: <dal...@us...> - 2014-05-12 15:25:12
|
Revision: 23540 http://sourceforge.net/p/jedit/svn/23540 Author: daleanson Date: 2014-05-12 15:25:08 +0000 (Mon, 12 May 2014) Log Message: ----------- cleanup Modified Paths: -------------- plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml 2014-05-11 23:34:05 UTC (rev 23539) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml 2014-05-12 15:25:08 UTC (rev 23540) @@ -77,6 +77,17 @@ <antcall target="Conversions" inheritrefs="true"/> + <antcall + target="Chapter6" + inheritrefs="true"/> + <antcall + target="Imports" + inheritrefs="true"/> + <antcall + target="NestedGenericClasses" + inheritrefs="true"/> + + </target> <!-- ======================================================================== @@ -84,6 +95,48 @@ ========================================================================= --> <target + name="NestedGenericClasses"> + <java + classname="JavaParser" + fork="true" + resultproperty="NestedGenericClasseserror"> + <classpath + refid="classpathref"/> + <arg + value="test_files/NestedGenericClasses.java"/> + </java> + <fail + message="NestedGenericClasses failed: ${NestedGenericClasseserror}"> + <condition> + <not> + <equals arg1="${NestedGenericClasseserror}" arg2="0" trim="true"/> + </not> + </condition> + </fail> + </target> + + <target + name="Imports"> + <java + classname="JavaParser" + fork="true" + resultproperty="Importserror"> + <classpath + refid="classpathref"/> + <arg + value="test_files/Imports.java"/> + </java> + <fail + message="Imports failed: ${Importserror}"> + <condition> + <not> + <equals arg1="${Importserror}" arg2="0" trim="true"/> + </not> + </condition> + </fail> + </target> + + <target name="ColoredPoint"> <java classname="JavaParser" @@ -419,6 +472,27 @@ </fail> </target> + <target + name="Chapter6"> + <java + classname="JavaParser" + fork="true" + resultproperty="Chapter6error"> + <classpath + refid="classpathref"/> + <arg + value="test_files/Chapter6.java"/> + </java> + <fail + message="Chapter6 failed: ${Chapter6error}"> + <condition> + <not> + <equals arg1="${Chapter6error}" arg2="0" trim="true"/> + </not> + </condition> + </fail> + </target> + <!-- ======================================================================== Target: javacc clean and create ========================================================================= --> @@ -471,10 +545,6 @@ name="TokenMgrError.java"/> <include name="ParseException.java"/> - <!-- - <include - name="Token.java"/> - --> </fileset> </delete> </target> Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-05-11 23:34:05 UTC (rev 23539) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-05-12 15:25:08 UTC (rev 23540) @@ -515,14 +515,6 @@ void NumericType(): {} { - IntegralType() - | - FloatingPointType() -} - -void IntegralType(): -{} -{ <BYTE> | <SHORT> @@ -532,11 +524,7 @@ <LONG> | <CHAR> -} - -void FloatingPointType(): -{} -{ + | <FLOAT> | <DOUBLE> @@ -558,21 +546,9 @@ void ClassOrInterfaceType(): {} { - ClassType() -} - -void ClassType(): -{} -{ (Annotation())* <IDENTIFIER> [ LOOKAHEAD(6) TypeArguments() ] ( LOOKAHEAD(2) <DOT> (Annotation() )* <IDENTIFIER> [ LOOKAHEAD(2) TypeArguments() ] )* } -void InterfaceType(): -{} -{ - ClassType() -} - void TypeVariable(): {} { @@ -614,7 +590,7 @@ void AdditionalBound(): {} { - <BIT_AND> InterfaceType() + <BIT_AND> ClassOrInterfaceType() } void TypeArguments(): @@ -745,21 +721,9 @@ void ClassModifier(): {} { - Annotation() + InterfaceModifier() | - <PUBLIC> - | - <PROTECTED> - | - <PRIVATE> - | - <ABSTRACT> - | - <STATIC> - | <FINAL> - | - <STRICTFP> } void TypeParameters(): @@ -777,7 +741,7 @@ void Superclass(): {} { - <EXTENDS> ClassType() + <EXTENDS> ClassOrInterfaceType() } void Superinterfaces(): @@ -789,7 +753,7 @@ void InterfaceTypeList(): {} { - InterfaceType() (<COMMA> InterfaceType())* + ClassOrInterfaceType() (<COMMA> ClassOrInterfaceType())* } void ClassBody(): @@ -953,25 +917,11 @@ void MethodModifier(): {} { - Annotation() + ClassModifier() | - <PUBLIC> - | - <PROTECTED> - | - <PRIVATE> - | - <ABSTRACT> - | - <STATIC> - | - <FINAL> - | <SYNCHRONIZED> | <NATIVE> - | - <STRICTFP> } void MethodHeader(): @@ -1062,7 +1012,7 @@ {} { LOOKAHEAD(3) - ClassType() + ClassOrInterfaceType() | LOOKAHEAD(3) TypeVariable() @@ -1502,7 +1452,7 @@ { Block() | - EmptyStatement() + <SEMICOLON> | ExpressionStatement() | @@ -1525,12 +1475,6 @@ TryStatement() } -void EmptyStatement(): -{} -{ - <SEMICOLON> -} - void LabeledStatement(): {} { @@ -1625,7 +1569,7 @@ void SwitchLabel(): {} { - <CASE> ( LOOKAHEAD(2) ConstantExpression() | <IDENTIFIER> ) <COLON> + <CASE> ( LOOKAHEAD(2) Expression() | <IDENTIFIER> ) <COLON> <_DEFAULT> <COLON> } @@ -1754,15 +1698,9 @@ void Catches(): {} { - (CatchClause())+ + (<CATCH> <LPAREN> CatchFormalParameter() <RPAREN> Block())+ } -void CatchClause(): -{} -{ - <CATCH> <LPAREN> CatchFormalParameter() <RPAREN> Block() -} - void CatchFormalParameter(): {} { @@ -1772,7 +1710,7 @@ void CatchType(): {} { - UnannClassType() (<BIT_OR> ClassType())* + UnannClassType() (<BIT_OR> ClassOrInterfaceType())* } void Finally(): @@ -1810,6 +1748,7 @@ Productions() from §15 (Expressions()) */ +// TODO: Left recursion detected: "Primary... --> PrimaryNoNewArray... --> MethodInvocation... --> Primary..." void Primary(): {} { @@ -1820,18 +1759,20 @@ ArrayCreationExpression() } +// TODO: Left recursion, see Primary() above. void PrimaryNoNewArray(): {} { LOOKAHEAD(MethodInvocation()) MethodInvocation() (LOOKAHEAD(2) <DOT> MethodInvocation())* | - LOOKAHEAD(ArrayAccess()) + LOOKAHEAD(ArrayAccess())S ArrayAccess() | LOOKAHEAD(FieldAccess()) FieldAccess() | + // TODO: Left recursion, see Primary() above. LOOKAHEAD(MethodReference()) MethodReference() | @@ -1888,15 +1829,30 @@ void MethodInvocation(): {} { - LOOKAHEAD(6) - MethodName() <LPAREN> [ArgumentList()] <RPAREN> + /* + MethodInvocation: + MethodName ( [ArgumentList] ) + TypeName . [TypeArguments] Identifier ( [ArgumentList] ) + ExpressionName . [TypeArguments] Identifier ( [ArgumentList] ) + Primary . [TypeArguments] Identifier ( [ArgumentList] ) + super . [TypeArguments] Identifier ( [ArgumentList] ) + TypeName . super . [TypeArguments] Identifier ( [ArgumentList] ) + + TODO: Primary causes left recursion. + */ + + LOOKAHEAD(3) + MethodName() <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> | + // combined the 2 typenames LOOKAHEAD(3) TypeName() <DOT> [<SUPER> <DOT>] [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> | LOOKAHEAD(3) ExpressionName() <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> | + //Primary() <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> + //| <SUPER> [<DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER>] <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> } @@ -1921,7 +1877,7 @@ TypeName() <DOT> <SUPER> <DOUBLECOLON> [TypeArguments()] <IDENTIFIER> | LOOKAHEAD(3) - ClassType() <DOUBLECOLON> [TypeArguments()] <NEW> + ClassOrInterfaceType() <DOUBLECOLON> [TypeArguments()] <NEW> | LOOKAHEAD(3) ArrayType() <DOUBLECOLON> <NEW> @@ -1957,12 +1913,6 @@ (Annotation())* <LBRACKET> Expression() <RBRACKET> } -void ConstantExpression(): -{} -{ - Expression() -} - void Expression(): {} { @@ -2155,7 +2105,7 @@ | PreDecrementExpression() | - <PLUS> UnaryExpression() + <PLUS> UnaryExpression() | <MINUS> UnaryExpression() | This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dal...@us...> - 2014-07-02 03:48:00
|
Revision: 23608 http://sourceforge.net/p/jedit/svn/23608 Author: daleanson Date: 2014-07-02 03:47:52 +0000 (Wed, 02 Jul 2014) Log Message: ----------- Back to the original grammar for Expressions. Still have left recursion in Primary. Modified Paths: -------------- plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj Added Paths: ----------- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Chapter6.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Imports.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/NestedGenericClasses.java plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Packages.java Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-06-27 20:16:57 UTC (rev 23607) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/java18_clean.jj 2014-07-02 03:47:52 UTC (rev 23608) @@ -1749,6 +1749,11 @@ */ // TODO: Left recursion detected: "Primary... --> PrimaryNoNewArray... --> MethodInvocation... --> Primary..." +/* +Primary: +PrimaryNoNewArray +ArrayCreationExpression +*/ void Primary(): {} { @@ -1760,42 +1765,44 @@ } // TODO: Left recursion, see Primary() above. -void PrimaryNoNewArray(): +/* +PrimaryNoNewArray: +Literal +TypeName {[ ]} . class +void . class +this +TypeName . this +( Expression ) +ClassInstanceCreationExpression +FieldAccess +ArrayAccess +MethodInvocation +MethodReference +*/ +void PrimaryNoNewArray() : {} { - LOOKAHEAD(3) - PrimaryNoMethodInvocation() + Literal() | - MethodInvocation() (LOOKAHEAD(2) <DOT> MethodInvocation())* -} - -void PrimaryNoMethodInvocation() : -{} -{ - LOOKAHEAD(ArrayAccess()) - ArrayAccess() + TypeName() [<LBRACKET> <RBRACKET>] <DOT> <CLASS> | - LOOKAHEAD(FieldAccess()) - FieldAccess() + <VOID> <DOT> <CLASS> | - LOOKAHEAD(MethodReference()) - MethodReference() + <THIS> | - LOOKAHEAD(ClassInstanceCreationExpression()) + TypeName() <DOT> <THIS> + | + <LPAREN> Expression() <RPAREN> + | ClassInstanceCreationExpression() | - Literal() + FieldAccess() | - LOOKAHEAD(3) - TypeName() (LOOKAHEAD(2) ( <LBRACKET> <RBRACKET> )* <DOT> <CLASS> | <DOT> <THIS>) + ArrayAccess() | - LOOKAHEAD(3) - <LPAREN> Expression() <RPAREN> (LOOKAHEAD(2) <DOT> MethodInvocation())* + MethodInvocation() | - <VOID> <DOT> <CLASS> - | - LOOKAHEAD(2) - <THIS> + MethodReference() } void ClassInstanceCreationExpression(): @@ -1831,37 +1838,34 @@ ExpressionName() <LBRACKET> Expression() <RBRACKET> ( <LBRACKET> Expression() <RBRACKET> )* } +/* +MethodInvocation: +MethodName ( [ArgumentList] ) +TypeName . [TypeArguments] Identifier ( [ArgumentList] ) +ExpressionName . [TypeArguments] Identifier ( [ArgumentList] ) +Primary . [TypeArguments] Identifier ( [ArgumentList] ) +super . [TypeArguments] Identifier ( [ArgumentList] ) +TypeName . super . [TypeArguments] Identifier ( [ArgumentList] ) + +TODO: Primary causes left recursion. +*/ void MethodInvocation(): {} { - /* - MethodInvocation: - MethodName ( [ArgumentList] ) - TypeName . [TypeArguments] Identifier ( [ArgumentList] ) - ExpressionName . [TypeArguments] Identifier ( [ArgumentList] ) - Primary . [TypeArguments] Identifier ( [ArgumentList] ) - super . [TypeArguments] Identifier ( [ArgumentList] ) - TypeName . super . [TypeArguments] Identifier ( [ArgumentList] ) - - TODO: Primary causes left recursion. - */ - ( - LOOKAHEAD(3) - MethodName() <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> - | - // combined the 2 typenames - LOOKAHEAD(3) - TypeName() <DOT> [<SUPER> <DOT>] [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> - | - LOOKAHEAD(3) - ExpressionName() <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> - | - LOOKAHEAD(3) - PrimaryNoMethodInvocation() <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> - | - <SUPER> [<DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER>] <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> - ) - ( LOOKAHEAD(2) <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> )* + LOOKAHEAD(3) + MethodName() <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> + | + // combined the 2 TypeNames + LOOKAHEAD(3) + TypeName() <DOT> [<SUPER> <DOT>] [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> + | + LOOKAHEAD(3) + ExpressionName() <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> + | + <SUPER> [<DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER>] <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> + | + LOOKAHEAD(3) + Primary() <DOT> [LOOKAHEAD(2) TypeArguments()] <IDENTIFIER> <LPAREN> [LOOKAHEAD(2) ArgumentList()] <RPAREN> } void ArgumentList(): Added: plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Chapter6.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Chapter6.java (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Chapter6.java 2014-07-02 03:47:52 UTC (rev 23608) @@ -0,0 +1,50 @@ +// Chapter 6 + +public class HashSet<E> extends AbstractSet<E> { +} + +public class HashMap<K,V> extends AbstractMap<K,V> { +} + +public class ThreadLocal<T> { +} + +public interface Functor<T, X extends Throwable> { + T eval() throws X; +} + +interface ProcessStates { + int PS_RUNNING = 0; + int PS_SUSPENDED = 1; +} + +class Test { + public static void main(String[] args) { + Class c = System.out.getClass(); + System.out.println(c.toString().length() + + args[0].length() + args.length); + } +} + +class Test2 { + public static void main(String[] args) { + int i; + class Local { + { + for (int i = 0; i < 10; i++) + System.out.println(i); + } + } + new Local(); + } +} + +class Test3 { + public static void main(String[] args) { + for (int i = 0; i < 10; i++) + System.out.print(i + " "); + for (int i = 10; i > 0; i--) + System.out.print(i + " "); + System.out.println(); + } +} \ No newline at end of file Added: plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Imports.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Imports.java (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Imports.java 2014-07-02 03:47:52 UTC (rev 23608) @@ -0,0 +1,13 @@ +// imports + +// single type import +import java.util.Vector; + +// type import on demand +import java.awt.*; + +// single static import +import static java.lang.Math.random; + +// static import on demand +import static javax.swing.*; \ No newline at end of file Added: plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/NestedGenericClasses.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/NestedGenericClasses.java (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/NestedGenericClasses.java 2014-07-02 03:47:52 UTC (rev 23608) @@ -0,0 +1,51 @@ +// chapter 8, nested generic classes +class Seq<T> { + T head; + Seq<T> tail; + + Seq() { this(null, null); } + Seq(T head, Seq<T> tail) { + this.head = head; + this.tail = tail; + } + boolean isEmpty() { return tail == null; } + + class Zipper<S> { + // the double >> causes a parse error + Seq<Pair<T,S> > zip(Seq<S> that) { + if (isEmpty() || that.isEmpty()) { + return new Seq<Pair<T,S>>(); + } else { + Seq<T>.Zipper<S> tailZipper = + tail.new Zipper<S>(); + return new Seq<Pair<T,S>>( + new Pair<T,S>(head, that.head), + tailZipper.zip(that.tail)); + } + } + } +} +class Pair<T, S> { + T fst; S snd; + Pair(T f, S s) { fst = f; snd = s; } +} +class Test { + public static void main(String[] args) { + Seq<String> strs = + new Seq<String>( + "a", + new Seq<String>("b", + new Seq<String>())); + Seq<Number> nums = + new Seq<Number>( + new Integer(1), + new Seq<Number>(new Double(1.5), + new Seq<Number>())); + + Seq<String>.Zipper<Number> zipper = + strs.new Zipper<Number>(); + + Seq<Pair<String,Number>> combined = + zipper.zip(nums); + } +} \ No newline at end of file Added: plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Packages.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Packages.java (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/test_files/Packages.java 2014-07-02 03:47:52 UTC (rev 23608) @@ -0,0 +1,14 @@ +// packages +@Any package a.b.c.d.e; + +/* +@Any package a.b.c; +package a; +package a.b; +package a.b.c; +package a.b.c.d; +package a.b.c.d.e; +@Any package a; +@Any package a.b; +@Any package a.b.c.d; +*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dal...@us...> - 2014-12-16 04:10:03
|
Revision: 23772 http://sourceforge.net/p/jedit/svn/23772 Author: daleanson Date: 2014-12-16 04:10:00 +0000 (Tue, 16 Dec 2014) Log Message: ----------- Clean Java 1.8 grammar. Added Paths: ----------- plugins/JavaSideKick/trunk/clean_jj/1.8/Tiger.jj plugins/JavaSideKick/trunk/clean_jj/1.8/TigerParserConstants.java plugins/JavaSideKick/trunk/clean_jj/1.8/TigerParserTokenManager.java Added: plugins/JavaSideKick/trunk/clean_jj/1.8/Tiger.jj =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/Tiger.jj (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/Tiger.jj 2014-12-16 04:10:00 UTC (rev 23772) @@ -0,0 +1,2837 @@ + +/* +Per Sreenivasa Viswanadha (as posted on the javacc user mailing list), the +original java 1.5 grammar is licensed under the BSD license, so this modified +grammar is also. + +Copyright (c) 2014, Dale Anson +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the <ORGANIZATION> nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +options { + JAVA_UNICODE_ESCAPE = true; + //ERROR_REPORTING = true; + STATIC = false; + //DEBUG_PARSER = true; +} + +PARSER_BEGIN(TigerParser) + +import java.io.*; +import java.util.*; + +/** + * References like JLS X.X are section numbers in the Java Language Specification + * Third Edition. + * + * This has been modified to support Java 7 and 8. + * + * For Java 7 features, see http://docs.oracle.com/javase/8/docs/technotes/guides/language/enhancements.html#javase7 + * - binary literals + * - underscores in numeric literals + * - strings in switch statements + * - type inference for generic instance creation + * - try with resources + * - catch multiple exception types + * + * For Java 8 features, see http://docs.oracle.com/javase/8/docs/technotes/guides/language/enhancements.html#javase8 + * - Lambda Expressions + * - Improved Type Inference + * - Annotations on Java Types + * - Repeating Annotations + * - Method Parameter Reflection + * + */ +public class TigerParser +{ + + private InputStream inputStream = null; + + public static void main(String args[]) { + TigerParser parser; + if (args.length == 0) { + System.out.println("TigerParser: Reading from standard input . . ."); + parser = new TigerParser(System.in); + } else if (args.length == 1) { + System.out.println("TigerParser: Reading from file " + args[0] + " . . ."); + try { + parser = new TigerParser(new java.io.FileInputStream(args[0])); + } catch (java.io.FileNotFoundException e) { + System.out.println("TigerParser: File " + args[0] + " not found."); + return; + } + } else { + System.out.println("TigerParser: Usage is one of:"); + System.out.println(" java TigerParser < inputfile"); + System.out.println("OR"); + System.out.println(" java TigerParser inputfile"); + return; + } + try { + parser.enable_tracing(); + parser.CompilationUnit(); + if (args.length == 0) { + System.out.println("TigerParser: input parsed successfully."); + } + else if (args.length == 1) { + System.out.println("TigerParser: " + args[0] + " parsed successfully."); + } + } catch (ParseException e) { + if (args.length == 0) { + System.err.println("TigerParser: Encountered errors during parse."); + } + else if (args.length == 1) { + System.err.println("TigerParser: Encountered errors during parse of " + args[0]); + } + System.err.println(e.getMessage()); + System.exit(1); + } + } + + /** + * Constructor for TigerParser. + * @param fileName name of the file to parse + */ + public TigerParser(String filename) + { + this(System.in); + try { + inputStream = new FileInputStream(new File(filename)); + ReInit(inputStream); + } + catch(Exception e) { + e.printStackTrace(); + } + } + + TigerParser(JavaCharStream stream) { + jj_input_stream = stream; + token_source = new TigerParserTokenManager(jj_input_stream); + token = new Token(); + jj_ntk = -1; + } + + /** + * @param pe ParseException, if null, one will be generated. + * @param kinds One or more token types (see TigerParserConstants for + * definitions). Skipping will stop at the first token type found in + * this list. + * @return the token that was skipped to. This could be null since there is + * a limit of checking no more than 100 tokens. If a token of the requested + * kind is not found within the next 100 tokens, null will be returned. + */ + public Token error_skipto(ParseException pe, int... kinds) { + if (pe == null) { + pe = generateParseException(); // generate the exception object. + } + addException(pe); + return error_skipto(kinds); + } + + private Token error_skipto(int... kinds) { + Token t = null; + int i = 0; + do { + i++; + if (i > 100) { + return t; + } + t = getNextToken(); + for (int type : kinds) { + if (t.kind == type) { + return t; + } + } + } while (t != null); + return t; + } + + private List<Exception> exceptions = new ArrayList<Exception>(); + + private void addException(ParseException pe) { + exceptions.add(pe); + } + + public List<Exception> getErrors() { + return exceptions; + } + + public void setTabSize(int size) { + jj_input_stream.setTabSize(size); + } + + public int getTabSize() { + return jj_input_stream.getTabSize(0); + } + + /* + * Returns true if the next token is not in the FOLLOW list of "expansion". + * It is used to decide when the end of an "expansion" has been reached. + */ + private boolean notTailOfExpansionUnit() { + Token t; + t = getToken(1); + if (t.kind == BIT_OR || t.kind == COMMA || t.kind == RPAREN || t.kind == RBRACE || t.kind == RBRACKET) return false; + return true; + } +} + +PARSER_END(TigerParser) + + + +/******************************************** + * THE JAVA TOKEN SPECIFICATION STARTS HERE * + ********************************************/ + +/* WHITE SPACE */ + +SKIP : +{ + " " +| "\t" +| "\n" +| "\r" +| "\f" +} + +/* COMMENTS */ + +MORE : +{ + /* danson, added backup(2) for special handling of single line comments at + the end of a file, see <IN_SINGLE_LINE_COMMENT> special token below */ + "//" { input_stream.backup(2); } : IN_SINGLE_LINE_COMMENT +| + <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT +| + "/*" : IN_MULTI_LINE_COMMENT +} + +<IN_SINGLE_LINE_COMMENT> +SPECIAL_TOKEN : +{ + /* this is the original, I've replaced with the next line to allow a single + line comment at the end of a java file without a new line following the + comment. The java language specification says that single line comments + must be followed by an end-of-line marker (see section 3.4), so this new rule + relaxes that requirement slightly by allowing the line terminator to be + optional. This only makes sense when the comment is the last line of the + source file, all other single line comments will have a line terminator. This + request was posted as a bug against JBrowse, I don't see any problem with + allowing it, especially since Sun's compiler doesn't complain. */ + /* <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : DEFAULT */ + < SINGLE_LINE_COMMENT: "//"(~["\n","\r"])* ("\n"|"\r"|"\r\n")? > : DEFAULT +} + +<IN_FORMAL_COMMENT> +SPECIAL_TOKEN : +{ + <FORMAL_COMMENT: "*/" > : DEFAULT +} + +<IN_MULTI_LINE_COMMENT> +SPECIAL_TOKEN : +{ + <MULTI_LINE_COMMENT: "*/" > : DEFAULT +} + +<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> +MORE : +{ + < ~[] > +} + +/* RESERVED WORDS AND LITERALS */ + +TOKEN : +{ + < ABSTRACT: "abstract" > +| < ASSERT: "assert" > +| < BOOLEAN: "boolean" > +| < BREAK: "break" > +| < BYTE: "byte" > +| < CASE: "case" > +| < CATCH: "catch" > +| < CHAR: "char" > +| < CLASS: "class" > +| < CONST: "const" > +| < CONTINUE: "continue" > +| < _DEFAULT: "default" > +| < DO: "do" > +| < DOUBLE: "double" > +| < ELSE: "else" > +| < ENUM: "enum" > +| < EXTENDS: "extends" > +| < FALSE: "false" > +| < FINAL: "final" > +| < FINALLY: "finally" > +| < FLOAT: "float" > +| < FOR: "for" > +| < GOTO: "goto" > +| < IF: "if" > +| < IMPLEMENTS: "implements" > +| < IMPORT: "import" > +| < INSTANCEOF: "instanceof" > +| < INT: "int" > +| < INTERFACE: "interface" > +| < LONG: "long" > +| < NATIVE: "native" > +| < NEW: "new" > +| < NULL: "null" > +| < PACKAGE: "package"> +| < PRIVATE: "private" > +| < PROTECTED: "protected" > +| < PUBLIC: "public" > +| < RETURN: "return" > +| < SHORT: "short" > +| < STATIC: "static" > +| < STRICTFP: "strictfp" > +| < SUPER: "super" > +| < SWITCH: "switch" > +| < SYNCHRONIZED: "synchronized" > +| < THIS: "this" > +| < THROW: "throw" > +| < THROWS: "throws" > +| < TRANSIENT: "transient" > +| < TRUE: "true" > +| < TRY: "try" > +| < VOID: "void" > +| < VOLATILE: "volatile" > +| < WHILE: "while" > +} + +/* JAVACC RESERVED WORDS: These are the only tokens in JavaCC but not in Java */ +/* danson, using these keywords as tokens causes problems when parsing java +code, so I'm replacing these keyworks with semantic lookahead as described in +the javacc faq. */ +/* +TOKEN : +{ + < _OPTIONS: "options" > +| < _LOOKAHEAD: "LOOKAHEAD" > +| < _IGNORE_CASE: "IGNORE_CASE" > +| < _PARSER_BEGIN: "PARSER_BEGIN" > +| < _PARSER_END: "PARSER_END" > +| < _JAVACODE: "JAVACODE" > +| < _TOKEN: "TOKEN" > +| < _SPECIAL_TOKEN: "SPECIAL_TOKEN" > +| < _MORE: "MORE" > +| < _SKIP: "SKIP" > +| < _TOKEN_MGR_DECLS: "TOKEN_MGR_DECLS" > +| < _EOF: "EOF" > +} +*/ + +/* LITERALS */ +// DONE: Java 7 allows a binary literal. +// DONE: Java 7 allows underscores in numeric literals to improve readability, e.g. +// long creditCardNumber = 1234_5678_9012_3456L; +TOKEN : +{ + < INTEGER_LITERAL: + <DECIMAL_LITERAL> (["l","L"])? + | <HEX_LITERAL> (["l","L"])? + | <BINARY_LITERAL> (["l","L"])? + | <OCTAL_LITERAL> (["l","L"])? + > +| + < #DECIMAL_LITERAL: ["1"-"9"] ((["_"])*["0"-"9"])* > +| + < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])((["_"])*["0"-"9","a"-"f","A"-"F"])* > +| + < #BINARY_LITERAL: "0" ["b","B"] (["0"-"1"])((["_"])*["0"-"1"])* > // new for Java 7 +| + < #OCTAL_LITERAL: "0" ((["_"])*(["0"-"7"]))* > +| + < FLOATING_POINT_LITERAL: + (["0"-"9"])((["_"])*(["0"-"9"]))* "." ((["0"-"9"])((["_"])*(["0"-"9"]))*)* (<EXPONENT>)? (["f","F","d","D"])? + | "." (["0"-"9"])((["_"])*(["0"-"9"]))* (<EXPONENT>)? (["f","F","d","D"])? + | (["0"-"9"])((["_"])*(["0"-"9"]))* <EXPONENT> (["f","F","d","D"])? + | (["0"-"9"])((["_"])*(["0"-"9"]))* (<EXPONENT>)? ["f","F","d","D"] + > + +| + < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > +| + < CHARACTER_LITERAL: + "'" + ( (~["'","\\","\n","\r"]) + | ("\\" + ( ["n","t","b","r","f","\\","'","\""] + | ["0"-"7"] ( ["0"-"7"] )? + | ["0"-"3"] ["0"-"7"] ["0"-"7"] + ) + ) + ) + "'" + > +| + < STRING_LITERAL: + "\"" + ( (~["\"","\\","\n","\r"]) + | ("\\" + ( ["n","t","b","r","f","\\","'","\""] + | ["0"-"7"] ( ["0"-"7"] )? + | ["0"-"3"] ["0"-"7"] ["0"-"7"] + ) + ) + )* + "\"" + > +} + +/* IDENTIFIERS */ + +TOKEN : +{ + < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* > +| + < #LETTER: + [ + "\u0024", + "\u0041"-"\u005a", + "\u005f", + "\u0061"-"\u007a", + "\u00c0"-"\u00d6", + "\u00d8"-"\u00f6", + "\u00f8"-"\u00ff", + "\u0100"-"\u1fff", + "\u3040"-"\u318f", + "\u3300"-"\u337f", + "\u3400"-"\u3d2d", + "\u4e00"-"\u9fff", + "\uf900"-"\ufaff" + ] + > +| + < #DIGIT: + [ + "\u0030"-"\u0039", + "\u0660"-"\u0669", + "\u06f0"-"\u06f9", + "\u0966"-"\u096f", + "\u09e6"-"\u09ef", + "\u0a66"-"\u0a6f", + "\u0ae6"-"\u0aef", + "\u0b66"-"\u0b6f", + "\u0be7"-"\u0bef", + "\u0c66"-"\u0c6f", + "\u0ce6"-"\u0cef", + "\u0d66"-"\u0d6f", + "\u0e50"-"\u0e59", + "\u0ed0"-"\u0ed9", + "\u1040"-"\u1049" + ] + > +} + +/* SEPARATORS */ + +TOKEN : +{ + < LPAREN: "(" > +| < RPAREN: ")" > +| < LBRACE: "{" > +| < RBRACE: "}" > +| < LBRACKET: "[" > +| < RBRACKET: "]" > +| < SEMICOLON: ";" > +| < COMMA: "," > +| < DOT: "." > +| < AT: "@" > +} + +/* OPERATORS */ + +TOKEN : +{ + < ASSIGN: "=" > +| < LT: "<" > +| < BANG: "!" > +| < TILDE: "~" > +| < HOOK: "?" > +| < COLON: ":" > +| < EQ: "==" > +| < LE: "<=" > +| < GE: ">=" > +| < NE: "!=" > +| < SC_OR: "||" > +| < SC_AND: "&&" > +| < INCR: "++" > +| < DECR: "--" > +| < PLUS: "+" > +| < MINUS: "-" > +| < STAR: "*" > +| < SLASH: "/" > +| < BIT_AND: "&" > +| < BIT_OR: "|" > +| < XOR: "^" > +| < REM: "%" > +| < LSHIFT: "<<" > +| < PLUSASSIGN: "+=" > +| < MINUSASSIGN: "-=" > +| < STARASSIGN: "*=" > +| < SLASHASSIGN: "/=" > +| < ANDASSIGN: "&=" > +| < ORASSIGN: "|=" > +| < XORASSIGN: "^=" > +| < REMASSIGN: "%=" > +| < LSHIFTASSIGN: "<<=" > +| < RSIGNEDSHIFTASSIGN: ">>=" > +| < RUNSIGNEDSHIFTASSIGN: ">>>=" > +| < ELLIPSIS: "..." > +| < POINTER: "->" > +| < DIAMOND: "<>" > + +} + +/* >'s need special attention due to generics syntax. */ +TOKEN : +{ + < RUNSIGNEDSHIFT: ">>>" > + { + matchedToken.kind = GT; + ((Token.GTToken)matchedToken).realKind = RUNSIGNEDSHIFT; + input_stream.backup(2); + } +| < RSIGNEDSHIFT: ">>" > + { + matchedToken.kind = GT; + ((Token.GTToken)matchedToken).realKind = RSIGNEDSHIFT; + input_stream.backup(1); + } +| < GT: ">" > +} + + + + +/************************************************ + * THE JAVACC GRAMMAR SPECIFICATION STARTS HERE * + ************************************************/ +void getJavaCCRootNode(int tab_size) : +{ +} +{ + javacc_input() +} + +void javacc_input() : +{ +} +{ + javacc_options() + + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("PARSER_BEGIN")} ) + <IDENTIFIER> <LPAREN> identifier() <RPAREN> + + CompilationUnit() + + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("PARSER_END")} ) + <IDENTIFIER> <LPAREN> identifier() <RPAREN> + + ( + production() + )+ + <EOF> +} + +void javacc_options() : +{ +} +{ + // special handling for javacc keyword + [ + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("options")} ) + (<IDENTIFIER> <LBRACE> ( option_binding() )+ <RBRACE> ) + ] +} + + +void option_binding() : +{} +{ + ( + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("LOOKAHEAD")} ) + identifier() + | + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("IGNORE_CASE")} ) + identifier() + | + <IDENTIFIER> + | + <STATIC> ) + <ASSIGN> + ( IntegerLiteral() | BooleanLiteral() | StringLiteral() ) + <SEMICOLON> +} + +void production() : +{ +} +{ + ( + LOOKAHEAD(1) + /* + * Since JAVACODE is both a JavaCC reserved word and a Java identifier, + * we need to give preference to "javacode_production" over + * "bnf_production". + */ + javacode_production() +| + LOOKAHEAD(1) + /* + * Since SKIP, TOKEN, etc. are both JavaCC reserved words and Java + * identifiers, we need to give preference to "regular_expression_production" + * over "bnf_production". + */ + regular_expr_production() +| + LOOKAHEAD(1) + /* + * Since TOKEN_MGR_DECLS is both a JavaCC reserved word and a Java identifier, + * we need to give preference to "token_manager_decls" over + * "bnf_production". + */ + token_manager_decls() +| + bnf_production() + ) +} + +void javacode_production() : +{ +} +{ + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("JAVACODE")} ) + <IDENTIFIER> + ResultType() identifier() FormalParameters() + [ LOOKAHEAD(2) <THROWS> Name() ( <COMMA> Name() )* ] + [ LOOKAHEAD(2) node_descriptor() ] + Block() + +} + +void bnf_production() : +{ +} +{ + ResultType() identifier() FormalParameters() + [ <THROWS> Name() ( <COMMA> Name() )* ] + [ node_descriptor() ] + <COLON> + Block() + <LBRACE> expansion_choices() <RBRACE> + +} + +void regular_expr_production() : +{ +} +{ + [ + LOOKAHEAD(2) <LT> <STAR> <GT> + | + <LT> <IDENTIFIER> ( <COMMA> <IDENTIFIER> )* <GT> + ] + regexpr_kind() [ <LBRACKET> + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("IGNORE_CASE")} ) + <IDENTIFIER> + <RBRACKET> + ] <COLON> + <LBRACE> regexpr_spec() ( "|" regexpr_spec() )* <RBRACE> + +} + +void token_manager_decls() : +{ +} +{ + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("TOKEN_MGR_DECLS")} ) + <IDENTIFIER> <COLON> TokenMgrDeclBlock() + +} + +Token regexpr_kind() : +{ + Token t = null; +} +{ + ( + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("TOKEN")} ) + t=<IDENTIFIER> +| + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("SPECIAL_TOKEN")} ) + t=<IDENTIFIER> +| + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("SKIP")} ) + t=<IDENTIFIER> +| + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("MORE")} ) + t=<IDENTIFIER> + ) + { + return t; + } +} + +void regexpr_spec() : +{} +{ + regular_expression() [ Block() ] [ <COLON> <IDENTIFIER> ] +} + +void expansion_choices() : +{} +{ + expansion() ( "|" expansion() )* +} + +void expansion() : +{} +{ + ( LOOKAHEAD(1) + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("LOOKAHEAD")} ) + <IDENTIFIER> <LPAREN> local_lookahead() <RPAREN> + )? + ( LOOKAHEAD(0, { notTailOfExpansionUnit() } ) + expansion_unit() + [ node_descriptor() ] + )+ +} + +void local_lookahead() : + { + boolean commaAtEnd = false, emptyLA = true; + } +{ + [ + /* + * The lookahead of 1 is to turn off the warning message that lets + * us know that an expansion choice can also start with an integer + * literal because a primary expression can do the same. But we + * know that this is what we want. + */ + LOOKAHEAD(1) + IntegerLiteral() + { + emptyLA = false; + } + ] + [ LOOKAHEAD(0, { !emptyLA && (getToken(1).kind != RPAREN) } ) + <COMMA> + { + commaAtEnd = true; + } + ] + [ LOOKAHEAD(0, { getToken(1).kind != RPAREN && getToken(1).kind != LBRACE } ) + expansion_choices() + { + emptyLA = false; commaAtEnd = false; + } + ] + [ LOOKAHEAD(0, { !emptyLA && !commaAtEnd && (getToken(1).kind != RPAREN) } ) + <COMMA> + { + commaAtEnd = true; + } + ] + [ LOOKAHEAD(0, { emptyLA || commaAtEnd } ) + <LBRACE> Expression() <RBRACE> + ] +} + +void expansion_unit() : +{} +{ + LOOKAHEAD(1) + /* + * We give this priority over primary expressions which use LOOKAHEAD as the + * name of its identifier. + */ + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("LOOKAHEAD")} ) + <IDENTIFIER> <LPAREN> local_lookahead() <RPAREN> +| + Block() +| + <LBRACKET> expansion_choices() <RBRACKET> +| + <TRY> <LBRACE> expansion_choices() <RBRACE> + ( <CATCH> <LPAREN> Name() <IDENTIFIER> <RPAREN> Block() )* + [ <FINALLY> Block() ] +| + LOOKAHEAD( identifier() | StringLiteral() | <LT> | PrimaryExpression() <ASSIGN> ) + [ + LOOKAHEAD(PrimaryExpression() <ASSIGN>) + PrimaryExpression() <ASSIGN> + ] + ( regular_expression() | identifier() Arguments() ) +| + <LPAREN> expansion_choices() <RPAREN> ( "+" | <STAR> | "?" )? +} + +void regular_expression() : +{} +{ + StringLiteral() +| + LOOKAHEAD(3) + <LT> [ [ "#" ] identifier() <COLON> ] complex_regular_expression_choices() <GT> +| + LOOKAHEAD(2) + <LT> identifier() <GT> +| + <LT> + // special handling for javacc keyword + LOOKAHEAD( {getToken(1).kind == IDENTIFIER && getToken(1).image.equals("EOF")} ) + <IDENTIFIER> + <GT> +} + +void complex_regular_expression_choices() : +{} +{ + complex_regular_expression() ( "|" complex_regular_expression() )* +} + +void complex_regular_expression() : +{} +{ + ( complex_regular_expression_unit() )+ +} + +void complex_regular_expression_unit() : +{} +{ + StringLiteral() +| + <LT> identifier() <GT> +| + character_list() +| + <LPAREN> complex_regular_expression_choices() <RPAREN> ( "+" | <STAR> | "?" )? +} + +void character_list() : +{} +{ + [ "~" ] <LBRACKET> [ character_descriptor() ( <COMMA> character_descriptor() )* ] <RBRACKET> +} + +void character_descriptor() : +{} +{ + StringLiteral() [ "-" StringLiteral() ] +} + +String identifier() : +{ + Token t = null; +} +{ + t=<IDENTIFIER> + { + return t.image; + } +} + + +/********************************************** + * THE JJTREE PRODUCTIONS START HERE * + **********************************************/ + +void node_descriptor() : +{} +{ + "#" ( <IDENTIFIER> | <VOID> ) + [ + LOOKAHEAD(1) + <LPAREN> [ <GT> ] node_descriptor_expression() <RPAREN> + ] +} + + +JAVACODE +void node_descriptor_expression() +{ + Token tok; + int nesting = 1; + while (true) { + tok = getToken(1); + if (tok.kind == 0) { + throw new ParseException(); + } + if (tok.kind == LPAREN) nesting++; + if (tok.kind == RPAREN) { + nesting--; + if (nesting == 0) break; + } + tok = getNextToken(); + } +} + +/* javacc productions */ + +void IntegerLiteral() : +{} +{ + <INTEGER_LITERAL> +} + + +void StringLiteral() : +{} +{ + <STRING_LITERAL> +} + + +/***************************************** + * THE JAVA LANGUAGE GRAMMAR STARTS HERE * + *****************************************/ + +/* + * Program structuring syntax follows. + */ + +void getJavaRootNode() : +{ +} +{ + JavaCompilationUnit() +} + +/** + * Main entry point for parsing the PARSER section in javacc files. Use + * JavaCompilationUnit as main entry point for parsing java files. + */ +void CompilationUnit(): +{ +} +{ + try { + ( + + [ LOOKAHEAD(2) PackageDeclaration() ] + ( ImportDeclaration() )* + + // TypeDeclaration, this will be one or more classes or + // interfaces, add these as child nodes of the root node + ( + TypeDeclaration() + )* + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE, PUBLIC, PRIVATE, PROTECTED, CLASS, INTERFACE, ENUM); + } + +} + +/** + * Main entry point for parsing java files. + */ +void JavaCompilationUnit(): +{ +} +{ + try { + ( + CompilationUnit() + + // read the whole file + <EOF> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void PackageDeclaration(): +{ +} +{ + try { + [ Annotation() ] // Java 8 + <PACKAGE> Name() <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, IMPORT, CLASS, INTERFACE, ENUM, PUBLIC, PRIVATE, PROTECTED); + } + +} + +void ImportDeclaration(): +{ +} +{ + try { + <IMPORT> [ <STATIC> ] Name() [ <DOT> <STAR> ] <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, IMPORT, CLASS, INTERFACE, ENUM, PUBLIC, PRIVATE, PROTECTED); + } +} + +/* + * Modifiers. We match all modifiers in a single rule to reduce the chances of + * syntax errors for simple modifier mistakes. It will also enable us to give + * better error messages. + */ + +void Modifiers(): +{ +} +{ + ( + LOOKAHEAD(2) + ( + <PUBLIC> + | + <STATIC> + | + <PROTECTED> + | + <PRIVATE> + | + <FINAL> + | + <ABSTRACT> + | + <SYNCHRONIZED> + | + <NATIVE> + | + <TRANSIENT> + | + <VOLATILE> + | + <STRICTFP> + | + Annotation() + ) + )* + +} + +/* + * Declaration syntax follows. + */ + +// Handle classes, interfaces, enums, and annotations. +void TypeDeclaration(): +{ +} +{ + try { + + <SEMICOLON> + | + Modifiers() + ( + LOOKAHEAD(2) + ClassOrInterfaceDeclaration() + | + EnumDeclaration() + | + AnnotationTypeDeclaration() + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE, PUBLIC, PRIVATE, PROTECTED); + } +} + +void ClassOrInterfaceDeclaration(): +{ +} +{ + try { + ( + [ Annotation() ] // Java 8 + <CLASS> | <INTERFACE> + ) + <IDENTIFIER> + [ TypeParameters() ] + [ ExtendsList() ] + [ ImplementsList() ] + ClassOrInterfaceBody() + [ LOOKAHEAD(2) <SEMICOLON> ] + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, CLASS, INTERFACE, ENUM, PUBLIC, PRIVATE, PROTECTED); + } +} + +void ExtendsList(): +{} +{ + try { + <EXTENDS> ClassOrInterfaceType() + ( <COMMA> ClassOrInterfaceType() )* + + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void ImplementsList(): +{ +} +{ + try { + <IMPLEMENTS> ClassOrInterfaceType() + ( <COMMA> ClassOrInterfaceType())* + + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void EnumDeclaration(): +{ +} +{ + try { + <ENUM> <IDENTIFIER> + [ ImplementsList() ] + EnumBody() + + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void EnumBody(): +{ +} +{ + try { + <LBRACE> + EnumConstant() ( <COMMA> EnumConstant() )* + [ <SEMICOLON> ( ClassOrInterfaceBodyDeclaration() )* ] + <RBRACE> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void EnumConstant(): +{ +} +{ + try { + [ Annotation() ] // Java 8 + <IDENTIFIER> [ Arguments() ] [ ClassOrInterfaceBody() ] + } + catch(ParseException pe) { + // This grammar expects commas to be followed by EnumConstants, but + // neither javac nor the language spec says it has to, so something like + // public enum {ACE, BASE, CASE, } is allowed. + // TODO: rethrow the exception? This is poor coding practice. + return; + } +} + +void TypeParameters(): +{ +} +{ + try { + ( + <LT> + ( + TypeParameter() + )? + ( + <COMMA> + TypeParameter() + )* + <GT> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, GT); + } +} + +void TypeParameter(): +{ +} +{ + try { + ( + <IDENTIFIER> [ TypeBound() ] + ) + + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void TypeBound(): +{ +} +{ + try { + + ( + <EXTENDS> + ClassOrInterfaceType() + ( + "&" + ClassOrInterfaceType() + )* + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ClassOrInterfaceBody(): +{ +} +{ + try { + + ( + <LBRACE> + ( + ClassOrInterfaceBodyDeclaration() + )* + <RBRACE> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE, PUBLIC, PRIVATE, PROTECTED); + } +} + +void ClassOrInterfaceBodyDeclaration(): +{ +} +{ + try { + ( + LOOKAHEAD(2) + Initializer() + | + Modifiers() // Just get all the modifiers out of the way. If you want to do + // more checks, pass the modifiers down to the member + ( + LOOKAHEAD(3) + ClassOrInterfaceDeclaration() + | + EnumDeclaration() + | + LOOKAHEAD( [ TypeParameters() ] <IDENTIFIER> <LPAREN> ) + ConstructorDeclaration() + | + LOOKAHEAD( Type() <IDENTIFIER> ( <LBRACKET> <RBRACKET> )* ( <COMMA> | <ASSIGN> | <SEMICOLON> ) ) + FieldDeclaration() + | + LOOKAHEAD(2) + AnnotationTypeDeclaration() + | + MethodDeclaration() + ) + | + <SEMICOLON> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, PUBLIC, PRIVATE, PROTECTED); + } +} + +void FieldDeclaration(): +{ +} +{ + try { + + ( + // Modifiers are already matched in the caller + [ LOOKAHEAD(2) Annotation() ] // Java 8 + Type() VariableDeclarator() + ( + <COMMA> VariableDeclarator() + )* + <SEMICOLON> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void VariableDeclarator(): +{ +} +{ + try { + ( + VariableDeclaratorId() [ <ASSIGN> VariableInitializer() ] + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void VariableDeclaratorId(): +{ +} +{ + try { + [ Annotation() ] // Java 8 + <IDENTIFIER> + ( + [ Annotation() ] // Java 8 + <LBRACKET> <RBRACKET> + )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void VariableInitializer(): +{ +} +{ + try { + + ArrayInitializer() + | + Expression() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ArrayInitializer(): +{ +} +{ + try { + + <LBRACE> [ VariableInitializer() ( LOOKAHEAD(2) <COMMA> VariableInitializer() )* ] [ <COMMA> ] <RBRACE> + + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void MethodDeclaration(): +{ +} +{ + try { + ( + // Modifiers already matched in the caller! + [ LOOKAHEAD(2) Annotation() ] // Java 8 + [ TypeParameters() ] + ResultType() + [ Annotation() ] // Java 8 + MethodDeclarator() [ <THROWS> NameList() ] + ( Block() | <SEMICOLON> ) + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE, PUBLIC, PRIVATE, PROTECTED); + } +} + +void MethodDeclarator(): +{ +} +{ + try { + ( + <IDENTIFIER> FormalParameters() ( <LBRACKET> <RBRACKET> )* + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, LBRACE, RBRACE); + } +} + +void FormalParameters(): +{ +} +{ + try { + ( + <LPAREN> + [ + FormalParameter() + ( + <COMMA> + FormalParameter() + )* + ] + <RPAREN> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE, PUBLIC, PRIVATE, PROTECTED); + } +} + +void FormalParameter(): +{ +} +{ + try { + ( + Modifiers() + Type() + [ LOOKAHEAD(2) Annotation() ] // Java 8 + [ + <ELLIPSIS> // ... + ] + VariableDeclaratorId() + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RPAREN); + } +} + +void ConstructorDeclaration(): +{ +} +{ + try { + ( + [ Annotation() ] + [ TypeParameters() ] + <IDENTIFIER> FormalParameters() [ <THROWS> NameList() ] + <LBRACE> + [ LOOKAHEAD(ExplicitConstructorInvocation()) ExplicitConstructorInvocation() ] + ( BlockStatement() )* + <RBRACE> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void ExplicitConstructorInvocation(): +{ +} +{ + try { + LOOKAHEAD(<THIS> Arguments() <SEMICOLON>) + <THIS> Arguments() <SEMICOLON> + | + [ LOOKAHEAD(2) PrimaryExpression() <DOT> ] <SUPER> Arguments() <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void Initializer(): +{ +} +{ + try { + [ <STATIC> ] Block() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + + +void Type(): +{ +} +{ + try { + ( + LOOKAHEAD(2) ReferenceType() + | + PrimitiveType() + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ReferenceType(): +{ +} +{ + try { + ( + LOOKAHEAD(3) + PrimitiveType() ( LOOKAHEAD(2) <LBRACKET> <RBRACKET> )+ + | + ( ClassOrInterfaceType() ) ( LOOKAHEAD(2) <LBRACKET> <RBRACKET> )* + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ClassOrInterfaceType(): +{ +} +{ + try { + ( + [ Annotation() ] // Java 8 + <IDENTIFIER> [ LOOKAHEAD(2) TypeArguments() ] + // checks for types with package names, like com.whatever.MyClass as + // opposed to just MyClass, which is covered in the block above + ( LOOKAHEAD(2) <DOT> + [ + Annotation() + ] // Java 8 + <IDENTIFIER> [ LOOKAHEAD(2) TypeArguments() ] + )* + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void TypeArguments(): +{ +} +{ + try { + ( + <DIAMOND> + ) + | + ( + <LT> TypeArgument() + + ( <COMMA> TypeArgument() )* <GT> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void TypeArgument(): +{ +} +{ + try { + ( + ReferenceType() + | + "?" [ WildcardBounds() ] + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void WildcardBounds(): +{ +} +{ + try { + + ( + <EXTENDS> ReferenceType() + | + <SUPER> ReferenceType() + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + + +void PrimitiveType(): +{ +} +{ + try { + [ Annotation() ] // Java 8 + ( + <BOOLEAN> + | + <CHAR> + | + <BYTE> + | + <SHORT> + | + <INT> + | + <LONG> + | + <FLOAT> + | + <DOUBLE> + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ResultType(): +{ +} +{ + try { + ( + <VOID> + | + Type() + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void Name(): +{ +} +{ + try { + + <IDENTIFIER> + ( + LOOKAHEAD(2) + <DOT> <IDENTIFIER> + )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void NameList(): +{ +} +{ + try { + Name() + ( <COMMA> Name() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + + +void Expression(): +/* + * This expansion has been written this way instead of: + * Assignment() | ConditionalExpression() + * for performance reasons. + * However, it is a weakening of the grammar for it allows the LHS of + * assignments to be any conditional expression whereas it can only be + * a primary expression. Consider adding a semantic predicate to work + * around this. + */ +{ +} +{ + try { + LOOKAHEAD(LambdaExpression()) + LambdaExpression() // Java 8 + | + ( + ConditionalExpression() + [ + LOOKAHEAD(2) + AssignmentOperator() Expression() + ] + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void LambdaExpression(): +{ +} +{ + try { + LambdaParameters() <POINTER> LambdaBody() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void LambdaParameters(): +{ +} +{ + try { + <IDENTIFIER> + | + LOOKAHEAD(3) + <LPAREN> [FormalParameters()] <RPAREN> + | + LOOKAHEAD(3) + <LPAREN> InferredFormalParameterList() <RPAREN> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +// Java 8 +void InferredFormalParameterList(): +{ +} +{ + try { + <IDENTIFIER> + ( + <COMMA> + <IDENTIFIER> + )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +// Java 8 +void LambdaBody(): +{ +} +{ + try { + Expression() + | + Block() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void AssignmentOperator(): +{} +{ + <ASSIGN> | "*=" | "/=" | "%=" | "+=" | "-=" | "<<=" | ">>=" | ">>>=" | "&=" | "^=" | "|=" +} + +void ConditionalExpression(): +{ +} +{ + try { + ConditionalOrExpression() [ "?" Expression() <COLON> Expression() ] + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ConditionalOrExpression(): +{ +} +{ + try { + ConditionalAndExpression() ( "||" ConditionalAndExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ConditionalAndExpression(): +{ +} +{ + try { + InclusiveOrExpression() ( "&&" InclusiveOrExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void InclusiveOrExpression(): +{ +} +{ + try { + ExclusiveOrExpression() ( "|" ExclusiveOrExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} +// TODO: continue from here +void ExclusiveOrExpression(): +{ +} +{ + try { + AndExpression() ( "^" AndExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void AndExpression(): +{ +} +{ + try { + EqualityExpression() ( "&" EqualityExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +/* @return List<Type> */ +void EqualityExpression(): +{ +} +{ + try { + InstanceOfExpression() ( ( "==" | "!=" ) InstanceOfExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void InstanceOfExpression(): +{ +} +{ + try { + RelationalExpression() [ <INSTANCEOF> Type() ] + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void RelationalExpression(): +{ +} +{ + try { + ShiftExpression() ( ( <LT> | <GT> | "<=" | ">=" ) ShiftExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ShiftExpression(): +{ +} +{ + try { + AdditiveExpression() ( ( "<<" | RSIGNEDSHIFT() | RUNSIGNEDSHIFT() ) AdditiveExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void AdditiveExpression(): +{ +} +{ + try { + MultiplicativeExpression() ( ( "+" | "-" ) MultiplicativeExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void MultiplicativeExpression(): +{ +} +{ + try { + UnaryExpression() ( ( <STAR> | "/" | "%" ) UnaryExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void UnaryExpression(): +{ +} +{ + try { + ( "+" | "-" ) UnaryExpression() + | + PreIncrementExpression() + | + PreDecrementExpression() + | + UnaryExpressionNotPlusMinus() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void PreIncrementExpression(): +{ +} +{ + try { + "++" PrimaryExpression() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void PreDecrementExpression(): +{ +} +{ + try { + "--" PrimaryExpression() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void UnaryExpressionNotPlusMinus(): +{ +} +{ + try { + ( "~" | "!" ) UnaryExpression() + | + LOOKAHEAD( CastLookahead() ) + CastExpression() + | + PostfixExpression() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +// This production is to determine lookahead only. The LOOKAHEAD specifications +// below are not used, but they are there just to indicate that we know about +// this. +void CastLookahead(): +{ +} +{ + try { + LOOKAHEAD(2) + <LPAREN> PrimitiveType() + | + LOOKAHEAD(<LPAREN> Type() <LBRACKET>) + <LPAREN> Type() <LBRACKET> <RBRACKET> + | + <LPAREN> Type() <RPAREN> ( "~" | "!" | <LPAREN> | <IDENTIFIER> | <THIS> | <SUPER> | <NEW> | Literal() ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void PostfixExpression(): +{ +} +{ + try { + PrimaryExpression() [ "++" | "--" ] + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void CastExpression(): +{ +} +{ + try { + LOOKAHEAD(<LPAREN> PrimitiveType()) + <LPAREN> Type() <RPAREN> UnaryExpression() + | + <LPAREN> Type() <RPAREN> UnaryExpressionNotPlusMinus() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +/** + * JLS 15.8 Primary Expressions + * Primary expressions include most of the simplest kinds of expressions, from + * which all others are constructed: literals, class literals, field accesses, + * method invocations, and array accesses. A parenthesized expression is also + * treated syntactically as a primary expression. + */ +void PrimaryExpression(): +{ +} +{ + try { + PrimaryPrefix() + ( LOOKAHEAD(2) + PrimarySuffix() + )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void MemberSelector(): +{ +} +{ + try { + <DOT> TypeArguments() <IDENTIFIER> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void PrimaryPrefix(): +{ +} +{ + try { + Literal() + | + <THIS> + | + <SUPER> <DOT> <IDENTIFIER> + | + LOOKAHEAD( ClassOrInterfaceType() <DOT> <IDENTIFIER> ) + ClassOrInterfaceType() <DOT> <IDENTIFIER> + | + LOOKAHEAD( ClassOrInterfaceType() <DOT> <SUPER> <DOT> <IDENTIFIER> ) + ClassOrInterfaceType() <DOT> <SUPER> <DOT> <IDENTIFIER> + | + <LPAREN> Expression() <RPAREN> + | + AllocationExpression() + | + LOOKAHEAD( ResultType() <DOT> <CLASS> ) + ResultType() <DOT> <CLASS> + | + Name() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void PrimarySuffix(): +{ +} +{ + try { + LOOKAHEAD(2) + <DOT> <THIS> + | + LOOKAHEAD(2) + <DOT> AllocationExpression() + | + LOOKAHEAD(3) + MemberSelector() + | + <LBRACKET> Expression() <RBRACKET> + | + <DOT> <IDENTIFIER> + | + Arguments() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void Literal(): +{} +{ + try { + <INTEGER_LITERAL> + | + <FLOATING_POINT_LITERAL> + | + <CHARACTER_LITERAL> + | + <STRING_LITERAL> + | + BooleanLiteral() + | + NullLiteral() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void BooleanLiteral(): +{} +{ + <TRUE> +| + <FALSE> +} + +void NullLiteral(): +{} +{ + <NULL> +} + +void Arguments(): +{ +} +{ + try { + <LPAREN> [ ArgumentList() ] <RPAREN> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ArgumentList(): +{ +} +{ + try { + Expression() ( <COMMA> Expression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void AllocationExpression(): +{ +} +{ + try { + LOOKAHEAD(2) + <NEW> PrimitiveType() ArrayDimsAndInits() + | + <NEW> ClassOrInterfaceType() [ TypeArguments() ] + ( + ArrayDimsAndInits() + | + Arguments() [ ClassOrInterfaceBody() ] + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +/* + * The third LOOKAHEAD specification below is to parse to PrimarySuffix + * if there is an expression between the "[...]". + */ +void ArrayDimsAndInits(): +{ +} +{ + try { + LOOKAHEAD(2) + ( LOOKAHEAD(2) <LBRACKET> Expression() <RBRACKET> )+ ( LOOKAHEAD(2) <LBRACKET> <RBRACKET> )* + | + ( <LBRACKET> <RBRACKET> )+ ArrayInitializer() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + + +/* + * Statement syntax follows. + */ + +void Statement(): +{ +} +{ + try { + ( + LOOKAHEAD(2) + LabeledStatement() + | + AssertStatement() + | + Block() + | + EmptyStatement() + | + StatementExpression() <SEMICOLON> + | + SwitchStatement() + | + IfStatement() + | + WhileStatement() + | + DoStatement() + | + ForStatement() + | + BreakStatement() + | + ContinueStatement() + | + ReturnStatement() + | + ThrowStatement() + | + SynchronizedStatement() + | + TryStatement() + ) + + } + catch(ParseException pe) { + //error_skipto(pe, SEMICOLON); + throw pe; + } +} + +void AssertStatement(): +{} +{ + try { + <ASSERT> Expression() [ <COLON> Expression() ] <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void LabeledStatement(): +{} +{ + try { + <IDENTIFIER> <COLON> Statement() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void Block(): +{ +} +{ + try { + <LBRACE> ( BlockStatement() )* <RBRACE> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON, RBRACE); + } +} + +void BlockStatement(): +{ +} +{ + try { + [LOOKAHEAD(2) Annotation()] + ( + LOOKAHEAD( Modifiers() Type() <IDENTIFIER>) + LocalVariableDeclaration() <SEMICOLON> + | + LOOKAHEAD(3) + Statement() + | + ClassOrInterfaceDeclaration() + ) + } + catch(ParseException pe) { + //error_skipto(pe, SEMICOLON, RBRACE); + throw pe; + } +} + +void TokenMgrDeclBlock(): +{ +} +{ + try { + <LBRACE> ( TokenMgrDeclBlockStatement() )* <RBRACE> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void TokenMgrDeclBlockStatement(): +{ +} +{ + try { + Modifiers() + ( + /* + LOOKAHEAD([ "final" ] Type() <IDENTIFIER>) + LocalVariableDeclaration() <SEMICOLON> + | + */ + LOOKAHEAD( Type() <IDENTIFIER> ( <LBRACKET> <RBRACKET> )* ( <COMMA> | <ASSIGN> | <SEMICOLON> ) ) + FieldDeclaration() + | + LOOKAHEAD(3) + MethodDeclaration() + | + LOOKAHEAD(3) + Statement() + | + ClassOrInterfaceDeclaration() + ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void LocalVariableDeclaration(): +{ +} +{ + try { + Modifiers() Type() VariableDeclarator() + ( <COMMA> VariableDeclarator() + )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } + +} + +void EmptyStatement(): +{} +{ + <SEMICOLON> +} + +void StatementExpression(): +/* + * The last expansion of this production accepts more than the legal + * Java expansions for StatementExpression. This expansion does not + * use PostfixExpression for performance reasons. + */ +{ +} +{ + try { + PreIncrementExpression() + | + PreDecrementExpression() + | + PrimaryExpression() + [ + "++" + | + "--" + | + AssignmentOperator() Expression() + ] + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void SwitchStatement(): +{ +} +{ + try { + <SWITCH> <LPAREN> Expression() <RPAREN> <LBRACE> + ( SwitchLabel() ( BlockStatement() )* )* + <RBRACE> + + } + catch(ParseException pe) { + error_skipto(pe, RBRACE); + } +} + +void SwitchLabel(): +{ +} +{ + try { + <CASE> Expression() <COLON> + | + <_DEFAULT> <COLON> + } + catch(ParseException pe) { + error_skipto(pe, COLON); + } +} + +void IfStatement(): +/* + * The disambiguating algorithm of JavaCC automatically binds dangling + * else's to the innermost if statement. The LOOKAHEAD specification + * is to tell JavaCC that we know what we are doing. + */ +{ +} +{ + try { + <IF> <LPAREN> Expression() <RPAREN> Statement() [ LOOKAHEAD(1) <ELSE> Statement() ] + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void WhileStatement(): +{ +} +{ + try { + <WHILE> <LPAREN> Expression() <RPAREN> Statement() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void DoStatement(): +{ +} +{ + try { + <DO> Statement() <WHILE> <LPAREN> Expression() <RPAREN> <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ForStatement(): +{ +} +{ + try { + <FOR> <LPAREN> + ( + LOOKAHEAD([ <FINAL> ] Type() <IDENTIFIER> <COLON>) + [ <FINAL> ] Type() <IDENTIFIER> <COLON> Expression() + | + [ ForInit() ] <SEMICOLON> [ Expression() ] <SEMICOLON> [ ForUpdate() ] + ) + <RPAREN> Statement() + + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ForInit(): +{ +} +{ + try { + LOOKAHEAD( [ <FINAL> ] Type() <IDENTIFIER> ) + LocalVariableDeclaration() + | + StatementExpressionList() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void StatementExpressionList(): +{ +} +{ + try { + StatementExpression() ( <COMMA> StatementExpression() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ForUpdate(): +{} +{ + try { + StatementExpressionList() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void BreakStatement(): +{} +{ + <BREAK> [ <IDENTIFIER> ] <SEMICOLON> +} + +void ContinueStatement(): +{} +{ + <CONTINUE> [ <IDENTIFIER> ] <SEMICOLON> +} + +void ReturnStatement(): +{ +} +{ + try { + <RETURN> [ Expression() ] <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void ThrowStatement(): +{ +} +{ + try { + <THROW> Expression() <SEMICOLON> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void SynchronizedStatement(): +{ +} +{ + try { + <SYNCHRONIZED> <LPAREN> Expression() <RPAREN> Block() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void TryStatement(): +/* + * Semantic check required here to make sure that at least one + * finally/catch is present. + */ + // DONE: Java 7 allows try with resources, where the resource implements Closeable. + // e.g. + // try (BufferedReader br = new BufferedReader(new FileReader(path))) { + // return br.readLine(); + // } + // Note that neither 'catch' nor 'finally' are required in this case. + // + // DONE: Java 7 allows 'catch' to handle more than one exception type, e.g. + // catch (IOException|SQLException ex) +{ +} +{ + try { + <TRY> [<LPAREN> LocalVariableDeclaration()(LOOKAHEAD(2) <SEMICOLON> LocalVariableDeclaration())* [<SEMICOLON>] <RPAREN>] + Block() + + ( <CATCH> <LPAREN> + ( + LOOKAHEAD(3) + FormalParameter() + | + ClassOrInterfaceType()(LOOKAHEAD(2) "|" ClassOrInterfaceType())+ VariableDeclaratorId() + ) + <RPAREN> + Block() + )* + + [ <FINALLY> + Block() + ] + } + catch(ParseException pe) { + error_skipto(pe, RBRACE); + } +} + +/* We use productions to match >>>, >> and > so that we can keep the + * type declaration syntax with generics clean + */ + +void RUNSIGNEDSHIFT(): +{} +{ + ( LOOKAHEAD({ getToken(1).kind == GT && + getToken(1) instanceof Token.GTToken && + ((Token.GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT} ) + <GT> <GT> <GT> + ) +} + +void RSIGNEDSHIFT(): +{} +{ + ( LOOKAHEAD({ getToken(1).kind == GT && + getToken(1) instanceof Token.GTToken && + ((Token.GTToken)getToken(1)).realKind == RSIGNEDSHIFT} ) + <GT> <GT> + ) +} + +/* Annotation syntax follows. */ + +void Annotation(): +{ +} +{ + try { + LOOKAHEAD( <AT> Name() <LPAREN> ( <IDENTIFIER> <ASSIGN> | <RPAREN> )) + NormalAnnotation() + | + LOOKAHEAD( <AT> Name() <LPAREN> ) + SingleMemberAnnotation() + | + MarkerAnnotation() + } + catch(ParseException pe) { + // TODO: what to do here? + addException(pe); + } +} + +void NormalAnnotation(): +{ +} +{ + try { + <AT> Name() <LPAREN> [ MemberValuePairs() ] <RPAREN> + } + catch(ParseException pe) { + error_skipto(pe, RPAREN); + } +} + +void MarkerAnnotation(): +{ +} +{ + try { + <AT> Name() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); // TODO is there a better token to skip to? + } +} + +void SingleMemberAnnotation(): +{ +} +{ + try { + <AT> Name() <LPAREN> MemberValue() <RPAREN> + } + catch(ParseException pe) { + error_skipto(pe, RPAREN); + } +} + +void MemberValuePairs(): +{ +} +{ + try { + MemberValuePair() ( <COMMA> MemberValuePair() )* + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void MemberValuePair(): +{ +} +{ + try { + <IDENTIFIER> <ASSIGN> MemberValue() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void MemberValue(): +{ +} +{ + try { + LOOKAHEAD(2) + Annotation() + | + MemberValueArrayInitializer() + | + ConditionalExpression() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void MemberValueArrayInitializer(): +{ +} +{ + try { + <LBRACE> (MemberValue() ( LOOKAHEAD(2) <COMMA> MemberValue() )* [ <COMMA> ])? <RBRACE> + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + + +/* Annotation Types. */ +void AnnotationTypeDeclaration(): +{ +} +{ + Modifiers() + try { + <AT> <INTERFACE> <IDENTIFIER> AnnotationTypeBody() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void AnnotationTypeBody(): +{ +} +{ + try { + <LBRACE> ( AnnotationTypeMemberDeclaration() )* <RBRACE> + } + catch(ParseException pe) { + error_skipto(pe, RBRACKET); + } +} + +void AnnotationTypeMemberDeclaration(): +{ +} +{ + Modifiers() + try { + ( + LOOKAHEAD(Type() <IDENTIFIER> <LPAREN>) + Type() <IDENTIFIER> <LPAREN> <RPAREN> [ DefaultValue() ] <SEMICOLON> + | + LOOKAHEAD(3) + ClassOrInterfaceDeclaration() + | + EnumDeclaration() + | + LOOKAHEAD(2) + AnnotationTypeDeclaration() + | + FieldDeclaration() + ) + | + ( <SEMICOLON> ) + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } +} + +void DefaultValue(): +{ +} +{ + try { + <_DEFAULT> MemberValue() + } + catch(ParseException pe) { + error_skipto(pe, SEMICOLON); + } + +} + Added: plugins/JavaSideKick/trunk/clean_jj/1.8/TigerParserConstants.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/TigerParserConstants.java (rev 0) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/TigerParserConstants.java 2014-12-16 04:10:00 UTC (rev 23772) @@ -0,0 +1,390 @@ +/* Generated By:JavaCC: Do not edit this line. TigerParserConstants.java */ + +/** + * Token literal values and constants. + * Generated by org.javacc.parser.OtherFilesGen#start() + */ +public interface TigerParserConstants { + + /** End of File. */ + int EOF = 0; + /** RegularExpression Id. */ + int SINGLE_LINE_COMMENT = 9; + /** RegularExpression Id. */ + int FORMAL_COMMENT = 10; + /** RegularExpression Id. */ + int MULTI_LINE_COMMENT = 11; + /** RegularExpression Id. */ + int ABSTRACT = 13; + /** RegularExpression Id. */ + int ASSERT = 14; + /** RegularExpression Id. */ + int BOOLEAN = 15; + /** RegularExpression Id. */ + int BREAK = 16; + /** RegularExpression Id. */ + int BYTE = 17; + /** RegularExpression Id. */ + int CASE = 18; + /** Reg... [truncated message content] |
From: <dal...@us...> - 2014-12-16 04:10:37
|
Revision: 23773 http://sourceforge.net/p/jedit/svn/23773 Author: daleanson Date: 2014-12-16 04:10:34 +0000 (Tue, 16 Dec 2014) Log Message: ----------- Updates for clean Java 1.8 grammar. Modified Paths: -------------- plugins/JavaSideKick/trunk/clean_jj/1.8/Token.java plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/Token.java =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/Token.java 2014-12-16 04:10:00 UTC (rev 23772) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/Token.java 2014-12-16 04:10:34 UTC (rev 23773) @@ -117,9 +117,9 @@ switch(ofKind) { default : return new Token(ofKind, image); - case JavaParserConstants.RUNSIGNEDSHIFT: - case JavaParserConstants.RSIGNEDSHIFT: - case JavaParserConstants.GT: + case TigerParserConstants.RUNSIGNEDSHIFT: + case TigerParserConstants.RSIGNEDSHIFT: + case TigerParserConstants.GT: return new GTToken(ofKind, image); } } @@ -131,7 +131,7 @@ public static class GTToken extends Token { - int realKind = JavaParserConstants.GT; + int realKind = TigerParserConstants.GT; public GTToken() { super(); Modified: plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml =================================================================== --- plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml 2014-12-16 04:10:00 UTC (rev 23772) +++ plugins/JavaSideKick/trunk/clean_jj/1.8/build.xml 2014-12-16 04:10:34 UTC (rev 23773) @@ -97,7 +97,7 @@ <target name="NestedGenericClasses"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="NestedGenericClasseserror"> <classpath @@ -118,7 +118,7 @@ <target name="Imports"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="Importserror"> <classpath @@ -139,7 +139,7 @@ <target name="ColoredPoint"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="ColoredPointerror"> <classpath @@ -160,7 +160,7 @@ <target name="GUITest"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="guitesterror"> <classpath @@ -181,7 +181,7 @@ <target name="Move"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="Moveerror"> <classpath @@ -202,7 +202,7 @@ <target name="Point"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="Pointerror"> <classpath @@ -223,7 +223,7 @@ <target name="RawTypes"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="RawTypeserror"> <classpath @@ -244,7 +244,7 @@ <target name="RawTypes2"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="RawTypes2error"> <classpath @@ -265,7 +265,7 @@ <target name="RawTypesAndInheritance"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="RawTypesAndInheritanceerror"> <classpath @@ -286,7 +286,7 @@ <target name="MembersOfATypeVariable"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="membersofatypevariableerror"> <classpath @@ -307,7 +307,7 @@ <target name="TestConstructor"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="TestConstructorerror"> <classpath @@ -328,7 +328,7 @@ <target name="TestObjectCreation"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="TestObjectCreationerror"> <classpath @@ -349,7 +349,7 @@ <target name="UnboundedWildcards"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="UnboundedWildcardserror"> <classpath @@ -370,7 +370,7 @@ <target name="UsageOfAType"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="UsageOfATypeerror"> <classpath @@ -391,7 +391,7 @@ <target name="StringLiterals"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="StringLiteralserror"> <classpath @@ -412,7 +412,7 @@ <target name="IntegerOperations"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="IntegerOperationserror"> <classpath @@ -433,7 +433,7 @@ <target name="FloatingPointOperations"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="FloatingPointOperationserror"> <classpath @@ -454,7 +454,7 @@ <target name="Conversions"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="Conversionserror"> <classpath @@ -475,7 +475,7 @@ <target name="Chapter6"> <java - classname="JavaParser" + classname="TigerParser" fork="true" resultproperty="Chapter6error"> <classpath @@ -512,7 +512,7 @@ executable="${javacc}" resultproperty="javaccerror"> <arg - value="${parser.src.dir}/java18_clean.jj"/> + value="${parser.src.dir}/Tiger.jj"/> </exec> <fail message="javacc failed: ${javaccerror}"> @@ -534,11 +534,11 @@ <fileset dir="${parser.src.dir}"> <include - name="JavaParser.java"/> + name="TigerParser.java"/> <include - name="JavaParserTokenManager.java"/> + name="TigerParserTokenManager.java"/> <include - name="JavaParserConstants.java"/> + name="TigerParserConstants.java"/> <include name="*CharStream*.java"/> <include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |