Attachment 146602 Details for Bug 287648 – Grammar + Parser + Misc changes v0.6

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Grammar + Parser + Misc changes v0.6

patch.txt (text/plain), 176.65 KB, created by Srikanth Sankaran

on 2009-09-07 09:06:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Srikanth Sankaran

Created: 2009-09-07 09:06:54 EDT

Size: 176.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java,v
>retrieving revision 1.166
>diff -u -r1.166 ASTConverterTestAST3_2.java
>--- src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java	17 Aug 2009 17:45:43 -0000	1.166
>+++ src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java	7 Sep 2009 12:54:31 -0000
>@@ -7622,7 +7622,7 @@
> 				true);
> 			assertEquals("Not a compilation unit", ASTNode.COMPILATION_UNIT, node.getNodeType());
> 			CompilationUnit unit = (CompilationUnit) node;
>-			assertProblemsSize(unit, 1, "Syntax error, insert \"AssignmentOperator Expression\" to complete Expression");
>+			assertProblemsSize(unit, 1, "Syntax error, insert \"VariableDeclarators\" to complete LocalVariableDeclaration");
> 			node = getASTNode(unit, 0, 0, 0);
> 			assertEquals("Not an expression statement", ASTNode.EXPRESSION_STATEMENT, node.getNodeType());
> 			assertTrue("Not recovered", isRecovered(node));
>@@ -7731,9 +7731,8 @@
> 			CompilationUnit unit = (CompilationUnit) node;
> 			assertProblemsSize(
> 					unit,
>-					2,
>-					"Object.equ cannot be resolved to a variable\n" +
>-					"Syntax error, insert \"AssignmentOperator Expression\" to complete Expression");
>+					1,
>+					"Syntax error, insert \"VariableDeclarators\" to complete LocalVariableDeclaration");
> 			node = getASTNode(unit, 0, 0);
> 			assertEquals("Not a field declaration statement", ASTNode.INITIALIZER, node.getNodeType());
> 			Initializer initializer = (Initializer) node;
>@@ -7999,75 +7998,83 @@
> 				"}");
> 
> 		assertASTResult(
>-				"===== AST =====\n" +
>-				"import java.nio.ByteBuffer;\n" +
>-				"import java.nio.CharBuffer;\n" +
>-				"import java.nio.charset.Charset;\n" +
>-				"import java.nio.charset.CharsetDecoder;\n" +
>-				"import java.nio.charset.CharsetEncoder;\n" +
>-				"import java.nio.charset.CoderResult;\n" +
>-				"public class TestCharset extends Charset {\n" +
>-				"  public CharsetDecoder newDecoder(){\n" +
>-				"    return new CharsetDecoder(this,2.0,2.0){\n" +
>-				"      void CharsetDecoder(){\n" +
>-				"      }\n" +
>-				"      protected CoderResult decodeLoop(      ByteBuffer in,      CharBuffer out){\n" +
>-				"        return null;\n" +
>-				"      }\n" +
>-				"    }\n" +
>-				";\n" +
>-				"    ;\n" +
>-				"  }\n" +
>-				"  public CharsetEncoder newEncoder(){\n" +
>-				"    return null;\n" +
>-				"  }\n" +
>-				"}\n" +
>-				"\n" +
>-				"===== Details =====\n" +
>-				"===== Problems =====\n" +
>-				"1. ERROR in /Converter/src/TestCharset.java (at line 1)\n" +
>-				"	import java.nio.ByteBuffer;\n" +
>-				"	       ^^^^^^^^\n" +
>-				"The import java.nio cannot be resolved\n" +
>-				"2. ERROR in /Converter/src/TestCharset.java (at line 2)\n" +
>-				"	import java.nio.CharBuffer;\n" +
>-				"	       ^^^^^^^^\n" +
>-				"The import java.nio cannot be resolved\n" +
>-				"3. ERROR in /Converter/src/TestCharset.java (at line 3)\n" +
>-				"	import java.nio.charset.Charset;\n" +
>-				"	       ^^^^^^^^\n" +
>-				"The import java.nio cannot be resolved\n" +
>-				"4. ERROR in /Converter/src/TestCharset.java (at line 4)\n" +
>-				"	import java.nio.charset.CharsetDecoder;\n" +
>-				"	       ^^^^^^^^\n" +
>-				"The import java.nio cannot be resolved\n" +
>-				"5. ERROR in /Converter/src/TestCharset.java (at line 5)\n" +
>-				"	import java.nio.charset.CharsetEncoder;\n" +
>-				"	       ^^^^^^^^\n" +
>-				"The import java.nio cannot be resolved\n" +
>-				"6. ERROR in /Converter/src/TestCharset.java (at line 6)\n" +
>-				"	import java.nio.charset.CoderResult;\n" +
>-				"	       ^^^^^^^^\n" +
>-				"The import java.nio cannot be resolved\n" +
>-				"7. ERROR in /Converter/src/TestCharset.java (at line 7)\n" +
>-				"	public class TestCharset extends Charset {\n" +
>-				"	                                 ^^^^^^^\n" +
>-				"Charset cannot be resolved to a type\n" +
>-				"8. ERROR in /Converter/src/TestCharset.java (at line 8)\n" +
>-				"	public CharsetDecoder newDecoder() {\n" +
>-				"	       ^^^^^^^^^^^^^^\n" +
>-				"CharsetDecoder cannot be resolved to a type\n" +
>-				"9. ERROR in /Converter/src/TestCharset.java (at line 9)\n" +
>-				"	return new CharsetDecoder(this, 2.0, 2.0) {\n" +
>-				"	           ^^^^^^^^^^^^^^\n" +
>-				"CharsetDecoder cannot be resolved to a type\n" +
>-				"10. ERROR in /Converter/src/TestCharset.java (at line 10)\n" +
>-				"	CharsetDecoder(CharSet\n" +
>-				"	^^^^^^^^^^^^^^^^^^^^^^\n" +
>-				"Syntax error on token(s), misplaced construct(s)\n" +
>-				"11. ERROR in /Converter/src/TestCharset.java (at line 17)\n" +
>-				"	public CharsetEncoder newEncoder() {\n" +
>-				"	       ^^^^^^^^^^^^^^\n" +
>+				"===== AST =====\n" + 
>+				"import java.nio.ByteBuffer;\n" + 
>+				"import java.nio.CharBuffer;\n" + 
>+				"import java.nio.charset.Charset;\n" + 
>+				"import java.nio.charset.CharsetDecoder;\n" + 
>+				"import java.nio.charset.CharsetEncoder;\n" + 
>+				"import java.nio.charset.CoderResult;\n" + 
>+				"public class TestCharset extends Charset {\n" + 
>+				"  public CharsetDecoder newDecoder(){\n" + 
>+				"    return new CharsetDecoder(this,2.0,2.0){\n" + 
>+				"      void CharsetDecoder(){\n" + 
>+				"      }\n" + 
>+				"      protected CoderResult decodeLoop(      ByteBuffer in,      CharBuffer out){\n" + 
>+				"        return null;\n" + 
>+				"      }\n" + 
>+				"    }\n" + 
>+				";\n" + 
>+				"    ;\n" + 
>+				"  }\n" + 
>+				"  public CharsetEncoder newEncoder(){\n" + 
>+				"    return null;\n" + 
>+				"  }\n" + 
>+				"}\n" + 
>+				"\n" + 
>+				"===== Details =====\n" + 
>+				"===== Problems =====\n" + 
>+				"1. ERROR in /Converter/src/TestCharset.java (at line 1)\n" + 
>+				"	import java.nio.ByteBuffer;\n" + 
>+				"	       ^^^^^^^^\n" + 
>+				"The import java.nio cannot be resolved\n" + 
>+				"2. ERROR in /Converter/src/TestCharset.java (at line 2)\n" + 
>+				"	import java.nio.CharBuffer;\n" + 
>+				"	       ^^^^^^^^\n" + 
>+				"The import java.nio cannot be resolved\n" + 
>+				"3. ERROR in /Converter/src/TestCharset.java (at line 3)\n" + 
>+				"	import java.nio.charset.Charset;\n" + 
>+				"	       ^^^^^^^^\n" + 
>+				"The import java.nio cannot be resolved\n" + 
>+				"4. ERROR in /Converter/src/TestCharset.java (at line 4)\n" + 
>+				"	import java.nio.charset.CharsetDecoder;\n" + 
>+				"	       ^^^^^^^^\n" + 
>+				"The import java.nio cannot be resolved\n" + 
>+				"5. ERROR in /Converter/src/TestCharset.java (at line 5)\n" + 
>+				"	import java.nio.charset.CharsetEncoder;\n" + 
>+				"	       ^^^^^^^^\n" + 
>+				"The import java.nio cannot be resolved\n" + 
>+				"6. ERROR in /Converter/src/TestCharset.java (at line 6)\n" + 
>+				"	import java.nio.charset.CoderResult;\n" + 
>+				"	       ^^^^^^^^\n" + 
>+				"The import java.nio cannot be resolved\n" + 
>+				"7. ERROR in /Converter/src/TestCharset.java (at line 7)\n" + 
>+				"	public class TestCharset extends Charset {\n" + 
>+				"	                                 ^^^^^^^\n" + 
>+				"Charset cannot be resolved to a type\n" + 
>+				"8. ERROR in /Converter/src/TestCharset.java (at line 8)\n" + 
>+				"	public CharsetDecoder newDecoder() {\n" + 
>+				"	       ^^^^^^^^^^^^^^\n" + 
>+				"CharsetDecoder cannot be resolved to a type\n" + 
>+				"9. ERROR in /Converter/src/TestCharset.java (at line 9)\n" + 
>+				"	return new CharsetDecoder(this, 2.0, 2.0) {\n" + 
>+				"	           ^^^^^^^^^^^^^^\n" + 
>+				"CharsetDecoder cannot be resolved to a type\n" + 
>+				"10. ERROR in /Converter/src/TestCharset.java (at line 10)\n" + 
>+				"	CharsetDecoder(CharSet\n" + 
>+				"	               ^^^^^^^\n" + 
>+				"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameter\n" + 
>+				"11. ERROR in /Converter/src/TestCharset.java (at line 10)\n" + 
>+				"	CharsetDecoder(CharSet\n" + 
>+				"	               ^^^^^^^\n" + 
>+				"Syntax error, insert \")\" to complete ConstructorDeclaration\n" + 
>+				"12. ERROR in /Converter/src/TestCharset.java (at line 10)\n" + 
>+				"	CharsetDecoder(CharSet\n" + 
>+				"	               ^^^^^^^\n" + 
>+				"Syntax error, insert \";\" to complete ClassBodyDeclarations\n" + 
>+				"13. ERROR in /Converter/src/TestCharset.java (at line 17)\n" + 
>+				"	public CharsetEncoder newEncoder() {\n" + 
>+				"	       ^^^^^^^^^^^^^^\n" + 
> 				"CharsetEncoder cannot be resolved to a type\n",
> 				result);
> 		}
>#P org.eclipse.jdt.core.tests
>Index: Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java
>===================================================================
>RCS file: /home/cvs/numbat/org.eclipse.jdt.core.tests/Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java,v
>retrieving revision 1.328
>diff -u -r1.328 NegativeTest.java
>--- Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java	17 Aug 2009 17:45:39 -0000	1.328
>+++ Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java	7 Sep 2009 12:54:47 -0000
>@@ -4939,21 +4939,21 @@
> 			"  }\n" +
> 			"}",
> 		},
>-		"----------\n" +
>-		"1. ERROR in p\\NA.java (at line 7)\n" +
>-		"	(new Class1).run();\n" +
>-		"	 ^^^\n" +
>-		"Syntax error on token \"new\", delete this token\n" +
>-		"----------\n" +
>-		"2. ERROR in p\\NA.java (at line 8)\n" +
>-		"	(new Class2).run();\n" +
>-		"	 ^^^\n" +
>-		"Syntax error on token \"new\", delete this token\n" +
>-		"----------\n" +
>-		"3. ERROR in p\\NA.java (at line 9)\n" +
>-		"	(new Class3).run();\n" +
>-		"	 ^^^\n" +
>-		"Syntax error on token \"new\", delete this token\n" +
>+		"----------\n" + 
>+		"1. ERROR in p\\NA.java (at line 7)\n" + 
>+		"	(new Class1).run();\n" + 
>+		"	     ^^^^^^\n" + 
>+		"Syntax error, insert \"Dimensions\" to complete Expression\n" + 
>+		"----------\n" + 
>+		"2. ERROR in p\\NA.java (at line 8)\n" + 
>+		"	(new Class2).run();\n" + 
>+		"	     ^^^^^^\n" + 
>+		"Syntax error, insert \"Dimensions\" to complete Expression\n" + 
>+		"----------\n" + 
>+		"3. ERROR in p\\NA.java (at line 9)\n" + 
>+		"	(new Class3).run();\n" + 
>+		"	     ^^^^^^\n" + 
>+		"Syntax error, insert \"Dimensions\" to complete Expression\n" + 
> 		"----------\n"
> 	);
> }
>#P org.eclipse.jdt.core
>Index: grammar/java.g
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/grammar/java.g,v
>retrieving revision 1.10
>diff -u -r1.10 java.g
>--- grammar/java.g	7 May 2009 08:49:43 -0000	1.10
>+++ grammar/java.g	7 Sep 2009 12:54:56 -0000
>@@ -178,8 +178,11 @@
> Goal ::= '>>' Initializer
> -- error recovery
> -- Modifiersopt is used to properly consume a header and exit the rule reduction at the end of the parse() method
>-Goal ::= '>>>' Header1 Modifiersopt
>-Goal ::= '!' Header2 Modifiersopt
>+-- 1.7, we now use NonAnnotModifiersopt, since using Modifiersopt here pollutes the follow set of
>+-- various non terminals and results in shift/reduce conflicts in various places. (e.g, ConstructorHeader
>+-- cannot really have Modifiers in its follow set.)
>+Goal ::= '>>>' Header1 NonAnnotModifiersopt
>+Goal ::= '!' Header2 NonAnnotModifiersopt
> Goal ::= '*' BlockStatements
> Goal ::= '*' CatchHeader
> -- JDOM
>@@ -213,9 +216,14 @@
> BooleanLiteral -> false
> /:$readableName BooleanLiteral:/
> 
>-Type ::= PrimitiveType
>+Type ::= UnannotatedType
>+Type ::= OneOrMoreAnnotations UnannotatedType
>+/:$compliance 1.7:/
>+/:$readableName Type:/
>+
>+UnannotatedType ::= PrimitiveType
> /.$putCase consumePrimitiveType(); $break ./
>-Type -> ReferenceType
>+UnannotatedType -> ReferenceType
> /:$readableName Type:/
> 
> PrimitiveType -> NumericType
>@@ -250,14 +258,17 @@
> 
> ClassOrInterface ::= Name
> /.$putCase consumeClassOrInterfaceName();  $break ./
>-ClassOrInterface ::= GenericType '.' Name
>-/.$putCase consumeClassOrInterface();  $break ./
>+ClassOrInterface ::= GenericTypeDotName
> /:$readableName Type:/
> 
> GenericType ::= ClassOrInterface TypeArguments
> /.$putCase consumeGenericType();  $break ./
> /:$readableName GenericType:/
> 
>+GenericTypeDotName ::= GenericType '.' Name
>+/.$putCase consumeClassOrInterface();  $break ./
>+/:$readableName GenericTypeDotName:/
>+
> --
> -- These rules have been rewritten to avoid some conflicts introduced
> -- by adding the 1.1 features
>@@ -267,8 +278,7 @@
> -- ArrayType ::= ArrayType '[' ']'
> --
> 
>-ArrayTypeWithTypeArgumentsName ::= GenericType '.' Name
>-/.$putCase consumeArrayTypeWithTypeArgumentsName();  $break ./
>+ArrayTypeWithTypeArgumentsName ::= GenericTypeDotName
> /:$readableName ArrayTypeWithTypeArgumentsName:/
> 
> ArrayType ::= PrimitiveType Dims
>@@ -282,6 +292,8 @@
> /:$readableName ArrayType:/
> 
> ClassType -> ClassOrInterfaceType
>+ClassType ::= OneOrMoreAnnotations ClassOrInterfaceType
>+/:$compliance 1.7:/
> /:$readableName ClassType:/
> 
> --------------------------------------------------------------
>@@ -422,11 +434,29 @@
> 
> --18.7 Only in the LALR(1) Grammar
> 
>+NonAnnotModifiers -> NonAnnotModifier
>+NonAnnotModifiers -> NonAnnotModifiers NonAnnotModifier
>+/.$putCase consumeModifiers2(); $break ./
>+/:$readableName Modifiers:/
>+
> Modifiers -> Modifier
> Modifiers ::= Modifiers Modifier
> /.$putCase consumeModifiers2(); $break ./
> /:$readableName Modifiers:/
> 
>+NonAnnotModifier -> 'public' 
>+NonAnnotModifier -> 'protected'
>+NonAnnotModifier -> 'private'
>+NonAnnotModifier -> 'static'
>+NonAnnotModifier -> 'abstract'
>+NonAnnotModifier -> 'final'
>+NonAnnotModifier -> 'native'
>+NonAnnotModifier -> 'synchronized'
>+NonAnnotModifier -> 'transient'
>+NonAnnotModifier -> 'volatile'
>+NonAnnotModifier -> 'strictfp'
>+/:$readableName Modifier:/
>+
> Modifier -> 'public' 
> Modifier -> 'protected'
> Modifier -> 'private'
>@@ -485,6 +515,9 @@
> 
> InterfaceType ::= ClassOrInterfaceType
> /.$putCase consumeInterfaceType(); $break ./
>+InterfaceType ::= OneOrMoreAnnotations ClassOrInterfaceType
>+/:$compliance 1.7:/
>+/.$putCase consumeInterfaceType(); $break ./
> /:$readableName InterfaceType:/
> 
> ClassBody ::= '{' ClassBodyDeclarationsopt '}'
>@@ -548,7 +581,7 @@
> --    | 'transient'
> --    | 'volatile'
> 
>-FieldDeclaration ::= Modifiersopt Type VariableDeclarators ';'
>+FieldDeclaration ::= Modifiersopt UnannotatedType VariableDeclarators ';'
> /.$putCase consumeFieldDeclaration(); $break ./
> /:$readableName FieldDeclaration:/
> 
>@@ -619,7 +652,7 @@
> 
> MethodHeaderName ::= Modifiersopt TypeParameters Type 'Identifier' '('
> /.$putCase consumeMethodHeaderNameWithTypeParameters(false); $break ./
>-MethodHeaderName ::= Modifiersopt Type 'Identifier' '('
>+MethodHeaderName ::= Modifiersopt UnannotatedType 'Identifier' '('
> /.$putCase consumeMethodHeaderName(false); $break ./
> /:$readableName MethodHeaderName:/
> 
>@@ -628,7 +661,7 @@
> /:$readableName ):/
> /:$recovery_template ):/
> 
>-MethodHeaderExtendedDims ::= Dimsopt
>+MethodHeaderExtendedDims ::= DimsoptAnnotsopt
> /.$putCase consumeMethodHeaderExtendedDims(); $break ./
> /:$readableName MethodHeaderExtendedDims:/
> 
>@@ -638,6 +671,9 @@
> 
> ConstructorHeader ::= ConstructorHeaderName FormalParameterListopt MethodHeaderRightParen MethodHeaderThrowsClauseopt
> /.$putCase consumeConstructorHeader(); $break ./
>+ConstructorHeader ::= ConstructorHeaderName FormalParameterListopt MethodHeaderRightParen OneOrMoreAnnotations MethodHeaderThrowsClauseopt
>+/:$compliance 1.7:/
>+/.$putCase consumeConstructorHeader(); $break ./
> /:$readableName ConstructorDeclaration:/
> 
> ConstructorHeaderName ::=  Modifiersopt TypeParameters 'Identifier' '('
>@@ -651,10 +687,33 @@
> /.$putCase consumeFormalParameterList(); $break ./
> /:$readableName FormalParameterList:/
> 
>+PotentialNameArray -> $empty
>+/.$putCase consumePotentialNameArrayType(); $break ./
>+/:$readableName PotentialNameArray:/
>+
> --1.1 feature
>-FormalParameter ::= Modifiersopt Type VariableDeclaratorId
>+--FormalParameter ::= Modifiersopt Type VariableDeclaratorId
>+--FormalParameter ::= Modifiersopt Type '...' VariableDeclaratorId
>+--The above rules have been rewritten by inlinng the type subgrammar
>+--to avoid the conflicts resulting from jsr308 changes.
>+FormalParameter ::= Modifiersopt PrimitiveType DimsoptAnnotsopt VariableDeclaratorId
>+/.$putCase consumeFormalParameter(false); $break ./
>+FormalParameter ::= Modifiersopt PrimitiveType DimsoptAnnotsopt '...' VariableDeclaratorId
>+/.$putCase consumeFormalParameter(true); $break ./
>+/:$compliance 1.5:/
>+FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt PotentialNameArray VariableDeclaratorId
>+/.$putCase consumeFormalParameter(false); $break ./
>+FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt PotentialNameArray '...' VariableDeclaratorId
>+/.$putCase consumeFormalParameter(true); $break ./
>+/:$compliance 1.5:/
>+FormalParameter ::= Modifiersopt GenericType DimsoptAnnotsopt VariableDeclaratorId
> /.$putCase consumeFormalParameter(false); $break ./
>-FormalParameter ::= Modifiersopt Type '...' VariableDeclaratorId
>+FormalParameter ::= Modifiersopt GenericType DimsoptAnnotsopt '...' VariableDeclaratorId
>+/.$putCase consumeFormalParameter(true); $break ./
>+/:$compliance 1.5:/
>+FormalParameter ::= Modifiersopt GenericTypeDotName DimsoptAnnotsopt VariableDeclaratorId
>+/.$putCase consumeFormalParameter(false); $break ./
>+FormalParameter ::= Modifiersopt GenericTypeDotName DimsoptAnnotsopt '...' VariableDeclaratorId
> /.$putCase consumeFormalParameter(true); $break ./
> /:$readableName FormalParameter:/
> /:$compliance 1.5:/
>@@ -865,13 +924,13 @@
> /.$putCase consumeLocalVariableDeclarationStatement(); $break ./
> /:$readableName LocalVariableDeclarationStatement:/
> 
>-LocalVariableDeclaration ::= Type PushModifiers VariableDeclarators
>+LocalVariableDeclaration ::= UnannotatedType PushModifiers VariableDeclarators
> /.$putCase consumeLocalVariableDeclaration(); $break ./
> -- 1.1 feature
> -- The modifiers part of this rule makes the grammar more permissive. 
> -- The only modifier here is final. We put Modifiers to allow multiple modifiers
> -- This will require to check the validity of the modifier
>-LocalVariableDeclaration ::= Modifiers Type PushRealModifiers VariableDeclarators
>+LocalVariableDeclaration ::= Modifiers UnannotatedType PushRealModifiers VariableDeclarators
> /.$putCase consumeLocalVariableDeclaration(); $break ./
> /:$readableName LocalVariableDeclaration:/
> 
>@@ -1219,24 +1278,42 @@
> 
> ArrayCreationHeader ::= 'new' PrimitiveType DimWithOrWithOutExprs
> /.$putCase consumeArrayCreationHeader(); $break ./
>+ArrayCreationHeader ::= 'new' OneOrMoreAnnotations PrimitiveType DimWithOrWithOutExprs
>+/:$compliance 1.7:/
>+/.$putCase consumeArrayCreationHeader(); $break ./
> 
> ArrayCreationHeader ::= 'new' ClassOrInterfaceType DimWithOrWithOutExprs
> /.$putCase consumeArrayCreationHeader(); $break ./
>+ArrayCreationHeader ::= 'new' OneOrMoreAnnotations ClassOrInterfaceType DimWithOrWithOutExprs
>+/:$compliance 1.7:/
>+/.$putCase consumeArrayCreationHeader(); $break ./
> /:$readableName ArrayCreationHeader:/
> 
> ArrayCreationWithoutArrayInitializer ::= 'new' PrimitiveType DimWithOrWithOutExprs
> /.$putCase consumeArrayCreationExpressionWithoutInitializer(); $break ./
>+ArrayCreationWithoutArrayInitializer ::= 'new' OneOrMoreAnnotations PrimitiveType DimWithOrWithOutExprs
>+/:$compliance 1.7:/
>+/.$putCase consumeArrayCreationExpressionWithoutInitializer(); $break ./
> /:$readableName ArrayCreationWithoutArrayInitializer:/
> 
> ArrayCreationWithArrayInitializer ::= 'new' PrimitiveType DimWithOrWithOutExprs ArrayInitializer
> /.$putCase consumeArrayCreationExpressionWithInitializer(); $break ./
>+ArrayCreationWithArrayInitializer ::= 'new' OneOrMoreAnnotations PrimitiveType DimWithOrWithOutExprs ArrayInitializer
>+/:$compliance 1.7:/
>+/.$putCase consumeArrayCreationExpressionWithInitializer(); $break ./
> /:$readableName ArrayCreationWithArrayInitializer:/
> 
> ArrayCreationWithoutArrayInitializer ::= 'new' ClassOrInterfaceType DimWithOrWithOutExprs
> /.$putCase consumeArrayCreationExpressionWithoutInitializer(); $break ./
>+ArrayCreationWithoutArrayInitializer ::= 'new' OneOrMoreAnnotations ClassOrInterfaceType DimWithOrWithOutExprs
>+/:$compliance 1.7:/
>+/.$putCase consumeArrayCreationExpressionWithoutInitializer(); $break ./
> 
> ArrayCreationWithArrayInitializer ::= 'new' ClassOrInterfaceType DimWithOrWithOutExprs ArrayInitializer
> /.$putCase consumeArrayCreationExpressionWithInitializer(); $break ./
>+ArrayCreationWithArrayInitializer ::= 'new' OneOrMoreAnnotations ClassOrInterfaceType DimWithOrWithOutExprs ArrayInitializer
>+/:$compliance 1.7:/
>+/.$putCase consumeArrayCreationExpressionWithInitializer(); $break ./
> 
> DimWithOrWithOutExprs ::= DimWithOrWithOutExpr
> DimWithOrWithOutExprs ::= DimWithOrWithOutExprs DimWithOrWithOutExpr
>@@ -1249,6 +1326,30 @@
> /:$readableName Dimension:/
> -- -----------------------------------------------
> 
>+-- jsr 308
>+
>+DimsoptAnnotsopt -> $empty
>+/. $putCase consumeEmptyDimsoptAnnotsopt(); $break ./
>+/:$readableName AnnotationsDimensionsSequence:/
>+DimsoptAnnotsopt -> DimsAnnotLoop
>+/. $putCase consumeDimsWithTrailingAnnotsopt(); $break ./
>+/:$readableName Dimensionsoptannotsopt:/
>+DimsAnnotLoop ::= OneDimOrAnnot
>+DimsAnnotLoop ::= DimsAnnotLoop OneDimOrAnnot
>+/:$readableName DimsAnnotLoop:/
>+
>+OneDimOrAnnot -> Annotation
>+/:$compliance 1.7:/
>+OneDimOrAnnot -> '[' ']'
>+/. $putCase consumeOneDimLoop(); $break ./
>+/:$readableName OneDimensionOrAnnotation:/
>+
>+OneOrMoreAnnotations -> Annotation
>+/:$compliance 1.7:/
>+OneOrMoreAnnotations ::= OneOrMoreAnnotations Annotation
>+/:$compliance 1.7:/
>+/:$readableName OneOrMoreAnnotations:/
>+
> Dims ::= DimsLoop
> /. $putCase consumeDims(); $break ./
> /:$readableName Dimensions:/
>@@ -1258,6 +1359,10 @@
> OneDimLoop ::= '[' ']'
> /. $putCase consumeOneDimLoop(); $break ./
> /:$readableName Dimension:/
>+OneDimLoop ::= OneOrMoreAnnotations '[' ']'
>+/:$compliance 1.7:/
>+/. $putCase consumeOneDimLoopWithAnnotations(); $break ./
>+/:$readableName DimensionWithAnnotations:/
> 
> FieldAccess ::= Primary '.' 'Identifier'
> /.$putCase consumeFieldAccess(false); $break ./
>@@ -1340,14 +1445,29 @@
> 
> CastExpression ::= PushLPAREN PrimitiveType Dimsopt PushRPAREN InsideCastExpression UnaryExpression
> /.$putCase consumeCastExpressionWithPrimitiveType(); $break ./
>+CastExpression ::= PushLPAREN OneOrMoreAnnotations PrimitiveType Dimsopt PushRPAREN InsideCastExpression UnaryExpression
>+/:$compliance 1.7:/
>+/.$putCase consumeCastExpressionWithPrimitiveType(); $break ./
> CastExpression ::= PushLPAREN Name OnlyTypeArgumentsForCastExpression Dimsopt PushRPAREN InsideCastExpression UnaryExpressionNotPlusMinus
> /.$putCase consumeCastExpressionWithGenericsArray(); $break ./
>+CastExpression ::= PushLPAREN OneOrMoreAnnotations Name OnlyTypeArgumentsForCastExpression Dimsopt PushRPAREN InsideCastExpression UnaryExpressionNotPlusMinus
>+/:$compliance 1.7:/
>+/.$putCase consumeCastExpressionWithGenericsArray(); $break ./
> CastExpression ::= PushLPAREN Name OnlyTypeArgumentsForCastExpression '.' ClassOrInterfaceType Dimsopt PushRPAREN InsideCastExpressionWithQualifiedGenerics UnaryExpressionNotPlusMinus
> /.$putCase consumeCastExpressionWithQualifiedGenericsArray(); $break ./
>+CastExpression ::= PushLPAREN OneOrMoreAnnotations Name OnlyTypeArgumentsForCastExpression '.' ClassOrInterfaceType Dimsopt PushRPAREN InsideCastExpressionWithQualifiedGenerics UnaryExpressionNotPlusMinus
>+/:$compliance 1.7:/
>+/.$putCase consumeCastExpressionWithQualifiedGenericsArray(); $break ./
> CastExpression ::= PushLPAREN Name PushRPAREN InsideCastExpressionLL1 UnaryExpressionNotPlusMinus
> /.$putCase consumeCastExpressionLL1(); $break ./
>+CastExpression ::= PushLPAREN OneOrMoreAnnotations Name PushRPAREN InsideCastExpressionLL1 UnaryExpressionNotPlusMinus
>+/:$compliance 1.7:/
>+/.$putCase consumeCastExpressionLL1(); $break ./
> CastExpression ::= PushLPAREN Name Dims PushRPAREN InsideCastExpression UnaryExpressionNotPlusMinus
> /.$putCase consumeCastExpressionWithNameArray(); $break ./
>+CastExpression ::= PushLPAREN OneOrMoreAnnotations Name Dims PushRPAREN InsideCastExpression UnaryExpressionNotPlusMinus
>+/:$compliance 1.7:/
>+/.$putCase consumeCastExpressionWithNameArray(); $break ./
> /:$readableName CastExpression:/
> 
> OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments
>@@ -1403,6 +1523,9 @@
> InstanceofExpression -> RelationalExpression
> InstanceofExpression ::= InstanceofExpression 'instanceof' ReferenceType
> /.$putCase consumeInstanceOfExpression(); $break ./
>+InstanceofExpression ::= InstanceofExpression 'instanceof' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeInstanceOfExpression(); $break ./
> /:$readableName Expression:/
> 
> EqualityExpression -> InstanceofExpression
>@@ -1526,6 +1649,12 @@
> /.$putCase consumeClassBodyDeclarationsopt(); $break ./
> /:$readableName ClassBodyDeclarations:/
> 
>+NonAnnotModifiersopt ::= $empty 
>+/. $putCase consumeDefaultModifiers(); $break ./
>+NonAnnotModifiersopt ::= NonAnnotModifiers
>+/.$putCase consumeModifiers(); $break ./ 
>+/:$readableName Modifiers:/
>+
> Modifiersopt ::= $empty 
> /. $putCase consumeDefaultModifiers(); $break ./
> Modifiersopt ::= Modifiers
>@@ -1666,11 +1795,11 @@
> /.$putCase consumeEnhancedForStatement(); $break ./
> /:$readableName EnhancedForStatementNoShortIf:/
> 
>-EnhancedForStatementHeaderInit ::= 'for' '(' Type PushModifiers Identifier Dimsopt
>+EnhancedForStatementHeaderInit ::= 'for' '(' UnannotatedType PushModifiers Identifier Dimsopt
> /.$putCase consumeEnhancedForStatementHeaderInit(false); $break ./
> /:$readableName EnhancedForStatementHeaderInit:/
> 
>-EnhancedForStatementHeaderInit ::= 'for' '(' Modifiers Type PushRealModifiers Identifier Dimsopt
>+EnhancedForStatementHeaderInit ::= 'for' '(' Modifiers UnannotatedType PushRealModifiers Identifier Dimsopt
> /.$putCase consumeEnhancedForStatementHeaderInit(true); $break ./
> /:$readableName EnhancedForStatementHeaderInit:/
> 
>@@ -1730,6 +1859,9 @@
> TypeArgument ::= ReferenceType
> /.$putCase consumeTypeArgument(); $break ./
> /:$compliance 1.5:/
>+TypeArgument ::= OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeArgument(); $break ./
> TypeArgument -> Wildcard
> /:$readableName TypeArgument:/
> /:$compliance 1.5:/
>@@ -1743,10 +1875,16 @@
> ReferenceType1 ::= ReferenceType '>'
> /.$putCase consumeReferenceType1(); $break ./
> /:$compliance 1.5:/
>+ReferenceType1 ::= OneOrMoreAnnotations ReferenceType '>'
>+/:$compliance 1.7:/
>+/.$putCase consumeReferenceType1(); $break ./
> ReferenceType1 ::= ClassOrInterface '<' TypeArgumentList2
> /.$putCase consumeTypeArgumentReferenceType1(); $break ./
>-/:$readableName ReferenceType1:/
> /:$compliance 1.5:/
>+ReferenceType1 ::= OneOrMoreAnnotations ClassOrInterface '<' TypeArgumentList2
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeArgumentReferenceType1(); $break ./
>+/:$readableName ReferenceType1:/
> 
> TypeArgumentList2 -> TypeArgument2
> /:$compliance 1.5:/
>@@ -1764,10 +1902,16 @@
> ReferenceType2 ::= ReferenceType '>>'
> /.$putCase consumeReferenceType2(); $break ./
> /:$compliance 1.5:/
>+ReferenceType2 ::= OneOrMoreAnnotations ReferenceType '>>'
>+/:$compliance 1.7:/
>+/.$putCase consumeReferenceType2(); $break ./
> ReferenceType2 ::= ClassOrInterface '<' TypeArgumentList3
> /.$putCase consumeTypeArgumentReferenceType2(); $break ./
>-/:$readableName ReferenceType2:/
> /:$compliance 1.5:/
>+ReferenceType2 ::= OneOrMoreAnnotations ClassOrInterface '<' TypeArgumentList3
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeArgumentReferenceType2(); $break ./
>+/:$readableName ReferenceType2:/
> 
> TypeArgumentList3 -> TypeArgument3
> TypeArgumentList3 ::= TypeArgumentList ',' TypeArgument3
>@@ -1782,8 +1926,11 @@
> 
> ReferenceType3 ::= ReferenceType '>>>'
> /.$putCase consumeReferenceType3(); $break ./
>-/:$readableName ReferenceType3:/
> /:$compliance 1.5:/
>+ReferenceType3 ::= OneOrMoreAnnotations ReferenceType '>>>'
>+/:$compliance 1.7:/
>+/.$putCase consumeReferenceType3(); $break ./
>+/:$readableName ReferenceType3:/
> 
> Wildcard ::= '?'
> /.$putCase consumeWildcard(); $break ./
>@@ -1796,10 +1943,16 @@
> WildcardBounds ::= 'extends' ReferenceType
> /.$putCase consumeWildcardBoundsExtends(); $break ./
> /:$compliance 1.5:/
>+WildcardBounds ::= 'extends' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeWildcardBoundsExtends(); $break ./
> WildcardBounds ::= 'super' ReferenceType
> /.$putCase consumeWildcardBoundsSuper(); $break ./
>-/:$readableName WildcardBounds:/
> /:$compliance 1.5:/
>+WildcardBounds ::= 'super' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeWildcardBoundsSuper(); $break ./
>+/:$readableName WildcardBounds:/
> 
> Wildcard1 ::= '?' '>'
> /.$putCase consumeWildcard1(); $break ./
>@@ -1851,8 +2004,11 @@
> 
> TypeParameterHeader ::= Identifier
> /.$putCase consumeTypeParameterHeader(); $break ./
>-/:$readableName TypeParameter:/
> /:$compliance 1.5:/
>+TypeParameterHeader ::= OneOrMoreAnnotations Identifier
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeParameterHeader(); $break ./
>+/:$readableName TypeParameter:/
> 
> TypeParameters ::= '<' TypeParameterList1
> /.$putCase consumeTypeParameters(); $break ./
>@@ -1871,10 +2027,16 @@
> TypeParameter ::= TypeParameterHeader 'extends' ReferenceType
> /.$putCase consumeTypeParameterWithExtends(); $break ./
> /:$compliance 1.5:/
>+TypeParameter ::= TypeParameterHeader 'extends' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeParameterWithExtends(); $break ./
> TypeParameter ::= TypeParameterHeader 'extends' ReferenceType AdditionalBoundList
> /.$putCase consumeTypeParameterWithExtendsAndBounds(); $break ./
>-/:$readableName TypeParameter:/
> /:$compliance 1.5:/
>+TypeParameter ::= TypeParameterHeader 'extends' OneOrMoreAnnotations ReferenceType AdditionalBoundList
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeParameterWithExtendsAndBounds(); $break ./
>+/:$readableName TypeParameter:/
> 
> AdditionalBoundList -> AdditionalBound
> /:$compliance 1.5:/
>@@ -1884,8 +2046,11 @@
> 
> AdditionalBound ::= '&' ReferenceType
> /.$putCase consumeAdditionalBound(); $break ./
>-/:$readableName AdditionalBound:/
> /:$compliance 1.5:/
>+AdditionalBound ::= '&' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeAdditionalBound(); $break ./
>+/:$readableName AdditionalBound:/
> 
> TypeParameterList1 -> TypeParameter1
> /:$compliance 1.5:/
>@@ -1902,8 +2067,11 @@
> /:$compliance 1.5:/
> TypeParameter1 ::= TypeParameterHeader 'extends' ReferenceType AdditionalBoundList1
> /.$putCase consumeTypeParameter1WithExtendsAndBounds(); $break ./
>-/:$readableName TypeParameter1:/
> /:$compliance 1.5:/
>+TypeParameter1 ::= TypeParameterHeader 'extends' OneOrMoreAnnotations ReferenceType AdditionalBoundList1
>+/:$compliance 1.7:/
>+/.$putCase consumeTypeParameter1WithExtendsAndBounds(); $break ./
>+/:$readableName TypeParameter1:/
> 
> AdditionalBoundList1 -> AdditionalBound1
> /:$compliance 1.5:/
>@@ -2005,8 +2173,14 @@
> InstanceofExpression_NotName -> RelationalExpression_NotName
> InstanceofExpression_NotName ::= Name 'instanceof' ReferenceType
> /.$putCase consumeInstanceOfExpressionWithName(); $break ./
>+InstanceofExpression_NotName ::= Name 'instanceof' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeInstanceOfExpressionWithName(); $break ./
> InstanceofExpression_NotName  ::= InstanceofExpression_NotName 'instanceof' ReferenceType
> /.$putCase consumeInstanceOfExpression(); $break ./
>+InstanceofExpression_NotName  ::= InstanceofExpression_NotName 'instanceof' OneOrMoreAnnotations ReferenceType
>+/:$compliance 1.7:/
>+/.$putCase consumeInstanceOfExpression(); $break ./
> /:$readableName Expression:/
> 
> EqualityExpression_NotName -> InstanceofExpression_NotName
>@@ -2119,7 +2293,7 @@
> 
> AnnotationMethodHeaderName ::= Modifiersopt TypeParameters Type 'Identifier' '('
> /.$putCase consumeMethodHeaderNameWithTypeParameters(true); $break ./
>-AnnotationMethodHeaderName ::= Modifiersopt Type 'Identifier' '('
>+AnnotationMethodHeaderName ::= Modifiersopt UnannotatedType 'Identifier' '('
> /.$putCase consumeMethodHeaderName(true); $break ./
> /:$readableName MethodHeaderName:/
> /:$compliance 1.5:/
>@@ -2262,7 +2436,7 @@
> RecoveryMethodHeaderName ::= Modifiersopt TypeParameters Type 'Identifier' '('
> /.$putCase consumeRecoveryMethodHeaderNameWithTypeParameters(); $break ./
> /:$compliance 1.5:/
>-RecoveryMethodHeaderName ::= Modifiersopt Type 'Identifier' '('
>+RecoveryMethodHeaderName ::= Modifiersopt UnannotatedType 'Identifier' '('
> /.$putCase consumeRecoveryMethodHeaderName(); $break ./
> /:$readableName MethodHeaderName:/
> 
>@@ -2331,3 +2505,4 @@
> 
> $end
> -- need a carriage return after the $end
>+
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java,v
>retrieving revision 1.406
>diff -u -r1.406 Parser.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java	26 Aug 2009 22:56:29 -0000	1.406
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java	7 Sep 2009 12:54:53 -0000
>@@ -4721,6 +4721,17 @@
> protected void consumeModifiers2() {
> 	this.expressionLengthStack[this.expressionLengthPtr - 1] += this.expressionLengthStack[this.expressionLengthPtr--];
> }
>+
>+protected void consumePotentialNameArrayType () {
>+	
>+	// FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt PotentialNameArray VariableDeclaratorId
>+	// FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt PotentialNameArray '...' VariableDeclaratorId
>+	// PotentialNameArray -> $empty
>+	// Dimensions including lack of have been pushed appropriately by action attached to DimsoptAnnotsopt
>+	pushOnGenericsLengthStack(0); // handle type arguments
>+	pushOnGenericsIdentifiersLengthStack(this.identifierLengthStack[this.identifierLengthPtr]);
>+}
>+
> protected void consumeNameArrayType() {
> 	pushOnGenericsLengthStack(0); // handle type arguments
> 	pushOnGenericsIdentifiersLengthStack(this.identifierLengthStack[this.identifierLengthPtr]);
>@@ -5126,1686 +5137,1869 @@
> // This method is part of an automatic generation : do NOT edit-modify  
> protected void consumeRule(int act) {
>   switch ( act ) {
>-    case 30 : if (DEBUG) { System.out.println("Type ::= PrimitiveType"); }  //$NON-NLS-1$
>+    case 32 : if (DEBUG) { System.out.println("UnannotatedType ::= PrimitiveType"); }  //$NON-NLS-1$
> 		    consumePrimitiveType();  
> 			break;
>  
>-    case 44 : if (DEBUG) { System.out.println("ReferenceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
>+    case 46 : if (DEBUG) { System.out.println("ReferenceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
> 		    consumeReferenceType();   
> 			break;
>  
>-    case 48 : if (DEBUG) { System.out.println("ClassOrInterface ::= Name"); }  //$NON-NLS-1$
>+    case 50 : if (DEBUG) { System.out.println("ClassOrInterface ::= Name"); }  //$NON-NLS-1$
> 		    consumeClassOrInterfaceName();   
> 			break;
>  
>-    case 49 : if (DEBUG) { System.out.println("ClassOrInterface ::= GenericType DOT Name"); }  //$NON-NLS-1$
>-		    consumeClassOrInterface();   
>-			break;
>- 
>-    case 50 : if (DEBUG) { System.out.println("GenericType ::= ClassOrInterface TypeArguments"); }  //$NON-NLS-1$
>+    case 52 : if (DEBUG) { System.out.println("GenericType ::= ClassOrInterface TypeArguments"); }  //$NON-NLS-1$
> 		    consumeGenericType();   
> 			break;
>  
>-    case 51 : if (DEBUG) { System.out.println("ArrayTypeWithTypeArgumentsName ::= GenericType DOT Name"); }  //$NON-NLS-1$
>-		    consumeArrayTypeWithTypeArgumentsName();   
>+    case 53 : if (DEBUG) { System.out.println("GenericTypeDotName ::= GenericType DOT Name"); }  //$NON-NLS-1$
>+		    consumeClassOrInterface();   
> 			break;
>  
>-    case 52 : if (DEBUG) { System.out.println("ArrayType ::= PrimitiveType Dims"); }  //$NON-NLS-1$
>+    case 55 : if (DEBUG) { System.out.println("ArrayType ::= PrimitiveType Dims"); }  //$NON-NLS-1$
> 		    consumePrimitiveArrayType();   
> 			break;
>  
>-    case 53 : if (DEBUG) { System.out.println("ArrayType ::= Name Dims"); }  //$NON-NLS-1$
>+    case 56 : if (DEBUG) { System.out.println("ArrayType ::= Name Dims"); }  //$NON-NLS-1$
> 		    consumeNameArrayType();   
> 			break;
>  
>-    case 54 : if (DEBUG) { System.out.println("ArrayType ::= ArrayTypeWithTypeArgumentsName Dims"); }  //$NON-NLS-1$
>+    case 57 : if (DEBUG) { System.out.println("ArrayType ::= ArrayTypeWithTypeArgumentsName Dims"); }  //$NON-NLS-1$
> 		    consumeGenericTypeNameArrayType();   
> 			break;
>  
>-    case 55 : if (DEBUG) { System.out.println("ArrayType ::= GenericType Dims"); }  //$NON-NLS-1$
>+    case 58 : if (DEBUG) { System.out.println("ArrayType ::= GenericType Dims"); }  //$NON-NLS-1$
> 		    consumeGenericTypeArrayType();   
> 			break;
>  
>-    case 60 : if (DEBUG) { System.out.println("QualifiedName ::= Name DOT SimpleName"); }  //$NON-NLS-1$
>+    case 64 : if (DEBUG) { System.out.println("QualifiedName ::= Name DOT SimpleName"); }  //$NON-NLS-1$
> 		    consumeQualifiedName();  
> 			break;
>  
>-    case 61 : if (DEBUG) { System.out.println("CompilationUnit ::= EnterCompilationUnit..."); }  //$NON-NLS-1$
>+    case 65 : if (DEBUG) { System.out.println("CompilationUnit ::= EnterCompilationUnit..."); }  //$NON-NLS-1$
> 		    consumeCompilationUnit();  
> 			break;
>  
>-    case 62 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration"); }  //$NON-NLS-1$
>+    case 66 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration"); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnit();  
> 			break;
>  
>-    case 63 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
>+    case 67 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnit();  
> 			break;
>  
>-    case 64 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
>+    case 68 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>  
>-    case 65 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
>+    case 69 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>  
>-    case 66 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ImportDeclarations..."); }  //$NON-NLS-1$
>+    case 70 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ImportDeclarations..."); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnit();  
> 			break;
>  
>-    case 67 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= TypeDeclarations"); }  //$NON-NLS-1$
>+    case 71 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= TypeDeclarations"); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>  
>-    case 68 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ImportDeclarations..."); }  //$NON-NLS-1$
>+    case 72 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ImportDeclarations..."); }  //$NON-NLS-1$
> 		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>  
>-    case 69 : if (DEBUG) { System.out.println("InternalCompilationUnit ::="); }  //$NON-NLS-1$
>+    case 73 : if (DEBUG) { System.out.println("InternalCompilationUnit ::="); }  //$NON-NLS-1$
> 		    consumeEmptyInternalCompilationUnit();  
> 			break;
>  
>-    case 70 : if (DEBUG) { System.out.println("ReduceImports ::="); }  //$NON-NLS-1$
>+    case 74 : if (DEBUG) { System.out.println("ReduceImports ::="); }  //$NON-NLS-1$
> 		    consumeReduceImports();  
> 			break;
>  
>-    case 71 : if (DEBUG) { System.out.println("EnterCompilationUnit ::="); }  //$NON-NLS-1$
>+    case 75 : if (DEBUG) { System.out.println("EnterCompilationUnit ::="); }  //$NON-NLS-1$
> 		    consumeEnterCompilationUnit();  
> 			break;
>  
>-    case 87 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
>+    case 91 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
> 		    consumeCatchHeader();  
> 			break;
>  
>-    case 89 : if (DEBUG) { System.out.println("ImportDeclarations ::= ImportDeclarations..."); }  //$NON-NLS-1$
>+    case 93 : if (DEBUG) { System.out.println("ImportDeclarations ::= ImportDeclarations..."); }  //$NON-NLS-1$
> 		    consumeImportDeclarations();  
> 			break;
>  
>-    case 91 : if (DEBUG) { System.out.println("TypeDeclarations ::= TypeDeclarations TypeDeclaration"); }  //$NON-NLS-1$
>+    case 95 : if (DEBUG) { System.out.println("TypeDeclarations ::= TypeDeclarations TypeDeclaration"); }  //$NON-NLS-1$
> 		    consumeTypeDeclarations();  
> 			break;
>  
>-    case 92 : if (DEBUG) { System.out.println("PackageDeclaration ::= PackageDeclarationName SEMICOLON"); }  //$NON-NLS-1$
>+    case 96 : if (DEBUG) { System.out.println("PackageDeclaration ::= PackageDeclarationName SEMICOLON"); }  //$NON-NLS-1$
> 		     consumePackageDeclaration();  
> 			break;
>  
>-    case 93 : if (DEBUG) { System.out.println("PackageDeclarationName ::= Modifiers package..."); }  //$NON-NLS-1$
>+    case 97 : if (DEBUG) { System.out.println("PackageDeclarationName ::= Modifiers package..."); }  //$NON-NLS-1$
> 		     consumePackageDeclarationNameWithModifiers();  
> 			break;
>  
>-    case 94 : if (DEBUG) { System.out.println("PackageDeclarationName ::= PackageComment package Name"); }  //$NON-NLS-1$
>+    case 98 : if (DEBUG) { System.out.println("PackageDeclarationName ::= PackageComment package Name"); }  //$NON-NLS-1$
> 		     consumePackageDeclarationName();  
> 			break;
>  
>-    case 95 : if (DEBUG) { System.out.println("PackageComment ::="); }  //$NON-NLS-1$
>+    case 99 : if (DEBUG) { System.out.println("PackageComment ::="); }  //$NON-NLS-1$
> 		     consumePackageComment();  
> 			break;
>  
>-    case 100 : if (DEBUG) { System.out.println("SingleTypeImportDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 104 : if (DEBUG) { System.out.println("SingleTypeImportDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 101 : if (DEBUG) { System.out.println("SingleTypeImportDeclarationName ::= import Name"); }  //$NON-NLS-1$
>+    case 105 : if (DEBUG) { System.out.println("SingleTypeImportDeclarationName ::= import Name"); }  //$NON-NLS-1$
> 		    consumeSingleTypeImportDeclarationName();  
> 			break;
>  
>-    case 102 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 106 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 103 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclarationName ::= import Name DOT..."); }  //$NON-NLS-1$
>+    case 107 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclarationName ::= import Name DOT..."); }  //$NON-NLS-1$
> 		    consumeTypeImportOnDemandDeclarationName();  
> 			break;
>  
>-     case 106 : if (DEBUG) { System.out.println("TypeDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>+     case 110 : if (DEBUG) { System.out.println("TypeDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyTypeDeclaration();  
> 			break;
>  
>-    case 110 : if (DEBUG) { System.out.println("Modifiers ::= Modifiers Modifier"); }  //$NON-NLS-1$
>+    case 114 : if (DEBUG) { System.out.println("NonAnnotModifiers ::= NonAnnotModifiers NonAnnotModifier"); }  //$NON-NLS-1$
> 		    consumeModifiers2();  
> 			break;
>  
>-    case 122 : if (DEBUG) { System.out.println("Modifier ::= Annotation"); }  //$NON-NLS-1$
>+    case 116 : if (DEBUG) { System.out.println("Modifiers ::= Modifiers Modifier"); }  //$NON-NLS-1$
>+		    consumeModifiers2();  
>+			break;
>+ 
>+    case 139 : if (DEBUG) { System.out.println("Modifier ::= Annotation"); }  //$NON-NLS-1$
> 		    consumeAnnotationAsModifier();  
> 			break;
>  
>-    case 123 : if (DEBUG) { System.out.println("ClassDeclaration ::= ClassHeader ClassBody"); }  //$NON-NLS-1$
>+    case 140 : if (DEBUG) { System.out.println("ClassDeclaration ::= ClassHeader ClassBody"); }  //$NON-NLS-1$
> 		    consumeClassDeclaration();  
> 			break;
>  
>-    case 124 : if (DEBUG) { System.out.println("ClassHeader ::= ClassHeaderName ClassHeaderExtendsopt..."); }  //$NON-NLS-1$
>+    case 141 : if (DEBUG) { System.out.println("ClassHeader ::= ClassHeaderName ClassHeaderExtendsopt..."); }  //$NON-NLS-1$
> 		    consumeClassHeader();  
> 			break;
>  
>-    case 125 : if (DEBUG) { System.out.println("ClassHeaderName ::= ClassHeaderName1 TypeParameters"); }  //$NON-NLS-1$
>+    case 142 : if (DEBUG) { System.out.println("ClassHeaderName ::= ClassHeaderName1 TypeParameters"); }  //$NON-NLS-1$
> 		    consumeTypeHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 127 : if (DEBUG) { System.out.println("ClassHeaderName1 ::= Modifiersopt class Identifier"); }  //$NON-NLS-1$
>+    case 144 : if (DEBUG) { System.out.println("ClassHeaderName1 ::= Modifiersopt class Identifier"); }  //$NON-NLS-1$
> 		    consumeClassHeaderName1();  
> 			break;
>  
>-    case 128 : if (DEBUG) { System.out.println("ClassHeaderExtends ::= extends ClassType"); }  //$NON-NLS-1$
>+    case 145 : if (DEBUG) { System.out.println("ClassHeaderExtends ::= extends ClassType"); }  //$NON-NLS-1$
> 		    consumeClassHeaderExtends();  
> 			break;
>  
>-    case 129 : if (DEBUG) { System.out.println("ClassHeaderImplements ::= implements InterfaceTypeList"); }  //$NON-NLS-1$
>+    case 146 : if (DEBUG) { System.out.println("ClassHeaderImplements ::= implements InterfaceTypeList"); }  //$NON-NLS-1$
> 		    consumeClassHeaderImplements();  
> 			break;
>  
>-    case 131 : if (DEBUG) { System.out.println("InterfaceTypeList ::= InterfaceTypeList COMMA..."); }  //$NON-NLS-1$
>+    case 148 : if (DEBUG) { System.out.println("InterfaceTypeList ::= InterfaceTypeList COMMA..."); }  //$NON-NLS-1$
> 		    consumeInterfaceTypeList();  
> 			break;
>  
>-    case 132 : if (DEBUG) { System.out.println("InterfaceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
>+    case 149 : if (DEBUG) { System.out.println("InterfaceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
> 		    consumeInterfaceType();  
> 			break;
>  
>-    case 135 : if (DEBUG) { System.out.println("ClassBodyDeclarations ::= ClassBodyDeclarations..."); }  //$NON-NLS-1$
>+    case 150 : if (DEBUG) { System.out.println("InterfaceType ::= OneOrMoreAnnotations..."); }  //$NON-NLS-1$
>+		    consumeInterfaceType();  
>+			break;
>+ 
>+    case 153 : if (DEBUG) { System.out.println("ClassBodyDeclarations ::= ClassBodyDeclarations..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclarations();  
> 			break;
>  
>-    case 139 : if (DEBUG) { System.out.println("ClassBodyDeclaration ::= Diet NestedMethod..."); }  //$NON-NLS-1$
>+    case 157 : if (DEBUG) { System.out.println("ClassBodyDeclaration ::= Diet NestedMethod..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclaration();  
> 			break;
>  
>-    case 140 : if (DEBUG) { System.out.println("Diet ::="); }  //$NON-NLS-1$
>+    case 158 : if (DEBUG) { System.out.println("Diet ::="); }  //$NON-NLS-1$
> 		    consumeDiet();  
> 			break;
> 
>-    case 141 : if (DEBUG) { System.out.println("Initializer ::= Diet NestedMethod CreateInitializer..."); }  //$NON-NLS-1$
>+    case 159 : if (DEBUG) { System.out.println("Initializer ::= Diet NestedMethod CreateInitializer..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclaration();  
> 			break;
>  
>-    case 142 : if (DEBUG) { System.out.println("CreateInitializer ::="); }  //$NON-NLS-1$
>+    case 160 : if (DEBUG) { System.out.println("CreateInitializer ::="); }  //$NON-NLS-1$
> 		    consumeCreateInitializer();  
> 			break;
> 
>-    case 149 : if (DEBUG) { System.out.println("ClassMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>+    case 167 : if (DEBUG) { System.out.println("ClassMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyTypeDeclaration();  
> 			break;
> 
>-    case 152 : if (DEBUG) { System.out.println("FieldDeclaration ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 170 : if (DEBUG) { System.out.println("FieldDeclaration ::= Modifiersopt UnannotatedType..."); }  //$NON-NLS-1$
> 		    consumeFieldDeclaration();  
> 			break;
>  
>-    case 154 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
>+    case 172 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
> 		    consumeVariableDeclarators();  
> 			break;
>  
>-    case 157 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
>+    case 175 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
> 		    consumeEnterVariable();  
> 			break;
>  
>-    case 158 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
>+    case 176 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
> 		    consumeExitVariableWithInitialization();  
> 			break;
>  
>-    case 159 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
>+    case 177 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
> 		    consumeExitVariableWithoutInitialization();  
> 			break;
>  
>-    case 160 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
>+    case 178 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
> 		    consumeForceNoDiet();  
> 			break;
>  
>-    case 161 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
>+    case 179 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
> 		    consumeRestoreDiet();  
> 			break;
>  
>-    case 166 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
>+    case 184 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
> 		    // set to true to consume a method with a body
>   consumeMethodDeclaration(true);   
> 			break;
>  
>-    case 167 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
>+    case 185 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
> 		    // set to false to consume a method without body
>   consumeMethodDeclaration(false);  
> 			break;
>  
>-    case 168 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
>+    case 186 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>-    case 169 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt TypeParameters Type..."); }  //$NON-NLS-1$
>+    case 187 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt TypeParameters Type..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderNameWithTypeParameters(false);  
> 			break;
>  
>-    case 170 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt Type Identifier LPAREN"); }  //$NON-NLS-1$
>+    case 188 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt UnannotatedType..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderName(false);  
> 			break;
>  
>-    case 171 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
>+    case 189 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderRightParen();  
> 			break;
>  
>-    case 172 : if (DEBUG) { System.out.println("MethodHeaderExtendedDims ::= Dimsopt"); }  //$NON-NLS-1$
>+    case 190 : if (DEBUG) { System.out.println("MethodHeaderExtendedDims ::= DimsoptAnnotsopt"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderExtendedDims();  
> 			break;
>  
>-    case 173 : if (DEBUG) { System.out.println("MethodHeaderThrowsClause ::= throws ClassTypeList"); }  //$NON-NLS-1$
>+    case 191 : if (DEBUG) { System.out.println("MethodHeaderThrowsClause ::= throws ClassTypeList"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderThrowsClause();  
> 			break;
>  
>-    case 174 : if (DEBUG) { System.out.println("ConstructorHeader ::= ConstructorHeaderName..."); }  //$NON-NLS-1$
>+    case 192 : if (DEBUG) { System.out.println("ConstructorHeader ::= ConstructorHeaderName..."); }  //$NON-NLS-1$
>+		    consumeConstructorHeader();  
>+			break;
>+ 
>+    case 193 : if (DEBUG) { System.out.println("ConstructorHeader ::= ConstructorHeaderName..."); }  //$NON-NLS-1$
> 		    consumeConstructorHeader();  
> 			break;
>  
>-    case 175 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt TypeParameters..."); }  //$NON-NLS-1$
>+    case 194 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt TypeParameters..."); }  //$NON-NLS-1$
> 		    consumeConstructorHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 176 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt Identifier LPAREN"); }  //$NON-NLS-1$
>+    case 195 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt Identifier LPAREN"); }  //$NON-NLS-1$
> 		    consumeConstructorHeaderName();  
> 			break;
>  
>-    case 178 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
>+    case 197 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
> 		    consumeFormalParameterList();  
> 			break;
>  
>-    case 179 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 198 : if (DEBUG) { System.out.println("PotentialNameArray ::="); }  //$NON-NLS-1$
>+		    consumePotentialNameArrayType();  
>+			break;
>+ 
>+    case 199 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt PrimitiveType..."); }  //$NON-NLS-1$
> 		    consumeFormalParameter(false);  
> 			break;
>  
>-    case 180 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type ELLIPSIS..."); }  //$NON-NLS-1$
>+    case 200 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt PrimitiveType..."); }  //$NON-NLS-1$
> 		    consumeFormalParameter(true);  
> 			break;
>  
>-    case 182 : if (DEBUG) { System.out.println("ClassTypeList ::= ClassTypeList COMMA ClassTypeElt"); }  //$NON-NLS-1$
>+    case 201 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt"); }  //$NON-NLS-1$
>+		    consumeFormalParameter(false);  
>+			break;
>+ 
>+    case 202 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt"); }  //$NON-NLS-1$
>+		    consumeFormalParameter(true);  
>+			break;
>+ 
>+    case 203 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt GenericType..."); }  //$NON-NLS-1$
>+		    consumeFormalParameter(false);  
>+			break;
>+ 
>+    case 204 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt GenericType..."); }  //$NON-NLS-1$
>+		    consumeFormalParameter(true);  
>+			break;
>+ 
>+    case 205 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt GenericTypeDotName..."); }  //$NON-NLS-1$
>+		    consumeFormalParameter(false);  
>+			break;
>+ 
>+    case 206 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt GenericTypeDotName..."); }  //$NON-NLS-1$
>+		    consumeFormalParameter(true);  
>+			break;
>+ 
>+    case 208 : if (DEBUG) { System.out.println("ClassTypeList ::= ClassTypeList COMMA ClassTypeElt"); }  //$NON-NLS-1$
> 		    consumeClassTypeList();  
> 			break;
>  
>-    case 183 : if (DEBUG) { System.out.println("ClassTypeElt ::= ClassType"); }  //$NON-NLS-1$
>+    case 209 : if (DEBUG) { System.out.println("ClassTypeElt ::= ClassType"); }  //$NON-NLS-1$
> 		    consumeClassTypeElt();  
> 			break;
>  
>-    case 184 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE BlockStatementsopt..."); }  //$NON-NLS-1$
>+    case 210 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE BlockStatementsopt..."); }  //$NON-NLS-1$
> 		    consumeMethodBody();  
> 			break;
>  
>-    case 185 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
>+    case 211 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
> 		    consumeNestedMethod();  
> 			break;
>  
>-    case 186 : if (DEBUG) { System.out.println("StaticInitializer ::= StaticOnly Block"); }  //$NON-NLS-1$
>+    case 212 : if (DEBUG) { System.out.println("StaticInitializer ::= StaticOnly Block"); }  //$NON-NLS-1$
> 		    consumeStaticInitializer();  
> 			break;
> 
>-    case 187 : if (DEBUG) { System.out.println("StaticOnly ::= static"); }  //$NON-NLS-1$
>+    case 213 : if (DEBUG) { System.out.println("StaticOnly ::= static"); }  //$NON-NLS-1$
> 		    consumeStaticOnly();  
> 			break;
>  
>-    case 188 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader MethodBody"); }  //$NON-NLS-1$
>+    case 214 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader MethodBody"); }  //$NON-NLS-1$
> 		    consumeConstructorDeclaration() ;  
> 			break;
>  
>-    case 189 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader SEMICOLON"); }  //$NON-NLS-1$
>+    case 215 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeInvalidConstructorDeclaration() ;  
> 			break;
>  
>-    case 190 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= this LPAREN..."); }  //$NON-NLS-1$
>+    case 216 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= this LPAREN..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(0, THIS_CALL);  
> 			break;
>  
>-    case 191 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments this"); }  //$NON-NLS-1$
>+    case 217 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments this"); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(0,THIS_CALL);  
> 			break;
>  
>-    case 192 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= super LPAREN..."); }  //$NON-NLS-1$
>+    case 218 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= super LPAREN..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(0,SUPER_CALL);  
> 			break;
>  
>-    case 193 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 219 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(0,SUPER_CALL);  
> 			break;
>  
>-    case 194 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT super..."); }  //$NON-NLS-1$
>+    case 220 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT super..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(1, SUPER_CALL);  
> 			break;
>  
>-    case 195 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
>+    case 221 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(1, SUPER_CALL);  
> 			break;
>  
>-    case 196 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT super LPAREN"); }  //$NON-NLS-1$
>+    case 222 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT super LPAREN"); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(2, SUPER_CALL);  
> 			break;
>  
>-    case 197 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
>+    case 223 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(2, SUPER_CALL);  
> 			break;
>  
>-    case 198 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT this..."); }  //$NON-NLS-1$
>+    case 224 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT this..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(1, THIS_CALL);  
> 			break;
>  
>-    case 199 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
>+    case 225 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(1, THIS_CALL);  
> 			break;
>  
>-    case 200 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT this LPAREN"); }  //$NON-NLS-1$
>+    case 226 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT this LPAREN"); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(2, THIS_CALL);  
> 			break;
>  
>-    case 201 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
>+    case 227 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(2, THIS_CALL);  
> 			break;
>  
>-    case 202 : if (DEBUG) { System.out.println("InterfaceDeclaration ::= InterfaceHeader InterfaceBody"); }  //$NON-NLS-1$
>+    case 228 : if (DEBUG) { System.out.println("InterfaceDeclaration ::= InterfaceHeader InterfaceBody"); }  //$NON-NLS-1$
> 		    consumeInterfaceDeclaration();  
> 			break;
>  
>-    case 203 : if (DEBUG) { System.out.println("InterfaceHeader ::= InterfaceHeaderName..."); }  //$NON-NLS-1$
>+    case 229 : if (DEBUG) { System.out.println("InterfaceHeader ::= InterfaceHeaderName..."); }  //$NON-NLS-1$
> 		    consumeInterfaceHeader();  
> 			break;
>  
>-    case 204 : if (DEBUG) { System.out.println("InterfaceHeaderName ::= InterfaceHeaderName1..."); }  //$NON-NLS-1$
>+    case 230 : if (DEBUG) { System.out.println("InterfaceHeaderName ::= InterfaceHeaderName1..."); }  //$NON-NLS-1$
> 		    consumeTypeHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 206 : if (DEBUG) { System.out.println("InterfaceHeaderName1 ::= Modifiersopt interface..."); }  //$NON-NLS-1$
>+    case 232 : if (DEBUG) { System.out.println("InterfaceHeaderName1 ::= Modifiersopt interface..."); }  //$NON-NLS-1$
> 		    consumeInterfaceHeaderName1();  
> 			break;
>  
>-    case 207 : if (DEBUG) { System.out.println("InterfaceHeaderExtends ::= extends InterfaceTypeList"); }  //$NON-NLS-1$
>+    case 233 : if (DEBUG) { System.out.println("InterfaceHeaderExtends ::= extends InterfaceTypeList"); }  //$NON-NLS-1$
> 		    consumeInterfaceHeaderExtends();  
> 			break;
>  
>-    case 210 : if (DEBUG) { System.out.println("InterfaceMemberDeclarations ::=..."); }  //$NON-NLS-1$
>+    case 236 : if (DEBUG) { System.out.println("InterfaceMemberDeclarations ::=..."); }  //$NON-NLS-1$
> 		    consumeInterfaceMemberDeclarations();  
> 			break;
>  
>-    case 211 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>+    case 237 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyTypeDeclaration();  
> 			break;
>  
>-    case 213 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
>+    case 239 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
> 		    consumeInvalidMethodDeclaration();  
> 			break;
>  
>-    case 214 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
>+    case 240 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
> 		    consumeInvalidConstructorDeclaration(true);   
> 			break;
>  
>-    case 215 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
>+    case 241 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
> 		    consumeInvalidConstructorDeclaration(false);   
> 			break;
>  
>-    case 223 : if (DEBUG) { System.out.println("PushLeftBrace ::="); }  //$NON-NLS-1$
>+    case 249 : if (DEBUG) { System.out.println("PushLeftBrace ::="); }  //$NON-NLS-1$
> 		    consumePushLeftBrace();  
> 			break;
>  
>-    case 224 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace ,opt RBRACE"); }  //$NON-NLS-1$
>+    case 250 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace ,opt RBRACE"); }  //$NON-NLS-1$
> 		    consumeEmptyArrayInitializer();  
> 			break;
>  
>-    case 225 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
>+    case 251 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
> 		    consumeArrayInitializer();  
> 			break;
>  
>-    case 226 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
>+    case 252 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
> 		    consumeArrayInitializer();  
> 			break;
>  
>-    case 228 : if (DEBUG) { System.out.println("VariableInitializers ::= VariableInitializers COMMA..."); }  //$NON-NLS-1$
>+    case 254 : if (DEBUG) { System.out.println("VariableInitializers ::= VariableInitializers COMMA..."); }  //$NON-NLS-1$
> 		    consumeVariableInitializers();  
> 			break;
>  
>-    case 229 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
>+    case 255 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
> 		    consumeBlock();  
> 			break;
>  
>-    case 230 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
>+    case 256 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
> 		    consumeOpenBlock() ;  
> 			break;
>  
>-    case 232 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
>+    case 258 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
> 		    consumeBlockStatements() ;  
> 			break;
>  
>-    case 236 : if (DEBUG) { System.out.println("BlockStatement ::= InterfaceDeclaration"); }  //$NON-NLS-1$
>+    case 262 : if (DEBUG) { System.out.println("BlockStatement ::= InterfaceDeclaration"); }  //$NON-NLS-1$
> 		    consumeInvalidInterfaceDeclaration();  
> 			break;
>  
>-    case 237 : if (DEBUG) { System.out.println("BlockStatement ::= AnnotationTypeDeclaration"); }  //$NON-NLS-1$
>+    case 263 : if (DEBUG) { System.out.println("BlockStatement ::= AnnotationTypeDeclaration"); }  //$NON-NLS-1$
> 		    consumeInvalidAnnotationTypeDeclaration();  
> 			break;
>  
>-    case 238 : if (DEBUG) { System.out.println("BlockStatement ::= EnumDeclaration"); }  //$NON-NLS-1$
>+    case 264 : if (DEBUG) { System.out.println("BlockStatement ::= EnumDeclaration"); }  //$NON-NLS-1$
> 		    consumeInvalidEnumDeclaration();  
> 			break;
>  
>-    case 239 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
>+    case 265 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
> 		    consumeLocalVariableDeclarationStatement();  
> 			break;
>  
>-    case 240 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Type PushModifiers..."); }  //$NON-NLS-1$
>+    case 266 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= UnannotatedType..."); }  //$NON-NLS-1$
> 		    consumeLocalVariableDeclaration();  
> 			break;
>  
>-    case 241 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Modifiers Type..."); }  //$NON-NLS-1$
>+    case 267 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Modifiers UnannotatedType"); }  //$NON-NLS-1$
> 		    consumeLocalVariableDeclaration();  
> 			break;
>  
>-    case 242 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
>+    case 268 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
> 		    consumePushModifiers();  
> 			break;
>  
>-    case 243 : if (DEBUG) { System.out.println("PushModifiersForHeader ::="); }  //$NON-NLS-1$
>+    case 269 : if (DEBUG) { System.out.println("PushModifiersForHeader ::="); }  //$NON-NLS-1$
> 		    consumePushModifiersForHeader();  
> 			break;
>  
>-    case 244 : if (DEBUG) { System.out.println("PushRealModifiers ::="); }  //$NON-NLS-1$
>+    case 270 : if (DEBUG) { System.out.println("PushRealModifiers ::="); }  //$NON-NLS-1$
> 		    consumePushRealModifiers();  
> 			break;
>  
>-    case 270 : if (DEBUG) { System.out.println("EmptyStatement ::= SEMICOLON"); }  //$NON-NLS-1$
>+    case 296 : if (DEBUG) { System.out.println("EmptyStatement ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyStatement();  
> 			break;
>  
>-    case 271 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
>+    case 297 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
> 		    consumeStatementLabel() ;  
> 			break;
>  
>-    case 272 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
>+    case 298 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
> 		    consumeStatementLabel() ;  
> 			break;
>  
>-    case 273 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
>+    case 299 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
> 		    consumeLabel() ;  
> 			break;
>  
>-     case 274 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
>+     case 300 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeExpressionStatement();  
> 			break;
>  
>-    case 283 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 309 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementIfNoElse();  
> 			break;
>  
>-    case 284 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 310 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementIfWithElse();  
> 			break;
>  
>-    case 285 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
>+    case 311 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
> 		    consumeStatementIfWithElse();  
> 			break;
>  
>-    case 286 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 312 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementSwitch() ;  
> 			break;
>  
>-    case 287 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
>+    case 313 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
> 		    consumeEmptySwitchBlock() ;  
> 			break;
>  
>-    case 290 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
>+    case 316 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
> 		    consumeSwitchBlock() ;  
> 			break;
>  
>-    case 292 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
>+    case 318 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
> 		    consumeSwitchBlockStatements() ;  
> 			break;
>  
>-    case 293 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
>+    case 319 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
> 		    consumeSwitchBlockStatement() ;  
> 			break;
>  
>-    case 295 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
>+    case 321 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
> 		    consumeSwitchLabels() ;  
> 			break;
>  
>-     case 296 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
>+     case 322 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
> 		    consumeCaseLabel();  
> 			break;
>  
>-     case 297 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
>+     case 323 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
> 		    consumeDefaultLabel();  
> 			break;
>  
>-    case 298 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 324 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementWhile() ;  
> 			break;
>  
>-    case 299 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
>+    case 325 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
> 		    consumeStatementWhile() ;  
> 			break;
>  
>-    case 300 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
>+    case 326 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
> 		    consumeStatementDo() ;  
> 			break;
>  
>-    case 301 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
>+    case 327 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
> 		    consumeStatementFor() ;  
> 			break;
>  
>-    case 302 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
>+    case 328 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
> 		    consumeStatementFor() ;  
> 			break;
>  
>-    case 303 : if (DEBUG) { System.out.println("ForInit ::= StatementExpressionList"); }  //$NON-NLS-1$
>+    case 329 : if (DEBUG) { System.out.println("ForInit ::= StatementExpressionList"); }  //$NON-NLS-1$
> 		    consumeForInit() ;  
> 			break;
>  
>-    case 307 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
>+    case 333 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
> 		    consumeStatementExpressionList() ;  
> 			break;
>  
>-    case 308 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression SEMICOLON"); }  //$NON-NLS-1$
>+    case 334 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeSimpleAssertStatement() ;  
> 			break;
>  
>-    case 309 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression COLON Expression"); }  //$NON-NLS-1$
>+    case 335 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression COLON Expression"); }  //$NON-NLS-1$
> 		    consumeAssertStatement() ;  
> 			break;
>  
>-    case 310 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
>+    case 336 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementBreak() ;  
> 			break;
>  
>-    case 311 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
>+    case 337 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementBreakWithLabel() ;  
> 			break;
>  
>-    case 312 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
>+    case 338 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementContinue() ;  
> 			break;
>  
>-    case 313 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
>+    case 339 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementContinueWithLabel() ;  
> 			break;
>  
>-    case 314 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
>+    case 340 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementReturn() ;  
> 			break;
>  
>-    case 315 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
>+    case 341 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementThrow();  
> 			break;
>  
>-    case 316 : if (DEBUG) { System.out.println("SynchronizedStatement ::= OnlySynchronized LPAREN..."); }  //$NON-NLS-1$
>+    case 342 : if (DEBUG) { System.out.println("SynchronizedStatement ::= OnlySynchronized LPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementSynchronized();  
> 			break;
>  
>-    case 317 : if (DEBUG) { System.out.println("OnlySynchronized ::= synchronized"); }  //$NON-NLS-1$
>+    case 343 : if (DEBUG) { System.out.println("OnlySynchronized ::= synchronized"); }  //$NON-NLS-1$
> 		    consumeOnlySynchronized();  
> 			break;
>  
>-    case 318 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
>+    case 344 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
> 		    consumeStatementTry(false);  
> 			break;
>  
>-    case 319 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
>+    case 345 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
> 		    consumeStatementTry(true);  
> 			break;
>  
>-    case 321 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
>+    case 347 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
> 		    consumeExitTryBlock();  
> 			break;
>  
>-    case 323 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
>+    case 349 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
> 		    consumeCatches();  
> 			break;
>  
>-    case 324 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
>+    case 350 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementCatch() ;  
> 			break;
>  
>-    case 326 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
>+    case 352 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
> 		    consumeLeftParen();  
> 			break;
>  
>-    case 327 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
>+    case 353 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
> 		    consumeRightParen();  
> 			break;
>  
>-    case 332 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
>+    case 358 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayThis();  
> 			break;
>  
>-    case 333 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression_NotName..."); }  //$NON-NLS-1$
>+    case 359 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression_NotName..."); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArray();  
> 			break;
>  
>-    case 334 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Name PushRPAREN"); }  //$NON-NLS-1$
>+    case 360 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Name PushRPAREN"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayWithName();  
> 			break;
>  
>-    case 337 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT this"); }  //$NON-NLS-1$
>+    case 363 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT this"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayNameThis();  
> 			break;
>  
>-    case 338 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT super"); }  //$NON-NLS-1$
>+    case 364 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT super"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayNameSuper();  
> 			break;
>  
>-    case 339 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT class"); }  //$NON-NLS-1$
>+    case 365 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayName();  
> 			break;
>  
>-    case 340 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name Dims DOT class"); }  //$NON-NLS-1$
>+    case 366 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name Dims DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayArrayType();  
> 			break;
>  
>-    case 341 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType Dims DOT class"); }  //$NON-NLS-1$
>+    case 367 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType Dims DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayPrimitiveArrayType();  
> 			break;
>  
>-    case 342 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType DOT class"); }  //$NON-NLS-1$
>+    case 368 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayPrimitiveType();  
> 			break;
>  
>-    case 345 : if (DEBUG) { System.out.println("AllocationHeader ::= new ClassType LPAREN..."); }  //$NON-NLS-1$
>+    case 371 : if (DEBUG) { System.out.println("AllocationHeader ::= new ClassType LPAREN..."); }  //$NON-NLS-1$
> 		    consumeAllocationHeader();  
> 			break;
>  
>-    case 346 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new..."); }  //$NON-NLS-1$
>+    case 372 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionWithTypeArguments();  
> 			break;
>  
>-    case 347 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new ClassType LPAREN"); }  //$NON-NLS-1$
>+    case 373 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new ClassType LPAREN"); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpression();  
> 			break;
>  
>-    case 348 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
>+    case 374 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;  
> 			break;
>  
>-    case 349 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
>+    case 375 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualified() ;  
> 			break;
>  
>-    case 350 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
>+    case 376 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualified() ;  
> 			break;
>  
>-    case 351 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
>+    case 377 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;  
> 			break;
>  
>-    case 352 : if (DEBUG) { System.out.println("ClassInstanceCreationExpressionName ::= Name DOT"); }  //$NON-NLS-1$
>+    case 378 : if (DEBUG) { System.out.println("ClassInstanceCreationExpressionName ::= Name DOT"); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionName() ;  
> 			break;
>  
>-    case 353 : if (DEBUG) { System.out.println("UnqualifiedClassBodyopt ::="); }  //$NON-NLS-1$
>+    case 379 : if (DEBUG) { System.out.println("UnqualifiedClassBodyopt ::="); }  //$NON-NLS-1$
> 		    consumeClassBodyopt();  
> 			break;
>  
>-    case 355 : if (DEBUG) { System.out.println("UnqualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>+    case 381 : if (DEBUG) { System.out.println("UnqualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
> 		    consumeEnterAnonymousClassBody(false);  
> 			break;
>  
>-    case 356 : if (DEBUG) { System.out.println("QualifiedClassBodyopt ::="); }  //$NON-NLS-1$
>+    case 382 : if (DEBUG) { System.out.println("QualifiedClassBodyopt ::="); }  //$NON-NLS-1$
> 		    consumeClassBodyopt();  
> 			break;
>  
>-    case 358 : if (DEBUG) { System.out.println("QualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>+    case 384 : if (DEBUG) { System.out.println("QualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
> 		    consumeEnterAnonymousClassBody(true);  
> 			break;
>  
>-    case 360 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA Expression"); }  //$NON-NLS-1$
>+    case 386 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA Expression"); }  //$NON-NLS-1$
> 		    consumeArgumentList();  
> 			break;
>  
>-    case 361 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new PrimitiveType..."); }  //$NON-NLS-1$
>+    case 387 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new PrimitiveType..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationHeader();  
>+			break;
>+ 
>+    case 388 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new OneOrMoreAnnotations..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationHeader();  
>+			break;
>+ 
>+    case 389 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new ClassOrInterfaceType..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationHeader();  
> 			break;
>  
>-    case 362 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new ClassOrInterfaceType..."); }  //$NON-NLS-1$
>+    case 390 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new OneOrMoreAnnotations..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationHeader();  
> 			break;
>  
>-    case 363 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+    case 391 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithoutInitializer();  
> 			break;
>  
>-    case 364 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new PrimitiveType"); }  //$NON-NLS-1$
>+    case 392 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithoutInitializer();  
>+			break;
>+ 
>+    case 393 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new PrimitiveType"); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithInitializer();  
>+			break;
>+ 
>+    case 394 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithInitializer();  
> 			break;
>  
>-    case 365 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+    case 395 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithoutInitializer();  
>+			break;
>+ 
>+    case 396 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithoutInitializer();  
> 			break;
>  
>-    case 366 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+    case 397 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithInitializer();  
> 			break;
>  
>-    case 368 : if (DEBUG) { System.out.println("DimWithOrWithOutExprs ::= DimWithOrWithOutExprs..."); }  //$NON-NLS-1$
>+    case 398 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithInitializer();  
>+			break;
>+ 
>+    case 400 : if (DEBUG) { System.out.println("DimWithOrWithOutExprs ::= DimWithOrWithOutExprs..."); }  //$NON-NLS-1$
> 		    consumeDimWithOrWithOutExprs();  
> 			break;
>  
>-     case 370 : if (DEBUG) { System.out.println("DimWithOrWithOutExpr ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+     case 402 : if (DEBUG) { System.out.println("DimWithOrWithOutExpr ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
> 		    consumeDimWithOrWithOutExpr();  
> 			break;
>  
>-     case 371 : if (DEBUG) { System.out.println("Dims ::= DimsLoop"); }  //$NON-NLS-1$
>+     case 403 : if (DEBUG) { System.out.println("DimsoptAnnotsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyDimsoptAnnotsopt();  
>+			break;
>+ 
>+     case 404 : if (DEBUG) { System.out.println("DimsoptAnnotsopt -> DimsAnnotLoop"); }  //$NON-NLS-1$
>+		    consumeDimsWithTrailingAnnotsopt();  
>+			break;
>+ 
>+     case 408 : if (DEBUG) { System.out.println("OneDimOrAnnot ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+		    consumeOneDimLoop();  
>+			break;
>+ 
>+     case 411 : if (DEBUG) { System.out.println("Dims ::= DimsLoop"); }  //$NON-NLS-1$
> 		    consumeDims();  
> 			break;
>  
>-     case 374 : if (DEBUG) { System.out.println("OneDimLoop ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+     case 414 : if (DEBUG) { System.out.println("OneDimLoop ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
> 		    consumeOneDimLoop();  
> 			break;
>  
>-    case 375 : if (DEBUG) { System.out.println("FieldAccess ::= Primary DOT Identifier"); }  //$NON-NLS-1$
>+     case 415 : if (DEBUG) { System.out.println("OneDimLoop ::= OneOrMoreAnnotations LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+		    consumeOneDimLoopWithAnnotations();  
>+			break;
>+ 
>+    case 416 : if (DEBUG) { System.out.println("FieldAccess ::= Primary DOT Identifier"); }  //$NON-NLS-1$
> 		    consumeFieldAccess(false);  
> 			break;
>  
>-    case 376 : if (DEBUG) { System.out.println("FieldAccess ::= super DOT Identifier"); }  //$NON-NLS-1$
>+    case 417 : if (DEBUG) { System.out.println("FieldAccess ::= super DOT Identifier"); }  //$NON-NLS-1$
> 		    consumeFieldAccess(true);  
> 			break;
>  
>-    case 377 : if (DEBUG) { System.out.println("MethodInvocation ::= Name LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>+    case 418 : if (DEBUG) { System.out.println("MethodInvocation ::= Name LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
> 		    consumeMethodInvocationName();  
> 			break;
>  
>-    case 378 : if (DEBUG) { System.out.println("MethodInvocation ::= Name DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 419 : if (DEBUG) { System.out.println("MethodInvocation ::= Name DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationNameWithTypeArguments();  
> 			break;
>  
>-    case 379 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 420 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationPrimaryWithTypeArguments();  
> 			break;
>  
>-    case 380 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>+    case 421 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT Identifier LPAREN..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationPrimary();  
> 			break;
>  
>-    case 381 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 422 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationSuperWithTypeArguments();  
> 			break;
>  
>-    case 382 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>+    case 423 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT Identifier LPAREN..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationSuper();  
> 			break;
>  
>-    case 383 : if (DEBUG) { System.out.println("ArrayAccess ::= Name LBRACKET Expression RBRACKET"); }  //$NON-NLS-1$
>+    case 424 : if (DEBUG) { System.out.println("ArrayAccess ::= Name LBRACKET Expression RBRACKET"); }  //$NON-NLS-1$
> 		    consumeArrayAccess(true);  
> 			break;
>  
>-    case 384 : if (DEBUG) { System.out.println("ArrayAccess ::= PrimaryNoNewArray LBRACKET Expression..."); }  //$NON-NLS-1$
>+    case 425 : if (DEBUG) { System.out.println("ArrayAccess ::= PrimaryNoNewArray LBRACKET Expression..."); }  //$NON-NLS-1$
> 		    consumeArrayAccess(false);  
> 			break;
>  
>-    case 385 : if (DEBUG) { System.out.println("ArrayAccess ::= ArrayCreationWithArrayInitializer..."); }  //$NON-NLS-1$
>+    case 426 : if (DEBUG) { System.out.println("ArrayAccess ::= ArrayCreationWithArrayInitializer..."); }  //$NON-NLS-1$
> 		    consumeArrayAccess(false);  
> 			break;
>  
>-    case 387 : if (DEBUG) { System.out.println("PostfixExpression ::= Name"); }  //$NON-NLS-1$
>+    case 428 : if (DEBUG) { System.out.println("PostfixExpression ::= Name"); }  //$NON-NLS-1$
> 		    consumePostfixExpression();  
> 			break;
>  
>-    case 390 : if (DEBUG) { System.out.println("PostIncrementExpression ::= PostfixExpression PLUS_PLUS"); }  //$NON-NLS-1$
>+    case 431 : if (DEBUG) { System.out.println("PostIncrementExpression ::= PostfixExpression PLUS_PLUS"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS,true);  
> 			break;
>  
>-    case 391 : if (DEBUG) { System.out.println("PostDecrementExpression ::= PostfixExpression..."); }  //$NON-NLS-1$
>+    case 432 : if (DEBUG) { System.out.println("PostDecrementExpression ::= PostfixExpression..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS,true);  
> 			break;
>  
>-    case 392 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
>+    case 433 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
> 		    consumePushPosition();  
> 			break;
>  
>-    case 395 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>+    case 436 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 396 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>+    case 437 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 398 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
>+    case 439 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS,false);  
> 			break;
>  
>-    case 399 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
>+    case 440 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS,false);  
> 			break;
>  
>-    case 401 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
>+    case 442 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
> 			break;
>  
>-    case 402 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
>+    case 443 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.NOT);  
> 			break;
>  
>-    case 404 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN PrimitiveType Dimsopt..."); }  //$NON-NLS-1$
>+    case 445 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN PrimitiveType Dimsopt..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithPrimitiveType();  
> 			break;
>  
>-    case 405 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+    case 446 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN OneOrMoreAnnotations..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithPrimitiveType();  
>+			break;
>+ 
>+    case 447 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithGenericsArray();  
>+			break;
>+ 
>+    case 448 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN OneOrMoreAnnotations Name"); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithGenericsArray();  
> 			break;
>  
>-    case 406 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+    case 449 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithQualifiedGenericsArray();  
>+			break;
>+ 
>+    case 450 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN OneOrMoreAnnotations Name"); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithQualifiedGenericsArray();  
> 			break;
>  
>-    case 407 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name PushRPAREN..."); }  //$NON-NLS-1$
>+    case 451 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name PushRPAREN..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionLL1();  
> 			break;
>  
>-    case 408 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name Dims PushRPAREN..."); }  //$NON-NLS-1$
>+    case 452 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN OneOrMoreAnnotations Name"); }  //$NON-NLS-1$
>+		    consumeCastExpressionLL1();  
>+			break;
>+ 
>+    case 453 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name Dims PushRPAREN..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithNameArray();  
>+			break;
>+ 
>+    case 454 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN OneOrMoreAnnotations Name"); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithNameArray();  
> 			break;
>  
>-    case 409 : if (DEBUG) { System.out.println("OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments"); }  //$NON-NLS-1$
>+    case 455 : if (DEBUG) { System.out.println("OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments"); }  //$NON-NLS-1$
> 		    consumeOnlyTypeArgumentsForCastExpression();  
> 			break;
>  
>-    case 410 : if (DEBUG) { System.out.println("InsideCastExpression ::="); }  //$NON-NLS-1$
>+    case 456 : if (DEBUG) { System.out.println("InsideCastExpression ::="); }  //$NON-NLS-1$
> 		    consumeInsideCastExpression();  
> 			break;
>  
>-    case 411 : if (DEBUG) { System.out.println("InsideCastExpressionLL1 ::="); }  //$NON-NLS-1$
>+    case 457 : if (DEBUG) { System.out.println("InsideCastExpressionLL1 ::="); }  //$NON-NLS-1$
> 		    consumeInsideCastExpressionLL1();  
> 			break;
>  
>-    case 412 : if (DEBUG) { System.out.println("InsideCastExpressionWithQualifiedGenerics ::="); }  //$NON-NLS-1$
>+    case 458 : if (DEBUG) { System.out.println("InsideCastExpressionWithQualifiedGenerics ::="); }  //$NON-NLS-1$
> 		    consumeInsideCastExpressionWithQualifiedGenerics();  
> 			break;
>  
>-    case 414 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+    case 460 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
> 			break;
>  
>-    case 415 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+    case 461 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.DIVIDE);  
> 			break;
>  
>-    case 416 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+    case 462 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.REMAINDER);  
> 			break;
>  
>-    case 418 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
>+    case 464 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 419 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
>+    case 465 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 421 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
>+    case 467 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
> 			break;
>  
>-    case 422 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+    case 468 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
> 			break;
>  
>-    case 423 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 469 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 425 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
>+    case 471 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS);  
> 			break;
>  
>-    case 426 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
>+    case 472 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER);  
> 			break;
>  
>-    case 427 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
>+    case 473 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
> 			break;
>  
>-    case 428 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
>+    case 474 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
> 			break;
>  
>-    case 430 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
>+    case 476 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
>+		    consumeInstanceOfExpression();  
>+			break;
>+ 
>+    case 477 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
> 		    consumeInstanceOfExpression();  
> 			break;
>  
>-    case 432 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
>+    case 479 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
> 			break;
>  
>-    case 433 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
>+    case 480 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
> 			break;
>  
>-    case 435 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
>+    case 482 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND);  
> 			break;
>  
>-    case 437 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
>+    case 484 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.XOR);  
> 			break;
>  
>-    case 439 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
>+    case 486 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR);  
> 			break;
>  
>-    case 441 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
>+    case 488 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND_AND);  
> 			break;
>  
>-    case 443 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>+    case 490 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR_OR);  
> 			break;
>  
>-    case 445 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>+    case 492 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
> 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>  
>-    case 448 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
>+    case 495 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
> 		    consumeAssignment();  
> 			break;
>  
>-    case 450 : if (DEBUG) { System.out.println("Assignment ::= InvalidArrayInitializerAssignement"); }  //$NON-NLS-1$
>+    case 497 : if (DEBUG) { System.out.println("Assignment ::= InvalidArrayInitializerAssignement"); }  //$NON-NLS-1$
> 		    ignoreExpressionAssignment(); 
> 			break;
>  
>-    case 451 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
>+    case 498 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(EQUAL);  
> 			break;
>  
>-    case 452 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
>+    case 499 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(MULTIPLY);  
> 			break;
>  
>-    case 453 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
>+    case 500 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(DIVIDE);  
> 			break;
>  
>-    case 454 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
>+    case 501 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(REMAINDER);  
> 			break;
>  
>-    case 455 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
>+    case 502 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(PLUS);  
> 			break;
>  
>-    case 456 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
>+    case 503 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(MINUS);  
> 			break;
>  
>-    case 457 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+    case 504 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(LEFT_SHIFT);  
> 			break;
>  
>-    case 458 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+    case 505 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(RIGHT_SHIFT);  
> 			break;
>  
>-    case 459 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+    case 506 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 460 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
>+    case 507 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(AND);  
> 			break;
>  
>-    case 461 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
>+    case 508 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(XOR);  
> 			break;
>  
>-    case 462 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
>+    case 509 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(OR);  
> 			break;
>  
>-    case 466 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
>+    case 513 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyExpression();  
> 			break;
>  
>-    case 471 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>+    case 518 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyClassBodyDeclarationsopt();  
> 			break;
>  
>-    case 472 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+    case 519 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclarationsopt();  
> 			break;
>  
>-     case 473 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
>+     case 520 : if (DEBUG) { System.out.println("NonAnnotModifiersopt ::="); }  //$NON-NLS-1$
> 		    consumeDefaultModifiers();  
> 			break;
>  
>-    case 474 : if (DEBUG) { System.out.println("Modifiersopt ::= Modifiers"); }  //$NON-NLS-1$
>+    case 521 : if (DEBUG) { System.out.println("NonAnnotModifiersopt ::= NonAnnotModifiers"); }  //$NON-NLS-1$
> 		    consumeModifiers();  
> 			break;
>  
>-    case 475 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
>+     case 522 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
>+		    consumeDefaultModifiers();  
>+			break;
>+ 
>+    case 523 : if (DEBUG) { System.out.println("Modifiersopt ::= Modifiers"); }  //$NON-NLS-1$
>+		    consumeModifiers();  
>+			break;
>+ 
>+    case 524 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyBlockStatementsopt();  
> 			break;
>  
>-     case 477 : if (DEBUG) { System.out.println("Dimsopt ::="); }  //$NON-NLS-1$
>+     case 526 : if (DEBUG) { System.out.println("Dimsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyDimsopt();  
> 			break;
>  
>-     case 479 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
>+     case 528 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyArgumentListopt();  
> 			break;
>  
>-    case 483 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
>+    case 532 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
> 		    consumeFormalParameterListopt();  
> 			break;
>  
>-     case 487 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>+     case 536 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyInterfaceMemberDeclarationsopt();  
> 			break;
>  
>-     case 488 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+     case 537 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
> 		    consumeInterfaceMemberDeclarationsopt();  
> 			break;
>  
>-    case 489 : if (DEBUG) { System.out.println("NestedType ::="); }  //$NON-NLS-1$
>+    case 538 : if (DEBUG) { System.out.println("NestedType ::="); }  //$NON-NLS-1$
> 		    consumeNestedType();  
> 			break;
> 
>-     case 490 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
>+     case 539 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyForInitopt();  
> 			break;
>  
>-     case 492 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
>+     case 541 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyForUpdateopt();  
> 			break;
>  
>-     case 496 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
>+     case 545 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyCatchesopt();  
> 			break;
>  
>-     case 498 : if (DEBUG) { System.out.println("EnumDeclaration ::= EnumHeader EnumBody"); }  //$NON-NLS-1$
>+     case 547 : if (DEBUG) { System.out.println("EnumDeclaration ::= EnumHeader EnumBody"); }  //$NON-NLS-1$
> 		    consumeEnumDeclaration();  
> 			break;
>  
>-     case 499 : if (DEBUG) { System.out.println("EnumHeader ::= EnumHeaderName ClassHeaderImplementsopt"); }  //$NON-NLS-1$
>+     case 548 : if (DEBUG) { System.out.println("EnumHeader ::= EnumHeaderName ClassHeaderImplementsopt"); }  //$NON-NLS-1$
> 		    consumeEnumHeader();  
> 			break;
>  
>-     case 500 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier"); }  //$NON-NLS-1$
>+     case 549 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier"); }  //$NON-NLS-1$
> 		    consumeEnumHeaderName();  
> 			break;
>  
>-     case 501 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier..."); }  //$NON-NLS-1$
>+     case 550 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier..."); }  //$NON-NLS-1$
> 		    consumeEnumHeaderNameWithTypeParameters();  
> 			break;
>  
>-     case 502 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumBodyDeclarationsopt RBRACE"); }  //$NON-NLS-1$
>+     case 551 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumBodyDeclarationsopt RBRACE"); }  //$NON-NLS-1$
> 		    consumeEnumBodyNoConstants();  
> 			break;
>  
>-     case 503 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE COMMA EnumBodyDeclarationsopt..."); }  //$NON-NLS-1$
>+     case 552 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE COMMA EnumBodyDeclarationsopt..."); }  //$NON-NLS-1$
> 		    consumeEnumBodyNoConstants();  
> 			break;
>  
>-     case 504 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants COMMA..."); }  //$NON-NLS-1$
>+     case 553 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants COMMA..."); }  //$NON-NLS-1$
> 		    consumeEnumBodyWithConstants();  
> 			break;
>  
>-     case 505 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants..."); }  //$NON-NLS-1$
>+     case 554 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants..."); }  //$NON-NLS-1$
> 		    consumeEnumBodyWithConstants();  
> 			break;
>  
>-    case 507 : if (DEBUG) { System.out.println("EnumConstants ::= EnumConstants COMMA EnumConstant"); }  //$NON-NLS-1$
>+    case 556 : if (DEBUG) { System.out.println("EnumConstants ::= EnumConstants COMMA EnumConstant"); }  //$NON-NLS-1$
> 		    consumeEnumConstants();  
> 			break;
>  
>-    case 508 : if (DEBUG) { System.out.println("EnumConstantHeaderName ::= Modifiersopt Identifier"); }  //$NON-NLS-1$
>+    case 557 : if (DEBUG) { System.out.println("EnumConstantHeaderName ::= Modifiersopt Identifier"); }  //$NON-NLS-1$
> 		    consumeEnumConstantHeaderName();  
> 			break;
>  
>-    case 509 : if (DEBUG) { System.out.println("EnumConstantHeader ::= EnumConstantHeaderName..."); }  //$NON-NLS-1$
>+    case 558 : if (DEBUG) { System.out.println("EnumConstantHeader ::= EnumConstantHeaderName..."); }  //$NON-NLS-1$
> 		    consumeEnumConstantHeader();  
> 			break;
>  
>-    case 510 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader ForceNoDiet..."); }  //$NON-NLS-1$
>+    case 559 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader ForceNoDiet..."); }  //$NON-NLS-1$
> 		    consumeEnumConstantWithClassBody();  
> 			break;
>  
>-    case 511 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader"); }  //$NON-NLS-1$
>+    case 560 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader"); }  //$NON-NLS-1$
> 		    consumeEnumConstantNoClassBody();  
> 			break;
>  
>-    case 512 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>+    case 561 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
> 		    consumeArguments();  
> 			break;
>  
>-    case 513 : if (DEBUG) { System.out.println("Argumentsopt ::="); }  //$NON-NLS-1$
>+    case 562 : if (DEBUG) { System.out.println("Argumentsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyArguments();  
> 			break;
>  
>-    case 515 : if (DEBUG) { System.out.println("EnumDeclarations ::= SEMICOLON ClassBodyDeclarationsopt"); }  //$NON-NLS-1$
>+    case 564 : if (DEBUG) { System.out.println("EnumDeclarations ::= SEMICOLON ClassBodyDeclarationsopt"); }  //$NON-NLS-1$
> 		    consumeEnumDeclarations();  
> 			break;
>  
>-    case 516 : if (DEBUG) { System.out.println("EnumBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>+    case 565 : if (DEBUG) { System.out.println("EnumBodyDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyEnumDeclarations();  
> 			break;
>  
>-    case 518 : if (DEBUG) { System.out.println("EnhancedForStatement ::= EnhancedForStatementHeader..."); }  //$NON-NLS-1$
>+    case 567 : if (DEBUG) { System.out.println("EnhancedForStatement ::= EnhancedForStatementHeader..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatement();  
> 			break;
>  
>-    case 519 : if (DEBUG) { System.out.println("EnhancedForStatementNoShortIf ::=..."); }  //$NON-NLS-1$
>+    case 568 : if (DEBUG) { System.out.println("EnhancedForStatementNoShortIf ::=..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatement();  
> 			break;
>  
>-    case 520 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Type..."); }  //$NON-NLS-1$
>+    case 569 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatementHeaderInit(false);  
> 			break;
>  
>-    case 521 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Modifiers"); }  //$NON-NLS-1$
>+    case 570 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Modifiers"); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatementHeaderInit(true);  
> 			break;
>  
>-    case 522 : if (DEBUG) { System.out.println("EnhancedForStatementHeader ::=..."); }  //$NON-NLS-1$
>+    case 571 : if (DEBUG) { System.out.println("EnhancedForStatementHeader ::=..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatementHeader();  
> 			break;
>  
>-    case 523 : if (DEBUG) { System.out.println("SingleStaticImportDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 572 : if (DEBUG) { System.out.println("SingleStaticImportDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 524 : if (DEBUG) { System.out.println("SingleStaticImportDeclarationName ::= import static Name"); }  //$NON-NLS-1$
>+    case 573 : if (DEBUG) { System.out.println("SingleStaticImportDeclarationName ::= import static Name"); }  //$NON-NLS-1$
> 		    consumeSingleStaticImportDeclarationName();  
> 			break;
>  
>-    case 525 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 574 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 526 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclarationName ::= import static..."); }  //$NON-NLS-1$
>+    case 575 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclarationName ::= import static..."); }  //$NON-NLS-1$
> 		    consumeStaticImportOnDemandDeclarationName();  
> 			break;
>  
>-    case 527 : if (DEBUG) { System.out.println("TypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>+    case 576 : if (DEBUG) { System.out.println("TypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
> 		    consumeTypeArguments();  
> 			break;
>  
>-    case 528 : if (DEBUG) { System.out.println("OnlyTypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>+    case 577 : if (DEBUG) { System.out.println("OnlyTypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
> 		    consumeOnlyTypeArguments();  
> 			break;
>  
>-    case 530 : if (DEBUG) { System.out.println("TypeArgumentList1 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+    case 579 : if (DEBUG) { System.out.println("TypeArgumentList1 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList1();  
> 			break;
>  
>-    case 532 : if (DEBUG) { System.out.println("TypeArgumentList ::= TypeArgumentList COMMA TypeArgument"); }  //$NON-NLS-1$
>+    case 581 : if (DEBUG) { System.out.println("TypeArgumentList ::= TypeArgumentList COMMA TypeArgument"); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList();  
> 			break;
>  
>-    case 533 : if (DEBUG) { System.out.println("TypeArgument ::= ReferenceType"); }  //$NON-NLS-1$
>+    case 582 : if (DEBUG) { System.out.println("TypeArgument ::= ReferenceType"); }  //$NON-NLS-1$
>+		    consumeTypeArgument();  
>+			break;
>+ 
>+    case 583 : if (DEBUG) { System.out.println("TypeArgument ::= OneOrMoreAnnotations ReferenceType"); }  //$NON-NLS-1$
> 		    consumeTypeArgument();  
> 			break;
>  
>-    case 537 : if (DEBUG) { System.out.println("ReferenceType1 ::= ReferenceType GREATER"); }  //$NON-NLS-1$
>+    case 587 : if (DEBUG) { System.out.println("ReferenceType1 ::= ReferenceType GREATER"); }  //$NON-NLS-1$
> 		    consumeReferenceType1();  
> 			break;
>  
>-    case 538 : if (DEBUG) { System.out.println("ReferenceType1 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+    case 588 : if (DEBUG) { System.out.println("ReferenceType1 ::= OneOrMoreAnnotations ReferenceType..."); }  //$NON-NLS-1$
>+		    consumeReferenceType1();  
>+			break;
>+ 
>+    case 589 : if (DEBUG) { System.out.println("ReferenceType1 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentReferenceType1();  
> 			break;
>  
>-    case 540 : if (DEBUG) { System.out.println("TypeArgumentList2 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+    case 590 : if (DEBUG) { System.out.println("ReferenceType1 ::= OneOrMoreAnnotations ClassOrInterface"); }  //$NON-NLS-1$
>+		    consumeTypeArgumentReferenceType1();  
>+			break;
>+ 
>+    case 592 : if (DEBUG) { System.out.println("TypeArgumentList2 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList2();  
> 			break;
>  
>-    case 543 : if (DEBUG) { System.out.println("ReferenceType2 ::= ReferenceType RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 595 : if (DEBUG) { System.out.println("ReferenceType2 ::= ReferenceType RIGHT_SHIFT"); }  //$NON-NLS-1$
>+		    consumeReferenceType2();  
>+			break;
>+ 
>+    case 596 : if (DEBUG) { System.out.println("ReferenceType2 ::= OneOrMoreAnnotations ReferenceType..."); }  //$NON-NLS-1$
> 		    consumeReferenceType2();  
> 			break;
>  
>-    case 544 : if (DEBUG) { System.out.println("ReferenceType2 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+    case 597 : if (DEBUG) { System.out.println("ReferenceType2 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+		    consumeTypeArgumentReferenceType2();  
>+			break;
>+ 
>+    case 598 : if (DEBUG) { System.out.println("ReferenceType2 ::= OneOrMoreAnnotations ClassOrInterface"); }  //$NON-NLS-1$
> 		    consumeTypeArgumentReferenceType2();  
> 			break;
>  
>-    case 546 : if (DEBUG) { System.out.println("TypeArgumentList3 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+    case 600 : if (DEBUG) { System.out.println("TypeArgumentList3 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList3();  
> 			break;
>  
>-    case 549 : if (DEBUG) { System.out.println("ReferenceType3 ::= ReferenceType UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 603 : if (DEBUG) { System.out.println("ReferenceType3 ::= ReferenceType UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeReferenceType3();  
> 			break;
>  
>-    case 550 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION"); }  //$NON-NLS-1$
>+    case 604 : if (DEBUG) { System.out.println("ReferenceType3 ::= OneOrMoreAnnotations ReferenceType..."); }  //$NON-NLS-1$
>+		    consumeReferenceType3();  
>+			break;
>+ 
>+    case 605 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION"); }  //$NON-NLS-1$
> 		    consumeWildcard();  
> 			break;
>  
>-    case 551 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION WildcardBounds"); }  //$NON-NLS-1$
>+    case 606 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION WildcardBounds"); }  //$NON-NLS-1$
> 		    consumeWildcardWithBounds();  
> 			break;
>  
>-    case 552 : if (DEBUG) { System.out.println("WildcardBounds ::= extends ReferenceType"); }  //$NON-NLS-1$
>+    case 607 : if (DEBUG) { System.out.println("WildcardBounds ::= extends ReferenceType"); }  //$NON-NLS-1$
> 		    consumeWildcardBoundsExtends();  
> 			break;
>  
>-    case 553 : if (DEBUG) { System.out.println("WildcardBounds ::= super ReferenceType"); }  //$NON-NLS-1$
>+    case 608 : if (DEBUG) { System.out.println("WildcardBounds ::= extends OneOrMoreAnnotations..."); }  //$NON-NLS-1$
>+		    consumeWildcardBoundsExtends();  
>+			break;
>+ 
>+    case 609 : if (DEBUG) { System.out.println("WildcardBounds ::= super ReferenceType"); }  //$NON-NLS-1$
>+		    consumeWildcardBoundsSuper();  
>+			break;
>+ 
>+    case 610 : if (DEBUG) { System.out.println("WildcardBounds ::= super OneOrMoreAnnotations..."); }  //$NON-NLS-1$
> 		    consumeWildcardBoundsSuper();  
> 			break;
>  
>-    case 554 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION GREATER"); }  //$NON-NLS-1$
>+    case 611 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION GREATER"); }  //$NON-NLS-1$
> 		    consumeWildcard1();  
> 			break;
>  
>-    case 555 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION WildcardBounds1"); }  //$NON-NLS-1$
>+    case 612 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION WildcardBounds1"); }  //$NON-NLS-1$
> 		    consumeWildcard1WithBounds();  
> 			break;
>  
>-    case 556 : if (DEBUG) { System.out.println("WildcardBounds1 ::= extends ReferenceType1"); }  //$NON-NLS-1$
>+    case 613 : if (DEBUG) { System.out.println("WildcardBounds1 ::= extends ReferenceType1"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds1Extends();  
> 			break;
>  
>-    case 557 : if (DEBUG) { System.out.println("WildcardBounds1 ::= super ReferenceType1"); }  //$NON-NLS-1$
>+    case 614 : if (DEBUG) { System.out.println("WildcardBounds1 ::= super ReferenceType1"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds1Super();  
> 			break;
>  
>-    case 558 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 615 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeWildcard2();  
> 			break;
>  
>-    case 559 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION WildcardBounds2"); }  //$NON-NLS-1$
>+    case 616 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION WildcardBounds2"); }  //$NON-NLS-1$
> 		    consumeWildcard2WithBounds();  
> 			break;
>  
>-    case 560 : if (DEBUG) { System.out.println("WildcardBounds2 ::= extends ReferenceType2"); }  //$NON-NLS-1$
>+    case 617 : if (DEBUG) { System.out.println("WildcardBounds2 ::= extends ReferenceType2"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds2Extends();  
> 			break;
>  
>-    case 561 : if (DEBUG) { System.out.println("WildcardBounds2 ::= super ReferenceType2"); }  //$NON-NLS-1$
>+    case 618 : if (DEBUG) { System.out.println("WildcardBounds2 ::= super ReferenceType2"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds2Super();  
> 			break;
>  
>-    case 562 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 619 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeWildcard3();  
> 			break;
>  
>-    case 563 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION WildcardBounds3"); }  //$NON-NLS-1$
>+    case 620 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION WildcardBounds3"); }  //$NON-NLS-1$
> 		    consumeWildcard3WithBounds();  
> 			break;
>  
>-    case 564 : if (DEBUG) { System.out.println("WildcardBounds3 ::= extends ReferenceType3"); }  //$NON-NLS-1$
>+    case 621 : if (DEBUG) { System.out.println("WildcardBounds3 ::= extends ReferenceType3"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds3Extends();  
> 			break;
>  
>-    case 565 : if (DEBUG) { System.out.println("WildcardBounds3 ::= super ReferenceType3"); }  //$NON-NLS-1$
>+    case 622 : if (DEBUG) { System.out.println("WildcardBounds3 ::= super ReferenceType3"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds3Super();  
> 			break;
>  
>-    case 566 : if (DEBUG) { System.out.println("TypeParameterHeader ::= Identifier"); }  //$NON-NLS-1$
>+    case 623 : if (DEBUG) { System.out.println("TypeParameterHeader ::= Identifier"); }  //$NON-NLS-1$
> 		    consumeTypeParameterHeader();  
> 			break;
>  
>-    case 567 : if (DEBUG) { System.out.println("TypeParameters ::= LESS TypeParameterList1"); }  //$NON-NLS-1$
>+    case 624 : if (DEBUG) { System.out.println("TypeParameterHeader ::= OneOrMoreAnnotations Identifier"); }  //$NON-NLS-1$
>+		    consumeTypeParameterHeader();  
>+			break;
>+ 
>+    case 625 : if (DEBUG) { System.out.println("TypeParameters ::= LESS TypeParameterList1"); }  //$NON-NLS-1$
> 		    consumeTypeParameters();  
> 			break;
>  
>-    case 569 : if (DEBUG) { System.out.println("TypeParameterList ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>+    case 627 : if (DEBUG) { System.out.println("TypeParameterList ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterList();  
> 			break;
>  
>-    case 571 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 629 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameterWithExtends();  
>+			break;
>+ 
>+    case 630 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterWithExtends();  
> 			break;
>  
>-    case 572 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 631 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameterWithExtendsAndBounds();  
>+			break;
>+ 
>+    case 632 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterWithExtendsAndBounds();  
> 			break;
>  
>-    case 574 : if (DEBUG) { System.out.println("AdditionalBoundList ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>+    case 634 : if (DEBUG) { System.out.println("AdditionalBoundList ::= AdditionalBoundList..."); }  //$NON-NLS-1$
> 		    consumeAdditionalBoundList();  
> 			break;
>  
>-    case 575 : if (DEBUG) { System.out.println("AdditionalBound ::= AND ReferenceType"); }  //$NON-NLS-1$
>+    case 635 : if (DEBUG) { System.out.println("AdditionalBound ::= AND ReferenceType"); }  //$NON-NLS-1$
> 		    consumeAdditionalBound();  
> 			break;
>  
>-    case 577 : if (DEBUG) { System.out.println("TypeParameterList1 ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>+    case 636 : if (DEBUG) { System.out.println("AdditionalBound ::= AND OneOrMoreAnnotations..."); }  //$NON-NLS-1$
>+		    consumeAdditionalBound();  
>+			break;
>+ 
>+    case 638 : if (DEBUG) { System.out.println("TypeParameterList1 ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterList1();  
> 			break;
>  
>-    case 578 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader GREATER"); }  //$NON-NLS-1$
>+    case 639 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader GREATER"); }  //$NON-NLS-1$
> 		    consumeTypeParameter1();  
> 			break;
>  
>-    case 579 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 640 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameter1WithExtends();  
> 			break;
>  
>-    case 580 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 641 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameter1WithExtendsAndBounds();  
> 			break;
>  
>-    case 582 : if (DEBUG) { System.out.println("AdditionalBoundList1 ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>+    case 642 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameter1WithExtendsAndBounds();  
>+			break;
>+ 
>+    case 644 : if (DEBUG) { System.out.println("AdditionalBoundList1 ::= AdditionalBoundList..."); }  //$NON-NLS-1$
> 		    consumeAdditionalBoundList1();  
> 			break;
>  
>-    case 583 : if (DEBUG) { System.out.println("AdditionalBound1 ::= AND ReferenceType1"); }  //$NON-NLS-1$
>+    case 645 : if (DEBUG) { System.out.println("AdditionalBound1 ::= AND ReferenceType1"); }  //$NON-NLS-1$
> 		    consumeAdditionalBound1();  
> 			break;
>  
>-    case 589 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= PLUS PushPosition..."); }  //$NON-NLS-1$
>+    case 651 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= PLUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 590 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= MINUS PushPosition..."); }  //$NON-NLS-1$
>+    case 652 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= MINUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 593 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= TWIDDLE..."); }  //$NON-NLS-1$
>+    case 655 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= TWIDDLE..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
> 			break;
>  
>-    case 594 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= NOT PushPosition"); }  //$NON-NLS-1$
>+    case 656 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= NOT PushPosition"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.NOT);  
> 			break;
>  
>-    case 597 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 659 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
> 			break;
>  
>-    case 598 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name MULTIPLY..."); }  //$NON-NLS-1$
>+    case 660 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name MULTIPLY..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.MULTIPLY);  
> 			break;
>  
>-    case 599 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 661 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.DIVIDE);  
> 			break;
>  
>-    case 600 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name DIVIDE..."); }  //$NON-NLS-1$
>+    case 662 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name DIVIDE..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.DIVIDE);  
> 			break;
>  
>-    case 601 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 663 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.REMAINDER);  
> 			break;
>  
>-    case 602 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name REMAINDER..."); }  //$NON-NLS-1$
>+    case 664 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name REMAINDER..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.REMAINDER);  
> 			break;
>  
>-    case 604 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 666 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 605 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name PLUS..."); }  //$NON-NLS-1$
>+    case 667 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name PLUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.PLUS);  
> 			break;
>  
>-    case 606 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 668 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 607 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name MINUS..."); }  //$NON-NLS-1$
>+    case 669 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name MINUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.MINUS);  
> 			break;
>  
>-    case 609 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+    case 671 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
> 			break;
>  
>-    case 610 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name LEFT_SHIFT..."); }  //$NON-NLS-1$
>+    case 672 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name LEFT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.LEFT_SHIFT);  
> 			break;
>  
>-    case 611 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+    case 673 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
> 			break;
>  
>-    case 612 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+    case 674 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name RIGHT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.RIGHT_SHIFT);  
> 			break;
>  
>-    case 613 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+    case 675 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 614 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name UNSIGNED_RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+    case 676 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name UNSIGNED_RIGHT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 616 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
>+    case 678 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS);  
> 			break;
>  
>-    case 617 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS..."); }  //$NON-NLS-1$
>+    case 679 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.LESS);  
> 			break;
>  
>-    case 618 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
>+    case 680 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER);  
> 			break;
>  
>-    case 619 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER..."); }  //$NON-NLS-1$
>+    case 681 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.GREATER);  
> 			break;
>  
>-    case 620 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 682 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
> 			break;
>  
>-    case 621 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS_EQUAL..."); }  //$NON-NLS-1$
>+    case 683 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.LESS_EQUAL);  
> 			break;
>  
>-    case 622 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 684 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
> 			break;
>  
>-    case 623 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER_EQUAL..."); }  //$NON-NLS-1$
>+    case 685 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.GREATER_EQUAL);  
> 			break;
>  
>-    case 625 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
>+    case 687 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
> 		    consumeInstanceOfExpressionWithName();  
> 			break;
>  
>-    case 626 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 688 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
>+		    consumeInstanceOfExpressionWithName();  
>+			break;
>+ 
>+    case 689 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeInstanceOfExpression();  
>+			break;
>+ 
>+    case 690 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeInstanceOfExpression();  
> 			break;
>  
>-    case 628 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 692 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
> 			break;
>  
>-    case 629 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name EQUAL_EQUAL..."); }  //$NON-NLS-1$
>+    case 693 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name EQUAL_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpressionWithName(OperatorIds.EQUAL_EQUAL);  
> 			break;
>  
>-    case 630 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 694 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
> 			break;
>  
>-    case 631 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name NOT_EQUAL..."); }  //$NON-NLS-1$
>+    case 695 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name NOT_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpressionWithName(OperatorIds.NOT_EQUAL);  
> 			break;
>  
>-    case 633 : if (DEBUG) { System.out.println("AndExpression_NotName ::= AndExpression_NotName AND..."); }  //$NON-NLS-1$
>+    case 697 : if (DEBUG) { System.out.println("AndExpression_NotName ::= AndExpression_NotName AND..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND);  
> 			break;
>  
>-    case 634 : if (DEBUG) { System.out.println("AndExpression_NotName ::= Name AND EqualityExpression"); }  //$NON-NLS-1$
>+    case 698 : if (DEBUG) { System.out.println("AndExpression_NotName ::= Name AND EqualityExpression"); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.AND);  
> 			break;
>  
>-    case 636 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 700 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.XOR);  
> 			break;
>  
>-    case 637 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::= Name XOR AndExpression"); }  //$NON-NLS-1$
>+    case 701 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::= Name XOR AndExpression"); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.XOR);  
> 			break;
>  
>-    case 639 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 703 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR);  
> 			break;
>  
>-    case 640 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::= Name OR..."); }  //$NON-NLS-1$
>+    case 704 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::= Name OR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.OR);  
> 			break;
>  
>-    case 642 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 706 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND_AND);  
> 			break;
>  
>-    case 643 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::= Name AND_AND..."); }  //$NON-NLS-1$
>+    case 707 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::= Name AND_AND..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.AND_AND);  
> 			break;
>  
>-    case 645 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 709 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR_OR);  
> 			break;
>  
>-    case 646 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::= Name OR_OR..."); }  //$NON-NLS-1$
>+    case 710 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::= Name OR_OR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.OR_OR);  
> 			break;
>  
>-    case 648 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 712 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>  
>-    case 649 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); }  //$NON-NLS-1$
>+    case 713 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); }  //$NON-NLS-1$
> 		    consumeConditionalExpressionWithName(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>  
>-    case 653 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>+    case 717 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderName() ;  
> 			break;
>  
>-    case 654 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>+    case 718 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;  
> 			break;
>  
>-    case 655 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>+    case 719 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;  
> 			break;
>  
>-    case 656 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>+    case 720 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderName() ;  
> 			break;
>  
>-    case 657 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); }  //$NON-NLS-1$
>+    case 721 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeader() ;  
> 			break;
>  
>-    case 658 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 722 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclaration() ;  
> 			break;
>  
>-    case 660 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>+    case 724 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyAnnotationTypeMemberDeclarationsopt() ;  
> 			break;
>  
>-    case 661 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+    case 725 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeMemberDeclarationsopt() ;  
> 			break;
>  
>-    case 663 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); }  //$NON-NLS-1$
>+    case 727 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeMemberDeclarations() ;  
> 			break;
>  
>-    case 664 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
>+    case 728 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderNameWithTypeParameters(true);  
> 			break;
>  
>-    case 665 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 729 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderName(true);  
> 			break;
>  
>-    case 666 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); }  //$NON-NLS-1$
>+    case 730 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyMethodHeaderDefaultValue() ;  
> 			break;
>  
>-    case 667 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); }  //$NON-NLS-1$
>+    case 731 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderDefaultValue();  
> 			break;
>  
>-    case 668 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); }  //$NON-NLS-1$
>+    case 732 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>-    case 669 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 733 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeMemberDeclaration() ;  
> 			break;
>  
>-    case 677 : if (DEBUG) { System.out.println("AnnotationName ::= AT Name"); }  //$NON-NLS-1$
>+    case 741 : if (DEBUG) { System.out.println("AnnotationName ::= AT Name"); }  //$NON-NLS-1$
> 		    consumeAnnotationName() ;  
> 			break;
>  
>-    case 678 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>+    case 742 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
> 		    consumeNormalAnnotation() ;  
> 			break;
>  
>-    case 679 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); }  //$NON-NLS-1$
>+    case 743 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyMemberValuePairsopt() ;  
> 			break;
>  
>-    case 682 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); }  //$NON-NLS-1$
>+    case 746 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); }  //$NON-NLS-1$
> 		    consumeMemberValuePairs() ;  
> 			break;
>  
>-    case 683 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); }  //$NON-NLS-1$
>+    case 747 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); }  //$NON-NLS-1$
> 		    consumeMemberValuePair() ;  
> 			break;
>  
>-    case 684 : if (DEBUG) { System.out.println("EnterMemberValue ::="); }  //$NON-NLS-1$
>+    case 748 : if (DEBUG) { System.out.println("EnterMemberValue ::="); }  //$NON-NLS-1$
> 		    consumeEnterMemberValue() ;  
> 			break;
>  
>-    case 685 : if (DEBUG) { System.out.println("ExitMemberValue ::="); }  //$NON-NLS-1$
>+    case 749 : if (DEBUG) { System.out.println("ExitMemberValue ::="); }  //$NON-NLS-1$
> 		    consumeExitMemberValue() ;  
> 			break;
>  
>-    case 687 : if (DEBUG) { System.out.println("MemberValue ::= Name"); }  //$NON-NLS-1$
>+    case 751 : if (DEBUG) { System.out.println("MemberValue ::= Name"); }  //$NON-NLS-1$
> 		    consumeMemberValueAsName() ;  
> 			break;
>  
>-    case 690 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 754 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 691 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 755 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 692 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 756 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeEmptyMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 693 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 757 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeEmptyMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 694 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); }  //$NON-NLS-1$
>+    case 758 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); }  //$NON-NLS-1$
> 		    consumeEnterMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 696 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); }  //$NON-NLS-1$
>+    case 760 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); }  //$NON-NLS-1$
> 		    consumeMemberValues() ;  
> 			break;
>  
>-    case 697 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); }  //$NON-NLS-1$
>+    case 761 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); }  //$NON-NLS-1$
> 		    consumeMarkerAnnotation() ;  
> 			break;
>  
>-    case 698 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); }  //$NON-NLS-1$
>+    case 762 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); }  //$NON-NLS-1$
> 		    consumeSingleMemberAnnotationMemberValue() ;  
> 			break;
>  
>-    case 699 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>+    case 763 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
> 		    consumeSingleMemberAnnotation() ;  
> 			break;
>  
>-    case 700 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); }  //$NON-NLS-1$
>+    case 764 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); }  //$NON-NLS-1$
> 		    consumeRecoveryMethodHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 701 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 765 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
> 		    consumeRecoveryMethodHeaderName();  
> 			break;
>  
>-    case 702 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>+    case 766 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>-    case 703 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>+    case 767 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
> 	}
> }
>+private void consumeDimsWithTrailingAnnotsopt() {
>+	// DimsoptAnnotsopt -> DimsAnnotLoop
>+	pushOnIntStack(this.dimensions);
>+	this.dimensions = 0;
>+	// handle trailing annotations if any here.
>+}
>+private void consumeOneDimLoopWithAnnotations() {
>+	// OneDimLoop ::= OneOrMoreAnnotations '[' ']'
>+	this.dimensions++;
>+}
>+private void consumeEmptyDimsoptAnnotsopt() {
>+	// DimsoptAnnotsopt ::= $empty
>+	pushOnIntStack(0);  // signal a non array
>+	// handling trailing annotations if any here.
>+}
> protected void consumeSimpleAssertStatement() {
> 	// AssertStatement ::= 'assert' Expression ';'
> 	this.expressionLengthPtr--;
>Index: formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java,v
>retrieving revision 1.218
>diff -u -r1.218 CodeFormatterVisitor.java
>--- formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java	21 Aug 2009 08:28:20 -0000	1.218
>+++ formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java	7 Sep 2009 12:54:56 -0000
>@@ -166,8 +166,8 @@
> 	};
> 	private static final int[] CLOSING_GENERICS_EXPECTEDTOKENS = new int[] {
> 		TerminalTokens.TokenNameRIGHT_SHIFT,
>-		TerminalTokens.TokenNameUNSIGNED_RIGHT_SHIFT,
>-		TerminalTokens.TokenNameGREATER
>+		TerminalTokens.TokenNameGREATER,
>+		TerminalTokens.TokenNameUNSIGNED_RIGHT_SHIFT
> 	};
> 	private int chunkKind;
> 	public int lastLocalDeclarationSourceStart;
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java,v
>retrieving revision 1.799
>diff -u -r1.799 GenericTypeTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	18 Aug 2009 02:37:27 -0000	1.799
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	7 Sep 2009 12:55:24 -0000
>@@ -1870,23 +1870,22 @@
> 				"	A2 a2;\n" +
> 				"}\n"
> 			},
>-			"----------\n" +
>-			"1. ERROR in test\\X1.java (at line 3)\n" +
>-			"	public class X1<A1 extends X2<A2> {\n" +
>-			"	                              ^^\n" +
>-			"A2 cannot be resolved to a type\n" +
>-			"----------\n" +
>-			"2. ERROR in test\\X1.java (at line 3)\n" +
>-			"	public class X1<A1 extends X2<A2> {\n" +
>-			"	                                ^\n" +
>-			"Syntax error, insert \">\" to complete ReferenceType1\n" +
>-			"----------\n" +
>-			"3. ERROR in test\\X1.java (at line 7)\n" +
>-			"	class X2<A2 {\n" +
>-			"	         ^^\n" +
>-			"Syntax error on token \"A2\", > expected after this token\n" +
>-			"----------\n"
>-		);
>+			"----------\n" + 
>+			"1. ERROR in test\\X1.java (at line 3)\n" + 
>+			"	public class X1<A1 extends X2<A2> {\n" + 
>+			"	                              ^^\n" + 
>+			"A2 cannot be resolved to a type\n" + 
>+			"----------\n" + 
>+			"2. ERROR in test\\X1.java (at line 3)\n" + 
>+			"	public class X1<A1 extends X2<A2> {\n" + 
>+			"	                                ^\n" + 
>+			"Syntax error, insert \"AdditionalBoundList1\" to complete TypeParameter1\n" + 
>+			"----------\n" + 
>+			"3. ERROR in test\\X1.java (at line 7)\n" + 
>+			"	class X2<A2 {\n" + 
>+			"	         ^^\n" + 
>+			"Syntax error, insert \">\" to complete TypeParameter1\n" + 
>+			"----------\n"		);
> 	}
> 
> 	// JSR14-V10[2.4]: Not terminated consecutive declaration
>@@ -2311,26 +2310,26 @@
> 					"class X2<A extends X3<String> {}\n" +
> 					"class X3<A {}\n"
> 			},
>-			"----------\n" +
>-			"1. ERROR in test\\X.java (at line 2)\n" +
>-			"	public class X<A extends X1<X2<X3<String>>> {}\n" +
>-			"	                                        ^^^\n" +
>-			"Syntax error, insert \">\" to complete ReferenceType1\n" +
>-			"----------\n" +
>-			"2. ERROR in test\\X.java (at line 3)\n" +
>-			"	class X1<A extends X2<X3<String>> {}\n" +
>-			"	                               ^^\n" +
>-			"Syntax error, insert \">\" to complete ReferenceType1\n" +
>-			"----------\n" +
>-			"3. ERROR in test\\X.java (at line 4)\n" +
>-			"	class X2<A extends X3<String> {}\n" +
>-			"	                            ^\n" +
>-			"Syntax error, insert \">\" to complete ReferenceType1\n" +
>-			"----------\n" +
>-			"4. ERROR in test\\X.java (at line 5)\n" +
>-			"	class X3<A {}\n" +
>-			"	         ^\n" +
>-			"Syntax error on token \"A\", > expected after this token\n" +
>+			"----------\n" + 
>+			"1. ERROR in test\\X.java (at line 2)\n" + 
>+			"	public class X<A extends X1<X2<X3<String>>> {}\n" + 
>+			"	                                        ^^^\n" + 
>+			"Syntax error, insert \"AdditionalBoundList1\" to complete TypeParameter1\n" + 
>+			"----------\n" + 
>+			"2. ERROR in test\\X.java (at line 3)\n" + 
>+			"	class X1<A extends X2<X3<String>> {}\n" + 
>+			"	                               ^^\n" + 
>+			"Syntax error, insert \"AdditionalBoundList1\" to complete TypeParameter1\n" + 
>+			"----------\n" + 
>+			"3. ERROR in test\\X.java (at line 4)\n" + 
>+			"	class X2<A extends X3<String> {}\n" + 
>+			"	                            ^\n" + 
>+			"Syntax error, insert \"AdditionalBoundList1\" to complete TypeParameter1\n" + 
>+			"----------\n" + 
>+			"4. ERROR in test\\X.java (at line 5)\n" + 
>+			"	class X3<A {}\n" + 
>+			"	         ^\n" + 
>+			"Syntax error, insert \">\" to complete TypeParameter1\n" + 
> 			"----------\n"
> 		);
> 	}
>@@ -2398,16 +2397,16 @@
> 					"class X2<A extends X3<String>> {}\n" +
> 					"class X3<A> {}\n"
> 			},
>-			"----------\n" +
>-			"1. ERROR in test\\X.java (at line 2)\n" +
>-			"	public class X<A extends X1<X2<X3<String {}\n" +
>-			"	                                  ^^^^^^\n" +
>-			"Syntax error, insert \">>>\" to complete ReferenceType3\n" +
>-			"----------\n" +
>-			"2. ERROR in test\\X.java (at line 2)\n" +
>-			"	public class X<A extends X1<X2<X3<String {}\n" +
>-			"	                                  ^^^^^^\n" +
>-			"Syntax error, insert \">\" to complete ReferenceType1\n" +
>+			"----------\n" + 
>+			"1. ERROR in test\\X.java (at line 2)\n" + 
>+			"	public class X<A extends X1<X2<X3<String {}\n" + 
>+			"	                                  ^^^^^^\n" + 
>+			"Syntax error, insert \">>>\" to complete ReferenceType3\n" + 
>+			"----------\n" + 
>+			"2. ERROR in test\\X.java (at line 2)\n" + 
>+			"	public class X<A extends X1<X2<X3<String {}\n" + 
>+			"	                                  ^^^^^^\n" + 
>+			"Syntax error, insert \"AdditionalBoundList1\" to complete TypeParameter1\n" + 
> 			"----------\n");
> 	}
> 	public void test0084() {
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestMixed.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestMixed.java,v
>retrieving revision 1.51
>diff -u -r1.51 JavadocTestMixed.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestMixed.java	27 Jun 2008 16:04:44 -0000	1.51
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestMixed.java	7 Sep 2009 12:55:24 -0000
>@@ -779,49 +779,27 @@
> 					+ "		return \"\";\n"
> 					+ "	}\n"
> 					+ "}\n" },
>-					this.complianceLevel < ClassFileConstants.JDK1_5
>-					? "----------\n"
>-						+ "1. ERROR in test\\X.java (at line 23)\n"
>-						+ "	}\n"
>-						+ "	^\n"
>-						+ "Syntax error, insert \"}\" to complete ClassBody\n"
>-						+ "----------\n"
>-						+ "2. ERROR in test\\X.java (at line 26)\n"
>-						+ "	* @param list Valid param tag\n"
>-						+ "	         ^^^^\n"
>-						+ "Javadoc: Parameter list is not declared\n"
>-						+ "----------\n"
>-						+ "3. ERROR in test\\X.java (at line 33)\n"
>-						+ "	public String foo(java.util.Vector ) {\n"
>-						+ "	                            ^^^^^^\n"
>-						+ "Syntax error on token \"Vector\", VariableDeclaratorId expected after this token\n"
>-						+ "----------\n"
>-						+ "4. ERROR in test\\X.java (at line 36)\n"
>-						+ "	}\n"
>-						+ "	^\n"
>-						+ "Syntax error on token \"}\", delete this token\n"
>-						+ "----------\n"
>-					: "----------\n"
>-						+ "1. ERROR in test\\X.java (at line 23)\n"
>-						+ "	}\n"
>-						+ "	^\n"
>-						+ "Syntax error, insert \"}\" to complete ClassBody\n"
>-						+ "----------\n"
>-						+ "2. ERROR in test\\X.java (at line 26)\n"
>-						+ "	* @param list Valid param tag\n"
>-						+ "	         ^^^^\n"
>-						+ "Javadoc: Parameter list is not declared\n"
>-						+ "----------\n"
>-						+ "3. ERROR in test\\X.java (at line 33)\n"
>-						+ "	public String foo(java.util.Vector ) {\n"
>-						+ "	                           ^\n"
>-						+ "Syntax error on token \".\", ... expected\n"
>-						+ "----------\n"
>-						+ "4. ERROR in test\\X.java (at line 36)\n"
>-						+ "	}\n"
>-						+ "	^\n"
>-						+ "Syntax error on token \"}\", delete this token\n"
>-						+ "----------\n");
>+					"----------\n" + 
>+					"1. ERROR in test\\X.java (at line 23)\n" + 
>+					"	}\n" + 
>+					"	^\n" + 
>+					"Syntax error, insert \"}\" to complete ClassBody\n" + 
>+					"----------\n" + 
>+					"2. ERROR in test\\X.java (at line 26)\n" + 
>+					"	* @param list Valid param tag\n" + 
>+					"	         ^^^^\n" + 
>+					"Javadoc: Parameter list is not declared\n" + 
>+					"----------\n" + 
>+					"3. ERROR in test\\X.java (at line 33)\n" + 
>+					"	public String foo(java.util.Vector ) {\n" + 
>+					"	                            ^^^^^^\n" + 
>+					"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
>+					"----------\n" + 
>+					"4. ERROR in test\\X.java (at line 36)\n" + 
>+					"	}\n" + 
>+					"	^\n" + 
>+					"Syntax error on token \"}\", delete this token\n" + 
>+					"----------\n");						
> 	}
> 
> 	public void test040() {
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/ComplianceDiagnoseTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/ComplianceDiagnoseTest.java,v
>retrieving revision 1.42
>diff -u -r1.42 ComplianceDiagnoseTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/ComplianceDiagnoseTest.java	27 Aug 2009 15:26:58 -0000	1.42
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/ComplianceDiagnoseTest.java	7 Sep 2009 12:55:04 -0000
>@@ -1456,21 +1456,21 @@
> 		expected13ProblemLog;
> 
> 	String expected15ProblemLog =
>-		"----------\n" +
>-		"1. WARNING in X.java (at line 1)\n" +
>-		"	public class X <T1 extends String, T2 extends Y {\n" +
>-		"	                           ^^^^^^\n" +
>-		"The type parameter T1 should not be bounded by the final type String. Final types cannot be further extended\n" +
>-		"----------\n" +
>-		"2. ERROR in X.java (at line 1)\n" +
>-		"	public class X <T1 extends String, T2 extends Y {\n" +
>-		"	                                              ^\n" +
>-		"Syntax error, insert \">\" to complete ReferenceType1\n" +
>-		"----------\n" +
>-		"3. ERROR in X.java (at line 1)\n" +
>-		"	public class X <T1 extends String, T2 extends Y {\n" +
>-		"	                                              ^\n" +
>-		"Y cannot be resolved to a type\n" +
>+		"----------\n" + 
>+		"1. WARNING in X.java (at line 1)\n" + 
>+		"	public class X <T1 extends String, T2 extends Y {\n" + 
>+		"	                           ^^^^^^\n" + 
>+		"The type parameter T1 should not be bounded by the final type String. Final types cannot be further extended\n" + 
>+		"----------\n" + 
>+		"2. ERROR in X.java (at line 1)\n" + 
>+		"	public class X <T1 extends String, T2 extends Y {\n" + 
>+		"	                                              ^\n" + 
>+		"Syntax error, insert \"AdditionalBoundList1\" to complete TypeParameter1\n" + 
>+		"----------\n" + 
>+		"3. ERROR in X.java (at line 1)\n" + 
>+		"	public class X <T1 extends String, T2 extends Y {\n" + 
>+		"	                                              ^\n" + 
>+		"Y cannot be resolved to a type\n" + 
> 		"----------\n";
> 
> 	runComplianceParserTest(
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/SyntaxErrorTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/SyntaxErrorTest.java,v
>retrieving revision 1.27
>diff -u -r1.27 SyntaxErrorTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/SyntaxErrorTest.java	27 Jun 2008 16:04:46 -0000	1.27
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/SyntaxErrorTest.java	7 Sep 2009 12:55:05 -0000
>@@ -166,17 +166,17 @@
> 		"1. ERROR in <parenthesis mismatch> (at line 3)\n" +
> 		"	[ arg1, 						\n" +
> 		"	^\n" +
>-		"Syntax error on token \"[\", invalid Type\n" +
>+		"Syntax error on token \"[\", boolean expected\n" +
> 		"----------\n" +
> 		"2. ERROR in <parenthesis mismatch> (at line 4)\n" +
> 		"	{ arg2, ]						\n" +
> 		"	^\n" +
>-		"Syntax error on token \"{\", invalid Type\n" +
>+		"Syntax error on token \"{\", boolean expected\n" +
> 		"----------\n" +
> 		"3. ERROR in <parenthesis mismatch> (at line 4)\n" +
> 		"	{ arg2, ]						\n" +
> 		"	        ^\n" +
>-		"Syntax error on token \"]\", invalid Type\n" +
>+		"Syntax error on token \"]\", boolean expected\n" +
> 		"----------\n" +
> 		"4. ERROR in <parenthesis mismatch> (at line 5)\n" +
> 		"	arg3, 						\n" +
>@@ -273,7 +273,7 @@
> 		"1. ERROR in <test> (at line 3)\n"+
> 		"	i; 									\n"+
> 		"	^\n"+
>-		"Syntax error, insert \"AssignmentOperator Expression\" to complete Expression\n"+
>+		"Syntax error, insert \"VariableDeclarators\" to complete LocalVariableDeclaration\n" +
> 		"----------\n";
> 
> 	String testName = "<test>";
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/ParserTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/ParserTest.java,v
>retrieving revision 1.25
>diff -u -r1.25 ParserTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/ParserTest.java	3 Jul 2008 09:05:22 -0000	1.25
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/ParserTest.java	7 Sep 2009 12:55:05 -0000
>@@ -71,16 +71,21 @@
> 			"	}\n" +
> 			"}\n"
> 		},
>-		"----------\n" +
>-		"1. ERROR in X.java (at line 3)\n" +
>-		"	throws new X\n" +
>-		"	^^^^^^\n" +
>-		"Syntax error on token \"throws\", throw expected\n" +
>-		"----------\n" +
>-		"2. ERROR in X.java (at line 3)\n" +
>-		"	throws new X\n" +
>-		"	           ^\n" +
>-		"Syntax error, unexpected end of method\n" +
>+		"----------\n" + 
>+		"1. ERROR in X.java (at line 3)\n" + 
>+		"	throws new X\n" + 
>+		"	^^^^^^\n" + 
>+		"Syntax error on token \"throws\", throw expected\n" + 
>+		"----------\n" + 
>+		"2. ERROR in X.java (at line 3)\n" + 
>+		"	throws new X\n" + 
>+		"	           ^\n" + 
>+		"Syntax error, insert \"Dimensions\" to complete Expression\n" + 
>+		"----------\n" + 
>+		"3. ERROR in X.java (at line 3)\n" + 
>+		"	throws new X\n" + 
>+		"	           ^\n" + 
>+		"Syntax error, insert \";\" to complete BlockStatements\n" + 
> 		"----------\n"
> 	);
> }
>@@ -130,16 +135,21 @@
> 			"	}\n" +
> 			"}\n"
> 		},
>-		"----------\n" +
>-		"1. ERROR in X.java (at line 3)\n" +
>-		"	throws new X\n" +
>-		"	^^^^^^\n" +
>-		"Syntax error on token \"throws\", throw expected\n" +
>-		"----------\n" +
>-		"2. ERROR in X.java (at line 3)\n" +
>-		"	throws new X\n" +
>-		"	           ^\n" +
>-		"Syntax error, unexpected end of initializer\n" +
>+		"----------\n" + 
>+		"1. ERROR in X.java (at line 3)\n" + 
>+		"	throws new X\n" + 
>+		"	^^^^^^\n" + 
>+		"Syntax error on token \"throws\", throw expected\n" + 
>+		"----------\n" + 
>+		"2. ERROR in X.java (at line 3)\n" + 
>+		"	throws new X\n" + 
>+		"	           ^\n" + 
>+		"Syntax error, insert \"Dimensions\" to complete Expression\n" + 
>+		"----------\n" + 
>+		"3. ERROR in X.java (at line 3)\n" + 
>+		"	throws new X\n" + 
>+		"	           ^\n" + 
>+		"Syntax error, insert \";\" to complete BlockStatements\n" + 
> 		"----------\n"
> 	);
> }
>@@ -238,11 +248,11 @@
> 			"   public void bar(){}\n" +
> 			"}\n"
> 		},
>-		"----------\n" +
>-		"1. ERROR in X.java (at line 2)\n" +
>-		"	public void foo(X, Object o, String s) {\n" +
>-		"	                 ^\n" +
>-		"Syntax error on token \",\", . expected\n" +
>+		"----------\n" + 
>+		"1. ERROR in X.java (at line 2)\n" + 
>+		"	public void foo(X, Object o, String s) {\n" + 
>+		"	                ^\n" + 
>+		"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
> 		"----------\n"
> 	);
> }

Actions: View | Diff

Attachments on bug 287648: 145655 | 145779 | 145880 | 146186 | 146401 | 146602 | 148041 | 148087 | 149501 | 149970 | 150486 | 187248 | 217341 | 217581 | 217668 | 217685 | 217786