Attachment 192679 Details for Bug 342054 – Proposed fix + regression tests

[patch] Proposed fix + regression tests

patch_342054.txt (text/plain), 142.47 KB, created by Olivier Thomann

on 2011-04-06 18:24:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2011-04-06 18:24:05 EDT

Size: 142.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.220
>diff -u -r1.220 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	28 Feb 2011 18:27:48 -0000	1.220
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	6 Apr 2011 22:23:42 -0000
>@@ -2574,6 +2574,64 @@
> 		this.listLength++;
> 	}
> }
>+protected void consumeCatchFormalParameter(boolean isVarArgs) {
>+	if (this.indexOfAssistIdentifier() < 0) {
>+		super.consumeCatchFormalParameter(isVarArgs);
>+		if (this.pendingAnnotation != null) {
>+			this.pendingAnnotation.potentialAnnotatedNode = this.astStack[this.astPtr];
>+			this.pendingAnnotation = null;
>+		}
>+	} else {
>+
>+		this.identifierLengthPtr--;
>+		char[] identifierName = this.identifierStack[this.identifierPtr];
>+		long namePositions = this.identifierPositionStack[this.identifierPtr--];
>+		int extendedDimensions = this.intStack[this.intPtr--];
>+		int endOfEllipsis = 0;
>+		if (isVarArgs) {
>+			endOfEllipsis = this.intStack[this.intPtr--];
>+		}
>+		int firstDimensions = this.intStack[this.intPtr--];
>+		final int typeDimensions = firstDimensions + extendedDimensions;
>+		TypeReference type = getTypeReference(typeDimensions);
>+		if (isVarArgs) {
>+			type = copyDims(type, typeDimensions + 1);
>+			if (extendedDimensions == 0) {
>+				type.sourceEnd = endOfEllipsis;
>+			}
>+			type.bits |= ASTNode.IsVarArgs; // set isVarArgs
>+		}
>+		this.intPtr -= 2;
>+		CompletionOnArgumentName arg =
>+			new CompletionOnArgumentName(
>+				identifierName,
>+				namePositions,
>+				type,
>+				this.intStack[this.intPtr + 1] & ~ClassFileConstants.AccDeprecated); // modifiers
>+		arg.bits &= ~ASTNode.IsArgument;
>+		// consume annotations
>+		int length;
>+		if ((length = this.expressionLengthStack[this.expressionLengthPtr--]) != 0) {
>+			System.arraycopy(
>+				this.expressionStack,
>+				(this.expressionPtr -= length) + 1,
>+				arg.annotations = new Annotation[length],
>+				0,
>+				length);
>+		}
>+
>+		arg.isCatchArgument = topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_CATCH_AND_RIGHT_PAREN;
>+		pushOnAstStack(arg);
>+
>+		this.assistNode = arg;
>+		this.lastCheckPoint = (int) namePositions;
>+		this.isOrphanCompletionNode = true;
>+
>+		/* if incomplete method header, listLength counter will not have been reset,
>+			indicating that some arguments are available on the stack */
>+		this.listLength++;
>+	}
>+}
> protected void consumeStatementFor() {
> 	super.consumeStatementFor();
> 
>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.93
>diff -u -r1.93 SelectionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java	28 Feb 2011 18:27:48 -0000	1.93
>+++ codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java	6 Apr 2011 22:23:42 -0000
>@@ -594,6 +594,74 @@
> 		this.listLength++;
> 	}
> }
>+protected void consumeCatchFormalParameter(boolean isVarArgs) {
>+	if (this.indexOfAssistIdentifier() < 0) {
>+		super.consumeCatchFormalParameter(isVarArgs);
>+		if((!this.diet || this.dietInt != 0) && this.astPtr > -1) {
>+			Argument argument = (Argument) this.astStack[this.astPtr];
>+			if(argument.type == this.assistNode) {
>+				this.isOrphanCompletionNode = true;
>+				this.restartRecovery	= true;	// force to restart in recovery mode
>+				this.lastIgnoredToken = -1;
>+			}
>+		}
>+	} else {
>+		this.identifierLengthPtr--;
>+		char[] identifierName = this.identifierStack[this.identifierPtr];
>+		long namePositions = this.identifierPositionStack[this.identifierPtr--];
>+		int extendedDimensions = this.intStack[this.intPtr--];
>+		int endOfEllipsis = 0;
>+		if (isVarArgs) {
>+			endOfEllipsis = this.intStack[this.intPtr--];
>+		}
>+		int firstDimensions = this.intStack[this.intPtr--];
>+		final int typeDimensions = firstDimensions + extendedDimensions;
>+		TypeReference type = getTypeReference(typeDimensions);
>+		if (isVarArgs) {
>+			type = copyDims(type, typeDimensions + 1);
>+			if (extendedDimensions == 0) {
>+				type.sourceEnd = endOfEllipsis;
>+			}
>+			type.bits |= ASTNode.IsVarArgs; // set isVarArgs
>+		}
>+		int modifierPositions = this.intStack[this.intPtr--];
>+		this.intPtr--;
>+		Argument arg =
>+			new SelectionOnArgumentName(
>+				identifierName,
>+				namePositions,
>+				type,
>+				this.intStack[this.intPtr + 1] & ~ClassFileConstants.AccDeprecated); // modifiers
>+		arg.bits &= ~ASTNode.IsArgument;
>+		arg.declarationSourceStart = modifierPositions;
>+
>+		// consume annotations
>+		int length;
>+		if ((length = this.expressionLengthStack[this.expressionLengthPtr--]) != 0) {
>+			System.arraycopy(
>+				this.expressionStack,
>+				(this.expressionPtr -= length) + 1,
>+				arg.annotations = new Annotation[length],
>+				0,
>+				length);
>+		}
>+
>+		pushOnAstStack(arg);
>+
>+		this.assistNode = arg;
>+		this.lastCheckPoint = (int) namePositions;
>+		this.isOrphanCompletionNode = true;
>+
>+		if (!this.diet){
>+			this.restartRecovery	= true;	// force to restart in recovery mode
>+			this.lastIgnoredToken = -1;
>+		}
>+
>+		/* if incomplete method header, listLength counter will not have been reset,
>+			indicating that some arguments are available on the stack */
>+		this.listLength++;
>+	}
>+}
> protected void consumeInsideCastExpression() {
> 	super.consumeInsideCastExpression();
> 	pushOnElementStack(K_CAST_STATEMENT);
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java,v
>retrieving revision 1.108
>diff -u -r1.108 ASTNode.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java	16 Feb 2011 08:25:28 -0000	1.108
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java	6 Apr 2011 22:23:43 -0000
>@@ -26,7 +26,7 @@
> 	// storage for internal flags (32 bits)				BIT USAGE
> 	public final static int Bit1 = 0x1;					// return type (operator) | name reference kind (name ref) | add assertion (type decl) | useful empty statement (empty statement)
> 	public final static int Bit2 = 0x2;					// return type (operator) | name reference kind (name ref) | has local type (type, method, field decl)
>-	public final static int Bit3 = 0x4;					// return type (operator) | name reference kind (name ref) | implicit this (this ref)
>+	public final static int Bit3 = 0x4;					// return type (operator) | name reference kind (name ref) | implicit this (this ref) | locals (isArgument)
> 	public final static int Bit4 = 0x8;					// return type (operator) | first assignment to local (name ref,local decl) | undocumented empty block (block, type and method decl)
> 	public final static int Bit5 = 0x10;					// value for return (expression) | has all method bodies (unit) | supertype ref (type ref) | resolved (field decl)
> 	public final static int Bit6 = 0x20;					// depth (name ref, msg) | ignore need cast check (cast expression) | error in signature (method declaration/ initializer) | is recovered (annotation reference)
>@@ -113,6 +113,9 @@
> 	// for name refs or local decls
> 	public static final int FirstAssignmentToLocal = Bit4;
> 
>+	// for local decls
>+	public static final int IsArgument = Bit3;
>+
> 	// for msg or field references
> 	public static final int NeedReceiverGenericCast = Bit19;
> 	
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java,v
>retrieving revision 1.65
>diff -u -r1.65 Argument.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java	3 Nov 2009 15:37:47 -0000	1.65
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java	6 Apr 2011 22:23:43 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -74,7 +74,7 @@
> 	 * @see org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration#getKind()
> 	 */
> 	public int getKind() {
>-		return PARAMETER;
>+		return (this.bits & ASTNode.IsArgument) != 0 ? PARAMETER : LOCAL_VARIABLE;
> 	}
> 
> 	public boolean isVarArgs() {
>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.424
>diff -u -r1.424 Parser.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java	15 Mar 2011 14:43:57 -0000	1.424
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java	6 Apr 2011 22:23:46 -0000
>@@ -3859,6 +3859,74 @@
> 		}
> 	}
> }
>+protected void consumeCatchFormalParameter(boolean isVarArgs) {
>+	// FormalParameter ::= Type VariableDeclaratorId ==> false
>+	// FormalParameter ::= Modifiers Type VariableDeclaratorId ==> true
>+	/*
>+	this.astStack :
>+	this.identifierStack : type identifier
>+	this.intStack : dim dim
>+	 ==>
>+	this.astStack : Argument
>+	this.identifierStack :
>+	this.intStack :
>+	*/
>+
>+	this.identifierLengthPtr--;
>+	char[] identifierName = this.identifierStack[this.identifierPtr];
>+	long namePositions = this.identifierPositionStack[this.identifierPtr--];
>+	int extendedDimensions = this.intStack[this.intPtr--];
>+	int endOfEllipsis = 0;
>+	if (isVarArgs) {
>+		endOfEllipsis = this.intStack[this.intPtr--];
>+	}
>+	int firstDimensions = this.intStack[this.intPtr--];
>+	final int typeDimensions = firstDimensions + extendedDimensions;
>+	TypeReference type = getTypeReference(typeDimensions);
>+	if (isVarArgs) {
>+		type = copyDims(type, typeDimensions + 1);
>+		if (extendedDimensions == 0) {
>+			type.sourceEnd = endOfEllipsis;
>+		}
>+		type.bits |= ASTNode.IsVarArgs; // set isVarArgs
>+	}
>+	int modifierPositions = this.intStack[this.intPtr--];
>+	this.intPtr--;
>+	Argument arg =
>+		new Argument(
>+			identifierName,
>+			namePositions,
>+			type,
>+			this.intStack[this.intPtr + 1] & ~ClassFileConstants.AccDeprecated); // modifiers
>+	arg.bits &= ~ASTNode.IsArgument;
>+	arg.declarationSourceStart = modifierPositions;
>+	// consume annotations
>+	int length;
>+	if ((length = this.expressionLengthStack[this.expressionLengthPtr--]) != 0) {
>+		System.arraycopy(
>+			this.expressionStack,
>+			(this.expressionPtr -= length) + 1,
>+			arg.annotations = new Annotation[length],
>+			0,
>+			length);
>+	}
>+	pushOnAstStack(arg);
>+
>+	/* if incomplete method header, this.listLength counter will not have been reset,
>+		indicating that some arguments are available on the stack */
>+	this.listLength++;
>+
>+	if(isVarArgs) {
>+		if (!this.statementRecoveryActivated &&
>+				this.options.sourceLevel < ClassFileConstants.JDK1_5 &&
>+				this.lastErrorEndPositionBeforeRecovery < this.scanner.currentPosition) {
>+				problemReporter().invalidUsageOfVarargs(arg);
>+		} else if (!this.statementRecoveryActivated &&
>+				extendedDimensions > 0) {
>+			problemReporter().illegalExtendedDimensions(arg);
>+		}
>+	}
>+}
> protected void consumeFormalParameterList() {
> 	// FormalParameterList ::= FormalParameterList ',' FormalParameter
> 	optimizedConcatNodeLists();
>@@ -5272,1593 +5340,1601 @@
> 		    consumeEnterCompilationUnit();  
> 			break;
>  
>-    case 87 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
>+    case 87 : if (DEBUG) { System.out.println("CatchHeader ::= catch LPAREN CatchFormalParameter RPAREN"); }  //$NON-NLS-1$
> 		    consumeCatchHeader();  
> 			break;
>  
>-    case 89 : if (DEBUG) { System.out.println("ImportDeclarations ::= ImportDeclarations..."); }  //$NON-NLS-1$
>+    case 88 : if (DEBUG) { System.out.println("CatchFormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+		    consumeCatchFormalParameter(false);  
>+			break;
>+ 
>+    case 89 : if (DEBUG) { System.out.println("CatchFormalParameter ::= Modifiersopt Type ELLIPSIS..."); }  //$NON-NLS-1$
>+		    consumeCatchFormalParameter(true);  
>+			break;
>+ 
>+    case 91 : if (DEBUG) { System.out.println("ImportDeclarations ::= ImportDeclarations..."); }  //$NON-NLS-1$
> 		    consumeImportDeclarations();  
> 			break;
>  
>-    case 91 : if (DEBUG) { System.out.println("TypeDeclarations ::= TypeDeclarations TypeDeclaration"); }  //$NON-NLS-1$
>+    case 93 : if (DEBUG) { System.out.println("TypeDeclarations ::= TypeDeclarations TypeDeclaration"); }  //$NON-NLS-1$
> 		    consumeTypeDeclarations();  
> 			break;
>  
>-    case 92 : if (DEBUG) { System.out.println("PackageDeclaration ::= PackageDeclarationName SEMICOLON"); }  //$NON-NLS-1$
>+    case 94 : if (DEBUG) { System.out.println("PackageDeclaration ::= PackageDeclarationName SEMICOLON"); }  //$NON-NLS-1$
> 		     consumePackageDeclaration();  
> 			break;
>  
>-    case 93 : if (DEBUG) { System.out.println("PackageDeclarationName ::= Modifiers package..."); }  //$NON-NLS-1$
>+    case 95 : if (DEBUG) { System.out.println("PackageDeclarationName ::= Modifiers package..."); }  //$NON-NLS-1$
> 		     consumePackageDeclarationNameWithModifiers();  
> 			break;
>  
>-    case 94 : if (DEBUG) { System.out.println("PackageDeclarationName ::= PackageComment package Name"); }  //$NON-NLS-1$
>+    case 96 : if (DEBUG) { System.out.println("PackageDeclarationName ::= PackageComment package Name"); }  //$NON-NLS-1$
> 		     consumePackageDeclarationName();  
> 			break;
>  
>-    case 95 : if (DEBUG) { System.out.println("PackageComment ::="); }  //$NON-NLS-1$
>+    case 97 : if (DEBUG) { System.out.println("PackageComment ::="); }  //$NON-NLS-1$
> 		     consumePackageComment();  
> 			break;
>  
>-    case 100 : if (DEBUG) { System.out.println("SingleTypeImportDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 102 : if (DEBUG) { System.out.println("SingleTypeImportDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 101 : if (DEBUG) { System.out.println("SingleTypeImportDeclarationName ::= import Name"); }  //$NON-NLS-1$
>+    case 103 : if (DEBUG) { System.out.println("SingleTypeImportDeclarationName ::= import Name"); }  //$NON-NLS-1$
> 		    consumeSingleTypeImportDeclarationName();  
> 			break;
>  
>-    case 102 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 104 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 103 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclarationName ::= import Name DOT..."); }  //$NON-NLS-1$
>+    case 105 : if (DEBUG) { System.out.println("TypeImportOnDemandDeclarationName ::= import Name DOT..."); }  //$NON-NLS-1$
> 		    consumeTypeImportOnDemandDeclarationName();  
> 			break;
>  
>-     case 106 : if (DEBUG) { System.out.println("TypeDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>+     case 108 : if (DEBUG) { System.out.println("TypeDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyTypeDeclaration();  
> 			break;
>  
>-    case 110 : if (DEBUG) { System.out.println("Modifiers ::= Modifiers Modifier"); }  //$NON-NLS-1$
>+    case 112 : if (DEBUG) { System.out.println("Modifiers ::= Modifiers Modifier"); }  //$NON-NLS-1$
> 		    consumeModifiers2();  
> 			break;
>  
>-    case 122 : if (DEBUG) { System.out.println("Modifier ::= Annotation"); }  //$NON-NLS-1$
>+    case 124 : if (DEBUG) { System.out.println("Modifier ::= Annotation"); }  //$NON-NLS-1$
> 		    consumeAnnotationAsModifier();  
> 			break;
>  
>-    case 123 : if (DEBUG) { System.out.println("ClassDeclaration ::= ClassHeader ClassBody"); }  //$NON-NLS-1$
>+    case 125 : if (DEBUG) { System.out.println("ClassDeclaration ::= ClassHeader ClassBody"); }  //$NON-NLS-1$
> 		    consumeClassDeclaration();  
> 			break;
>  
>-    case 124 : if (DEBUG) { System.out.println("ClassHeader ::= ClassHeaderName ClassHeaderExtendsopt..."); }  //$NON-NLS-1$
>+    case 126 : if (DEBUG) { System.out.println("ClassHeader ::= ClassHeaderName ClassHeaderExtendsopt..."); }  //$NON-NLS-1$
> 		    consumeClassHeader();  
> 			break;
>  
>-    case 125 : if (DEBUG) { System.out.println("ClassHeaderName ::= ClassHeaderName1 TypeParameters"); }  //$NON-NLS-1$
>+    case 127 : if (DEBUG) { System.out.println("ClassHeaderName ::= ClassHeaderName1 TypeParameters"); }  //$NON-NLS-1$
> 		    consumeTypeHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 127 : if (DEBUG) { System.out.println("ClassHeaderName1 ::= Modifiersopt class Identifier"); }  //$NON-NLS-1$
>+    case 129 : if (DEBUG) { System.out.println("ClassHeaderName1 ::= Modifiersopt class Identifier"); }  //$NON-NLS-1$
> 		    consumeClassHeaderName1();  
> 			break;
>  
>-    case 128 : if (DEBUG) { System.out.println("ClassHeaderExtends ::= extends ClassType"); }  //$NON-NLS-1$
>+    case 130 : if (DEBUG) { System.out.println("ClassHeaderExtends ::= extends ClassType"); }  //$NON-NLS-1$
> 		    consumeClassHeaderExtends();  
> 			break;
>  
>-    case 129 : if (DEBUG) { System.out.println("ClassHeaderImplements ::= implements InterfaceTypeList"); }  //$NON-NLS-1$
>+    case 131 : if (DEBUG) { System.out.println("ClassHeaderImplements ::= implements InterfaceTypeList"); }  //$NON-NLS-1$
> 		    consumeClassHeaderImplements();  
> 			break;
>  
>-    case 131 : if (DEBUG) { System.out.println("InterfaceTypeList ::= InterfaceTypeList COMMA..."); }  //$NON-NLS-1$
>+    case 133 : if (DEBUG) { System.out.println("InterfaceTypeList ::= InterfaceTypeList COMMA..."); }  //$NON-NLS-1$
> 		    consumeInterfaceTypeList();  
> 			break;
>  
>-    case 132 : if (DEBUG) { System.out.println("InterfaceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
>+    case 134 : if (DEBUG) { System.out.println("InterfaceType ::= ClassOrInterfaceType"); }  //$NON-NLS-1$
> 		    consumeInterfaceType();  
> 			break;
>  
>-    case 135 : if (DEBUG) { System.out.println("ClassBodyDeclarations ::= ClassBodyDeclarations..."); }  //$NON-NLS-1$
>+    case 137 : if (DEBUG) { System.out.println("ClassBodyDeclarations ::= ClassBodyDeclarations..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclarations();  
> 			break;
>  
>-    case 139 : if (DEBUG) { System.out.println("ClassBodyDeclaration ::= Diet NestedMethod..."); }  //$NON-NLS-1$
>+    case 141 : if (DEBUG) { System.out.println("ClassBodyDeclaration ::= Diet NestedMethod..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclaration();  
> 			break;
>  
>-    case 140 : if (DEBUG) { System.out.println("Diet ::="); }  //$NON-NLS-1$
>+    case 142 : if (DEBUG) { System.out.println("Diet ::="); }  //$NON-NLS-1$
> 		    consumeDiet();  
> 			break;
> 
>-    case 141 : if (DEBUG) { System.out.println("Initializer ::= Diet NestedMethod CreateInitializer..."); }  //$NON-NLS-1$
>+    case 143 : if (DEBUG) { System.out.println("Initializer ::= Diet NestedMethod CreateInitializer..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclaration();  
> 			break;
>  
>-    case 142 : if (DEBUG) { System.out.println("CreateInitializer ::="); }  //$NON-NLS-1$
>+    case 144 : if (DEBUG) { System.out.println("CreateInitializer ::="); }  //$NON-NLS-1$
> 		    consumeCreateInitializer();  
> 			break;
> 
>-    case 149 : if (DEBUG) { System.out.println("ClassMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>+    case 151 : if (DEBUG) { System.out.println("ClassMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyTypeDeclaration();  
> 			break;
> 
>-    case 152 : if (DEBUG) { System.out.println("FieldDeclaration ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 154 : if (DEBUG) { System.out.println("FieldDeclaration ::= Modifiersopt Type..."); }  //$NON-NLS-1$
> 		    consumeFieldDeclaration();  
> 			break;
>  
>-    case 154 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
>+    case 156 : if (DEBUG) { System.out.println("VariableDeclarators ::= VariableDeclarators COMMA..."); }  //$NON-NLS-1$
> 		    consumeVariableDeclarators();  
> 			break;
>  
>-    case 157 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
>+    case 159 : if (DEBUG) { System.out.println("EnterVariable ::="); }  //$NON-NLS-1$
> 		    consumeEnterVariable();  
> 			break;
>  
>-    case 158 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
>+    case 160 : if (DEBUG) { System.out.println("ExitVariableWithInitialization ::="); }  //$NON-NLS-1$
> 		    consumeExitVariableWithInitialization();  
> 			break;
>  
>-    case 159 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
>+    case 161 : if (DEBUG) { System.out.println("ExitVariableWithoutInitialization ::="); }  //$NON-NLS-1$
> 		    consumeExitVariableWithoutInitialization();  
> 			break;
>  
>-    case 160 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
>+    case 162 : if (DEBUG) { System.out.println("ForceNoDiet ::="); }  //$NON-NLS-1$
> 		    consumeForceNoDiet();  
> 			break;
>  
>-    case 161 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
>+    case 163 : if (DEBUG) { System.out.println("RestoreDiet ::="); }  //$NON-NLS-1$
> 		    consumeRestoreDiet();  
> 			break;
>  
>-    case 166 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
>+    case 168 : if (DEBUG) { System.out.println("MethodDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
> 		    // set to true to consume a method with a body
>   consumeMethodDeclaration(true);   
> 			break;
>  
>-    case 167 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
>+    case 169 : if (DEBUG) { System.out.println("AbstractMethodDeclaration ::= MethodHeader SEMICOLON"); }  //$NON-NLS-1$
> 		    // set to false to consume a method without body
>   consumeMethodDeclaration(false);  
> 			break;
>  
>-    case 168 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
>+    case 170 : if (DEBUG) { System.out.println("MethodHeader ::= MethodHeaderName FormalParameterListopt"); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>-    case 169 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt TypeParameters Type..."); }  //$NON-NLS-1$
>+    case 171 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt TypeParameters Type..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderNameWithTypeParameters(false);  
> 			break;
>  
>-    case 170 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt Type Identifier LPAREN"); }  //$NON-NLS-1$
>+    case 172 : if (DEBUG) { System.out.println("MethodHeaderName ::= Modifiersopt Type Identifier LPAREN"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderName(false);  
> 			break;
>  
>-    case 171 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
>+    case 173 : if (DEBUG) { System.out.println("MethodHeaderRightParen ::= RPAREN"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderRightParen();  
> 			break;
>  
>-    case 172 : if (DEBUG) { System.out.println("MethodHeaderExtendedDims ::= Dimsopt"); }  //$NON-NLS-1$
>+    case 174 : if (DEBUG) { System.out.println("MethodHeaderExtendedDims ::= Dimsopt"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderExtendedDims();  
> 			break;
>  
>-    case 173 : if (DEBUG) { System.out.println("MethodHeaderThrowsClause ::= throws ClassTypeList"); }  //$NON-NLS-1$
>+    case 175 : if (DEBUG) { System.out.println("MethodHeaderThrowsClause ::= throws ClassTypeList"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderThrowsClause();  
> 			break;
>  
>-    case 174 : if (DEBUG) { System.out.println("ConstructorHeader ::= ConstructorHeaderName..."); }  //$NON-NLS-1$
>+    case 176 : if (DEBUG) { System.out.println("ConstructorHeader ::= ConstructorHeaderName..."); }  //$NON-NLS-1$
> 		    consumeConstructorHeader();  
> 			break;
>  
>-    case 175 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt TypeParameters..."); }  //$NON-NLS-1$
>+    case 177 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt TypeParameters..."); }  //$NON-NLS-1$
> 		    consumeConstructorHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 176 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt Identifier LPAREN"); }  //$NON-NLS-1$
>+    case 178 : if (DEBUG) { System.out.println("ConstructorHeaderName ::= Modifiersopt Identifier LPAREN"); }  //$NON-NLS-1$
> 		    consumeConstructorHeaderName();  
> 			break;
>  
>-    case 178 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
>+    case 180 : if (DEBUG) { System.out.println("FormalParameterList ::= FormalParameterList COMMA..."); }  //$NON-NLS-1$
> 		    consumeFormalParameterList();  
> 			break;
>  
>-    case 179 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 181 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
> 		    consumeFormalParameter(false);  
> 			break;
>  
>-    case 180 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type ELLIPSIS..."); }  //$NON-NLS-1$
>+    case 182 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type ELLIPSIS..."); }  //$NON-NLS-1$
> 		    consumeFormalParameter(true);  
> 			break;
>  
>-    case 182 : if (DEBUG) { System.out.println("ClassTypeList ::= ClassTypeList COMMA ClassTypeElt"); }  //$NON-NLS-1$
>+    case 184 : if (DEBUG) { System.out.println("ClassTypeList ::= ClassTypeList COMMA ClassTypeElt"); }  //$NON-NLS-1$
> 		    consumeClassTypeList();  
> 			break;
>  
>-    case 183 : if (DEBUG) { System.out.println("ClassTypeElt ::= ClassType"); }  //$NON-NLS-1$
>+    case 185 : if (DEBUG) { System.out.println("ClassTypeElt ::= ClassType"); }  //$NON-NLS-1$
> 		    consumeClassTypeElt();  
> 			break;
>  
>-    case 184 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE BlockStatementsopt..."); }  //$NON-NLS-1$
>+    case 186 : if (DEBUG) { System.out.println("MethodBody ::= NestedMethod LBRACE BlockStatementsopt..."); }  //$NON-NLS-1$
> 		    consumeMethodBody();  
> 			break;
>  
>-    case 185 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
>+    case 187 : if (DEBUG) { System.out.println("NestedMethod ::="); }  //$NON-NLS-1$
> 		    consumeNestedMethod();  
> 			break;
>  
>-    case 186 : if (DEBUG) { System.out.println("StaticInitializer ::= StaticOnly Block"); }  //$NON-NLS-1$
>+    case 188 : if (DEBUG) { System.out.println("StaticInitializer ::= StaticOnly Block"); }  //$NON-NLS-1$
> 		    consumeStaticInitializer();  
> 			break;
> 
>-    case 187 : if (DEBUG) { System.out.println("StaticOnly ::= static"); }  //$NON-NLS-1$
>+    case 189 : if (DEBUG) { System.out.println("StaticOnly ::= static"); }  //$NON-NLS-1$
> 		    consumeStaticOnly();  
> 			break;
>  
>-    case 188 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader MethodBody"); }  //$NON-NLS-1$
>+    case 190 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader MethodBody"); }  //$NON-NLS-1$
> 		    consumeConstructorDeclaration() ;  
> 			break;
>  
>-    case 189 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader SEMICOLON"); }  //$NON-NLS-1$
>+    case 191 : if (DEBUG) { System.out.println("ConstructorDeclaration ::= ConstructorHeader SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeInvalidConstructorDeclaration() ;  
> 			break;
>  
>-    case 190 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= this LPAREN..."); }  //$NON-NLS-1$
>+    case 192 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= this LPAREN..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(0, THIS_CALL);  
> 			break;
>  
>-    case 191 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments this"); }  //$NON-NLS-1$
>+    case 193 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments this"); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(0,THIS_CALL);  
> 			break;
>  
>-    case 192 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= super LPAREN..."); }  //$NON-NLS-1$
>+    case 194 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= super LPAREN..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(0,SUPER_CALL);  
> 			break;
>  
>-    case 193 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 195 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(0,SUPER_CALL);  
> 			break;
>  
>-    case 194 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT super..."); }  //$NON-NLS-1$
>+    case 196 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT super..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(1, SUPER_CALL);  
> 			break;
>  
>-    case 195 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
>+    case 197 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(1, SUPER_CALL);  
> 			break;
>  
>-    case 196 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT super LPAREN"); }  //$NON-NLS-1$
>+    case 198 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT super LPAREN"); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(2, SUPER_CALL);  
> 			break;
>  
>-    case 197 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
>+    case 199 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(2, SUPER_CALL);  
> 			break;
>  
>-    case 198 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT this..."); }  //$NON-NLS-1$
>+    case 200 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT this..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(1, THIS_CALL);  
> 			break;
>  
>-    case 199 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
>+    case 201 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Primary DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(1, THIS_CALL);  
> 			break;
>  
>-    case 200 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT this LPAREN"); }  //$NON-NLS-1$
>+    case 202 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT this LPAREN"); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocation(2, THIS_CALL);  
> 			break;
>  
>-    case 201 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
>+    case 203 : if (DEBUG) { System.out.println("ExplicitConstructorInvocation ::= Name DOT..."); }  //$NON-NLS-1$
> 		    consumeExplicitConstructorInvocationWithTypeArguments(2, THIS_CALL);  
> 			break;
>  
>-    case 202 : if (DEBUG) { System.out.println("InterfaceDeclaration ::= InterfaceHeader InterfaceBody"); }  //$NON-NLS-1$
>+    case 204 : if (DEBUG) { System.out.println("InterfaceDeclaration ::= InterfaceHeader InterfaceBody"); }  //$NON-NLS-1$
> 		    consumeInterfaceDeclaration();  
> 			break;
>  
>-    case 203 : if (DEBUG) { System.out.println("InterfaceHeader ::= InterfaceHeaderName..."); }  //$NON-NLS-1$
>+    case 205 : if (DEBUG) { System.out.println("InterfaceHeader ::= InterfaceHeaderName..."); }  //$NON-NLS-1$
> 		    consumeInterfaceHeader();  
> 			break;
>  
>-    case 204 : if (DEBUG) { System.out.println("InterfaceHeaderName ::= InterfaceHeaderName1..."); }  //$NON-NLS-1$
>+    case 206 : if (DEBUG) { System.out.println("InterfaceHeaderName ::= InterfaceHeaderName1..."); }  //$NON-NLS-1$
> 		    consumeTypeHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 206 : if (DEBUG) { System.out.println("InterfaceHeaderName1 ::= Modifiersopt interface..."); }  //$NON-NLS-1$
>+    case 208 : if (DEBUG) { System.out.println("InterfaceHeaderName1 ::= Modifiersopt interface..."); }  //$NON-NLS-1$
> 		    consumeInterfaceHeaderName1();  
> 			break;
>  
>-    case 207 : if (DEBUG) { System.out.println("InterfaceHeaderExtends ::= extends InterfaceTypeList"); }  //$NON-NLS-1$
>+    case 209 : if (DEBUG) { System.out.println("InterfaceHeaderExtends ::= extends InterfaceTypeList"); }  //$NON-NLS-1$
> 		    consumeInterfaceHeaderExtends();  
> 			break;
>  
>-    case 210 : if (DEBUG) { System.out.println("InterfaceMemberDeclarations ::=..."); }  //$NON-NLS-1$
>+    case 212 : if (DEBUG) { System.out.println("InterfaceMemberDeclarations ::=..."); }  //$NON-NLS-1$
> 		    consumeInterfaceMemberDeclarations();  
> 			break;
>  
>-    case 211 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
>+    case 213 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyTypeDeclaration();  
> 			break;
>  
>-    case 213 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
>+    case 215 : if (DEBUG) { System.out.println("InterfaceMemberDeclaration ::= MethodHeader MethodBody"); }  //$NON-NLS-1$
> 		    consumeInvalidMethodDeclaration();  
> 			break;
>  
>-    case 214 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
>+    case 216 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
> 		    consumeInvalidConstructorDeclaration(true);   
> 			break;
>  
>-    case 215 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
>+    case 217 : if (DEBUG) { System.out.println("InvalidConstructorDeclaration ::= ConstructorHeader..."); }  //$NON-NLS-1$
> 		    consumeInvalidConstructorDeclaration(false);   
> 			break;
>  
>-    case 226 : if (DEBUG) { System.out.println("PushLeftBrace ::="); }  //$NON-NLS-1$
>+    case 228 : if (DEBUG) { System.out.println("PushLeftBrace ::="); }  //$NON-NLS-1$
> 		    consumePushLeftBrace();  
> 			break;
>  
>-    case 227 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace ,opt RBRACE"); }  //$NON-NLS-1$
>+    case 229 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace ,opt RBRACE"); }  //$NON-NLS-1$
> 		    consumeEmptyArrayInitializer();  
> 			break;
>  
>-    case 228 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
>+    case 230 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
> 		    consumeArrayInitializer();  
> 			break;
>  
>-    case 229 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
>+    case 231 : if (DEBUG) { System.out.println("ArrayInitializer ::= LBRACE PushLeftBrace..."); }  //$NON-NLS-1$
> 		    consumeArrayInitializer();  
> 			break;
>  
>-    case 231 : if (DEBUG) { System.out.println("VariableInitializers ::= VariableInitializers COMMA..."); }  //$NON-NLS-1$
>+    case 233 : if (DEBUG) { System.out.println("VariableInitializers ::= VariableInitializers COMMA..."); }  //$NON-NLS-1$
> 		    consumeVariableInitializers();  
> 			break;
>  
>-    case 232 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
>+    case 234 : if (DEBUG) { System.out.println("Block ::= OpenBlock LBRACE BlockStatementsopt RBRACE"); }  //$NON-NLS-1$
> 		    consumeBlock();  
> 			break;
>  
>-    case 233 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
>+    case 235 : if (DEBUG) { System.out.println("OpenBlock ::="); }  //$NON-NLS-1$
> 		    consumeOpenBlock() ;  
> 			break;
>  
>-    case 235 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
>+    case 237 : if (DEBUG) { System.out.println("BlockStatements ::= BlockStatements BlockStatement"); }  //$NON-NLS-1$
> 		    consumeBlockStatements() ;  
> 			break;
>  
>-    case 239 : if (DEBUG) { System.out.println("BlockStatement ::= InterfaceDeclaration"); }  //$NON-NLS-1$
>+    case 241 : if (DEBUG) { System.out.println("BlockStatement ::= InterfaceDeclaration"); }  //$NON-NLS-1$
> 		    consumeInvalidInterfaceDeclaration();  
> 			break;
>  
>-    case 240 : if (DEBUG) { System.out.println("BlockStatement ::= AnnotationTypeDeclaration"); }  //$NON-NLS-1$
>+    case 242 : if (DEBUG) { System.out.println("BlockStatement ::= AnnotationTypeDeclaration"); }  //$NON-NLS-1$
> 		    consumeInvalidAnnotationTypeDeclaration();  
> 			break;
>  
>-    case 241 : if (DEBUG) { System.out.println("BlockStatement ::= EnumDeclaration"); }  //$NON-NLS-1$
>+    case 243 : if (DEBUG) { System.out.println("BlockStatement ::= EnumDeclaration"); }  //$NON-NLS-1$
> 		    consumeInvalidEnumDeclaration();  
> 			break;
>  
>-    case 242 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
>+    case 244 : if (DEBUG) { System.out.println("LocalVariableDeclarationStatement ::=..."); }  //$NON-NLS-1$
> 		    consumeLocalVariableDeclarationStatement();  
> 			break;
>  
>-    case 243 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Type PushModifiers..."); }  //$NON-NLS-1$
>+    case 245 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Type PushModifiers..."); }  //$NON-NLS-1$
> 		    consumeLocalVariableDeclaration();  
> 			break;
>  
>-    case 244 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Modifiers Type..."); }  //$NON-NLS-1$
>+    case 246 : if (DEBUG) { System.out.println("LocalVariableDeclaration ::= Modifiers Type..."); }  //$NON-NLS-1$
> 		    consumeLocalVariableDeclaration();  
> 			break;
>  
>-    case 245 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
>+    case 247 : if (DEBUG) { System.out.println("PushModifiers ::="); }  //$NON-NLS-1$
> 		    consumePushModifiers();  
> 			break;
>  
>-    case 246 : if (DEBUG) { System.out.println("PushModifiersForHeader ::="); }  //$NON-NLS-1$
>+    case 248 : if (DEBUG) { System.out.println("PushModifiersForHeader ::="); }  //$NON-NLS-1$
> 		    consumePushModifiersForHeader();  
> 			break;
>  
>-    case 247 : if (DEBUG) { System.out.println("PushRealModifiers ::="); }  //$NON-NLS-1$
>+    case 249 : if (DEBUG) { System.out.println("PushRealModifiers ::="); }  //$NON-NLS-1$
> 		    consumePushRealModifiers();  
> 			break;
>  
>-    case 273 : if (DEBUG) { System.out.println("EmptyStatement ::= SEMICOLON"); }  //$NON-NLS-1$
>+    case 275 : if (DEBUG) { System.out.println("EmptyStatement ::= SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeEmptyStatement();  
> 			break;
>  
>-    case 274 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
>+    case 276 : if (DEBUG) { System.out.println("LabeledStatement ::= Label COLON Statement"); }  //$NON-NLS-1$
> 		    consumeStatementLabel() ;  
> 			break;
>  
>-    case 275 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
>+    case 277 : if (DEBUG) { System.out.println("LabeledStatementNoShortIf ::= Label COLON..."); }  //$NON-NLS-1$
> 		    consumeStatementLabel() ;  
> 			break;
>  
>-    case 276 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
>+    case 278 : if (DEBUG) { System.out.println("Label ::= Identifier"); }  //$NON-NLS-1$
> 		    consumeLabel() ;  
> 			break;
>  
>-     case 277 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
>+     case 279 : if (DEBUG) { System.out.println("ExpressionStatement ::= StatementExpression SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeExpressionStatement();  
> 			break;
>  
>-    case 286 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 288 : if (DEBUG) { System.out.println("IfThenStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementIfNoElse();  
> 			break;
>  
>-    case 287 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 289 : if (DEBUG) { System.out.println("IfThenElseStatement ::= if LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementIfWithElse();  
> 			break;
>  
>-    case 288 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
>+    case 290 : if (DEBUG) { System.out.println("IfThenElseStatementNoShortIf ::= if LPAREN Expression..."); }  //$NON-NLS-1$
> 		    consumeStatementIfWithElse();  
> 			break;
>  
>-    case 289 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 291 : if (DEBUG) { System.out.println("SwitchStatement ::= switch LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementSwitch() ;  
> 			break;
>  
>-    case 290 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
>+    case 292 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE RBRACE"); }  //$NON-NLS-1$
> 		    consumeEmptySwitchBlock() ;  
> 			break;
>  
>-    case 293 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
>+    case 295 : if (DEBUG) { System.out.println("SwitchBlock ::= LBRACE SwitchBlockStatements..."); }  //$NON-NLS-1$
> 		    consumeSwitchBlock() ;  
> 			break;
>  
>-    case 295 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
>+    case 297 : if (DEBUG) { System.out.println("SwitchBlockStatements ::= SwitchBlockStatements..."); }  //$NON-NLS-1$
> 		    consumeSwitchBlockStatements() ;  
> 			break;
>  
>-    case 296 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
>+    case 298 : if (DEBUG) { System.out.println("SwitchBlockStatement ::= SwitchLabels BlockStatements"); }  //$NON-NLS-1$
> 		    consumeSwitchBlockStatement() ;  
> 			break;
>  
>-    case 298 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
>+    case 300 : if (DEBUG) { System.out.println("SwitchLabels ::= SwitchLabels SwitchLabel"); }  //$NON-NLS-1$
> 		    consumeSwitchLabels() ;  
> 			break;
>  
>-     case 299 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
>+     case 301 : if (DEBUG) { System.out.println("SwitchLabel ::= case ConstantExpression COLON"); }  //$NON-NLS-1$
> 		    consumeCaseLabel();  
> 			break;
>  
>-     case 300 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
>+     case 302 : if (DEBUG) { System.out.println("SwitchLabel ::= default COLON"); }  //$NON-NLS-1$
> 		    consumeDefaultLabel();  
> 			break;
>  
>-    case 301 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
>+    case 303 : if (DEBUG) { System.out.println("WhileStatement ::= while LPAREN Expression RPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementWhile() ;  
> 			break;
>  
>-    case 302 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
>+    case 304 : if (DEBUG) { System.out.println("WhileStatementNoShortIf ::= while LPAREN Expression..."); }  //$NON-NLS-1$
> 		    consumeStatementWhile() ;  
> 			break;
>  
>-    case 303 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
>+    case 305 : if (DEBUG) { System.out.println("DoStatement ::= do Statement while LPAREN Expression..."); }  //$NON-NLS-1$
> 		    consumeStatementDo() ;  
> 			break;
>  
>-    case 304 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
>+    case 306 : if (DEBUG) { System.out.println("ForStatement ::= for LPAREN ForInitopt SEMICOLON..."); }  //$NON-NLS-1$
> 		    consumeStatementFor() ;  
> 			break;
>  
>-    case 305 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
>+    case 307 : if (DEBUG) { System.out.println("ForStatementNoShortIf ::= for LPAREN ForInitopt..."); }  //$NON-NLS-1$
> 		    consumeStatementFor() ;  
> 			break;
>  
>-    case 306 : if (DEBUG) { System.out.println("ForInit ::= StatementExpressionList"); }  //$NON-NLS-1$
>+    case 308 : if (DEBUG) { System.out.println("ForInit ::= StatementExpressionList"); }  //$NON-NLS-1$
> 		    consumeForInit() ;  
> 			break;
>  
>-    case 310 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
>+    case 312 : if (DEBUG) { System.out.println("StatementExpressionList ::= StatementExpressionList..."); }  //$NON-NLS-1$
> 		    consumeStatementExpressionList() ;  
> 			break;
>  
>-    case 311 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression SEMICOLON"); }  //$NON-NLS-1$
>+    case 313 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeSimpleAssertStatement() ;  
> 			break;
>  
>-    case 312 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression COLON Expression"); }  //$NON-NLS-1$
>+    case 314 : if (DEBUG) { System.out.println("AssertStatement ::= assert Expression COLON Expression"); }  //$NON-NLS-1$
> 		    consumeAssertStatement() ;  
> 			break;
>  
>-    case 313 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
>+    case 315 : if (DEBUG) { System.out.println("BreakStatement ::= break SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementBreak() ;  
> 			break;
>  
>-    case 314 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
>+    case 316 : if (DEBUG) { System.out.println("BreakStatement ::= break Identifier SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementBreakWithLabel() ;  
> 			break;
>  
>-    case 315 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
>+    case 317 : if (DEBUG) { System.out.println("ContinueStatement ::= continue SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementContinue() ;  
> 			break;
>  
>-    case 316 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
>+    case 318 : if (DEBUG) { System.out.println("ContinueStatement ::= continue Identifier SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementContinueWithLabel() ;  
> 			break;
>  
>-    case 317 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
>+    case 319 : if (DEBUG) { System.out.println("ReturnStatement ::= return Expressionopt SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementReturn() ;  
> 			break;
>  
>-    case 318 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
>+    case 320 : if (DEBUG) { System.out.println("ThrowStatement ::= throw Expression SEMICOLON"); }  //$NON-NLS-1$
> 		    consumeStatementThrow();  
> 			break;
>  
>-    case 319 : if (DEBUG) { System.out.println("SynchronizedStatement ::= OnlySynchronized LPAREN..."); }  //$NON-NLS-1$
>+    case 321 : if (DEBUG) { System.out.println("SynchronizedStatement ::= OnlySynchronized LPAREN..."); }  //$NON-NLS-1$
> 		    consumeStatementSynchronized();  
> 			break;
>  
>-    case 320 : if (DEBUG) { System.out.println("OnlySynchronized ::= synchronized"); }  //$NON-NLS-1$
>+    case 322 : if (DEBUG) { System.out.println("OnlySynchronized ::= synchronized"); }  //$NON-NLS-1$
> 		    consumeOnlySynchronized();  
> 			break;
>  
>-    case 321 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
>+    case 323 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catches"); }  //$NON-NLS-1$
> 		    consumeStatementTry(false);  
> 			break;
>  
>-    case 322 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
>+    case 324 : if (DEBUG) { System.out.println("TryStatement ::= try TryBlock Catchesopt Finally"); }  //$NON-NLS-1$
> 		    consumeStatementTry(true);  
> 			break;
>  
>-    case 324 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
>+    case 326 : if (DEBUG) { System.out.println("ExitTryBlock ::="); }  //$NON-NLS-1$
> 		    consumeExitTryBlock();  
> 			break;
>  
>-    case 326 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
>+    case 328 : if (DEBUG) { System.out.println("Catches ::= Catches CatchClause"); }  //$NON-NLS-1$
> 		    consumeCatches();  
> 			break;
>  
>-    case 327 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN FormalParameter RPAREN..."); }  //$NON-NLS-1$
>+    case 329 : if (DEBUG) { System.out.println("CatchClause ::= catch LPAREN CatchFormalParameter RPAREN"); }  //$NON-NLS-1$
> 		    consumeStatementCatch() ;  
> 			break;
>  
>-    case 329 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
>+    case 331 : if (DEBUG) { System.out.println("PushLPAREN ::= LPAREN"); }  //$NON-NLS-1$
> 		    consumeLeftParen();  
> 			break;
>  
>-    case 330 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
>+    case 332 : if (DEBUG) { System.out.println("PushRPAREN ::= RPAREN"); }  //$NON-NLS-1$
> 		    consumeRightParen();  
> 			break;
>  
>-    case 335 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
>+    case 337 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= this"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayThis();  
> 			break;
>  
>-    case 336 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression_NotName..."); }  //$NON-NLS-1$
>+    case 338 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Expression_NotName..."); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArray();  
> 			break;
>  
>-    case 337 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Name PushRPAREN"); }  //$NON-NLS-1$
>+    case 339 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PushLPAREN Name PushRPAREN"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayWithName();  
> 			break;
>  
>-    case 340 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT this"); }  //$NON-NLS-1$
>+    case 342 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT this"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayNameThis();  
> 			break;
>  
>-    case 341 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT super"); }  //$NON-NLS-1$
>+    case 343 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT super"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayNameSuper();  
> 			break;
>  
>-    case 342 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT class"); }  //$NON-NLS-1$
>+    case 344 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayName();  
> 			break;
>  
>-    case 343 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name Dims DOT class"); }  //$NON-NLS-1$
>+    case 345 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= Name Dims DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayArrayType();  
> 			break;
>  
>-    case 344 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType Dims DOT class"); }  //$NON-NLS-1$
>+    case 346 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType Dims DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayPrimitiveArrayType();  
> 			break;
>  
>-    case 345 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType DOT class"); }  //$NON-NLS-1$
>+    case 347 : if (DEBUG) { System.out.println("PrimaryNoNewArray ::= PrimitiveType DOT class"); }  //$NON-NLS-1$
> 		    consumePrimaryNoNewArrayPrimitiveType();  
> 			break;
>  
>-    case 348 : if (DEBUG) { System.out.println("AllocationHeader ::= new ClassType LPAREN..."); }  //$NON-NLS-1$
>+    case 350 : if (DEBUG) { System.out.println("AllocationHeader ::= new ClassType LPAREN..."); }  //$NON-NLS-1$
> 		    consumeAllocationHeader();  
> 			break;
>  
>-    case 349 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new..."); }  //$NON-NLS-1$
>+    case 351 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionWithTypeArguments();  
> 			break;
>  
>-    case 350 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new ClassType LPAREN"); }  //$NON-NLS-1$
>+    case 352 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= new ClassType LPAREN"); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpression();  
> 			break;
>  
>-    case 351 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
>+    case 353 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;  
> 			break;
>  
>-    case 352 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
>+    case 354 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::= Primary DOT new..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualified() ;  
> 			break;
>  
>-    case 353 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
>+    case 355 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualified() ;  
> 			break;
>  
>-    case 354 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
>+    case 356 : if (DEBUG) { System.out.println("ClassInstanceCreationExpression ::=..."); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ;  
> 			break;
>  
>-    case 355 : if (DEBUG) { System.out.println("ClassInstanceCreationExpressionName ::= Name DOT"); }  //$NON-NLS-1$
>+    case 357 : if (DEBUG) { System.out.println("ClassInstanceCreationExpressionName ::= Name DOT"); }  //$NON-NLS-1$
> 		    consumeClassInstanceCreationExpressionName() ;  
> 			break;
>  
>-    case 356 : if (DEBUG) { System.out.println("UnqualifiedClassBodyopt ::="); }  //$NON-NLS-1$
>+    case 358 : if (DEBUG) { System.out.println("UnqualifiedClassBodyopt ::="); }  //$NON-NLS-1$
> 		    consumeClassBodyopt();  
> 			break;
>  
>-    case 358 : if (DEBUG) { System.out.println("UnqualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>+    case 360 : if (DEBUG) { System.out.println("UnqualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
> 		    consumeEnterAnonymousClassBody(false);  
> 			break;
>  
>-    case 359 : if (DEBUG) { System.out.println("QualifiedClassBodyopt ::="); }  //$NON-NLS-1$
>+    case 361 : if (DEBUG) { System.out.println("QualifiedClassBodyopt ::="); }  //$NON-NLS-1$
> 		    consumeClassBodyopt();  
> 			break;
>  
>-    case 361 : if (DEBUG) { System.out.println("QualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
>+    case 363 : if (DEBUG) { System.out.println("QualifiedEnterAnonymousClassBody ::="); }  //$NON-NLS-1$
> 		    consumeEnterAnonymousClassBody(true);  
> 			break;
>  
>-    case 363 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA Expression"); }  //$NON-NLS-1$
>+    case 365 : if (DEBUG) { System.out.println("ArgumentList ::= ArgumentList COMMA Expression"); }  //$NON-NLS-1$
> 		    consumeArgumentList();  
> 			break;
>  
>-    case 364 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new PrimitiveType..."); }  //$NON-NLS-1$
>+    case 366 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new PrimitiveType..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationHeader();  
> 			break;
>  
>-    case 365 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new ClassOrInterfaceType..."); }  //$NON-NLS-1$
>+    case 367 : if (DEBUG) { System.out.println("ArrayCreationHeader ::= new ClassOrInterfaceType..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationHeader();  
> 			break;
>  
>-    case 366 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+    case 368 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithoutInitializer();  
> 			break;
>  
>-    case 367 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new PrimitiveType"); }  //$NON-NLS-1$
>+    case 369 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new PrimitiveType"); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithInitializer();  
> 			break;
>  
>-    case 368 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+    case 370 : if (DEBUG) { System.out.println("ArrayCreationWithoutArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithoutInitializer();  
> 			break;
>  
>-    case 369 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
>+    case 371 : if (DEBUG) { System.out.println("ArrayCreationWithArrayInitializer ::= new..."); }  //$NON-NLS-1$
> 		    consumeArrayCreationExpressionWithInitializer();  
> 			break;
>  
>-    case 371 : if (DEBUG) { System.out.println("DimWithOrWithOutExprs ::= DimWithOrWithOutExprs..."); }  //$NON-NLS-1$
>+    case 373 : if (DEBUG) { System.out.println("DimWithOrWithOutExprs ::= DimWithOrWithOutExprs..."); }  //$NON-NLS-1$
> 		    consumeDimWithOrWithOutExprs();  
> 			break;
>  
>-     case 373 : if (DEBUG) { System.out.println("DimWithOrWithOutExpr ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+     case 375 : if (DEBUG) { System.out.println("DimWithOrWithOutExpr ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
> 		    consumeDimWithOrWithOutExpr();  
> 			break;
>  
>-     case 374 : if (DEBUG) { System.out.println("Dims ::= DimsLoop"); }  //$NON-NLS-1$
>+     case 376 : if (DEBUG) { System.out.println("Dims ::= DimsLoop"); }  //$NON-NLS-1$
> 		    consumeDims();  
> 			break;
>  
>-     case 377 : if (DEBUG) { System.out.println("OneDimLoop ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
>+     case 379 : if (DEBUG) { System.out.println("OneDimLoop ::= LBRACKET RBRACKET"); }  //$NON-NLS-1$
> 		    consumeOneDimLoop();  
> 			break;
>  
>-    case 378 : if (DEBUG) { System.out.println("FieldAccess ::= Primary DOT Identifier"); }  //$NON-NLS-1$
>+    case 380 : if (DEBUG) { System.out.println("FieldAccess ::= Primary DOT Identifier"); }  //$NON-NLS-1$
> 		    consumeFieldAccess(false);  
> 			break;
>  
>-    case 379 : if (DEBUG) { System.out.println("FieldAccess ::= super DOT Identifier"); }  //$NON-NLS-1$
>+    case 381 : if (DEBUG) { System.out.println("FieldAccess ::= super DOT Identifier"); }  //$NON-NLS-1$
> 		    consumeFieldAccess(true);  
> 			break;
>  
>-    case 380 : if (DEBUG) { System.out.println("MethodInvocation ::= Name LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>+    case 382 : if (DEBUG) { System.out.println("MethodInvocation ::= Name LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
> 		    consumeMethodInvocationName();  
> 			break;
>  
>-    case 381 : if (DEBUG) { System.out.println("MethodInvocation ::= Name DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 383 : if (DEBUG) { System.out.println("MethodInvocation ::= Name DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationNameWithTypeArguments();  
> 			break;
>  
>-    case 382 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 384 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationPrimaryWithTypeArguments();  
> 			break;
>  
>-    case 383 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>+    case 385 : if (DEBUG) { System.out.println("MethodInvocation ::= Primary DOT Identifier LPAREN..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationPrimary();  
> 			break;
>  
>-    case 384 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
>+    case 386 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT OnlyTypeArguments..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationSuperWithTypeArguments();  
> 			break;
>  
>-    case 385 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT Identifier LPAREN..."); }  //$NON-NLS-1$
>+    case 387 : if (DEBUG) { System.out.println("MethodInvocation ::= super DOT Identifier LPAREN..."); }  //$NON-NLS-1$
> 		    consumeMethodInvocationSuper();  
> 			break;
>  
>-    case 386 : if (DEBUG) { System.out.println("ArrayAccess ::= Name LBRACKET Expression RBRACKET"); }  //$NON-NLS-1$
>+    case 388 : if (DEBUG) { System.out.println("ArrayAccess ::= Name LBRACKET Expression RBRACKET"); }  //$NON-NLS-1$
> 		    consumeArrayAccess(true);  
> 			break;
>  
>-    case 387 : if (DEBUG) { System.out.println("ArrayAccess ::= PrimaryNoNewArray LBRACKET Expression..."); }  //$NON-NLS-1$
>+    case 389 : if (DEBUG) { System.out.println("ArrayAccess ::= PrimaryNoNewArray LBRACKET Expression..."); }  //$NON-NLS-1$
> 		    consumeArrayAccess(false);  
> 			break;
>  
>-    case 388 : if (DEBUG) { System.out.println("ArrayAccess ::= ArrayCreationWithArrayInitializer..."); }  //$NON-NLS-1$
>+    case 390 : if (DEBUG) { System.out.println("ArrayAccess ::= ArrayCreationWithArrayInitializer..."); }  //$NON-NLS-1$
> 		    consumeArrayAccess(false);  
> 			break;
>  
>-    case 390 : if (DEBUG) { System.out.println("PostfixExpression ::= Name"); }  //$NON-NLS-1$
>+    case 392 : if (DEBUG) { System.out.println("PostfixExpression ::= Name"); }  //$NON-NLS-1$
> 		    consumePostfixExpression();  
> 			break;
>  
>-    case 393 : if (DEBUG) { System.out.println("PostIncrementExpression ::= PostfixExpression PLUS_PLUS"); }  //$NON-NLS-1$
>+    case 395 : if (DEBUG) { System.out.println("PostIncrementExpression ::= PostfixExpression PLUS_PLUS"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS,true);  
> 			break;
>  
>-    case 394 : if (DEBUG) { System.out.println("PostDecrementExpression ::= PostfixExpression..."); }  //$NON-NLS-1$
>+    case 396 : if (DEBUG) { System.out.println("PostDecrementExpression ::= PostfixExpression..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS,true);  
> 			break;
>  
>-    case 395 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
>+    case 397 : if (DEBUG) { System.out.println("PushPosition ::="); }  //$NON-NLS-1$
> 		    consumePushPosition();  
> 			break;
>  
>-    case 398 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>+    case 400 : if (DEBUG) { System.out.println("UnaryExpression ::= PLUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 399 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
>+    case 401 : if (DEBUG) { System.out.println("UnaryExpression ::= MINUS PushPosition UnaryExpression"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 401 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
>+    case 403 : if (DEBUG) { System.out.println("PreIncrementExpression ::= PLUS_PLUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS,false);  
> 			break;
>  
>-    case 402 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
>+    case 404 : if (DEBUG) { System.out.println("PreDecrementExpression ::= MINUS_MINUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS,false);  
> 			break;
>  
>-    case 404 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
>+    case 406 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= TWIDDLE PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
> 			break;
>  
>-    case 405 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
>+    case 407 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus ::= NOT PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.NOT);  
> 			break;
>  
>-    case 407 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN PrimitiveType Dimsopt..."); }  //$NON-NLS-1$
>+    case 409 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN PrimitiveType Dimsopt..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithPrimitiveType();  
> 			break;
>  
>-    case 408 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+    case 410 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithGenericsArray();  
> 			break;
>  
>-    case 409 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
>+    case 411 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithQualifiedGenericsArray();  
> 			break;
>  
>-    case 410 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name PushRPAREN..."); }  //$NON-NLS-1$
>+    case 412 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name PushRPAREN..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionLL1();  
> 			break;
>  
>-    case 411 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name Dims PushRPAREN..."); }  //$NON-NLS-1$
>+    case 413 : if (DEBUG) { System.out.println("CastExpression ::= PushLPAREN Name Dims PushRPAREN..."); }  //$NON-NLS-1$
> 		    consumeCastExpressionWithNameArray();  
> 			break;
>  
>-    case 412 : if (DEBUG) { System.out.println("OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments"); }  //$NON-NLS-1$
>+    case 414 : if (DEBUG) { System.out.println("OnlyTypeArgumentsForCastExpression ::= OnlyTypeArguments"); }  //$NON-NLS-1$
> 		    consumeOnlyTypeArgumentsForCastExpression();  
> 			break;
>  
>-    case 413 : if (DEBUG) { System.out.println("InsideCastExpression ::="); }  //$NON-NLS-1$
>+    case 415 : if (DEBUG) { System.out.println("InsideCastExpression ::="); }  //$NON-NLS-1$
> 		    consumeInsideCastExpression();  
> 			break;
>  
>-    case 414 : if (DEBUG) { System.out.println("InsideCastExpressionLL1 ::="); }  //$NON-NLS-1$
>+    case 416 : if (DEBUG) { System.out.println("InsideCastExpressionLL1 ::="); }  //$NON-NLS-1$
> 		    consumeInsideCastExpressionLL1();  
> 			break;
>  
>-    case 415 : if (DEBUG) { System.out.println("InsideCastExpressionWithQualifiedGenerics ::="); }  //$NON-NLS-1$
>+    case 417 : if (DEBUG) { System.out.println("InsideCastExpressionWithQualifiedGenerics ::="); }  //$NON-NLS-1$
> 		    consumeInsideCastExpressionWithQualifiedGenerics();  
> 			break;
>  
>-    case 417 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+    case 419 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
> 			break;
>  
>-    case 418 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+    case 420 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.DIVIDE);  
> 			break;
>  
>-    case 419 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
>+    case 421 : if (DEBUG) { System.out.println("MultiplicativeExpression ::= MultiplicativeExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.REMAINDER);  
> 			break;
>  
>-    case 421 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
>+    case 423 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression PLUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 422 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
>+    case 424 : if (DEBUG) { System.out.println("AdditiveExpression ::= AdditiveExpression MINUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 424 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
>+    case 426 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression LEFT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
> 			break;
>  
>-    case 425 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+    case 427 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression RIGHT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
> 			break;
>  
>-    case 426 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 428 : if (DEBUG) { System.out.println("ShiftExpression ::= ShiftExpression UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 428 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
>+    case 430 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS);  
> 			break;
>  
>-    case 429 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
>+    case 431 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression GREATER..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER);  
> 			break;
>  
>-    case 430 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
>+    case 432 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression LESS_EQUAL"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
> 			break;
>  
>-    case 431 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
>+    case 433 : if (DEBUG) { System.out.println("RelationalExpression ::= RelationalExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
> 			break;
>  
>-    case 433 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
>+    case 435 : if (DEBUG) { System.out.println("InstanceofExpression ::= InstanceofExpression instanceof"); }  //$NON-NLS-1$
> 		    consumeInstanceOfExpression();  
> 			break;
>  
>-    case 435 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
>+    case 437 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression EQUAL_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
> 			break;
>  
>-    case 436 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
>+    case 438 : if (DEBUG) { System.out.println("EqualityExpression ::= EqualityExpression NOT_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
> 			break;
>  
>-    case 438 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
>+    case 440 : if (DEBUG) { System.out.println("AndExpression ::= AndExpression AND EqualityExpression"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND);  
> 			break;
>  
>-    case 440 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
>+    case 442 : if (DEBUG) { System.out.println("ExclusiveOrExpression ::= ExclusiveOrExpression XOR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.XOR);  
> 			break;
>  
>-    case 442 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
>+    case 444 : if (DEBUG) { System.out.println("InclusiveOrExpression ::= InclusiveOrExpression OR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR);  
> 			break;
>  
>-    case 444 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
>+    case 446 : if (DEBUG) { System.out.println("ConditionalAndExpression ::= ConditionalAndExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND_AND);  
> 			break;
>  
>-    case 446 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>+    case 448 : if (DEBUG) { System.out.println("ConditionalOrExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR_OR);  
> 			break;
>  
>-    case 448 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
>+    case 450 : if (DEBUG) { System.out.println("ConditionalExpression ::= ConditionalOrExpression..."); }  //$NON-NLS-1$
> 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>  
>-    case 451 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
>+    case 453 : if (DEBUG) { System.out.println("Assignment ::= PostfixExpression AssignmentOperator..."); }  //$NON-NLS-1$
> 		    consumeAssignment();  
> 			break;
>  
>-    case 453 : if (DEBUG) { System.out.println("Assignment ::= InvalidArrayInitializerAssignement"); }  //$NON-NLS-1$
>+    case 455 : if (DEBUG) { System.out.println("Assignment ::= InvalidArrayInitializerAssignement"); }  //$NON-NLS-1$
> 		    ignoreExpressionAssignment(); 
> 			break;
>  
>-    case 454 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
>+    case 456 : if (DEBUG) { System.out.println("AssignmentOperator ::= EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(EQUAL);  
> 			break;
>  
>-    case 455 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
>+    case 457 : if (DEBUG) { System.out.println("AssignmentOperator ::= MULTIPLY_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(MULTIPLY);  
> 			break;
>  
>-    case 456 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
>+    case 458 : if (DEBUG) { System.out.println("AssignmentOperator ::= DIVIDE_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(DIVIDE);  
> 			break;
>  
>-    case 457 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
>+    case 459 : if (DEBUG) { System.out.println("AssignmentOperator ::= REMAINDER_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(REMAINDER);  
> 			break;
>  
>-    case 458 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
>+    case 460 : if (DEBUG) { System.out.println("AssignmentOperator ::= PLUS_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(PLUS);  
> 			break;
>  
>-    case 459 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
>+    case 461 : if (DEBUG) { System.out.println("AssignmentOperator ::= MINUS_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(MINUS);  
> 			break;
>  
>-    case 460 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+    case 462 : if (DEBUG) { System.out.println("AssignmentOperator ::= LEFT_SHIFT_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(LEFT_SHIFT);  
> 			break;
>  
>-    case 461 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+    case 463 : if (DEBUG) { System.out.println("AssignmentOperator ::= RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(RIGHT_SHIFT);  
> 			break;
>  
>-    case 462 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
>+    case 464 : if (DEBUG) { System.out.println("AssignmentOperator ::= UNSIGNED_RIGHT_SHIFT_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 463 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
>+    case 465 : if (DEBUG) { System.out.println("AssignmentOperator ::= AND_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(AND);  
> 			break;
>  
>-    case 464 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
>+    case 466 : if (DEBUG) { System.out.println("AssignmentOperator ::= XOR_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(XOR);  
> 			break;
>  
>-    case 465 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
>+    case 467 : if (DEBUG) { System.out.println("AssignmentOperator ::= OR_EQUAL"); }  //$NON-NLS-1$
> 		    consumeAssignmentOperator(OR);  
> 			break;
>  
>-    case 469 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
>+    case 471 : if (DEBUG) { System.out.println("Expressionopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyExpression();  
> 			break;
>  
>-    case 474 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>+    case 476 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyClassBodyDeclarationsopt();  
> 			break;
>  
>-    case 475 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+    case 477 : if (DEBUG) { System.out.println("ClassBodyDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
> 		    consumeClassBodyDeclarationsopt();  
> 			break;
>  
>-     case 476 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
>+     case 478 : if (DEBUG) { System.out.println("Modifiersopt ::="); }  //$NON-NLS-1$
> 		    consumeDefaultModifiers();  
> 			break;
>  
>-    case 477 : if (DEBUG) { System.out.println("Modifiersopt ::= Modifiers"); }  //$NON-NLS-1$
>+    case 479 : if (DEBUG) { System.out.println("Modifiersopt ::= Modifiers"); }  //$NON-NLS-1$
> 		    consumeModifiers();  
> 			break;
>  
>-    case 478 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
>+    case 480 : if (DEBUG) { System.out.println("BlockStatementsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyBlockStatementsopt();  
> 			break;
>  
>-     case 480 : if (DEBUG) { System.out.println("Dimsopt ::="); }  //$NON-NLS-1$
>+     case 482 : if (DEBUG) { System.out.println("Dimsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyDimsopt();  
> 			break;
>  
>-     case 482 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
>+     case 484 : if (DEBUG) { System.out.println("ArgumentListopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyArgumentListopt();  
> 			break;
>  
>-    case 486 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
>+    case 488 : if (DEBUG) { System.out.println("FormalParameterListopt ::="); }  //$NON-NLS-1$
> 		    consumeFormalParameterListopt();  
> 			break;
>  
>-     case 490 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>+     case 492 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyInterfaceMemberDeclarationsopt();  
> 			break;
>  
>-     case 491 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+     case 493 : if (DEBUG) { System.out.println("InterfaceMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
> 		    consumeInterfaceMemberDeclarationsopt();  
> 			break;
>  
>-    case 492 : if (DEBUG) { System.out.println("NestedType ::="); }  //$NON-NLS-1$
>+    case 494 : if (DEBUG) { System.out.println("NestedType ::="); }  //$NON-NLS-1$
> 		    consumeNestedType();  
> 			break;
> 
>-     case 493 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
>+     case 495 : if (DEBUG) { System.out.println("ForInitopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyForInitopt();  
> 			break;
>  
>-     case 495 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
>+     case 497 : if (DEBUG) { System.out.println("ForUpdateopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyForUpdateopt();  
> 			break;
>  
>-     case 499 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
>+     case 501 : if (DEBUG) { System.out.println("Catchesopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyCatchesopt();  
> 			break;
>  
>-     case 501 : if (DEBUG) { System.out.println("EnumDeclaration ::= EnumHeader EnumBody"); }  //$NON-NLS-1$
>+     case 503 : if (DEBUG) { System.out.println("EnumDeclaration ::= EnumHeader EnumBody"); }  //$NON-NLS-1$
> 		    consumeEnumDeclaration();  
> 			break;
>  
>-     case 502 : if (DEBUG) { System.out.println("EnumHeader ::= EnumHeaderName ClassHeaderImplementsopt"); }  //$NON-NLS-1$
>+     case 504 : if (DEBUG) { System.out.println("EnumHeader ::= EnumHeaderName ClassHeaderImplementsopt"); }  //$NON-NLS-1$
> 		    consumeEnumHeader();  
> 			break;
>  
>-     case 503 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier"); }  //$NON-NLS-1$
>+     case 505 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier"); }  //$NON-NLS-1$
> 		    consumeEnumHeaderName();  
> 			break;
>  
>-     case 504 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier..."); }  //$NON-NLS-1$
>+     case 506 : if (DEBUG) { System.out.println("EnumHeaderName ::= Modifiersopt enum Identifier..."); }  //$NON-NLS-1$
> 		    consumeEnumHeaderNameWithTypeParameters();  
> 			break;
>  
>-     case 505 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumBodyDeclarationsopt RBRACE"); }  //$NON-NLS-1$
>+     case 507 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumBodyDeclarationsopt RBRACE"); }  //$NON-NLS-1$
> 		    consumeEnumBodyNoConstants();  
> 			break;
>  
>-     case 506 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE COMMA EnumBodyDeclarationsopt..."); }  //$NON-NLS-1$
>+     case 508 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE COMMA EnumBodyDeclarationsopt..."); }  //$NON-NLS-1$
> 		    consumeEnumBodyNoConstants();  
> 			break;
>  
>-     case 507 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants COMMA..."); }  //$NON-NLS-1$
>+     case 509 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants COMMA..."); }  //$NON-NLS-1$
> 		    consumeEnumBodyWithConstants();  
> 			break;
>  
>-     case 508 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants..."); }  //$NON-NLS-1$
>+     case 510 : if (DEBUG) { System.out.println("EnumBody ::= LBRACE EnumConstants..."); }  //$NON-NLS-1$
> 		    consumeEnumBodyWithConstants();  
> 			break;
>  
>-    case 510 : if (DEBUG) { System.out.println("EnumConstants ::= EnumConstants COMMA EnumConstant"); }  //$NON-NLS-1$
>+    case 512 : if (DEBUG) { System.out.println("EnumConstants ::= EnumConstants COMMA EnumConstant"); }  //$NON-NLS-1$
> 		    consumeEnumConstants();  
> 			break;
>  
>-    case 511 : if (DEBUG) { System.out.println("EnumConstantHeaderName ::= Modifiersopt Identifier"); }  //$NON-NLS-1$
>+    case 513 : if (DEBUG) { System.out.println("EnumConstantHeaderName ::= Modifiersopt Identifier"); }  //$NON-NLS-1$
> 		    consumeEnumConstantHeaderName();  
> 			break;
>  
>-    case 512 : if (DEBUG) { System.out.println("EnumConstantHeader ::= EnumConstantHeaderName..."); }  //$NON-NLS-1$
>+    case 514 : if (DEBUG) { System.out.println("EnumConstantHeader ::= EnumConstantHeaderName..."); }  //$NON-NLS-1$
> 		    consumeEnumConstantHeader();  
> 			break;
>  
>-    case 513 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader ForceNoDiet..."); }  //$NON-NLS-1$
>+    case 515 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader ForceNoDiet..."); }  //$NON-NLS-1$
> 		    consumeEnumConstantWithClassBody();  
> 			break;
>  
>-    case 514 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader"); }  //$NON-NLS-1$
>+    case 516 : if (DEBUG) { System.out.println("EnumConstant ::= EnumConstantHeader"); }  //$NON-NLS-1$
> 		    consumeEnumConstantNoClassBody();  
> 			break;
>  
>-    case 515 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
>+    case 517 : if (DEBUG) { System.out.println("Arguments ::= LPAREN ArgumentListopt RPAREN"); }  //$NON-NLS-1$
> 		    consumeArguments();  
> 			break;
>  
>-    case 516 : if (DEBUG) { System.out.println("Argumentsopt ::="); }  //$NON-NLS-1$
>+    case 518 : if (DEBUG) { System.out.println("Argumentsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyArguments();  
> 			break;
>  
>-    case 518 : if (DEBUG) { System.out.println("EnumDeclarations ::= SEMICOLON ClassBodyDeclarationsopt"); }  //$NON-NLS-1$
>+    case 520 : if (DEBUG) { System.out.println("EnumDeclarations ::= SEMICOLON ClassBodyDeclarationsopt"); }  //$NON-NLS-1$
> 		    consumeEnumDeclarations();  
> 			break;
>  
>-    case 519 : if (DEBUG) { System.out.println("EnumBodyDeclarationsopt ::="); }  //$NON-NLS-1$
>+    case 521 : if (DEBUG) { System.out.println("EnumBodyDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyEnumDeclarations();  
> 			break;
>  
>-    case 521 : if (DEBUG) { System.out.println("EnhancedForStatement ::= EnhancedForStatementHeader..."); }  //$NON-NLS-1$
>+    case 523 : if (DEBUG) { System.out.println("EnhancedForStatement ::= EnhancedForStatementHeader..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatement();  
> 			break;
>  
>-    case 522 : if (DEBUG) { System.out.println("EnhancedForStatementNoShortIf ::=..."); }  //$NON-NLS-1$
>+    case 524 : if (DEBUG) { System.out.println("EnhancedForStatementNoShortIf ::=..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatement();  
> 			break;
>  
>-    case 523 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Type..."); }  //$NON-NLS-1$
>+    case 525 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Type..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatementHeaderInit(false);  
> 			break;
>  
>-    case 524 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Modifiers"); }  //$NON-NLS-1$
>+    case 526 : if (DEBUG) { System.out.println("EnhancedForStatementHeaderInit ::= for LPAREN Modifiers"); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatementHeaderInit(true);  
> 			break;
>  
>-    case 525 : if (DEBUG) { System.out.println("EnhancedForStatementHeader ::=..."); }  //$NON-NLS-1$
>+    case 527 : if (DEBUG) { System.out.println("EnhancedForStatementHeader ::=..."); }  //$NON-NLS-1$
> 		    consumeEnhancedForStatementHeader();  
> 			break;
>  
>-    case 526 : if (DEBUG) { System.out.println("SingleStaticImportDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 528 : if (DEBUG) { System.out.println("SingleStaticImportDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 527 : if (DEBUG) { System.out.println("SingleStaticImportDeclarationName ::= import static Name"); }  //$NON-NLS-1$
>+    case 529 : if (DEBUG) { System.out.println("SingleStaticImportDeclarationName ::= import static Name"); }  //$NON-NLS-1$
> 		    consumeSingleStaticImportDeclarationName();  
> 			break;
>  
>-    case 528 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 530 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeImportDeclaration();  
> 			break;
>  
>-    case 529 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclarationName ::= import static..."); }  //$NON-NLS-1$
>+    case 531 : if (DEBUG) { System.out.println("StaticImportOnDemandDeclarationName ::= import static..."); }  //$NON-NLS-1$
> 		    consumeStaticImportOnDemandDeclarationName();  
> 			break;
>  
>-    case 530 : if (DEBUG) { System.out.println("TypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>+    case 532 : if (DEBUG) { System.out.println("TypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
> 		    consumeTypeArguments();  
> 			break;
>  
>-    case 531 : if (DEBUG) { System.out.println("OnlyTypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
>+    case 533 : if (DEBUG) { System.out.println("OnlyTypeArguments ::= LESS TypeArgumentList1"); }  //$NON-NLS-1$
> 		    consumeOnlyTypeArguments();  
> 			break;
>  
>-    case 533 : if (DEBUG) { System.out.println("TypeArgumentList1 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+    case 535 : if (DEBUG) { System.out.println("TypeArgumentList1 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList1();  
> 			break;
>  
>-    case 535 : if (DEBUG) { System.out.println("TypeArgumentList ::= TypeArgumentList COMMA TypeArgument"); }  //$NON-NLS-1$
>+    case 537 : if (DEBUG) { System.out.println("TypeArgumentList ::= TypeArgumentList COMMA TypeArgument"); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList();  
> 			break;
>  
>-    case 536 : if (DEBUG) { System.out.println("TypeArgument ::= ReferenceType"); }  //$NON-NLS-1$
>+    case 538 : if (DEBUG) { System.out.println("TypeArgument ::= ReferenceType"); }  //$NON-NLS-1$
> 		    consumeTypeArgument();  
> 			break;
>  
>-    case 540 : if (DEBUG) { System.out.println("ReferenceType1 ::= ReferenceType GREATER"); }  //$NON-NLS-1$
>+    case 542 : if (DEBUG) { System.out.println("ReferenceType1 ::= ReferenceType GREATER"); }  //$NON-NLS-1$
> 		    consumeReferenceType1();  
> 			break;
>  
>-    case 541 : if (DEBUG) { System.out.println("ReferenceType1 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+    case 543 : if (DEBUG) { System.out.println("ReferenceType1 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentReferenceType1();  
> 			break;
>  
>-    case 543 : if (DEBUG) { System.out.println("TypeArgumentList2 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+    case 545 : if (DEBUG) { System.out.println("TypeArgumentList2 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList2();  
> 			break;
>  
>-    case 546 : if (DEBUG) { System.out.println("ReferenceType2 ::= ReferenceType RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 548 : if (DEBUG) { System.out.println("ReferenceType2 ::= ReferenceType RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeReferenceType2();  
> 			break;
>  
>-    case 547 : if (DEBUG) { System.out.println("ReferenceType2 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
>+    case 549 : if (DEBUG) { System.out.println("ReferenceType2 ::= ClassOrInterface LESS..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentReferenceType2();  
> 			break;
>  
>-    case 549 : if (DEBUG) { System.out.println("TypeArgumentList3 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
>+    case 551 : if (DEBUG) { System.out.println("TypeArgumentList3 ::= TypeArgumentList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeArgumentList3();  
> 			break;
>  
>-    case 552 : if (DEBUG) { System.out.println("ReferenceType3 ::= ReferenceType UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 554 : if (DEBUG) { System.out.println("ReferenceType3 ::= ReferenceType UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeReferenceType3();  
> 			break;
>  
>-    case 553 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION"); }  //$NON-NLS-1$
>+    case 555 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION"); }  //$NON-NLS-1$
> 		    consumeWildcard();  
> 			break;
>  
>-    case 554 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION WildcardBounds"); }  //$NON-NLS-1$
>+    case 556 : if (DEBUG) { System.out.println("Wildcard ::= QUESTION WildcardBounds"); }  //$NON-NLS-1$
> 		    consumeWildcardWithBounds();  
> 			break;
>  
>-    case 555 : if (DEBUG) { System.out.println("WildcardBounds ::= extends ReferenceType"); }  //$NON-NLS-1$
>+    case 557 : if (DEBUG) { System.out.println("WildcardBounds ::= extends ReferenceType"); }  //$NON-NLS-1$
> 		    consumeWildcardBoundsExtends();  
> 			break;
>  
>-    case 556 : if (DEBUG) { System.out.println("WildcardBounds ::= super ReferenceType"); }  //$NON-NLS-1$
>+    case 558 : if (DEBUG) { System.out.println("WildcardBounds ::= super ReferenceType"); }  //$NON-NLS-1$
> 		    consumeWildcardBoundsSuper();  
> 			break;
>  
>-    case 557 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION GREATER"); }  //$NON-NLS-1$
>+    case 559 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION GREATER"); }  //$NON-NLS-1$
> 		    consumeWildcard1();  
> 			break;
>  
>-    case 558 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION WildcardBounds1"); }  //$NON-NLS-1$
>+    case 560 : if (DEBUG) { System.out.println("Wildcard1 ::= QUESTION WildcardBounds1"); }  //$NON-NLS-1$
> 		    consumeWildcard1WithBounds();  
> 			break;
>  
>-    case 559 : if (DEBUG) { System.out.println("WildcardBounds1 ::= extends ReferenceType1"); }  //$NON-NLS-1$
>+    case 561 : if (DEBUG) { System.out.println("WildcardBounds1 ::= extends ReferenceType1"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds1Extends();  
> 			break;
>  
>-    case 560 : if (DEBUG) { System.out.println("WildcardBounds1 ::= super ReferenceType1"); }  //$NON-NLS-1$
>+    case 562 : if (DEBUG) { System.out.println("WildcardBounds1 ::= super ReferenceType1"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds1Super();  
> 			break;
>  
>-    case 561 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 563 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeWildcard2();  
> 			break;
>  
>-    case 562 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION WildcardBounds2"); }  //$NON-NLS-1$
>+    case 564 : if (DEBUG) { System.out.println("Wildcard2 ::= QUESTION WildcardBounds2"); }  //$NON-NLS-1$
> 		    consumeWildcard2WithBounds();  
> 			break;
>  
>-    case 563 : if (DEBUG) { System.out.println("WildcardBounds2 ::= extends ReferenceType2"); }  //$NON-NLS-1$
>+    case 565 : if (DEBUG) { System.out.println("WildcardBounds2 ::= extends ReferenceType2"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds2Extends();  
> 			break;
>  
>-    case 564 : if (DEBUG) { System.out.println("WildcardBounds2 ::= super ReferenceType2"); }  //$NON-NLS-1$
>+    case 566 : if (DEBUG) { System.out.println("WildcardBounds2 ::= super ReferenceType2"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds2Super();  
> 			break;
>  
>-    case 565 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
>+    case 567 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION UNSIGNED_RIGHT_SHIFT"); }  //$NON-NLS-1$
> 		    consumeWildcard3();  
> 			break;
>  
>-    case 566 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION WildcardBounds3"); }  //$NON-NLS-1$
>+    case 568 : if (DEBUG) { System.out.println("Wildcard3 ::= QUESTION WildcardBounds3"); }  //$NON-NLS-1$
> 		    consumeWildcard3WithBounds();  
> 			break;
>  
>-    case 567 : if (DEBUG) { System.out.println("WildcardBounds3 ::= extends ReferenceType3"); }  //$NON-NLS-1$
>+    case 569 : if (DEBUG) { System.out.println("WildcardBounds3 ::= extends ReferenceType3"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds3Extends();  
> 			break;
>  
>-    case 568 : if (DEBUG) { System.out.println("WildcardBounds3 ::= super ReferenceType3"); }  //$NON-NLS-1$
>+    case 570 : if (DEBUG) { System.out.println("WildcardBounds3 ::= super ReferenceType3"); }  //$NON-NLS-1$
> 		    consumeWildcardBounds3Super();  
> 			break;
>  
>-    case 569 : if (DEBUG) { System.out.println("TypeParameterHeader ::= Identifier"); }  //$NON-NLS-1$
>+    case 571 : if (DEBUG) { System.out.println("TypeParameterHeader ::= Identifier"); }  //$NON-NLS-1$
> 		    consumeTypeParameterHeader();  
> 			break;
>  
>-    case 570 : if (DEBUG) { System.out.println("TypeParameters ::= LESS TypeParameterList1"); }  //$NON-NLS-1$
>+    case 572 : if (DEBUG) { System.out.println("TypeParameters ::= LESS TypeParameterList1"); }  //$NON-NLS-1$
> 		    consumeTypeParameters();  
> 			break;
>  
>-    case 572 : if (DEBUG) { System.out.println("TypeParameterList ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>+    case 574 : if (DEBUG) { System.out.println("TypeParameterList ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterList();  
> 			break;
>  
>-    case 574 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 576 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterWithExtends();  
> 			break;
>  
>-    case 575 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 577 : if (DEBUG) { System.out.println("TypeParameter ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterWithExtendsAndBounds();  
> 			break;
>  
>-    case 577 : if (DEBUG) { System.out.println("AdditionalBoundList ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>+    case 579 : if (DEBUG) { System.out.println("AdditionalBoundList ::= AdditionalBoundList..."); }  //$NON-NLS-1$
> 		    consumeAdditionalBoundList();  
> 			break;
>  
>-    case 578 : if (DEBUG) { System.out.println("AdditionalBound ::= AND ReferenceType"); }  //$NON-NLS-1$
>+    case 580 : if (DEBUG) { System.out.println("AdditionalBound ::= AND ReferenceType"); }  //$NON-NLS-1$
> 		    consumeAdditionalBound();  
> 			break;
>  
>-    case 580 : if (DEBUG) { System.out.println("TypeParameterList1 ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
>+    case 582 : if (DEBUG) { System.out.println("TypeParameterList1 ::= TypeParameterList COMMA..."); }  //$NON-NLS-1$
> 		    consumeTypeParameterList1();  
> 			break;
>  
>-    case 581 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader GREATER"); }  //$NON-NLS-1$
>+    case 583 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader GREATER"); }  //$NON-NLS-1$
> 		    consumeTypeParameter1();  
> 			break;
>  
>-    case 582 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 584 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameter1WithExtends();  
> 			break;
>  
>-    case 583 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
>+    case 585 : if (DEBUG) { System.out.println("TypeParameter1 ::= TypeParameterHeader extends..."); }  //$NON-NLS-1$
> 		    consumeTypeParameter1WithExtendsAndBounds();  
> 			break;
>  
>-    case 585 : if (DEBUG) { System.out.println("AdditionalBoundList1 ::= AdditionalBoundList..."); }  //$NON-NLS-1$
>+    case 587 : if (DEBUG) { System.out.println("AdditionalBoundList1 ::= AdditionalBoundList..."); }  //$NON-NLS-1$
> 		    consumeAdditionalBoundList1();  
> 			break;
>  
>-    case 586 : if (DEBUG) { System.out.println("AdditionalBound1 ::= AND ReferenceType1"); }  //$NON-NLS-1$
>+    case 588 : if (DEBUG) { System.out.println("AdditionalBound1 ::= AND ReferenceType1"); }  //$NON-NLS-1$
> 		    consumeAdditionalBound1();  
> 			break;
>  
>-    case 592 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= PLUS PushPosition..."); }  //$NON-NLS-1$
>+    case 594 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= PLUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 593 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= MINUS PushPosition..."); }  //$NON-NLS-1$
>+    case 595 : if (DEBUG) { System.out.println("UnaryExpression_NotName ::= MINUS PushPosition..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 596 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= TWIDDLE..."); }  //$NON-NLS-1$
>+    case 598 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= TWIDDLE..."); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.TWIDDLE);  
> 			break;
>  
>-    case 597 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= NOT PushPosition"); }  //$NON-NLS-1$
>+    case 599 : if (DEBUG) { System.out.println("UnaryExpressionNotPlusMinus_NotName ::= NOT PushPosition"); }  //$NON-NLS-1$
> 		    consumeUnaryExpression(OperatorIds.NOT);  
> 			break;
>  
>-    case 600 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 602 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MULTIPLY);  
> 			break;
>  
>-    case 601 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name MULTIPLY..."); }  //$NON-NLS-1$
>+    case 603 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name MULTIPLY..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.MULTIPLY);  
> 			break;
>  
>-    case 602 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 604 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.DIVIDE);  
> 			break;
>  
>-    case 603 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name DIVIDE..."); }  //$NON-NLS-1$
>+    case 605 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name DIVIDE..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.DIVIDE);  
> 			break;
>  
>-    case 604 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 606 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.REMAINDER);  
> 			break;
>  
>-    case 605 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name REMAINDER..."); }  //$NON-NLS-1$
>+    case 607 : if (DEBUG) { System.out.println("MultiplicativeExpression_NotName ::= Name REMAINDER..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.REMAINDER);  
> 			break;
>  
>-    case 607 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 609 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.PLUS);  
> 			break;
>  
>-    case 608 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name PLUS..."); }  //$NON-NLS-1$
>+    case 610 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name PLUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.PLUS);  
> 			break;
>  
>-    case 609 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 611 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.MINUS);  
> 			break;
>  
>-    case 610 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name MINUS..."); }  //$NON-NLS-1$
>+    case 612 : if (DEBUG) { System.out.println("AdditiveExpression_NotName ::= Name MINUS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.MINUS);  
> 			break;
>  
>-    case 612 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+    case 614 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LEFT_SHIFT);  
> 			break;
>  
>-    case 613 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name LEFT_SHIFT..."); }  //$NON-NLS-1$
>+    case 615 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name LEFT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.LEFT_SHIFT);  
> 			break;
>  
>-    case 614 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+    case 616 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.RIGHT_SHIFT);  
> 			break;
>  
>-    case 615 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+    case 617 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name RIGHT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.RIGHT_SHIFT);  
> 			break;
>  
>-    case 616 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
>+    case 618 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= ShiftExpression_NotName..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 617 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name UNSIGNED_RIGHT_SHIFT..."); }  //$NON-NLS-1$
>+    case 619 : if (DEBUG) { System.out.println("ShiftExpression_NotName ::= Name UNSIGNED_RIGHT_SHIFT..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.UNSIGNED_RIGHT_SHIFT);  
> 			break;
>  
>-    case 619 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
>+    case 621 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS);  
> 			break;
>  
>-    case 620 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS..."); }  //$NON-NLS-1$
>+    case 622 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.LESS);  
> 			break;
>  
>-    case 621 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
>+    case 623 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= ShiftExpression_NotName"); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER);  
> 			break;
>  
>-    case 622 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER..."); }  //$NON-NLS-1$
>+    case 624 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.GREATER);  
> 			break;
>  
>-    case 623 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 625 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.LESS_EQUAL);  
> 			break;
>  
>-    case 624 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS_EQUAL..."); }  //$NON-NLS-1$
>+    case 626 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name LESS_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.LESS_EQUAL);  
> 			break;
>  
>-    case 625 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 627 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.GREATER_EQUAL);  
> 			break;
>  
>-    case 626 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER_EQUAL..."); }  //$NON-NLS-1$
>+    case 628 : if (DEBUG) { System.out.println("RelationalExpression_NotName ::= Name GREATER_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.GREATER_EQUAL);  
> 			break;
>  
>-    case 628 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
>+    case 630 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::= Name instanceof..."); }  //$NON-NLS-1$
> 		    consumeInstanceOfExpressionWithName();  
> 			break;
>  
>-    case 629 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 631 : if (DEBUG) { System.out.println("InstanceofExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeInstanceOfExpression();  
> 			break;
>  
>-    case 631 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 633 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.EQUAL_EQUAL);  
> 			break;
>  
>-    case 632 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name EQUAL_EQUAL..."); }  //$NON-NLS-1$
>+    case 634 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name EQUAL_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpressionWithName(OperatorIds.EQUAL_EQUAL);  
> 			break;
>  
>-    case 633 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 635 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpression(OperatorIds.NOT_EQUAL);  
> 			break;
>  
>-    case 634 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name NOT_EQUAL..."); }  //$NON-NLS-1$
>+    case 636 : if (DEBUG) { System.out.println("EqualityExpression_NotName ::= Name NOT_EQUAL..."); }  //$NON-NLS-1$
> 		    consumeEqualityExpressionWithName(OperatorIds.NOT_EQUAL);  
> 			break;
>  
>-    case 636 : if (DEBUG) { System.out.println("AndExpression_NotName ::= AndExpression_NotName AND..."); }  //$NON-NLS-1$
>+    case 638 : if (DEBUG) { System.out.println("AndExpression_NotName ::= AndExpression_NotName AND..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND);  
> 			break;
>  
>-    case 637 : if (DEBUG) { System.out.println("AndExpression_NotName ::= Name AND EqualityExpression"); }  //$NON-NLS-1$
>+    case 639 : if (DEBUG) { System.out.println("AndExpression_NotName ::= Name AND EqualityExpression"); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.AND);  
> 			break;
>  
>-    case 639 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 641 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.XOR);  
> 			break;
>  
>-    case 640 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::= Name XOR AndExpression"); }  //$NON-NLS-1$
>+    case 642 : if (DEBUG) { System.out.println("ExclusiveOrExpression_NotName ::= Name XOR AndExpression"); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.XOR);  
> 			break;
>  
>-    case 642 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 644 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR);  
> 			break;
>  
>-    case 643 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::= Name OR..."); }  //$NON-NLS-1$
>+    case 645 : if (DEBUG) { System.out.println("InclusiveOrExpression_NotName ::= Name OR..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.OR);  
> 			break;
>  
>-    case 645 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 647 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.AND_AND);  
> 			break;
>  
>-    case 646 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::= Name AND_AND..."); }  //$NON-NLS-1$
>+    case 648 : if (DEBUG) { System.out.println("ConditionalAndExpression_NotName ::= Name AND_AND..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpressionWithName(OperatorIds.AND_AND);  
> 			break;
>  
>-    case 648 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 650 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeBinaryExpression(OperatorIds.OR_OR);  
> 			break;
>  
>-    case 649 : if (DEBUG) { System.out.println("ConditionalOrExpression_NotName ::= Name OR_OR..."); }  //$NON-NLS-1$
>+    case 651 : 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("ConditionalExpression_NotName ::=..."); }  //$NON-NLS-1$
>+    case 653 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::=..."); }  //$NON-NLS-1$
> 		    consumeConditionalExpression(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>  
>-    case 652 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); }  //$NON-NLS-1$
>+    case 654 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); }  //$NON-NLS-1$
> 		    consumeConditionalExpressionWithName(OperatorIds.QUESTIONCOLON) ;  
> 			break;
>  
>-    case 656 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>+    case 658 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderName() ;  
> 			break;
>  
>-    case 657 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
>+    case 659 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;  
> 			break;
>  
>-    case 658 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>+    case 660 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ;  
> 			break;
>  
>-    case 659 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
>+    case 661 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeaderName() ;  
> 			break;
>  
>-    case 660 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); }  //$NON-NLS-1$
>+    case 662 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclarationHeader() ;  
> 			break;
>  
>-    case 661 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 663 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeDeclaration() ;  
> 			break;
>  
>-    case 663 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); }  //$NON-NLS-1$
>+    case 665 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyAnnotationTypeMemberDeclarationsopt() ;  
> 			break;
>  
>-    case 664 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
>+    case 666 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeMemberDeclarationsopt() ;  
> 			break;
>  
>-    case 666 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); }  //$NON-NLS-1$
>+    case 668 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeMemberDeclarations() ;  
> 			break;
>  
>-    case 667 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
>+    case 669 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderNameWithTypeParameters(true);  
> 			break;
>  
>-    case 668 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 670 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
> 		    consumeMethodHeaderName(true);  
> 			break;
>  
>-    case 669 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); }  //$NON-NLS-1$
>+    case 671 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyMethodHeaderDefaultValue() ;  
> 			break;
>  
>-    case 670 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); }  //$NON-NLS-1$
>+    case 672 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); }  //$NON-NLS-1$
> 		    consumeMethodHeaderDefaultValue();  
> 			break;
>  
>-    case 671 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); }  //$NON-NLS-1$
>+    case 673 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>-    case 672 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); }  //$NON-NLS-1$
>+    case 674 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); }  //$NON-NLS-1$
> 		    consumeAnnotationTypeMemberDeclaration() ;  
> 			break;
>  
>-    case 680 : if (DEBUG) { System.out.println("AnnotationName ::= AT Name"); }  //$NON-NLS-1$
>+    case 682 : if (DEBUG) { System.out.println("AnnotationName ::= AT Name"); }  //$NON-NLS-1$
> 		    consumeAnnotationName() ;  
> 			break;
>  
>-    case 681 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>+    case 683 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
> 		    consumeNormalAnnotation() ;  
> 			break;
>  
>-    case 682 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); }  //$NON-NLS-1$
>+    case 684 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); }  //$NON-NLS-1$
> 		    consumeEmptyMemberValuePairsopt() ;  
> 			break;
>  
>-    case 685 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); }  //$NON-NLS-1$
>+    case 687 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); }  //$NON-NLS-1$
> 		    consumeMemberValuePairs() ;  
> 			break;
>  
>-    case 686 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); }  //$NON-NLS-1$
>+    case 688 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); }  //$NON-NLS-1$
> 		    consumeMemberValuePair() ;  
> 			break;
>  
>-    case 687 : if (DEBUG) { System.out.println("EnterMemberValue ::="); }  //$NON-NLS-1$
>+    case 689 : if (DEBUG) { System.out.println("EnterMemberValue ::="); }  //$NON-NLS-1$
> 		    consumeEnterMemberValue() ;  
> 			break;
>  
>-    case 688 : if (DEBUG) { System.out.println("ExitMemberValue ::="); }  //$NON-NLS-1$
>+    case 690 : if (DEBUG) { System.out.println("ExitMemberValue ::="); }  //$NON-NLS-1$
> 		    consumeExitMemberValue() ;  
> 			break;
>  
>-    case 690 : if (DEBUG) { System.out.println("MemberValue ::= Name"); }  //$NON-NLS-1$
>+    case 692 : if (DEBUG) { System.out.println("MemberValue ::= Name"); }  //$NON-NLS-1$
> 		    consumeMemberValueAsName() ;  
> 			break;
>  
>-    case 693 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 695 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 694 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 696 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 695 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 697 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeEmptyMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 696 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
>+    case 698 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); }  //$NON-NLS-1$
> 		    consumeEmptyMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 697 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); }  //$NON-NLS-1$
>+    case 699 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); }  //$NON-NLS-1$
> 		    consumeEnterMemberValueArrayInitializer() ;  
> 			break;
>  
>-    case 699 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); }  //$NON-NLS-1$
>+    case 701 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); }  //$NON-NLS-1$
> 		    consumeMemberValues() ;  
> 			break;
>  
>-    case 700 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); }  //$NON-NLS-1$
>+    case 702 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); }  //$NON-NLS-1$
> 		    consumeMarkerAnnotation() ;  
> 			break;
>  
>-    case 701 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); }  //$NON-NLS-1$
>+    case 703 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); }  //$NON-NLS-1$
> 		    consumeSingleMemberAnnotationMemberValue() ;  
> 			break;
>  
>-    case 702 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
>+    case 704 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); }  //$NON-NLS-1$
> 		    consumeSingleMemberAnnotation() ;  
> 			break;
>  
>-    case 703 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); }  //$NON-NLS-1$
>+    case 705 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); }  //$NON-NLS-1$
> 		    consumeRecoveryMethodHeaderNameWithTypeParameters();  
> 			break;
>  
>-    case 704 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
>+    case 706 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt Type..."); }  //$NON-NLS-1$
> 		    consumeRecoveryMethodHeaderName();  
> 			break;
>  
>-    case 705 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>+    case 707 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>-    case 706 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
>+    case 708 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); }  //$NON-NLS-1$
> 		    consumeMethodHeader();  
> 			break;
>  
>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.64
>diff -u -r1.64 ParserBasicInformation.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java	14 Jan 2011 17:02:24 -0000	1.64
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java	6 Apr 2011 22:23:46 -0000
>@@ -16,20 +16,20 @@
> 
> 	int ERROR_SYMBOL = 110,
> 		MAX_NAME_LENGTH = 41,
>-		NUM_STATES = 970,
>+		NUM_STATES = 973,
> 
> 		NT_OFFSET = 110,
>-		SCOPE_UBOUND = 133,
>-		SCOPE_SIZE = 134,
>-		LA_STATE_OFFSET = 12789,
>+		SCOPE_UBOUND = 135,
>+		SCOPE_SIZE = 136,
>+		LA_STATE_OFFSET = 12710,
> 		MAX_LA = 1,
>-		NUM_RULES = 706,
>+		NUM_RULES = 708,
> 		NUM_TERMINALS = 110,
>-		NUM_NON_TERMINALS = 314,
>-		NUM_SYMBOLS = 424,
>-		START_STATE = 821,
>+		NUM_NON_TERMINALS = 315,
>+		NUM_SYMBOLS = 425,
>+		START_STATE = 1105,
> 		EOFT_SYMBOL = 69,
> 		EOLT_SYMBOL = 69,
>-		ACCEPT_ACTION = 12788,
>-		ERROR_ACTION = 12789;
>+		ACCEPT_ACTION = 12709,
>+		ERROR_ACTION = 12710;
> }
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java,v
>retrieving revision 1.36
>diff -u -r1.36 TerminalTokens.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java	14 Jan 2011 17:02:24 -0000	1.36
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java	6 Apr 2011 22:23:46 -0000
>@@ -58,7 +58,7 @@
> 		TokenNamefor = 78,
> 		TokenNamegoto = 109,
> 		TokenNameif = 79,
>-		TokenNameimplements = 106,
>+		TokenNameimplements = 107,
> 		TokenNameimport = 100,
> 		TokenNameinstanceof = 12,
> 		TokenNameint = 37,
>@@ -140,7 +140,7 @@
> 		TokenNameDOT = 3,
> 		TokenNameEQUAL = 71,
> 		TokenNameAT = 53,
>-		TokenNameELLIPSIS = 107,
>+		TokenNameELLIPSIS = 106,
> 		TokenNameEOF = 69,
> 		TokenNameERROR = 110;
> }
>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.28
>diff -u -r1.28 readableNames.properties
>--- compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties	14 Jan 2011 17:02:24 -0000	1.28
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties	6 Apr 2011 22:23:46 -0000
>@@ -1,13 +1,3 @@
>-###############################################################################
>-# Copyright (c) 2011 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
> ,opt=,
> AbstractMethodDeclaration=MethodDeclaration
> AdditionalBound1=AdditionalBound1
>@@ -55,6 +45,7 @@
> BreakStatement=BreakStatement
> CastExpression=CastExpression
> CatchClause=CatchClause
>+CatchFormalParameter=FormalParameter
> CatchHeader=CatchHeader
> Catches=Catches
> Catchesopt=Catches
>Index: grammar/java.g
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/grammar/java.g,v
>retrieving revision 1.11
>diff -u -r1.11 java.g
>--- grammar/java.g	7 Jul 2010 05:56:10 -0000	1.11
>+++ grammar/java.g	6 Apr 2011 22:23:47 -0000
>@@ -350,10 +350,18 @@
> Header2 -> EnumConstantHeader
> /:$readableName Header2:/
> 
>-CatchHeader ::= 'catch' '(' FormalParameter ')' '{'
>+CatchHeader ::= 'catch' '(' CatchFormalParameter ')' '{'
> /.$putCase consumeCatchHeader(); $break ./
> /:$readableName CatchHeader:/
> 
>+CatchFormalParameter ::= Modifiersopt Type VariableDeclaratorId
>+/.$putCase consumeCatchFormalParameter(false); $break ./
>+CatchFormalParameter ::= Modifiersopt Type '...' VariableDeclaratorId
>+/.$putCase consumeCatchFormalParameter(true); $break ./
>+/:$readableName FormalParameter:/
>+/:$compliance 1.5:/
>+/:$recovery_template Identifier Identifier:/
>+
> ImportDeclarations -> ImportDeclaration
> ImportDeclarations ::= ImportDeclarations ImportDeclaration 
> /.$putCase consumeImportDeclarations(); $break ./
>@@ -1100,7 +1108,7 @@
> /.$putCase consumeCatches(); $break ./
> /:$readableName Catches:/
> 
>-CatchClause ::= 'catch' '(' FormalParameter ')'    Block
>+CatchClause ::= 'catch' '(' CatchFormalParameter ')' Block
> /.$putCase consumeStatementCatch() ; $break ./
> /:$readableName CatchClause:/
> 
>Index: model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java,v
>retrieving revision 1.31
>diff -u -r1.31 DocumentElementParser.java
>--- model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java	23 Apr 2009 14:53:48 -0000	1.31
>+++ model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java	6 Apr 2011 22:23:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -588,6 +588,58 @@
> 	pushOnAstStack(arg);
> 	this.intArrayPtr--;
> }
>+protected void consumeCatchFormalParameter(boolean isVarArgs) {
>+	// FormalParameter ::= Type VariableDeclaratorId ==> false
>+	// FormalParameter ::= Modifiers Type VariableDeclaratorId ==> true
>+	/*
>+	astStack :
>+	identifierStack : type identifier
>+	intStack : dim dim
>+	 ==>
>+	astStack : Argument
>+	identifierStack :
>+	intStack :
>+	*/
>+
>+	this.identifierLengthPtr--;
>+	char[] parameterName = this.identifierStack[this.identifierPtr];
>+	long namePositions = this.identifierPositionStack[this.identifierPtr--];
>+	int extendedDimensions = this.intStack[this.intPtr--];
>+	int endOfEllipsis = 0;
>+	if (isVarArgs) {
>+		endOfEllipsis = this.intStack[this.intPtr--];
>+	}
>+	int firstDimensions = this.intStack[this.intPtr--];
>+	final int typeDimensions = firstDimensions + extendedDimensions;
>+	TypeReference type = getTypeReference(typeDimensions);
>+	if (isVarArgs) {
>+		type = copyDims(type, typeDimensions + 1);
>+		if (extendedDimensions == 0) {
>+			type.sourceEnd = endOfEllipsis;
>+		}
>+		type.bits |= ASTNode.IsVarArgs; // set isVarArgs
>+	}
>+	this.intPtr -= 3;
>+	Argument arg =
>+		new Argument(
>+			parameterName,
>+			namePositions,
>+			type,
>+			this.intStack[this.intPtr + 1]);// modifiers
>+	arg.bits &= ~ASTNode.IsArgument;
>+	// consume annotations
>+	int length;
>+	if ((length = this.expressionLengthStack[this.expressionLengthPtr--]) != 0) {
>+		System.arraycopy(
>+			this.expressionStack,
>+			(this.expressionPtr -= length) + 1,
>+			arg.annotations = new Annotation[length],
>+			0,
>+			length);
>+	}
>+	pushOnAstStack(arg);
>+	this.intArrayPtr--;
>+}
> /*
>  *
>  * INTERNAL USE-ONLY
>Index: model/org/eclipse/jdt/internal/compiler/SourceElementParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceElementParser.java,v
>retrieving revision 1.91
>diff -u -r1.91 SourceElementParser.java
>--- model/org/eclipse/jdt/internal/compiler/SourceElementParser.java	28 Jul 2010 16:17:03 -0000	1.91
>+++ model/org/eclipse/jdt/internal/compiler/SourceElementParser.java	6 Apr 2011 22:23:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -381,6 +381,15 @@
> 	// the declarationSourceStart to be set
> 	flushCommentsDefinedPriorTo(this.scanner.currentPosition);
> }
>+protected void consumeCatchFormalParameter(boolean isVarArgs) {
>+	super.consumeCatchFormalParameter(isVarArgs);
>+
>+	// Flush comments prior to this formal parameter so the declarationSourceStart of the following parameter
>+	// is correctly set (see bug 80904)
>+	// Note that this could be done in the Parser itself, but this would slow down all parsers, when they don't need
>+	// the declarationSourceStart to be set
>+	flushCommentsDefinedPriorTo(this.scanner.currentPosition);
>+}
> protected void consumeInterfaceHeaderName1() {
> 	int currentAstPtr = this.astPtr;
> 	super.consumeInterfaceHeaderName1();
>Index: model/org/eclipse/jdt/internal/core/LocalVariable.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/LocalVariable.java,v
>retrieving revision 1.32
>diff -u -r1.32 LocalVariable.java
>--- model/org/eclipse/jdt/internal/core/LocalVariable.java	21 Feb 2011 00:53:31 -0000	1.32
>+++ model/org/eclipse/jdt/internal/core/LocalVariable.java	6 Apr 2011 22:23:47 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference;
> import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
> import org.eclipse.jdt.internal.compiler.ast.UnaryExpression;
>+import org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers;
> import org.eclipse.jdt.internal.compiler.parser.RecoveryScanner;
> import org.eclipse.jdt.internal.core.util.MementoTokenizer;
> import org.eclipse.jdt.internal.core.util.Util;
>@@ -306,7 +307,7 @@
> 			}
> 			return 0;
> 		}
>-		return this.flags;
>+		return this.flags & ExtraCompilerModifiers.AccJustFlag;
> 	}
> 
> 	/**
>Index: search/org/eclipse/jdt/internal/core/search/matching/MatchLocatorParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocatorParser.java,v
>retrieving revision 1.89
>diff -u -r1.89 MatchLocatorParser.java
>--- search/org/eclipse/jdt/internal/core/search/matching/MatchLocatorParser.java	28 Feb 2011 18:27:47 -0000	1.89
>+++ search/org/eclipse/jdt/internal/core/search/matching/MatchLocatorParser.java	6 Apr 2011 22:23:47 -0000
>@@ -320,6 +320,11 @@
> 	this.patternLocator.match((LocalDeclaration) this.astStack[this.astPtr], this.nodeSet);
> }
> 
>+protected void consumeCatchFormalParameter(boolean isVarArgs) {
>+	super.consumeCatchFormalParameter(isVarArgs);
>+	this.patternLocator.match((LocalDeclaration) this.astStack[this.astPtr], this.nodeSet);
>+}
>+
> protected void consumeInstanceOfExpression() {
> 	super.consumeInstanceOfExpression();
> 	if ((this.patternFineGrain & IJavaSearchConstants.INSTANCEOF_TYPE_REFERENCE) != 0) {
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java,v
>retrieving revision 1.68
>diff -u -r1.68 ASTModelBridgeTests.java
>--- src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java	29 Oct 2010 16:35:46 -0000	1.68
>+++ src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java	6 Apr 2011 22:23:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2010 IBM Corporation and others.
>+ * Copyright (c) 2004, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -1653,6 +1653,38 @@
> 	}
> 
> 	/*
>+	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=342054
>+	 */
>+	public void testLocalVariable7() throws JavaModelException {
>+		ASTNode node = buildAST(
>+			"public class X {\n" +
>+			"	public void foo() {\n" +
>+			"		try {\n" + 
>+			"		} catch (Exception e) {\n" +
>+			"		}\n" +
>+			"	}\n" +
>+			"}"
>+		);
>+		node.accept(new ASTVisitor() {
>+			public boolean visit(SingleVariableDeclaration variableDeclaration) {
>+				final IVariableBinding binding = variableDeclaration.resolveBinding();
>+				final IJavaElement javaElement = binding.getJavaElement();
>+				assertNotNull("No java element", javaElement);
>+				final int type = javaElement.getElementType();
>+				assertEquals("Wrong type", IJavaElement.LOCAL_VARIABLE, type);
>+				ILocalVariable variable = (ILocalVariable) javaElement;
>+				final ITypeRoot typeRoot = variable.getTypeRoot();
>+				assertNotNull("Not type root", typeRoot);
>+				assertTrue("Invalid", typeRoot.exists());
>+				assertNotNull("No declaring element", variable.getDeclaringMember());
>+				int flags = variable.getFlags();
>+				assertFalse("wrong modifier for " + variable.getElementName(), Flags.isFinal(flags));
>+				assertFalse("wrong value for isParameter" + variable.getElementName(), variable.isParameter());
>+				return true;
>+			}
>+		});
>+	}
>+	/*
> 	 * Ensures that the IJavaElement of an IBinding representing a member type is correct.
> 	 */
> 	public void testMemberType() throws JavaModelException {
>Index: src/org/eclipse/jdt/core/tests/model/ResolveTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests.java,v
>retrieving revision 1.96
>diff -u -r1.96 ResolveTests.java
>--- src/org/eclipse/jdt/core/tests/model/ResolveTests.java	26 Nov 2010 00:08:59 -0000	1.96
>+++ src/org/eclipse/jdt/core/tests/model/ResolveTests.java	6 Apr 2011 22:23:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -15,6 +15,7 @@
> import junit.framework.Test;
> 
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.jdt.core.Flags;
> import org.eclipse.jdt.core.IClassFile;
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.IJavaElement;
>@@ -200,6 +201,20 @@
> 	);
> }
> /**
>+ * bugs http://dev.eclipse.org/bugs/show_bug.cgi?id=342054
>+ */
>+public void testCatchArgumentType3() throws JavaModelException {
>+	ICompilationUnit cu = getCompilationUnit("Resolve", "src", "", "ResolveCatchArgumentType1.java");
>+	IJavaElement[] elements = codeSelect(cu, "exception", "exception");
>+	assertElementsEqual(
>+		"Unexpected elements",
>+		"exception [in foo() [in ResolveCatchArgumentType1 [in ResolveCatchArgumentType1.java [in <default> [in src [in Resolve]]]]]]",
>+		elements
>+	);
>+	assertFalse("Not a parameter", ((ILocalVariable) elements[0]).isParameter());
>+	assertEquals("Wrong flags", Flags.AccFinal, ((ILocalVariable) elements[0]).getFlags());
>+}
>+/**
>  * Resolve the class 'X' (field type).
>  */
> public void testClass1() throws JavaModelException {
>Index: workspace/Resolve/src/ResolveCatchArgumentType1.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/Resolve/src/ResolveCatchArgumentType1.java,v
>retrieving revision 1.1
>diff -u -r1.1 ResolveCatchArgumentType1.java
>--- workspace/Resolve/src/ResolveCatchArgumentType1.java	5 Nov 2002 10:18:18 -0000	1.1
>+++ workspace/Resolve/src/ResolveCatchArgumentType1.java	6 Apr 2011 22:23:49 -0000
>@@ -1,7 +1,7 @@
> public class ResolveCatchArgumentType1 {
> 	void foo() {
> 		try {
>-		} catch (X1.Y1 e) {
>+		} catch (final X1.Y1 exception) {
> 		}
> 	}
> }
>\ No newline at end of file
>#P org.eclipse.jdt.core.tools
>Index: src/org/eclipse/jdt/core/tools/parser/UpdateParserFiles.java
>===================================================================
>RCS file: /home/cvs/numbat/org.eclipse.jdt.core.tools/src/org/eclipse/jdt/core/tools/parser/UpdateParserFiles.java,v
>retrieving revision 1.15
>diff -u -r1.15 UpdateParserFiles.java
>--- src/org/eclipse/jdt/core/tools/parser/UpdateParserFiles.java	25 Jan 2011 20:33:03 -0000	1.15
>+++ src/org/eclipse/jdt/core/tools/parser/UpdateParserFiles.java	6 Apr 2011 22:22:55 -0000
>@@ -18,7 +18,7 @@
> 	}
> 	
> 	public void testUpdate() {
>-		String parserDirectoryName = "C:/eclipse/workspaces/java7/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser"; //$NON-NLS-1$
>+		String parserDirectoryName = "C:\\eclipse\\workspaces\\head\\org.eclipse.jdt.core\\compiler\\org\\eclipse\\jdt\\internal\\compiler\\parser"; //$NON-NLS-1$
> 		ParserUpdater updater = new ParserUpdater("C:/java_tools/jikespg", parserDirectoryName, ParserUpdater.JAVA); //$NON-NLS-1$
> 		updater.update();
> 	}

Actions: View | Diff

Attachments on bug 342054: 192678 | 192679