From b17869ff74a099b4ed57284047a56b12fc415de5 Mon Sep 17 00:00:00 2001
From: Markus Schorn
Date: Thu, 27 Jan 2011 09:29:03 +0000
Subject: Fix some LR-parser test-failures.

---
 .../src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lrparser')

diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java
index b5d6c345100..c3e4caf2b12 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java
@@ -31,6 +31,7 @@ import org.eclipse.cdt.core.parser.ParserUtil;
 import org.eclipse.cdt.core.parser.ScannerInfo;
 import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
 import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase;
 import org.eclipse.core.runtime.CoreException;
 
 /**
@@ -59,8 +60,12 @@ public class ParseHelper {
 		public int visit(IASTName name) {
 			nameList.add(name);
 			IBinding binding = name.resolveBinding();
-			if (binding instanceof IProblemBinding)
+			if (binding instanceof IProblemBinding) {
+				// Suppress assertion that would be thrown for computing string representation
+				// of template-ids. The flag will be reset by BaseTestCase.setUp().
+				CPPASTNameBase.sAllowNameComputation= true;
 				problemBindings.add(name.toString());
+			}
 			if (binding == null)
 				numNullBindings++;
 			return PROCESS_CONTINUE;
-- 
cgit v1.2.3