Add many missing @Override to remove warnings

Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>

46 files changed, 499 insertions, 0 deletions

diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
index 9994baf2771..2e1fe56caaa 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
@@ -321,6 +321,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
 		
 	}
 	
+	@Override
 	@Deprecated
 	public IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader,
 			IScannerInfo scanInfo, ICodeReaderFactory fileCreator, IIndex index, IParserLogService log)
@@ -329,6 +330,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
 		return getASTTranslationUnit(reader, scanInfo, fileCreator, index, 0, log);
 	}
 	
+	@Override
 	@Deprecated
 	public IASTCompletionNode getCompletionNode(org.eclipse.cdt.core.parser.CodeReader reader,
 			IScannerInfo scanInfo, ICodeReaderFactory fileCreator, IIndex index, IParserLogService log,
@@ -443,6 +445,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
 		System.out.println();
 	}
 	
+	@Override
 	@Deprecated
 	public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) {
 		return GCCLanguage.getDefault().getSelectedNames(ast, start, length);
@@ -465,6 +468,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
 		return super.getAdapter(adapter);
 	}
 	
+	@Override
 	public IContributedModelBuilder createModelBuilder(@SuppressWarnings("unused") ITranslationUnit tu) {
 		return null;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/LPGTokenAdapter.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/LPGTokenAdapter.java
index b0cf39e3b69..be564321093 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/LPGTokenAdapter.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/LPGTokenAdapter.java
@@ -43,76 +43,94 @@ public class LPGTokenAdapter implements lpg.lpgjavaruntime.IToken {
 		return token;
 	}
 	
+	@Override
 	public int getAdjunctIndex() {
 		return adjunctIndex;
 	}
 
+	@Override
 	public int getColumn() {
 		return 0;
 	}
 
+	@Override
 	public int getEndColumn() {
 		return 0;
 	}
 
+	@Override
 	public int getEndLine() {
 		return 0;
 	}
 
+	@Override
 	public int getEndOffset() {
 		return token.getEndOffset();
 	}
 
+	@Override
 	public lpg.lpgjavaruntime.IToken[] getFollowingAdjuncts() {
 		return null;
 	}
 
+	@Override
 	public int getKind() {
 		return kind;
 	}
 
+	@Override
 	public int getLine() {
 		return 0;
 	}
 
+	@Override
 	public lpg.lpgjavaruntime.IToken[] getPrecedingAdjuncts() {
 		return null;
 	}
 
+	@Override
 	public PrsStream getPrsStream() {
 		return null;
 	}
 
+	@Override
 	public int getStartOffset() {
 		return token.getOffset();
 	}
 
+	@Override
 	public int getTokenIndex() {
 		return tokenIndex;
 	}
 
+	@Override
 	@Deprecated
 	public String getValue(@SuppressWarnings("unused") char[] arg0) {
 		return toString();
 	}
 
+	@Override
 	public void setAdjunctIndex(int adjunctIndex) {
 		this.adjunctIndex = adjunctIndex;
 	}
 
+	@Override
 	public void setEndOffset(@SuppressWarnings("unused") int arg0) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void setKind(int kind) {
 		this.kind = kind;
 	}
 
+	@Override
 	public void setStartOffset(@SuppressWarnings("unused") int arg0) {
 		throw new UnsupportedOperationException();
 
 	}
 
+	@Override
 	public void setTokenIndex(int tokenIndex) {
 		this.tokenIndex = tokenIndex;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ASTCompletionNode.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ASTCompletionNode.java
index 9c387e48618..6bd36de6706 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ASTCompletionNode.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ASTCompletionNode.java
@@ -69,11 +69,13 @@ public class ASTCompletionNode implements IASTCompletionNode {
 	/**
 	 * Returns the length of the prefix.
 	 */
+	@Override
 	public int getLength() {
 		return prefix == null ? 0 : prefix.length();
 	}
 
 	
+	@Override
 	public IASTName[] getNames() {
 		return names.toArray(new IASTName[names.size()]);
 	}
@@ -85,6 +87,7 @@ public class ASTCompletionNode implements IASTCompletionNode {
 	 * 
 	 * @returns a string of length >= 1 or null
 	 */
+	@Override
 	public String getPrefix() {
 		return prefix;
 	}
@@ -93,6 +96,7 @@ public class ASTCompletionNode implements IASTCompletionNode {
 		this.tu = tu;
 	}
 
+	@Override
 	public IASTTranslationUnit getTranslationUnit() {
 		return tu;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/TokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/TokenMap.java
index 57c443e52fd..8f2e6a2aeec 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/TokenMap.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/TokenMap.java
@@ -58,6 +58,7 @@ public class TokenMap implements ITokenMap {
 	/**
 	 * Maps a token kind back to the corresponding kind define in the base C99 parser.
 	 */
+	@Override
 	public int mapKind(int kind) {
 		if(kindMap == null)
 			return kind;
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99SecondaryParserFactory.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99SecondaryParserFactory.java
index 45fe22320b1..3d643fdd43d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99SecondaryParserFactory.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99SecondaryParserFactory.java
@@ -29,14 +29,17 @@ public class C99SecondaryParserFactory implements ISecondaryParserFactory {
 	}
 	
 	
+	@Override
 	public ISecondaryParser<IASTExpression> getExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new C99ExpressionParser(stream, properties); 
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getNoCastExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new C99NoCastExpressionParser(stream, properties);
 	}
 	
+	@Override
 	public ISecondaryParser<IASTExpression> getSizeofExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new C99SizeofExpressionParser(stream, properties);
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPSecondaryParserFactory.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPSecondaryParserFactory.java
index f2ee4bf628f..9e8ef309b35 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPSecondaryParserFactory.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPSecondaryParserFactory.java
@@ -33,22 +33,27 @@ public class CPPSecondaryParserFactory implements ICPPSecondaryParserFactory {
 	}
 	
 	
+	@Override
 	public ISecondaryParser<ICPPASTTemplateParameter> getTemplateTypeParameterParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPTemplateTypeParameterParser(stream, properties);
 	}
 	
+	@Override
 	public ISecondaryParser<IASTDeclarator> getNoFunctionDeclaratorParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPNoFunctionDeclaratorParser(stream, properties); 
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPExpressionParser(stream, properties);
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getNoCastExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPNoCastExpressionParser(stream, properties);
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getSizeofExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPSizeofExpressionParser(stream, properties);
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GCCSecondaryParserFactory.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GCCSecondaryParserFactory.java
index 0b68da007c9..a93ed422f5f 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GCCSecondaryParserFactory.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GCCSecondaryParserFactory.java
@@ -29,14 +29,17 @@ public class GCCSecondaryParserFactory implements ISecondaryParserFactory {
 	}
 	
 	
+	@Override
 	public ISecondaryParser<IASTExpression> getExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new C99ExpressionParser(stream, properties); 
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getNoCastExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new C99NoCastExpressionParser(stream, properties);
 	}
 	
+	@Override
 	public ISecondaryParser<IASTExpression> getSizeofExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new GCCSizeofExpressionParser(stream, properties);
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPSecondaryParserFactory.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPSecondaryParserFactory.java
index ed4a6260ddd..111210655b9 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPSecondaryParserFactory.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPSecondaryParserFactory.java
@@ -34,22 +34,27 @@ public class GPPSecondaryParserFactory implements ICPPSecondaryParserFactory {
 	}
 	
 	
+	@Override
 	public ISecondaryParser<ICPPASTTemplateParameter> getTemplateTypeParameterParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPTemplateTypeParameterParser(stream, properties);
 	}
 	
+	@Override
 	public ISecondaryParser<IASTDeclarator> getNoFunctionDeclaratorParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPNoFunctionDeclaratorParser(stream, properties); 
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPExpressionParser(stream, properties);
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getNoCastExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new CPPNoCastExpressionParser(stream, properties);
 	}
 
+	@Override
 	public ISecondaryParser<IASTExpression> getSizeofExpressionParser(ITokenStream stream, Map<String,String> properties) {
 		return new GPPSizeofExpressionParser(stream, properties);
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
index cdf59e62750..d34fd5fccff 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
@@ -52,10 +52,12 @@ public class C99Language extends BaseExtensibleLanguage {
 		return ScannerExtensionConfiguration.createC();
 	}
 
+	@Override
 	public String getId() {
 		return ID;
 	}
 
+	@Override
 	public int getLinkageID() {
 		return ILinkage.C_LINKAGE_ID;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java
index e7eda385ffa..32fb0506077 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java
@@ -30,14 +30,17 @@ public final class DOMToC99TokenMap implements IDOMTokenMap {
 		// just a private constructor
 	}
 	
+	@Override
 	public int getEOFTokenKind() {
 		return TK_EOF_TOKEN;
 	}
 	
+	@Override
 	public int getEOCTokenKind() {
 		return TK_EndOfCompletion;
 	}
 	
+	@Override
 	public int mapKind(IToken token) {
 		
 		switch(token.getType()) {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java
index 087b0ecd43e..89e7545565e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java
@@ -31,14 +31,17 @@ public class DOMToISOCPPTokenMap implements IDOMTokenMap {
 		// just a private constructor
 	}
 	
+	@Override
 	public int getEOFTokenKind() {
 		return TK_EOF_TOKEN;
 	}
 	
+	@Override
 	public int getEOCTokenKind() {
 		return TK_EndOfCompletion;
 	}
 	
+	@Override
 	public int mapKind(IToken token) {
 		
 		switch(token.getType()) {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
index 8d773e8237f..f89598cd66d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
@@ -50,10 +50,12 @@ public class ISOCPPLanguage extends BaseExtensibleLanguage {
 		return ScannerExtensionConfiguration.createCPP();
 	}
 
+	@Override
 	public String getId() {
 		return ID;
 	}
 
+	@Override
 	public int getLinkageID() {
 		return ILinkage.CPP_LINKAGE_ID;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java
index d3808f3f9e1..c30c66f1547 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java
@@ -31,14 +31,17 @@ public final class DOMToGCCTokenMap implements IDOMTokenMap {
 		// just a private constructor
 	}
 	
+	@Override
 	public int getEOFTokenKind() {
 		return TK_EOF_TOKEN;
 	}
 	
+	@Override
 	public int getEOCTokenKind() {
 		return TK_EndOfCompletion;
 	}
 	
+	@Override
 	public int mapKind(IToken token) {
 		
 		switch(token.getType()) {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java
index a4f091d7c94..b4e1a0e8198 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java
@@ -32,14 +32,17 @@ public class DOMToGPPTokenMap implements IDOMTokenMap {
 		// just a private constructor
 	}
 	
+	@Override
 	public int getEOFTokenKind() {
 		return TK_EOF_TOKEN;
 	}
 	
+	@Override
 	public int getEOCTokenKind() {
 		return TK_EndOfCompletion;
 	}
 	
+	@Override
 	public int mapKind(IToken token) {
 		
 		switch(token.getType()) {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GCCLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GCCLanguage.java
index da00102ddd7..2fcc27eee6d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GCCLanguage.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GCCLanguage.java
@@ -49,10 +49,12 @@ public class GCCLanguage extends BaseExtensibleLanguage {
 		return GCCScannerExtensionConfiguration.getInstance();
 	}
 
+	@Override
 	public String getId() {
 		return ID;
 	}
 
+	@Override
 	public int getLinkageID() {
 		return ILinkage.C_LINKAGE_ID;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GPPLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GPPLanguage.java
index 09352219234..428817c3c8e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GPPLanguage.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/GPPLanguage.java
@@ -50,10 +50,12 @@ public class GPPLanguage extends BaseExtensibleLanguage {
 		return GPPScannerExtensionConfiguration.getInstance();
 	}
 
+	@Override
 	public String getId() {
 		return ID;
 	}
 
+	@Override
 	public int getLinkageID() {
 		return ILinkage.CPP_LINKAGE_ID;
 	}
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/AbstractTrialUndoActionProvider.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/AbstractTrialUndoActionProvider.java
index 4df42dfe282..c337fafdbcc 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/AbstractTrialUndoActionProvider.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/AbstractTrialUndoActionProvider.java
@@ -78,22 +78,27 @@ public abstract class AbstractTrialUndoActionProvider<ACT, RULE_DATA> extends Pr
 		btParser.backtrack();
 	}
 
+	@Override
 	public void setActiveRule(Rule<RULE_DATA> rule) {
 		activeRule = rule;
 	}
 	
+	@Override
 	public Rule<RULE_DATA> getActiveRule() {
 		return activeRule;
 	}
 	
+	@Override
 	public final boolean trialAction(int rule_number) {
 		return ruleAction[rule_number].doTrial(this, parserAction);
 	}
 
+	@Override
 	public final void undoAction(int rule_number) {
 		ruleAction[rule_number].doUndo(this, parserAction);
 	}
 
+	@Override
 	public final void finalAction(int rule_number) {
 		//System.out.println("finalAction: " + rule_number); //$NON-NLS-1$
 		ruleAction[rule_number].doFinal(this, parserAction);
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java
index 9c3f5e0cb94..069571d10e2 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java
@@ -47,6 +47,7 @@ public class FixedBacktrackingParser extends Stacks
     //
     // Override the getToken function in Stacks.
     //
+    @Override
     public final int getToken(int i)
     {
         return tokens.get(locationStack[stateStackTop + (i - 1)]);
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java
index 025a4b6d93c..52b12341b1b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java
@@ -57,9 +57,11 @@ public class C99ExpressionParser extends PrsStream implements RuleAction, IToken
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -106,6 +108,7 @@ public class C99ExpressionParser extends PrsStream implements RuleAction, IToken
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return C99ExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return C99ExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return C99ExpressionParserprs.EOFT_SYMBOL; }
@@ -193,12 +196,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -212,19 +217,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return C99ExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "C99ExpressionParser";
@@ -234,6 +243,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -250,6 +260,7 @@ public C99ExpressionParser(ITokenStream stream, Map<String,String> properties) {
 }	
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java
index b03d8c092b5..105aea7c7ce 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java
@@ -213,8 +213,10 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -399,8 +401,10 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -492,6 +496,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -580,6 +585,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -608,6 +614,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -659,6 +666,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -687,6 +695,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static byte nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -707,6 +716,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -724,6 +734,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -744,6 +755,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -755,6 +767,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -766,6 +779,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -777,6 +791,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -788,6 +803,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -799,6 +815,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -824,6 +841,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -841,6 +859,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -869,6 +888,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java
index c6faee7f42b..abb07daad6d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java
@@ -57,9 +57,11 @@ public class C99NoCastExpressionParser extends PrsStream implements RuleAction,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -106,6 +108,7 @@ public class C99NoCastExpressionParser extends PrsStream implements RuleAction,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return C99NoCastExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return C99NoCastExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return C99NoCastExpressionParserprs.EOFT_SYMBOL; }
@@ -193,12 +196,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -212,19 +217,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return C99NoCastExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "C99NoCastExpressionParser";
@@ -234,6 +243,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -250,6 +260,7 @@ public C99NoCastExpressionParser(ITokenStream stream, Map<String,String> propert
 }	
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java
index c140f0dbe97..90a36f1dc01 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java
@@ -212,8 +212,10 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -397,8 +399,10 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -488,6 +492,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -571,6 +576,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -599,6 +605,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -650,6 +657,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -678,6 +686,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -698,6 +707,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -715,6 +725,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -735,6 +746,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -746,6 +758,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -757,6 +770,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -768,6 +782,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -779,6 +794,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -790,6 +806,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -815,6 +832,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -832,6 +850,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -860,6 +879,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java
index afc4412c3e5..203e5c1957a 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java
@@ -53,9 +53,11 @@ public class C99Parser extends PrsStream implements RuleAction, ITokenStream,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -102,6 +104,7 @@ public class C99Parser extends PrsStream implements RuleAction, ITokenStream,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return C99Parsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return C99Parsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return C99Parserprs.EOFT_SYMBOL; }
@@ -189,12 +192,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTTranslationUnit   parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -208,25 +213,30 @@ public  IASTTranslationUnit   parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return C99Parsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "C99Parser";
 }
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java
index a5fff97b04f..aa946890b3d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java
@@ -269,8 +269,10 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -512,8 +514,10 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -682,6 +686,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -847,6 +852,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -884,6 +890,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -948,6 +955,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -985,6 +993,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -1010,6 +1019,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -1027,6 +1037,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -1047,6 +1058,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -1058,6 +1070,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -1069,6 +1082,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -1080,6 +1094,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -1091,6 +1106,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -1102,6 +1118,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -1127,6 +1144,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -1147,6 +1165,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -1184,6 +1203,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java
index 0a2607bb77c..6d6cceb3b1d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java
@@ -57,9 +57,11 @@ public class C99SizeofExpressionParser extends PrsStream implements RuleAction,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -106,6 +108,7 @@ public class C99SizeofExpressionParser extends PrsStream implements RuleAction,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return C99SizeofExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return C99SizeofExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return C99SizeofExpressionParserprs.EOFT_SYMBOL; }
@@ -193,12 +196,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -212,19 +217,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return C99SizeofExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "C99SizeofExpressionParser";
@@ -234,6 +243,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -250,6 +260,7 @@ public C99SizeofExpressionParser(ITokenStream stream, Map<String,String> propert
 }	
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java
index 8088f65c433..88af46a307a 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java
@@ -213,8 +213,10 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -399,8 +401,10 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -491,6 +495,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -574,6 +579,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -602,6 +608,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -649,6 +656,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -677,6 +685,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -697,6 +706,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -714,6 +724,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -734,6 +745,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -745,6 +757,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -756,6 +769,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -767,6 +781,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -778,6 +793,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -789,6 +805,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -814,6 +831,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -831,6 +849,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -859,6 +878,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java
index 5eab88df45d..00d6f3f8363 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java
@@ -58,9 +58,11 @@ public class CPPExpressionParser extends PrsStream implements RuleAction, IToken
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -107,6 +109,7 @@ public class CPPExpressionParser extends PrsStream implements RuleAction, IToken
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return CPPExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return CPPExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return CPPExpressionParserprs.EOFT_SYMBOL; }
@@ -194,12 +197,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -213,19 +218,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return CPPExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "CPPExpressionParser";
@@ -235,6 +244,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -257,6 +267,7 @@ public CPPExpressionParser(ITokenStream stream, Map<String,String> properties) {
 }		
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
index 050017f0402..33150acda64 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
@@ -683,8 +683,10 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -1379,8 +1381,10 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -1789,6 +1793,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2191,6 +2196,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2259,6 +2265,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2379,6 +2386,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -2447,6 +2455,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -2485,6 +2494,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -2505,6 +2515,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -2535,6 +2546,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -2555,6 +2567,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -2575,6 +2588,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -2595,6 +2609,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -2615,6 +2630,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -2635,6 +2651,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -2709,6 +2726,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -2754,6 +2772,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -2822,6 +2841,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
index b1b87d4c458..03a563cd28f 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
@@ -58,9 +58,11 @@ public class CPPNoCastExpressionParser extends PrsStream implements RuleAction,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -107,6 +109,7 @@ public class CPPNoCastExpressionParser extends PrsStream implements RuleAction,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return CPPNoCastExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return CPPNoCastExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return CPPNoCastExpressionParserprs.EOFT_SYMBOL; }
@@ -194,12 +197,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -213,19 +218,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return CPPNoCastExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "CPPNoCastExpressionParser";
@@ -235,6 +244,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -257,6 +267,7 @@ public CPPNoCastExpressionParser(ITokenStream stream, Map<String,String> propert
 }		
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
index 61aedec412b..2aeccbbc92e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
@@ -681,8 +681,10 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -1375,8 +1377,10 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -1785,6 +1789,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2187,6 +2192,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2255,6 +2261,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2375,6 +2382,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -2443,6 +2451,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -2482,6 +2491,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -2502,6 +2512,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -2532,6 +2543,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -2552,6 +2564,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -2572,6 +2585,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -2592,6 +2606,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -2612,6 +2627,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -2632,6 +2648,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -2706,6 +2723,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -2751,6 +2769,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -2819,6 +2838,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java
index cac36b0887c..36a3891479c 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java
@@ -58,9 +58,11 @@ public class CPPNoFunctionDeclaratorParser extends PrsStream implements RuleActi
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -107,6 +109,7 @@ public class CPPNoFunctionDeclaratorParser extends PrsStream implements RuleActi
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return CPPNoFunctionDeclaratorParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return CPPNoFunctionDeclaratorParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return CPPNoFunctionDeclaratorParserprs.EOFT_SYMBOL; }
@@ -194,12 +197,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTDeclarator  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -213,19 +218,23 @@ public  IASTDeclarator  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return CPPNoFunctionDeclaratorParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "CPPNoFunctionDeclaratorParser";
@@ -235,6 +244,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -257,6 +267,7 @@ public CPPNoFunctionDeclaratorParser(ITokenStream stream, Map<String,String> pro
 }		
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
index 04277692d27..e887d5db68d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
@@ -692,8 +692,10 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -1397,8 +1399,10 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -1795,6 +1799,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2182,6 +2187,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2250,6 +2256,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2367,6 +2374,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -2435,6 +2443,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -2473,6 +2482,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -2493,6 +2503,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -2523,6 +2534,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -2543,6 +2555,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -2563,6 +2576,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -2583,6 +2597,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -2603,6 +2618,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -2623,6 +2639,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -2697,6 +2714,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -2742,6 +2760,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -2810,6 +2829,7 @@ public class CPPNoFunctionDeclaratorParserprs implements lpg.lpgjavaruntime.Pars
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java
index cb9db917e8a..77885733f01 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java
@@ -54,9 +54,11 @@ public class CPPParser extends PrsStream implements RuleAction, ITokenStream,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -103,6 +105,7 @@ public class CPPParser extends PrsStream implements RuleAction, ITokenStream,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return CPPParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return CPPParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return CPPParserprs.EOFT_SYMBOL; }
@@ -190,12 +193,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTTranslationUnit   parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -209,25 +214,30 @@ public  IASTTranslationUnit   parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return CPPParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "CPPParser";
 }
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
index 7a09731971d..afa3f7de958 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
@@ -688,8 +688,10 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -1389,8 +1391,10 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -1796,6 +1800,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2195,6 +2200,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2263,6 +2269,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2387,6 +2394,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -2455,6 +2463,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -2493,6 +2502,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -2513,6 +2523,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -2543,6 +2554,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -2563,6 +2575,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -2583,6 +2596,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -2603,6 +2617,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -2623,6 +2638,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -2643,6 +2659,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -2717,6 +2734,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -2762,6 +2780,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -2830,6 +2849,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java
index ff1b4090a34..966852de00c 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java
@@ -58,9 +58,11 @@ public class CPPSizeofExpressionParser extends PrsStream implements RuleAction,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -107,6 +109,7 @@ public class CPPSizeofExpressionParser extends PrsStream implements RuleAction,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return CPPSizeofExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return CPPSizeofExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return CPPSizeofExpressionParserprs.EOFT_SYMBOL; }
@@ -194,12 +197,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -213,19 +218,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return CPPSizeofExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "CPPSizeofExpressionParser";
@@ -235,6 +244,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -257,6 +267,7 @@ public CPPSizeofExpressionParser(ITokenStream stream, Map<String,String> propert
 }		
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
index 94775ef3936..9523fbc2d62 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
@@ -686,8 +686,10 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -1385,8 +1387,10 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -1795,6 +1799,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2197,6 +2202,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2265,6 +2271,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2385,6 +2392,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -2453,6 +2461,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -2491,6 +2500,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -2511,6 +2521,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -2541,6 +2552,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -2560,6 +2572,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -2579,6 +2592,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -2598,6 +2612,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -2617,6 +2632,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -2636,6 +2652,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -2710,6 +2727,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -2755,6 +2773,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -2823,6 +2842,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java
index 9c70bef1336..1ff08c00120 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java
@@ -60,9 +60,11 @@ public class CPPTemplateTypeParameterParser extends PrsStream implements RuleAct
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -109,6 +111,7 @@ public class CPPTemplateTypeParameterParser extends PrsStream implements RuleAct
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return CPPTemplateTypeParameterParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return CPPTemplateTypeParameterParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return CPPTemplateTypeParameterParserprs.EOFT_SYMBOL; }
@@ -196,12 +199,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  ICPPASTTemplateParameter  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -215,19 +220,23 @@ public  ICPPASTTemplateParameter  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return CPPTemplateTypeParameterParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "CPPTemplateTypeParameterParser";
@@ -237,6 +246,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -259,6 +269,7 @@ public CPPTemplateTypeParameterParser(ITokenStream stream, Map<String,String> pr
 }		
 
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
index e54b45a58c6..7bb82ea0b44 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
@@ -695,8 +695,10 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -1403,8 +1405,10 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -1804,6 +1808,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2198,6 +2203,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2266,6 +2272,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2383,6 +2390,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -2451,6 +2459,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -2489,6 +2498,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -2509,6 +2519,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -2539,6 +2550,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -2559,6 +2571,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -2579,6 +2592,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -2599,6 +2613,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -2619,6 +2634,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -2639,6 +2655,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -2713,6 +2730,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -2758,6 +2776,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -2826,6 +2845,7 @@ public class CPPTemplateTypeParameterParserprs implements lpg.lpgjavaruntime.Par
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java
index 72d18fbaa4a..96b3bd39e16 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java
@@ -58,9 +58,11 @@ public class GCCParser extends PrsStream implements RuleAction, ITokenStream,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -107,6 +109,7 @@ public class GCCParser extends PrsStream implements RuleAction, ITokenStream,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return GCCParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return GCCParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return GCCParserprs.EOFT_SYMBOL; }
@@ -198,12 +201,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTTranslationUnit   parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -217,19 +222,23 @@ public  IASTTranslationUnit   parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return GCCParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "GCCParser";
@@ -238,6 +247,7 @@ public String getName() {
 
 private  GNUBuildASTParserAction  gnuAction;
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java
index 04f0894df4c..e8e2f3e895e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java
@@ -361,8 +361,10 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -710,8 +712,10 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -946,6 +950,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -1176,6 +1181,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -1221,6 +1227,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -1303,6 +1310,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -1348,6 +1356,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -1375,6 +1384,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -1392,6 +1402,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -1414,6 +1425,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -1431,6 +1443,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -1448,6 +1461,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -1465,6 +1479,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -1482,6 +1497,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -1499,6 +1515,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -1550,6 +1567,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -1580,6 +1598,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -1625,6 +1644,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java
index 6c04c8edadd..3f700def298 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java
@@ -62,9 +62,11 @@ public class GCCSizeofExpressionParser extends PrsStream implements RuleAction,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -111,6 +113,7 @@ public class GCCSizeofExpressionParser extends PrsStream implements RuleAction,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return GCCSizeofExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return GCCSizeofExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return GCCSizeofExpressionParserprs.EOFT_SYMBOL; }
@@ -202,12 +205,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -221,19 +226,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return GCCSizeofExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "GCCSizeofExpressionParser";
@@ -243,6 +252,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -261,6 +271,7 @@ public GCCSizeofExpressionParser(ITokenStream stream, Map<String,String> propert
 
 private  GNUBuildASTParserAction  gnuAction;
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java
index 41c1b0f2035..98c8ecfc11d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java
@@ -345,8 +345,10 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction {
@@ -676,8 +678,10 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char baseAction[] = BaseAction.baseAction;
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -892,6 +896,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -1099,6 +1104,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -1141,6 +1147,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -1212,6 +1219,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -1254,6 +1262,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -1279,6 +1288,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -1296,6 +1306,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -1318,6 +1329,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -1334,6 +1346,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -1350,6 +1363,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -1366,6 +1380,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -1382,6 +1397,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static byte scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -1398,6 +1414,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -1448,6 +1465,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -1476,6 +1494,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -1518,6 +1537,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java
index eade3f18542..27b23cf089d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java
@@ -60,9 +60,11 @@ public class GPPParser extends PrsStream implements RuleAction, ITokenStream,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -109,6 +111,7 @@ public class GPPParser extends PrsStream implements RuleAction, ITokenStream,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return GPPParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return GPPParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return GPPParserprs.EOFT_SYMBOL; }
@@ -200,12 +203,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTTranslationUnit   parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -219,19 +224,23 @@ public  IASTTranslationUnit   parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return GPPParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "GPPParser";
@@ -240,6 +249,7 @@ public String getName() {
 
 private  GNUBuildASTParserAction  gnuAction;
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java
index 71c515e22b5..0a71e91cb1b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java
@@ -831,8 +831,10 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction0 {
@@ -1743,8 +1745,10 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         index += BaseAction0.baseAction0.length;
         System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length);
     };
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -2298,6 +2302,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2848,6 +2853,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2924,6 +2930,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -3070,6 +3077,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -3146,6 +3154,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -3188,6 +3197,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -3209,6 +3219,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -3241,6 +3252,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -3264,6 +3276,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -3287,6 +3300,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -3310,6 +3324,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -3333,6 +3348,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -3356,6 +3372,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -3443,6 +3460,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -3499,6 +3517,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -3575,6 +3594,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java
index 1089558fb18..e41f55c7321 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java
@@ -64,9 +64,11 @@ public class GPPSizeofExpressionParser extends PrsStream implements RuleAction,
     public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
 
     public int getLeftSpan() { return btParser.getFirstToken(); }
+    @Override
     public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
 
     public int getRightSpan() { return btParser.getLastToken(); }
+    @Override
     public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
 
     public int getRhsErrorTokenIndex(int i)
@@ -113,6 +115,7 @@ public class GPPSizeofExpressionParser extends PrsStream implements RuleAction,
         } 
     }
 
+    @Override
     public String[] orderedTerminalSymbols() { return GPPSizeofExpressionParsersym.orderedTerminalSymbols; }
     public String getTokenKindName(int kind) { return GPPSizeofExpressionParsersym.orderedTerminalSymbols[kind]; }
     public int getEOFTokenKind() { return GPPSizeofExpressionParserprs.EOFT_SYMBOL; }
@@ -204,12 +207,14 @@ private void initActions(Map<String,String> properties) {
 }
 
 
+@Override
 public void addToken(IToken token) {
 	token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 	super.addToken(token);
 }
 
 
+@Override
 public  IASTExpression  parse() {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
@@ -223,19 +228,23 @@ public  IASTExpression  parse() {
 }
 
 
+@Override
 public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
 // uncomment this method to use with backtracking parser
+@Override
 public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
+@Override
 public String[] getOrderedTerminalSymbols() {
 	return GPPSizeofExpressionParsersym.orderedTerminalSymbols;
 }
 
+@Override
 @SuppressWarnings("nls")
 public String getName() {
 	return "GPPSizeofExpressionParser";
@@ -245,6 +254,7 @@ public String getName() {
 
 private ITokenMap tokenMap = null;
 
+@Override
 public void setTokens(List<IToken> tokens) {
 	resetTokenStream();
 	addToken(new Token(null, 0, 0, 0)); // dummy token
@@ -269,6 +279,7 @@ public GPPSizeofExpressionParser(ITokenStream stream, Map<String,String> propert
 
 private  GNUBuildASTParserAction  gnuAction;
 
+    @Override
     public void ruleAction(int ruleNumber)
     {
         switch (ruleNumber)
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java
index ae7452e0177..9b1040d3bd4 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java
@@ -809,8 +809,10 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static short baseCheck[] = BaseCheck.baseCheck;
+    @Override
     public final int baseCheck(int index) { return baseCheck[index]; }
     public final static short rhs[] = baseCheck;
+    @Override
     public final int rhs(int index) { return rhs[index]; };
 
     public interface BaseAction0 {
@@ -1697,8 +1699,10 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         index += BaseAction0.baseAction0.length;
         System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length);
     };
+    @Override
     public final int baseAction(int index) { return baseAction[index]; }
     public final static char lhs[] = baseAction;
+    @Override
     public final int lhs(int index) { return lhs[index]; };
 
     public interface TermCheck {
@@ -2230,6 +2234,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termCheck[] = TermCheck.termCheck;
+    @Override
     public final int termCheck(int index) { return termCheck[index]; }
 
     public interface TermAction {
@@ -2757,6 +2762,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char termAction[] = TermAction.termAction;
+    @Override
     public final int termAction(int index) { return termAction[index]; }
 
     public interface Asb {
@@ -2832,6 +2838,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asb[] = Asb.asb;
+    @Override
     public final int asb(int index) { return asb[index]; }
 
     public interface Asr {
@@ -2978,6 +2985,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char asr[] = Asr.asr;
+    @Override
     public final int asr(int index) { return asr[index]; }
 
     public interface Nasb {
@@ -3053,6 +3061,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasb[] = Nasb.nasb;
+    @Override
     public final int nasb(int index) { return nasb[index]; }
 
     public interface Nasr {
@@ -3095,6 +3104,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nasr[] = Nasr.nasr;
+    @Override
     public final int nasr(int index) { return nasr[index]; }
 
     public interface TerminalIndex {
@@ -3116,6 +3126,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char terminalIndex[] = TerminalIndex.terminalIndex;
+    @Override
     public final int terminalIndex(int index) { return terminalIndex[index]; }
 
     public interface NonterminalIndex {
@@ -3148,6 +3159,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
+    @Override
     public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
 
     public interface ScopePrefix {
@@ -3170,6 +3182,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopePrefix[] = ScopePrefix.scopePrefix;
+    @Override
     public final int scopePrefix(int index) { return scopePrefix[index]; }
 
     public interface ScopeSuffix {
@@ -3192,6 +3205,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
+    @Override
     public final int scopeSuffix(int index) { return scopeSuffix[index]; }
 
     public interface ScopeLhs {
@@ -3214,6 +3228,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLhs[] = ScopeLhs.scopeLhs;
+    @Override
     public final int scopeLhs(int index) { return scopeLhs[index]; }
 
     public interface ScopeLa {
@@ -3236,6 +3251,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeLa[] = ScopeLa.scopeLa;
+    @Override
     public final int scopeLa(int index) { return scopeLa[index]; }
 
     public interface ScopeStateSet {
@@ -3258,6 +3274,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
+    @Override
     public final int scopeStateSet(int index) { return scopeStateSet[index]; }
 
     public interface ScopeRhs {
@@ -3344,6 +3361,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeRhs[] = ScopeRhs.scopeRhs;
+    @Override
     public final int scopeRhs(int index) { return scopeRhs[index]; }
 
     public interface ScopeState {
@@ -3399,6 +3417,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char scopeState[] = ScopeState.scopeState;
+    @Override
     public final int scopeState(int index) { return scopeState[index]; }
 
     public interface InSymb {
@@ -3474,6 +3493,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
         };
     };
     public final static char inSymb[] = InSymb.inSymb;
+    @Override
     public final int inSymb(int index) { return inSymb[index]; }
 
     public interface Name {