Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2011-02-07 11:40:37 -0500
committerVivian Kong2011-02-07 11:40:37 -0500
commit35b1b4e66c2d8d1a05728581ae18c4de4363e4bc (patch)
tree524d1ce04ca66681ad417d5d9c91f30e5cf48a3d
parentcb7670dbc486b47cc034427c96795c826f17f2f4 (diff)
downloadorg.eclipse.cdt-35b1b4e66c2d8d1a05728581ae18c4de4363e4bc.tar.gz
org.eclipse.cdt-35b1b4e66c2d8d1a05728581ae18c4de4363e4bc.tar.xz
org.eclipse.cdt-35b1b4e66c2d8d1a05728581ae18c4de4363e4bc.zip
Bug 328867 for John Liu
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java5
-rw-r--r--xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java3
2 files changed, 5 insertions, 3 deletions
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 c78749b9fc..087b0ecd43 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/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 a9690f775d..d19793a451 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$

Back to the top