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

Add check for null

Browse source
This commit is contained in:
Anton Leherbauer 2007-04-27 06:51:23 +00:00
parent bd759a1e82
commit d239639cce
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCLanguage.java
View file

@ -38,6 +38,7 @@ import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.KeywordSetKey; import org.eclipse.cdt.core.parser.KeywordSetKey;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.token.KeywordSets; import org.eclipse.cdt.internal.core.parser.token.KeywordSets;
@ -195,11 +196,13 @@ public abstract class AbstractCLanguage extends AbstractLanguage implements ICLa
public String[] getKeywords() { public String[] getKeywords() {
Set keywords= KeywordSets.getKeywords(KeywordSetKey.KEYWORDS, ParserLanguage.C); Set keywords= KeywordSets.getKeywords(KeywordSetKey.KEYWORDS, ParserLanguage.C);
keywords= new HashSet(keywords); keywords= new HashSet(keywords);
List additionalKeywords= getScannerExtensionConfiguration().getAdditionalKeywords().toList(); CharArrayIntMap additionalKeywords= getScannerExtensionConfiguration().getAdditionalKeywords();
for (Iterator iterator = additionalKeywords.iterator(); iterator.hasNext(); ) { if (additionalKeywords != null) {
for (Iterator iterator = additionalKeywords.toList().iterator(); iterator.hasNext(); ) {
char[] name = (char[]) iterator.next(); char[] name = (char[]) iterator.next();
keywords.add(new String(name)); keywords.add(new String(name));
} }
}
return (String[]) keywords.toArray(new String[keywords.size()]); return (String[]) keywords.toArray(new String[keywords.size()]);
} }
@ -217,11 +220,13 @@ public abstract class AbstractCLanguage extends AbstractLanguage implements ICLa
public String[] getPreprocessorKeywords() { public String[] getPreprocessorKeywords() {
Set keywords= KeywordSets.getKeywords(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.C); Set keywords= KeywordSets.getKeywords(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.C);
keywords= new HashSet(keywords); keywords= new HashSet(keywords);
List additionalKeywords= getScannerExtensionConfiguration().getAdditionalPreprocessorKeywords().toList(); CharArrayIntMap additionalKeywords= getScannerExtensionConfiguration().getAdditionalPreprocessorKeywords();
for (Iterator iterator = additionalKeywords.iterator(); iterator.hasNext(); ) { if (additionalKeywords != null) {
for (Iterator iterator = additionalKeywords.toList().iterator(); iterator.hasNext(); ) {
char[] name = (char[]) iterator.next(); char[] name = (char[]) iterator.next();
keywords.add(new String(name)); keywords.add(new String(name));
} }
}
return (String[]) keywords.toArray(new String[keywords.size()]); return (String[]) keywords.toArray(new String[keywords.size()]);
} }
} }

13
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPLanguage.java
View file

@ -37,6 +37,7 @@ import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.KeywordSetKey; import org.eclipse.cdt.core.parser.KeywordSetKey;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner;
import org.eclipse.cdt.internal.core.parser.token.KeywordSets; import org.eclipse.cdt.internal.core.parser.token.KeywordSets;
@ -192,11 +193,13 @@ public abstract class AbstractCPPLanguage extends AbstractLanguage implements IC
public String[] getKeywords() { public String[] getKeywords() {
Set keywords= KeywordSets.getKeywords(KeywordSetKey.KEYWORDS, ParserLanguage.CPP); Set keywords= KeywordSets.getKeywords(KeywordSetKey.KEYWORDS, ParserLanguage.CPP);
keywords= new HashSet(keywords); keywords= new HashSet(keywords);
List additionalKeywords= getScannerExtensionConfiguration().getAdditionalKeywords().toList(); CharArrayIntMap additionalKeywords= getScannerExtensionConfiguration().getAdditionalKeywords();
for (Iterator iterator = additionalKeywords.iterator(); iterator.hasNext(); ) { if (additionalKeywords != null) {
for (Iterator iterator = additionalKeywords.toList().iterator(); iterator.hasNext(); ) {
char[] name = (char[]) iterator.next(); char[] name = (char[]) iterator.next();
keywords.add(new String(name)); keywords.add(new String(name));
} }
}
return (String[]) keywords.toArray(new String[keywords.size()]); return (String[]) keywords.toArray(new String[keywords.size()]);
} }
@ -214,11 +217,13 @@ public abstract class AbstractCPPLanguage extends AbstractLanguage implements IC
public String[] getPreprocessorKeywords() { public String[] getPreprocessorKeywords() {
Set keywords= KeywordSets.getKeywords(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.CPP); Set keywords= KeywordSets.getKeywords(KeywordSetKey.PP_DIRECTIVE, ParserLanguage.CPP);
keywords= new HashSet(keywords); keywords= new HashSet(keywords);
List additionalKeywords= getScannerExtensionConfiguration().getAdditionalPreprocessorKeywords().toList(); CharArrayIntMap additionalKeywords= getScannerExtensionConfiguration().getAdditionalPreprocessorKeywords();
for (Iterator iterator = additionalKeywords.iterator(); iterator.hasNext(); ) { if (additionalKeywords != null) {
for (Iterator iterator = additionalKeywords.toList().iterator(); iterator.hasNext(); ) {
char[] name = (char[]) iterator.next(); char[] name = (char[]) iterator.next();
keywords.add(new String(name)); keywords.add(new String(name));
} }
}
return (String[]) keywords.toArray(new String[keywords.size()]); return (String[]) keywords.toArray(new String[keywords.size()]);
} }
} }