diff options
5 files changed, 8 insertions, 6 deletions
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml index 72b8fd4ba14..63a38e7e070 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml +++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.cdt.core.lrparser.feature" label="%featureName" - version="5.1.0.qualifier" + version="5.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.cdt.core.lrparser"> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF index 0f1f07b721f..5bdecaba6aa 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF +++ b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.1 Bundle-SymbolicName: org.eclipse.cdt.core.lrparser;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.2.0.qualifier Bundle-ClassPath: . Require-Bundle: org.eclipse.cdt.core, net.sourceforge.lpg.lpgjavaruntime;bundle-version="1.1.0";visibility:=reexport, 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 c78749b9fc1..087b0ecd43e 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -171,7 +171,8 @@ public class DOMToISOCPPTokenMap implements IDOMTokenMap { case tCOMPLETION : return TK_Completion; case tEOC : return TK_EndOfCompletion; case tEND_OF_INPUT : return TK_EOF_TOKEN; - + case tPOUND : return TK_Invalid; + default: assert false : "token not recognized by the ISO CPP parser: " + token.getType(); //$NON-NLS-1$ return TK_Invalid; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.core.lrparser.xlc/META-INF/MANIFEST.MF index cafad91ec6a..2da9ca31efc 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/META-INF/MANIFEST.MF +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.1 Bundle-SymbolicName: org.eclipse.cdt.core.lrparser.xlc;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin Require-Bundle: org.eclipse.cdt.core;bundle-version="5.1.0", diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java index a9690f775d2..d19793a4513 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. + * Copyright (c) 2009, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -188,6 +188,7 @@ public class XlcCPPTokenMap implements IDOMTokenMap { case t__Imaginary : return TK__Imaginary; case t_restrict : return TK_restrict; + case tPOUND : return TK_Invalid; default: assert false : "token not recognized: " + token.getType(); //$NON-NLS-1$ |