Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2011-02-07 17:14:05 +0000
committerVivian Kong2011-02-07 17:14:05 +0000
commit3806bba6bc0f4e165bd5e132ce2407995b1ce400 (patch)
tree7e5146611f9894304c913704af4b8f02696a923f /lrparser
parentbf2278893dd26400d3ccb6c1db3fb76d8d82db49 (diff)
downloadorg.eclipse.cdt-3806bba6bc0f4e165bd5e132ce2407995b1ce400.tar.gz
org.eclipse.cdt-3806bba6bc0f4e165bd5e132ce2407995b1ce400.tar.xz
org.eclipse.cdt-3806bba6bc0f4e165bd5e132ce2407995b1ce400.zip
Bug 328867 patch by John Liu, update plugin/feature versions
Diffstat (limited to 'lrparser')
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml2
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF2
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java5
3 files changed, 5 insertions, 4 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;

Back to the top