fix for bug 240567 for the LR parsers

5 files changed, 17 insertions, 34 deletions

diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
index 97e97a41c44..db0aca142ad 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
@@ -108,8 +108,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
 			System.out.println();
 		}
 
-		// TODO temporary
-		IScannerExtensionConfiguration config = new ScannerExtensionConfiguration();
+		IScannerExtensionConfiguration config = getScannerExtensionConfiguration();
 		
 		ParserLanguage pl = getParserLanguage();
 		IScanner preprocessor = new CPreprocessor(reader, scanInfo, pl, log, config, fileCreator);
@@ -161,7 +160,6 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
 			printCompletionNode(cn);
 		}
 		
-		// TODO temporary
 		IScannerExtensionConfiguration config = getScannerExtensionConfiguration();
 		
 		ParserLanguage pl = getParserLanguage();
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
index e63178b4322..502ec24b536 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
@@ -9,8 +9,6 @@
 package org.eclipse.cdt.core.dom.lrparser;
 
 import org.eclipse.cdt.core.dom.parser.AbstractScannerExtensionConfiguration;
-import org.eclipse.cdt.core.parser.IMacro;
-import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
 
 
 /**
@@ -19,26 +17,23 @@ import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
  * @author Mike Kucera
  *
  */
+@SuppressWarnings("nls")
 public class ScannerExtensionConfiguration extends AbstractScannerExtensionConfiguration {
 
-	@Override
-	public CharArrayIntMap getAdditionalKeywords() {
-		return null;
+	
+	private ScannerExtensionConfiguration() {
 	}
-
-	@Override
-	public IMacro[] getAdditionalMacros() {
-		return null;
+	
+	public static ScannerExtensionConfiguration createC() {
+		ScannerExtensionConfiguration sec = new ScannerExtensionConfiguration();
+		sec.addMacro("__null", "(void *)0"); 
+		return sec;
 	}
-
-	@Override
-	public CharArrayIntMap getAdditionalPreprocessorKeywords() {
-		return null;
-	}
-
-	@Override
-	public boolean initializeMacroValuesTo1() {
-		return false;
+	
+	public static ScannerExtensionConfiguration createCPP() {
+		ScannerExtensionConfiguration sec = new ScannerExtensionConfiguration();
+		sec.addMacro("__null", "0");
+		return sec;
 	}
 
 	@Override
@@ -46,14 +41,4 @@ public class ScannerExtensionConfiguration extends AbstractScannerExtensionConfi
 		return true;
 	}
 
-	@Override
-	public char[] supportAdditionalNumericLiteralSuffixes() {
-		return null;
-	}
-
-	@Override
-	public boolean supportMinAndMaxOperators() {
-		return false;
-	}
-
 }
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
index 50a825be716..a32549434ab 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
@@ -42,7 +42,7 @@ public class C99Language extends BaseExtensibleLanguage {
 	public static final String ID = PLUGIN_ID + ".c99"; //$NON-NLS-1$ 
 	
 	private static final IDOMTokenMap TOKEN_MAP = DOMToC99TokenMap.DEFAULT_MAP;
-	private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = new ScannerExtensionConfiguration();
+	private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = ScannerExtensionConfiguration.createC();
 	
 	private static C99Language DEFAULT = new C99Language();
 	
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
index b4bc11eff16..83920e3f179 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
@@ -43,7 +43,7 @@ public class ISOCPPLanguage extends BaseExtensibleLanguage {
 	
 	private static final IDOMTokenMap TOKEN_MAP = DOMToISOCPPTokenMap.DEFAULT_MAP;
 	
-	private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = new ScannerExtensionConfiguration();
+	private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = ScannerExtensionConfiguration.createCPP();
 	
 	
 	private static ISOCPPLanguage DEFAULT = new ISOCPPLanguage();
diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
index c2b879a92dc..88e9a4021cd 100644
--- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
+++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
@@ -47,7 +47,7 @@ public class UPCLanguage extends BaseExtensibleLanguage {
 	
 	private static final UPCLanguage myDefault  = new UPCLanguage();
 
-	private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = new ScannerExtensionConfiguration();
+	private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = ScannerExtensionConfiguration.createC();
 	
 	
 	public static UPCLanguage getDefault() {