Bug 540373: Cleanup: Organize Imports

This was done by selecting all projects in Eclipse then Source -> Clean Up... -> choosing: - Organize Imports and completing the wizard Change-Id: Ia7b305a4c967d0e6f4e8fb8c1041e7028b24006c
author: Jonah Graham 2018-11-20 16:20:42 +0000
committer: Jonah Graham 2018-11-22 21:47:02 +0000
commit: a923614c73274179d56e78d35d17aef149c23a03 (patch)
tree: 668905afc85ffbb08e42844f6abafbcf038f7e10 /lrparser/org.eclipse.cdt.core.lrparser/src
parent: 170e654b4796bad1453ae85a427b97317d67a69a (diff)
download: org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.tar.gz
org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.tar.xz
org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.zip
27 files changed, 1502 insertions, 236 deletions
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java
index bc126d97190..ca82d49cfa3 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java
@@ -13,13 +13,13 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.lrparser;
 
-import lpg.lpgjavaruntime.IToken;
-import lpg.lpgjavaruntime.Token;
-
 import org.eclipse.cdt.core.parser.EndOfFileException;
 import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.core.parser.OffsetLimitReachedException;
 
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.Token;
+
 /**
  * Adapts the CPreprocessor from the CDT core for use with LPG based parsers.
  *
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java
index 6ef6f0bfe0d..584c4ee8ee9 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java
@@ -15,10 +15,10 @@ package org.eclipse.cdt.core.dom.lrparser;
 
 import java.util.List;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 
+import lpg.lpgjavaruntime.IToken;
+
 public interface ISecondaryParser<N extends IASTNode> extends IParser<N> {
 
 	/**
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java
index 87617550e74..456ad6a8d03 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java
@@ -17,14 +17,14 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 
+import lpg.lpgjavaruntime.IToken;
+
 @SuppressWarnings("restriction")
 public abstract class AbstractParserAction {
 
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java
index 091d0e57a2e..8c347d47c56 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java
@@ -16,12 +16,12 @@ package org.eclipse.cdt.core.dom.lrparser.action;
 import java.util.Arrays;
 import java.util.List;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 
+import lpg.lpgjavaruntime.IToken;
+
 @SuppressWarnings("restriction")
 public final class ParserUtil {
 
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java
index 46034b94d4b..d4862fa2d5f 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java
@@ -14,14 +14,42 @@
 
 package org.eclipse.cdt.core.dom.lrparser.action.c99;
 
-import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.*;
-import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.endOffset;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.length;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.matchTokens;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.offset;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Bool;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Complex;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_char;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_const;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_double;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_float;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_for;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_int;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_long;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_register;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_restrict;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_short;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_static;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_union;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_void;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_volatile;
 
 import java.util.Collections;
 import java.util.List;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
@@ -79,6 +107,8 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousStatement;
 import org.eclipse.cdt.internal.core.dom.parser.c.CASTAmbiguousExpression;
 import org.eclipse.cdt.internal.core.dom.parser.c.CASTAmbiguousStatement;
 
+import lpg.lpgjavaruntime.IToken;
+
 /**
  * Semantic actions called by the C99 parser to build an AST.
  *
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
index 6b5f482d5dc..4a97e4c916b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
@@ -13,10 +13,55 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.lrparser.action.cpp;
 
-import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.*;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.endOffset;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.length;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.matchTokens;
+import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.offset;
 import static org.eclipse.cdt.core.parser.util.CollectionUtils.findFirstAndRemove;
 import static org.eclipse.cdt.core.parser.util.CollectionUtils.reverseIterable;
-import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.*;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_ColonColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_bool;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_char;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_class;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_const;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_delete;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_double;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_explicit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_float;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_for;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_friend;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_int;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_long;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_mutable;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_new;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_private;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_protected;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_public;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_register;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_short;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_static;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typename;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_union;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_virtual;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_void;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_wchar_t;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,8 +69,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
@@ -118,6 +161,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTAmbiguousTemplateArgum
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTConstructorInitializer;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.OverloadableOperator;
 
+import lpg.lpgjavaruntime.IToken;
+
 /**
  * Semantic actions that build the AST during the parse.
  * These are the actions that are specific to the C++ parser, the superclass
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java
index a9f6963bfdc..8d426ae8381 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java
@@ -17,8 +17,6 @@ import static org.eclipse.cdt.core.parser.util.CollectionUtils.findFirstAndRemov
 
 import java.util.List;
 
-import lpg.lpgjavaruntime.IToken;
-
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTExpression;
 import org.eclipse.cdt.core.dom.ast.IASTInitializerList;
@@ -38,6 +36,8 @@ import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.ICPPSecondaryParserFactory;
 import org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym;
 
+import lpg.lpgjavaruntime.IToken;
+
 public class GPPBuildASTParserAction extends CPPBuildASTParserAction {
 	private final ICPPNodeFactory nodeFactory;
 
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 2bd909aca3f..b49ed623cf2 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
@@ -13,8 +13,196 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.lrparser.c99;
 
-import static org.eclipse.cdt.core.parser.IToken.*;
-import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*;
+import static org.eclipse.cdt.core.parser.IToken.tAMPER;
+import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tAND;
+import static org.eclipse.cdt.core.parser.IToken.tARROW;
+import static org.eclipse.cdt.core.parser.IToken.tASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT;
+import static org.eclipse.cdt.core.parser.IToken.tBITOR;
+import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOMMA;
+import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION;
+import static org.eclipse.cdt.core.parser.IToken.tDECR;
+import static org.eclipse.cdt.core.parser.IToken.tDIV;
+import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tDOT;
+import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS;
+import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT;
+import static org.eclipse.cdt.core.parser.IToken.tEOC;
+import static org.eclipse.cdt.core.parser.IToken.tEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT;
+import static org.eclipse.cdt.core.parser.IToken.tGT;
+import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER;
+import static org.eclipse.cdt.core.parser.IToken.tINCR;
+import static org.eclipse.cdt.core.parser.IToken.tINTEGER;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tLCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tLPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tLSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tLT;
+import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tMINUS;
+import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tMOD;
+import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tNOT;
+import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tOR;
+import static org.eclipse.cdt.core.parser.IToken.tPLUS;
+import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tQUESTION;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tRPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tSEMI;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTL;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTR;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING;
+import static org.eclipse.cdt.core.parser.IToken.tXOR;
+import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.t__Bool;
+import static org.eclipse.cdt.core.parser.IToken.t__Complex;
+import static org.eclipse.cdt.core.parser.IToken.t__Imaginary;
+import static org.eclipse.cdt.core.parser.IToken.t_auto;
+import static org.eclipse.cdt.core.parser.IToken.t_break;
+import static org.eclipse.cdt.core.parser.IToken.t_case;
+import static org.eclipse.cdt.core.parser.IToken.t_char;
+import static org.eclipse.cdt.core.parser.IToken.t_const;
+import static org.eclipse.cdt.core.parser.IToken.t_continue;
+import static org.eclipse.cdt.core.parser.IToken.t_default;
+import static org.eclipse.cdt.core.parser.IToken.t_do;
+import static org.eclipse.cdt.core.parser.IToken.t_double;
+import static org.eclipse.cdt.core.parser.IToken.t_else;
+import static org.eclipse.cdt.core.parser.IToken.t_enum;
+import static org.eclipse.cdt.core.parser.IToken.t_extern;
+import static org.eclipse.cdt.core.parser.IToken.t_float;
+import static org.eclipse.cdt.core.parser.IToken.t_for;
+import static org.eclipse.cdt.core.parser.IToken.t_goto;
+import static org.eclipse.cdt.core.parser.IToken.t_if;
+import static org.eclipse.cdt.core.parser.IToken.t_inline;
+import static org.eclipse.cdt.core.parser.IToken.t_int;
+import static org.eclipse.cdt.core.parser.IToken.t_long;
+import static org.eclipse.cdt.core.parser.IToken.t_register;
+import static org.eclipse.cdt.core.parser.IToken.t_restrict;
+import static org.eclipse.cdt.core.parser.IToken.t_return;
+import static org.eclipse.cdt.core.parser.IToken.t_short;
+import static org.eclipse.cdt.core.parser.IToken.t_signed;
+import static org.eclipse.cdt.core.parser.IToken.t_sizeof;
+import static org.eclipse.cdt.core.parser.IToken.t_static;
+import static org.eclipse.cdt.core.parser.IToken.t_struct;
+import static org.eclipse.cdt.core.parser.IToken.t_switch;
+import static org.eclipse.cdt.core.parser.IToken.t_typedef;
+import static org.eclipse.cdt.core.parser.IToken.t_union;
+import static org.eclipse.cdt.core.parser.IToken.t_unsigned;
+import static org.eclipse.cdt.core.parser.IToken.t_void;
+import static org.eclipse.cdt.core.parser.IToken.t_volatile;
+import static org.eclipse.cdt.core.parser.IToken.t_while;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_And;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_AndAnd;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_AndAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Arrow;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Assign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Bang;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Caret;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_CaretAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Colon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Comma;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Dot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_DotDotDot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EOF_TOKEN;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EQ;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_GE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_GT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Invalid;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Minus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_MinusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_MinusMinus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_NE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Or;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_OrAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_OrOr;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Percent;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_PercentAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Plus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_PlusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_PlusPlus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Question;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Slash;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_SlashAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Star;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_StarAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Tilde;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Bool;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Complex;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Imaginary;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_break;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_case;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_char;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_charconst;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_const;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_continue;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_default;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_do;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_double;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_else;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_float;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_floating;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_for;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_goto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_if;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_int;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_integer;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_long;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_register;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_restrict;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_return;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_short;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_sizeof;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_static;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_stringlit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_switch;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_union;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_void;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_while;
 
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.parser.IToken;
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 d5ab01d7669..fe465f6821a 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
@@ -13,8 +13,255 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.lrparser.cpp;
 
-import static org.eclipse.cdt.core.parser.IToken.*;
-import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.*;
+import static org.eclipse.cdt.core.parser.IToken.tAMPER;
+import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tAND;
+import static org.eclipse.cdt.core.parser.IToken.tARROW;
+import static org.eclipse.cdt.core.parser.IToken.tARROWSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT;
+import static org.eclipse.cdt.core.parser.IToken.tBITOR;
+import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOLONCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOMMA;
+import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION;
+import static org.eclipse.cdt.core.parser.IToken.tDECR;
+import static org.eclipse.cdt.core.parser.IToken.tDIV;
+import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tDOT;
+import static org.eclipse.cdt.core.parser.IToken.tDOTSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS;
+import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT;
+import static org.eclipse.cdt.core.parser.IToken.tEOC;
+import static org.eclipse.cdt.core.parser.IToken.tEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT;
+import static org.eclipse.cdt.core.parser.IToken.tGT;
+import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER;
+import static org.eclipse.cdt.core.parser.IToken.tINCR;
+import static org.eclipse.cdt.core.parser.IToken.tINTEGER;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tLCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tLPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tLSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tLT;
+import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tMINUS;
+import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tMOD;
+import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tNOT;
+import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tOR;
+import static org.eclipse.cdt.core.parser.IToken.tPLUS;
+import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tPOUND;
+import static org.eclipse.cdt.core.parser.IToken.tQUESTION;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tRPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tSEMI;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTL;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTR;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING;
+import static org.eclipse.cdt.core.parser.IToken.tXOR;
+import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.t_asm;
+import static org.eclipse.cdt.core.parser.IToken.t_auto;
+import static org.eclipse.cdt.core.parser.IToken.t_bool;
+import static org.eclipse.cdt.core.parser.IToken.t_break;
+import static org.eclipse.cdt.core.parser.IToken.t_case;
+import static org.eclipse.cdt.core.parser.IToken.t_catch;
+import static org.eclipse.cdt.core.parser.IToken.t_char;
+import static org.eclipse.cdt.core.parser.IToken.t_class;
+import static org.eclipse.cdt.core.parser.IToken.t_const;
+import static org.eclipse.cdt.core.parser.IToken.t_const_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_continue;
+import static org.eclipse.cdt.core.parser.IToken.t_default;
+import static org.eclipse.cdt.core.parser.IToken.t_delete;
+import static org.eclipse.cdt.core.parser.IToken.t_do;
+import static org.eclipse.cdt.core.parser.IToken.t_double;
+import static org.eclipse.cdt.core.parser.IToken.t_dynamic_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_else;
+import static org.eclipse.cdt.core.parser.IToken.t_enum;
+import static org.eclipse.cdt.core.parser.IToken.t_explicit;
+import static org.eclipse.cdt.core.parser.IToken.t_export;
+import static org.eclipse.cdt.core.parser.IToken.t_extern;
+import static org.eclipse.cdt.core.parser.IToken.t_false;
+import static org.eclipse.cdt.core.parser.IToken.t_float;
+import static org.eclipse.cdt.core.parser.IToken.t_for;
+import static org.eclipse.cdt.core.parser.IToken.t_friend;
+import static org.eclipse.cdt.core.parser.IToken.t_goto;
+import static org.eclipse.cdt.core.parser.IToken.t_if;
+import static org.eclipse.cdt.core.parser.IToken.t_inline;
+import static org.eclipse.cdt.core.parser.IToken.t_int;
+import static org.eclipse.cdt.core.parser.IToken.t_long;
+import static org.eclipse.cdt.core.parser.IToken.t_mutable;
+import static org.eclipse.cdt.core.parser.IToken.t_namespace;
+import static org.eclipse.cdt.core.parser.IToken.t_new;
+import static org.eclipse.cdt.core.parser.IToken.t_operator;
+import static org.eclipse.cdt.core.parser.IToken.t_private;
+import static org.eclipse.cdt.core.parser.IToken.t_protected;
+import static org.eclipse.cdt.core.parser.IToken.t_public;
+import static org.eclipse.cdt.core.parser.IToken.t_register;
+import static org.eclipse.cdt.core.parser.IToken.t_reinterpret_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_return;
+import static org.eclipse.cdt.core.parser.IToken.t_short;
+import static org.eclipse.cdt.core.parser.IToken.t_signed;
+import static org.eclipse.cdt.core.parser.IToken.t_sizeof;
+import static org.eclipse.cdt.core.parser.IToken.t_static;
+import static org.eclipse.cdt.core.parser.IToken.t_static_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_struct;
+import static org.eclipse.cdt.core.parser.IToken.t_switch;
+import static org.eclipse.cdt.core.parser.IToken.t_template;
+import static org.eclipse.cdt.core.parser.IToken.t_this;
+import static org.eclipse.cdt.core.parser.IToken.t_throw;
+import static org.eclipse.cdt.core.parser.IToken.t_true;
+import static org.eclipse.cdt.core.parser.IToken.t_try;
+import static org.eclipse.cdt.core.parser.IToken.t_typedef;
+import static org.eclipse.cdt.core.parser.IToken.t_typeid;
+import static org.eclipse.cdt.core.parser.IToken.t_typename;
+import static org.eclipse.cdt.core.parser.IToken.t_union;
+import static org.eclipse.cdt.core.parser.IToken.t_unsigned;
+import static org.eclipse.cdt.core.parser.IToken.t_using;
+import static org.eclipse.cdt.core.parser.IToken.t_virtual;
+import static org.eclipse.cdt.core.parser.IToken.t_void;
+import static org.eclipse.cdt.core.parser.IToken.t_volatile;
+import static org.eclipse.cdt.core.parser.IToken.t_wchar_t;
+import static org.eclipse.cdt.core.parser.IToken.t_while;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_And;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_AndAnd;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_AndAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Arrow;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_ArrowStar;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Assign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Bang;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Caret;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_CaretAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Colon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_ColonColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Comma;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Dot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_DotDotDot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_DotStar;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EOF_TOKEN;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EQ;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_GE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_GT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Invalid;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Minus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_MinusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_MinusMinus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_NE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Or;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_OrAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_OrOr;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Percent;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_PercentAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Plus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_PlusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_PlusPlus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Question;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Slash;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_SlashAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Star;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_StarAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Tilde;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_asm;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_bool;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_break;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_case;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_catch;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_char;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_charconst;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_class;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_const;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_const_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_continue;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_default;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_delete;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_do;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_double;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_dynamic_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_else;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_explicit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_export;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_false;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_float;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_floating;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_for;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_friend;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_goto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_if;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_int;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_integer;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_long;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_mutable;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_namespace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_new;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_operator;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_private;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_protected;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_public;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_register;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_reinterpret_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_return;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_short;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_sizeof;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_static;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_static_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_stringlit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_switch;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_template;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_this;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_throw;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_true;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_try;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typeid;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typename;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_union;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_using;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_virtual;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_void;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_wchar_t;
+import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_while;
 
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.parser.IToken;
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 e0bda11d4d3..ab23aa22d19 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
@@ -13,8 +13,204 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.lrparser.gnu;
 
-import static org.eclipse.cdt.core.parser.IToken.*;
-import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.*;
+import static org.eclipse.cdt.core.parser.IToken.tAMPER;
+import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tAND;
+import static org.eclipse.cdt.core.parser.IToken.tARROW;
+import static org.eclipse.cdt.core.parser.IToken.tASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT;
+import static org.eclipse.cdt.core.parser.IToken.tBITOR;
+import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOMMA;
+import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION;
+import static org.eclipse.cdt.core.parser.IToken.tDECR;
+import static org.eclipse.cdt.core.parser.IToken.tDIV;
+import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tDOT;
+import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS;
+import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT;
+import static org.eclipse.cdt.core.parser.IToken.tEOC;
+import static org.eclipse.cdt.core.parser.IToken.tEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT;
+import static org.eclipse.cdt.core.parser.IToken.tGT;
+import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER;
+import static org.eclipse.cdt.core.parser.IToken.tINCR;
+import static org.eclipse.cdt.core.parser.IToken.tINTEGER;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tLCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tLPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tLSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tLT;
+import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tMINUS;
+import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tMOD;
+import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tNOT;
+import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tOR;
+import static org.eclipse.cdt.core.parser.IToken.tPLUS;
+import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tQUESTION;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tRPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tSEMI;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTL;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTR;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING;
+import static org.eclipse.cdt.core.parser.IToken.tXOR;
+import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.t__Bool;
+import static org.eclipse.cdt.core.parser.IToken.t__Complex;
+import static org.eclipse.cdt.core.parser.IToken.t__Imaginary;
+import static org.eclipse.cdt.core.parser.IToken.t_asm;
+import static org.eclipse.cdt.core.parser.IToken.t_auto;
+import static org.eclipse.cdt.core.parser.IToken.t_break;
+import static org.eclipse.cdt.core.parser.IToken.t_case;
+import static org.eclipse.cdt.core.parser.IToken.t_char;
+import static org.eclipse.cdt.core.parser.IToken.t_const;
+import static org.eclipse.cdt.core.parser.IToken.t_continue;
+import static org.eclipse.cdt.core.parser.IToken.t_default;
+import static org.eclipse.cdt.core.parser.IToken.t_do;
+import static org.eclipse.cdt.core.parser.IToken.t_double;
+import static org.eclipse.cdt.core.parser.IToken.t_else;
+import static org.eclipse.cdt.core.parser.IToken.t_enum;
+import static org.eclipse.cdt.core.parser.IToken.t_extern;
+import static org.eclipse.cdt.core.parser.IToken.t_float;
+import static org.eclipse.cdt.core.parser.IToken.t_for;
+import static org.eclipse.cdt.core.parser.IToken.t_goto;
+import static org.eclipse.cdt.core.parser.IToken.t_if;
+import static org.eclipse.cdt.core.parser.IToken.t_inline;
+import static org.eclipse.cdt.core.parser.IToken.t_int;
+import static org.eclipse.cdt.core.parser.IToken.t_long;
+import static org.eclipse.cdt.core.parser.IToken.t_register;
+import static org.eclipse.cdt.core.parser.IToken.t_restrict;
+import static org.eclipse.cdt.core.parser.IToken.t_return;
+import static org.eclipse.cdt.core.parser.IToken.t_short;
+import static org.eclipse.cdt.core.parser.IToken.t_signed;
+import static org.eclipse.cdt.core.parser.IToken.t_sizeof;
+import static org.eclipse.cdt.core.parser.IToken.t_static;
+import static org.eclipse.cdt.core.parser.IToken.t_struct;
+import static org.eclipse.cdt.core.parser.IToken.t_switch;
+import static org.eclipse.cdt.core.parser.IToken.t_typedef;
+import static org.eclipse.cdt.core.parser.IToken.t_union;
+import static org.eclipse.cdt.core.parser.IToken.t_unsigned;
+import static org.eclipse.cdt.core.parser.IToken.t_void;
+import static org.eclipse.cdt.core.parser.IToken.t_volatile;
+import static org.eclipse.cdt.core.parser.IToken.t_while;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_And;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_AndAnd;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_AndAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Arrow;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Assign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Bang;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Caret;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_CaretAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Colon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Comma;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Dot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_DotDotDot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_EOF_TOKEN;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_EQ;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_GE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_GT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Invalid;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MAX;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MIN;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Minus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MinusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MinusMinus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_NE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Or;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_OrAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_OrOr;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Percent;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_PercentAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Plus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_PlusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_PlusPlus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Question;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Slash;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_SlashAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Star;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_StarAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Tilde;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK__Bool;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK__Complex;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK__Imaginary;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK___alignof__;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK___attribute__;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK___declspec;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_asm;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_break;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_case;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_char;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_charconst;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_const;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_continue;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_default;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_do;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_double;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_else;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_float;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_floating;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_for;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_goto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_if;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_int;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_integer;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_long;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_register;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_restrict;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_return;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_short;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_sizeof;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_static;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_stringlit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_switch;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_typeof;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_union;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_void;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_while;
 
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.parser.IGCCToken;
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 fc449516b01..8f48d4f4160 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
@@ -13,8 +13,267 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.dom.lrparser.gnu;
 
-import static org.eclipse.cdt.core.parser.IToken.*;
-import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.*;
+import static org.eclipse.cdt.core.parser.IToken.tAMPER;
+import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tAND;
+import static org.eclipse.cdt.core.parser.IToken.tARROW;
+import static org.eclipse.cdt.core.parser.IToken.tARROWSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT;
+import static org.eclipse.cdt.core.parser.IToken.tBITOR;
+import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOLONCOLON;
+import static org.eclipse.cdt.core.parser.IToken.tCOMMA;
+import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION;
+import static org.eclipse.cdt.core.parser.IToken.tDECR;
+import static org.eclipse.cdt.core.parser.IToken.tDIV;
+import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tDOT;
+import static org.eclipse.cdt.core.parser.IToken.tDOTSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS;
+import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT;
+import static org.eclipse.cdt.core.parser.IToken.tEOC;
+import static org.eclipse.cdt.core.parser.IToken.tEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT;
+import static org.eclipse.cdt.core.parser.IToken.tGT;
+import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER;
+import static org.eclipse.cdt.core.parser.IToken.tINCR;
+import static org.eclipse.cdt.core.parser.IToken.tINTEGER;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tLBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tLCHAR;
+import static org.eclipse.cdt.core.parser.IToken.tLPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tLSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tLT;
+import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tMINUS;
+import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tMOD;
+import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tNOT;
+import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL;
+import static org.eclipse.cdt.core.parser.IToken.tOR;
+import static org.eclipse.cdt.core.parser.IToken.tPLUS;
+import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tPOUND;
+import static org.eclipse.cdt.core.parser.IToken.tQUESTION;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACE;
+import static org.eclipse.cdt.core.parser.IToken.tRBRACKET;
+import static org.eclipse.cdt.core.parser.IToken.tRPAREN;
+import static org.eclipse.cdt.core.parser.IToken.tSEMI;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTL;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTR;
+import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTAR;
+import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.tSTRING;
+import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR;
+import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING;
+import static org.eclipse.cdt.core.parser.IToken.tXOR;
+import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN;
+import static org.eclipse.cdt.core.parser.IToken.t__Complex;
+import static org.eclipse.cdt.core.parser.IToken.t__Imaginary;
+import static org.eclipse.cdt.core.parser.IToken.t_asm;
+import static org.eclipse.cdt.core.parser.IToken.t_auto;
+import static org.eclipse.cdt.core.parser.IToken.t_bool;
+import static org.eclipse.cdt.core.parser.IToken.t_break;
+import static org.eclipse.cdt.core.parser.IToken.t_case;
+import static org.eclipse.cdt.core.parser.IToken.t_catch;
+import static org.eclipse.cdt.core.parser.IToken.t_char;
+import static org.eclipse.cdt.core.parser.IToken.t_class;
+import static org.eclipse.cdt.core.parser.IToken.t_const;
+import static org.eclipse.cdt.core.parser.IToken.t_const_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_continue;
+import static org.eclipse.cdt.core.parser.IToken.t_default;
+import static org.eclipse.cdt.core.parser.IToken.t_delete;
+import static org.eclipse.cdt.core.parser.IToken.t_do;
+import static org.eclipse.cdt.core.parser.IToken.t_double;
+import static org.eclipse.cdt.core.parser.IToken.t_dynamic_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_else;
+import static org.eclipse.cdt.core.parser.IToken.t_enum;
+import static org.eclipse.cdt.core.parser.IToken.t_explicit;
+import static org.eclipse.cdt.core.parser.IToken.t_export;
+import static org.eclipse.cdt.core.parser.IToken.t_extern;
+import static org.eclipse.cdt.core.parser.IToken.t_false;
+import static org.eclipse.cdt.core.parser.IToken.t_float;
+import static org.eclipse.cdt.core.parser.IToken.t_for;
+import static org.eclipse.cdt.core.parser.IToken.t_friend;
+import static org.eclipse.cdt.core.parser.IToken.t_goto;
+import static org.eclipse.cdt.core.parser.IToken.t_if;
+import static org.eclipse.cdt.core.parser.IToken.t_inline;
+import static org.eclipse.cdt.core.parser.IToken.t_int;
+import static org.eclipse.cdt.core.parser.IToken.t_long;
+import static org.eclipse.cdt.core.parser.IToken.t_mutable;
+import static org.eclipse.cdt.core.parser.IToken.t_namespace;
+import static org.eclipse.cdt.core.parser.IToken.t_new;
+import static org.eclipse.cdt.core.parser.IToken.t_operator;
+import static org.eclipse.cdt.core.parser.IToken.t_private;
+import static org.eclipse.cdt.core.parser.IToken.t_protected;
+import static org.eclipse.cdt.core.parser.IToken.t_public;
+import static org.eclipse.cdt.core.parser.IToken.t_register;
+import static org.eclipse.cdt.core.parser.IToken.t_reinterpret_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_restrict;
+import static org.eclipse.cdt.core.parser.IToken.t_return;
+import static org.eclipse.cdt.core.parser.IToken.t_short;
+import static org.eclipse.cdt.core.parser.IToken.t_signed;
+import static org.eclipse.cdt.core.parser.IToken.t_sizeof;
+import static org.eclipse.cdt.core.parser.IToken.t_static;
+import static org.eclipse.cdt.core.parser.IToken.t_static_cast;
+import static org.eclipse.cdt.core.parser.IToken.t_struct;
+import static org.eclipse.cdt.core.parser.IToken.t_switch;
+import static org.eclipse.cdt.core.parser.IToken.t_template;
+import static org.eclipse.cdt.core.parser.IToken.t_this;
+import static org.eclipse.cdt.core.parser.IToken.t_throw;
+import static org.eclipse.cdt.core.parser.IToken.t_true;
+import static org.eclipse.cdt.core.parser.IToken.t_try;
+import static org.eclipse.cdt.core.parser.IToken.t_typedef;
+import static org.eclipse.cdt.core.parser.IToken.t_typeid;
+import static org.eclipse.cdt.core.parser.IToken.t_typename;
+import static org.eclipse.cdt.core.parser.IToken.t_union;
+import static org.eclipse.cdt.core.parser.IToken.t_unsigned;
+import static org.eclipse.cdt.core.parser.IToken.t_using;
+import static org.eclipse.cdt.core.parser.IToken.t_virtual;
+import static org.eclipse.cdt.core.parser.IToken.t_void;
+import static org.eclipse.cdt.core.parser.IToken.t_volatile;
+import static org.eclipse.cdt.core.parser.IToken.t_wchar_t;
+import static org.eclipse.cdt.core.parser.IToken.t_while;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_And;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_AndAnd;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_AndAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Arrow;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_ArrowStar;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Assign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Bang;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Caret;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_CaretAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Colon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_ColonColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Comma;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Completion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Dot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_DotDotDot;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_DotStar;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_EOF_TOKEN;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_EQ;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_EndOfCompletion;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_GE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_GT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Invalid;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LT;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MAX;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MIN;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Minus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MinusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MinusMinus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_NE;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Or;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_OrAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_OrOr;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Percent;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_PercentAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Plus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_PlusAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_PlusPlus;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Question;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightBrace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightBracket;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightParen;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightShift;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightShiftAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_SemiColon;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Slash;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_SlashAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Star;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_StarAssign;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Tilde;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK__Complex;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK__Imaginary;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK___alignof__;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK___attribute__;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK___declspec;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_asm;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_auto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_bool;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_break;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_case;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_catch;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_char;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_charconst;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_class;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_const;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_const_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_continue;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_default;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_delete;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_do;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_double;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_dynamic_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_else;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_enum;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_explicit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_export;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_extern;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_false;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_float;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_floating;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_for;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_friend;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_goto;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_identifier;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_if;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_inline;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_int;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_integer;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_long;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_mutable;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_namespace;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_new;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_operator;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_private;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_protected;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_public;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_register;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_reinterpret_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_restrict;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_return;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_short;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_signed;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_sizeof;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_static;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_static_cast;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_stringlit;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_struct;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_switch;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_template;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_this;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_throw;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_true;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_try;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typedef;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typeid;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typename;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typeof;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_union;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_unsigned;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_using;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_virtual;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_void;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_volatile;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_wchar_t;
+import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_while;
 
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.parser.IGCCToken;
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 ac1a65cf8f3..f0646c2e4a0 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
@@ -21,7 +21,6 @@ import lpg.lpgjavaruntime.IntTuple;
 import lpg.lpgjavaruntime.Monitor;
 import lpg.lpgjavaruntime.NotBacktrackParseTableException;
 import lpg.lpgjavaruntime.ParseTable;
-import lpg.lpgjavaruntime.PrsStream;
 import lpg.lpgjavaruntime.RuleAction;
 import lpg.lpgjavaruntime.Stacks;
 import lpg.lpgjavaruntime.TokenStream;
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 6ee544bfc2e..d1942165a46 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
@@ -16,28 +16,52 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.c99;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class C99ExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 0d0550b11dd..d1aec14f116 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
@@ -16,28 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.c99;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class C99NoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 ba7dfef971c..011cc7bf8e2 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
@@ -16,24 +16,48 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.c99;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
 import org.eclipse.cdt.core.index.IIndex;
-
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class C99Parser extends PrsStream
 		implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit>
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 6fa2fa3ad35..eb472080d1a 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
@@ -16,28 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.c99;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class C99SizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 111167f1b3e..273ba36cb53 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
@@ -16,29 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class CPPExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 e9f1c77a09b..3e97046ad6f 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
@@ -16,29 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class CPPNoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 e325e255e01..baac3dd691d 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
@@ -16,29 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class CPPNoFunctionDeclaratorParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTDeclarator>, ISecondaryParser<IASTDeclarator> {
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 70f695d9542..9eaecd071bc 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
@@ -16,25 +16,47 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
 import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class CPPParser extends PrsStream
 		implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java
index 7e703117e92..0d61e686ebd 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java
@@ -13,8 +13,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 public class CPPRules {
 	static Map fRules = new HashMap();
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 d0f077afe4b..9ba3c8bf77c 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
@@ -16,29 +16,50 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class CPPSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 d0e99cb7652..a8044972e2b 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
@@ -16,31 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 
-import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter;
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class CPPTemplateTypeParameterParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<ICPPASTTemplateParameter>, ISecondaryParser<ICPPASTTemplateParameter> {
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 f0d1497e450..550bfaa011a 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
@@ -16,29 +16,49 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.gcc;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
 import org.eclipse.cdt.core.index.IIndex;
-
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
 
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
-
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory;
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class GCCParser extends PrsStream
 		implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit>
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 c29d6e6e87a..b61e1f616e1 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
@@ -16,33 +16,53 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.gcc;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
 import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
-import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory;
-
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
 
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory;
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class GCCSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
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 bd89af415e4..ab3c2e7ed2f 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
@@ -16,31 +16,51 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.gpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction;
+import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
 import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
+import org.eclipse.cdt.core.parser.IScanner;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
 
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
-
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.*;
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class GPPParser extends PrsStream
 		implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit>
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 49230324045..61af36c4800 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
@@ -16,35 +16,54 @@
 
 package org.eclipse.cdt.internal.core.dom.lrparser.gpp;
 
-import lpg.lpgjavaruntime.*;
-
-import java.util.*;
-import org.eclipse.cdt.core.dom.ast.*;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTExpression;
+import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression;
+import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation;
+import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
 import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
 import org.eclipse.cdt.core.dom.lrparser.IParser;
+import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
 import org.eclipse.cdt.core.dom.lrparser.ITokenCollector;
-import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
-import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
-import org.eclipse.cdt.core.parser.IScanner;
-import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
-import org.eclipse.cdt.core.index.IIndex;
-
-import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap;
 import org.eclipse.cdt.core.dom.lrparser.action.TokenMap;
-import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser;
-
-import org.eclipse.cdt.core.dom.ast.cpp.*;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
-import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
-
 import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction;
-
 import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.*;
+import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser;
+import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.parser.IScanner;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
+
+import lpg.lpgjavaruntime.BadParseException;
+import lpg.lpgjavaruntime.BadParseSymFileException;
+import lpg.lpgjavaruntime.DiagnoseParser;
+import lpg.lpgjavaruntime.ErrorToken;
+import lpg.lpgjavaruntime.IToken;
+import lpg.lpgjavaruntime.LexStream;
+import lpg.lpgjavaruntime.Monitor;
+import lpg.lpgjavaruntime.NotBacktrackParseTableException;
+import lpg.lpgjavaruntime.NullExportedSymbolsException;
+import lpg.lpgjavaruntime.NullTerminalSymbolsException;
+import lpg.lpgjavaruntime.ParseErrorCodes;
+import lpg.lpgjavaruntime.ParseTable;
+import lpg.lpgjavaruntime.PrsStream;
+import lpg.lpgjavaruntime.RuleAction;
+import lpg.lpgjavaruntime.Token;
+import lpg.lpgjavaruntime.UndefinedEofSymbolException;
+import lpg.lpgjavaruntime.UnimplementedTerminalsException;
 
 public class GPPSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector,
 		IParser<IASTExpression>, ISecondaryParser<IASTExpression> {
author	Jonah Graham	2018-11-20 16:20:42 +0000
committer	Jonah Graham	2018-11-22 21:47:02 +0000
commit	a923614c73274179d56e78d35d17aef149c23a03 (patch)
tree	668905afc85ffbb08e42844f6abafbcf038f7e10 /lrparser/org.eclipse.cdt.core.lrparser/src
parent	170e654b4796bad1453ae85a427b97317d67a69a (diff)
download	org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.tar.gz org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.tar.xz org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.zip