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] |