Attachment 134615 Details for Bug 132679 – Proposed patch

[patch] Proposed patch

bug132679b_007.txt (text/plain), 142.74 KB, created by David Audel

on 2009-05-06 09:42:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Audel

Created: 2009-05-06 09:42:40 EDT

Size: 142.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/CompletionTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java,v
>retrieving revision 1.202
>diff -u -r1.202 CompletionTests.java
>--- src/org/eclipse/jdt/core/tests/model/CompletionTests.java	28 Apr 2009 17:46:11 -0000	1.202
>+++ src/org/eclipse/jdt/core/tests/model/CompletionTests.java	6 May 2009 13:17:20 -0000
>@@ -139,7 +139,45 @@
> 			"bar[METHOD_REF]{, LArrayInitializer;, ()I, bar, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=132679
>+public void testBug132679() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/Test269493.java",
>+			"package test;\n" +
>+			"class Context {\n" +
>+			"\n" +
>+			"  private int value = 10;\n" +
>+			"\n" +
>+			"  public abstract class Callback {\n" +
>+			"      public abstract void doit(int value);\n" +
>+			"  }\n" +
>+			"}\n" +
>+			"\n" +
>+			"public class ContextTest {\n" +
>+			"\n" +
>+			"  private Context context = new Context();\n" +
>+			"\n" +
>+			"  public void test() {\n" +
>+			"      context.new Callback() {\n" +
>+			"      public void doit(int value) {\n" +
>+			"        Object foo = new Object();\n" +
>+			"        foo.equ\n" +
>+			"      }\n" +
>+			"    };\n" +
>+			"  }\n" +
>+			"}\n");
>+			
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "foo.equ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
> public void testBug164311() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
>#P org.eclipse.jdt.core
>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java,v
>retrieving revision 1.207
>diff -u -r1.207 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	6 May 2009 08:56:58 -0000	1.207
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	6 May 2009 13:17:23 -0000
>@@ -2238,10 +2238,10 @@
> 		this.pendingAnnotation = null;
> 	}
> }
>-protected void consumeEnterAnonymousClassBody() {
>+protected void consumeEnterAnonymousClassBody(boolean qualified) {
> 	popElement(K_SELECTOR_QUALIFIER);
> 	popElement(K_SELECTOR_INVOCATION_TYPE);
>-	super.consumeEnterAnonymousClassBody();
>+	super.consumeEnterAnonymousClassBody(qualified);
> }
> protected void consumeEnterVariable() {
> 	this.identifierPtr--;
>Index: codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java,v
>retrieving revision 1.88
>diff -u -r1.88 SelectionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java	7 Mar 2009 01:08:06 -0000	1.88
>+++ codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java	6 May 2009 13:17:23 -0000
>@@ -369,11 +369,11 @@
> 		super.consumeClassInstanceCreationExpressionWithTypeArguments();
> 	}
> }
>-protected void consumeEnterAnonymousClassBody() {
>+protected void consumeEnterAnonymousClassBody(boolean qualified) {
> 	// EnterAnonymousClassBody ::= $empty
> 
> 	if (this.indexOfAssistIdentifier() < 0) {
>-		super.consumeEnterAnonymousClassBody();
>+		super.consumeEnterAnonymousClassBody(qualified);
> 		return;
> 	}
> 
>@@ -401,6 +401,11 @@
> 			0,
> 			argumentLength);
> 	}
>+	
>+	if (qualified) {
>+		this.expressionLengthPtr--;
>+		alloc.enclosingInstance = this.expressionStack[this.expressionPtr--];
>+	}
> 
> 	alloc.type = typeReference;
> 
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc,v
>retrieving revision 1.49
>diff -u -r1.49 parser4.rsc
>Binary files /tmp/cvsdajhQ9 and parser4.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc,v
>retrieving revision 1.50
>diff -u -r1.50 parser5.rsc
>Binary files /tmp/cvsEVvSyr and parser5.rsc differ
>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.402
>diff -u -r1.402 Parser.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java	6 May 2009 13:01:15 -0000	1.402
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java	6 May 2009 13:17:25 -0000
>@@ -2331,11 +2331,15 @@
> 	// ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' SimpleName '(' ArgumentListopt ')' ClassBodyopt
> 	classInstanceCreation(true);
> 
>-	this.expressionLengthPtr--;
> 	QualifiedAllocationExpression qae =
>-		(QualifiedAllocationExpression) this.expressionStack[this.expressionPtr--];
>-	qae.enclosingInstance = this.expressionStack[this.expressionPtr];
>-	this.expressionStack[this.expressionPtr] = qae;
>+		(QualifiedAllocationExpression) this.expressionStack[this.expressionPtr];
>+	
>+	if (qae.anonymousType == null) {
>+		this.expressionLengthPtr--;
>+		this.expressionPtr--;
>+		qae.enclosingInstance = this.expressionStack[this.expressionPtr];
>+		this.expressionStack[this.expressionPtr] = qae;
>+	}
> 	qae.sourceStart = qae.enclosingInstance.sourceStart;
> }
> protected void consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() {
>@@ -2391,12 +2395,16 @@
> 			allocationExpression.sourceStart = this.intStack[this.intPtr--];
> 		}
> 	}
>-
>-	this.expressionLengthPtr--;
>+	
> 	QualifiedAllocationExpression qae =
>-		(QualifiedAllocationExpression) this.expressionStack[this.expressionPtr--];
>-	qae.enclosingInstance = this.expressionStack[this.expressionPtr];
>-	this.expressionStack[this.expressionPtr] = qae;
>+		(QualifiedAllocationExpression) this.expressionStack[this.expressionPtr];
>+	
>+	if (qae.anonymousType == null) {
>+		this.expressionLengthPtr--;
>+		this.expressionPtr--;
>+		qae.enclosingInstance = this.expressionStack[this.expressionPtr];
>+		this.expressionStack[this.expressionPtr] = qae;
>+	}
> 	qae.sourceStart = qae.enclosingInstance.sourceStart;
> }
> protected void consumeClassInstanceCreationExpressionWithTypeArguments() {
>@@ -2977,7 +2985,7 @@
> 
> 	iteratorForStatement.sourceEnd = localDeclaration.declarationSourceEnd;
> }
>-protected void consumeEnterAnonymousClassBody() {
>+protected void consumeEnterAnonymousClassBody(boolean qualified) {
> 	// EnterAnonymousClassBody ::= $empty
> 	TypeReference typeReference = getTypeReference(0);
> 
>@@ -2999,6 +3007,12 @@
> 			0,
> 			argumentLength);
> 	}
>+	
>+	if (qualified) {
>+		this.expressionLengthPtr--;
>+		alloc.enclosingInstance = this.expressionStack[this.expressionPtr--];
>+	}
>+	
> 	alloc.type = typeReference;
> 
> 	anonymousType.sourceEnd = alloc.sourceEnd;
>@@ -5107,1679 +5121,1687 @@
> 	// PushRPAREN ::= ')'
> 	pushOnIntStack(this.rParenPos);
> }
>-// This method is part of an automatic generation : do NOT edit-modify
>+// 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$
>-		    consumePrimitiveType();
>+		    consumePrimitiveType();  
> 			break;
>-
>+ 
>     case 44 : if (DEBUG) { System.out.println("ReferenceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
>-		    consumeReferenceType();
>+		    consumeReferenceType();   
> 			break;
>-
>+ 
>     case 48 : if (DEBUG) { System.out.println("ClassOrInterface ::= Name"); }  //$NON-NLS-1$
>-		    consumeClassOrInterfaceName();
>+		    consumeClassOrInterfaceName();   
> 			break;
>-
>+ 
>     case 49 : if (DEBUG) { System.out.println("ClassOrInterface ::= GenericType DOT Name"); }  //$NON-NLS-1$
>-		    consumeClassOrInterface();
>+		    consumeClassOrInterface();   
> 			break;
>-
>+ 
>     case 50 : if (DEBUG) { System.out.println("GenericType ::= ClassOrInterface TypeArguments"); }  //$NON-NLS-1$
>-		    consumeGenericType();
>+		    consumeGenericType();   
> 			break;
>-
>+ 
>     case 51 : if (DEBUG) { System.out.println("ArrayTypeWithTypeArgumentsName ::= GenericType DOT Name"); }  //$NON-NLS-1$
>-		    consumeArrayTypeWithTypeArgumentsName();
>+		    consumeArrayTypeWithTypeArgumentsName();   
> 			break;
>-
>+ 
>     case 52 : if (DEBUG) { System.out.println("ArrayType ::= PrimitiveType Dims"); }  //$NON-NLS-1$
>-		    consumePrimitiveArrayType();
>+		    consumePrimitiveArrayType();   
> 			break;
>-
>+ 
>     case 53 : if (DEBUG) { System.out.println("ArrayType ::= Name Dims"); }  //$NON-NLS-1$
>-		    consumeNameArrayType();
>+		    consumeNameArrayType();   
> 			break;
>-
>+ 
>     case 54 : if (DEBUG) { System.out.println("ArrayType ::= ArrayTypeWithTypeArgumentsName Dims"); }  //$NON-NLS-1$
>-		    consumeGenericTypeNameArrayType();
>+		    consumeGenericTypeNameArrayType();   
> 			break;
>-
>+ 
>     case 55 : if (DEBUG) { System.out.println("ArrayType ::= GenericType Dims"); }  //$NON-NLS-1$
>-		    consumeGenericTypeArrayType();
>+		    consumeGenericTypeArrayType();   
> 			break;
>-
>+ 
>     case 60 : if (DEBUG) { System.out.println("QualifiedName ::= Name DOT SimpleName"); }  //$NON-NLS-1$
>-		    consumeQualifiedName();
>+		    consumeQualifiedName();  
> 			break;
>-
>+ 
>     case 61 : if (DEBUG) { System.out.println("CompilationUnit ::= EnterCompilationUnit..."); }  //$NON-NLS-1$
>-		    consumeCompilationUnit();
>+		    consumeCompilationUnit();  
> 			break;
>-
>+ 
>     case 62 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration"); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnit();
>+		    consumeInternalCompilationUnit();  
> 			break;
>-
>+ 
>     case 63 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnit();
>+		    consumeInternalCompilationUnit();  
> 			break;
>-
>+ 
>     case 64 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnitWithTypes();
>+		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>-
>+ 
>     case 65 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= PackageDeclaration..."); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnitWithTypes();
>+		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>-
>+ 
>     case 66 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ImportDeclarations..."); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnit();
>+		    consumeInternalCompilationUnit();  
> 			break;
>-
>+ 
>     case 67 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= TypeDeclarations"); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnitWithTypes();
>+		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>-
>+ 
>     case 68 : if (DEBUG) { System.out.println("InternalCompilationUnit ::= ImportDeclarations..."); }  //$NON-NLS-1$
>-		    consumeInternalCompilationUnitWithTypes();
>+		    consumeInternalCompilationUnitWithTypes();  
> 			break;
>-
>+ 
>     case 69 : if (DEBUG) { System.out.println("InternalCompilationUnit ::="); }  //$NON-NLS-1$
>-		    consumeEmptyInternalCompilationUnit();
>+		    consumeEmptyInternalCompilationUnit();  
> 			break;
>-
>+ 
>     case 70 : if (DEBUG) { System.out.println("ReduceImports ::="); }  //$NON-NLS-1$
>-		    consumeReduceImports();
>+		    consumeReduceImports();  
> 			break;
>-
>+ 
>     case 71 : if (DEBUG) { System.out.println("EnterCompilationUnit ::="); }  //$NON-NLS-1$
>-		    consumeEnterCompilationUnit();
>+		    consumeEnterCompilationUnit();  
> 			break;
>-
>+ 
>     case 87 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
>-		    consumeCatchHeader();
>+		    consumeCatchHeader();  
> 			break;
>-
>+ 
>     case 89 : if (DEBUG) { System.out.println("ImportDeclarations ::= ImportDeclarations..."); }  //$NON-NLS-1$
>-		    consumeImportDeclarations();
>+		    consumeImportDeclarations();  
> 			break;
>-
>+ 
>     case 91 : if (DEBUG) { System.out.println("TypeDeclarations ::= TypeDeclarations TypeDeclaration"); }  //$NON-NLS-1$
>-		    consumeTypeDeclarations();
>+		    consumeTypeDeclarations();  
> 			break;
>-
>+ 
>     case 92 : if (DEBUG) { System.out.println("PackageDeclaration ::= PackageDeclarationName SEMICOLON"); }  //$NON-NLS-1$
>-		     consumePackageDeclaration();
>+		     consumePackageDeclaration();  
> 			break;
>-
>+ 
>     case 93 : if (DEBUG) { System.out.println("PackageDeclarationName ::= Modifiers package..."); }  //$NON-NLS-1$
>-		     consumePackageDeclarationNameWithModifiers();
>+		     consumePackageDeclarationNameWithModifiers();  
> 			break;
>-
>+ 
>     case 94 : if (DEBUG) { System.out.println("PackageDeclarationName ::= PackageComment package Name"); }  //$NON-NLS-1$
>-		     consumePackageDeclarationName();
>+		     consumePackageDeclarationName();  
> 			break;
>-
>+ 
>     case 95 : if (DEBUG) { System.out.println("PackageComment ::="); }  //$NON-NLS-1$
>-		     consumePackageComment();
>+		     consumePackageComment();  
> 			break;
>-
>+ 
>     case 100 : if (DEBUG) { System.out.println("SingleTypeImportDeclaration ::=..."); }  //$NON-NLS-1$
>-		    consumeImportDeclaration();
>+		    consumeImportDeclaration();  
> 			break;
>-
>+ 
>     case 101 : if (DEBUG) { System.out.println("SingleTypeImportDeclarationName ::= import Name"); }  //$NON-NLS-1$
>-		    consumeSingleTypeImportDeclarationName();
>+		    consumeSingleTypeImportDeclarationName();  
> 			break;
>-
>+ 
>     case 102 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>-		    consumeImportDeclaration();
>+		    consumeImportDeclaration();  
> 			break;
>-
>+ 
>     case 103 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclarationName ::= import Name DOT..."); }  //$NON-NLS-1$
>-		    consumeTypeImportOnDemandDeclarationName();
>+		    consumeTypeImportOnDemandDeclarationName();  
> 			break;
>-
>+ 
>      case 106 : if (DEBUG) { System.out.println("TypeDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeEmptyTypeDeclaration();
>+		    consumeEmptyTypeDeclaration();  
> 			break;
>-
>+ 
>     case 110 : if (DEBUG) { System.out.println("Modifiers ::= Modifiers Modifier"); }  //$NON-NLS-1$
>-		    consumeModifiers2();
>+		    consumeModifiers2();  
> 			break;
>-
>+ 
>     case 122 : if (DEBUG) { System.out.println("Modifier ::= Annotation"); }  //$NON-NLS-1$
>-		    consumeAnnotationAsModifier();
>+		    consumeAnnotationAsModifier();  
> 			break;
>-
>+ 
>     case 123 : if (DEBUG) { System.out.println("ClassDeclaration ::= ClassHeader ClassBody"); }  //$NON-NLS-1$
>-		    consumeClassDeclaration();
>+		    consumeClassDeclaration();  
> 			break;
>-
>+ 
>     case 124 : if (DEBUG) { System.out.println("ClassHeader ::= ClassHeaderName ClassHeaderExtendsopt..."); }  //$NON-NLS-1$
>-		    consumeClassHeader();
>+		    consumeClassHeader();  
> 			break;
>-
>+ 
>     case 125 : if (DEBUG) { System.out.println("ClassHeaderName ::= ClassHeaderName1 TypeParameters"); }  //$NON-NLS-1$
>-		    consumeTypeHeaderNameWithTypeParameters();
>+		    consumeTypeHeaderNameWithTypeParameters();  
> 			break;
>-
>+ 
>     case 127 : if (DEBUG) { System.out.println("ClassHeaderName1 ::= Modifiersopt class Identifier"); }  //$NON-NLS-1$
>-		    consumeClassHeaderName1();
>+		    consumeClassHeaderName1();  
> 			break;
>-
>+ 
>     case 128 : if (DEBUG) { System.out.println("ClassHeaderExtends ::= extends ClassType"); }  //$NON-NLS-1$
>-		    consumeClassHeaderExtends();
>+		    consumeClassHeaderExtends();  
> 			break;
>-
>+ 
>     case 129 : if (DEBUG) { System.out.println("ClassHeaderImplements ::= implements InterfaceTypeList"); }  //$NON-NLS-1$
>-		    consumeClassHeaderImplements();
>+		    consumeClassHeaderImplements();  
> 			break;
>-
>+ 
>     case 131 : if (DEBUG) { System.out.println("InterfaceTypeList ::= InterfaceTypeList COMMA..."); }  //$NON-NLS-1$
>-		    consumeInterfaceTypeList();
>+		    consumeInterfaceTypeList();  
> 			break;
>-
>+ 
>     case 132 : if (DEBUG) { System.out.println("InterfaceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
>-		    consumeInterfaceType();
>+		    consumeInterfaceType();  
> 			break;
>-
>+ 
>     case 135 : if (DEBUG) { System.out.println("ClassBodyDeclarations ::= ClassBodyDeclarations..."); }  //$NON-NLS-1$
>-		    consumeClassBodyDeclarations();
>+		    consumeClassBodyDeclarations();  
> 			break;
>-
>+ 
>     case 139 : if (DEBUG) { System.out.println("ClassBodyDeclaration ::= Diet NestedMethod..."); }  //$NON-NLS-1$
>-		    consumeClassBodyDeclaration();
>+		    consumeClassBodyDeclaration();  
> 			break;
>-
>+ 
>     case 140 : if (DEBUG) { System.out.println("Diet ::="); }  //$NON-NLS-1$
>-		    consumeDiet();
>+		    consumeDiet();  
> 			break;
> 
>     case 141 : if (DEBUG) { System.out.println("Initializer ::= Diet NestedMethod CreateInitializer..."); }  //$NON-NLS-1$
>-		    consumeClassBodyDeclaration();
>+		    consumeClassBodyDeclaration();  
> 			break;
>-
>+ 
>     case 142 : if (DEBUG) { System.out.println("CreateInitializer ::="); }  //$NON-NLS-1$
>-		    consumeCreateInitializer();
>+		    consumeCreateInitializer();  
> 			break;
> 
>     case 149 : if (DEBUG) { System.out.println("ClassMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeEmptyTypeDeclaration();
>+		    consumeEmptyTypeDeclaration();  
> 			break;
> 
>     case 152 : if (DEBUG) { System.out.println("FieldDeclaration ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>-		    consumeFieldDeclaration();
>+		    consumeFieldDeclaration();  
> 			break;
>-
>+ 
>     case 154 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
>-		    consumeVariableDeclarators();
>+		    consumeVariableDeclarators();  
> 			break;
>-
>+ 
>     case 157 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
>-		    consumeEnterVariable();
>+		    consumeEnterVariable();  
> 			break;
>-
>+ 
>     case 158 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
>-		    consumeExitVariableWithInitialization();
>+		    consumeExitVariableWithInitialization();  
> 			break;
>-
>+ 
>     case 159 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
>-		    consumeExitVariableWithoutInitialization();
>+		    consumeExitVariableWithoutInitialization();  
> 			break;
>-
>+ 
>     case 160 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
>-		    consumeForceNoDiet();
>+		    consumeForceNoDiet();  
> 			break;
>-
>+ 
>     case 161 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
>-		    consumeRestoreDiet();
>+		    consumeRestoreDiet();  
> 			break;
>-
>+ 
>     case 166 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
> 		    // set to true to consume a method with a body
>-  consumeMethodDeclaration(true);
>+  consumeMethodDeclaration(true);   
> 			break;
>-
>+ 
>     case 167 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
> 		    // set to false to consume a method without body
>-  consumeMethodDeclaration(false);
>+  consumeMethodDeclaration(false);  
> 			break;
>-
>+ 
>     case 168 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
>-		    consumeMethodHeader();
>+		    consumeMethodHeader();  
> 			break;
>-
>+ 
>     case 169 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt TypeParameters Type..."); }  //$NON-NLS-1$
>-		    consumeMethodHeaderNameWithTypeParameters(false);
>+		    consumeMethodHeaderNameWithTypeParameters(false);  
> 			break;
>-
>+ 
>     case 170 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt Type Identifier LPAREN"); }  //$NON-NLS-1$
>-		    consumeMethodHeaderName(false);
>+		    consumeMethodHeaderName(false);  
> 			break;
>-
>+ 
>     case 171 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
>-		    consumeMethodHeaderRightParen();
>+		    consumeMethodHeaderRightParen();  
> 			break;
>-
>+ 
>     case 172 : if (DEBUG) { System.out.println("MethodHeaderExtendedDims ::= Dimsopt"); }  //$NON-NLS-1$
>-		    consumeMethodHeaderExtendedDims();
>+		    consumeMethodHeaderExtendedDims();  
> 			break;
>-
>+ 
>     case 173 : if (DEBUG) { System.out.println("MethodHeaderThrowsClause ::= throws ClassTypeList"); }  //$NON-NLS-1$
>-		    consumeMethodHeaderThrowsClause();
>+		    consumeMethodHeaderThrowsClause();  
> 			break;
>-
>+ 
>     case 174 : if (DEBUG) { System.out.println("ConstructorHeader ::= ConstructorHeaderName..."); }  //$NON-NLS-1$
>-		    consumeConstructorHeader();
>+		    consumeConstructorHeader();  
> 			break;
>-
>+ 
>     case 175 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt TypeParameters..."); }  //$NON-NLS-1$
>-		    consumeConstructorHeaderNameWithTypeParameters();
>+		    consumeConstructorHeaderNameWithTypeParameters();  
> 			break;
>-
>+ 
>     case 176 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt Identifier LPAREN"); }  //$NON-NLS-1$
>-		    consumeConstructorHeaderName();
>+		    consumeConstructorHeaderName();  
> 			break;
>-
>+ 
>     case 178 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
>-		    consumeFormalParameterList();
>+		    consumeFormalParameterList();  
> 			break;
>-
>+ 
>     case 179 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>-		    consumeFormalParameter(false);
>+		    consumeFormalParameter(false);  
> 			break;
>-
>+ 
>     case 180 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type ELLIPSIS..."); }  //$NON-NLS-1$
>-		    consumeFormalParameter(true);
>+		    consumeFormalParameter(true);  
> 			break;
>-
>+ 
>     case 182 : if (DEBUG) { System.out.println("ClassTypeList ::= ClassTypeList COMMA ClassTypeElt"); }  //$NON-NLS-1$
>-		    consumeClassTypeList();
>+		    consumeClassTypeList();  
> 			break;
>-
>+ 
>     case 183 : if (DEBUG) { System.out.println("ClassTypeElt ::= ClassType"); }  //$NON-NLS-1$
>-		    consumeClassTypeElt();
>+		    consumeClassTypeElt();  
> 			break;
>-
>+ 
>     case 184 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE BlockStatementsopt..."); }  //$NON-NLS-1$
>-		    consumeMethodBody();
>+		    consumeMethodBody();  
> 			break;
>-
>+ 
>     case 185 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
>-		    consumeNestedMethod();
>+		    consumeNestedMethod();  
> 			break;
>-
>+ 
>     case 186 : if (DEBUG) { System.out.println("StaticInitializer ::= StaticOnly Block"); }  //$NON-NLS-1$
>-		    consumeStaticInitializer();
>+		    consumeStaticInitializer();  
> 			break;
> 
>     case 187 : if (DEBUG) { System.out.println("StaticOnly ::= static"); }  //$NON-NLS-1$
>-		    consumeStaticOnly();
>+		    consumeStaticOnly();  
> 			break;
>-
>+ 
>     case 188 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader MethodBody"); }  //$NON-NLS-1$
>-		    consumeConstructorDeclaration() ;
>+		    consumeConstructorDeclaration() ;  
> 			break;
>-
>+ 
>     case 189 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeInvalidConstructorDeclaration() ;
>+		    consumeInvalidConstructorDeclaration() ;  
> 			break;
>-
>+ 
>     case 190 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= this LPAREN..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocation(0, THIS_CALL);
>+		    consumeExplicitConstructorInvocation(0, THIS_CALL);  
> 			break;
>-
>+ 
>     case 191 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments this"); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocationWithTypeArguments(0,THIS_CALL);
>+		    consumeExplicitConstructorInvocationWithTypeArguments(0,THIS_CALL);  
> 			break;
>-
>+ 
>     case 192 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= super LPAREN..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocation(0,SUPER_CALL);
>+		    consumeExplicitConstructorInvocation(0,SUPER_CALL);  
> 			break;
>-
>+ 
>     case 193 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocationWithTypeArguments(0,SUPER_CALL);
>+		    consumeExplicitConstructorInvocationWithTypeArguments(0,SUPER_CALL);  
> 			break;
>-
>+ 
>     case 194 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT super..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocation(1, SUPER_CALL);
>+		    consumeExplicitConstructorInvocation(1, SUPER_CALL);  
> 			break;
>-
>+ 
>     case 195 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocationWithTypeArguments(1, SUPER_CALL);
>+		    consumeExplicitConstructorInvocationWithTypeArguments(1, SUPER_CALL);  
> 			break;
>-
>+ 
>     case 196 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT super LPAREN"); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocation(2, SUPER_CALL);
>+		    consumeExplicitConstructorInvocation(2, SUPER_CALL);  
> 			break;
>-
>+ 
>     case 197 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocationWithTypeArguments(2, SUPER_CALL);
>+		    consumeExplicitConstructorInvocationWithTypeArguments(2, SUPER_CALL);  
> 			break;
>-
>+ 
>     case 198 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT this..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocation(1, THIS_CALL);
>+		    consumeExplicitConstructorInvocation(1, THIS_CALL);  
> 			break;
>-
>+ 
>     case 199 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocationWithTypeArguments(1, THIS_CALL);
>+		    consumeExplicitConstructorInvocationWithTypeArguments(1, THIS_CALL);  
> 			break;
>-
>+ 
>     case 200 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT this LPAREN"); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocation(2, THIS_CALL);
>+		    consumeExplicitConstructorInvocation(2, THIS_CALL);  
> 			break;
>-
>+ 
>     case 201 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
>-		    consumeExplicitConstructorInvocationWithTypeArguments(2, THIS_CALL);
>+		    consumeExplicitConstructorInvocationWithTypeArguments(2, THIS_CALL);  
> 			break;
>-
>+ 
>     case 202 : if (DEBUG) { System.out.println("InterfaceDeclaration ::= InterfaceHeader InterfaceBody"); }  //$NON-NLS-1$
>-		    consumeInterfaceDeclaration();
>+		    consumeInterfaceDeclaration();  
> 			break;
>-
>+ 
>     case 203 : if (DEBUG) { System.out.println("InterfaceHeader ::= InterfaceHeaderName..."); }  //$NON-NLS-1$
>-		    consumeInterfaceHeader();
>+		    consumeInterfaceHeader();  
> 			break;
>-
>+ 
>     case 204 : if (DEBUG) { System.out.println("InterfaceHeaderName ::= InterfaceHeaderName1..."); }  //$NON-NLS-1$
>-		    consumeTypeHeaderNameWithTypeParameters();
>+		    consumeTypeHeaderNameWithTypeParameters();  
> 			break;
>-
>+ 
>     case 206 : if (DEBUG) { System.out.println("InterfaceHeaderName1 ::= Modifiersopt interface..."); }  //$NON-NLS-1$
>-		    consumeInterfaceHeaderName1();
>+		    consumeInterfaceHeaderName1();  
> 			break;
>-
>+ 
>     case 207 : if (DEBUG) { System.out.println("InterfaceHeaderExtends ::= extends InterfaceTypeList"); }  //$NON-NLS-1$
>-		    consumeInterfaceHeaderExtends();
>+		    consumeInterfaceHeaderExtends();  
> 			break;
>-
>+ 
>     case 210 : if (DEBUG) { System.out.println("InterfaceMemberDeclarations ::=..."); }  //$NON-NLS-1$
>-		    consumeInterfaceMemberDeclarations();
>+		    consumeInterfaceMemberDeclarations();  
> 			break;
>-
>+ 
>     case 211 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeEmptyTypeDeclaration();
>+		    consumeEmptyTypeDeclaration();  
> 			break;
>-
>+ 
>     case 213 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
>-		    consumeInvalidMethodDeclaration();
>+		    consumeInvalidMethodDeclaration();  
> 			break;
>-
>+ 
>     case 214 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
>-		    consumeInvalidConstructorDeclaration(true);
>+		    consumeInvalidConstructorDeclaration(true);   
> 			break;
>-
>+ 
>     case 215 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
>-		    consumeInvalidConstructorDeclaration(false);
>+		    consumeInvalidConstructorDeclaration(false);   
> 			break;
>-
>+ 
>     case 223 : if (DEBUG) { System.out.println("PushLeftBrace ::="); }  //$NON-NLS-1$
>-		    consumePushLeftBrace();
>+		    consumePushLeftBrace();  
> 			break;
>-
>+ 
>     case 224 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace ,opt RBRACE"); }  //$NON-NLS-1$
>-		    consumeEmptyArrayInitializer();
>+		    consumeEmptyArrayInitializer();  
> 			break;
>-
>+ 
>     case 225 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
>-		    consumeArrayInitializer();
>+		    consumeArrayInitializer();  
> 			break;
>-
>+ 
>     case 226 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
>-		    consumeArrayInitializer();
>+		    consumeArrayInitializer();  
> 			break;
>-
>+ 
>     case 228 : if (DEBUG) { System.out.println("VariableInitializers ::= VariableInitializers COMMA..."); }  //$NON-NLS-1$
>-		    consumeVariableInitializers();
>+		    consumeVariableInitializers();  
> 			break;
>-
>+ 
>     case 229 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
>-		    consumeBlock();
>+		    consumeBlock();  
> 			break;
>-
>+ 
>     case 230 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
>-		    consumeOpenBlock() ;
>+		    consumeOpenBlock() ;  
> 			break;
>-
>+ 
>     case 232 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
>-		    consumeBlockStatements() ;
>+		    consumeBlockStatements() ;  
> 			break;
>-
>+ 
>     case 236 : if (DEBUG) { System.out.println("BlockStatement ::= InterfaceDeclaration"); }  //$NON-NLS-1$
>-		    consumeInvalidInterfaceDeclaration();
>+		    consumeInvalidInterfaceDeclaration();  
> 			break;
>-
>+ 
>     case 237 : if (DEBUG) { System.out.println("BlockStatement ::= AnnotationTypeDeclaration"); }  //$NON-NLS-1$
>-		    consumeInvalidAnnotationTypeDeclaration();
>+		    consumeInvalidAnnotationTypeDeclaration();  
> 			break;
>-
>+ 
>     case 238 : if (DEBUG) { System.out.println("BlockStatement ::= EnumDeclaration"); }  //$NON-NLS-1$
>-		    consumeInvalidEnumDeclaration();
>+		    consumeInvalidEnumDeclaration();  
> 			break;
>-
>+ 
>     case 239 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
>-		    consumeLocalVariableDeclarationStatement();
>+		    consumeLocalVariableDeclarationStatement();  
> 			break;
>-
>+ 
>     case 240 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Type PushModifiers..."); }  //$NON-NLS-1$
>-		    consumeLocalVariableDeclaration();
>+		    consumeLocalVariableDeclaration();  
> 			break;
>-
>+ 
>     case 241 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Modifiers Type..."); }  //$NON-NLS-1$
>-		    consumeLocalVariableDeclaration();
>+		    consumeLocalVariableDeclaration();  
> 			break;
>-
>+ 
>     case 242 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
>-		    consumePushModifiers();
>+		    consumePushModifiers();  
> 			break;
>-
>+ 
>     case 243 : if (DEBUG) { System.out.println("PushModifiersForHeader ::="); }  //$NON-NLS-1$
>-		    consumePushModifiersForHeader();
>+		    consumePushModifiersForHeader();  
> 			break;
>-
>+ 
>     case 244 : if (DEBUG) { System.out.println("PushRealModifiers ::="); }  //$NON-NLS-1$
>-		    consumePushRealModifiers();
>+		    consumePushRealModifiers();  
> 			break;
>-
>+ 
>     case 270 : if (DEBUG) { System.out.println("EmptyStatement ::= SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeEmptyStatement();
>+		    consumeEmptyStatement();  
> 			break;
>-
>+ 
>     case 271 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
>-		    consumeStatementLabel() ;
>+		    consumeStatementLabel() ;  
> 			break;
>-
>+ 
>     case 272 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
>-		    consumeStatementLabel() ;
>+		    consumeStatementLabel() ;  
> 			break;
>-
>+ 
>     case 273 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
>-		    consumeLabel() ;
>+		    consumeLabel() ;  
> 			break;
>-
>+ 
>      case 274 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeExpressionStatement();
>+		    consumeExpressionStatement();  
> 			break;
>-
>+ 
>     case 283 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>-		    consumeStatementIfNoElse();
>+		    consumeStatementIfNoElse();  
> 			break;
>-
>+ 
>     case 284 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>-		    consumeStatementIfWithElse();
>+		    consumeStatementIfWithElse();  
> 			break;
>-
>+ 
>     case 285 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
>-		    consumeStatementIfWithElse();
>+		    consumeStatementIfWithElse();  
> 			break;
>-
>+ 
>     case 286 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>-		    consumeStatementSwitch() ;
>+		    consumeStatementSwitch() ;  
> 			break;
>-
>+ 
>     case 287 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
>-		    consumeEmptySwitchBlock() ;
>+		    consumeEmptySwitchBlock() ;  
> 			break;
>-
>+ 
>     case 290 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
>-		    consumeSwitchBlock() ;
>+		    consumeSwitchBlock() ;  
> 			break;
>-
>+ 
>     case 292 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
>-		    consumeSwitchBlockStatements() ;
>+		    consumeSwitchBlockStatements() ;  
> 			break;
>-
>+ 
>     case 293 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
>-		    consumeSwitchBlockStatement() ;
>+		    consumeSwitchBlockStatement() ;  
> 			break;
>-
>+ 
>     case 295 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
>-		    consumeSwitchLabels() ;
>+		    consumeSwitchLabels() ;  
> 			break;
>-
>+ 
>      case 296 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
>-		    consumeCaseLabel();
>+		    consumeCaseLabel();  
> 			break;
>-
>+ 
>      case 297 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
>-		    consumeDefaultLabel();
>+		    consumeDefaultLabel();  
> 			break;
>-
>+ 
>     case 298 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>-		    consumeStatementWhile() ;
>+		    consumeStatementWhile() ;  
> 			break;
>-
>+ 
>     case 299 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
>-		    consumeStatementWhile() ;
>+		    consumeStatementWhile() ;  
> 			break;
>-
>+ 
>     case 300 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
>-		    consumeStatementDo() ;
>+		    consumeStatementDo() ;  
> 			break;
>-
>+ 
>     case 301 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
>-		    consumeStatementFor() ;
>+		    consumeStatementFor() ;  
> 			break;
>-
>+ 
>     case 302 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
>-		    consumeStatementFor() ;
>+		    consumeStatementFor() ;  
> 			break;
>-
>+ 
>     case 303 : if (DEBUG) { System.out.println("ForInit ::= StatementExpressionList"); }  //$NON-NLS-1$
>-		    consumeForInit() ;
>+		    consumeForInit() ;  
> 			break;
>-
>+ 
>     case 307 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
>-		    consumeStatementExpressionList() ;
>+		    consumeStatementExpressionList() ;  
> 			break;
>-
>+ 
>     case 308 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeSimpleAssertStatement() ;
>+		    consumeSimpleAssertStatement() ;  
> 			break;
>-
>+ 
>     case 309 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression COLON Expression"); }  //$NON-NLS-1$
>-		    consumeAssertStatement() ;
>+		    consumeAssertStatement() ;  
> 			break;
>-
>+ 
>     case 310 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeStatementBreak() ;
>+		    consumeStatementBreak() ;  
> 			break;
>-
>+ 
>     case 311 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeStatementBreakWithLabel() ;
>+		    consumeStatementBreakWithLabel() ;  
> 			break;
>-
>+ 
>     case 312 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeStatementContinue() ;
>+		    consumeStatementContinue() ;  
> 			break;
>-
>+ 
>     case 313 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeStatementContinueWithLabel() ;
>+		    consumeStatementContinueWithLabel() ;  
> 			break;
>-
>+ 
>     case 314 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeStatementReturn() ;
>+		    consumeStatementReturn() ;  
> 			break;
>-
>+ 
>     case 315 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
>-		    consumeStatementThrow();
>+		    consumeStatementThrow();  
> 			break;
>-
>+ 
>     case 316 : if (DEBUG) { System.out.println("SynchronizedStatement ::= OnlySynchronized LPAREN..."); }  //$NON-NLS-1$
>-		    consumeStatementSynchronized();
>+		    consumeStatementSynchronized();  
> 			break;
>-
>+ 
>     case 317 : if (DEBUG) { System.out.println("OnlySynchronized ::= synchronized"); }  //$NON-NLS-1$
>-		    consumeOnlySynchronized();
>+		    consumeOnlySynchronized();  
> 			break;
>-
>+ 
>     case 318 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
>-		    consumeStatementTry(false);
>+		    consumeStatementTry(false);  
> 			break;
>-
>+ 
>     case 319 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
>-		    consumeStatementTry(true);
>+		    consumeStatementTry(true);  
> 			break;
>-
>+ 
>     case 321 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
>-		    consumeExitTryBlock();
>+		    consumeExitTryBlock();  
> 			break;
>-
>+ 
>     case 323 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
>-		    consumeCatches();
>+		    consumeCatches();  
> 			break;
>-
>+ 
>     case 324 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
>-		    consumeStatementCatch() ;
>+		    consumeStatementCatch() ;  
> 			break;
>-
>+ 
>     case 326 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
>-		    consumeLeftParen();
>+		    consumeLeftParen();  
> 			break;
>-
>+ 
>     case 327 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
>-		    consumeRightParen();
>+		    consumeRightParen();  
> 			break;
>-
>+ 
>     case 332 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayThis();
>+		    consumePrimaryNoNewArrayThis();  
> 			break;
>-
>+ 
>     case 333 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression_NotName..."); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArray();
>+		    consumePrimaryNoNewArray();  
> 			break;
>-
>+ 
>     case 334 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Name PushRPAREN"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayWithName();
>+		    consumePrimaryNoNewArrayWithName();  
> 			break;
>-
>+ 
>     case 337 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT this"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayNameThis();
>+		    consumePrimaryNoNewArrayNameThis();  
> 			break;
>-
>+ 
>     case 338 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT super"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayNameSuper();
>+		    consumePrimaryNoNewArrayNameSuper();  
> 			break;
>-
>+ 
>     case 339 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT class"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayName();
>+		    consumePrimaryNoNewArrayName();  
> 			break;
>-
>+ 
>     case 340 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name Dims DOT class"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayArrayType();
>+		    consumePrimaryNoNewArrayArrayType();  
> 			break;
>-
>+ 
>     case 341 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType Dims DOT class"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayPrimitiveArrayType();
>+		    consumePrimaryNoNewArrayPrimitiveArrayType();  
> 			break;
>-
>+ 
>     case 342 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType DOT class"); }  //$NON-NLS-1$
>-		    consumePrimaryNoNewArrayPrimitiveType();
>+		    consumePrimaryNoNewArrayPrimitiveType();  
> 			break;
>-
>+ 
>     case 345 : if (DEBUG) { System.out.println("AllocationHeader ::= new ClassType LPAREN..."); }  //$NON-NLS-1$
>-		    consumeAllocationHeader();
>+		    consumeAllocationHeader();  
> 			break;
>-
>+ 
>     case 346 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new..."); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpressionWithTypeArguments();
>+		    consumeClassInstanceCreationExpressionWithTypeArguments();  
> 			break;
>-
>+ 
>     case 347 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new ClassType LPAREN"); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpression();
>+		    consumeClassInstanceCreationExpression();  
> 			break;
>-
>+ 
>     case 348 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;
>+		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;  
> 			break;
>-
>+ 
>     case 349 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpressionQualified() ;
>+		    consumeClassInstanceCreationExpressionQualified() ;  
> 			break;
>-
>+ 
>     case 350 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpressionQualified() ;
>+		    consumeClassInstanceCreationExpressionQualified() ;  
> 			break;
>-
>+ 
>     case 351 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;
>+		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;  
> 			break;
>-
>+ 
>     case 352 : if (DEBUG) { System.out.println("ClassInstanceCreationExpressionName ::= Name DOT"); }  //$NON-NLS-1$
>-		    consumeClassInstanceCreationExpressionName() ;
>+		    consumeClassInstanceCreationExpressionName() ;  
> 			break;
>-
>-    case 353 : if (DEBUG) { System.out.println("ClassBodyopt ::="); }  //$NON-NLS-1$
>-		    consumeClassBodyopt();
>+ 
>+    case 353 : if (DEBUG) { System.out.println("UnqualifiedClassBodyopt ::="); }  //$NON-NLS-1$
>+		    consumeClassBodyopt();  
> 			break;
>-
>-    case 355 : if (DEBUG) { System.out.println("EnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>-		    consumeEnterAnonymousClassBody();
>+ 
>+    case 355 : if (DEBUG) { System.out.println("UnqualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>+		    consumeEnterAnonymousClassBody(false);  
> 			break;
>-
>-    case 357 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA Expression"); }  //$NON-NLS-1$
>-		    consumeArgumentList();
>+ 
>+    case 356 : if (DEBUG) { System.out.println("QualifiedClassBodyopt ::="); }  //$NON-NLS-1$
>+		    consumeClassBodyopt();  
> 			break;
>-
>-    case 358 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new PrimitiveType..."); }  //$NON-NLS-1$
>-		    consumeArrayCreationHeader();
>+ 
>+    case 358 : if (DEBUG) { System.out.println("QualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>+		    consumeEnterAnonymousClassBody(true);  
> 			break;
>-
>-    case 359 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new ClassOrInterfaceType..."); }  //$NON-NLS-1$
>-		    consumeArrayCreationHeader();
>+ 
>+    case 360 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA Expression"); }  //$NON-NLS-1$
>+		    consumeArgumentList();  
> 			break;
>-
>-    case 360 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>-		    consumeArrayCreationExpressionWithoutInitializer();
>+ 
>+    case 361 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new PrimitiveType..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationHeader();  
> 			break;
>-
>-    case 361 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new PrimitiveType"); }  //$NON-NLS-1$
>-		    consumeArrayCreationExpressionWithInitializer();
>+ 
>+    case 362 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new ClassOrInterfaceType..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationHeader();  
> 			break;
>-
>-    case 362 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>-		    consumeArrayCreationExpressionWithoutInitializer();
>+ 
>+    case 363 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithoutInitializer();  
> 			break;
>-
>-    case 363 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
>-		    consumeArrayCreationExpressionWithInitializer();
>+ 
>+    case 364 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new PrimitiveType"); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithInitializer();  
> 			break;
>-
>-    case 365 : if (DEBUG) { System.out.println("DimWithOrWithOutExprs ::= DimWithOrWithOutExprs..."); }  //$NON-NLS-1$
>-		    consumeDimWithOrWithOutExprs();
>+ 
>+    case 365 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithoutInitializer();  
> 			break;
>-
>-     case 367 : if (DEBUG) { System.out.println("DimWithOrWithOutExpr ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>-		    consumeDimWithOrWithOutExpr();
>+ 
>+    case 366 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+		    consumeArrayCreationExpressionWithInitializer();  
> 			break;
>-
>-     case 368 : if (DEBUG) { System.out.println("Dims ::= DimsLoop"); }  //$NON-NLS-1$
>-		    consumeDims();
>+ 
>+    case 368 : if (DEBUG) { System.out.println("DimWithOrWithOutExprs ::= DimWithOrWithOutExprs..."); }  //$NON-NLS-1$
>+		    consumeDimWithOrWithOutExprs();  
> 			break;
>-
>-     case 371 : if (DEBUG) { System.out.println("OneDimLoop ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>-		    consumeOneDimLoop();
>+ 
>+     case 370 : if (DEBUG) { System.out.println("DimWithOrWithOutExpr ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+		    consumeDimWithOrWithOutExpr();  
> 			break;
>-
>-    case 372 : if (DEBUG) { System.out.println("FieldAccess ::= Primary DOT Identifier"); }  //$NON-NLS-1$
>-		    consumeFieldAccess(false);
>+ 
>+     case 371 : if (DEBUG) { System.out.println("Dims ::= DimsLoop"); }  //$NON-NLS-1$
>+		    consumeDims();  
> 			break;
>-
>-    case 373 : if (DEBUG) { System.out.println("FieldAccess ::= super DOT Identifier"); }  //$NON-NLS-1$
>-		    consumeFieldAccess(true);
>+ 
>+     case 374 : if (DEBUG) { System.out.println("OneDimLoop ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+		    consumeOneDimLoop();  
> 			break;
>-
>-    case 374 : if (DEBUG) { System.out.println("MethodInvocation ::= Name LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>-		    consumeMethodInvocationName();
>+ 
>+    case 375 : if (DEBUG) { System.out.println("FieldAccess ::= Primary DOT Identifier"); }  //$NON-NLS-1$
>+		    consumeFieldAccess(false);  
> 			break;
>-
>-    case 375 : if (DEBUG) { System.out.println("MethodInvocation ::= Name DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>-		    consumeMethodInvocationNameWithTypeArguments();
>+ 
>+    case 376 : if (DEBUG) { System.out.println("FieldAccess ::= super DOT Identifier"); }  //$NON-NLS-1$
>+		    consumeFieldAccess(true);  
> 			break;
>-
>-    case 376 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>-		    consumeMethodInvocationPrimaryWithTypeArguments();
>+ 
>+    case 377 : if (DEBUG) { System.out.println("MethodInvocation ::= Name LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>+		    consumeMethodInvocationName();  
> 			break;
>-
>-    case 377 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>-		    consumeMethodInvocationPrimary();
>+ 
>+    case 378 : if (DEBUG) { System.out.println("MethodInvocation ::= Name DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+		    consumeMethodInvocationNameWithTypeArguments();  
> 			break;
>-
>-    case 378 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>-		    consumeMethodInvocationSuperWithTypeArguments();
>+ 
>+    case 379 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+		    consumeMethodInvocationPrimaryWithTypeArguments();  
> 			break;
>-
>-    case 379 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>-		    consumeMethodInvocationSuper();
>+ 
>+    case 380 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>+		    consumeMethodInvocationPrimary();  
> 			break;
>-
>-    case 380 : if (DEBUG) { System.out.println("ArrayAccess ::= Name LBRACKET Expression RBRACKET"); }  //$NON-NLS-1$
>-		    consumeArrayAccess(true);
>+ 
>+    case 381 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+		    consumeMethodInvocationSuperWithTypeArguments();  
> 			break;
>-
>-    case 381 : if (DEBUG) { System.out.println("ArrayAccess ::= PrimaryNoNewArray LBRACKET Expression..."); }  //$NON-NLS-1$
>-		    consumeArrayAccess(false);
>+ 
>+    case 382 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>+		    consumeMethodInvocationSuper();  
> 			break;
>-
>-    case 382 : if (DEBUG) { System.out.println("ArrayAccess ::= ArrayCreationWithArrayInitializer..."); }  //$NON-NLS-1$
>-		    consumeArrayAccess(false);
>+ 
>+    case 383 : if (DEBUG) { System.out.println("ArrayAccess ::= Name LBRACKET Expression RBRACKET"); }  //$NON-NLS-1$
>+		    consumeArrayAccess(true);  
> 			break;
>-
>-    case 384 : if (DEBUG) { System.out.println("PostfixExpression ::= Name"); }  //$NON-NLS-1$
>-		    consumePostfixExpression();
>+ 
>+    case 384 : if (DEBUG) { System.out.println("ArrayAccess ::= PrimaryNoNewArray LBRACKET Expression..."); }  //$NON-NLS-1$
>+		    consumeArrayAccess(false);  
> 			break;
>-
>-    case 387 : if (DEBUG) { System.out.println("PostIncrementExpression ::= PostfixExpression PLUS_PLUS"); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.PLUS,true);
>+ 
>+    case 385 : if (DEBUG) { System.out.println("ArrayAccess ::= ArrayCreationWithArrayInitializer..."); }  //$NON-NLS-1$
>+		    consumeArrayAccess(false);  
> 			break;
>-
>-    case 388 : if (DEBUG) { System.out.println("PostDecrementExpression ::= PostfixExpression..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.MINUS,true);
>+ 
>+    case 387 : if (DEBUG) { System.out.println("PostfixExpression ::= Name"); }  //$NON-NLS-1$
>+		    consumePostfixExpression();  
> 			break;
>-
>-    case 389 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
>-		    consumePushPosition();
>+ 
>+    case 390 : if (DEBUG) { System.out.println("PostIncrementExpression ::= PostfixExpression PLUS_PLUS"); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.PLUS,true);  
> 			break;
>-
>-    case 392 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.PLUS);
>+ 
>+    case 391 : if (DEBUG) { System.out.println("PostDecrementExpression ::= PostfixExpression..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.MINUS,true);  
> 			break;
>-
>-    case 393 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.MINUS);
>+ 
>+    case 392 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
>+		    consumePushPosition();  
> 			break;
>-
>-    case 395 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.PLUS,false);
>+ 
>+    case 395 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.PLUS);  
> 			break;
>-
>-    case 396 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.MINUS,false);
>+ 
>+    case 396 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.MINUS);  
> 			break;
>-
>-    case 398 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.TWIDDLE);
>+ 
>+    case 398 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.PLUS,false);  
> 			break;
>-
>-    case 399 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.NOT);
>+ 
>+    case 399 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.MINUS,false);  
> 			break;
>-
>-    case 401 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN PrimitiveType Dimsopt..."); }  //$NON-NLS-1$
>-		    consumeCastExpressionWithPrimitiveType();
>+ 
>+    case 401 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
> 			break;
>-
>-    case 402 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>-		    consumeCastExpressionWithGenericsArray();
>+ 
>+    case 402 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.NOT);  
> 			break;
>-
>-    case 403 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>-		    consumeCastExpressionWithQualifiedGenericsArray();
>+ 
>+    case 404 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN PrimitiveType Dimsopt..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithPrimitiveType();  
> 			break;
>-
>-    case 404 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name PushRPAREN..."); }  //$NON-NLS-1$
>-		    consumeCastExpressionLL1();
>+ 
>+    case 405 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithGenericsArray();  
> 			break;
>-
>-    case 405 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name Dims PushRPAREN..."); }  //$NON-NLS-1$
>-		    consumeCastExpressionWithNameArray();
>+ 
>+    case 406 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithQualifiedGenericsArray();  
> 			break;
>-
>-    case 406 : if (DEBUG) { System.out.println("OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments"); }  //$NON-NLS-1$
>-		    consumeOnlyTypeArgumentsForCastExpression();
>+ 
>+    case 407 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name PushRPAREN..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionLL1();  
> 			break;
>-
>-    case 407 : if (DEBUG) { System.out.println("InsideCastExpression ::="); }  //$NON-NLS-1$
>-		    consumeInsideCastExpression();
>+ 
>+    case 408 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name Dims PushRPAREN..."); }  //$NON-NLS-1$
>+		    consumeCastExpressionWithNameArray();  
> 			break;
>-
>-    case 408 : if (DEBUG) { System.out.println("InsideCastExpressionLL1 ::="); }  //$NON-NLS-1$
>-		    consumeInsideCastExpressionLL1();
>+ 
>+    case 409 : if (DEBUG) { System.out.println("OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments"); }  //$NON-NLS-1$
>+		    consumeOnlyTypeArgumentsForCastExpression();  
> 			break;
>-
>-    case 409 : if (DEBUG) { System.out.println("InsideCastExpressionWithQualifiedGenerics ::="); }  //$NON-NLS-1$
>-		    consumeInsideCastExpressionWithQualifiedGenerics();
>+ 
>+    case 410 : if (DEBUG) { System.out.println("InsideCastExpression ::="); }  //$NON-NLS-1$
>+		    consumeInsideCastExpression();  
> 			break;
>-
>-    case 411 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.MULTIPLY);
>+ 
>+    case 411 : if (DEBUG) { System.out.println("InsideCastExpressionLL1 ::="); }  //$NON-NLS-1$
>+		    consumeInsideCastExpressionLL1();  
> 			break;
>-
>-    case 412 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.DIVIDE);
>+ 
>+    case 412 : if (DEBUG) { System.out.println("InsideCastExpressionWithQualifiedGenerics ::="); }  //$NON-NLS-1$
>+		    consumeInsideCastExpressionWithQualifiedGenerics();  
> 			break;
>-
>-    case 413 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.REMAINDER);
>+ 
>+    case 414 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
> 			break;
>-
>-    case 415 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.PLUS);
>+ 
>+    case 415 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.DIVIDE);  
> 			break;
>-
>-    case 416 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.MINUS);
>+ 
>+    case 416 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.REMAINDER);  
> 			break;
>-
>-    case 418 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);
>+ 
>+    case 418 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.PLUS);  
> 			break;
>-
>-    case 419 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);
>+ 
>+    case 419 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.MINUS);  
> 			break;
>-
>-    case 420 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);
>+ 
>+    case 421 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
> 			break;
>-
>-    case 422 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.LESS);
>+ 
>+    case 422 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
> 			break;
>-
>-    case 423 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.GREATER);
>+ 
>+    case 423 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>-
>-    case 424 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);
>+ 
>+    case 425 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.LESS);  
> 			break;
>-
>-    case 425 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);
>+ 
>+    case 426 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.GREATER);  
> 			break;
>-
>-    case 427 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
>-		    consumeInstanceOfExpression();
>+ 
>+    case 427 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
> 			break;
>-
>-    case 429 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
>-		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);
>+ 
>+    case 428 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
> 			break;
>-
>-    case 430 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
>-		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);
>+ 
>+    case 430 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
>+		    consumeInstanceOfExpression();  
> 			break;
>-
>-    case 432 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.AND);
>+ 
>+    case 432 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
>+		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
> 			break;
>-
>-    case 434 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.XOR);
>+ 
>+    case 433 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
>+		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
> 			break;
>-
>-    case 436 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.OR);
>+ 
>+    case 435 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.AND);  
> 			break;
>-
>-    case 438 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.AND_AND);
>+ 
>+    case 437 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.XOR);  
> 			break;
>-
>-    case 440 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.OR_OR);
>+ 
>+    case 439 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.OR);  
> 			break;
>-
>-    case 442 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>-		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;
>+ 
>+    case 441 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.AND_AND);  
> 			break;
>-
>-    case 445 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
>-		    consumeAssignment();
>+ 
>+    case 443 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.OR_OR);  
> 			break;
>-
>-    case 447 : if (DEBUG) { System.out.println("Assignment ::= InvalidArrayInitializerAssignement"); }  //$NON-NLS-1$
>-		    ignoreExpressionAssignment();
>+ 
>+    case 445 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>+		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>-
>-    case 448 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(EQUAL);
>+ 
>+    case 448 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
>+		    consumeAssignment();  
> 			break;
>-
>-    case 449 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(MULTIPLY);
>+ 
>+    case 450 : if (DEBUG) { System.out.println("Assignment ::= InvalidArrayInitializerAssignement"); }  //$NON-NLS-1$
>+		    ignoreExpressionAssignment(); 
> 			break;
>-
>-    case 450 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(DIVIDE);
>+ 
>+    case 451 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(EQUAL);  
> 			break;
>-
>-    case 451 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(REMAINDER);
>+ 
>+    case 452 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(MULTIPLY);  
> 			break;
>-
>-    case 452 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(PLUS);
>+ 
>+    case 453 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(DIVIDE);  
> 			break;
>-
>-    case 453 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(MINUS);
>+ 
>+    case 454 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(REMAINDER);  
> 			break;
>-
>-    case 454 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(LEFT_SHIFT);
>+ 
>+    case 455 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(PLUS);  
> 			break;
>-
>-    case 455 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(RIGHT_SHIFT);
>+ 
>+    case 456 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(MINUS);  
> 			break;
>-
>-    case 456 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(UNSIGNED_RIGHT_SHIFT);
>+ 
>+    case 457 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(LEFT_SHIFT);  
> 			break;
>-
>-    case 457 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(AND);
>+ 
>+    case 458 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(RIGHT_SHIFT);  
> 			break;
>-
>-    case 458 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(XOR);
>+ 
>+    case 459 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(UNSIGNED_RIGHT_SHIFT);  
> 			break;
>-
>-    case 459 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
>-		    consumeAssignmentOperator(OR);
>+ 
>+    case 460 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(AND);  
> 			break;
>-
>-    case 463 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyExpression();
>+ 
>+    case 461 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(XOR);  
> 			break;
>-
>-    case 468 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyClassBodyDeclarationsopt();
>+ 
>+    case 462 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
>+		    consumeAssignmentOperator(OR);  
> 			break;
>-
>-    case 469 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>-		    consumeClassBodyDeclarationsopt();
>+ 
>+    case 466 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyExpression();  
> 			break;
>-
>-     case 470 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
>-		    consumeDefaultModifiers();
>+ 
>+    case 471 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyClassBodyDeclarationsopt();  
> 			break;
>-
>-    case 471 : if (DEBUG) { System.out.println("Modifiersopt ::= Modifiers"); }  //$NON-NLS-1$
>-		    consumeModifiers();
>+ 
>+    case 472 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+		    consumeClassBodyDeclarationsopt();  
> 			break;
>-
>-    case 472 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyBlockStatementsopt();
>+ 
>+     case 473 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
>+		    consumeDefaultModifiers();  
> 			break;
>-
>-     case 474 : if (DEBUG) { System.out.println("Dimsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyDimsopt();
>+ 
>+    case 474 : if (DEBUG) { System.out.println("Modifiersopt ::= Modifiers"); }  //$NON-NLS-1$
>+		    consumeModifiers();  
> 			break;
>-
>-     case 476 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyArgumentListopt();
>+ 
>+    case 475 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyBlockStatementsopt();  
> 			break;
>-
>-    case 480 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
>-		    consumeFormalParameterListopt();
>+ 
>+     case 477 : if (DEBUG) { System.out.println("Dimsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyDimsopt();  
> 			break;
>-
>-     case 484 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyInterfaceMemberDeclarationsopt();
>+ 
>+     case 479 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyArgumentListopt();  
> 			break;
>-
>-     case 485 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>-		    consumeInterfaceMemberDeclarationsopt();
>+ 
>+    case 483 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
>+		    consumeFormalParameterListopt();  
> 			break;
>-
>-    case 486 : if (DEBUG) { System.out.println("NestedType ::="); }  //$NON-NLS-1$
>-		    consumeNestedType();
>+ 
>+     case 487 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyInterfaceMemberDeclarationsopt();  
> 			break;
>-
>-     case 487 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyForInitopt();
>+ 
>+     case 488 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+		    consumeInterfaceMemberDeclarationsopt();  
> 			break;
>-
>-     case 489 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyForUpdateopt();
>+ 
>+    case 489 : if (DEBUG) { System.out.println("NestedType ::="); }  //$NON-NLS-1$
>+		    consumeNestedType();  
> 			break;
> 
>-     case 493 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyCatchesopt();
>+     case 490 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyForInitopt();  
> 			break;
>-
>-     case 495 : if (DEBUG) { System.out.println("EnumDeclaration ::= EnumHeader EnumBody"); }  //$NON-NLS-1$
>-		    consumeEnumDeclaration();
>+ 
>+     case 492 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyForUpdateopt();  
> 			break;
>-
>-     case 496 : if (DEBUG) { System.out.println("EnumHeader ::= EnumHeaderName ClassHeaderImplementsopt"); }  //$NON-NLS-1$
>-		    consumeEnumHeader();
>+ 
>+     case 496 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyCatchesopt();  
> 			break;
>-
>-     case 497 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier"); }  //$NON-NLS-1$
>-		    consumeEnumHeaderName();
>+ 
>+     case 498 : if (DEBUG) { System.out.println("EnumDeclaration ::= EnumHeader EnumBody"); }  //$NON-NLS-1$
>+		    consumeEnumDeclaration();  
> 			break;
>-
>-     case 498 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier..."); }  //$NON-NLS-1$
>-		    consumeEnumHeaderNameWithTypeParameters();
>+ 
>+     case 499 : if (DEBUG) { System.out.println("EnumHeader ::= EnumHeaderName ClassHeaderImplementsopt"); }  //$NON-NLS-1$
>+		    consumeEnumHeader();  
> 			break;
>-
>-     case 499 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumBodyDeclarationsopt RBRACE"); }  //$NON-NLS-1$
>-		    consumeEnumBodyNoConstants();
>+ 
>+     case 500 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier"); }  //$NON-NLS-1$
>+		    consumeEnumHeaderName();  
> 			break;
>-
>-     case 500 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE COMMA EnumBodyDeclarationsopt..."); }  //$NON-NLS-1$
>-		    consumeEnumBodyNoConstants();
>+ 
>+     case 501 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier..."); }  //$NON-NLS-1$
>+		    consumeEnumHeaderNameWithTypeParameters();  
> 			break;
>-
>-     case 501 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants COMMA..."); }  //$NON-NLS-1$
>-		    consumeEnumBodyWithConstants();
>+ 
>+     case 502 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumBodyDeclarationsopt RBRACE"); }  //$NON-NLS-1$
>+		    consumeEnumBodyNoConstants();  
> 			break;
>-
>-     case 502 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants..."); }  //$NON-NLS-1$
>-		    consumeEnumBodyWithConstants();
>+ 
>+     case 503 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE COMMA EnumBodyDeclarationsopt..."); }  //$NON-NLS-1$
>+		    consumeEnumBodyNoConstants();  
> 			break;
>-
>-    case 504 : if (DEBUG) { System.out.println("EnumConstants ::= EnumConstants COMMA EnumConstant"); }  //$NON-NLS-1$
>-		    consumeEnumConstants();
>+ 
>+     case 504 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants COMMA..."); }  //$NON-NLS-1$
>+		    consumeEnumBodyWithConstants();  
> 			break;
>-
>-    case 505 : if (DEBUG) { System.out.println("EnumConstantHeaderName ::= Modifiersopt Identifier"); }  //$NON-NLS-1$
>-		    consumeEnumConstantHeaderName();
>+ 
>+     case 505 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants..."); }  //$NON-NLS-1$
>+		    consumeEnumBodyWithConstants();  
> 			break;
>-
>-    case 506 : if (DEBUG) { System.out.println("EnumConstantHeader ::= EnumConstantHeaderName..."); }  //$NON-NLS-1$
>-		    consumeEnumConstantHeader();
>+ 
>+    case 507 : if (DEBUG) { System.out.println("EnumConstants ::= EnumConstants COMMA EnumConstant"); }  //$NON-NLS-1$
>+		    consumeEnumConstants();  
> 			break;
>-
>-    case 507 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader ForceNoDiet..."); }  //$NON-NLS-1$
>-		    consumeEnumConstantWithClassBody();
>+ 
>+    case 508 : if (DEBUG) { System.out.println("EnumConstantHeaderName ::= Modifiersopt Identifier"); }  //$NON-NLS-1$
>+		    consumeEnumConstantHeaderName();  
> 			break;
>-
>-    case 508 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader"); }  //$NON-NLS-1$
>-		    consumeEnumConstantNoClassBody();
>+ 
>+    case 509 : if (DEBUG) { System.out.println("EnumConstantHeader ::= EnumConstantHeaderName..."); }  //$NON-NLS-1$
>+		    consumeEnumConstantHeader();  
> 			break;
>-
>-    case 509 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>-		    consumeArguments();
>+ 
>+    case 510 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader ForceNoDiet..."); }  //$NON-NLS-1$
>+		    consumeEnumConstantWithClassBody();  
> 			break;
>-
>-    case 510 : if (DEBUG) { System.out.println("Argumentsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyArguments();
>+ 
>+    case 511 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader"); }  //$NON-NLS-1$
>+		    consumeEnumConstantNoClassBody();  
> 			break;
>-
>-    case 512 : if (DEBUG) { System.out.println("EnumDeclarations ::= SEMICOLON ClassBodyDeclarationsopt"); }  //$NON-NLS-1$
>-		    consumeEnumDeclarations();
>+ 
>+    case 512 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>+		    consumeArguments();  
> 			break;
>-
>-    case 513 : if (DEBUG) { System.out.println("EnumBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyEnumDeclarations();
>+ 
>+    case 513 : if (DEBUG) { System.out.println("Argumentsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyArguments();  
> 			break;
>-
>-    case 515 : if (DEBUG) { System.out.println("EnhancedForStatement ::= EnhancedForStatementHeader..."); }  //$NON-NLS-1$
>-		    consumeEnhancedForStatement();
>+ 
>+    case 515 : if (DEBUG) { System.out.println("EnumDeclarations ::= SEMICOLON ClassBodyDeclarationsopt"); }  //$NON-NLS-1$
>+		    consumeEnumDeclarations();  
> 			break;
>-
>-    case 516 : if (DEBUG) { System.out.println("EnhancedForStatementNoShortIf ::=..."); }  //$NON-NLS-1$
>-		    consumeEnhancedForStatement();
>+ 
>+    case 516 : if (DEBUG) { System.out.println("EnumBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyEnumDeclarations();  
> 			break;
>-
>-    case 517 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Type..."); }  //$NON-NLS-1$
>-		    consumeEnhancedForStatementHeaderInit(false);
>+ 
>+    case 518 : if (DEBUG) { System.out.println("EnhancedForStatement ::= EnhancedForStatementHeader..."); }  //$NON-NLS-1$
>+		    consumeEnhancedForStatement();  
> 			break;
>-
>-    case 518 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Modifiers"); }  //$NON-NLS-1$
>-		    consumeEnhancedForStatementHeaderInit(true);
>+ 
>+    case 519 : if (DEBUG) { System.out.println("EnhancedForStatementNoShortIf ::=..."); }  //$NON-NLS-1$
>+		    consumeEnhancedForStatement();  
> 			break;
>-
>-    case 519 : if (DEBUG) { System.out.println("EnhancedForStatementHeader ::=..."); }  //$NON-NLS-1$
>-		    consumeEnhancedForStatementHeader();
>+ 
>+    case 520 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Type..."); }  //$NON-NLS-1$
>+		    consumeEnhancedForStatementHeaderInit(false);  
> 			break;
>-
>-    case 520 : if (DEBUG) { System.out.println("SingleStaticImportDeclaration ::=..."); }  //$NON-NLS-1$
>-		    consumeImportDeclaration();
>+ 
>+    case 521 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Modifiers"); }  //$NON-NLS-1$
>+		    consumeEnhancedForStatementHeaderInit(true);  
> 			break;
>-
>-    case 521 : if (DEBUG) { System.out.println("SingleStaticImportDeclarationName ::= import static Name"); }  //$NON-NLS-1$
>-		    consumeSingleStaticImportDeclarationName();
>+ 
>+    case 522 : if (DEBUG) { System.out.println("EnhancedForStatementHeader ::=..."); }  //$NON-NLS-1$
>+		    consumeEnhancedForStatementHeader();  
> 			break;
>-
>-    case 522 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>-		    consumeImportDeclaration();
>+ 
>+    case 523 : if (DEBUG) { System.out.println("SingleStaticImportDeclaration ::=..."); }  //$NON-NLS-1$
>+		    consumeImportDeclaration();  
> 			break;
>-
>-    case 523 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclarationName ::= import static..."); }  //$NON-NLS-1$
>-		    consumeStaticImportOnDemandDeclarationName();
>+ 
>+    case 524 : if (DEBUG) { System.out.println("SingleStaticImportDeclarationName ::= import static Name"); }  //$NON-NLS-1$
>+		    consumeSingleStaticImportDeclarationName();  
> 			break;
>-
>-    case 524 : if (DEBUG) { System.out.println("TypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>-		    consumeTypeArguments();
>+ 
>+    case 525 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>+		    consumeImportDeclaration();  
> 			break;
>-
>-    case 525 : if (DEBUG) { System.out.println("OnlyTypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>-		    consumeOnlyTypeArguments();
>+ 
>+    case 526 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclarationName ::= import static..."); }  //$NON-NLS-1$
>+		    consumeStaticImportOnDemandDeclarationName();  
> 			break;
>-
>-    case 527 : if (DEBUG) { System.out.println("TypeArgumentList1 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>-		    consumeTypeArgumentList1();
>+ 
>+    case 527 : if (DEBUG) { System.out.println("TypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>+		    consumeTypeArguments();  
> 			break;
>-
>-    case 529 : if (DEBUG) { System.out.println("TypeArgumentList ::= TypeArgumentList COMMA TypeArgument"); }  //$NON-NLS-1$
>-		    consumeTypeArgumentList();
>+ 
>+    case 528 : if (DEBUG) { System.out.println("OnlyTypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>+		    consumeOnlyTypeArguments();  
> 			break;
>-
>-    case 530 : if (DEBUG) { System.out.println("TypeArgument ::= ReferenceType"); }  //$NON-NLS-1$
>-		    consumeTypeArgument();
>+ 
>+    case 530 : if (DEBUG) { System.out.println("TypeArgumentList1 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+		    consumeTypeArgumentList1();  
> 			break;
>-
>-    case 534 : if (DEBUG) { System.out.println("ReferenceType1 ::= ReferenceType GREATER"); }  //$NON-NLS-1$
>-		    consumeReferenceType1();
>+ 
>+    case 532 : if (DEBUG) { System.out.println("TypeArgumentList ::= TypeArgumentList COMMA TypeArgument"); }  //$NON-NLS-1$
>+		    consumeTypeArgumentList();  
> 			break;
>-
>-    case 535 : if (DEBUG) { System.out.println("ReferenceType1 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>-		    consumeTypeArgumentReferenceType1();
>+ 
>+    case 533 : if (DEBUG) { System.out.println("TypeArgument ::= ReferenceType"); }  //$NON-NLS-1$
>+		    consumeTypeArgument();  
> 			break;
>-
>-    case 537 : if (DEBUG) { System.out.println("TypeArgumentList2 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>-		    consumeTypeArgumentList2();
>+ 
>+    case 537 : if (DEBUG) { System.out.println("ReferenceType1 ::= ReferenceType GREATER"); }  //$NON-NLS-1$
>+		    consumeReferenceType1();  
> 			break;
>-
>-    case 540 : if (DEBUG) { System.out.println("ReferenceType2 ::= ReferenceType RIGHT_SHIFT"); }  //$NON-NLS-1$
>-		    consumeReferenceType2();
>+ 
>+    case 538 : if (DEBUG) { System.out.println("ReferenceType1 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+		    consumeTypeArgumentReferenceType1();  
> 			break;
>-
>-    case 541 : if (DEBUG) { System.out.println("ReferenceType2 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>-		    consumeTypeArgumentReferenceType2();
>+ 
>+    case 540 : if (DEBUG) { System.out.println("TypeArgumentList2 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+		    consumeTypeArgumentList2();  
> 			break;
>-
>-    case 543 : if (DEBUG) { System.out.println("TypeArgumentList3 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>-		    consumeTypeArgumentList3();
>+ 
>+    case 543 : if (DEBUG) { System.out.println("ReferenceType2 ::= ReferenceType RIGHT_SHIFT"); }  //$NON-NLS-1$
>+		    consumeReferenceType2();  
> 			break;
>-
>-    case 546 : if (DEBUG) { System.out.println("ReferenceType3 ::= ReferenceType UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>-		    consumeReferenceType3();
>+ 
>+    case 544 : if (DEBUG) { System.out.println("ReferenceType2 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+		    consumeTypeArgumentReferenceType2();  
> 			break;
>-
>-    case 547 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION"); }  //$NON-NLS-1$
>-		    consumeWildcard();
>+ 
>+    case 546 : if (DEBUG) { System.out.println("TypeArgumentList3 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+		    consumeTypeArgumentList3();  
> 			break;
>-
>-    case 548 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION WildcardBounds"); }  //$NON-NLS-1$
>-		    consumeWildcardWithBounds();
>+ 
>+    case 549 : if (DEBUG) { System.out.println("ReferenceType3 ::= ReferenceType UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+		    consumeReferenceType3();  
> 			break;
>-
>-    case 549 : if (DEBUG) { System.out.println("WildcardBounds ::= extends ReferenceType"); }  //$NON-NLS-1$
>-		    consumeWildcardBoundsExtends();
>+ 
>+    case 550 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION"); }  //$NON-NLS-1$
>+		    consumeWildcard();  
> 			break;
>-
>-    case 550 : if (DEBUG) { System.out.println("WildcardBounds ::= super ReferenceType"); }  //$NON-NLS-1$
>-		    consumeWildcardBoundsSuper();
>+ 
>+    case 551 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION WildcardBounds"); }  //$NON-NLS-1$
>+		    consumeWildcardWithBounds();  
> 			break;
>-
>-    case 551 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION GREATER"); }  //$NON-NLS-1$
>-		    consumeWildcard1();
>+ 
>+    case 552 : if (DEBUG) { System.out.println("WildcardBounds ::= extends ReferenceType"); }  //$NON-NLS-1$
>+		    consumeWildcardBoundsExtends();  
> 			break;
>-
>-    case 552 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION WildcardBounds1"); }  //$NON-NLS-1$
>-		    consumeWildcard1WithBounds();
>+ 
>+    case 553 : if (DEBUG) { System.out.println("WildcardBounds ::= super ReferenceType"); }  //$NON-NLS-1$
>+		    consumeWildcardBoundsSuper();  
> 			break;
>-
>-    case 553 : if (DEBUG) { System.out.println("WildcardBounds1 ::= extends ReferenceType1"); }  //$NON-NLS-1$
>-		    consumeWildcardBounds1Extends();
>+ 
>+    case 554 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION GREATER"); }  //$NON-NLS-1$
>+		    consumeWildcard1();  
> 			break;
>-
>-    case 554 : if (DEBUG) { System.out.println("WildcardBounds1 ::= super ReferenceType1"); }  //$NON-NLS-1$
>-		    consumeWildcardBounds1Super();
>+ 
>+    case 555 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION WildcardBounds1"); }  //$NON-NLS-1$
>+		    consumeWildcard1WithBounds();  
> 			break;
>-
>-    case 555 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION RIGHT_SHIFT"); }  //$NON-NLS-1$
>-		    consumeWildcard2();
>+ 
>+    case 556 : if (DEBUG) { System.out.println("WildcardBounds1 ::= extends ReferenceType1"); }  //$NON-NLS-1$
>+		    consumeWildcardBounds1Extends();  
> 			break;
>-
>-    case 556 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION WildcardBounds2"); }  //$NON-NLS-1$
>-		    consumeWildcard2WithBounds();
>+ 
>+    case 557 : if (DEBUG) { System.out.println("WildcardBounds1 ::= super ReferenceType1"); }  //$NON-NLS-1$
>+		    consumeWildcardBounds1Super();  
> 			break;
>-
>-    case 557 : if (DEBUG) { System.out.println("WildcardBounds2 ::= extends ReferenceType2"); }  //$NON-NLS-1$
>-		    consumeWildcardBounds2Extends();
>+ 
>+    case 558 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION RIGHT_SHIFT"); }  //$NON-NLS-1$
>+		    consumeWildcard2();  
> 			break;
>-
>-    case 558 : if (DEBUG) { System.out.println("WildcardBounds2 ::= super ReferenceType2"); }  //$NON-NLS-1$
>-		    consumeWildcardBounds2Super();
>+ 
>+    case 559 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION WildcardBounds2"); }  //$NON-NLS-1$
>+		    consumeWildcard2WithBounds();  
> 			break;
>-
>-    case 559 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>-		    consumeWildcard3();
>+ 
>+    case 560 : if (DEBUG) { System.out.println("WildcardBounds2 ::= extends ReferenceType2"); }  //$NON-NLS-1$
>+		    consumeWildcardBounds2Extends();  
> 			break;
>-
>-    case 560 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION WildcardBounds3"); }  //$NON-NLS-1$
>-		    consumeWildcard3WithBounds();
>+ 
>+    case 561 : if (DEBUG) { System.out.println("WildcardBounds2 ::= super ReferenceType2"); }  //$NON-NLS-1$
>+		    consumeWildcardBounds2Super();  
> 			break;
>-
>-    case 561 : if (DEBUG) { System.out.println("WildcardBounds3 ::= extends ReferenceType3"); }  //$NON-NLS-1$
>-		    consumeWildcardBounds3Extends();
>+ 
>+    case 562 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+		    consumeWildcard3();  
> 			break;
>-
>-    case 562 : if (DEBUG) { System.out.println("WildcardBounds3 ::= super ReferenceType3"); }  //$NON-NLS-1$
>-		    consumeWildcardBounds3Super();
>+ 
>+    case 563 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION WildcardBounds3"); }  //$NON-NLS-1$
>+		    consumeWildcard3WithBounds();  
> 			break;
>-
>-    case 563 : if (DEBUG) { System.out.println("TypeParameterHeader ::= Identifier"); }  //$NON-NLS-1$
>-		    consumeTypeParameterHeader();
>+ 
>+    case 564 : if (DEBUG) { System.out.println("WildcardBounds3 ::= extends ReferenceType3"); }  //$NON-NLS-1$
>+		    consumeWildcardBounds3Extends();  
> 			break;
>-
>-    case 564 : if (DEBUG) { System.out.println("TypeParameters ::= LESS TypeParameterList1"); }  //$NON-NLS-1$
>-		    consumeTypeParameters();
>+ 
>+    case 565 : if (DEBUG) { System.out.println("WildcardBounds3 ::= super ReferenceType3"); }  //$NON-NLS-1$
>+		    consumeWildcardBounds3Super();  
> 			break;
>-
>-    case 566 : if (DEBUG) { System.out.println("TypeParameterList ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>-		    consumeTypeParameterList();
>+ 
>+    case 566 : if (DEBUG) { System.out.println("TypeParameterHeader ::= Identifier"); }  //$NON-NLS-1$
>+		    consumeTypeParameterHeader();  
> 			break;
>-
>-    case 568 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>-		    consumeTypeParameterWithExtends();
>+ 
>+    case 567 : if (DEBUG) { System.out.println("TypeParameters ::= LESS TypeParameterList1"); }  //$NON-NLS-1$
>+		    consumeTypeParameters();  
> 			break;
>-
>-    case 569 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>-		    consumeTypeParameterWithExtendsAndBounds();
>+ 
>+    case 569 : if (DEBUG) { System.out.println("TypeParameterList ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>+		    consumeTypeParameterList();  
> 			break;
>-
>-    case 571 : if (DEBUG) { System.out.println("AdditionalBoundList ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>-		    consumeAdditionalBoundList();
>+ 
>+    case 571 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameterWithExtends();  
> 			break;
>-
>-    case 572 : if (DEBUG) { System.out.println("AdditionalBound ::= AND ReferenceType"); }  //$NON-NLS-1$
>-		    consumeAdditionalBound();
>+ 
>+    case 572 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameterWithExtendsAndBounds();  
> 			break;
>-
>-    case 574 : if (DEBUG) { System.out.println("TypeParameterList1 ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>-		    consumeTypeParameterList1();
>+ 
>+    case 574 : if (DEBUG) { System.out.println("AdditionalBoundList ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>+		    consumeAdditionalBoundList();  
> 			break;
>-
>-    case 575 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader GREATER"); }  //$NON-NLS-1$
>-		    consumeTypeParameter1();
>+ 
>+    case 575 : if (DEBUG) { System.out.println("AdditionalBound ::= AND ReferenceType"); }  //$NON-NLS-1$
>+		    consumeAdditionalBound();  
> 			break;
>-
>-    case 576 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>-		    consumeTypeParameter1WithExtends();
>+ 
>+    case 577 : if (DEBUG) { System.out.println("TypeParameterList1 ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>+		    consumeTypeParameterList1();  
> 			break;
>-
>-    case 577 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>-		    consumeTypeParameter1WithExtendsAndBounds();
>+ 
>+    case 578 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader GREATER"); }  //$NON-NLS-1$
>+		    consumeTypeParameter1();  
> 			break;
>-
>-    case 579 : if (DEBUG) { System.out.println("AdditionalBoundList1 ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>-		    consumeAdditionalBoundList1();
>+ 
>+    case 579 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameter1WithExtends();  
> 			break;
>-
>-    case 580 : if (DEBUG) { System.out.println("AdditionalBound1 ::= AND ReferenceType1"); }  //$NON-NLS-1$
>-		    consumeAdditionalBound1();
>+ 
>+    case 580 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+		    consumeTypeParameter1WithExtendsAndBounds();  
> 			break;
>-
>-    case 586 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= PLUS PushPosition..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.PLUS);
>+ 
>+    case 582 : if (DEBUG) { System.out.println("AdditionalBoundList1 ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>+		    consumeAdditionalBoundList1();  
> 			break;
>-
>-    case 587 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= MINUS PushPosition..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.MINUS);
>+ 
>+    case 583 : if (DEBUG) { System.out.println("AdditionalBound1 ::= AND ReferenceType1"); }  //$NON-NLS-1$
>+		    consumeAdditionalBound1();  
> 			break;
>-
>-    case 590 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= TWIDDLE..."); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.TWIDDLE);
>+ 
>+    case 589 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= PLUS PushPosition..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.PLUS);  
> 			break;
>-
>-    case 591 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= NOT PushPosition"); }  //$NON-NLS-1$
>-		    consumeUnaryExpression(OperatorIds.NOT);
>+ 
>+    case 590 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= MINUS PushPosition..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.MINUS);  
> 			break;
>-
>-    case 594 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.MULTIPLY);
>+ 
>+    case 593 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= TWIDDLE..."); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
> 			break;
>-
>-    case 595 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name MULTIPLY..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.MULTIPLY);
>+ 
>+    case 594 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= NOT PushPosition"); }  //$NON-NLS-1$
>+		    consumeUnaryExpression(OperatorIds.NOT);  
> 			break;
>-
>-    case 596 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.DIVIDE);
>+ 
>+    case 597 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
> 			break;
>-
>-    case 597 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name DIVIDE..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.DIVIDE);
>+ 
>+    case 598 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name MULTIPLY..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.MULTIPLY);  
> 			break;
>-
>-    case 598 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.REMAINDER);
>+ 
>+    case 599 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.DIVIDE);  
> 			break;
>-
>-    case 599 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name REMAINDER..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.REMAINDER);
>+ 
>+    case 600 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name DIVIDE..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.DIVIDE);  
> 			break;
>-
>-    case 601 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.PLUS);
>+ 
>+    case 601 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.REMAINDER);  
> 			break;
>-
>-    case 602 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name PLUS..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.PLUS);
>+ 
>+    case 602 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name REMAINDER..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.REMAINDER);  
> 			break;
>-
>-    case 603 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.MINUS);
>+ 
>+    case 604 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.PLUS);  
> 			break;
>-
>-    case 604 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name MINUS..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.MINUS);
>+ 
>+    case 605 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name PLUS..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.PLUS);  
> 			break;
>-
>-    case 606 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);
>+ 
>+    case 606 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.MINUS);  
> 			break;
>-
>-    case 607 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name LEFT_SHIFT..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.LEFT_SHIFT);
>-			break;
>-
>-    case 608 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);
>+ 
>+    case 607 : 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 ::= Name RIGHT_SHIFT..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.RIGHT_SHIFT);
>+ 
>+    case 609 : 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 ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);
>+ 
>+    case 610 : 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 ::= Name UNSIGNED_RIGHT_SHIFT..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.UNSIGNED_RIGHT_SHIFT);
>+ 
>+    case 611 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
> 			break;
>-
>-    case 613 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.LESS);
>+ 
>+    case 612 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.RIGHT_SHIFT);  
> 			break;
>-
>-    case 614 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.LESS);
>+ 
>+    case 613 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>-
>-    case 615 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.GREATER);
>+ 
>+    case 614 : 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 ::= Name GREATER..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.GREATER);
>+ 
>+    case 616 : 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 ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);
>+ 
>+    case 617 : 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 ::= Name LESS_EQUAL..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.LESS_EQUAL);
>+ 
>+    case 618 : 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 ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);
>+ 
>+    case 619 : 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 ::= Name GREATER_EQUAL..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.GREATER_EQUAL);
>+ 
>+    case 620 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
> 			break;
>-
>-    case 622 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
>-		    consumeInstanceOfExpressionWithName();
>+ 
>+    case 621 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS_EQUAL..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.LESS_EQUAL);  
> 			break;
>-
>-    case 623 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeInstanceOfExpression();
>+ 
>+    case 622 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
> 			break;
>-
>-    case 625 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);
>+ 
>+    case 623 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER_EQUAL..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.GREATER_EQUAL);  
> 			break;
>-
>-    case 626 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name EQUAL_EQUAL..."); }  //$NON-NLS-1$
>-		    consumeEqualityExpressionWithName(OperatorIds.EQUAL_EQUAL);
>+ 
>+    case 625 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
>+		    consumeInstanceOfExpressionWithName();  
> 			break;
>-
>-    case 627 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);
>+ 
>+    case 626 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeInstanceOfExpression();  
> 			break;
>-
>-    case 628 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name NOT_EQUAL..."); }  //$NON-NLS-1$
>-		    consumeEqualityExpressionWithName(OperatorIds.NOT_EQUAL);
>+ 
>+    case 628 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
> 			break;
>-
>-    case 630 : if (DEBUG) { System.out.println("AndExpression_NotName ::= AndExpression_NotName AND..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.AND);
>+ 
>+    case 629 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name EQUAL_EQUAL..."); }  //$NON-NLS-1$
>+		    consumeEqualityExpressionWithName(OperatorIds.EQUAL_EQUAL);  
> 			break;
>-
>-    case 631 : if (DEBUG) { System.out.println("AndExpression_NotName ::= Name AND EqualityExpression"); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.AND);
>+ 
>+    case 630 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
> 			break;
>-
>-    case 633 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.XOR);
>+ 
>+    case 631 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name NOT_EQUAL..."); }  //$NON-NLS-1$
>+		    consumeEqualityExpressionWithName(OperatorIds.NOT_EQUAL);  
> 			break;
>-
>-    case 634 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::= Name XOR AndExpression"); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.XOR);
>+ 
>+    case 633 : if (DEBUG) { System.out.println("AndExpression_NotName ::= AndExpression_NotName AND..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.AND);  
> 			break;
>-
>-    case 636 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.OR);
>+ 
>+    case 634 : if (DEBUG) { System.out.println("AndExpression_NotName ::= Name AND EqualityExpression"); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.AND);  
> 			break;
>-
>-    case 637 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::= Name OR..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.OR);
>+ 
>+    case 636 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.XOR);  
> 			break;
>-
>-    case 639 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.AND_AND);
>+ 
>+    case 637 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::= Name XOR AndExpression"); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.XOR);  
> 			break;
>-
>-    case 640 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::= Name AND_AND..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.AND_AND);
>+ 
>+    case 639 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.OR);  
> 			break;
>-
>-    case 642 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpression(OperatorIds.OR_OR);
>+ 
>+    case 640 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::= Name OR..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.OR);  
> 			break;
>-
>-    case 643 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::= Name OR_OR..."); }  //$NON-NLS-1$
>-		    consumeBinaryExpressionWithName(OperatorIds.OR_OR);
>+ 
>+    case 642 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.AND_AND);  
> 			break;
>-
>-    case 645 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::=..."); }  //$NON-NLS-1$
>-		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;
>+ 
>+    case 643 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::= Name AND_AND..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.AND_AND);  
> 			break;
>-
>-    case 646 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); }  //$NON-NLS-1$
>-		    consumeConditionalExpressionWithName(OperatorIds.QUESTIONCOLON) ;
>+ 
>+    case 645 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpression(OperatorIds.OR_OR);  
> 			break;
>-
>-    case 650 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeDeclarationHeaderName() ;
>+ 
>+    case 646 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::= Name OR_OR..."); }  //$NON-NLS-1$
>+		    consumeBinaryExpressionWithName(OperatorIds.OR_OR);  
> 			break;
>-
>-    case 651 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;
>+ 
>+    case 648 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>-
>-    case 652 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;
>+ 
>+    case 649 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); }  //$NON-NLS-1$
>+		    consumeConditionalExpressionWithName(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>-
>-    case 653 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeDeclarationHeaderName() ;
>+ 
>+    case 653 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeDeclarationHeaderName() ;  
> 			break;
>-
>-    case 654 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeDeclarationHeader() ;
>+ 
>+    case 654 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;  
> 			break;
>-
>-    case 655 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeDeclaration() ;
>+ 
>+    case 655 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;  
> 			break;
>-
>-    case 657 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyAnnotationTypeMemberDeclarationsopt() ;
>+ 
>+    case 656 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeDeclarationHeaderName() ;  
> 			break;
>-
>-    case 658 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeMemberDeclarationsopt() ;
>+ 
>+    case 657 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeDeclarationHeader() ;  
> 			break;
>-
>-    case 660 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeMemberDeclarations() ;
>+ 
>+    case 658 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeDeclaration() ;  
> 			break;
>-
>-    case 661 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
>-		    consumeMethodHeaderNameWithTypeParameters(true);
>+ 
>+    case 660 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyAnnotationTypeMemberDeclarationsopt() ;  
> 			break;
>-
>-    case 662 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>-		    consumeMethodHeaderName(true);
>+ 
>+    case 661 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeMemberDeclarationsopt() ;  
> 			break;
>-
>-    case 663 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyMethodHeaderDefaultValue() ;
>+ 
>+    case 663 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeMemberDeclarations() ;  
> 			break;
>-
>-    case 664 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); }  //$NON-NLS-1$
>-		    consumeMethodHeaderDefaultValue();
>+ 
>+    case 664 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
>+		    consumeMethodHeaderNameWithTypeParameters(true);  
> 			break;
>-
>-    case 665 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); }  //$NON-NLS-1$
>-		    consumeMethodHeader();
>+ 
>+    case 665 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+		    consumeMethodHeaderName(true);  
> 			break;
>-
>-    case 666 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); }  //$NON-NLS-1$
>-		    consumeAnnotationTypeMemberDeclaration() ;
>+ 
>+    case 666 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyMethodHeaderDefaultValue() ;  
> 			break;
>-
>-    case 674 : if (DEBUG) { System.out.println("AnnotationName ::= AT Name"); }  //$NON-NLS-1$
>-		    consumeAnnotationName() ;
>+ 
>+    case 667 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); }  //$NON-NLS-1$
>+		    consumeMethodHeaderDefaultValue();  
> 			break;
>-
>-    case 675 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>-		    consumeNormalAnnotation() ;
>+ 
>+    case 668 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); }  //$NON-NLS-1$
>+		    consumeMethodHeader();  
> 			break;
>-
>-    case 676 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); }  //$NON-NLS-1$
>-		    consumeEmptyMemberValuePairsopt() ;
>+ 
>+    case 669 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); }  //$NON-NLS-1$
>+		    consumeAnnotationTypeMemberDeclaration() ;  
> 			break;
>-
>-    case 679 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); }  //$NON-NLS-1$
>-		    consumeMemberValuePairs() ;
>+ 
>+    case 677 : if (DEBUG) { System.out.println("AnnotationName ::= AT Name"); }  //$NON-NLS-1$
>+		    consumeAnnotationName() ;  
> 			break;
>-
>-    case 680 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); }  //$NON-NLS-1$
>-		    consumeMemberValuePair() ;
>+ 
>+    case 678 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>+		    consumeNormalAnnotation() ;  
> 			break;
>-
>-    case 681 : if (DEBUG) { System.out.println("EnterMemberValue ::="); }  //$NON-NLS-1$
>-		    consumeEnterMemberValue() ;
>+ 
>+    case 679 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); }  //$NON-NLS-1$
>+		    consumeEmptyMemberValuePairsopt() ;  
> 			break;
>-
>-    case 682 : if (DEBUG) { System.out.println("ExitMemberValue ::="); }  //$NON-NLS-1$
>-		    consumeExitMemberValue() ;
>+ 
>+    case 682 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); }  //$NON-NLS-1$
>+		    consumeMemberValuePairs() ;  
> 			break;
>-
>-    case 684 : if (DEBUG) { System.out.println("MemberValue ::= Name"); }  //$NON-NLS-1$
>-		    consumeMemberValueAsName() ;
>+ 
>+    case 683 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); }  //$NON-NLS-1$
>+		    consumeMemberValuePair() ;  
> 			break;
>-
>-    case 687 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>-		    consumeMemberValueArrayInitializer() ;
>+ 
>+    case 684 : if (DEBUG) { System.out.println("EnterMemberValue ::="); }  //$NON-NLS-1$
>+		    consumeEnterMemberValue() ;  
> 			break;
>-
>-    case 688 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>-		    consumeMemberValueArrayInitializer() ;
>+ 
>+    case 685 : if (DEBUG) { System.out.println("ExitMemberValue ::="); }  //$NON-NLS-1$
>+		    consumeExitMemberValue() ;  
> 			break;
>-
>-    case 689 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>-		    consumeEmptyMemberValueArrayInitializer() ;
>+ 
>+    case 687 : if (DEBUG) { System.out.println("MemberValue ::= Name"); }  //$NON-NLS-1$
>+		    consumeMemberValueAsName() ;  
> 			break;
>-
>+ 
>     case 690 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>-		    consumeEmptyMemberValueArrayInitializer() ;
>+		    consumeMemberValueArrayInitializer() ;  
> 			break;
>-
>-    case 691 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); }  //$NON-NLS-1$
>-		    consumeEnterMemberValueArrayInitializer() ;
>+ 
>+    case 691 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+		    consumeMemberValueArrayInitializer() ;  
> 			break;
>-
>-    case 693 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); }  //$NON-NLS-1$
>-		    consumeMemberValues() ;
>+ 
>+    case 692 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+		    consumeEmptyMemberValueArrayInitializer() ;  
> 			break;
>-
>-    case 694 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); }  //$NON-NLS-1$
>-		    consumeMarkerAnnotation() ;
>+ 
>+    case 693 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+		    consumeEmptyMemberValueArrayInitializer() ;  
> 			break;
>-
>-    case 695 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); }  //$NON-NLS-1$
>-		    consumeSingleMemberAnnotationMemberValue() ;
>+ 
>+    case 694 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); }  //$NON-NLS-1$
>+		    consumeEnterMemberValueArrayInitializer() ;  
> 			break;
>-
>-    case 696 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>-		    consumeSingleMemberAnnotation() ;
>+ 
>+    case 696 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); }  //$NON-NLS-1$
>+		    consumeMemberValues() ;  
> 			break;
>-
>-    case 697 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); }  //$NON-NLS-1$
>-		    consumeRecoveryMethodHeaderNameWithTypeParameters();
>+ 
>+    case 697 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); }  //$NON-NLS-1$
>+		    consumeMarkerAnnotation() ;  
> 			break;
>-
>-    case 698 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>-		    consumeRecoveryMethodHeaderName();
>+ 
>+    case 698 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); }  //$NON-NLS-1$
>+		    consumeSingleMemberAnnotationMemberValue() ;  
> 			break;
>-
>-    case 699 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>-		    consumeMethodHeader();
>+ 
>+    case 699 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>+		    consumeSingleMemberAnnotation() ;  
> 			break;
>-
>-    case 700 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>-		    consumeMethodHeader();
>+ 
>+    case 700 : 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$
>+		    consumeRecoveryMethodHeaderName();  
>+			break;
>+ 
>+    case 702 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>+		    consumeMethodHeader();  
>+			break;
>+ 
>+    case 703 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>+		    consumeMethodHeader();  
>+			break;
>+ 
> 	}
> }
> protected void consumeSimpleAssertStatement() {
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc,v
>retrieving revision 1.32
>diff -u -r1.32 parser12.rsc
>Binary files /tmp/cvsV4ygj1 and parser12.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc,v
>retrieving revision 1.25
>diff -u -r1.25 parser13.rsc
>Binary files /tmp/cvscrtKkj and parser13.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser24.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser24.rsc,v
>retrieving revision 1.4
>diff -u -r1.4 parser24.rsc
>Binary files /tmp/cvsJ04omB and parser24.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc,v
>retrieving revision 1.37
>diff -u -r1.37 parser16.rsc
>Binary files /tmp/cvsooJhoT and parser16.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc,v
>retrieving revision 1.36
>diff -u -r1.36 parser9.rsc
>Binary files /tmp/cvsTEBpqb and parser9.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc,v
>retrieving revision 1.26
>diff -u -r1.26 parser18.rsc
>Binary files /tmp/cvss5GLst and parser18.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc,v
>retrieving revision 1.37
>diff -u -r1.37 parser14.rsc
>Binary files /tmp/cvsexSkvL and parser14.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc,v
>retrieving revision 1.51
>diff -u -r1.51 parser3.rsc
>Binary files /tmp/cvsQ4f7x3 and parser3.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc,v
>retrieving revision 1.35
>diff -u -r1.35 parser15.rsc
>Binary files /tmp/cvstME6Al and parser15.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc,v
>retrieving revision 1.51
>diff -u -r1.51 parser2.rsc
>Binary files /tmp/cvskTKkED and parser2.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc,v
>retrieving revision 1.30
>diff -u -r1.30 parser17.rsc
>Binary files /tmp/cvsRcFMHV and parser17.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc,v
>retrieving revision 1.53
>diff -u -r1.53 parser1.rsc
>Binary files /tmp/cvs65mfMd and parser1.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc,v
>retrieving revision 1.36
>diff -u -r1.36 parser8.rsc
>Binary files /tmp/cvsJQfWQv and parser8.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java,v
>retrieving revision 1.61
>diff -u -r1.61 ParserBasicInformation.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java	27 May 2008 22:21:12 -0000	1.61
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java	6 May 2009 13:17:25 -0000
>@@ -16,20 +16,20 @@
> 
> 	int ERROR_SYMBOL = 110,
> 		MAX_NAME_LENGTH = 41,
>-		NUM_STATES = 969,
>+		NUM_STATES = 970,
> 
> 		NT_OFFSET = 110,
> 		SCOPE_UBOUND = 133,
> 		SCOPE_SIZE = 134,
>-		LA_STATE_OFFSET = 12828,
>+		LA_STATE_OFFSET = 12741,
> 		MAX_LA = 1,
>-		NUM_RULES = 700,
>+		NUM_RULES = 703,
> 		NUM_TERMINALS = 110,
>-		NUM_NON_TERMINALS = 311,
>-		NUM_SYMBOLS = 421,
>-		START_STATE = 731,
>+		NUM_NON_TERMINALS = 313,
>+		NUM_SYMBOLS = 423,
>+		START_STATE = 942,
> 		EOFT_SYMBOL = 68,
> 		EOLT_SYMBOL = 68,
>-		ACCEPT_ACTION = 12827,
>-		ERROR_ACTION = 12828;
>+		ACCEPT_ACTION = 12740,
>+		ERROR_ACTION = 12741;
> }
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser20.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser20.rsc,v
>retrieving revision 1.24
>diff -u -r1.24 parser20.rsc
>Binary files /tmp/cvsDORb15 and parser20.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties,v
>retrieving revision 1.25
>diff -u -r1.25 readableNames.properties
>--- compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties	7 Mar 2009 00:58:59 -0000	1.25
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties	6 May 2009 13:17:26 -0000
>@@ -62,7 +62,6 @@
> ClassBodyDeclaration=ClassBodyDeclaration
> ClassBodyDeclarations=ClassBodyDeclarations
> ClassBodyDeclarationsopt=ClassBodyDeclarations
>-ClassBodyopt=ClassBody
> ClassDeclaration=ClassDeclaration
> ClassHeader=ClassHeader
> ClassHeaderExtends=ClassHeaderExtends
>@@ -106,7 +105,6 @@
> EnhancedForStatementHeader=EnhancedForStatementHeader
> EnhancedForStatementHeaderInit=EnhancedForStatementHeaderInit
> EnhancedForStatementNoShortIf=EnhancedForStatementNoShortIf
>-EnterAnonymousClassBody=EnterAnonymousClassBody
> EnterCompilationUnit=EnterCompilationUnit
> EnterMemberValue=EnterMemberValue
> EnterMemberValueArrayInitializer=EnterMemberValueArrayInitializer
>@@ -239,6 +237,8 @@
> PushPosition=PushPosition
> PushRPAREN=)
> PushRealModifiers=PushRealModifiers
>+QualifiedClassBodyopt=ClassBody
>+QualifiedEnterAnonymousClassBody=EnterAnonymousClassBody
> QualifiedName=QualifiedName
> RecoveryMethodHeader=MethodHeader
> RecoveryMethodHeaderName=MethodHeaderName
>@@ -303,6 +303,8 @@
> UnaryExpressionNotPlusMinus=Expression
> UnaryExpressionNotPlusMinus_NotName=Expression
> UnaryExpression_NotName=Expression
>+UnqualifiedClassBodyopt=ClassBody
>+UnqualifiedEnterAnonymousClassBody=EnterAnonymousClassBody
> VariableDeclarator=VariableDeclarator
> VariableDeclaratorId=VariableDeclaratorId
> VariableDeclarators=VariableDeclarators
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc,v
>retrieving revision 1.34
>diff -u -r1.34 parser6.rsc
>Binary files /tmp/cvstjaHcG and parser6.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser21.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser21.rsc,v
>retrieving revision 1.26
>diff -u -r1.26 parser21.rsc
>Binary files /tmp/cvsaUNRiY and parser21.rsc differ
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/parser22.rsc
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser22.rsc,v
>retrieving revision 1.15
>diff -u -r1.15 parser22.rsc
>Binary files /tmp/cvsQqFfpg and parser22.rsc differ
>Index: grammar/java.g
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/grammar/java.g,v
>retrieving revision 1.9
>diff -u -r1.9 java.g
>--- grammar/java.g	25 Jan 2008 11:59:21 -0000	1.9
>+++ grammar/java.g	6 May 2009 13:17:27 -0000
>@@ -1166,25 +1166,25 @@
> /.$putCase consumeAllocationHeader(); $break ./
> /:$readableName AllocationHeader:/
> 
>-ClassInstanceCreationExpression ::= 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' ClassBodyopt
>+ClassInstanceCreationExpression ::= 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' UnqualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionWithTypeArguments(); $break ./
> 
>-ClassInstanceCreationExpression ::= 'new' ClassType '(' ArgumentListopt ')' ClassBodyopt
>+ClassInstanceCreationExpression ::= 'new' ClassType '(' ArgumentListopt ')' UnqualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpression(); $break ./
> --1.1 feature
> 
>-ClassInstanceCreationExpression ::= Primary '.' 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' ClassBodyopt
>+ClassInstanceCreationExpression ::= Primary '.' 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ; $break ./
> 
>-ClassInstanceCreationExpression ::= Primary '.' 'new' ClassType '(' ArgumentListopt ')' ClassBodyopt
>+ClassInstanceCreationExpression ::= Primary '.' 'new' ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualified() ; $break ./
> 
> --1.1 feature
>-ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' ClassType '(' ArgumentListopt ')' ClassBodyopt
>+ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualified() ; $break ./
> /:$readableName ClassInstanceCreationExpression:/
> 
>-ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' ClassBodyopt
>+ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ; $break ./
> /:$readableName ClassInstanceCreationExpression:/
> 
>@@ -1192,14 +1192,24 @@
> /.$putCase consumeClassInstanceCreationExpressionName() ; $break ./
> /:$readableName ClassInstanceCreationExpressionName:/
> 
>-ClassBodyopt ::= $empty --test made using null as contents
>+UnqualifiedClassBodyopt ::= $empty --test made using null as contents
> /.$putCase consumeClassBodyopt(); $break ./
>-ClassBodyopt ::= EnterAnonymousClassBody ClassBody
>+UnqualifiedClassBodyopt ::= UnqualifiedEnterAnonymousClassBody ClassBody
> /:$readableName ClassBody:/
> /:$no_statements_recovery:/
> 
>-EnterAnonymousClassBody ::= $empty
>-/.$putCase consumeEnterAnonymousClassBody(); $break ./
>+UnqualifiedEnterAnonymousClassBody ::= $empty
>+/.$putCase consumeEnterAnonymousClassBody(false); $break ./
>+/:$readableName EnterAnonymousClassBody:/
>+
>+QualifiedClassBodyopt ::= $empty --test made using null as contents
>+/.$putCase consumeClassBodyopt(); $break ./
>+QualifiedClassBodyopt ::= QualifiedEnterAnonymousClassBody ClassBody
>+/:$readableName ClassBody:/
>+/:$no_statements_recovery:/
>+
>+QualifiedEnterAnonymousClassBody ::= $empty
>+/.$putCase consumeEnterAnonymousClassBody(true); $break ./
> /:$readableName EnterAnonymousClassBody:/
> 
> ArgumentList ::= Expression
>Index: codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java,v
>retrieving revision 1.88
>diff -u -r1.88 AssistParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java	16 Jan 2009 14:29:29 -0000	1.88
>+++ codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java	6 May 2009 13:17:23 -0000
>@@ -311,8 +311,8 @@
> 		this.currentElement = this.currentElement.add(localDecl, 0);
> 	}
> }
>-protected void consumeEnterAnonymousClassBody() {
>-	super.consumeEnterAnonymousClassBody();
>+protected void consumeEnterAnonymousClassBody(boolean qualified) {
>+	super.consumeEnterAnonymousClassBody(qualified);
> 	popElement(K_SELECTOR);
> 	pushOnElementStack(K_TYPE_DELIMITER);
> }
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java,v
>retrieving revision 1.59
>diff -u -r1.59 DietRecoveryTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java	28 Apr 2009 17:17:31 -0000	1.59
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java	6 May 2009 13:17:45 -0000
>@@ -7759,4 +7759,77 @@
> 		expectedFullUnitToString,
> 		expectedCompletionDietUnitToString, testName);
> }
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=132679
>+public void test126() {
>+	String s =
>+		"package p;\n" +
>+		"public class ContextTest {\n" +
>+		"  private Context context = new Context();\n" +
>+		"  public void test() {\n" +
>+		"      context.new Callback() {\n" +
>+		"      public void doit(int value) {\n" +
>+		"       #\n" +
>+		"      }\n" +
>+		"    };\n" +
>+		"  }\n" +
>+		"}\n";
>+
>+	String expectedDietUnitToString =
>+		"package p;\n" + 
>+		"public class ContextTest {\n" + 
>+		"  private Context context = new Context();\n" + 
>+		"  public ContextTest() {\n" + 
>+		"  }\n" + 
>+		"  public void test() {\n" + 
>+		"  }\n" + 
>+		"}\n";
>+
>+	String expectedDietPlusBodyUnitToString =
>+		"package p;\n" + 
>+		"public class ContextTest {\n" + 
>+		"  private Context context = new Context();\n" + 
>+		"  public ContextTest() {\n" + 
>+		"    super();\n" + 
>+		"  }\n" + 
>+		"  public void test() {\n" + 
>+		"  }\n" + 
>+		"}\n";
>+
>+	String expectedDietPlusBodyPlusStatementsRecoveryUnitToString =
>+		"package p;\n" + 
>+		"public class ContextTest {\n" + 
>+		"  private Context context = new Context();\n" + 
>+		"  public ContextTest() {\n" + 
>+		"    super();\n" + 
>+		"  }\n" + 
>+		"  public void test() {\n" + 
>+		"    context.new Callback() {\n" + 
>+		"      public void doit(int value) {\n" + 
>+		"      }\n" + 
>+		"    };\n" + 
>+		"  }\n" + 
>+		"}\n";
>+
>+	String expectedFullUnitToString =
>+		expectedDietUnitToString;
>+
>+	String expectedCompletionDietUnitToString =
>+		"package p;\n" + 
>+		"public class ContextTest {\n" + 
>+		"  private Context context;\n" + 
>+		"  public ContextTest() {\n" + 
>+		"  }\n" + 
>+		"  public void test() {\n" + 
>+		"  }\n" + 
>+		"}\n";
>+
>+	String testName = "test";
>+	checkParse(
>+		s.toCharArray(),
>+		expectedDietUnitToString,
>+		expectedDietPlusBodyUnitToString,
>+		expectedDietPlusBodyPlusStatementsRecoveryUnitToString,
>+		expectedFullUnitToString,
>+		expectedCompletionDietUnitToString, testName);
>+}
> }

Actions: View | Diff

Attachments on bug 132679: 134615