diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt index a244cc3f6a..04f9db7a2f 100644 --- a/pmd/etc/changelog.txt +++ b/pmd/etc/changelog.txt @@ -1,5 +1,6 @@ ?? ??, 201? - 4.3: +Add support for Java 7 grammer - thanks to Dinesh Bolkensteyn and SonarSource Add options --ignore-literals and --ignore-identifiers to the CPD command line task, thanks to Cd-Man Fixed character reference in xml report - thanks to Seko Add C# support for CPD - thanks to Florian Bauer diff --git a/pmd/etc/grammar/Java.jjt b/pmd/etc/grammar/Java.jjt index d205023d99..0d1a5b4e2c 100644 --- a/pmd/etc/grammar/Java.jjt +++ b/pmd/etc/grammar/Java.jjt @@ -1,5 +1,9 @@ /** * + * Added support for Java 7 language constructs + * + * Dinesh Bolkensteyn (SonarSource), 06/11 + * =================================================================== * Added in support for assert as a name using lookaheads * * Tom Copeland, 09/03 @@ -70,71 +74,84 @@ import java.util.*; import net.sourceforge.pmd.PMD; public class JavaParser { - private boolean isJDK13; - private boolean isJDK15; + private int jdkVersion = 0; - public void setJDK13() { - this.isJDK13 = true; - } - - public void setJDK15() { - this.isJDK15 = true; + public void setJdkVersion(int jdkVersion) { + this.jdkVersion = jdkVersion; } private void checkForBadAssertUsage(String in, String usage) { - if (!isJDK13 && in.equals("assert")) { + if (jdkVersion > 3 && in.equals("assert")) { throw new ParseException("Can't use 'assert' as " + usage + " when running in JDK 1.4 mode!"); } } private void checkForBadStaticImportUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use static imports when running in JDK 1.4 mode!"); } } private void checkForBadAnnotationUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use annotations when running in JDK 1.4 mode!"); } } private void checkForBadGenericsUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use generics unless running in JDK 1.5 mode!"); } } private void checkForBadVariableArgumentsUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use variable arguments (varargs) when running in JDK 1.4 mode!"); } } private void checkForBadJDK15ForLoopSyntaxArgumentsUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use JDK 1.5 for loop syntax when running in JDK 1.4 mode!"); } } private void checkForBadEnumUsage(String in, String usage) { - if (isJDK15 && in.equals("enum")) { + if (jdkVersion >= 5 && in.equals("enum")) { throw new ParseException("Can't use 'enum' as " + usage + " when running in JDK 1.5 mode!"); } } private void checkForBadHexFloatingPointLiteral() { - if (!isJDK15) { - throw new ParseException("ERROR: Can't use hexadecimal floating point literals in pre-JDK 1.5 target"); + if (jdkVersion < 5) { + throw new ParseException("Can't use hexadecimal floating point literals in pre-JDK 1.5 target"); } } + + private void checkForBadNumericalLiteralslUsage(Token token) { + if (jdkVersion < 7) { + if (token.image.contains("_")) { + throw new ParseException("Can't use underscores in numerical literals when running in JDK inferior to 1.7 mode!"); + } + + if (token.image.startsWith("0b") || token.image.startsWith("0B")) { + throw new ParseException("Can't use binary numerical literals when running in JDK inferior to 1.7 mode!"); + } + } + } + + private void checkForBadDiamondUsage() { + if (jdkVersion < 7) { + throw new ParseException("Cannot use the diamond generic notation when running in JDK inferior to 1.7 mode!"); + } + } // This is a semantic LOOKAHEAD to determine if we're dealing with an assert // Note that this can't be replaced with a syntactic lookahead // since "assert" isn't a string literal token private boolean isNextTokenAnAssert() { boolean res = getToken(1).image.equals("assert"); - if (res && isJDK13 && getToken(2).image.equals("(")) { + if (res && jdkVersion <= 3 && getToken(2).image.equals("(")) { res = false; } return res; @@ -162,7 +179,7 @@ public class JavaParser { } PARSER_END(JavaParser) -TOKEN_MGR_DECLS : { +TOKEN_MGR_DECLS : { protected List comments = new ArrayList(); private Map excludeMap = new HashMap(); @@ -286,27 +303,30 @@ TOKEN : < INTEGER_LITERAL: (["l","L"])? | (["l","L"])? + | (["l","L"])? | (["l","L"])? > | - < #DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* > + < #DECIMAL_LITERAL: (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) > | - < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ > + < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"]((["0"-"9","a"-"f","A"-"F","_"])*["0"-"9","a"-"f","A"-"F"])?) > | - < #OCTAL_LITERAL: "0" (["0"-"7"])* > + < #BINARY_LITERAL: "0" ["b","B"] (["0","1"]((["0","1","_"])*["0","1"])?) > +| + < #OCTAL_LITERAL: "0" (["0"-"7"]((["0"-"7","_"])*["0"-"7"])?) > | < FLOATING_POINT_LITERAL: - (["0"-"9"])+ "." (["0"-"9"])* ()? (["f","F","d","D"])? - | "." (["0"-"9"])+ ()? (["f","F","d","D"])? - | (["0"-"9"])+ (["f","F","d","D"])? - | (["0"-"9"])+ ()? ["f","F","d","D"] + (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) "." (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?)? ()? (["f","F","d","D"])? + | "." (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) ()? (["f","F","d","D"])? + | (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) (["f","F","d","D"])? + | (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) ()? ["f","F","d","D"] > | < HEX_FLOATING_POINT_LITERAL: - ( (".")? | "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])* "." (["0"-"9","a"-"f","A"-"F"])+) ["p","P"] (["+","-"])? (["0"-"9"])+ (["f","F","d","D"])? + ( (".")? | "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"]((["0"-"9","a"-"f","A"-"F","_"])*["0"-"9","a"-"f","A"-"F"])?)? "." (["0"-"9","a"-"f","A"-"F"]((["0"-"9","a"-"f","A"-"F","_"])*["0"-"9","a"-"f","A"-"F"])?)) ["p","P"] (["+","-"])? (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) (["f","F","d","D"])? > | - < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > + < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) > | < CHARACTER_LITERAL: "'" @@ -1191,7 +1211,7 @@ jjtThis.setModifiers(modifiers); if (!t.image.equals("enum")) { throw new ParseException("ERROR: expecting enum"); } - if (!this.isJDK15) { + if (jdkVersion < 5) { throw new ParseException("ERROR: Can't use enum as a keyword in pre-JDK 1.5 target"); } } @@ -1326,7 +1346,7 @@ void FormalParameter() : } { ( "final" {jjtThis.setFinal();} | Annotation() )* - Type() + Type() ("|" Type())* [ "..." {checkForBadVariableArgumentsUsage();} {jjtThis.setVarargs();} ] VariableDeclaratorId() } @@ -1392,7 +1412,10 @@ void ClassOrInterfaceType(): void TypeArguments(): {} { + LOOKAHEAD(2) "<" {checkForBadGenericsUsage();} TypeArgument() ( "," TypeArgument() )* ">" + | + "<" {checkForBadDiamondUsage();} ">" } void TypeArgument(): @@ -1676,9 +1699,9 @@ void Literal() : {} { { Token t;} - t= {jjtThis.setImage(t.image); jjtThis.setIntLiteral();} -| t= {jjtThis.setImage(t.image); jjtThis.setFloatLiteral();} -| t= { checkForBadHexFloatingPointLiteral(); jjtThis.setImage(t.image); jjtThis.setFloatLiteral();} + t= { checkForBadNumericalLiteralslUsage(t); jjtThis.setImage(t.image); jjtThis.setIntLiteral();} +| t= { checkForBadNumericalLiteralslUsage(t); jjtThis.setImage(t.image); jjtThis.setFloatLiteral();} +| t= { checkForBadHexFloatingPointLiteral(); checkForBadNumericalLiteralslUsage(t); jjtThis.setImage(t.image); jjtThis.setFloatLiteral();} | t= {jjtThis.setImage(t.image); jjtThis.setCharLiteral();} | t= {jjtThis.setImage(t.image); jjtThis.setStringLiteral();} | BooleanLiteral() @@ -1933,15 +1956,40 @@ void SynchronizedStatement() : void TryStatement() : /* * Semantic check required here to make sure that at least one - * finally/catch is present. + * resource/finally/catch is present. */ {} { - "try" Block() + "try" (ResourceSpecification())? Block() ( CatchStatement() )* [ FinallyStatement() ] } +void ResourceSpecification() : +{} +{ + "(" + Resources() + (LOOKAHEAD(2) ";")? + ")" +} + +void Resources() : +{} +{ + Resource() (LOOKAHEAD(2) ";" Resource())* +} + +void Resource() : +{} +{ + ( "final" | Annotation() )* + Type() + VariableDeclaratorId() + "=" + Expression() +} + void CatchStatement() : {} { @@ -1958,7 +2006,7 @@ void FinallyStatement() : void AssertStatement() : { - if (isJDK13) { + if (jdkVersion <= 3) { throw new ParseException("Can't use 'assert' as a keyword when running in JDK 1.3 mode!"); } } diff --git a/pmd/regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java b/pmd/regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java index 5cceaf6e09..52f31266d6 100644 --- a/pmd/regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java @@ -1,12 +1,17 @@ package test.net.sourceforge.pmd.ast; import net.sourceforge.pmd.PMD; +import net.sourceforge.pmd.SourceType; import net.sourceforge.pmd.TargetJDK1_3; import net.sourceforge.pmd.TargetJDK1_4; import net.sourceforge.pmd.TargetJDK1_5; +import net.sourceforge.pmd.TargetJDK1_7; import net.sourceforge.pmd.TargetJDKVersion; +import net.sourceforge.pmd.ast.ASTCompilationUnit; import net.sourceforge.pmd.ast.JavaParser; import net.sourceforge.pmd.ast.ParseException; +import net.sourceforge.pmd.sourcetypehandlers.SourceTypeHandler; +import net.sourceforge.pmd.sourcetypehandlers.SourceTypeHandlerBroker; import org.junit.Test; @@ -175,6 +180,59 @@ public class JDKVersionTest { jp.CompilationUnit(); } + @Test + public final void testBinaryAndUnderscoresInNumericalLiterals() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_NUMERICAL_LITERALS)).CompilationUnit(); + } + + @Test + public final void testStringInSwitch() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_STRING_IN_SWITCH)).CompilationUnit(); + } + + @Test + public final void testGenericDiamond() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_GENERIC_DIAMOND)).CompilationUnit(); + } + + @Test + public final void testTryWithResources() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_TRY_WITH_RESOURCES)).CompilationUnit(); + } + + @Test + public final void testTryWithResourcesSemi() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_TRY_WITH_RESOURCES_SEMI)).CompilationUnit(); + } + + @Test + public final void testTryWithResourcesMulti() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_TRY_WITH_RESOURCES_MULTI)).CompilationUnit(); + } + + @Test + public final void testTryWithResourcesWithAnnotations() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_TRY_WITH_RESOURCES_WITH_ANNOTATIONS)).CompilationUnit(); + } + + @Test + public final void testTryWithResourcesWithVisitors() throws Throwable { + SourceTypeHandler sourceTypeHandler = SourceTypeHandlerBroker.getVisitorsFactoryForSourceType(SourceType.JAVA_17); + ASTCompilationUnit rootNode = (ASTCompilationUnit)sourceTypeHandler.getParser().parse(new StringReader(JDK17_TRY_WITH_RESOURCES)); + sourceTypeHandler.getSymbolFacade().start(rootNode); + sourceTypeHandler.getDataFlowFacade().start(rootNode); + sourceTypeHandler.getTypeResolutionFacade(getClass().getClassLoader()).start(rootNode); + } + + @Test + public final void testMulticatch() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_MULTICATCH)).CompilationUnit(); + } + + @Test + public final void testMulticatchWithAnnotations() throws Throwable { + new TargetJDK1_7().createParser(new StringReader(JDK17_MULTICATCH_WITH_ANNOTATIONS)).CompilationUnit(); + } private static final String ANNOTATED_LOCALS = "public class Foo {" + PMD.EOL + @@ -346,7 +404,150 @@ public class JDKVersionTest { "public class Foo {" + PMD.EOL + " public Foo() {}" + PMD.EOL + "}"; - + + private static final String JDK17_NUMERICAL_LITERALS = + "public class Test {" + PMD.EOL + + " int i1 = 0b00011110;" + PMD.EOL + + " int i2 = 0B00011110;" + PMD.EOL + + " int i3 = 0xA;" + PMD.EOL + + " int i4 = 0x1___A_F;" + PMD.EOL + + " int i5 = 0b1;" + PMD.EOL + + " int i6 = 0b1___1_0;" + PMD.EOL + + " int i7 = 0;" + PMD.EOL + + " int i8 = 02;" + PMD.EOL + + " int i9 = 0_123;" + PMD.EOL + + " int i10 = 1;" + PMD.EOL + + " int i11 = 1___3;" + PMD.EOL + + " int i12 = 1_43_43598_7;" + PMD.EOL + + " " + PMD.EOL + + " long l1 = 0b00011110L;" + PMD.EOL + + " long l2 = 0B00011110l;" + PMD.EOL + + " long l3 = 0xAL;" + PMD.EOL + + " long l4 = 0x1___A_FL;" + PMD.EOL + + " long l5 = 0b1L;" + PMD.EOL + + " long l6 = 0b1___1_0L;" + PMD.EOL + + " long l7 = 0l;" + PMD.EOL + + " long l8 = 02L;" + PMD.EOL + + " long l9 = 0_123l;" + PMD.EOL + + " long l10 = 1l;" + PMD.EOL + + " long l11 = 1___3l;" + PMD.EOL + + " long l12 = 1_43_43598_7L;" + PMD.EOL + + " long l13 = 1_43_43598_7;" + PMD.EOL + + " " + PMD.EOL + + " float f1 = .1f;" + PMD.EOL + + " float f2 = 1.f;" + PMD.EOL + + " float f3 = 0f;" + PMD.EOL + + " float f4 = 1e0F;" + PMD.EOL + + " float f5 = 1e0f;" + PMD.EOL + + " float f6 = 12.345F;" + PMD.EOL + + " float f7 = .5____2_1f;" + PMD.EOL + + " float f8 = 1__42__3.f;" + PMD.EOL + + " float f9 = 0__2_4__324f;" + PMD.EOL + + " float f10 = 1_34e0F;" + PMD.EOL + + " float f11 = 1__1_2e0f;" + PMD.EOL + + " float f12 = 2_1___2.3__4_5F;" + PMD.EOL + + " float f13 = 1_34e0__4__3f;" + PMD.EOL + + " float f14 = 1__1_2e00__000_4f;" + PMD.EOL + + " float f15 = 2_1___2.3__4_5e00______0_5F;" + PMD.EOL + + " " + PMD.EOL + + " double d1 = .1d;" + PMD.EOL + + " double d2 = 1.D;" + PMD.EOL + + " double d3 = 0d;" + PMD.EOL + + " double d4 = 1e0D;" + PMD.EOL + + " double d5 = 1e0d;" + PMD.EOL + + " double d6 = 12.345D;" + PMD.EOL + + " double d7 = .5____2_1d;" + PMD.EOL + + " double d8 = 1__42__3.D;" + PMD.EOL + + " double d9 = 0__2_4__324d;" + PMD.EOL + + " double d10 = 1_34e0d;" + PMD.EOL + + " double d11 = 1__1_2e0d;" + PMD.EOL + + " double d12 = 2_1___2.3__4_5D;" + PMD.EOL + + " double d13 = 1_34e0__4__3d;" + PMD.EOL + + " double d14 = 1__1_2e00__000_4d;" + PMD.EOL + + " double d15 = 2_1___2.3__4_5e00______0_5D;" + PMD.EOL + + " double d16 = 0.12___34;" + PMD.EOL + + " " + PMD.EOL + + " float hf1 = 0x.1___AFp1;" + PMD.EOL + + " float hf2 = 0x.1___AFp0__0__0f;" + PMD.EOL + + " float hf3 = 0x2__3_34.4___AFP00_00f;" + PMD.EOL + + " " + PMD.EOL + + " double hd1 = 0x.1___AFp1;" + PMD.EOL + + " double hd2 = 0x.1___AFp0__0__0d;" + PMD.EOL + + " double hd3 = 0x2__3_34.4___AFP00_00d;" + PMD.EOL + + " " + PMD.EOL + + " int doc1 = 1234_5678;" + PMD.EOL + + " long doc2 = 1_2_3_4__5_6_7_8L;" + PMD.EOL + + " int doc3 = 0b0001_0010_0100_1000;" + PMD.EOL + + " double doc4 = 3.141_592_653_589_793d;" + PMD.EOL + + " double doc5 = 0x1.ffff_ffff_ffff_fP1_023;" + PMD.EOL + + "}" + PMD.EOL + ; + + private static final String JDK17_STRING_IN_SWITCH = + "public class Test {" + PMD.EOL + + " public static void main(String[] args) {" + PMD.EOL + + " String mystr = \"value\" + \"2\";" + PMD.EOL + + " switch (mystr) {" + PMD.EOL + + " case \"value1\":" + PMD.EOL + + " break;" + PMD.EOL + + " case \"value2\":" + PMD.EOL + + " break;" + PMD.EOL + + " default:" + PMD.EOL + + " break;" + PMD.EOL + + " }" + PMD.EOL + + " }" + PMD.EOL + + "}" + PMD.EOL + ; + + private static final String JDK17_GENERIC_DIAMOND = + "public class InputJava7Diamond {" + PMD.EOL + + " HashMap map = new HashMap<>();" + PMD.EOL + + "}"; + + private static final String JDK17_TRY_WITH_RESOURCES = + "public class InputJava7TryWithResources {" + PMD.EOL + + " public static void main() {" + PMD.EOL + + " try (MyResource resource = new MyResource()) { }" + PMD.EOL + + " }" + PMD.EOL + + "}"; + + private static final String JDK17_TRY_WITH_RESOURCES_SEMI = + "public class InputJava7TryWithResources {" + PMD.EOL + + " public static void main() {" + PMD.EOL + + " try (MyResource resource = new MyResource();) { }" + PMD.EOL + + " }" + PMD.EOL + + "}"; + + private static final String JDK17_TRY_WITH_RESOURCES_MULTI = + "public class InputJava7TryWithResources {" + PMD.EOL + + " public static void main() {" + PMD.EOL + + " try (MyResource resource = new MyResource(); MyResource2 resource2 = new MyResource2()) { }" + PMD.EOL + + " }" + PMD.EOL + + "}"; + + private static final String JDK17_TRY_WITH_RESOURCES_WITH_ANNOTATIONS = + "public class InputJava7TryWithResources {" + PMD.EOL + + " public static void main() {" + PMD.EOL + + " try (@SuppressWarnings(\"all\") final MyResource resource = new MyResource()) { }" + PMD.EOL + + " }" + PMD.EOL + + "}"; + + private static final String JDK17_MULTICATCH = + "public class InputJava7Multicatch {" + PMD.EOL + + " public static void main() {" + PMD.EOL + + " try { }" + PMD.EOL + + " catch (FileNotFoundException | CustomException e) { }" + PMD.EOL + + " }" + PMD.EOL + + "}"; + + private static final String JDK17_MULTICATCH_WITH_ANNOTATIONS = + "public class InputJava7Multicatch {" + PMD.EOL + + " public static void main() {" + PMD.EOL + + " try { }" + PMD.EOL + + " catch (final @SuppressWarnings(\"all\") FileNotFoundException | CustomException e) { }" + PMD.EOL + + " }" + PMD.EOL + + "}"; + public static junit.framework.Test suite() { return new junit.framework.JUnit4TestAdapter(JDKVersionTest.class); } diff --git a/pmd/src/net/sourceforge/pmd/AbstractJavaRule.java b/pmd/src/net/sourceforge/pmd/AbstractJavaRule.java index c6694259c7..c1e203b454 100644 --- a/pmd/src/net/sourceforge/pmd/AbstractJavaRule.java +++ b/pmd/src/net/sourceforge/pmd/AbstractJavaRule.java @@ -567,4 +567,17 @@ public abstract class AbstractJavaRule extends CommonAbstractRule implements public Object visit(ASTCatchStatement node, Object data) { return visit((SimpleJavaNode)node, data); } + + + public Object visit(ASTResourceSpecification node, Object data) { + return visit((SimpleJavaNode)node, data); + } + + public Object visit(ASTResources node, Object data) { + return visit((SimpleJavaNode)node, data); + } + + public Object visit(ASTResource node, Object data) { + return visit((SimpleJavaNode)node, data); + } } diff --git a/pmd/src/net/sourceforge/pmd/TargetJDK1_3.java b/pmd/src/net/sourceforge/pmd/TargetJDK1_3.java index f509d4f342..0c6bc33a3b 100644 --- a/pmd/src/net/sourceforge/pmd/TargetJDK1_3.java +++ b/pmd/src/net/sourceforge/pmd/TargetJDK1_3.java @@ -22,7 +22,7 @@ public class TargetJDK1_3 implements TargetJDKVersion { */ public JavaParser createParser(InputStream in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK13(); + jp.setJdkVersion(3); return jp; } @@ -31,7 +31,7 @@ public class TargetJDK1_3 implements TargetJDKVersion { */ public JavaParser createParser(Reader in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK13(); + jp.setJdkVersion(3); return jp; } diff --git a/pmd/src/net/sourceforge/pmd/TargetJDK1_4.java b/pmd/src/net/sourceforge/pmd/TargetJDK1_4.java index 457577417d..26a317e90e 100644 --- a/pmd/src/net/sourceforge/pmd/TargetJDK1_4.java +++ b/pmd/src/net/sourceforge/pmd/TargetJDK1_4.java @@ -22,14 +22,18 @@ public class TargetJDK1_4 implements TargetJDKVersion { * @see net.sourceforge.pmd.TargetJDKVersion#createParser(InputStream) */ public JavaParser createParser(InputStream in) { - return new JavaParser(new JavaCharStream(in)); + JavaParser jp = new JavaParser(new JavaCharStream(in)); + jp.setJdkVersion(4); + return jp; } /** * @see net.sourceforge.pmd.TargetJDKVersion#createParser(Reader) */ public JavaParser createParser(Reader in) { - return new JavaParser(new JavaCharStream(in)); + JavaParser jp = new JavaParser(new JavaCharStream(in)); + jp.setJdkVersion(4); + return jp; } /** diff --git a/pmd/src/net/sourceforge/pmd/TargetJDK1_5.java b/pmd/src/net/sourceforge/pmd/TargetJDK1_5.java index 12025d60a3..19a40bc3c8 100644 --- a/pmd/src/net/sourceforge/pmd/TargetJDK1_5.java +++ b/pmd/src/net/sourceforge/pmd/TargetJDK1_5.java @@ -22,7 +22,7 @@ public class TargetJDK1_5 implements TargetJDKVersion { */ public JavaParser createParser(InputStream in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK15(); + jp.setJdkVersion(5); return jp; } @@ -31,7 +31,7 @@ public class TargetJDK1_5 implements TargetJDKVersion { */ public JavaParser createParser(Reader in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK15(); + jp.setJdkVersion(5); return jp; } diff --git a/pmd/src/net/sourceforge/pmd/TargetJDK1_6.java b/pmd/src/net/sourceforge/pmd/TargetJDK1_6.java index 4463e0efcf..3f82576bdb 100644 --- a/pmd/src/net/sourceforge/pmd/TargetJDK1_6.java +++ b/pmd/src/net/sourceforge/pmd/TargetJDK1_6.java @@ -21,7 +21,7 @@ public class TargetJDK1_6 implements TargetJDKVersion { */ public JavaParser createParser(InputStream in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK15(); + jp.setJdkVersion(6); return jp; } @@ -30,7 +30,7 @@ public class TargetJDK1_6 implements TargetJDKVersion { */ public JavaParser createParser(Reader in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK15(); + jp.setJdkVersion(6); return jp; } diff --git a/pmd/src/net/sourceforge/pmd/TargetJDK1_7.java b/pmd/src/net/sourceforge/pmd/TargetJDK1_7.java index 08526ce15f..ea281ec005 100644 --- a/pmd/src/net/sourceforge/pmd/TargetJDK1_7.java +++ b/pmd/src/net/sourceforge/pmd/TargetJDK1_7.java @@ -21,7 +21,7 @@ public class TargetJDK1_7 implements TargetJDKVersion { */ public JavaParser createParser(InputStream in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK15(); + jp.setJdkVersion(7); return jp; } @@ -30,7 +30,7 @@ public class TargetJDK1_7 implements TargetJDKVersion { */ public JavaParser createParser(Reader in) { JavaParser jp = new JavaParser(new JavaCharStream(in)); - jp.setJDK15(); + jp.setJdkVersion(7); return jp; } diff --git a/pmd/src/net/sourceforge/pmd/ast/ASTResource.java b/pmd/src/net/sourceforge/pmd/ast/ASTResource.java new file mode 100644 index 0000000000..9a77fc54ac --- /dev/null +++ b/pmd/src/net/sourceforge/pmd/ast/ASTResource.java @@ -0,0 +1,20 @@ +/* Generated By:JJTree: Do not edit this line. ASTResource.java Version 4.1 */ +/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=true,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY= */ +package net.sourceforge.pmd.ast; + +public class ASTResource extends ASTFormalParameter { + public ASTResource(int id) { + super(id); + } + + public ASTResource(JavaParser p, int id) { + super(p, id); + } + + + /** Accept the visitor. **/ + public Object jjtAccept(JavaParserVisitor visitor, Object data) { + return visitor.visit(this, data); + } +} +/* JavaCC - OriginalChecksum=43fe58be01783effb99f58d571b7eed2 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/ASTResourceSpecification.java b/pmd/src/net/sourceforge/pmd/ast/ASTResourceSpecification.java new file mode 100644 index 0000000000..273518c0c1 --- /dev/null +++ b/pmd/src/net/sourceforge/pmd/ast/ASTResourceSpecification.java @@ -0,0 +1,20 @@ +/* Generated By:JJTree: Do not edit this line. ASTResourceSpecification.java Version 4.1 */ +/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=true,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY= */ +package net.sourceforge.pmd.ast; + +public class ASTResourceSpecification extends SimpleJavaNode { + public ASTResourceSpecification(int id) { + super(id); + } + + public ASTResourceSpecification(JavaParser p, int id) { + super(p, id); + } + + + /** Accept the visitor. **/ + public Object jjtAccept(JavaParserVisitor visitor, Object data) { + return visitor.visit(this, data); + } +} +/* JavaCC - OriginalChecksum=302a35714ff98375ee6f404b5814bb94 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/ASTResources.java b/pmd/src/net/sourceforge/pmd/ast/ASTResources.java new file mode 100644 index 0000000000..f628f39bb0 --- /dev/null +++ b/pmd/src/net/sourceforge/pmd/ast/ASTResources.java @@ -0,0 +1,20 @@ +/* Generated By:JJTree: Do not edit this line. ASTResources.java Version 4.1 */ +/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=true,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY= */ +package net.sourceforge.pmd.ast; + +public class ASTResources extends SimpleJavaNode { + public ASTResources(int id) { + super(id); + } + + public ASTResources(JavaParser p, int id) { + super(p, id); + } + + + /** Accept the visitor. **/ + public Object jjtAccept(JavaParserVisitor visitor, Object data) { + return visitor.visit(this, data); + } +} +/* JavaCC - OriginalChecksum=66d98d4d1ab47edf1bbb1000ee168b36 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/CharStream.java b/pmd/src/net/sourceforge/pmd/ast/CharStream.java index 8cfc35adae..a4d3ee41f2 100644 --- a/pmd/src/net/sourceforge/pmd/ast/CharStream.java +++ b/pmd/src/net/sourceforge/pmd/ast/CharStream.java @@ -109,4 +109,4 @@ public interface CharStream { void Done(); } -/* JavaCC - OriginalChecksum=ee07529224d9f56bc326274129aba6aa (do not edit this line) */ +/* JavaCC - OriginalChecksum=1a0efc5345d544bfbfb4f4aa4874dcc9 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java b/pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java index bc25936757..02c9b6fb17 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java +++ b/pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java @@ -120,4 +120,4 @@ public class JJTJavaParserState { } } } -/* JavaCC - OriginalChecksum=1f85d5a954d2dafb00b08e69b12b9bd3 (do not edit this line) */ +/* JavaCC - OriginalChecksum=8adeb8c34464efb76188cd58df068d02 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java b/pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java index a2f87c2717..50a6d7e33e 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java +++ b/pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java @@ -613,4 +613,4 @@ public class JavaCharStream implements CharStream } } -/* JavaCC - OriginalChecksum=f18b7eb3e3e62d2724487ac20028cf2f (do not edit this line) */ +/* JavaCC - OriginalChecksum=dd099199b60a0a7ee9f65e20db756c9d (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaParser.java b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java index 768684fbb4..7841e2e133 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JavaParser.java +++ b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java @@ -4,71 +4,84 @@ import java.util.*; import net.sourceforge.pmd.PMD; public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, JavaParserConstants {/*@bgen(jjtree)*/ protected JJTJavaParserState jjtree = new JJTJavaParserState(); - private boolean isJDK13; - private boolean isJDK15; + private int jdkVersion = 0; - public void setJDK13() { - this.isJDK13 = true; - } - - public void setJDK15() { - this.isJDK15 = true; + public void setJdkVersion(int jdkVersion) { + this.jdkVersion = jdkVersion; } private void checkForBadAssertUsage(String in, String usage) { - if (!isJDK13 && in.equals("assert")) { + if (jdkVersion > 3 && in.equals("assert")) { throw new ParseException("Can't use 'assert' as " + usage + " when running in JDK 1.4 mode!"); } } private void checkForBadStaticImportUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use static imports when running in JDK 1.4 mode!"); } } private void checkForBadAnnotationUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use annotations when running in JDK 1.4 mode!"); } } private void checkForBadGenericsUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use generics unless running in JDK 1.5 mode!"); } } private void checkForBadVariableArgumentsUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use variable arguments (varargs) when running in JDK 1.4 mode!"); } } private void checkForBadJDK15ForLoopSyntaxArgumentsUsage() { - if (!isJDK15) { + if (jdkVersion < 5) { throw new ParseException("Can't use JDK 1.5 for loop syntax when running in JDK 1.4 mode!"); } } private void checkForBadEnumUsage(String in, String usage) { - if (isJDK15 && in.equals("enum")) { + if (jdkVersion >= 5 && in.equals("enum")) { throw new ParseException("Can't use 'enum' as " + usage + " when running in JDK 1.5 mode!"); } } private void checkForBadHexFloatingPointLiteral() { - if (!isJDK15) { - throw new ParseException("ERROR: Can't use hexadecimal floating point literals in pre-JDK 1.5 target"); + if (jdkVersion < 5) { + throw new ParseException("Can't use hexadecimal floating point literals in pre-JDK 1.5 target"); } } + private void checkForBadNumericalLiteralslUsage(Token token) { + if (jdkVersion < 7) { + if (token.image.contains("_")) { + throw new ParseException("Can't use underscores in numerical literals when running in JDK inferior to 1.7 mode!"); + } + + if (token.image.startsWith("0b") || token.image.startsWith("0B")) { + throw new ParseException("Can't use binary numerical literals when running in JDK inferior to 1.7 mode!"); + } + } + } + + private void checkForBadDiamondUsage() { + if (jdkVersion < 7) { + throw new ParseException("Cannot use the diamond generic notation when running in JDK inferior to 1.7 mode!"); + } + } + // This is a semantic LOOKAHEAD to determine if we're dealing with an assert // Note that this can't be replaced with a syntactic lookahead // since "assert" isn't a string literal token private boolean isNextTokenAnAssert() { boolean res = getToken(1).image.equals("assert"); - if (res && isJDK13 && getToken(2).image.equals("(")) { + if (res && jdkVersion <= 3 && getToken(2).image.equals("(")) { res = false; } return res; @@ -151,16 +164,16 @@ public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, Java TypeDeclaration(); } switch (jj_nt.kind) { - case 123: - jj_consume_token(123); + case 124: + jj_consume_token(124); break; default: jj_la1[2] = jj_gen; ; } switch (jj_nt.kind) { - case 124: - jj_consume_token(124); + case 125: + jj_consume_token(125); break; default: jj_la1[3] = jj_gen; @@ -616,7 +629,7 @@ jjtn000.setModifiers(modifiers); if (!t.image.equals("enum")) { {if (true) throw new ParseException("ERROR: expecting enum");} } - if (!this.isJDK15) { + if (jdkVersion < 5) { {if (true) throw new ParseException("ERROR: Can't use enum as a keyword in pre-JDK 1.5 target");} } t = jj_consume_token(IDENTIFIER); @@ -1568,6 +1581,19 @@ jjtn000.setModifiers(modifiers); } } Type(); + label_20: + while (true) { + switch (jj_nt.kind) { + case BIT_OR: + ; + break; + default: + jj_la1[47] = jj_gen; + break label_20; + } + jj_consume_token(BIT_OR); + Type(); + } switch (jj_nt.kind) { case ELLIPSIS: jj_consume_token(ELLIPSIS); @@ -1575,7 +1601,7 @@ jjtn000.setModifiers(modifiers); jjtn000.setVarargs(); break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; ; } VariableDeclaratorId(); @@ -1612,7 +1638,7 @@ Token t; TypeParameters(); break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; ; } jj_consume_token(IDENTIFIER); @@ -1623,7 +1649,7 @@ Token t; NameList(); break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; ; } jj_consume_token(LBRACE); @@ -1632,12 +1658,12 @@ Token t; } else { ; } - label_20: + label_21: while (true) { if (jj_2_11(1)) { ; } else { - break label_20; + break label_21; } BlockStatement(); } @@ -1717,7 +1743,7 @@ Token t; jj_consume_token(THIS); break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1725,7 +1751,7 @@ Token t; jj_consume_token(SEMICOLON); break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1763,7 +1789,7 @@ Token t; jjtn000.setStatic(); break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; ; } Block(); @@ -1812,7 +1838,7 @@ Token t; PrimitiveType(); break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1854,7 +1880,7 @@ Token t; case LONG: case SHORT: PrimitiveType(); - label_21: + label_22: while (true) { jj_consume_token(LBRACKET); jj_consume_token(RBRACKET); @@ -1862,18 +1888,18 @@ Token t; if (jj_2_15(2)) { ; } else { - break label_21; + break label_22; } } break; case IDENTIFIER: ClassOrInterfaceType(); - label_22: + label_23: while (true) { if (jj_2_16(2)) { ; } else { - break label_22; + break label_23; } jj_consume_token(LBRACKET); jj_consume_token(RBRACKET); @@ -1881,7 +1907,7 @@ Token t; } break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1920,12 +1946,12 @@ Token t; } else { ; } - label_23: + label_24: while (true) { if (jj_2_18(2)) { ; } else { - break label_23; + break label_24; } jj_consume_token(DOT); t = jj_consume_token(IDENTIFIER); @@ -1966,23 +1992,37 @@ Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - jj_consume_token(LT); + if (jj_2_20(2)) { + jj_consume_token(LT); checkForBadGenericsUsage(); - TypeArgument(); - label_24: - while (true) { + TypeArgument(); + label_25: + while (true) { + switch (jj_nt.kind) { + case COMMA: + ; + break; + default: + jj_la1[56] = jj_gen; + break label_25; + } + jj_consume_token(COMMA); + TypeArgument(); + } + jj_consume_token(GT); + } else { switch (jj_nt.kind) { - case COMMA: - ; + case LT: + jj_consume_token(LT); + checkForBadDiamondUsage(); + jj_consume_token(GT); break; default: - jj_la1[55] = jj_gen; - break label_24; + jj_la1[57] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - jj_consume_token(COMMA); - TypeArgument(); } - jj_consume_token(GT); } catch (Throwable jjte000) { if (jjtc000) { jjtree.clearNodeScope(jjtn000); @@ -2030,12 +2070,12 @@ Token t; WildcardBounds(); break; default: - jj_la1[56] = jj_gen; + jj_la1[58] = jj_gen; ; } break; default: - jj_la1[57] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2076,7 +2116,7 @@ Token t; ReferenceType(); break; default: - jj_la1[58] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2157,7 +2197,7 @@ Token t; jjtn000.setImage("double"); break; default: - jj_la1[59] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2190,7 +2230,7 @@ Token t; Type(); break; default: - jj_la1[60] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2226,12 +2266,12 @@ Token t; jjtn000.testingOnly__setBeginLine( t.beginLine); jjtn000.testingOnly__setBeginColumn( t.beginColumn); s.append(t.image); - label_25: + label_26: while (true) { - if (jj_2_20(2)) { + if (jj_2_21(2)) { ; } else { - break label_25; + break label_26; } jj_consume_token(DOT); t = jj_consume_token(IDENTIFIER); @@ -2254,15 +2294,15 @@ Token t; jjtree.openNodeScope(jjtn000); try { Name(); - label_26: + label_27: while (true) { switch (jj_nt.kind) { case COMMA: ; break; default: - jj_la1[61] = jj_gen; - break label_26; + jj_la1[63] = jj_gen; + break label_27; } jj_consume_token(COMMA); Name(); @@ -2315,7 +2355,7 @@ Token t; Expression(); break; default: - jj_la1[62] = jj_gen; + jj_la1[64] = jj_gen; ; } } catch (Throwable jjte000) { @@ -2419,7 +2459,7 @@ Token t; jjtn000.setImage("|="); jjtn000.setCompound(); break; default: - jj_la1[63] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2446,7 +2486,7 @@ Token t; ConditionalExpression(); break; default: - jj_la1[64] = jj_gen; + jj_la1[66] = jj_gen; ; } } catch (Throwable jjte000) { @@ -2477,15 +2517,15 @@ Token t; jjtree.openNodeScope(jjtn000); try { ConditionalAndExpression(); - label_27: + label_28: while (true) { switch (jj_nt.kind) { case SC_OR: ; break; default: - jj_la1[65] = jj_gen; - break label_27; + jj_la1[67] = jj_gen; + break label_28; } jj_consume_token(SC_OR); ConditionalAndExpression(); @@ -2518,15 +2558,15 @@ Token t; jjtree.openNodeScope(jjtn000); try { InclusiveOrExpression(); - label_28: + label_29: while (true) { switch (jj_nt.kind) { case SC_AND: ; break; default: - jj_la1[66] = jj_gen; - break label_28; + jj_la1[68] = jj_gen; + break label_29; } jj_consume_token(SC_AND); InclusiveOrExpression(); @@ -2559,15 +2599,15 @@ Token t; jjtree.openNodeScope(jjtn000); try { ExclusiveOrExpression(); - label_29: + label_30: while (true) { switch (jj_nt.kind) { case BIT_OR: ; break; default: - jj_la1[67] = jj_gen; - break label_29; + jj_la1[69] = jj_gen; + break label_30; } jj_consume_token(BIT_OR); ExclusiveOrExpression(); @@ -2600,15 +2640,15 @@ Token t; jjtree.openNodeScope(jjtn000); try { AndExpression(); - label_30: + label_31: while (true) { switch (jj_nt.kind) { case XOR: ; break; default: - jj_la1[68] = jj_gen; - break label_30; + jj_la1[70] = jj_gen; + break label_31; } jj_consume_token(XOR); AndExpression(); @@ -2641,15 +2681,15 @@ Token t; jjtree.openNodeScope(jjtn000); try { EqualityExpression(); - label_31: + label_32: while (true) { switch (jj_nt.kind) { case BIT_AND: ; break; default: - jj_la1[69] = jj_gen; - break label_31; + jj_la1[71] = jj_gen; + break label_32; } jj_consume_token(BIT_AND); EqualityExpression(); @@ -2682,7 +2722,7 @@ Token t; jjtree.openNodeScope(jjtn000); try { InstanceOfExpression(); - label_32: + label_33: while (true) { switch (jj_nt.kind) { case EQ: @@ -2690,8 +2730,8 @@ Token t; ; break; default: - jj_la1[70] = jj_gen; - break label_32; + jj_la1[72] = jj_gen; + break label_33; } switch (jj_nt.kind) { case EQ: @@ -2703,7 +2743,7 @@ Token t; jjtn000.setImage("!="); break; default: - jj_la1[71] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2743,7 +2783,7 @@ Token t; Type(); break; default: - jj_la1[72] = jj_gen; + jj_la1[74] = jj_gen; ; } } catch (Throwable jjte000) { @@ -2774,7 +2814,7 @@ Token t; jjtree.openNodeScope(jjtn000); try { ShiftExpression(); - label_33: + label_34: while (true) { switch (jj_nt.kind) { case LT: @@ -2784,8 +2824,8 @@ Token t; ; break; default: - jj_la1[73] = jj_gen; - break label_33; + jj_la1[75] = jj_gen; + break label_34; } switch (jj_nt.kind) { case LT: @@ -2805,7 +2845,7 @@ Token t; jjtn000.setImage(">="); break; default: - jj_la1[74] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2839,12 +2879,12 @@ Token t; jjtree.openNodeScope(jjtn000); try { AdditiveExpression(); - label_34: + label_35: while (true) { - if (jj_2_21(1)) { + if (jj_2_22(1)) { ; } else { - break label_34; + break label_35; } switch (jj_nt.kind) { case LSHIFT: @@ -2852,10 +2892,10 @@ Token t; jjtn000.setImage("<<"); break; default: - jj_la1[75] = jj_gen; - if (jj_2_22(1)) { + jj_la1[77] = jj_gen; + if (jj_2_23(1)) { RSIGNEDSHIFT(); - } else if (jj_2_23(1)) { + } else if (jj_2_24(1)) { RUNSIGNEDSHIFT(); } else { jj_consume_token(-1); @@ -2892,7 +2932,7 @@ Token t; jjtree.openNodeScope(jjtn000); try { MultiplicativeExpression(); - label_35: + label_36: while (true) { switch (jj_nt.kind) { case PLUS: @@ -2900,8 +2940,8 @@ Token t; ; break; default: - jj_la1[76] = jj_gen; - break label_35; + jj_la1[78] = jj_gen; + break label_36; } switch (jj_nt.kind) { case PLUS: @@ -2913,7 +2953,7 @@ Token t; jjtn000.setImage("-"); break; default: - jj_la1[77] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2947,7 +2987,7 @@ Token t; jjtree.openNodeScope(jjtn000); try { UnaryExpression(); - label_36: + label_37: while (true) { switch (jj_nt.kind) { case STAR: @@ -2956,8 +2996,8 @@ Token t; ; break; default: - jj_la1[78] = jj_gen; - break label_36; + jj_la1[80] = jj_gen; + break label_37; } switch (jj_nt.kind) { case STAR: @@ -2973,7 +3013,7 @@ Token t; jjtn000.setImage("%"); break; default: - jj_la1[79] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3019,7 +3059,7 @@ Token t; jjtn000.setImage("-"); break; default: - jj_la1[80] = jj_gen; + jj_la1[82] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3058,7 +3098,7 @@ Token t; UnaryExpressionNotPlusMinus(); break; default: - jj_la1[81] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3160,15 +3200,15 @@ Token t; jjtn000.setImage("!"); break; default: - jj_la1[82] = jj_gen; + jj_la1[84] = jj_gen; jj_consume_token(-1); throw new ParseException(); } UnaryExpression(); break; default: - jj_la1[83] = jj_gen; - if (jj_2_24(2147483647)) { + jj_la1[85] = jj_gen; + if (jj_2_25(2147483647)) { CastExpression(); } else { switch (jj_nt.kind) { @@ -3197,7 +3237,7 @@ Token t; PostfixExpression(); break; default: - jj_la1[84] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3228,10 +3268,10 @@ Token t; // below are not used, but they are there just to indicate that we know about // this. final public void CastLookahead() throws ParseException { - if (jj_2_25(2)) { + if (jj_2_26(2)) { jj_consume_token(LPAREN); PrimitiveType(); - } else if (jj_2_26(2147483647)) { + } else if (jj_2_27(2147483647)) { jj_consume_token(LPAREN); Type(); jj_consume_token(LBRACKET); @@ -3275,13 +3315,13 @@ Token t; Literal(); break; default: - jj_la1[85] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[86] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3308,13 +3348,13 @@ Token t; jjtn000.setImage("--"); break; default: - jj_la1[87] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[88] = jj_gen; + jj_la1[90] = jj_gen; ; } } catch (Throwable jjte000) { @@ -3344,7 +3384,7 @@ Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - if (jj_2_27(2147483647)) { + if (jj_2_28(2147483647)) { jj_consume_token(LPAREN); Type(); jj_consume_token(RPAREN); @@ -3358,7 +3398,7 @@ Token t; UnaryExpressionNotPlusMinus(); break; default: - jj_la1[89] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3391,12 +3431,12 @@ Token t; jjtree.openNodeScope(jjtn000); try { PrimaryPrefix(); - label_37: + label_38: while (true) { - if (jj_2_28(2)) { + if (jj_2_29(2)) { ; } else { - break label_37; + break label_38; } PrimarySuffix(); } @@ -3495,8 +3535,8 @@ jjtree.openNodeScope(jjtn000);Token t; AllocationExpression(); break; default: - jj_la1[90] = jj_gen; - if (jj_2_29(2147483647)) { + jj_la1[92] = jj_gen; + if (jj_2_30(2147483647)) { ResultType(); jj_consume_token(DOT); jj_consume_token(CLASS); @@ -3506,7 +3546,7 @@ jjtree.openNodeScope(jjtn000);Token t; Name(); break; default: - jj_la1[91] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3539,16 +3579,16 @@ jjtree.openNodeScope(jjtn000);Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000);Token t; try { - if (jj_2_30(2)) { + if (jj_2_31(2)) { jj_consume_token(DOT); jj_consume_token(THIS); - } else if (jj_2_31(2)) { - jj_consume_token(DOT); - jj_consume_token(SUPER); } else if (jj_2_32(2)) { + jj_consume_token(DOT); + jj_consume_token(SUPER); + } else if (jj_2_33(2)) { jj_consume_token(DOT); AllocationExpression(); - } else if (jj_2_33(3)) { + } else if (jj_2_34(3)) { MemberSelector(); } else { switch (jj_nt.kind) { @@ -3574,7 +3614,7 @@ jjtree.openNodeScope(jjtn000);Token t; jjtn000.setIsArguments(); break; default: - jj_la1[92] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3612,19 +3652,19 @@ jjtree.openNodeScope(jjtn000);Token t; t = jj_consume_token(INTEGER_LITERAL); jjtree.closeNodeScope(jjtn000, true); jjtc000 = false; - jjtn000.setImage(t.image); jjtn000.setIntLiteral(); + checkForBadNumericalLiteralslUsage(t); jjtn000.setImage(t.image); jjtn000.setIntLiteral(); break; case FLOATING_POINT_LITERAL: t = jj_consume_token(FLOATING_POINT_LITERAL); jjtree.closeNodeScope(jjtn000, true); jjtc000 = false; - jjtn000.setImage(t.image); jjtn000.setFloatLiteral(); + checkForBadNumericalLiteralslUsage(t); jjtn000.setImage(t.image); jjtn000.setFloatLiteral(); break; case HEX_FLOATING_POINT_LITERAL: t = jj_consume_token(HEX_FLOATING_POINT_LITERAL); jjtree.closeNodeScope(jjtn000, true); jjtc000 = false; - checkForBadHexFloatingPointLiteral(); jjtn000.setImage(t.image); jjtn000.setFloatLiteral(); + checkForBadHexFloatingPointLiteral(); checkForBadNumericalLiteralslUsage(t); jjtn000.setImage(t.image); jjtn000.setFloatLiteral(); break; case CHARACTER_LITERAL: t = jj_consume_token(CHARACTER_LITERAL); @@ -3646,7 +3686,7 @@ jjtree.openNodeScope(jjtn000);Token t; NullLiteral(); break; default: - jj_la1[93] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3688,7 +3728,7 @@ jjtree.openNodeScope(jjtn000);Token t; jj_consume_token(FALSE); break; default: - jj_la1[94] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3752,7 +3792,7 @@ jjtree.openNodeScope(jjtn000);Token t; ArgumentList(); break; default: - jj_la1[95] = jj_gen; + jj_la1[97] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3784,15 +3824,15 @@ jjtree.openNodeScope(jjtn000);Token t; jjtree.openNodeScope(jjtn000); try { Expression(); - label_38: + label_39: while (true) { switch (jj_nt.kind) { case COMMA: ; break; default: - jj_la1[96] = jj_gen; - break label_38; + jj_la1[98] = jj_gen; + break label_39; } jj_consume_token(COMMA); Expression(); @@ -3824,7 +3864,7 @@ jjtree.openNodeScope(jjtn000);Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - if (jj_2_34(2)) { + if (jj_2_35(2)) { jj_consume_token(NEW); PrimitiveType(); ArrayDimsAndInits(); @@ -3838,7 +3878,7 @@ jjtree.openNodeScope(jjtn000);Token t; TypeArguments(); break; default: - jj_la1[97] = jj_gen; + jj_la1[99] = jj_gen; ; } switch (jj_nt.kind) { @@ -3852,18 +3892,18 @@ jjtree.openNodeScope(jjtn000);Token t; ClassOrInterfaceBody(); break; default: - jj_la1[98] = jj_gen; + jj_la1[100] = jj_gen; ; } break; default: - jj_la1[99] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[100] = jj_gen; + jj_la1[102] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3899,32 +3939,32 @@ jjtree.openNodeScope(jjtn000);Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - if (jj_2_37(2)) { - label_39: + if (jj_2_38(2)) { + label_40: while (true) { jj_consume_token(LBRACKET); Expression(); jj_consume_token(RBRACKET); - if (jj_2_35(2)) { - ; - } else { - break label_39; - } - } - label_40: - while (true) { if (jj_2_36(2)) { ; } else { break label_40; } + } + label_41: + while (true) { + if (jj_2_37(2)) { + ; + } else { + break label_41; + } jj_consume_token(LBRACKET); jj_consume_token(RBRACKET); } } else { switch (jj_nt.kind) { case LBRACKET: - label_41: + label_42: while (true) { jj_consume_token(LBRACKET); jj_consume_token(RBRACKET); @@ -3933,14 +3973,14 @@ jjtree.openNodeScope(jjtn000);Token t; ; break; default: - jj_la1[101] = jj_gen; - break label_41; + jj_la1[103] = jj_gen; + break label_42; } } ArrayInitializer(); break; default: - jj_la1[102] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3977,7 +4017,7 @@ jjtree.openNodeScope(jjtn000);Token t; try { if (isNextTokenAnAssert()) { AssertStatement(); - } else if (jj_2_38(2)) { + } else if (jj_2_39(2)) { LabeledStatement(); } else { switch (jj_nt.kind) { @@ -4048,7 +4088,7 @@ jjtree.openNodeScope(jjtn000);Token t; TryStatement(); break; default: - jj_la1[103] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4112,12 +4152,12 @@ jjtree.openNodeScope(jjtn000);Token t; jjtree.openNodeScope(jjtn000);Token t; try { jj_consume_token(LBRACE); - label_42: + label_43: while (true) { - if (jj_2_39(1)) { + if (jj_2_40(1)) { ; } else { - break label_42; + break label_43; } BlockStatement(); } @@ -4154,18 +4194,18 @@ jjtree.openNodeScope(jjtn000);Token t; try { if (isNextTokenAnAssert()) { AssertStatement(); - } else if (jj_2_40(2147483647)) { + } else if (jj_2_41(2147483647)) { LocalVariableDeclaration(); jj_consume_token(SEMICOLON); - } else if (jj_2_41(1)) { + } else if (jj_2_42(1)) { Statement(); - } else if (jj_2_42(2147483647)) { + } else if (jj_2_43(2147483647)) { switch (jj_nt.kind) { case AT: Annotation(); break; default: - jj_la1[104] = jj_gen; + jj_la1[106] = jj_gen; ; } ClassOrInterfaceDeclaration(0); @@ -4200,7 +4240,7 @@ jjtree.openNodeScope(jjtn000);Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - label_43: + label_44: while (true) { switch (jj_nt.kind) { case FINAL: @@ -4208,8 +4248,8 @@ jjtree.openNodeScope(jjtn000);Token t; ; break; default: - jj_la1[105] = jj_gen; - break label_43; + jj_la1[107] = jj_gen; + break label_44; } switch (jj_nt.kind) { case FINAL: @@ -4220,22 +4260,22 @@ jjtree.openNodeScope(jjtn000);Token t; Annotation(); break; default: - jj_la1[106] = jj_gen; + jj_la1[108] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } Type(); VariableDeclarator(); - label_44: + label_45: while (true) { switch (jj_nt.kind) { case COMMA: ; break; default: - jj_la1[107] = jj_gen; - break label_44; + jj_la1[109] = jj_gen; + break label_45; } jj_consume_token(COMMA); VariableDeclarator(); @@ -4289,8 +4329,8 @@ jjtree.openNodeScope(jjtn000);Token t; PreDecrementExpression(); break; default: - jj_la1[109] = jj_gen; - if (jj_2_43(2147483647)) { + jj_la1[111] = jj_gen; + if (jj_2_44(2147483647)) { PostfixExpression(); } else { switch (jj_nt.kind) { @@ -4334,12 +4374,12 @@ jjtree.openNodeScope(jjtn000);Token t; Expression(); break; default: - jj_la1[108] = jj_gen; + jj_la1[110] = jj_gen; ; } break; default: - jj_la1[110] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4377,7 +4417,7 @@ jjtree.openNodeScope(jjtn000);Token t; Expression(); jj_consume_token(RPAREN); jj_consume_token(LBRACE); - label_45: + label_46: while (true) { switch (jj_nt.kind) { case CASE: @@ -4385,16 +4425,16 @@ jjtree.openNodeScope(jjtn000);Token t; ; break; default: - jj_la1[111] = jj_gen; - break label_45; + jj_la1[113] = jj_gen; + break label_46; } SwitchLabel(); - label_46: + label_47: while (true) { - if (jj_2_44(1)) { + if (jj_2_45(1)) { ; } else { - break label_46; + break label_47; } BlockStatement(); } @@ -4439,7 +4479,7 @@ jjtree.openNodeScope(jjtn000);Token t; jj_consume_token(COLON); break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4482,7 +4522,7 @@ jjtree.openNodeScope(jjtn000);Token t; Statement(); break; default: - jj_la1[113] = jj_gen; + jj_la1[115] = jj_gen; ; } jjtree.closeNodeScope(jjtn000, true); @@ -4583,7 +4623,7 @@ jjtree.openNodeScope(jjtn000);Token t; try { jj_consume_token(FOR); jj_consume_token(LPAREN); - if (jj_2_45(2147483647)) { + if (jj_2_46(2147483647)) { checkForBadJDK15ForLoopSyntaxArgumentsUsage(); Modifiers(); Type(); @@ -4649,7 +4689,7 @@ jjtree.openNodeScope(jjtn000);Token t; ForInit(); break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4685,7 +4725,7 @@ jjtree.openNodeScope(jjtn000);Token t; Expression(); break; default: - jj_la1[115] = jj_gen; + jj_la1[117] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4717,12 +4757,12 @@ jjtree.openNodeScope(jjtn000);Token t; ForUpdate(); break; default: - jj_la1[116] = jj_gen; + jj_la1[118] = jj_gen; ; } break; default: - jj_la1[117] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4756,7 +4796,7 @@ jjtree.openNodeScope(jjtn000);Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - if (jj_2_46(2147483647)) { + if (jj_2_47(2147483647)) { LocalVariableDeclaration(); } else { switch (jj_nt.kind) { @@ -4787,7 +4827,7 @@ jjtree.openNodeScope(jjtn000);Token t; StatementExpressionList(); break; default: - jj_la1[118] = jj_gen; + jj_la1[120] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4820,15 +4860,15 @@ jjtree.openNodeScope(jjtn000);Token t; jjtree.openNodeScope(jjtn000); try { StatementExpression(); - label_47: + label_48: while (true) { switch (jj_nt.kind) { case COMMA: ; break; default: - jj_la1[119] = jj_gen; - break label_47; + jj_la1[121] = jj_gen; + break label_48; } jj_consume_token(COMMA); StatementExpression(); @@ -4895,7 +4935,7 @@ jjtree.openNodeScope(jjtn000);Token t; jjtn000.setImage(t.image); break; default: - jj_la1[120] = jj_gen; + jj_la1[122] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4919,7 +4959,7 @@ jjtree.openNodeScope(jjtn000);Token t; jjtn000.setImage(t.image); break; default: - jj_la1[121] = jj_gen; + jj_la1[123] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4969,7 +5009,7 @@ jjtree.openNodeScope(jjtn000);Token t; Expression(); break; default: - jj_la1[122] = jj_gen; + jj_la1[124] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -5063,16 +5103,24 @@ jjtree.openNodeScope(jjtn000);Token t; jjtree.openNodeScope(jjtn000); try { jj_consume_token(TRY); + switch (jj_nt.kind) { + case LPAREN: + ResourceSpecification(); + break; + default: + jj_la1[125] = jj_gen; + ; + } Block(); - label_48: + label_49: while (true) { switch (jj_nt.kind) { case CATCH: ; break; default: - jj_la1[123] = jj_gen; - break label_48; + jj_la1[126] = jj_gen; + break label_49; } CatchStatement(); } @@ -5081,7 +5129,7 @@ jjtree.openNodeScope(jjtn000);Token t; FinallyStatement(); break; default: - jj_la1[124] = jj_gen; + jj_la1[127] = jj_gen; ; } } catch (Throwable jjte000) { @@ -5105,6 +5153,134 @@ jjtree.openNodeScope(jjtn000);Token t; } } + final public void ResourceSpecification() throws ParseException { + /*@bgen(jjtree) ResourceSpecification */ + ASTResourceSpecification jjtn000 = new ASTResourceSpecification(this, JJTRESOURCESPECIFICATION); + boolean jjtc000 = true; + jjtree.openNodeScope(jjtn000); + try { + jj_consume_token(LPAREN); + Resources(); + if (jj_2_48(2)) { + jj_consume_token(SEMICOLON); + } else { + ; + } + jj_consume_token(RPAREN); + } catch (Throwable jjte000) { + if (jjtc000) { + jjtree.clearNodeScope(jjtn000); + jjtc000 = false; + } else { + jjtree.popNode(); + } + if (jjte000 instanceof RuntimeException) { + {if (true) throw (RuntimeException)jjte000;} + } + if (jjte000 instanceof ParseException) { + {if (true) throw (ParseException)jjte000;} + } + {if (true) throw (Error)jjte000;} + } finally { + if (jjtc000) { + jjtree.closeNodeScope(jjtn000, true); + } + } + } + + final public void Resources() throws ParseException { + /*@bgen(jjtree) Resources */ + ASTResources jjtn000 = new ASTResources(this, JJTRESOURCES); + boolean jjtc000 = true; + jjtree.openNodeScope(jjtn000); + try { + Resource(); + label_50: + while (true) { + if (jj_2_49(2)) { + ; + } else { + break label_50; + } + jj_consume_token(SEMICOLON); + Resource(); + } + } catch (Throwable jjte000) { + if (jjtc000) { + jjtree.clearNodeScope(jjtn000); + jjtc000 = false; + } else { + jjtree.popNode(); + } + if (jjte000 instanceof RuntimeException) { + {if (true) throw (RuntimeException)jjte000;} + } + if (jjte000 instanceof ParseException) { + {if (true) throw (ParseException)jjte000;} + } + {if (true) throw (Error)jjte000;} + } finally { + if (jjtc000) { + jjtree.closeNodeScope(jjtn000, true); + } + } + } + + final public void Resource() throws ParseException { + /*@bgen(jjtree) Resource */ + ASTResource jjtn000 = new ASTResource(this, JJTRESOURCE); + boolean jjtc000 = true; + jjtree.openNodeScope(jjtn000); + try { + label_51: + while (true) { + switch (jj_nt.kind) { + case FINAL: + case AT: + ; + break; + default: + jj_la1[128] = jj_gen; + break label_51; + } + switch (jj_nt.kind) { + case FINAL: + jj_consume_token(FINAL); + break; + case AT: + Annotation(); + break; + default: + jj_la1[129] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + Type(); + VariableDeclaratorId(); + jj_consume_token(ASSIGN); + Expression(); + } catch (Throwable jjte000) { + if (jjtc000) { + jjtree.clearNodeScope(jjtn000); + jjtc000 = false; + } else { + jjtree.popNode(); + } + if (jjte000 instanceof RuntimeException) { + {if (true) throw (RuntimeException)jjte000;} + } + if (jjte000 instanceof ParseException) { + {if (true) throw (ParseException)jjte000;} + } + {if (true) throw (Error)jjte000;} + } finally { + if (jjtc000) { + jjtree.closeNodeScope(jjtn000, true); + } + } + } + final public void CatchStatement() throws ParseException { /*@bgen(jjtree) CatchStatement */ ASTCatchStatement jjtn000 = new ASTCatchStatement(this, JJTCATCHSTATEMENT); @@ -5170,7 +5346,7 @@ jjtree.openNodeScope(jjtn000);Token t; /*@bgen(jjtree) AssertStatement */ ASTAssertStatement jjtn000 = new ASTAssertStatement(this, JJTASSERTSTATEMENT); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);if (isJDK13) { + jjtree.openNodeScope(jjtn000);if (jdkVersion <= 3) { throw new ParseException("Can't use 'assert' as a keyword when running in JDK 1.3 mode!"); } try { @@ -5182,7 +5358,7 @@ jjtree.openNodeScope(jjtn000);Token t; Expression(); break; default: - jj_la1[125] = jj_gen; + jj_la1[130] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -5262,9 +5438,9 @@ jjtree.openNodeScope(jjtn000);Token t; boolean jjtc000 = true; jjtree.openNodeScope(jjtn000); try { - if (jj_2_47(2147483647)) { + if (jj_2_50(2147483647)) { NormalAnnotation(); - } else if (jj_2_48(2147483647)) { + } else if (jj_2_51(2147483647)) { SingleMemberAnnotation(); } else { switch (jj_nt.kind) { @@ -5272,7 +5448,7 @@ jjtree.openNodeScope(jjtn000);Token t; MarkerAnnotation(); break; default: - jj_la1[126] = jj_gen; + jj_la1[131] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5312,7 +5488,7 @@ jjtree.openNodeScope(jjtn000);Token t; MemberValuePairs(); break; default: - jj_la1[127] = jj_gen; + jj_la1[132] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5414,15 +5590,15 @@ jjtree.openNodeScope(jjtn000);Token t; jjtree.openNodeScope(jjtn000); try { MemberValuePair(); - label_49: + label_52: while (true) { switch (jj_nt.kind) { case COMMA: ; break; default: - jj_la1[128] = jj_gen; - break label_49; + jj_la1[133] = jj_gen; + break label_52; } jj_consume_token(COMMA); MemberValuePair(); @@ -5523,7 +5699,7 @@ jjtree.openNodeScope(jjtn000);Token t; ConditionalExpression(); break; default: - jj_la1[129] = jj_gen; + jj_la1[134] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5587,12 +5763,12 @@ jjtree.openNodeScope(jjtn000);Token t; case PLUS: case MINUS: MemberValue(); - label_50: + label_53: while (true) { - if (jj_2_49(2)) { + if (jj_2_52(2)) { ; } else { - break label_50; + break label_53; } jj_consume_token(COMMA); MemberValue(); @@ -5602,12 +5778,12 @@ jjtree.openNodeScope(jjtn000);Token t; jj_consume_token(COMMA); break; default: - jj_la1[130] = jj_gen; + jj_la1[135] = jj_gen; ; } break; default: - jj_la1[131] = jj_gen; + jj_la1[136] = jj_gen; ; } jj_consume_token(RBRACE); @@ -5673,7 +5849,7 @@ jjtn000.setModifiers(modifiers); jjtree.openNodeScope(jjtn000); try { jj_consume_token(LBRACE); - label_51: + label_54: while (true) { switch (jj_nt.kind) { case ABSTRACT: @@ -5703,8 +5879,8 @@ jjtn000.setModifiers(modifiers); ; break; default: - jj_la1[132] = jj_gen; - break label_51; + jj_la1[137] = jj_gen; + break label_54; } AnnotationTypeMemberDeclaration(); } @@ -5761,7 +5937,7 @@ jjtn000.setModifiers(modifiers); case IDENTIFIER: case AT: modifiers = Modifiers(); - if (jj_2_50(3)) { + if (jj_2_53(3)) { AnnotationMethodDeclaration(modifiers); } else { switch (jj_nt.kind) { @@ -5772,8 +5948,8 @@ jjtn000.setModifiers(modifiers); ClassOrInterfaceDeclaration(modifiers); break; default: - jj_la1[133] = jj_gen; - if (jj_2_51(3)) { + jj_la1[138] = jj_gen; + if (jj_2_54(3)) { EnumDeclaration(modifiers); } else { switch (jj_nt.kind) { @@ -5792,7 +5968,7 @@ jjtn000.setModifiers(modifiers); FieldDeclaration(modifiers); break; default: - jj_la1[134] = jj_gen; + jj_la1[139] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5804,7 +5980,7 @@ jjtn000.setModifiers(modifiers); jj_consume_token(SEMICOLON); break; default: - jj_la1[135] = jj_gen; + jj_la1[140] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5845,7 +6021,7 @@ jjtn000.setModifiers(modifiers); DefaultValue(); break; default: - jj_la1[136] = jj_gen; + jj_la1[141] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -6259,116 +6435,93 @@ jjtn000.setModifiers(modifiers); finally { jj_save(50, xla); } } - private boolean jj_3R_223() { - if (jj_3R_233()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_262()) { jj_scanpos = xsp; break; } - } - return false; + private boolean jj_2_52(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_52(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(51, xla); } } - private boolean jj_3R_206() { - if (jj_3R_223()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_259()) { jj_scanpos = xsp; break; } - } - return false; + private boolean jj_2_53(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_53(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(52, xla); } } - private boolean jj_3R_183() { - if (jj_3R_206()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_241()) { jj_scanpos = xsp; break; } - } - return false; + private boolean jj_2_54(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_54(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(53, xla); } } - private boolean jj_3R_139() { - if (jj_3R_183()) return true; + private boolean jj_3R_146() { + if (jj_3R_189()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_231()) jj_scanpos = xsp; + if (jj_3R_238()) jj_scanpos = xsp; return false; } - private boolean jj_3R_253() { + private boolean jj_3R_260() { if (jj_scan_token(ORASSIGN)) return true; return false; } - private boolean jj_3R_252() { + private boolean jj_3R_259() { if (jj_scan_token(XORASSIGN)) return true; return false; } - private boolean jj_3R_251() { + private boolean jj_3R_258() { if (jj_scan_token(ANDASSIGN)) return true; return false; } - private boolean jj_3R_250() { + private boolean jj_3R_257() { if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true; return false; } - private boolean jj_3R_249() { + private boolean jj_3R_256() { if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; return false; } - private boolean jj_3R_248() { + private boolean jj_3R_255() { if (jj_scan_token(LSHIFTASSIGN)) return true; return false; } - private boolean jj_3R_247() { + private boolean jj_3R_254() { if (jj_scan_token(MINUSASSIGN)) return true; return false; } - private boolean jj_3R_246() { + private boolean jj_3R_253() { if (jj_scan_token(PLUSASSIGN)) return true; return false; } - private boolean jj_3R_245() { + private boolean jj_3R_252() { if (jj_scan_token(REMASSIGN)) return true; return false; } - private boolean jj_3R_244() { + private boolean jj_3R_251() { if (jj_scan_token(SLASHASSIGN)) return true; return false; } - private boolean jj_3R_243() { + private boolean jj_3R_250() { if (jj_scan_token(STARASSIGN)) return true; return false; } - private boolean jj_3R_232() { + private boolean jj_3R_239() { Token xsp; xsp = jj_scanpos; - if (jj_3R_242()) { - jj_scanpos = xsp; - if (jj_3R_243()) { - jj_scanpos = xsp; - if (jj_3R_244()) { - jj_scanpos = xsp; - if (jj_3R_245()) { - jj_scanpos = xsp; - if (jj_3R_246()) { - jj_scanpos = xsp; - if (jj_3R_247()) { - jj_scanpos = xsp; - if (jj_3R_248()) { - jj_scanpos = xsp; if (jj_3R_249()) { jj_scanpos = xsp; if (jj_3R_250()) { @@ -6377,7 +6530,21 @@ jjtn000.setModifiers(modifiers); jj_scanpos = xsp; if (jj_3R_252()) { jj_scanpos = xsp; - if (jj_3R_253()) return true; + if (jj_3R_253()) { + jj_scanpos = xsp; + if (jj_3R_254()) { + jj_scanpos = xsp; + if (jj_3R_255()) { + jj_scanpos = xsp; + if (jj_3R_256()) { + jj_scanpos = xsp; + if (jj_3R_257()) { + jj_scanpos = xsp; + if (jj_3R_258()) { + jj_scanpos = xsp; + if (jj_3R_259()) { + jj_scanpos = xsp; + if (jj_3R_260()) return true; } } } @@ -6392,141 +6559,141 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_242() { + private boolean jj_3R_249() { if (jj_scan_token(ASSIGN)) return true; return false; } - private boolean jj_3R_222() { - if (jj_3R_232()) return true; - if (jj_3R_88()) return true; + private boolean jj_3R_229() { + if (jj_3R_239()) return true; + if (jj_3R_92()) return true; return false; } - private boolean jj_3R_88() { - if (jj_3R_139()) return true; + private boolean jj_3R_92() { + if (jj_3R_146()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_222()) jj_scanpos = xsp; + if (jj_3R_229()) jj_scanpos = xsp; return false; } - private boolean jj_3R_332() { + private boolean jj_3R_339() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_95()) return true; + if (jj_3R_100()) return true; return false; } - private boolean jj_3R_317() { - if (jj_3R_95()) return true; + private boolean jj_3R_324() { + if (jj_3R_100()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_332()) { jj_scanpos = xsp; break; } + if (jj_3R_339()) { jj_scanpos = xsp; break; } } return false; } private boolean jj_3_19() { - if (jj_3R_78()) return true; + if (jj_3R_81()) return true; return false; } - private boolean jj_3_20() { + private boolean jj_3_21() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(IDENTIFIER)) return true; return false; } - private boolean jj_3R_257() { + private boolean jj_3R_268() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_121()) return true; + if (jj_3R_82()) return true; return false; } - private boolean jj_3R_95() { + private boolean jj_3R_100() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_20()) { jj_scanpos = xsp; break; } + if (jj_3_21()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_137() { - if (jj_3R_70()) return true; + private boolean jj_3R_144() { + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_85() { + private boolean jj_3R_89() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(59)) { jj_scanpos = xsp; - if (jj_3R_137()) return true; + if (jj_3R_144()) return true; } return false; } - private boolean jj_3R_133() { + private boolean jj_3R_140() { if (jj_scan_token(DOUBLE)) return true; return false; } - private boolean jj_3R_132() { + private boolean jj_3R_139() { if (jj_scan_token(FLOAT)) return true; return false; } - private boolean jj_3R_131() { + private boolean jj_3R_138() { if (jj_scan_token(LONG)) return true; return false; } - private boolean jj_3R_130() { + private boolean jj_3R_137() { if (jj_scan_token(INT)) return true; return false; } - private boolean jj_3R_129() { + private boolean jj_3R_136() { if (jj_scan_token(SHORT)) return true; return false; } - private boolean jj_3R_128() { + private boolean jj_3R_135() { if (jj_scan_token(BYTE)) return true; return false; } - private boolean jj_3R_127() { + private boolean jj_3R_134() { if (jj_scan_token(CHAR)) return true; return false; } - private boolean jj_3R_126() { + private boolean jj_3R_133() { if (jj_scan_token(BOOLEAN)) return true; return false; } - private boolean jj_3R_83() { + private boolean jj_3R_87() { Token xsp; xsp = jj_scanpos; - if (jj_3R_126()) { + if (jj_3R_133()) { jj_scanpos = xsp; - if (jj_3R_127()) { + if (jj_3R_134()) { jj_scanpos = xsp; - if (jj_3R_128()) { + if (jj_3R_135()) { jj_scanpos = xsp; - if (jj_3R_129()) { + if (jj_3R_136()) { jj_scanpos = xsp; - if (jj_3R_130()) { + if (jj_3R_137()) { jj_scanpos = xsp; - if (jj_3R_131()) { + if (jj_3R_138()) { jj_scanpos = xsp; - if (jj_3R_132()) { + if (jj_3R_139()) { jj_scanpos = xsp; - if (jj_3R_133()) return true; + if (jj_3R_140()) return true; } } } @@ -6537,30 +6704,38 @@ jjtn000.setModifiers(modifiers); return false; } + private boolean jj_3R_290() { + if (jj_scan_token(SUPER)) return true; + if (jj_3R_80()) return true; + return false; + } + + private boolean jj_3R_289() { + if (jj_scan_token(EXTENDS)) return true; + if (jj_3R_80()) return true; + return false; + } + private boolean jj_3R_276() { - if (jj_scan_token(SUPER)) return true; - if (jj_3R_77()) return true; + if (jj_3R_281()) return true; return false; } - private boolean jj_3R_266() { - if (jj_3R_270()) return true; - return false; - } - - private boolean jj_3R_270() { + private boolean jj_3R_281() { Token xsp; xsp = jj_scanpos; - if (jj_3R_275()) { + if (jj_3R_289()) { jj_scanpos = xsp; - if (jj_3R_276()) return true; + if (jj_3R_290()) return true; } return false; } - private boolean jj_3R_275() { - if (jj_scan_token(EXTENDS)) return true; - if (jj_3R_77()) return true; + private boolean jj_3R_128() { + if (jj_scan_token(HOOK)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_276()) jj_scanpos = xsp; return false; } @@ -6570,36 +6745,44 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_181() { - if (jj_scan_token(HOOK)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_266()) jj_scanpos = xsp; + private boolean jj_3R_127() { + if (jj_3R_80()) return true; return false; } - private boolean jj_3R_121() { + private boolean jj_3R_82() { Token xsp; xsp = jj_scanpos; - if (jj_3R_180()) { + if (jj_3R_127()) { jj_scanpos = xsp; - if (jj_3R_181()) return true; + if (jj_3R_128()) return true; } return false; } - private boolean jj_3R_180() { - if (jj_3R_77()) return true; + private boolean jj_3R_126() { + if (jj_scan_token(LT)) return true; + if (jj_scan_token(GT)) return true; return false; } - private boolean jj_3R_78() { + private boolean jj_3R_81() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_20()) { + jj_scanpos = xsp; + if (jj_3R_126()) return true; + } + return false; + } + + private boolean jj_3_20() { if (jj_scan_token(LT)) return true; - if (jj_3R_121()) return true; + if (jj_3R_82()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_257()) { jj_scanpos = xsp; break; } + if (jj_3R_268()) { jj_scanpos = xsp; break; } } if (jj_scan_token(GT)) return true; return false; @@ -6611,6 +6794,11 @@ jjtn000.setModifiers(modifiers); return false; } + private boolean jj_3R_379() { + if (jj_3R_388()) return true; + return false; + } + private boolean jj_3_18() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(IDENTIFIER)) return true; @@ -6621,11 +6809,11 @@ jjtn000.setModifiers(modifiers); } private boolean jj_3_17() { - if (jj_3R_78()) return true; + if (jj_3R_81()) return true; return false; } - private boolean jj_3R_179() { + private boolean jj_3R_187() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; @@ -6637,8 +6825,8 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_120() { - if (jj_3R_179()) return true; + private boolean jj_3R_125() { + if (jj_3R_187()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -6647,8 +6835,8 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_119() { - if (jj_3R_83()) return true; + private boolean jj_3R_124() { + if (jj_3R_87()) return true; Token xsp; if (jj_3_15()) return true; while (true) { @@ -6658,86 +6846,99 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_77() { + private boolean jj_3R_80() { Token xsp; xsp = jj_scanpos; - if (jj_3R_119()) { + if (jj_3R_124()) { jj_scanpos = xsp; - if (jj_3R_120()) return true; + if (jj_3R_125()) return true; } return false; } - private boolean jj_3R_297() { + private boolean jj_3R_304() { if (jj_scan_token(THROWS)) return true; - if (jj_3R_317()) return true; + if (jj_3R_324()) return true; return false; } - private boolean jj_3R_109() { - if (jj_3R_83()) return true; + private boolean jj_3R_114() { + if (jj_3R_87()) return true; return false; } - private boolean jj_3_14() { - if (jj_3R_77()) return true; - return false; - } - - private boolean jj_3R_70() { + private boolean jj_3R_73() { Token xsp; xsp = jj_scanpos; if (jj_3_14()) { jj_scanpos = xsp; - if (jj_3R_109()) return true; + if (jj_3R_114()) return true; } return false; } - private boolean jj_3R_355() { - if (jj_3R_99()) return true; + private boolean jj_3_14() { + if (jj_3R_80()) return true; return false; } - private boolean jj_3R_370() { - if (jj_3R_378()) return true; + private boolean jj_3R_388() { + if (jj_scan_token(_DEFAULT)) return true; + if (jj_3R_102()) return true; return false; } - private boolean jj_3R_288() { + private boolean jj_3R_363() { + if (jj_3R_104()) return true; + return false; + } + + private boolean jj_3R_295() { if (jj_scan_token(STATIC)) return true; return false; } private boolean jj_3_13() { if (jj_scan_token(THIS)) return true; - if (jj_3R_76()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_279() { + private boolean jj_3R_284() { Token xsp; xsp = jj_scanpos; - if (jj_3R_288()) jj_scanpos = xsp; - if (jj_3R_184()) return true; + if (jj_3R_295()) jj_scanpos = xsp; + if (jj_3R_190()) return true; + return false; + } + + private boolean jj_3R_103() { + if (jj_3R_73()) return true; + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_scan_token(LPAREN)) return true; + if (jj_scan_token(RPAREN)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_379()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; return false; } private boolean jj_3_10() { - if (jj_3R_73()) return true; + if (jj_3R_76()) return true; return false; } private boolean jj_3_12() { - if (jj_3R_75()) return true; + if (jj_3R_78()) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(SUPER)) return true; if (jj_scan_token(LPAREN)) return true; return false; } - private boolean jj_3R_113() { + private boolean jj_3R_118() { Token xsp; xsp = jj_scanpos; if (jj_3_12()) jj_scanpos = xsp; @@ -6746,60 +6947,80 @@ jjtn000.setModifiers(modifiers); jj_scanpos = xsp; if (jj_scan_token(53)) return true; } - if (jj_3R_76()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_112() { + private boolean jj_3R_117() { if (jj_scan_token(THIS)) return true; - if (jj_3R_76()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_73() { + private boolean jj_3R_76() { Token xsp; xsp = jj_scanpos; - if (jj_3R_112()) { + if (jj_3R_117()) { jj_scanpos = xsp; - if (jj_3R_113()) return true; + if (jj_3R_118()) return true; } return false; } - private boolean jj_3R_331() { + private boolean jj_3R_338() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_330()) return true; + if (jj_3R_337()) return true; + return false; + } + + private boolean jj_3R_366() { + if (jj_3R_297()) return true; return false; } private boolean jj_3_11() { - if (jj_3R_74()) return true; + if (jj_3R_77()) return true; return false; } - private boolean jj_3R_298() { - if (jj_3R_73()) return true; + private boolean jj_3R_305() { + if (jj_3R_76()) return true; return false; } - private boolean jj_3R_295() { - if (jj_3R_108()) return true; + private boolean jj_3R_365() { + if (jj_3R_299()) return true; return false; } - private boolean jj_3R_289() { + private boolean jj_3R_302() { + if (jj_3R_113()) return true; + return false; + } + + private boolean jj_3_54() { + if (jj_3R_71()) return true; + return false; + } + + private boolean jj_3R_364() { + if (jj_3R_70()) return true; + return false; + } + + private boolean jj_3R_296() { Token xsp; xsp = jj_scanpos; - if (jj_3R_295()) jj_scanpos = xsp; + if (jj_3R_302()) jj_scanpos = xsp; if (jj_scan_token(IDENTIFIER)) return true; - if (jj_3R_296()) return true; + if (jj_3R_303()) return true; xsp = jj_scanpos; - if (jj_3R_297()) jj_scanpos = xsp; + if (jj_3R_304()) jj_scanpos = xsp; if (jj_scan_token(LBRACE)) return true; xsp = jj_scanpos; - if (jj_3R_298()) jj_scanpos = xsp; + if (jj_3R_305()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; if (jj_3_11()) { jj_scanpos = xsp; break; } @@ -6808,199 +7029,227 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_378() { - if (jj_scan_token(_DEFAULT)) return true; - if (jj_3R_97()) return true; + private boolean jj_3R_351() { + if (jj_scan_token(BIT_OR)) return true; + if (jj_3R_73()) return true; return false; } - private boolean jj_3R_320() { + private boolean jj_3_53() { + if (jj_3R_103()) return true; + return false; + } + + private boolean jj_3R_327() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_303() { + private boolean jj_3R_310() { if (jj_scan_token(THROWS)) return true; - if (jj_3R_317()) return true; + if (jj_3R_324()) return true; return false; } - private boolean jj_3R_344() { + private boolean jj_3R_353() { + if (jj_3R_98()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3_53()) { + jj_scanpos = xsp; + if (jj_3R_364()) { + jj_scanpos = xsp; + if (jj_3_54()) { + jj_scanpos = xsp; + if (jj_3R_365()) { + jj_scanpos = xsp; + if (jj_3R_366()) return true; + } + } + } + } + return false; + } + + private boolean jj_3R_341() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_353()) { + jj_scanpos = xsp; + if (jj_scan_token(82)) return true; + } + return false; + } + + private boolean jj_3R_352() { if (jj_scan_token(ELLIPSIS)) return true; return false; } - private boolean jj_3R_354() { + private boolean jj_3R_328() { + if (jj_3R_341()) return true; + return false; + } + + private boolean jj_3R_362() { if (jj_scan_token(FINAL)) return true; return false; } - private boolean jj_3R_343() { + private boolean jj_3R_350() { Token xsp; xsp = jj_scanpos; - if (jj_3R_354()) { + if (jj_3R_362()) { jj_scanpos = xsp; - if (jj_3R_355()) return true; + if (jj_3R_363()) return true; } return false; } - private boolean jj_3R_330() { + private boolean jj_3_52() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_102()) return true; + return false; + } + + private boolean jj_3R_337() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_343()) { jj_scanpos = xsp; break; } + if (jj_3R_350()) { jj_scanpos = xsp; break; } + } + if (jj_3R_73()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_351()) { jj_scanpos = xsp; break; } } - if (jj_3R_70()) return true; xsp = jj_scanpos; - if (jj_3R_344()) jj_scanpos = xsp; - if (jj_3R_318()) return true; + if (jj_3R_352()) jj_scanpos = xsp; + if (jj_3R_325()) return true; return false; } - private boolean jj_3R_98() { - if (jj_3R_70()) return true; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_scan_token(LPAREN)) return true; - if (jj_scan_token(RPAREN)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_370()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - private boolean jj_3R_316() { - if (jj_3R_330()) return true; + private boolean jj_3R_323() { + if (jj_3R_337()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_331()) { jj_scanpos = xsp; break; } + if (jj_3R_338()) { jj_scanpos = xsp; break; } } return false; } + private boolean jj_3R_312() { + if (jj_scan_token(LBRACE)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_328()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RBRACE)) return true; + return false; + } + private boolean jj_3_9() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_72()) return true; + if (jj_3R_75()) return true; return false; } - private boolean jj_3R_296() { + private boolean jj_3R_303() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_316()) jj_scanpos = xsp; + if (jj_3R_323()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_358() { - if (jj_3R_290()) return true; - return false; - } - - private boolean jj_3R_357() { - if (jj_3R_292()) return true; - return false; - } - - private boolean jj_3_51() { - if (jj_3R_68()) return true; - return false; - } - - private boolean jj_3R_356() { - if (jj_3R_67()) return true; - return false; - } - - private boolean jj_3_50() { - if (jj_3R_98()) return true; - return false; - } - - private boolean jj_3R_302() { + private boolean jj_3R_299() { + if (jj_scan_token(AT)) return true; + if (jj_scan_token(INTERFACE)) return true; if (jj_scan_token(IDENTIFIER)) return true; - if (jj_3R_296()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_320()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_345() { - if (jj_3R_94()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3_50()) { - jj_scanpos = xsp; - if (jj_3R_356()) { - jj_scanpos = xsp; - if (jj_3_51()) { - jj_scanpos = xsp; - if (jj_3R_357()) { - jj_scanpos = xsp; - if (jj_3R_358()) return true; - } - } - } - } - return false; - } - - private boolean jj_3R_334() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_345()) { - jj_scanpos = xsp; - if (jj_scan_token(81)) return true; - } - return false; - } - - private boolean jj_3R_321() { - if (jj_3R_334()) return true; - return false; - } - - private boolean jj_3R_304() { - if (jj_3R_184()) return true; - return false; - } - - private boolean jj_3R_301() { - if (jj_3R_108()) return true; - return false; - } - - private boolean jj_3_49() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_97()) return true; - return false; - } - - private boolean jj_3R_291() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_301()) jj_scanpos = xsp; - if (jj_3R_85()) return true; - if (jj_3R_302()) return true; - xsp = jj_scanpos; - if (jj_3R_303()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_304()) { - jj_scanpos = xsp; - if (jj_scan_token(81)) return true; - } + if (jj_3R_312()) return true; return false; } private boolean jj_3R_264() { - if (jj_3R_72()) return true; + if (jj_3R_102()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_52()) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_scan_token(83)) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_205() { + if (jj_scan_token(LBRACE)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_264()) jj_scanpos = xsp; + if (jj_scan_token(RBRACE)) return true; + return false; + } + + private boolean jj_3R_309() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_3R_303()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_327()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_246() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_245()) return true; + return false; + } + + private boolean jj_3R_311() { + if (jj_3R_190()) return true; + return false; + } + + private boolean jj_3R_166() { + if (jj_3R_146()) return true; + return false; + } + + private boolean jj_3R_308() { + if (jj_3R_113()) return true; + return false; + } + + private boolean jj_3R_165() { + if (jj_3R_205()) return true; + return false; + } + + private boolean jj_3R_298() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_308()) jj_scanpos = xsp; + if (jj_3R_89()) return true; + if (jj_3R_309()) return true; + xsp = jj_scanpos; + if (jj_3R_310()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_311()) { + jj_scanpos = xsp; + if (jj_scan_token(82)) return true; + } + return false; + } + + private boolean jj_3R_271() { + if (jj_3R_75()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -7009,265 +7258,292 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_305() { - if (jj_scan_token(LBRACE)) return true; + private boolean jj_3R_102() { Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_321()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_164()) { + jj_scanpos = xsp; + if (jj_3R_165()) { + jj_scanpos = xsp; + if (jj_3R_166()) return true; + } } - if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_319() { + private boolean jj_3R_164() { + if (jj_3R_104()) return true; + return false; + } + + private boolean jj_3R_245() { + if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(ASSIGN)) return true; - if (jj_3R_72()) return true; + if (jj_3R_102()) return true; return false; } - private boolean jj_3R_167() { + private boolean jj_3R_326() { + if (jj_scan_token(ASSIGN)) return true; + if (jj_3R_75()) return true; + return false; + } + + private boolean jj_3R_175() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_264()) jj_scanpos = xsp; + if (jj_3R_271()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_scan_token(82)) jj_scanpos = xsp; + if (jj_scan_token(83)) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_300() { + private boolean jj_3R_307() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_299()) return true; + if (jj_3R_306()) return true; return false; } - private boolean jj_3R_292() { - if (jj_scan_token(AT)) return true; - if (jj_scan_token(INTERFACE)) return true; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_3R_305()) return true; - return false; - } - - private boolean jj_3R_71() { + private boolean jj_3R_74() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_111() { - if (jj_3R_88()) return true; + private boolean jj_3R_116() { + if (jj_3R_92()) return true; return false; } - private boolean jj_3R_110() { - if (jj_3R_167()) return true; + private boolean jj_3R_234() { + if (jj_3R_245()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_246()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_115() { + if (jj_3R_175()) return true; + return false; + } + + private boolean jj_3R_75() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_115()) { + jj_scanpos = xsp; + if (jj_3R_116()) return true; + } + return false; + } + + private boolean jj_3R_218() { + if (jj_3R_234()) return true; + return false; + } + + private boolean jj_3R_101() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_scan_token(ASSIGN)) return true; + return false; + } + + private boolean jj_3R_207() { + if (jj_scan_token(AT)) return true; + if (jj_3R_100()) return true; + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_102()) return true; + if (jj_scan_token(RPAREN)) return true; + return false; + } + + private boolean jj_3R_349() { + if (jj_3R_110()) return true; + return false; + } + + private boolean jj_3R_340() { + if (jj_scan_token(LBRACKET)) return true; + if (jj_scan_token(RBRACKET)) return true; + return false; + } + + private boolean jj_3R_325() { + if (jj_scan_token(IDENTIFIER)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_340()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_174() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_173()) return true; + return false; + } + + private boolean jj_3R_209() { + if (jj_3R_219()) return true; + return false; + } + + private boolean jj_3R_208() { + if (jj_scan_token(AT)) return true; + if (jj_3R_100()) return true; + return false; + } + + private boolean jj_3_51() { + if (jj_scan_token(AT)) return true; + if (jj_3R_100()) return true; + if (jj_scan_token(LPAREN)) return true; + return false; + } + + private boolean jj_3R_235() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_3R_187()) return true; + return false; + } + + private boolean jj_3R_206() { + if (jj_scan_token(AT)) return true; + if (jj_3R_100()) return true; + if (jj_scan_token(LPAREN)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_218()) jj_scanpos = xsp; + if (jj_scan_token(RPAREN)) return true; + return false; + } + + private boolean jj_3R_306() { + if (jj_3R_325()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_326()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3_50() { + if (jj_scan_token(AT)) return true; + if (jj_3R_100()) return true; + if (jj_scan_token(LPAREN)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_101()) { + jj_scanpos = xsp; + if (jj_scan_token(77)) return true; + } return false; } private boolean jj_3R_72() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_110()) { - jj_scanpos = xsp; - if (jj_3R_111()) return true; - } - return false; - } - - private boolean jj_3R_258() { - if (jj_3R_97()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_49()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_scan_token(82)) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_198() { - if (jj_scan_token(LBRACE)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_258()) jj_scanpos = xsp; - if (jj_scan_token(RBRACE)) return true; - return false; - } - - private boolean jj_3R_239() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_238()) return true; - return false; - } - - private boolean jj_3R_342() { - if (jj_3R_105()) return true; - return false; - } - - private boolean jj_3R_333() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_scan_token(RBRACKET)) return true; - return false; - } - - private boolean jj_3R_158() { - if (jj_3R_139()) return true; - return false; - } - - private boolean jj_3R_318() { - if (jj_scan_token(IDENTIFIER)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_333()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_166() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_165()) return true; - return false; - } - - private boolean jj_3R_202() { - if (jj_3R_212()) return true; - return false; - } - - private boolean jj_3R_157() { - if (jj_3R_198()) return true; - return false; - } - - private boolean jj_3R_97() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_156()) { - jj_scanpos = xsp; - if (jj_3R_157()) { - jj_scanpos = xsp; - if (jj_3R_158()) return true; - } - } - return false; - } - - private boolean jj_3R_156() { - if (jj_3R_99()) return true; - return false; - } - - private boolean jj_3R_228() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_3R_179()) return true; - return false; - } - - private boolean jj_3R_299() { - if (jj_3R_318()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_319()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_69() { - if (jj_3R_108()) return true; + if (jj_3R_113()) return true; return false; } private boolean jj_3_7() { - if (jj_3R_70()) return true; + if (jj_3R_73()) return true; if (jj_scan_token(IDENTIFIER)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_71()) { jj_scanpos = xsp; break; } + if (jj_3R_74()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_scan_token(82)) { + if (jj_scan_token(83)) { jj_scanpos = xsp; - if (jj_scan_token(85)) { + if (jj_scan_token(86)) { jj_scanpos = xsp; - if (jj_scan_token(81)) return true; + if (jj_scan_token(82)) return true; } } return false; } - private boolean jj_3R_238() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_scan_token(ASSIGN)) return true; - if (jj_3R_97()) return true; - return false; - } - private boolean jj_3_6() { Token xsp; xsp = jj_scanpos; - if (jj_3R_69()) jj_scanpos = xsp; + if (jj_3R_72()) jj_scanpos = xsp; if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(LPAREN)) return true; return false; } - private boolean jj_3R_290() { - if (jj_3R_70()) return true; - if (jj_3R_299()) return true; + private boolean jj_3R_169() { + if (jj_3R_208()) return true; + return false; + } + + private boolean jj_3R_297() { + if (jj_3R_73()) return true; + if (jj_3R_306()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_300()) { jj_scanpos = xsp; break; } + if (jj_3R_307()) { jj_scanpos = xsp; break; } } if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_65() { - if (jj_3R_99()) return true; + private boolean jj_3R_68() { + if (jj_3R_104()) return true; return false; } - private boolean jj_3R_341() { - if (jj_3R_76()) return true; + private boolean jj_3R_348() { + if (jj_3R_79()) return true; return false; } - private boolean jj_3R_101() { + private boolean jj_3R_168() { + if (jj_3R_207()) return true; + return false; + } + + private boolean jj_3R_106() { if (jj_scan_token(INTERFACE)) return true; return false; } - private boolean jj_3R_227() { - if (jj_3R_238()) return true; + private boolean jj_3R_288() { + if (jj_3R_299()) return true; + return false; + } + + private boolean jj_3R_129() { + return false; + } + + private boolean jj_3R_104() { Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_239()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_167()) { + jj_scanpos = xsp; + if (jj_3R_168()) { + jj_scanpos = xsp; + if (jj_3R_169()) return true; + } } return false; } - private boolean jj_3R_211() { - if (jj_3R_227()) return true; + private boolean jj_3R_167() { + if (jj_3R_206()) return true; return false; } - private boolean jj_3R_283() { - if (jj_3R_292()) return true; - return false; - } - - private boolean jj_3R_96() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_scan_token(ASSIGN)) return true; + private boolean jj_3R_287() { + if (jj_3R_298()) return true; return false; } @@ -7279,55 +7555,47 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_282() { - if (jj_3R_291()) return true; + private boolean jj_3R_286() { + if (jj_3R_297()) return true; return false; } - private boolean jj_3R_281() { - if (jj_3R_290()) return true; + private boolean jj_3R_360() { + if (jj_scan_token(COLON)) return true; + if (jj_3R_92()) return true; return false; } - private boolean jj_3R_280() { - if (jj_3R_289()) return true; + private boolean jj_3R_285() { + if (jj_3R_296()) return true; return false; } private boolean jj_3_5() { - if (jj_3R_68()) return true; - return false; - } - - private boolean jj_3R_200() { - if (jj_scan_token(AT)) return true; - if (jj_3R_95()) return true; - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_97()) return true; - if (jj_scan_token(RPAREN)) return true; + if (jj_3R_71()) return true; return false; } private boolean jj_3_4() { - if (jj_3R_67()) return true; + if (jj_3R_70()) return true; return false; } - private boolean jj_3R_274() { - if (jj_3R_94()) return true; + private boolean jj_3R_280() { + if (jj_3R_98()) return true; Token xsp; xsp = jj_scanpos; if (jj_3_4()) { jj_scanpos = xsp; if (jj_3_5()) { jj_scanpos = xsp; - if (jj_3R_280()) { + if (jj_3R_285()) { jj_scanpos = xsp; - if (jj_3R_281()) { + if (jj_3R_286()) { jj_scanpos = xsp; - if (jj_3R_282()) { + if (jj_3R_287()) { jj_scanpos = xsp; - if (jj_3R_283()) return true; + if (jj_3R_288()) return true; } } } @@ -7336,32 +7604,41 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_269() { + private boolean jj_3R_130() { + return false; + } + + private boolean jj_3R_275() { Token xsp; xsp = jj_scanpos; - if (jj_3R_273()) { + if (jj_3R_279()) { jj_scanpos = xsp; - if (jj_3R_274()) { + if (jj_3R_280()) { jj_scanpos = xsp; - if (jj_scan_token(81)) return true; + if (jj_scan_token(82)) return true; } } return false; } - private boolean jj_3R_273() { - if (jj_3R_279()) return true; + private boolean jj_3R_279() { + if (jj_3R_284()) return true; return false; } - private boolean jj_3R_201() { - if (jj_scan_token(AT)) return true; - if (jj_3R_95()) return true; + private boolean jj_3R_272() { + if (jj_3R_275()) return true; return false; } - private boolean jj_3R_265() { - if (jj_3R_269()) return true; + private boolean jj_3R_84() { + jj_lookingAhead = true; + jj_semLA = getToken(1).kind == GT && + ((Token.GTToken)getToken(1)).realKind == RSIGNEDSHIFT; + jj_lookingAhead = false; + if (!jj_semLA || jj_3R_129()) return true; + if (jj_scan_token(GT)) return true; + if (jj_scan_token(GT)) return true; return false; } @@ -7370,76 +7647,47 @@ jjtn000.setModifiers(modifiers); Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_65()) { jj_scanpos = xsp; break; } + if (jj_3R_68()) { jj_scanpos = xsp; break; } } - if (jj_3R_66()) return true; + if (jj_3R_69()) return true; return false; } - private boolean jj_3_48() { - if (jj_scan_token(AT)) return true; - if (jj_3R_95()) return true; - if (jj_scan_token(LPAREN)) return true; - return false; - } - - private boolean jj_3R_199() { - if (jj_scan_token(AT)) return true; - if (jj_3R_95()) return true; - if (jj_scan_token(LPAREN)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_211()) jj_scanpos = xsp; - if (jj_scan_token(RPAREN)) return true; - return false; - } - - private boolean jj_3_47() { - if (jj_scan_token(AT)) return true; - if (jj_3R_95()) return true; - if (jj_scan_token(LPAREN)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_96()) { - jj_scanpos = xsp; - if (jj_scan_token(76)) return true; - } - return false; - } - - private boolean jj_3R_105() { + private boolean jj_3R_110() { if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_265()) { jj_scanpos = xsp; break; } + if (jj_3R_272()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_161() { - if (jj_3R_201()) return true; + private boolean jj_3R_85() { + jj_lookingAhead = true; + jj_semLA = getToken(1).kind == GT && + ((Token.GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT; + jj_lookingAhead = false; + if (!jj_semLA || jj_3R_130()) return true; + if (jj_scan_token(GT)) return true; + if (jj_scan_token(GT)) return true; + if (jj_scan_token(GT)) return true; return false; } - private boolean jj_3R_212() { + private boolean jj_3R_219() { if (jj_scan_token(EXTENDS)) return true; - if (jj_3R_179()) return true; + if (jj_3R_187()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_228()) { jj_scanpos = xsp; break; } + if (jj_3R_235()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_160() { - if (jj_3R_200()) return true; - return false; - } - - private boolean jj_3R_162() { + private boolean jj_3R_170() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(28)) { @@ -7449,114 +7697,107 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_122() { - return false; - } - - private boolean jj_3R_99() { + private boolean jj_3R_105() { Token xsp; xsp = jj_scanpos; - if (jj_3R_159()) { - jj_scanpos = xsp; - if (jj_3R_160()) { - jj_scanpos = xsp; - if (jj_3R_161()) return true; - } - } - return false; - } - - private boolean jj_3R_159() { - if (jj_3R_199()) return true; - return false; - } - - private boolean jj_3R_100() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_162()) jj_scanpos = xsp; + if (jj_3R_170()) jj_scanpos = xsp; if (jj_scan_token(CLASS)) return true; return false; } - private boolean jj_3R_165() { + private boolean jj_3R_173() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_202()) jj_scanpos = xsp; + if (jj_3R_209()) jj_scanpos = xsp; return false; } - private boolean jj_3R_352() { - if (jj_scan_token(COLON)) return true; - if (jj_3R_88()) return true; + private boolean jj_3R_176() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_3R_92()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_360()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_108() { + private boolean jj_3R_113() { if (jj_scan_token(LT)) return true; - if (jj_3R_165()) return true; + if (jj_3R_173()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_166()) { jj_scanpos = xsp; break; } + if (jj_3R_174()) { jj_scanpos = xsp; break; } } if (jj_scan_token(GT)) return true; return false; } - private boolean jj_3R_123() { + private boolean jj_3R_387() { + if (jj_scan_token(FINALLY)) return true; + if (jj_3R_190()) return true; return false; } - private boolean jj_3R_329() { - if (jj_3R_269()) return true; + private boolean jj_3R_336() { + if (jj_3R_275()) return true; return false; } - private boolean jj_3R_80() { - jj_lookingAhead = true; - jj_semLA = getToken(1).kind == GT && - ((Token.GTToken)getToken(1)).realKind == RSIGNEDSHIFT; - jj_lookingAhead = false; - if (!jj_semLA || jj_3R_122()) return true; - if (jj_scan_token(GT)) return true; - if (jj_scan_token(GT)) return true; + private boolean jj_3R_204() { + if (jj_3R_104()) return true; return false; } - private boolean jj_3R_66() { + private boolean jj_3R_69() { if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_341()) jj_scanpos = xsp; + if (jj_3R_348()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_342()) jj_scanpos = xsp; + if (jj_3R_349()) jj_scanpos = xsp; return false; } - private boolean jj_3R_315() { + private boolean jj_3R_322() { if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_329()) { jj_scanpos = xsp; break; } + if (jj_3R_336()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_328() { + private boolean jj_3R_335() { + if (jj_3R_104()) return true; + return false; + } + + private boolean jj_3_49() { + if (jj_scan_token(SEMICOLON)) return true; if (jj_3R_99()) return true; return false; } - private boolean jj_3R_314() { + private boolean jj_3R_386() { + if (jj_scan_token(CATCH)) return true; + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_337()) return true; + if (jj_scan_token(RPAREN)) return true; + if (jj_3R_190()) return true; + return false; + } + + private boolean jj_3R_321() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_328()) { jj_scanpos = xsp; break; } + if (jj_3R_335()) { jj_scanpos = xsp; break; } } - if (jj_3R_66()) return true; + if (jj_3R_69()) return true; while (true) { xsp = jj_scanpos; if (jj_3_3()) { jj_scanpos = xsp; break; } @@ -7564,362 +7805,401 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_81() { - jj_lookingAhead = true; - jj_semLA = getToken(1).kind == GT && - ((Token.GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT; - jj_lookingAhead = false; - if (!jj_semLA || jj_3R_123()) return true; - if (jj_scan_token(GT)) return true; - if (jj_scan_token(GT)) return true; - if (jj_scan_token(GT)) return true; - return false; - } - - private boolean jj_3R_107() { + private boolean jj_3R_112() { if (jj_scan_token(LBRACE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_314()) jj_scanpos = xsp; + if (jj_3R_321()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_scan_token(82)) jj_scanpos = xsp; + if (jj_scan_token(83)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_315()) jj_scanpos = xsp; + if (jj_3R_322()) jj_scanpos = xsp; if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_106() { - if (jj_3R_164()) return true; + private boolean jj_3R_163() { + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(28)) { + jj_scanpos = xsp; + if (jj_3R_204()) return true; + } return false; } - private boolean jj_3R_168() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_3R_88()) return true; + private boolean jj_3R_99() { Token xsp; - xsp = jj_scanpos; - if (jj_3R_352()) jj_scanpos = xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_163()) { jj_scanpos = xsp; break; } + } + if (jj_3R_73()) return true; + if (jj_3R_325()) return true; + if (jj_scan_token(ASSIGN)) return true; + if (jj_3R_92()) return true; + return false; + } + + private boolean jj_3R_111() { + if (jj_3R_172()) return true; + return false; + } + + private boolean jj_3R_394() { + if (jj_3R_99()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_49()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3_48() { if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_377() { - if (jj_scan_token(FINALLY)) return true; - if (jj_3R_184()) return true; + private boolean jj_3R_385() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_394()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3_48()) jj_scanpos = xsp; + if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_68() { + private boolean jj_3R_71() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(IDENTIFIER)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_106()) jj_scanpos = xsp; - if (jj_3R_107()) return true; - return false; - } - - private boolean jj_3R_327() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_179()) return true; + if (jj_3R_111()) jj_scanpos = xsp; + if (jj_3R_112()) return true; return false; } private boolean jj_3R_376() { - if (jj_scan_token(CATCH)) return true; - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_330()) return true; - if (jj_scan_token(RPAREN)) return true; - if (jj_3R_184()) return true; + if (jj_3R_385()) return true; return false; } - private boolean jj_3R_164() { - if (jj_scan_token(IMPLEMENTS)) return true; - if (jj_3R_179()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_327()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_369() { - if (jj_3R_377()) return true; - return false; - } - - private boolean jj_3R_368() { - if (jj_3R_376()) return true; - return false; - } - - private boolean jj_3R_326() { + private boolean jj_3R_334() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_179()) return true; + if (jj_3R_187()) return true; return false; } - private boolean jj_3R_163() { - if (jj_scan_token(EXTENDS)) return true; - if (jj_3R_179()) return true; + private boolean jj_3R_378() { + if (jj_3R_387()) return true; + return false; + } + + private boolean jj_3R_172() { + if (jj_scan_token(IMPLEMENTS)) return true; + if (jj_3R_187()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_326()) { jj_scanpos = xsp; break; } + if (jj_3R_334()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_197() { + private boolean jj_3R_377() { + if (jj_3R_386()) return true; + return false; + } + + private boolean jj_3R_333() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_187()) return true; + return false; + } + + private boolean jj_3R_203() { if (jj_scan_token(TRY)) return true; - if (jj_3R_184()) return true; Token xsp; + xsp = jj_scanpos; + if (jj_3R_376()) jj_scanpos = xsp; + if (jj_3R_190()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_368()) { jj_scanpos = xsp; break; } + if (jj_3R_377()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_369()) jj_scanpos = xsp; + if (jj_3R_378()) jj_scanpos = xsp; return false; } - private boolean jj_3R_104() { - if (jj_3R_164()) return true; + private boolean jj_3R_171() { + if (jj_scan_token(EXTENDS)) return true; + if (jj_3R_187()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_333()) { jj_scanpos = xsp; break; } + } return false; } - private boolean jj_3R_103() { - if (jj_3R_163()) return true; - return false; - } - - private boolean jj_3R_102() { - if (jj_3R_108()) return true; - return false; - } - - private boolean jj_3R_196() { + private boolean jj_3R_202() { if (jj_scan_token(SYNCHRONIZED)) return true; if (jj_scan_token(LPAREN)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RPAREN)) return true; - if (jj_3R_184()) return true; + if (jj_3R_190()) return true; return false; } - private boolean jj_3R_367() { - if (jj_3R_88()) return true; + private boolean jj_3R_375() { + if (jj_3R_92()) return true; return false; } - private boolean jj_3R_366() { + private boolean jj_3R_109() { + if (jj_3R_172()) return true; + return false; + } + + private boolean jj_3R_108() { + if (jj_3R_171()) return true; + return false; + } + + private boolean jj_3R_107() { + if (jj_3R_113()) return true; + return false; + } + + private boolean jj_3R_374() { if (jj_scan_token(IDENTIFIER)) return true; return false; } + private boolean jj_3R_201() { + if (jj_scan_token(THROW)) return true; + if (jj_3R_92()) return true; + if (jj_scan_token(SEMICOLON)) return true; + return false; + } + + private boolean jj_3R_70() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_105()) { + jj_scanpos = xsp; + if (jj_3R_106()) return true; + } + if (jj_scan_token(IDENTIFIER)) return true; + xsp = jj_scanpos; + if (jj_3R_107()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_108()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_109()) jj_scanpos = xsp; + if (jj_3R_110()) return true; + return false; + } + + private boolean jj_3R_400() { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_192()) return true; + return false; + } + + private boolean jj_3R_200() { + if (jj_scan_token(RETURN)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_375()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; + return false; + } + + private boolean jj_3R_373() { + if (jj_scan_token(IDENTIFIER)) return true; + return false; + } + + private boolean jj_3R_199() { + if (jj_scan_token(CONTINUE)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_374()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; + return false; + } + + private boolean jj_3R_198() { + if (jj_scan_token(BREAK)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_373()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; + return false; + } + + private boolean jj_3R_393() { + if (jj_3R_399()) return true; + return false; + } + + private boolean jj_3_47() { + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(28)) jj_scanpos = xsp; + if (jj_3R_73()) return true; + if (jj_scan_token(IDENTIFIER)) return true; + return false; + } + + private boolean jj_3R_399() { + if (jj_3R_192()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_400()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_370() { + if (jj_scan_token(ELSE)) return true; + if (jj_3R_95()) return true; + return false; + } + private boolean jj_3R_67() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_100()) { - jj_scanpos = xsp; - if (jj_3R_101()) return true; - } - if (jj_scan_token(IDENTIFIER)) return true; - xsp = jj_scanpos; - if (jj_3R_102()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_103()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_104()) jj_scanpos = xsp; - if (jj_3R_105()) return true; + if (jj_3R_104()) return true; return false; } - private boolean jj_3R_195() { - if (jj_scan_token(THROW)) return true; - if (jj_3R_88()) return true; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - private boolean jj_3R_389() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_186()) return true; - return false; - } - - private boolean jj_3R_194() { - if (jj_scan_token(RETURN)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_367()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - private boolean jj_3R_365() { - if (jj_scan_token(IDENTIFIER)) return true; - return false; - } - - private boolean jj_3R_193() { - if (jj_scan_token(CONTINUE)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_366()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - private boolean jj_3R_192() { - if (jj_scan_token(BREAK)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_365()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - private boolean jj_3R_383() { - if (jj_3R_388()) return true; - return false; - } - - private boolean jj_3_46() { - Token xsp; - xsp = jj_scanpos; - if (jj_scan_token(28)) jj_scanpos = xsp; - if (jj_3R_70()) return true; - if (jj_scan_token(IDENTIFIER)) return true; - return false; - } - - private boolean jj_3R_388() { - if (jj_3R_186()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_389()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_64() { - if (jj_3R_99()) return true; - return false; - } - - private boolean jj_3R_63() { + private boolean jj_3R_66() { if (jj_scan_token(STRICTFP)) return true; return false; } - private boolean jj_3R_62() { + private boolean jj_3R_398() { + if (jj_3R_399()) return true; + return false; + } + + private boolean jj_3R_65() { if (jj_scan_token(VOLATILE)) return true; return false; } - private boolean jj_3R_362() { - if (jj_scan_token(ELSE)) return true; - if (jj_3R_91()) return true; - return false; - } - - private boolean jj_3R_61() { + private boolean jj_3R_64() { if (jj_scan_token(TRANSIENT)) return true; return false; } - private boolean jj_3R_60() { + private boolean jj_3R_63() { if (jj_scan_token(NATIVE)) return true; return false; } - private boolean jj_3R_387() { - if (jj_3R_388()) return true; + private boolean jj_3R_397() { + if (jj_3R_177()) return true; return false; } - private boolean jj_3R_59() { - if (jj_scan_token(SYNCHRONIZED)) return true; - return false; - } - - private boolean jj_3R_58() { - if (jj_scan_token(ABSTRACT)) return true; - return false; - } - - private boolean jj_3R_57() { - if (jj_scan_token(FINAL)) return true; - return false; - } - - private boolean jj_3R_386() { - if (jj_3R_169()) return true; - return false; - } - - private boolean jj_3R_382() { + private boolean jj_3R_392() { Token xsp; xsp = jj_scanpos; - if (jj_3R_386()) { + if (jj_3R_397()) { jj_scanpos = xsp; - if (jj_3R_387()) return true; + if (jj_3R_398()) return true; } return false; } - private boolean jj_3R_56() { - if (jj_scan_token(PRIVATE)) return true; + private boolean jj_3R_62() { + if (jj_scan_token(SYNCHRONIZED)) return true; return false; } - private boolean jj_3_45() { - if (jj_3R_94()) return true; - if (jj_3R_70()) return true; + private boolean jj_3_46() { + if (jj_3R_98()) return true; + if (jj_3R_73()) return true; if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_55() { + private boolean jj_3R_61() { + if (jj_scan_token(ABSTRACT)) return true; + return false; + } + + private boolean jj_3R_60() { + if (jj_scan_token(FINAL)) return true; + return false; + } + + private boolean jj_3R_59() { + if (jj_scan_token(PRIVATE)) return true; + return false; + } + + private boolean jj_3R_58() { if (jj_scan_token(PROTECTED)) return true; return false; } - private boolean jj_3R_54() { + private boolean jj_3R_57() { if (jj_scan_token(STATIC)) return true; return false; } - private boolean jj_3R_53() { + private boolean jj_3R_384() { + if (jj_3R_393()) return true; + return false; + } + + private boolean jj_3R_383() { + if (jj_3R_92()) return true; + return false; + } + + private boolean jj_3R_56() { if (jj_scan_token(PUBLIC)) return true; return false; } - private boolean jj_3R_375() { - if (jj_3R_383()) return true; + private boolean jj_3R_382() { + if (jj_3R_392()) return true; return false; } - private boolean jj_3R_374() { - if (jj_3R_88()) return true; + private boolean jj_3R_372() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_382()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; + xsp = jj_scanpos; + if (jj_3R_383()) jj_scanpos = xsp; + if (jj_scan_token(SEMICOLON)) return true; + xsp = jj_scanpos; + if (jj_3R_384()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_371() { + if (jj_3R_98()) return true; + if (jj_3R_73()) return true; + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_scan_token(COLON)) return true; + if (jj_3R_92()) return true; return false; } private boolean jj_3_2() { Token xsp; xsp = jj_scanpos; - if (jj_3R_53()) { - jj_scanpos = xsp; - if (jj_3R_54()) { - jj_scanpos = xsp; - if (jj_3R_55()) { - jj_scanpos = xsp; if (jj_3R_56()) { jj_scanpos = xsp; if (jj_3R_57()) { @@ -7936,7 +8216,13 @@ jjtn000.setModifiers(modifiers); jj_scanpos = xsp; if (jj_3R_63()) { jj_scanpos = xsp; - if (jj_3R_64()) return true; + if (jj_3R_64()) { + jj_scanpos = xsp; + if (jj_3R_65()) { + jj_scanpos = xsp; + if (jj_3R_66()) { + jj_scanpos = xsp; + if (jj_3R_67()) return true; } } } @@ -7951,12 +8237,7 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_373() { - if (jj_3R_382()) return true; - return false; - } - - private boolean jj_3R_94() { + private boolean jj_3R_98() { Token xsp; while (true) { xsp = jj_scanpos; @@ -7965,64 +8246,42 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_364() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_373()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - xsp = jj_scanpos; - if (jj_3R_374()) jj_scanpos = xsp; - if (jj_scan_token(SEMICOLON)) return true; - xsp = jj_scanpos; - if (jj_3R_375()) jj_scanpos = xsp; - return false; - } - - private boolean jj_3R_363() { - if (jj_3R_94()) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_scan_token(COLON)) return true; - if (jj_3R_88()) return true; - return false; - } - - private boolean jj_3R_191() { + private boolean jj_3R_197() { if (jj_scan_token(FOR)) return true; if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_363()) { + if (jj_3R_371()) { jj_scanpos = xsp; - if (jj_3R_364()) return true; + if (jj_3R_372()) return true; } if (jj_scan_token(RPAREN)) return true; - if (jj_3R_91()) return true; + if (jj_3R_95()) return true; return false; } - private boolean jj_3R_190() { + private boolean jj_3R_196() { if (jj_scan_token(DO)) return true; - if (jj_3R_91()) return true; + if (jj_3R_95()) return true; if (jj_scan_token(WHILE)) return true; if (jj_scan_token(LPAREN)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RPAREN)) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_52() { - if (jj_3R_99()) return true; + private boolean jj_3R_195() { + if (jj_scan_token(WHILE)) return true; + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_92()) return true; + if (jj_scan_token(RPAREN)) return true; + if (jj_3R_95()) return true; return false; } - private boolean jj_3R_189() { - if (jj_scan_token(WHILE)) return true; - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_88()) return true; - if (jj_scan_token(RPAREN)) return true; - if (jj_3R_91()) return true; + private boolean jj_3R_55() { + if (jj_3R_104()) return true; return false; } @@ -8030,105 +8289,105 @@ jjtn000.setModifiers(modifiers); Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_52()) { jj_scanpos = xsp; break; } + if (jj_3R_55()) { jj_scanpos = xsp; break; } } if (jj_scan_token(PACKAGE)) return true; return false; } - private boolean jj_3_44() { - if (jj_3R_74()) return true; + private boolean jj_3_45() { + if (jj_3R_77()) return true; return false; } - private boolean jj_3R_170() { - if (jj_3R_99()) return true; + private boolean jj_3R_178() { + if (jj_3R_104()) return true; return false; } - private boolean jj_3R_188() { + private boolean jj_3R_194() { if (jj_scan_token(IF)) return true; if (jj_scan_token(LPAREN)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RPAREN)) return true; - if (jj_3R_91()) return true; + if (jj_3R_95()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_362()) jj_scanpos = xsp; + if (jj_3R_370()) jj_scanpos = xsp; return false; } - private boolean jj_3R_381() { + private boolean jj_3R_391() { if (jj_scan_token(_DEFAULT)) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_380() { + private boolean jj_3R_390() { if (jj_scan_token(CASE)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_372() { + private boolean jj_3R_381() { Token xsp; xsp = jj_scanpos; - if (jj_3R_380()) { + if (jj_3R_390()) { jj_scanpos = xsp; - if (jj_3R_381()) return true; + if (jj_3R_391()) return true; } return false; } - private boolean jj_3R_361() { - if (jj_3R_372()) return true; + private boolean jj_3R_369() { + if (jj_3R_381()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_44()) { jj_scanpos = xsp; break; } + if (jj_3_45()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_214() { - if (jj_3R_99()) return true; + private boolean jj_3R_221() { + if (jj_3R_104()) return true; return false; } - private boolean jj_3_43() { - if (jj_3R_75()) return true; + private boolean jj_3_44() { + if (jj_3R_78()) return true; Token xsp; xsp = jj_scanpos; - if (jj_scan_token(97)) { + if (jj_scan_token(98)) { jj_scanpos = xsp; - if (jj_scan_token(98)) return true; + if (jj_scan_token(99)) return true; } return false; } - private boolean jj_3R_187() { + private boolean jj_3R_193() { if (jj_scan_token(SWITCH)) return true; if (jj_scan_token(LPAREN)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RPAREN)) return true; if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_361()) { jj_scanpos = xsp; break; } + if (jj_3R_369()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3R_371() { - if (jj_3R_232()) return true; - if (jj_3R_88()) return true; + private boolean jj_3R_380() { + if (jj_3R_239()) return true; + if (jj_3R_92()) return true; return false; } - private boolean jj_3R_93() { + private boolean jj_3R_97() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(28)) { @@ -8138,308 +8397,289 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_210() { - if (jj_3R_75()) return true; + private boolean jj_3R_217() { + if (jj_3R_78()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_371()) jj_scanpos = xsp; + if (jj_3R_380()) jj_scanpos = xsp; return false; } - private boolean jj_3R_209() { - if (jj_3R_226()) return true; + private boolean jj_3R_216() { + if (jj_3R_233()) return true; return false; } - private boolean jj_3R_208() { - if (jj_3R_225()) return true; + private boolean jj_3R_215() { + if (jj_3R_232()) return true; return false; } - private boolean jj_3R_186() { + private boolean jj_3R_192() { Token xsp; xsp = jj_scanpos; - if (jj_3R_207()) { + if (jj_3R_214()) { jj_scanpos = xsp; - if (jj_3R_208()) { + if (jj_3R_215()) { jj_scanpos = xsp; - if (jj_3R_209()) { + if (jj_3R_216()) { jj_scanpos = xsp; - if (jj_3R_210()) return true; + if (jj_3R_217()) return true; } } } return false; } - private boolean jj_3R_207() { - if (jj_3R_224()) return true; + private boolean jj_3R_214() { + if (jj_3R_231()) return true; return false; } - private boolean jj_3R_185() { + private boolean jj_3R_191() { if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_92() { - if (jj_3R_99()) return true; + private boolean jj_3R_96() { + if (jj_3R_104()) return true; return false; } - private boolean jj_3R_353() { + private boolean jj_3R_361() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_299()) return true; + if (jj_3R_306()) return true; return false; } - private boolean jj_3R_140() { - if (jj_3R_99()) return true; - return false; - } - - private boolean jj_3_42() { + private boolean jj_3_43() { Token xsp; xsp = jj_scanpos; - if (jj_3R_92()) jj_scanpos = xsp; + if (jj_3R_96()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_93()) jj_scanpos = xsp; + if (jj_3R_97()) jj_scanpos = xsp; if (jj_scan_token(CLASS)) return true; return false; } - private boolean jj_3R_203() { + private boolean jj_3R_147() { + if (jj_3R_104()) return true; + return false; + } + + private boolean jj_3R_210() { Token xsp; xsp = jj_scanpos; - if (jj_3R_213()) { + if (jj_3R_220()) { jj_scanpos = xsp; - if (jj_3R_214()) return true; + if (jj_3R_221()) return true; } return false; } - private boolean jj_3R_213() { + private boolean jj_3R_220() { if (jj_scan_token(FINAL)) return true; return false; } - private boolean jj_3R_169() { + private boolean jj_3R_177() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_203()) { jj_scanpos = xsp; break; } + if (jj_3R_210()) { jj_scanpos = xsp; break; } } - if (jj_3R_70()) return true; - if (jj_3R_299()) return true; + if (jj_3R_73()) return true; + if (jj_3R_306()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_353()) { jj_scanpos = xsp; break; } + if (jj_3R_361()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_90() { + private boolean jj_3R_94() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(28)) { jj_scanpos = xsp; - if (jj_3R_140()) return true; + if (jj_3R_147()) return true; } return false; } - private boolean jj_3R_116() { + private boolean jj_3R_121() { Token xsp; xsp = jj_scanpos; - if (jj_3R_170()) jj_scanpos = xsp; - if (jj_3R_67()) return true; - return false; - } - - private boolean jj_3_40() { - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_90()) { jj_scanpos = xsp; break; } - } + if (jj_3R_178()) jj_scanpos = xsp; if (jj_3R_70()) return true; - if (jj_scan_token(IDENTIFIER)) return true; return false; } private boolean jj_3_41() { - if (jj_3R_91()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_94()) { jj_scanpos = xsp; break; } + } + if (jj_3R_73()) return true; + if (jj_scan_token(IDENTIFIER)) return true; return false; } - private boolean jj_3R_115() { - if (jj_3R_169()) return true; + private boolean jj_3_42() { + if (jj_3R_95()) return true; + return false; + } + + private boolean jj_3R_120() { + if (jj_3R_177()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_114() { - if (jj_3R_168()) return true; + private boolean jj_3R_119() { + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_74() { + private boolean jj_3R_77() { Token xsp; xsp = jj_scanpos; jj_lookingAhead = true; jj_semLA = isNextTokenAnAssert(); jj_lookingAhead = false; - if (!jj_semLA || jj_3R_114()) { + if (!jj_semLA || jj_3R_119()) { jj_scanpos = xsp; - if (jj_3R_115()) { + if (jj_3R_120()) { jj_scanpos = xsp; - if (jj_3_41()) { + if (jj_3_42()) { jj_scanpos = xsp; - if (jj_3R_116()) return true; + if (jj_3R_121()) return true; } } } return false; } - private boolean jj_3_39() { - if (jj_3R_74()) return true; + private boolean jj_3_40() { + if (jj_3R_77()) return true; return false; } - private boolean jj_3R_184() { + private boolean jj_3R_190() { if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_39()) { jj_scanpos = xsp; break; } + if (jj_3_40()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; return false; } - private boolean jj_3_36() { + private boolean jj_3_37() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_89() { + private boolean jj_3R_93() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(COLON)) return true; - if (jj_3R_91()) return true; + if (jj_3R_95()) return true; return false; } - private boolean jj_3R_155() { + private boolean jj_3R_162() { + if (jj_3R_203()) return true; + return false; + } + + private boolean jj_3R_161() { + if (jj_3R_202()) return true; + return false; + } + + private boolean jj_3R_160() { + if (jj_3R_201()) return true; + return false; + } + + private boolean jj_3R_159() { + if (jj_3R_200()) return true; + return false; + } + + private boolean jj_3R_158() { + if (jj_3R_199()) return true; + return false; + } + + private boolean jj_3R_157() { + if (jj_3R_198()) return true; + return false; + } + + private boolean jj_3R_156() { if (jj_3R_197()) return true; return false; } - private boolean jj_3R_154() { + private boolean jj_3R_155() { if (jj_3R_196()) return true; return false; } - private boolean jj_3R_153() { + private boolean jj_3R_154() { if (jj_3R_195()) return true; return false; } - private boolean jj_3R_152() { + private boolean jj_3R_153() { if (jj_3R_194()) return true; return false; } - private boolean jj_3R_151() { + private boolean jj_3R_152() { if (jj_3R_193()) return true; return false; } - private boolean jj_3R_150() { + private boolean jj_3R_151() { if (jj_3R_192()) return true; - return false; - } - - private boolean jj_3R_149() { - if (jj_3R_191()) return true; - return false; - } - - private boolean jj_3R_148() { - if (jj_3R_190()) return true; - return false; - } - - private boolean jj_3R_147() { - if (jj_3R_189()) return true; - return false; - } - - private boolean jj_3R_146() { - if (jj_3R_188()) return true; - return false; - } - - private boolean jj_3R_145() { - if (jj_3R_187()) return true; - return false; - } - - private boolean jj_3R_144() { - if (jj_3R_186()) return true; if (jj_scan_token(SEMICOLON)) return true; return false; } - private boolean jj_3R_143() { - if (jj_3R_185()) return true; + private boolean jj_3R_150() { + if (jj_3R_191()) return true; return false; } - private boolean jj_3R_142() { - if (jj_3R_184()) return true; + private boolean jj_3R_149() { + if (jj_3R_190()) return true; return false; } - private boolean jj_3R_235() { - if (jj_3R_78()) return true; + private boolean jj_3R_242() { + if (jj_3R_81()) return true; return false; } - private boolean jj_3_38() { - if (jj_3R_89()) return true; + private boolean jj_3_39() { + if (jj_3R_93()) return true; return false; } - private boolean jj_3R_141() { - if (jj_3R_168()) return true; - return false; - } - - private boolean jj_3R_91() { + private boolean jj_3R_95() { Token xsp; xsp = jj_scanpos; jj_lookingAhead = true; jj_semLA = isNextTokenAnAssert(); jj_lookingAhead = false; - if (!jj_semLA || jj_3R_141()) { + if (!jj_semLA || jj_3R_148()) { jj_scanpos = xsp; - if (jj_3_38()) { - jj_scanpos = xsp; - if (jj_3R_142()) { - jj_scanpos = xsp; - if (jj_3R_143()) { - jj_scanpos = xsp; - if (jj_3R_144()) { - jj_scanpos = xsp; - if (jj_3R_145()) { - jj_scanpos = xsp; - if (jj_3R_146()) { - jj_scanpos = xsp; - if (jj_3R_147()) { - jj_scanpos = xsp; - if (jj_3R_148()) { + if (jj_3_39()) { jj_scanpos = xsp; if (jj_3R_149()) { jj_scanpos = xsp; @@ -8453,7 +8693,21 @@ jjtn000.setModifiers(modifiers); jj_scanpos = xsp; if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_155()) return true; + if (jj_3R_155()) { + jj_scanpos = xsp; + if (jj_3R_156()) { + jj_scanpos = xsp; + if (jj_3R_157()) { + jj_scanpos = xsp; + if (jj_3R_158()) { + jj_scanpos = xsp; + if (jj_3R_159()) { + jj_scanpos = xsp; + if (jj_3R_160()) { + jj_scanpos = xsp; + if (jj_3R_161()) { + jj_scanpos = xsp; + if (jj_3R_162()) return true; } } } @@ -8472,209 +8726,214 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_256() { - if (jj_3R_105()) return true; + private boolean jj_3R_148() { + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_261() { + private boolean jj_3R_263() { + if (jj_3R_110()) return true; + return false; + } + + private boolean jj_3R_267() { if (jj_scan_token(LBRACKET)) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3_35() { + private boolean jj_3_36() { if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_255() { + private boolean jj_3R_262() { Token xsp; - if (jj_3R_261()) return true; + if (jj_3R_267()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_261()) { jj_scanpos = xsp; break; } + if (jj_3R_267()) { jj_scanpos = xsp; break; } } - if (jj_3R_167()) return true; + if (jj_3R_175()) return true; return false; } - private boolean jj_3_37() { + private boolean jj_3_38() { Token xsp; - if (jj_3_35()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3_35()) { jj_scanpos = xsp; break; } - } + if (jj_3_36()) return true; while (true) { xsp = jj_scanpos; if (jj_3_36()) { jj_scanpos = xsp; break; } } - return false; - } - - private boolean jj_3R_234() { - Token xsp; - xsp = jj_scanpos; - if (jj_3_37()) { - jj_scanpos = xsp; - if (jj_3R_255()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3_37()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_237() { - if (jj_3R_76()) return true; + private boolean jj_3R_241() { Token xsp; xsp = jj_scanpos; - if (jj_3R_256()) jj_scanpos = xsp; + if (jj_3_38()) { + jj_scanpos = xsp; + if (jj_3R_262()) return true; + } return false; } - private boolean jj_3R_205() { + private boolean jj_3R_244() { + if (jj_3R_79()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_263()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_212() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; return false; } - private boolean jj_3R_236() { - if (jj_3R_234()) return true; + private boolean jj_3R_243() { + if (jj_3R_241()) return true; return false; } - private boolean jj_3R_138() { + private boolean jj_3R_145() { if (jj_scan_token(NEW)) return true; - if (jj_3R_179()) return true; + if (jj_3R_187()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_235()) jj_scanpos = xsp; + if (jj_3R_242()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_236()) { + if (jj_3R_243()) { jj_scanpos = xsp; - if (jj_3R_237()) return true; + if (jj_3R_244()) return true; } return false; } - private boolean jj_3R_86() { + private boolean jj_3R_90() { Token xsp; xsp = jj_scanpos; - if (jj_3_34()) { + if (jj_3_35()) { jj_scanpos = xsp; - if (jj_3R_138()) return true; + if (jj_3R_145()) return true; } return false; } - private boolean jj_3_34() { + private boolean jj_3_35() { if (jj_scan_token(NEW)) return true; - if (jj_3R_83()) return true; - if (jj_3R_234()) return true; + if (jj_3R_87()) return true; + if (jj_3R_241()) return true; return false; } - private boolean jj_3R_118() { - if (jj_3R_178()) return true; + private boolean jj_3R_123() { + if (jj_3R_186()) return true; return false; } - private boolean jj_3R_178() { - if (jj_3R_88()) return true; + private boolean jj_3R_186() { + if (jj_3R_92()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_205()) { jj_scanpos = xsp; break; } + if (jj_3R_212()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_76() { + private boolean jj_3R_79() { if (jj_scan_token(LPAREN)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_118()) jj_scanpos = xsp; + if (jj_3R_123()) jj_scanpos = xsp; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_182() { - if (jj_3R_204()) return true; + private boolean jj_3R_188() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_230() { + private boolean jj_3R_237() { if (jj_scan_token(NULL)) return true; return false; } - private boolean jj_3R_229() { + private boolean jj_3R_236() { Token xsp; xsp = jj_scanpos; - if (jj_3R_240()) { + if (jj_3R_247()) { jj_scanpos = xsp; if (jj_scan_token(27)) return true; } return false; } - private boolean jj_3R_240() { + private boolean jj_3R_247() { if (jj_scan_token(TRUE)) return true; return false; } - private boolean jj_3R_221() { - if (jj_3R_230()) return true; + private boolean jj_3R_228() { + if (jj_3R_237()) return true; return false; } - private boolean jj_3R_385() { + private boolean jj_3R_396() { if (jj_scan_token(DECR)) return true; return false; } - private boolean jj_3R_220() { - if (jj_3R_229()) return true; + private boolean jj_3R_227() { + if (jj_3R_236()) return true; return false; } - private boolean jj_3R_219() { + private boolean jj_3R_226() { if (jj_scan_token(STRING_LITERAL)) return true; return false; } - private boolean jj_3R_218() { + private boolean jj_3R_225() { if (jj_scan_token(CHARACTER_LITERAL)) return true; return false; } - private boolean jj_3R_217() { + private boolean jj_3R_224() { if (jj_scan_token(HEX_FLOATING_POINT_LITERAL)) return true; return false; } - private boolean jj_3R_216() { + private boolean jj_3R_223() { if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; return false; } - private boolean jj_3R_204() { + private boolean jj_3R_211() { Token xsp; xsp = jj_scanpos; - if (jj_3R_215()) { + if (jj_3R_222()) { jj_scanpos = xsp; - if (jj_3R_216()) { + if (jj_3R_223()) { jj_scanpos = xsp; - if (jj_3R_217()) { + if (jj_3R_224()) { jj_scanpos = xsp; - if (jj_3R_218()) { + if (jj_3R_225()) { jj_scanpos = xsp; - if (jj_3R_219()) { + if (jj_3R_226()) { jj_scanpos = xsp; - if (jj_3R_220()) { + if (jj_3R_227()) { jj_scanpos = xsp; - if (jj_3R_221()) return true; + if (jj_3R_228()) return true; } } } @@ -8684,68 +8943,68 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_215() { + private boolean jj_3R_222() { if (jj_scan_token(INTEGER_LITERAL)) return true; return false; } - private boolean jj_3R_136() { - if (jj_3R_76()) return true; + private boolean jj_3R_143() { + if (jj_3R_79()) return true; return false; } - private boolean jj_3R_135() { + private boolean jj_3R_142() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(IDENTIFIER)) return true; return false; } - private boolean jj_3_29() { - if (jj_3R_85()) return true; + private boolean jj_3_30() { + if (jj_3R_89()) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(CLASS)) return true; return false; } - private boolean jj_3R_134() { + private boolean jj_3R_141() { if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_88()) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3_33() { - if (jj_3R_87()) return true; + private boolean jj_3_34() { + if (jj_3R_91()) return true; return false; } - private boolean jj_3R_348() { + private boolean jj_3R_356() { if (jj_scan_token(REM)) return true; return false; } - private boolean jj_3_32() { + private boolean jj_3_33() { if (jj_scan_token(DOT)) return true; - if (jj_3R_86()) return true; + if (jj_3R_90()) return true; return false; } - private boolean jj_3R_84() { + private boolean jj_3R_88() { Token xsp; xsp = jj_scanpos; - if (jj_3_30()) { - jj_scanpos = xsp; if (jj_3_31()) { jj_scanpos = xsp; if (jj_3_32()) { jj_scanpos = xsp; if (jj_3_33()) { jj_scanpos = xsp; - if (jj_3R_134()) { + if (jj_3_34()) { jj_scanpos = xsp; - if (jj_3R_135()) { + if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_136()) return true; + if (jj_3R_142()) { + jj_scanpos = xsp; + if (jj_3R_143()) return true; } } } @@ -8755,75 +9014,75 @@ jjtn000.setModifiers(modifiers); return false; } + private boolean jj_3_32() { + if (jj_scan_token(DOT)) return true; + if (jj_scan_token(SUPER)) return true; + return false; + } + private boolean jj_3_31() { - if (jj_scan_token(DOT)) return true; - if (jj_scan_token(SUPER)) return true; - return false; - } - - private boolean jj_3_30() { if (jj_scan_token(DOT)) return true; if (jj_scan_token(THIS)) return true; return false; } - private boolean jj_3R_177() { - if (jj_3R_95()) return true; + private boolean jj_3R_185() { + if (jj_3R_100()) return true; return false; } - private boolean jj_3R_176() { - if (jj_3R_85()) return true; + private boolean jj_3R_184() { + if (jj_3R_89()) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(CLASS)) return true; return false; } - private boolean jj_3_28() { - if (jj_3R_84()) return true; - return false; - } - - private boolean jj_3R_175() { - if (jj_3R_86()) return true; - return false; - } - - private boolean jj_3R_174() { - if (jj_scan_token(LPAREN)) return true; + private boolean jj_3_29() { if (jj_3R_88()) return true; + return false; + } + + private boolean jj_3R_183() { + if (jj_3R_90()) return true; + return false; + } + + private boolean jj_3R_182() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_92()) return true; if (jj_scan_token(RPAREN)) return true; return false; } - private boolean jj_3R_173() { + private boolean jj_3R_181() { if (jj_scan_token(SUPER)) return true; if (jj_scan_token(DOT)) return true; if (jj_scan_token(IDENTIFIER)) return true; return false; } - private boolean jj_3R_172() { + private boolean jj_3R_180() { if (jj_scan_token(THIS)) return true; return false; } - private boolean jj_3R_117() { + private boolean jj_3R_122() { Token xsp; xsp = jj_scanpos; - if (jj_3R_171()) { + if (jj_3R_179()) { jj_scanpos = xsp; - if (jj_3R_172()) { + if (jj_3R_180()) { jj_scanpos = xsp; - if (jj_3R_173()) { + if (jj_3R_181()) { jj_scanpos = xsp; - if (jj_3R_174()) { + if (jj_3R_182()) { jj_scanpos = xsp; - if (jj_3R_175()) { + if (jj_3R_183()) { jj_scanpos = xsp; - if (jj_3R_176()) { + if (jj_3R_184()) { jj_scanpos = xsp; - if (jj_3R_177()) return true; + if (jj_3R_185()) return true; } } } @@ -8833,118 +9092,118 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_171() { - if (jj_3R_204()) return true; + private boolean jj_3R_179() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_384() { + private boolean jj_3R_395() { if (jj_scan_token(INCR)) return true; return false; } - private boolean jj_3R_379() { + private boolean jj_3R_389() { Token xsp; xsp = jj_scanpos; - if (jj_3R_384()) { + if (jj_3R_395()) { jj_scanpos = xsp; - if (jj_3R_385()) return true; + if (jj_3R_396()) return true; } return false; } - private boolean jj_3R_87() { + private boolean jj_3R_91() { if (jj_scan_token(DOT)) return true; - if (jj_3R_78()) return true; + if (jj_3R_81()) return true; if (jj_scan_token(IDENTIFIER)) return true; return false; } + private boolean jj_3_28() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_87()) return true; + return false; + } + + private boolean jj_3R_358() { + if (jj_scan_token(BANG)) return true; + return false; + } + + private boolean jj_3R_78() { + if (jj_3R_122()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_29()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_344() { + if (jj_scan_token(MINUS)) return true; + return false; + } + + private boolean jj_3R_355() { + if (jj_scan_token(SLASH)) return true; + return false; + } + + private boolean jj_3R_368() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_73()) return true; + if (jj_scan_token(RPAREN)) return true; + if (jj_3R_332()) return true; + return false; + } + + private boolean jj_3R_359() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_367()) { + jj_scanpos = xsp; + if (jj_3R_368()) return true; + } + return false; + } + + private boolean jj_3R_367() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_73()) return true; + if (jj_scan_token(RPAREN)) return true; + if (jj_3R_301()) return true; + return false; + } + private boolean jj_3_27() { if (jj_scan_token(LPAREN)) return true; - if (jj_3R_83()) return true; - return false; - } - - private boolean jj_3R_350() { - if (jj_scan_token(BANG)) return true; - return false; - } - - private boolean jj_3R_75() { - if (jj_3R_117()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_28()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_337() { - if (jj_scan_token(MINUS)) return true; - return false; - } - - private boolean jj_3R_347() { - if (jj_scan_token(SLASH)) return true; - return false; - } - - private boolean jj_3R_360() { - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(RPAREN)) return true; - if (jj_3R_325()) return true; - return false; - } - - private boolean jj_3R_351() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_359()) { - jj_scanpos = xsp; - if (jj_3R_360()) return true; - } - return false; - } - - private boolean jj_3R_359() { - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(RPAREN)) return true; - if (jj_3R_294()) return true; - return false; - } - - private boolean jj_3_26() { - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_70()) return true; + if (jj_3R_73()) return true; if (jj_scan_token(LBRACKET)) return true; return false; } - private boolean jj_3R_226() { - if (jj_3R_75()) return true; + private boolean jj_3R_233() { + if (jj_3R_78()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_379()) jj_scanpos = xsp; + if (jj_3R_389()) jj_scanpos = xsp; return false; } - private boolean jj_3R_125() { + private boolean jj_3R_132() { if (jj_scan_token(LPAREN)) return true; - if (jj_3R_70()) return true; + if (jj_3R_73()) return true; if (jj_scan_token(RPAREN)) return true; Token xsp; xsp = jj_scanpos; + if (jj_scan_token(89)) { + jj_scanpos = xsp; if (jj_scan_token(88)) { jj_scanpos = xsp; - if (jj_scan_token(87)) { + if (jj_scan_token(76)) { jj_scanpos = xsp; - if (jj_scan_token(75)) { - jj_scanpos = xsp; - if (jj_scan_token(72)) { + if (jj_scan_token(73)) { jj_scanpos = xsp; if (jj_scan_token(53)) { jj_scanpos = xsp; @@ -8952,7 +9211,7 @@ jjtn000.setModifiers(modifiers); jj_scanpos = xsp; if (jj_scan_token(41)) { jj_scanpos = xsp; - if (jj_3R_182()) return true; + if (jj_3R_188()) return true; } } } @@ -8963,343 +9222,359 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3_24() { - if (jj_3R_82()) return true; - return false; - } - - private boolean jj_3R_324() { - if (jj_scan_token(MINUS)) return true; - return false; - } - - private boolean jj_3R_124() { - if (jj_scan_token(LPAREN)) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(LBRACKET)) return true; - if (jj_scan_token(RBRACKET)) return true; - return false; - } - - private boolean jj_3R_82() { - Token xsp; - xsp = jj_scanpos; - if (jj_3_25()) { - jj_scanpos = xsp; - if (jj_3R_124()) { - jj_scanpos = xsp; - if (jj_3R_125()) return true; - } - } - return false; - } - private boolean jj_3_25() { + if (jj_3R_86()) return true; + return false; + } + + private boolean jj_3R_331() { + if (jj_scan_token(MINUS)) return true; + return false; + } + + private boolean jj_3R_131() { if (jj_scan_token(LPAREN)) return true; - if (jj_3R_83()) return true; + if (jj_3R_73()) return true; + if (jj_scan_token(LBRACKET)) return true; + if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_340() { - if (jj_3R_226()) return true; - return false; - } - - private boolean jj_3R_349() { - if (jj_scan_token(TILDE)) return true; - return false; - } - - private boolean jj_3R_339() { - if (jj_3R_351()) return true; - return false; - } - - private boolean jj_3R_338() { + private boolean jj_3R_86() { Token xsp; xsp = jj_scanpos; - if (jj_3R_349()) { + if (jj_3_26()) { jj_scanpos = xsp; - if (jj_3R_350()) return true; - } - if (jj_3R_294()) return true; - return false; - } - - private boolean jj_3R_325() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_338()) { + if (jj_3R_131()) { jj_scanpos = xsp; - if (jj_3R_339()) { - jj_scanpos = xsp; - if (jj_3R_340()) return true; + if (jj_3R_132()) return true; } } return false; } - private boolean jj_3R_336() { - if (jj_scan_token(PLUS)) return true; + private boolean jj_3_26() { + if (jj_scan_token(LPAREN)) return true; + if (jj_3R_87()) return true; return false; } - private boolean jj_3R_322() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_336()) { - jj_scanpos = xsp; - if (jj_3R_337()) return true; - } - if (jj_3R_287()) return true; - return false; - } - - private boolean jj_3R_346() { - if (jj_scan_token(STAR)) return true; - return false; - } - - private boolean jj_3R_225() { - if (jj_scan_token(DECR)) return true; - if (jj_3R_75()) return true; - return false; - } - - private boolean jj_3R_335() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_346()) { - jj_scanpos = xsp; - if (jj_3R_347()) { - jj_scanpos = xsp; - if (jj_3R_348()) return true; - } - } - if (jj_3R_294()) return true; - return false; - } - - private boolean jj_3R_286() { - if (jj_scan_token(NE)) return true; - return false; - } - - private boolean jj_3R_224() { - if (jj_scan_token(INCR)) return true; - if (jj_3R_75()) return true; - return false; - } - - private boolean jj_3R_313() { - if (jj_3R_325()) return true; - return false; - } - - private boolean jj_3R_312() { - if (jj_3R_225()) return true; - return false; - } - - private boolean jj_3R_311() { - if (jj_3R_224()) return true; - return false; - } - - private boolean jj_3R_323() { - if (jj_scan_token(PLUS)) return true; - return false; - } - - private boolean jj_3R_310() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_323()) { - jj_scanpos = xsp; - if (jj_3R_324()) return true; - } - if (jj_3R_294()) return true; - return false; - } - - private boolean jj_3R_294() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_310()) { - jj_scanpos = xsp; - if (jj_3R_311()) { - jj_scanpos = xsp; - if (jj_3R_312()) { - jj_scanpos = xsp; - if (jj_3R_313()) return true; - } - } - } - return false; - } - - private boolean jj_3R_287() { - if (jj_3R_294()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_335()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_278() { - if (jj_3R_287()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_322()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3_23() { - if (jj_3R_81()) return true; - return false; - } - - private boolean jj_3_22() { - if (jj_3R_80()) return true; - return false; - } - - private boolean jj_3R_284() { - if (jj_scan_token(INSTANCEOF)) return true; - if (jj_3R_70()) return true; - return false; - } - - private boolean jj_3R_79() { - if (jj_scan_token(LSHIFT)) return true; - return false; - } - - private boolean jj_3_21() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_79()) { - jj_scanpos = xsp; - if (jj_3_22()) { - jj_scanpos = xsp; - if (jj_3_23()) return true; - } - } - if (jj_3R_278()) return true; - return false; - } - - private boolean jj_3R_285() { - if (jj_scan_token(EQ)) return true; - return false; - } - - private boolean jj_3R_277() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_285()) { - jj_scanpos = xsp; - if (jj_3R_286()) return true; - } - if (jj_3R_263()) return true; - return false; - } - - private boolean jj_3R_272() { - if (jj_3R_278()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_21()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_309() { - if (jj_scan_token(GE)) return true; - return false; - } - - private boolean jj_3R_308() { - if (jj_scan_token(LE)) return true; - return false; - } - - private boolean jj_3R_307() { - if (jj_scan_token(GT)) return true; - return false; - } - - private boolean jj_3R_306() { - if (jj_scan_token(LT)) return true; - return false; - } - - private boolean jj_3R_271() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_3R_260()) return true; - return false; - } - - private boolean jj_3R_293() { - Token xsp; - xsp = jj_scanpos; - 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()) return true; - } - } - } - if (jj_3R_272()) return true; - return false; - } - - private boolean jj_3R_268() { - if (jj_3R_272()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_293()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_262() { - if (jj_scan_token(BIT_OR)) return true; + private boolean jj_3R_347() { if (jj_3R_233()) return true; return false; } - private boolean jj_3R_267() { - if (jj_scan_token(XOR)) return true; - if (jj_3R_254()) return true; + private boolean jj_3R_357() { + if (jj_scan_token(TILDE)) return true; return false; } - private boolean jj_3R_263() { - if (jj_3R_268()) return true; + private boolean jj_3R_346() { + if (jj_3R_359()) return true; + return false; + } + + private boolean jj_3R_345() { Token xsp; xsp = jj_scanpos; - if (jj_3R_284()) jj_scanpos = xsp; + if (jj_3R_357()) { + jj_scanpos = xsp; + if (jj_3R_358()) return true; + } + if (jj_3R_301()) return true; return false; } - private boolean jj_3R_259() { + private boolean jj_3R_332() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_345()) { + jj_scanpos = xsp; + if (jj_3R_346()) { + jj_scanpos = xsp; + if (jj_3R_347()) return true; + } + } + return false; + } + + private boolean jj_3R_343() { + if (jj_scan_token(PLUS)) return true; + return false; + } + + private boolean jj_3R_329() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_343()) { + jj_scanpos = xsp; + if (jj_3R_344()) return true; + } + if (jj_3R_294()) return true; + return false; + } + + private boolean jj_3R_354() { + if (jj_scan_token(STAR)) return true; + return false; + } + + private boolean jj_3R_232() { + if (jj_scan_token(DECR)) return true; + if (jj_3R_78()) return true; + return false; + } + + private boolean jj_3R_342() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_354()) { + jj_scanpos = xsp; + if (jj_3R_355()) { + jj_scanpos = xsp; + if (jj_3R_356()) return true; + } + } + if (jj_3R_301()) return true; + return false; + } + + private boolean jj_3R_293() { + if (jj_scan_token(NE)) return true; + return false; + } + + private boolean jj_3R_231() { + if (jj_scan_token(INCR)) return true; + if (jj_3R_78()) return true; + return false; + } + + private boolean jj_3R_320() { + if (jj_3R_332()) return true; + return false; + } + + private boolean jj_3R_319() { + if (jj_3R_232()) return true; + return false; + } + + private boolean jj_3R_318() { + if (jj_3R_231()) return true; + return false; + } + + private boolean jj_3R_330() { + if (jj_scan_token(PLUS)) return true; + return false; + } + + private boolean jj_3R_317() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_330()) { + jj_scanpos = xsp; + if (jj_3R_331()) return true; + } + if (jj_3R_301()) return true; + return false; + } + + private boolean jj_3R_301() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_317()) { + jj_scanpos = xsp; + if (jj_3R_318()) { + jj_scanpos = xsp; + if (jj_3R_319()) { + jj_scanpos = xsp; + if (jj_3R_320()) return true; + } + } + } + return false; + } + + private boolean jj_3R_294() { + if (jj_3R_301()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_342()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_283() { + if (jj_3R_294()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_329()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3_24() { + if (jj_3R_85()) return true; + return false; + } + + private boolean jj_3_23() { + if (jj_3R_84()) return true; + return false; + } + + private boolean jj_3R_291() { + if (jj_scan_token(INSTANCEOF)) return true; + if (jj_3R_73()) return true; + return false; + } + + private boolean jj_3R_83() { + if (jj_scan_token(LSHIFT)) return true; + return false; + } + + private boolean jj_3R_292() { + if (jj_scan_token(EQ)) return true; + return false; + } + + private boolean jj_3_22() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_83()) { + jj_scanpos = xsp; + if (jj_3_23()) { + jj_scanpos = xsp; + if (jj_3_24()) return true; + } + } + if (jj_3R_283()) return true; + return false; + } + + private boolean jj_3R_282() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_292()) { + jj_scanpos = xsp; + if (jj_3R_293()) return true; + } + if (jj_3R_270()) return true; + return false; + } + + private boolean jj_3R_278() { + if (jj_3R_283()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_22()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_316() { + if (jj_scan_token(GE)) return true; + return false; + } + + private boolean jj_3R_315() { + if (jj_scan_token(LE)) return true; + return false; + } + + private boolean jj_3R_314() { + if (jj_scan_token(GT)) return true; + return false; + } + + private boolean jj_3R_313() { + if (jj_scan_token(LT)) return true; + return false; + } + + private boolean jj_3R_277() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_3R_266()) return true; + return false; + } + + private boolean jj_3R_300() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_313()) { + jj_scanpos = xsp; + if (jj_3R_314()) { + jj_scanpos = xsp; + if (jj_3R_315()) { + jj_scanpos = xsp; + if (jj_3R_316()) return true; + } + } + } + if (jj_3R_278()) return true; + return false; + } + + private boolean jj_3R_274() { + if (jj_3R_278()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_300()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_269() { + if (jj_scan_token(BIT_OR)) return true; + if (jj_3R_240()) return true; + return false; + } + + private boolean jj_3R_273() { + if (jj_scan_token(XOR)) return true; + if (jj_3R_261()) return true; + return false; + } + + private boolean jj_3R_270() { + if (jj_3R_274()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_291()) jj_scanpos = xsp; + return false; + } + + private boolean jj_3R_265() { if (jj_scan_token(SC_AND)) return true; - if (jj_3R_223()) return true; + if (jj_3R_230()) return true; return false; } - private boolean jj_3R_260() { - if (jj_3R_263()) return true; + private boolean jj_3R_266() { + if (jj_3R_270()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_282()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_248() { + if (jj_scan_token(SC_OR)) return true; + if (jj_3R_213()) return true; + return false; + } + + private boolean jj_3R_261() { + if (jj_3R_266()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -9308,36 +9583,50 @@ jjtn000.setModifiers(modifiers); return false; } - private boolean jj_3R_241() { - if (jj_scan_token(SC_OR)) return true; - if (jj_3R_206()) return true; + private boolean jj_3R_238() { + if (jj_scan_token(HOOK)) return true; + if (jj_3R_92()) return true; + if (jj_scan_token(COLON)) return true; + if (jj_3R_146()) return true; return false; } - private boolean jj_3R_254() { - if (jj_3R_260()) return true; + private boolean jj_3R_240() { + if (jj_3R_261()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_271()) { jj_scanpos = xsp; break; } + if (jj_3R_273()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_231() { - if (jj_scan_token(HOOK)) return true; - if (jj_3R_88()) return true; - if (jj_scan_token(COLON)) return true; - if (jj_3R_139()) return true; - return false; - } - - private boolean jj_3R_233() { - if (jj_3R_254()) return true; + private boolean jj_3R_230() { + if (jj_3R_240()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_267()) { jj_scanpos = xsp; break; } + if (jj_3R_269()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_213() { + if (jj_3R_230()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_265()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_189() { + if (jj_3R_213()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_248()) { jj_scanpos = xsp; break; } } return false; } @@ -9354,7 +9643,7 @@ jjtn000.setModifiers(modifiers); private boolean jj_lookingAhead = false; private boolean jj_semLA; private int jj_gen; - final private int[] jj_la1 = new int[137]; + final private int[] jj_la1 = new int[142]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -9366,18 +9655,18 @@ jjtn000.setModifiers(modifiers); jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x10081000,0x0,0x0,0x0,0x0,0x0,0x10001000,0x10081000,0x10081000,0x10001000,0x10001000,0x10081000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x510cb000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x510cb000,0x4104a000,0x510cb000,0x0,0x0,0x0,0x4904a000,0x4904a000,0x0,0x0,0x0,0x0,0x0,0x0,0x5104a000,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x4104a000,0x4104a000,0x0,0x4000000,0x4104a000,0x4000000,0x4104a000,0x4104a000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x0,0x4904a000,0x8000000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x8000000,0x8000000,0x4904a000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc9a4e000,0x0,0x10000000,0x10000000,0x0,0x0,0x0,0x4904a000,0x410000,0x410000,0x2000000,0x5904a000,0x4904a000,0x4904a000,0x5904a000,0x4904a000,0x0,0x0,0x0,0x4904a000,0x20000,0x20000000,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x4904a000,0x510cb000,0x10081000,0x4104a000,0x510cb000,0x400000,}; + jj_la1_0 = new int[] {0x0,0x10081000,0x0,0x0,0x0,0x0,0x0,0x10001000,0x10081000,0x10081000,0x10001000,0x10001000,0x10081000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x510cb000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x510cb000,0x4104a000,0x510cb000,0x0,0x0,0x0,0x4904a000,0x4904a000,0x0,0x0,0x0,0x0,0x0,0x0,0x5104a000,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x4104a000,0x4104a000,0x0,0x0,0x4000000,0x4104a000,0x4000000,0x4104a000,0x4104a000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x0,0x4904a000,0x8000000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x8000000,0x8000000,0x4904a000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc9a4e000,0x0,0x10000000,0x10000000,0x0,0x0,0x0,0x4904a000,0x410000,0x410000,0x2000000,0x5904a000,0x4904a000,0x4904a000,0x5904a000,0x4904a000,0x0,0x0,0x0,0x4904a000,0x0,0x20000,0x20000000,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x4904a000,0x0,0x4904a000,0x510cb000,0x10081000,0x4104a000,0x510cb000,0x400000,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x8,0x51127140,0x0,0x0,0x0,0x20000,0x0,0x51127100,0x40,0x51127140,0x0,0x0,0x40,0x0,0x0,0x4,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x591371e0,0x0,0x0,0x0,0x0,0x0,0x0,0x591371e0,0x80100a0,0x591371e0,0x0,0x0,0x0,0x8a2506a0,0x8a2506a0,0x0,0x0,0x800000,0x0,0x0,0x0,0x100a0,0x0,0x0,0x0,0x0,0x800000,0x240000,0x8a2506a0,0x20000,0x100a0,0x100a0,0x0,0x40000,0x100a0,0x40000,0x100a0,0x80100a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x8a2506a0,0x82240600,0x0,0x0,0x0,0x0,0x82240600,0x0,0x0,0x82000400,0x2000000,0x8a2506a0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0xae7d86a2,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x8a2506a0,0x511371e0,0x40,0x100a0,0x511371e0,0x0,}; + jj_la1_1 = new int[] {0x8,0x51127140,0x0,0x0,0x0,0x20000,0x0,0x51127100,0x40,0x51127140,0x0,0x0,0x40,0x0,0x0,0x4,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x591371e0,0x0,0x0,0x0,0x0,0x0,0x0,0x591371e0,0x80100a0,0x591371e0,0x0,0x0,0x0,0x8a2506a0,0x8a2506a0,0x0,0x0,0x800000,0x0,0x0,0x0,0x100a0,0x0,0x0,0x0,0x0,0x0,0x800000,0x240000,0x8a2506a0,0x20000,0x100a0,0x100a0,0x0,0x0,0x40000,0x100a0,0x40000,0x100a0,0x80100a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x8a2506a0,0x82240600,0x0,0x0,0x0,0x0,0x82240600,0x0,0x0,0x82000400,0x2000000,0x8a2506a0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0xae7d86a2,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x8a2506a0,0x0,0x0,0x0,0x8a2506a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8a2506a0,0x0,0x8a2506a0,0x511371e0,0x40,0x100a0,0x511371e0,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x120100,0x0,0x0,0x100000,0x0,0x80000,0x100000,0x100100,0x120100,0x0,0x0,0x0,0x400000,0x0,0x0,0x40000,0x40000,0x0,0x100000,0x100000,0x100100,0x40000,0x522100,0x20000,0x800,0x2000,0x40000,0x0,0x0,0x522100,0x500100,0x520100,0x40000,0x200000,0x8000,0x18029d8,0x18029d8,0x40000,0x400000,0x0,0x22000,0x8000,0x40000,0x100100,0x100000,0x100000,0x0,0x400000,0x0,0x0,0x9d8,0x0,0x0,0x100,0x40000,0x0,0x2000100,0x0,0x0,0x100,0x40000,0x200000,0x200000,0x2000000,0x80000000,0x0,0x0,0x0,0x0,0x48000000,0x48000000,0x0,0x30400000,0x30400000,0x0,0x0,0x0,0x0,0x0,0x0,0x18009d8,0x1800000,0x1800000,0x9d8,0x18009d8,0x800,0x0,0x0,0x800,0x8d8,0x100,0x88800,0xd8,0x0,0x18009d8,0x40000,0x400000,0x2000,0x8800,0x0,0x8000,0x8000,0x229d8,0x100000,0x100000,0x100000,0x40000,0x200000,0x0,0x9d8,0x0,0x0,0x0,0x1009d8,0x18009d8,0x9d8,0x1209d8,0x9d8,0x40000,0x100,0x100,0x18009d8,0x0,0x0,0x4000000,0x100000,0x100,0x40000,0x19029d8,0x40000,0x19029d8,0x120100,0x0,0x100100,0x120100,0x0,}; + jj_la1_2 = new int[] {0x0,0x240200,0x0,0x0,0x200000,0x0,0x100000,0x200000,0x200200,0x240200,0x0,0x0,0x0,0x800000,0x0,0x0,0x80000,0x80000,0x0,0x200000,0x200000,0x200200,0x80000,0xa44200,0x40000,0x1000,0x4000,0x80000,0x0,0x0,0xa44200,0xa00200,0xa40200,0x80000,0x400000,0x10000,0x30053b0,0x30053b0,0x80000,0x800000,0x0,0x44000,0x10000,0x80000,0x200200,0x200000,0x200000,0x0,0x0,0x800000,0x0,0x0,0x13b0,0x0,0x0,0x200,0x80000,0x800000,0x0,0x4000200,0x0,0x0,0x200,0x80000,0x400000,0x400000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x90000000,0x90000000,0x0,0x60800000,0x60800000,0x0,0x0,0x0,0x0,0x0,0x0,0x30013b0,0x3000000,0x3000000,0x13b0,0x30013b0,0x1000,0x0,0x0,0x1000,0x11b0,0x200,0x111000,0x1b0,0x0,0x30013b0,0x80000,0x800000,0x4000,0x11000,0x0,0x10000,0x10000,0x453b0,0x200000,0x200000,0x200000,0x80000,0x400000,0x0,0x13b0,0x0,0x0,0x0,0x2013b0,0x30013b0,0x13b0,0x2413b0,0x13b0,0x80000,0x200,0x200,0x30013b0,0x1000,0x0,0x0,0x200000,0x200000,0x8000000,0x200000,0x200,0x80000,0x32053b0,0x80000,0x32053b0,0x240200,0x0,0x200200,0x240200,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x0,0x0,0x8000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ff000,0x7ff000,0x0,0x0,0x1,0x100,0x200,0x80,0x0,0x0,0x0,0x4000000,0x4000000,0x800,0x18,0x18,0x460,0x460,0x18,0x1e,0x0,0x0,0x0,0x0,0x0,0x6,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x0,0x7ff000,0x6,0x0,0x0,0x0,0x0,0x6,0x1e,0x6,0x6,0x6,0x0,0x0,0x0,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x0,0x1e,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x0,0x0,0x10000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x3c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffe000,0xffe000,0x0,0x1,0x2,0x200,0x400,0x100,0x0,0x0,0x0,0x8000000,0x8000000,0x1000,0x30,0x30,0x8c0,0x8c0,0x30,0x3c,0x0,0x0,0x0,0x0,0x0,0xc,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0xffe000,0xc,0x0,0x0,0x0,0x0,0xc,0x3c,0xc,0xc,0xc,0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[51]; + final private JJCalls[] jj_2_rtns = new JJCalls[54]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -9387,7 +9676,7 @@ jjtn000.setModifiers(modifiers); token = new Token(); token.next = jj_nt = token_source.getNextToken(); jj_gen = 0; - for (int i = 0; i < 137; i++) jj_la1[i] = -1; + for (int i = 0; i < 142; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9399,7 +9688,7 @@ jjtn000.setModifiers(modifiers); jj_lookingAhead = false; jjtree.reset(); jj_gen = 0; - for (int i = 0; i < 137; i++) jj_la1[i] = -1; + for (int i = 0; i < 142; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9409,7 +9698,7 @@ jjtn000.setModifiers(modifiers); token = new Token(); token.next = jj_nt = token_source.getNextToken(); jj_gen = 0; - for (int i = 0; i < 137; i++) jj_la1[i] = -1; + for (int i = 0; i < 142; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9420,7 +9709,7 @@ jjtn000.setModifiers(modifiers); token.next = jj_nt = token_source.getNextToken(); jjtree.reset(); jj_gen = 0; - for (int i = 0; i < 137; i++) jj_la1[i] = -1; + for (int i = 0; i < 142; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9524,12 +9813,12 @@ jjtn000.setModifiers(modifiers); /** Generate ParseException. */ public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[125]; + boolean[] la1tokens = new boolean[126]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 137; i++) { + for (int i = 0; i < 142; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<", "", "", + "", "", "", "", diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java index ccb0635f00..ba146a23bb 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java +++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java @@ -27,123 +27,123 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) switch (pos) { case 0: - if ((active1 & 0x80000000080000L) != 0L) - return 4; + if ((active0 & 0x100L) != 0L || (active1 & 0x1008000000000L) != 0L) + return 31; + if ((active1 & 0x100000000100000L) != 0L) + return 1; if ((active0 & 0x7ffffffffffff000L) != 0L) { - jjmatchedKind = 72; - return 28; + jjmatchedKind = 73; + return 29; } - if ((active0 & 0x100L) != 0L || (active1 & 0x804000000000L) != 0L) - return 45; return -1; case 1: - if ((active0 & 0x201800000L) != 0L) - return 28; if ((active0 & 0x7ffffffdfe7ff000L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 1; } - return 28; + return 29; } if ((active0 & 0x100L) != 0L) - return 50; + return 36; + if ((active0 & 0x201800000L) != 0L) + return 29; return -1; case 2: - if ((active0 & 0x400026080000000L) != 0L) - return 28; if ((active0 & 0x7bfffd9d7f7ff000L) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 2; } - return 28; + return 29; } + if ((active0 & 0x400026080000000L) != 0L) + return 29; return -1; case 3: if ((active0 & 0x71dff95c7d7a7000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 3; - return 28; + return 29; } if ((active0 & 0xa20048102058000L) != 0L) - return 28; + return 29; return -1; case 4: if ((active0 & 0x20c50000781a4000L) != 0L) - return 28; + return 29; if ((active0 & 0x511af95c05603000L) != 0L) { if (jjmatchedPos != 4) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 4; } - return 28; + return 29; } return -1; case 5: - if ((active0 & 0x8ac10801000000L) != 0L) - return 28; if ((active0 & 0x5110385424603000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 5; - return 28; + return 29; } + if ((active0 & 0x8ac10801000000L) != 0L) + return 29; return -1; case 6: if ((active0 & 0x5110205400201000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 6; - return 28; + return 29; } if ((active0 & 0x180024402000L) != 0L) - return 28; + return 29; return -1; case 7: if ((active0 & 0x5000000000201000L) != 0L) - return 28; + return 29; if ((active0 & 0x110205400000000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 7; - return 28; + return 29; } return -1; case 8: - if ((active0 & 0x100204000000000L) != 0L) - return 28; if ((active0 & 0x10001400000000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 8; - return 28; + return 29; } + if ((active0 & 0x100204000000000L) != 0L) + return 29; return -1; case 9: - if ((active0 & 0x1400000000L) != 0L) - return 28; if ((active0 & 0x10000000000000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 9; - return 28; + return 29; } + if ((active0 & 0x1400000000L) != 0L) + return 29; return -1; case 10: if ((active0 & 0x10000000000000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 73; jjmatchedPos = 10; - return 28; + return 29; } return -1; default : @@ -173,63 +173,63 @@ private int jjMoveStringLiteralDfa0_0() case 13: return jjStopAtPos(0, 4); case 26: - return jjStopAtPos(0, 123); + return jjStopAtPos(0, 124); case 32: return jjStopAtPos(0, 1); case 33: - jjmatchedKind = 87; - return jjMoveStringLiteralDfa1_0(0x0L, 0x40000000L); + jjmatchedKind = 88; + return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000L); case 37: - jjmatchedKind = 106; - return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000000L); + jjmatchedKind = 107; + return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000000L); case 38: - jjmatchedKind = 103; - return jjMoveStringLiteralDfa1_0(0x0L, 0x1000100000000L); + jjmatchedKind = 104; + return jjMoveStringLiteralDfa1_0(0x0L, 0x2000200000000L); case 40: - return jjStopAtPos(0, 75); - case 41: return jjStopAtPos(0, 76); + case 41: + return jjStopAtPos(0, 77); case 42: - jjmatchedKind = 101; - return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000L); + jjmatchedKind = 102; + return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000000L); case 43: - jjmatchedKind = 99; - return jjMoveStringLiteralDfa1_0(0x0L, 0x100200000000L); - case 44: - return jjStopAtPos(0, 82); - case 45: jjmatchedKind = 100; return jjMoveStringLiteralDfa1_0(0x0L, 0x200400000000L); + case 44: + return jjStopAtPos(0, 83); + case 45: + jjmatchedKind = 101; + return jjMoveStringLiteralDfa1_0(0x0L, 0x400800000000L); case 46: - jjmatchedKind = 83; - return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000000000L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000000L); case 47: - jjmatchedKind = 102; - return jjMoveStringLiteralDfa1_0(0x100L, 0x800000000000L); + jjmatchedKind = 103; + return jjMoveStringLiteralDfa1_0(0x100L, 0x1000000000000L); case 58: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 91); case 59: - return jjStopAtPos(0, 81); + return jjStopAtPos(0, 82); case 60: - jjmatchedKind = 86; - return jjMoveStringLiteralDfa1_0(0x0L, 0x10080010000000L); + jjmatchedKind = 87; + return jjMoveStringLiteralDfa1_0(0x0L, 0x20100020000000L); case 61: - jjmatchedKind = 85; - return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000L); + jjmatchedKind = 86; + return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000L); case 62: - jjmatchedKind = 122; - return jjMoveStringLiteralDfa1_0(0x0L, 0x360000020000000L); + jjmatchedKind = 123; + return jjMoveStringLiteralDfa1_0(0x0L, 0x6c0000040000000L); case 63: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 90); case 64: - return jjStopAtPos(0, 84); + return jjStopAtPos(0, 85); case 91: - return jjStopAtPos(0, 79); - case 93: return jjStopAtPos(0, 80); + case 93: + return jjStopAtPos(0, 81); case 94: - jjmatchedKind = 105; - return jjMoveStringLiteralDfa1_0(0x0L, 0x4000000000000L); + jjmatchedKind = 106; + return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000000L); case 97: return jjMoveStringLiteralDfa1_0(0x1000L, 0x0L); case 98: @@ -263,15 +263,15 @@ private int jjMoveStringLiteralDfa0_0() case 119: return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x0L); case 123: - return jjStopAtPos(0, 77); - case 124: - jjmatchedKind = 104; - return jjMoveStringLiteralDfa1_0(0x0L, 0x2000080000000L); - case 125: return jjStopAtPos(0, 78); + case 124: + jjmatchedKind = 105; + return jjMoveStringLiteralDfa1_0(0x0L, 0x4000100000000L); + case 125: + return jjStopAtPos(0, 79); case 126: - jjmatchedKind = 88; - return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000000000L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000000000000L); default : return jjMoveNfa_0(0, 0); } @@ -286,41 +286,39 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) switch(curChar) { case 38: - if ((active1 & 0x100000000L) != 0L) - return jjStopAtPos(1, 96); - break; - case 42: - if ((active0 & 0x100L) != 0L) - return jjStartNfaWithStates_0(1, 8, 50); - break; - case 43: if ((active1 & 0x200000000L) != 0L) return jjStopAtPos(1, 97); break; - case 45: + case 42: + if ((active0 & 0x100L) != 0L) + return jjStartNfaWithStates_0(1, 8, 36); + break; + case 43: if ((active1 & 0x400000000L) != 0L) return jjStopAtPos(1, 98); break; + case 45: + if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(1, 99); + break; case 46: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000000000L); case 60: - if ((active1 & 0x80000000000L) != 0L) + if ((active1 & 0x100000000000L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 108; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10000000000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000000000L); case 61: - if ((active1 & 0x8000000L) != 0L) - return jjStopAtPos(1, 91); - else if ((active1 & 0x10000000L) != 0L) + if ((active1 & 0x10000000L) != 0L) return jjStopAtPos(1, 92); else if ((active1 & 0x20000000L) != 0L) return jjStopAtPos(1, 93); else if ((active1 & 0x40000000L) != 0L) return jjStopAtPos(1, 94); - else if ((active1 & 0x100000000000L) != 0L) - return jjStopAtPos(1, 108); + else if ((active1 & 0x80000000L) != 0L) + return jjStopAtPos(1, 95); else if ((active1 & 0x200000000000L) != 0L) return jjStopAtPos(1, 109); else if ((active1 & 0x400000000000L) != 0L) @@ -335,16 +333,18 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) return jjStopAtPos(1, 114); else if ((active1 & 0x8000000000000L) != 0L) return jjStopAtPos(1, 115); + else if ((active1 & 0x10000000000000L) != 0L) + return jjStopAtPos(1, 116); break; case 62: - if ((active1 & 0x200000000000000L) != 0L) + if ((active1 & 0x400000000000000L) != 0L) { - jjmatchedKind = 121; + jjmatchedKind = 122; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x160000000000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2c0000000000000L); case 91: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000000L); case 97: return jjMoveStringLiteralDfa2_0(active0, 0x90008030000L, active1, 0L); case 98: @@ -353,7 +353,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) return jjMoveStringLiteralDfa2_0(active0, 0x820000400000L, active1, 0L); case 102: if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(1, 33, 28); + return jjStartNfaWithStates_0(1, 33, 29); break; case 104: return jjMoveStringLiteralDfa2_0(active0, 0x20e1000000040000L, active1, 0L); @@ -385,8 +385,8 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) case 121: return jjMoveStringLiteralDfa2_0(active0, 0x10000000008000L, active1, 0L); case 124: - if ((active1 & 0x80000000L) != 0L) - return jjStopAtPos(1, 95); + if ((active1 & 0x100000000L) != 0L) + return jjStopAtPos(1, 96); break; default : break; @@ -405,25 +405,25 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a switch(curChar) { case 46: - if ((active1 & 0x80000000000000L) != 0L) - return jjStopAtPos(2, 119); + if ((active1 & 0x100000000000000L) != 0L) + return jjStopAtPos(2, 120); break; case 61: - if ((active1 & 0x10000000000000L) != 0L) - return jjStopAtPos(2, 116); - else if ((active1 & 0x20000000000000L) != 0L) + if ((active1 & 0x20000000000000L) != 0L) return jjStopAtPos(2, 117); + else if ((active1 & 0x40000000000000L) != 0L) + return jjStopAtPos(2, 118); break; case 62: - if ((active1 & 0x100000000000000L) != 0L) + if ((active1 & 0x200000000000000L) != 0L) { - jjmatchedKind = 120; + jjmatchedKind = 121; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000000000000L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000000000L); case 93: - if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(2, 124); + if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(2, 125); break; case 97: return jjMoveStringLiteralDfa3_0(active0, 0x1020000000c0000L, active1, 0L); @@ -447,7 +447,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a return jjMoveStringLiteralDfa3_0(active0, 0x4000c00000000L, active1, 0L); case 114: if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(2, 31, 28); + return jjStartNfaWithStates_0(2, 31, 29); return jjMoveStringLiteralDfa3_0(active0, 0x40c0000000000000L, active1, 0L); case 115: return jjMoveStringLiteralDfa3_0(active0, 0x1002011000L, active1, 0L); @@ -462,11 +462,11 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a return jjMoveStringLiteralDfa3_0(active0, 0x200000001000000L, active1, 0L); case 119: if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_0(2, 41, 28); + return jjStartNfaWithStates_0(2, 41, 29); break; case 121: if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 58, 28); + return jjStartNfaWithStates_0(2, 58, 29); break; default : break; @@ -485,8 +485,8 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a switch(curChar) { case 61: - if ((active1 & 0x40000000000000L) != 0L) - return jjStopAtPos(3, 118); + if ((active1 & 0x80000000000000L) != 0L) + return jjStopAtPos(3, 119); break; case 97: return jjMoveStringLiteralDfa4_0(active0, 0x1000000070404000L, active1, 0L); @@ -496,21 +496,21 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a return jjMoveStringLiteralDfa4_0(active0, 0x10000000020000L, active1, 0L); case 100: if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 59, 28); + return jjStartNfaWithStates_0(3, 59, 29); break; case 101: if ((active0 & 0x8000L) != 0L) - return jjStartNfaWithStates_0(3, 15, 28); + return jjStartNfaWithStates_0(3, 15, 29); else if ((active0 & 0x10000L) != 0L) - return jjStartNfaWithStates_0(3, 16, 28); + return jjStartNfaWithStates_0(3, 16, 29); else if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_0(3, 25, 28); + return jjStartNfaWithStates_0(3, 25, 29); else if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 57, 28); + return jjStartNfaWithStates_0(3, 57, 29); return jjMoveStringLiteralDfa4_0(active0, 0x4004004000000L, active1, 0L); case 103: if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_0(3, 39, 28); + return jjStartNfaWithStates_0(3, 39, 29); break; case 105: return jjMoveStringLiteralDfa4_0(active0, 0x4000010000000000L, active1, 0L); @@ -518,21 +518,21 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a return jjMoveStringLiteralDfa4_0(active0, 0x80000000000L, active1, 0L); case 108: if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_0(3, 42, 28); + return jjStartNfaWithStates_0(3, 42, 29); return jjMoveStringLiteralDfa4_0(active0, 0x2000400400002000L, active1, 0L); case 110: return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0L); case 111: if ((active0 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(3, 32, 28); + return jjStartNfaWithStates_0(3, 32, 29); return jjMoveStringLiteralDfa4_0(active0, 0xc0000800000000L, active1, 0L); case 114: if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_0(3, 18, 28); + return jjStartNfaWithStates_0(3, 18, 29); return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0L); case 115: if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 53, 28); + return jjStartNfaWithStates_0(3, 53, 29); return jjMoveStringLiteralDfa4_0(active0, 0x8180000L, active1, 0L); case 116: return jjMoveStringLiteralDfa4_0(active0, 0xa201000201000L, active1, 0L); @@ -562,19 +562,19 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a return jjMoveStringLiteralDfa5_0(active0, 0x4008000000000000L); case 101: if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_0(4, 27, 28); + return jjStartNfaWithStates_0(4, 27, 29); else if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 61, 28); + return jjStartNfaWithStates_0(4, 61, 29); return jjMoveStringLiteralDfa5_0(active0, 0x200400002000L); case 104: if ((active0 & 0x20000L) != 0L) - return jjStartNfaWithStates_0(4, 17, 28); + return jjStartNfaWithStates_0(4, 17, 29); return jjMoveStringLiteralDfa5_0(active0, 0x10000000000000L); case 105: return jjMoveStringLiteralDfa5_0(active0, 0x2400000200000L); case 107: if ((active0 & 0x4000L) != 0L) - return jjStartNfaWithStates_0(4, 14, 28); + return jjStartNfaWithStates_0(4, 14, 29); break; case 108: if ((active0 & 0x10000000L) != 0L) @@ -587,19 +587,19 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a return jjMoveStringLiteralDfa5_0(active0, 0x4000000L); case 114: if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 50, 28); + return jjStartNfaWithStates_0(4, 50, 29); return jjMoveStringLiteralDfa5_0(active0, 0x804800001000L); case 115: if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_0(4, 19, 28); + return jjStartNfaWithStates_0(4, 19, 29); return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L); case 116: if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_0(4, 20, 28); + return jjStartNfaWithStates_0(4, 20, 29); else if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(4, 30, 28); + return jjStartNfaWithStates_0(4, 30, 29); else if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 48, 28); + return jjStartNfaWithStates_0(4, 48, 29); return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L); case 117: return jjMoveStringLiteralDfa5_0(active0, 0x400000L); @@ -632,17 +632,17 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0) return jjMoveStringLiteralDfa6_0(active0, 0x3000L); case 99: if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_0(5, 46, 28); + return jjStartNfaWithStates_0(5, 46, 29); else if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 49, 28); + return jjStartNfaWithStates_0(5, 49, 29); return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L); case 100: return jjMoveStringLiteralDfa6_0(active0, 0x4000000L); case 101: if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_0(5, 24, 28); + return jjStartNfaWithStates_0(5, 24, 29); else if ((active0 & 0x10000000000L) != 0L) - return jjStartNfaWithStates_0(5, 40, 28); + return jjStartNfaWithStates_0(5, 40, 29); break; case 102: return jjMoveStringLiteralDfa6_0(active0, 0x4000000000L); @@ -650,7 +650,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0) return jjMoveStringLiteralDfa6_0(active0, 0x80000000000L); case 104: if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 51, 28); + return jjStartNfaWithStates_0(5, 51, 29); break; case 105: return jjMoveStringLiteralDfa6_0(active0, 0x1100000000000000L); @@ -660,17 +660,17 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0) return jjMoveStringLiteralDfa6_0(active0, 0x400000000L); case 110: if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_0(5, 47, 28); + return jjStartNfaWithStates_0(5, 47, 29); return jjMoveStringLiteralDfa6_0(active0, 0x1000200000L); case 114: return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L); case 115: if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 55, 28); + return jjStartNfaWithStates_0(5, 55, 29); break; case 116: if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_0(5, 35, 28); + return jjStartNfaWithStates_0(5, 35, 29); return jjMoveStringLiteralDfa6_0(active0, 0x4000100000000000L); default : break; @@ -694,9 +694,9 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0) return jjMoveStringLiteralDfa7_0(active0, 0x1000001000L); case 101: if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_0(6, 43, 28); + return jjStartNfaWithStates_0(6, 43, 29); else if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_0(6, 44, 28); + return jjStartNfaWithStates_0(6, 44, 29); return jjMoveStringLiteralDfa7_0(active0, 0x100000400000000L); case 102: return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000000L); @@ -704,23 +704,23 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0) return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000000L); case 110: if ((active0 & 0x2000L) != 0L) - return jjStartNfaWithStates_0(6, 13, 28); + return jjStartNfaWithStates_0(6, 13, 29); break; case 111: return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L); case 115: if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_0(6, 26, 28); + return jjStartNfaWithStates_0(6, 26, 29); break; case 116: if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_0(6, 22, 28); + return jjStartNfaWithStates_0(6, 22, 29); return jjMoveStringLiteralDfa7_0(active0, 0x200000000000L); case 117: return jjMoveStringLiteralDfa7_0(active0, 0x200000L); case 121: if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(6, 29, 28); + return jjStartNfaWithStates_0(6, 29, 29); break; default : break; @@ -742,19 +742,19 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0) return jjMoveStringLiteralDfa8_0(active0, 0x4000000000L); case 101: if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_0(7, 21, 28); + return jjStartNfaWithStates_0(7, 21, 29); else if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_0(7, 60, 28); + return jjStartNfaWithStates_0(7, 60, 29); return jjMoveStringLiteralDfa8_0(active0, 0x201000000000L); case 110: return jjMoveStringLiteralDfa8_0(active0, 0x110000400000000L); case 112: if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_0(7, 62, 28); + return jjStartNfaWithStates_0(7, 62, 29); break; case 116: if ((active0 & 0x1000L) != 0L) - return jjStartNfaWithStates_0(7, 12, 28); + return jjStartNfaWithStates_0(7, 12, 29); break; default : break; @@ -774,11 +774,11 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0) { case 100: if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_0(8, 45, 28); + return jjStartNfaWithStates_0(8, 45, 29); break; case 101: if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_0(8, 38, 28); + return jjStartNfaWithStates_0(8, 38, 29); break; case 105: return jjMoveStringLiteralDfa9_0(active0, 0x10000000000000L); @@ -786,7 +786,7 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0) return jjMoveStringLiteralDfa9_0(active0, 0x1000000000L); case 116: if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 56, 28); + return jjStartNfaWithStates_0(8, 56, 29); return jjMoveStringLiteralDfa9_0(active0, 0x400000000L); default : break; @@ -806,11 +806,11 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0) { case 102: if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_0(9, 36, 28); + return jjStartNfaWithStates_0(9, 36, 29); break; case 115: if ((active0 & 0x400000000L) != 0L) - return jjStartNfaWithStates_0(9, 34, 28); + return jjStartNfaWithStates_0(9, 34, 29); break; case 122: return jjMoveStringLiteralDfa10_0(active0, 0x10000000000000L); @@ -850,7 +850,7 @@ private int jjMoveStringLiteralDfa11_0(long old0, long active0) { case 100: if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(11, 52, 28); + return jjStartNfaWithStates_0(11, 52, 29); break; default : break; @@ -1051,7 +1051,7 @@ static final long[] jjbitVec61 = { private int jjMoveNfa_0(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 68; + jjnewStateCnt = 99; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -1066,9 +1066,9 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 45: + case 31: if (curChar == 42) - jjstateSet[jjnewStateCnt++] = 50; + jjstateSet[jjnewStateCnt++] = 36; else if (curChar == 47) { if (kind > 6) @@ -1078,287 +1078,413 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 0: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(3, 9); + { + if (kind > 63) + kind = 63; + jjCheckNAddStates(3, 15); + } else if (curChar == 47) - jjAddStates(10, 11); + jjAddStates(16, 17); else if (curChar == 36) { - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if (kind > 73) + kind = 73; + jjCheckNAdd(29); } else if (curChar == 34) - jjCheckNAddStates(12, 14); + jjCheckNAddStates(18, 20); else if (curChar == 39) - jjAddStates(15, 16); + jjAddStates(21, 22); else if (curChar == 46) - jjCheckNAdd(4); - if ((0x3fe000000000000L & l) != 0L) - { - if (kind > 63) - kind = 63; - jjCheckNAddTwoStates(1, 2); - } - else if (curChar == 48) - { - if (kind > 63) - kind = 63; - jjCheckNAddStates(17, 21); - } + jjstateSet[jjnewStateCnt++] = 1; + if (curChar == 48) + jjAddStates(23, 27); break; case 1: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 63) - kind = 63; - jjCheckNAddTwoStates(1, 2); + if (kind > 68) + kind = 68; + jjCheckNAddStates(28, 31); + break; + case 2: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(2, 3); break; case 3: - if (curChar == 46) - jjCheckNAdd(4); - break; - case 4: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; - jjCheckNAddStates(22, 24); + if (kind > 68) + kind = 68; + jjCheckNAddTwoStates(4, 9); + break; + case 5: + if ((0x280000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 6; break; case 6: - if ((0x280000000000L & l) != 0L) - jjCheckNAdd(7); - break; - case 7: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; - jjCheckNAddTwoStates(7, 8); + if (kind > 68) + kind = 68; + jjCheckNAddStates(32, 34); break; - case 9: - if (curChar == 39) - jjAddStates(15, 16); + case 7: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(7, 8); + break; + case 8: + case 53: + case 60: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 68) + kind = 68; + jjCheckNAdd(9); break; case 10: - if ((0xffffff7fffffdbffL & l) != 0L) - jjCheckNAdd(11); + if (curChar == 39) + jjAddStates(21, 22); break; case 11: - if (curChar == 39 && kind > 70) - kind = 70; + if ((0xffffff7fffffdbffL & l) != 0L) + jjCheckNAdd(12); break; - case 13: - if ((0x8400000000L & l) != 0L) - jjCheckNAdd(11); + case 12: + if (curChar == 39 && kind > 71) + kind = 71; break; case 14: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddTwoStates(15, 11); + if ((0x8400000000L & l) != 0L) + jjCheckNAdd(12); break; case 15: if ((0xff000000000000L & l) != 0L) - jjCheckNAdd(11); + jjCheckNAddTwoStates(16, 12); break; case 16: - if ((0xf000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 17; + if ((0xff000000000000L & l) != 0L) + jjCheckNAdd(12); break; case 17: - if ((0xff000000000000L & l) != 0L) - jjCheckNAdd(15); + if ((0xf000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 18; break; case 18: - if (curChar == 34) - jjCheckNAddStates(12, 14); + if ((0xff000000000000L & l) != 0L) + jjCheckNAdd(16); break; case 19: - if ((0xfffffffbffffdbffL & l) != 0L) - jjCheckNAddStates(12, 14); + if (curChar == 34) + jjCheckNAddStates(18, 20); break; - case 21: - if ((0x8400000000L & l) != 0L) - jjCheckNAddStates(12, 14); + case 20: + if ((0xfffffffbffffdbffL & l) != 0L) + jjCheckNAddStates(18, 20); break; case 22: - if (curChar == 34 && kind > 71) - kind = 71; + if ((0x8400000000L & l) != 0L) + jjCheckNAddStates(18, 20); break; case 23: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(25, 28); + if (curChar == 34 && kind > 72) + kind = 72; break; case 24: if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(12, 14); + jjCheckNAddStates(35, 38); break; case 25: - if ((0xf000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 26; + if ((0xff000000000000L & l) != 0L) + jjCheckNAddStates(18, 20); break; case 26: - if ((0xff000000000000L & l) != 0L) - jjCheckNAdd(24); + if ((0xf000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 27; break; case 27: - if (curChar != 36) - break; - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if ((0xff000000000000L & l) != 0L) + jjCheckNAdd(25); break; case 28: - if ((0x3ff00100fffc1ffL & l) == 0L) + if (curChar != 36) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if (kind > 73) + kind = 73; + jjCheckNAdd(29); break; case 29: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(3, 9); + if ((0x3ff00100fffc1ffL & l) == 0L) + break; + if (kind > 73) + kind = 73; + jjCheckNAdd(29); break; case 30: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(30, 31); - break; - case 31: - if (curChar != 46) - break; - if (kind > 67) - kind = 67; - jjCheckNAddStates(29, 31); + if (curChar == 47) + jjAddStates(16, 17); break; case 32: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 67) - kind = 67; - jjCheckNAddStates(29, 31); - break; - case 34: - if ((0x280000000000L & l) != 0L) - jjCheckNAdd(35); - break; - case 35: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 67) - kind = 67; - jjCheckNAddTwoStates(35, 8); - break; - case 36: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(36, 37); - break; - case 38: - if ((0x280000000000L & l) != 0L) - jjCheckNAdd(39); - break; - case 39: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 67) - kind = 67; - jjCheckNAddTwoStates(39, 8); - break; - case 40: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(32, 34); - break; - case 42: - if ((0x280000000000L & l) != 0L) - jjCheckNAdd(43); - break; - case 43: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(43, 8); - break; - case 44: - if (curChar == 47) - jjAddStates(10, 11); - break; - case 46: if ((0xffffffffffffdbffL & l) == 0L) break; if (kind > 6) kind = 6; jjCheckNAddStates(0, 2); break; - case 47: + case 33: if ((0x2400L & l) != 0L && kind > 6) kind = 6; break; - case 48: + case 34: if (curChar == 10 && kind > 6) kind = 6; break; - case 49: + case 35: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 48; + jjstateSet[jjnewStateCnt++] = 34; break; - case 50: + case 36: if (curChar == 42) - jjstateSet[jjnewStateCnt++] = 51; + jjstateSet[jjnewStateCnt++] = 37; break; - case 51: + case 37: if ((0xffff7fffffffffffL & l) != 0L && kind > 7) kind = 7; break; - case 52: + case 38: if (curChar == 42) - jjstateSet[jjnewStateCnt++] = 50; + jjstateSet[jjnewStateCnt++] = 36; break; - case 53: - if (curChar != 48) - break; - if (kind > 63) - kind = 63; - jjCheckNAddStates(17, 21); - break; - case 55: + case 39: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 63) kind = 63; - jjCheckNAddTwoStates(55, 2); + jjCheckNAddStates(3, 15); break; - case 56: - if ((0xff000000000000L & l) == 0L) + case 40: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(40, 41); + break; + case 41: + case 72: + if ((0x3ff000000000000L & l) == 0L) break; if (kind > 63) kind = 63; - jjCheckNAddTwoStates(56, 2); + jjCheckNAdd(42); break; - case 58: + case 43: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(35, 37); + jjCheckNAddTwoStates(43, 44); break; - case 59: - if (curChar == 46) - jjCheckNAdd(60); + case 44: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(45); break; - case 61: - if ((0x280000000000L & l) != 0L) - jjCheckNAdd(62); + case 45: + if (curChar != 46) + break; + if (kind > 68) + kind = 68; + jjCheckNAddStates(39, 41); break; - case 62: + case 46: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 68) kind = 68; - jjCheckNAddTwoStates(62, 63); + jjCheckNAddStates(42, 45); + break; + case 47: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(47, 48); + break; + case 48: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 68) + kind = 68; + jjCheckNAddTwoStates(49, 9); + break; + case 50: + if ((0x280000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 51; + break; + case 51: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 68) + kind = 68; + jjCheckNAddStates(46, 48); + break; + case 52: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(52, 53); + break; + case 54: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(54, 55); + break; + case 55: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(56); + break; + case 57: + if ((0x280000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 58; + break; + case 58: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 68) + kind = 68; + jjCheckNAddStates(49, 51); + break; + case 59: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(59, 60); + break; + case 61: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(61, 62); + break; + case 62: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(63, 9); + break; + case 64: + if ((0x280000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 65; break; case 65: if ((0x3ff000000000000L & l) != 0L) - jjAddStates(38, 39); + jjCheckNAddStates(52, 54); break; case 66: - if (curChar == 46) - jjCheckNAdd(67); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(66, 67); break; case 67: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(67, 60); + jjCheckNAdd(9); + break; + case 68: + if (curChar == 48) + jjAddStates(23, 27); + break; + case 70: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 63) + kind = 63; + jjCheckNAddStates(55, 57); + break; + case 71: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(71, 72); + break; + case 74: + if ((0x3000000000000L & l) == 0L) + break; + if (kind > 63) + kind = 63; + jjCheckNAddStates(58, 60); + break; + case 75: + if ((0x3000000000000L & l) != 0L) + jjCheckNAddTwoStates(75, 76); + break; + case 76: + if ((0x3000000000000L & l) == 0L) + break; + if (kind > 63) + kind = 63; + jjCheckNAdd(42); + break; + case 77: + if ((0xff000000000000L & l) == 0L) + break; + if (kind > 63) + kind = 63; + jjCheckNAddStates(61, 63); + break; + case 78: + if ((0xff000000000000L & l) != 0L) + jjCheckNAddTwoStates(78, 79); + break; + case 79: + if ((0xff000000000000L & l) == 0L) + break; + if (kind > 63) + kind = 63; + jjCheckNAdd(42); + break; + case 81: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(64, 67); + break; + case 82: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(82, 83); + break; + case 83: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(84, 85); + break; + case 84: + if (curChar == 46) + jjCheckNAdd(85); + break; + case 86: + if ((0x280000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 87; + break; + case 87: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 69) + kind = 69; + jjCheckNAddStates(68, 70); + break; + case 88: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(88, 89); + break; + case 89: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 69) + kind = 69; + jjCheckNAdd(90); + break; + case 92: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(71, 73); + break; + case 93: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(93, 94); + break; + case 94: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(95); + break; + case 95: + if (curChar == 46) + jjstateSet[jjnewStateCnt++] = 96; + break; + case 96: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(74, 76); + break; + case 97: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(97, 98); + break; + case 98: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(85); break; default : break; } @@ -1374,112 +1500,203 @@ private int jjMoveNfa_0(int startState, int curPos) case 0: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if (kind > 73) + kind = 73; + jjCheckNAdd(29); break; case 2: - if ((0x100000001000L & l) != 0L && kind > 63) - kind = 63; + if (curChar == 95) + jjAddStates(77, 78); break; - case 5: + case 4: if ((0x2000000020L & l) != 0L) - jjAddStates(40, 41); + jjAddStates(79, 80); break; - case 8: - if ((0x5000000050L & l) != 0L && kind > 67) - kind = 67; + case 7: + if (curChar == 95) + jjAddStates(81, 82); break; - case 10: + case 9: + if ((0x5000000050L & l) != 0L && kind > 68) + kind = 68; + break; + case 11: if ((0xffffffffefffffffL & l) != 0L) - jjCheckNAdd(11); - break; - case 12: - if (curChar == 92) - jjAddStates(42, 44); + jjCheckNAdd(12); break; case 13: - if ((0x14404410000000L & l) != 0L) - jjCheckNAdd(11); + if (curChar == 92) + jjAddStates(83, 85); break; - case 19: - if ((0xffffffffefffffffL & l) != 0L) - jjCheckNAddStates(12, 14); + case 14: + if ((0x14404410000000L & l) != 0L) + jjCheckNAdd(12); break; case 20: - if (curChar == 92) - jjAddStates(45, 47); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(18, 20); break; case 21: - if ((0x14404410000000L & l) != 0L) - jjCheckNAddStates(12, 14); + if (curChar == 92) + jjAddStates(86, 88); break; - case 28: + case 22: + if ((0x14404410000000L & l) != 0L) + jjCheckNAddStates(18, 20); + break; + case 29: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if (kind > 73) + kind = 73; + jjCheckNAdd(29); break; - case 33: - if ((0x2000000020L & l) != 0L) - jjAddStates(48, 49); - break; - case 37: - if ((0x2000000020L & l) != 0L) - jjAddStates(50, 51); - break; - case 41: - if ((0x2000000020L & l) != 0L) - jjAddStates(52, 53); - break; - case 46: + case 32: if (kind > 6) kind = 6; jjAddStates(0, 2); break; - case 51: + case 37: if (kind > 7) kind = 7; break; - case 54: - if ((0x100000001000000L & l) != 0L) - jjCheckNAdd(55); + case 40: + if (curChar == 95) + jjAddStates(89, 90); break; - case 55: + case 42: + if ((0x100000001000L & l) != 0L && kind > 63) + kind = 63; + break; + case 43: + if (curChar == 95) + jjAddStates(91, 92); + break; + case 47: + if (curChar == 95) + jjAddStates(93, 94); + break; + case 49: + if ((0x2000000020L & l) != 0L) + jjAddStates(95, 96); + break; + case 52: + if (curChar == 95) + jjAddStates(97, 98); + break; + case 54: + if (curChar == 95) + jjAddStates(99, 100); + break; + case 56: + if ((0x2000000020L & l) != 0L) + jjAddStates(101, 102); + break; + case 59: + if (curChar == 95) + jjAddStates(103, 104); + break; + case 61: + if (curChar == 95) + jjAddStates(105, 106); + break; + case 63: + if ((0x2000000020L & l) != 0L) + jjAddStates(107, 108); + break; + case 66: + if (curChar == 95) + jjAddStates(109, 110); + break; + case 69: + if ((0x100000001000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 70; + break; + case 70: if ((0x7e0000007eL & l) == 0L) break; if (kind > 63) kind = 63; - jjCheckNAddTwoStates(55, 2); + jjCheckNAddStates(55, 57); break; - case 57: + case 71: + if ((0x7e8000007eL & l) != 0L) + jjCheckNAddTwoStates(71, 72); + break; + case 72: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 63) + kind = 63; + jjCheckNAdd(42); + break; + case 73: + if ((0x400000004L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 74; + break; + case 75: + if (curChar == 95) + jjAddStates(111, 112); + break; + case 78: + if (curChar == 95) + jjAddStates(113, 114); + break; + case 80: if ((0x100000001000000L & l) != 0L) - jjCheckNAdd(58); + jjstateSet[jjnewStateCnt++] = 81; break; - case 58: + case 81: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(35, 37); + jjCheckNAddStates(64, 67); break; - case 60: + case 82: + if ((0x7e8000007eL & l) != 0L) + jjCheckNAddTwoStates(82, 83); + break; + case 83: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddTwoStates(84, 85); + break; + case 85: if ((0x1000000010000L & l) != 0L) - jjAddStates(54, 55); + jjAddStates(115, 116); break; - case 63: - if ((0x5000000050L & l) != 0L && kind > 68) - kind = 68; + case 88: + if (curChar == 95) + jjAddStates(117, 118); break; - case 64: + case 90: + if ((0x5000000050L & l) != 0L && kind > 69) + kind = 69; + break; + case 91: if ((0x100000001000000L & l) != 0L) - jjCheckNAddTwoStates(65, 66); + jjCheckNAddTwoStates(92, 95); break; - case 65: + case 92: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(65, 66); + jjCheckNAddStates(71, 73); break; - case 67: + case 93: + if ((0x7e8000007eL & l) != 0L) + jjCheckNAddTwoStates(93, 94); + break; + case 94: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(67, 60); + jjCheckNAdd(95); + break; + case 96: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(74, 76); + break; + case 97: + if ((0x7e8000007eL & l) != 0L) + jjCheckNAddTwoStates(97, 98); + break; + case 98: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAdd(85); break; default : break; } @@ -1499,33 +1716,33 @@ private int jjMoveNfa_0(int startState, int curPos) case 0: if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if (kind > 73) + kind = 73; + jjCheckNAdd(29); break; - case 10: + case 11: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjstateSet[jjnewStateCnt++] = 11; + jjstateSet[jjnewStateCnt++] = 12; break; - case 19: + case 20: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjAddStates(12, 14); + jjAddStates(18, 20); break; - case 28: + case 29: if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(28); + if (kind > 73) + kind = 73; + jjCheckNAdd(29); break; - case 46: + case 32: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; if (kind > 6) kind = 6; jjAddStates(0, 2); break; - case 51: + case 37: if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 7) kind = 7; break; @@ -1540,7 +1757,7 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 68 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 99 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1601,10 +1818,14 @@ private int jjMoveStringLiteralDfa1_1(long active0) return 2; } static final int[] jjnextStates = { - 46, 47, 49, 30, 31, 36, 37, 40, 41, 8, 45, 52, 19, 20, 22, 10, - 12, 54, 56, 2, 57, 64, 4, 5, 8, 19, 20, 24, 22, 32, 33, 8, - 40, 41, 8, 58, 59, 60, 65, 66, 6, 7, 13, 14, 16, 21, 23, 25, - 34, 35, 38, 39, 42, 43, 61, 62, + 32, 33, 35, 40, 41, 42, 43, 44, 45, 54, 55, 56, 61, 62, 63, 9, + 31, 38, 20, 21, 23, 11, 13, 69, 73, 77, 80, 91, 2, 3, 4, 9, + 7, 8, 9, 20, 21, 25, 23, 46, 49, 9, 47, 48, 49, 9, 52, 53, + 9, 59, 60, 9, 66, 67, 9, 71, 72, 42, 75, 76, 42, 78, 79, 42, + 82, 83, 84, 85, 88, 89, 90, 93, 94, 95, 97, 98, 85, 2, 3, 5, + 6, 7, 8, 14, 15, 17, 22, 24, 26, 40, 41, 43, 44, 47, 48, 50, + 51, 52, 53, 54, 55, 57, 58, 59, 60, 61, 62, 64, 65, 66, 67, 75, + 76, 78, 79, 86, 87, 88, 89, }; private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { @@ -1805,10 +2026,10 @@ public static final String[] jjstrLiteralImages = { "\164\150\162\157\167", "\164\150\162\157\167\163", "\164\162\141\156\163\151\145\156\164", "\164\162\165\145", "\164\162\171", "\166\157\151\144", "\166\157\154\141\164\151\154\145", "\167\150\151\154\145", "\163\164\162\151\143\164\146\160", null, null, null, null, null, null, null, -null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", -"\54", "\56", "\100", "\75", "\74", "\41", "\176", "\77", "\72", "\75\75", "\74\75", -"\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", -"\57", "\46", "\174", "\136", "\45", "\74\74", "\53\75", "\55\75", "\52\75", +null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", +"\73", "\54", "\56", "\100", "\75", "\74", "\41", "\176", "\77", "\72", "\75\75", +"\74\75", "\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", +"\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\45\75", "\74\74\75", "\76\76\75", "\76\76\76\75", "\56\56\56", "\76\76\76", "\76\76", "\76", "\32", "\176\133\135", }; @@ -1826,9 +2047,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, }; static final long[] jjtoToken = { - 0xfffffffffffff001L, 0x1ffffffffffff9d8L, + 0xfffffffffffff001L, 0x3ffffffffffff3b0L, }; static final long[] jjtoSkip = { 0x67eL, 0x0L, @@ -1840,8 +2062,8 @@ static final long[] jjtoMore = { 0x980L, 0x0L, }; protected CharStream input_stream; -private final int[] jjrounds = new int[68]; -private final int[] jjstateSet = new int[136]; +private final int[] jjrounds = new int[99]; +private final int[] jjstateSet = new int[198]; private final StringBuilder jjimage = new StringBuilder(); private StringBuilder image = jjimage; private int jjimageLen; @@ -1870,7 +2092,7 @@ private void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 68; i-- > 0;) + for (i = 99; i-- > 0;) jjrounds[i] = 0x80000000; } @@ -2084,17 +2306,17 @@ void TokenLexicalActions(Token matchedToken) { switch(jjmatchedKind) { - case 120 : - image.append(jjstrLiteralImages[120]); - lengthOfMatch = jjstrLiteralImages[120].length(); + case 121 : + image.append(jjstrLiteralImages[121]); + lengthOfMatch = jjstrLiteralImages[121].length(); matchedToken.kind = GT; ((Token.GTToken)matchedToken).realKind = RUNSIGNEDSHIFT; input_stream.backup(2); matchedToken.image = ">"; break; - case 121 : - image.append(jjstrLiteralImages[121]); - lengthOfMatch = jjstrLiteralImages[121].length(); + case 122 : + image.append(jjstrLiteralImages[122]); + lengthOfMatch = jjstrLiteralImages[122].length(); matchedToken.kind = GT; ((Token.GTToken)matchedToken).realKind = RSIGNEDSHIFT; input_stream.backup(1); diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java index bb68609eef..6fa23a56b5 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java +++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java @@ -94,24 +94,27 @@ public interface JavaParserTreeConstants public int JJTTHROWSTATEMENT = 88; public int JJTSYNCHRONIZEDSTATEMENT = 89; public int JJTTRYSTATEMENT = 90; - public int JJTCATCHSTATEMENT = 91; - public int JJTFINALLYSTATEMENT = 92; - public int JJTASSERTSTATEMENT = 93; - public int JJTRUNSIGNEDSHIFT = 94; - public int JJTRSIGNEDSHIFT = 95; - public int JJTANNOTATION = 96; - public int JJTNORMALANNOTATION = 97; - public int JJTMARKERANNOTATION = 98; - public int JJTSINGLEMEMBERANNOTATION = 99; - public int JJTMEMBERVALUEPAIRS = 100; - public int JJTMEMBERVALUEPAIR = 101; - public int JJTMEMBERVALUE = 102; - public int JJTMEMBERVALUEARRAYINITIALIZER = 103; - public int JJTANNOTATIONTYPEDECLARATION = 104; - public int JJTANNOTATIONTYPEBODY = 105; - public int JJTANNOTATIONTYPEMEMBERDECLARATION = 106; - public int JJTANNOTATIONMETHODDECLARATION = 107; - public int JJTDEFAULTVALUE = 108; + public int JJTRESOURCESPECIFICATION = 91; + public int JJTRESOURCES = 92; + public int JJTRESOURCE = 93; + public int JJTCATCHSTATEMENT = 94; + public int JJTFINALLYSTATEMENT = 95; + public int JJTASSERTSTATEMENT = 96; + public int JJTRUNSIGNEDSHIFT = 97; + public int JJTRSIGNEDSHIFT = 98; + public int JJTANNOTATION = 99; + public int JJTNORMALANNOTATION = 100; + public int JJTMARKERANNOTATION = 101; + public int JJTSINGLEMEMBERANNOTATION = 102; + public int JJTMEMBERVALUEPAIRS = 103; + public int JJTMEMBERVALUEPAIR = 104; + public int JJTMEMBERVALUE = 105; + public int JJTMEMBERVALUEARRAYINITIALIZER = 106; + public int JJTANNOTATIONTYPEDECLARATION = 107; + public int JJTANNOTATIONTYPEBODY = 108; + public int JJTANNOTATIONTYPEMEMBERDECLARATION = 109; + public int JJTANNOTATIONMETHODDECLARATION = 110; + public int JJTDEFAULTVALUE = 111; public String[] jjtNodeName = { @@ -206,6 +209,9 @@ public interface JavaParserTreeConstants "ThrowStatement", "SynchronizedStatement", "TryStatement", + "ResourceSpecification", + "Resources", + "Resource", "CatchStatement", "FinallyStatement", "AssertStatement", @@ -226,4 +232,4 @@ public interface JavaParserTreeConstants "DefaultValue", }; } -/* JavaCC - OriginalChecksum=28e68740207e50a892e7959c0ef43ae0 (do not edit this line) */ +/* JavaCC - OriginalChecksum=29b39dcf60c8732d67ff9c7dfd922984 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java index 53d2271d7c..678044ae21 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java +++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java @@ -94,6 +94,9 @@ public interface JavaParserVisitor public Object visit(ASTThrowStatement node, Object data); public Object visit(ASTSynchronizedStatement node, Object data); public Object visit(ASTTryStatement node, Object data); + public Object visit(ASTResourceSpecification node, Object data); + public Object visit(ASTResources node, Object data); + public Object visit(ASTResource node, Object data); public Object visit(ASTCatchStatement node, Object data); public Object visit(ASTFinallyStatement node, Object data); public Object visit(ASTAssertStatement node, Object data); @@ -113,4 +116,4 @@ public interface JavaParserVisitor public Object visit(ASTAnnotationMethodDeclaration node, Object data); public Object visit(ASTDefaultValue node, Object data); } -/* JavaCC - OriginalChecksum=c64246870a5e6312a32af1f3a34598f9 (do not edit this line) */ +/* JavaCC - OriginalChecksum=2ea4ba8f9c55c7ee106d2ff1cb84080a (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java index 67d93877c4..c164fa3264 100644 --- a/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java +++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java @@ -430,6 +430,18 @@ public class JavaParserVisitorAdapter implements JavaParserVisitor { public Object visit(ASTTryStatement node, Object data) { return visit((SimpleJavaNode) node, data); } + + public Object visit(ASTResourceSpecification node, Object data) { + return visit((SimpleJavaNode) node, data); + } + + public Object visit(ASTResources node, Object data) { + return visit((SimpleJavaNode) node, data); + } + + public Object visit(ASTResource node, Object data) { + return visit((SimpleJavaNode) node, data); + } public Object visit(ASTFinallyStatement node, Object data) { return visit((SimpleJavaNode) node, data); diff --git a/pmd/src/net/sourceforge/pmd/ast/ParseException.java b/pmd/src/net/sourceforge/pmd/ast/ParseException.java index 61959788a3..aeb02c16f9 100644 --- a/pmd/src/net/sourceforge/pmd/ast/ParseException.java +++ b/pmd/src/net/sourceforge/pmd/ast/ParseException.java @@ -195,4 +195,4 @@ public class ParseException extends RuntimeException { } } -/* JavaCC - OriginalChecksum=ef5dac5cf3d0acb71ed277e8df8173a1 (do not edit this line) */ +/* JavaCC - OriginalChecksum=02c72629b8dcd84edc31480a87e9bc97 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/Token.java b/pmd/src/net/sourceforge/pmd/ast/Token.java index 305170f35b..d9fee280f1 100644 --- a/pmd/src/net/sourceforge/pmd/ast/Token.java +++ b/pmd/src/net/sourceforge/pmd/ast/Token.java @@ -132,4 +132,4 @@ public class Token { } } -/* JavaCC - OriginalChecksum=0fc45836ac24c23412a256e5ad480628 (do not edit this line) */ +/* JavaCC - OriginalChecksum=db0cc77f0ac78d4798a0b95cf8c2feee (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java b/pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java index 4413b1cb2f..723449dfab 100644 --- a/pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java +++ b/pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java @@ -138,4 +138,4 @@ public class TokenMgrError extends RuntimeException this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=d89e07f1292843b46af7dff7e1b97290 (do not edit this line) */ +/* JavaCC - OriginalChecksum=69f02ca7fa92b5820fa9f9f7338f31ca (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/cpd/cppast/ParseException.java b/pmd/src/net/sourceforge/pmd/cpd/cppast/ParseException.java index cc7d6e24f2..8920656e88 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/cppast/ParseException.java +++ b/pmd/src/net/sourceforge/pmd/cpd/cppast/ParseException.java @@ -195,4 +195,4 @@ public class ParseException extends RuntimeException { } } -/* JavaCC - OriginalChecksum=8b42f597f21215eb130252440c369111 (do not edit this line) */ +/* JavaCC - OriginalChecksum=31bfc5f76d73ac014456ff24b3421ec1 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/cpd/cppast/SimpleCharStream.java b/pmd/src/net/sourceforge/pmd/cpd/cppast/SimpleCharStream.java index 92464e2280..701f569178 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/cppast/SimpleCharStream.java +++ b/pmd/src/net/sourceforge/pmd/cpd/cppast/SimpleCharStream.java @@ -473,4 +473,4 @@ public class SimpleCharStream } } -/* JavaCC - OriginalChecksum=9bbb8cb4295bb8f7d58e31ce57dc2e0f (do not edit this line) */ +/* JavaCC - OriginalChecksum=164c9467b96e643d0dc94f9340461e10 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/cpd/cppast/Token.java b/pmd/src/net/sourceforge/pmd/cpd/cppast/Token.java index 59cf8faec5..0e7c47d19e 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/cppast/Token.java +++ b/pmd/src/net/sourceforge/pmd/cpd/cppast/Token.java @@ -121,4 +121,4 @@ public class Token { } } -/* JavaCC - OriginalChecksum=1917659c640ac2c65feaa32a37580421 (do not edit this line) */ +/* JavaCC - OriginalChecksum=c274035bc4ab4fd85bbf63e60efd01fe (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/cpd/cppast/TokenMgrError.java b/pmd/src/net/sourceforge/pmd/cpd/cppast/TokenMgrError.java index 8a705c407e..f1e8b588c0 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/cppast/TokenMgrError.java +++ b/pmd/src/net/sourceforge/pmd/cpd/cppast/TokenMgrError.java @@ -137,4 +137,4 @@ public class TokenMgrError extends Error this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=7925b33c412b4bfa3a7147ae3e790276 (do not edit this line) */ +/* JavaCC - OriginalChecksum=a4f605ad03bdc43d3d36a44f2ccfce1a (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/CharStream.java b/pmd/src/net/sourceforge/pmd/jsp/ast/CharStream.java index df9c46bba3..c97b77ff18 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/CharStream.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/CharStream.java @@ -2,7 +2,7 @@ /* JavaCCOptions:STATIC=false */ /** * JSP Parser for PMD. - * @author Pieter � Application Engineers NV/SA � http://www.ae.be + * @author Pieter – Application Engineers NV/SA – http://www.ae.be */ package net.sourceforge.pmd.jsp.ast; @@ -114,4 +114,4 @@ public interface CharStream extends net.sourceforge.pmd.ast.CharStream { void Done(); } -/* JavaCC - OriginalChecksum=41ae2339795c47e740cf9814e6433c13 (do not edit this line) */ +/* JavaCC - OriginalChecksum=087c58fccada72eb2e83d4ed4684e607 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/JJTJspParserState.java b/pmd/src/net/sourceforge/pmd/jsp/ast/JJTJspParserState.java index bfbd56b053..d8b7972fd3 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/JJTJspParserState.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/JJTJspParserState.java @@ -120,4 +120,4 @@ public class JJTJspParserState { } } } -/* JavaCC - OriginalChecksum=8975088f82e71516c3dfebdcadc05dff (do not edit this line) */ +/* JavaCC - OriginalChecksum=c5c95d986dd0b349daf5295b6db479e4 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java b/pmd/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java index d26ef75c4b..1e0760ee25 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java @@ -2,7 +2,7 @@ /* JavaCCOptions:STATIC=false */ /** * JSP Parser for PMD. - * @author Pieter � Application Engineers NV/SA � http://www.ae.be + * @author Pieter – Application Engineers NV/SA – http://www.ae.be */ package net.sourceforge.pmd.jsp.ast; diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java b/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java index 3c21f292d4..046056b787 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java @@ -1,7 +1,7 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. JspParser.java */ /** * JSP Parser for PMD. - * @author Pieter � Application Engineers NV/SA � http://www.ae.be + * @author Pieter – Application Engineers NV/SA – http://www.ae.be */ package net.sourceforge.pmd.jsp.ast; diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/ParseException.java b/pmd/src/net/sourceforge/pmd/jsp/ast/ParseException.java index b95c29a9d0..e118c69cf3 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/ParseException.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/ParseException.java @@ -2,7 +2,7 @@ /* JavaCCOptions:KEEP_LINE_COL=null */ /** * JSP Parser for PMD. - * @author Pieter � Application Engineers NV/SA � http://www.ae.be + * @author Pieter – Application Engineers NV/SA – http://www.ae.be */ package net.sourceforge.pmd.jsp.ast; @@ -200,4 +200,4 @@ public class ParseException extends net.sourceforge.pmd.ast.ParseException { } } -/* JavaCC - OriginalChecksum=47ba7a613b44c98f64aa3789642241bf (do not edit this line) */ +/* JavaCC - OriginalChecksum=9c314ad748e28ebb5e21bd0f3d412d48 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/Token.java b/pmd/src/net/sourceforge/pmd/jsp/ast/Token.java index 52d0dbb1a6..cc99ed3a2b 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/Token.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/Token.java @@ -2,7 +2,7 @@ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */ /** * JSP Parser for PMD. - * @author Pieter � Application Engineers NV/SA � http://www.ae.be + * @author Pieter – Application Engineers NV/SA – http://www.ae.be */ package net.sourceforge.pmd.jsp.ast; @@ -126,4 +126,4 @@ public class Token { } } -/* JavaCC - OriginalChecksum=05c0e8e1123020dec33bf508fa9ba353 (do not edit this line) */ +/* JavaCC - OriginalChecksum=aa67d765e813be506da8791e170d6a36 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/TokenMgrError.java b/pmd/src/net/sourceforge/pmd/jsp/ast/TokenMgrError.java index 6085741cbb..6a3877a8fd 100644 --- a/pmd/src/net/sourceforge/pmd/jsp/ast/TokenMgrError.java +++ b/pmd/src/net/sourceforge/pmd/jsp/ast/TokenMgrError.java @@ -2,7 +2,7 @@ /* JavaCCOptions: */ /** * JSP Parser for PMD. - * @author Pieter � Application Engineers NV/SA � http://www.ae.be + * @author Pieter – Application Engineers NV/SA – http://www.ae.be */ package net.sourceforge.pmd.jsp.ast; @@ -142,4 +142,4 @@ public class TokenMgrError extends RuntimeException this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=56dfce4188771884defbd50c7c708c54 (do not edit this line) */ +/* JavaCC - OriginalChecksum=70702fe47de729b5cd980a2b6f128c71 (do not edit this line) */ diff --git a/pmd/src/net/sourceforge/pmd/parsers/Java13Parser.java b/pmd/src/net/sourceforge/pmd/parsers/Java13Parser.java index f25f6e46ec..2a04afada1 100644 --- a/pmd/src/net/sourceforge/pmd/parsers/Java13Parser.java +++ b/pmd/src/net/sourceforge/pmd/parsers/Java13Parser.java @@ -19,7 +19,7 @@ public class Java13Parser implements Parser { public Object parse(Reader source) throws ParseException { parser = new JavaParser(new JavaCharStream(source)); - parser.setJDK13(); + parser.setJdkVersion(3); parser.setExcludeMarker(marker); return parser.CompilationUnit(); } diff --git a/pmd/src/net/sourceforge/pmd/parsers/Java14Parser.java b/pmd/src/net/sourceforge/pmd/parsers/Java14Parser.java index e40bf6934d..e7ec252aab 100644 --- a/pmd/src/net/sourceforge/pmd/parsers/Java14Parser.java +++ b/pmd/src/net/sourceforge/pmd/parsers/Java14Parser.java @@ -19,6 +19,7 @@ public class Java14Parser implements Parser { public Object parse(Reader source) throws ParseException { parser = new JavaParser(new JavaCharStream(source)); + parser.setJdkVersion(4); parser.setExcludeMarker(marker); return parser.CompilationUnit(); } diff --git a/pmd/src/net/sourceforge/pmd/parsers/Java15Parser.java b/pmd/src/net/sourceforge/pmd/parsers/Java15Parser.java index d44def885f..58372e8d13 100644 --- a/pmd/src/net/sourceforge/pmd/parsers/Java15Parser.java +++ b/pmd/src/net/sourceforge/pmd/parsers/Java15Parser.java @@ -19,7 +19,7 @@ public class Java15Parser implements Parser { public Object parse(Reader source) throws ParseException { parser = new JavaParser(new JavaCharStream(source)); - parser.setJDK15(); + parser.setJdkVersion(5); parser.setExcludeMarker(marker); return parser.CompilationUnit(); } diff --git a/pmd/src/net/sourceforge/pmd/parsers/Java16Parser.java b/pmd/src/net/sourceforge/pmd/parsers/Java16Parser.java index 0157f4dcf9..de99b82167 100644 --- a/pmd/src/net/sourceforge/pmd/parsers/Java16Parser.java +++ b/pmd/src/net/sourceforge/pmd/parsers/Java16Parser.java @@ -18,7 +18,7 @@ public class Java16Parser implements Parser { public Object parse(Reader source) throws ParseException { parser = new JavaParser(new JavaCharStream(source)); - parser.setJDK15(); + parser.setJdkVersion(6); parser.setExcludeMarker(marker); return parser.CompilationUnit(); } diff --git a/pmd/src/net/sourceforge/pmd/parsers/Java17Parser.java b/pmd/src/net/sourceforge/pmd/parsers/Java17Parser.java index e4d4225591..dc886e8942 100644 --- a/pmd/src/net/sourceforge/pmd/parsers/Java17Parser.java +++ b/pmd/src/net/sourceforge/pmd/parsers/Java17Parser.java @@ -18,7 +18,7 @@ public class Java17Parser implements Parser { public Object parse(Reader source) throws ParseException { parser = new JavaParser(new JavaCharStream(source)); - parser.setJDK15(); + parser.setJdkVersion(7); parser.setExcludeMarker(marker); return parser.CompilationUnit(); } diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml index 809cf9d22c..9c40ce1117 100644 --- a/pmd/xdocs/credits.xml +++ b/pmd/xdocs/credits.xml @@ -323,6 +323,7 @@
  • Riku Nykanen - patch improving TooManyMethods rule
  • Tammo van Lessen - new rule GuardDebugLogging for Jakarta Commons Logging ruleset.
  • Steven Christou - patch improving DoNotCallSystemExit rule
    • +
  • Dinesh Bolkensteyn and SonarSource - Java 7 grammar support