mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

fix for bug 240567 for the LR parsers

Browse source
This commit is contained in:
Mike Kucera 2008-12-30 15:16:06 +00:00
parent 35ae8a7431
commit 60d92373d0
5 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
View file

@ -108,8 +108,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
System.out.println(); System.out.println();
} }
// TODO temporary IScannerExtensionConfiguration config = getScannerExtensionConfiguration();
IScannerExtensionConfiguration config = new ScannerExtensionConfiguration();
ParserLanguage pl = getParserLanguage(); ParserLanguage pl = getParserLanguage();
IScanner preprocessor = new CPreprocessor(reader, scanInfo, pl, log, config, fileCreator); IScanner preprocessor = new CPreprocessor(reader, scanInfo, pl, log, config, fileCreator);
@ -161,7 +160,6 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage {
printCompletionNode(cn); printCompletionNode(cn);
} }
// TODO temporary
IScannerExtensionConfiguration config = getScannerExtensionConfiguration(); IScannerExtensionConfiguration config = getScannerExtensionConfiguration();
ParserLanguage pl = getParserLanguage(); ParserLanguage pl = getParserLanguage();

41
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
View file

@ -9,8 +9,6 @@
package org.eclipse.cdt.core.dom.lrparser; package org.eclipse.cdt.core.dom.lrparser;
import org.eclipse.cdt.core.dom.parser.AbstractScannerExtensionConfiguration; 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 * @author Mike Kucera
* *
*/ */
@SuppressWarnings("nls")
public class ScannerExtensionConfiguration extends AbstractScannerExtensionConfiguration { public class ScannerExtensionConfiguration extends AbstractScannerExtensionConfiguration {
@Override
public CharArrayIntMap getAdditionalKeywords() { private ScannerExtensionConfiguration() {
return null;
} }
@Override public static ScannerExtensionConfiguration createC() {
public IMacro[] getAdditionalMacros() { ScannerExtensionConfiguration sec = new ScannerExtensionConfiguration();
return null; sec.addMacro("__null", "(void *)0");
return sec;
} }
@Override public static ScannerExtensionConfiguration createCPP() {
public CharArrayIntMap getAdditionalPreprocessorKeywords() { ScannerExtensionConfiguration sec = new ScannerExtensionConfiguration();
return null; sec.addMacro("__null", "0");
} return sec;
@Override
public boolean initializeMacroValuesTo1() {
return false;
} }
@Override @Override
@ -46,14 +41,4 @@ public class ScannerExtensionConfiguration extends AbstractScannerExtensionConfi
return true; return true;
} }
@Override
public char[] supportAdditionalNumericLiteralSuffixes() {
return null;
}
@Override
public boolean supportMinAndMaxOperators() {
return false;
}
} }

2
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
View file

@ -42,7 +42,7 @@ public class C99Language extends BaseExtensibleLanguage {
public static final String ID = PLUGIN_ID + ".c99"; //$NON-NLS-1$ public static final String ID = PLUGIN_ID + ".c99"; //$NON-NLS-1$
private static final IDOMTokenMap TOKEN_MAP = DOMToC99TokenMap.DEFAULT_MAP; 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(); private static C99Language DEFAULT = new C99Language();

2
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
View file

@ -43,7 +43,7 @@ public class ISOCPPLanguage extends BaseExtensibleLanguage {
private static final IDOMTokenMap TOKEN_MAP = DOMToISOCPPTokenMap.DEFAULT_MAP; 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(); private static ISOCPPLanguage DEFAULT = new ISOCPPLanguage();

2
upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
View file

@ -47,7 +47,7 @@ public class UPCLanguage extends BaseExtensibleLanguage {
private static final UPCLanguage myDefault = new UPCLanguage(); 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() { public static UPCLanguage getDefault() {