Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/upc
diff options
context:
space:
mode:
authorMike Kucera2008-05-22 20:13:25 +0000
committerMike Kucera2008-05-22 20:13:25 +0000
commitd39f018db6bef040b410367d5c4e67a7049a152e (patch)
tree8b11792e4a4d0c5aad61efa78400eeeccf75ceec /upc
parent654072913192fd9b5fe0c325166933b20bcaf416 (diff)
downloadorg.eclipse.cdt-d39f018db6bef040b410367d5c4e67a7049a152e.tar.gz
org.eclipse.cdt-d39f018db6bef040b410367d5c4e67a7049a152e.tar.xz
org.eclipse.cdt-d39f018db6bef040b410367d5c4e67a7049a152e.zip
bug 233561, NPE when instantiating UPCLanguage
Diffstat (limited to 'upc')
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java18
1 files changed, 0 insertions, 18 deletions
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 6c577e741ed..90fd09b0470 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
@@ -11,14 +11,12 @@
package org.eclipse.cdt.core.dom.upc;
import org.eclipse.cdt.core.dom.ILinkage;
-import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap;
import org.eclipse.cdt.core.dom.lrparser.IParser;
import org.eclipse.cdt.core.dom.lrparser.ScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.lrparser.action.c99.C99ASTNodeFactory;
-import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
import org.eclipse.cdt.core.dom.parser.upc.DOMToUPCTokenMap;
import org.eclipse.cdt.core.dom.parser.upc.UPCKeyword;
@@ -43,7 +41,6 @@ public class UPCLanguage extends BaseExtensibleLanguage {
public static final String ID = PLUGIN_ID + ".upc"; //$NON-NLS-1$
private static final IDOMTokenMap TOKEN_MAP = new DOMToUPCTokenMap();
- private static final C99Language C99_LANGUAGE = C99Language.getDefault();
private static final UPCLanguage myDefault = new UPCLanguage();
private static final String[] upcKeywords = UPCKeyword.getAllKeywords();
@@ -51,7 +48,6 @@ public class UPCLanguage extends BaseExtensibleLanguage {
private static final IScannerExtensionConfiguration SCANNER_CONFIGURATION = new ScannerExtensionConfiguration();
-
public static UPCLanguage getDefault() {
return myDefault;
}
@@ -80,15 +76,6 @@ public class UPCLanguage extends BaseExtensibleLanguage {
public int getLinkageID() {
return ILinkage.C_LINKAGE_ID;
}
-
- public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) {
- return C99_LANGUAGE.getSelectedNames(ast, start, length);
- }
-
- @Override
- public String[] getBuiltinTypes() {
- return C99_LANGUAGE.getBuiltinTypes();
- }
@Override
public String[] getKeywords() {
@@ -96,11 +83,6 @@ public class UPCLanguage extends BaseExtensibleLanguage {
}
@Override
- public String[] getPreprocessorKeywords() {
- return C99_LANGUAGE.getPreprocessorKeywords();
- }
-
- @Override
protected ParserLanguage getParserLanguage() {
return ParserLanguage.C;
}

Back to the top