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

Fixed an NPE when resolving prefix on a name that isn't properly hooked up in the AST. This usually occurs when a backtrack happens and the AST branch is cut off.

Browse source
This commit is contained in:
Doug Schaefer 2005-04-01 20:12:41 +00:00
parent c946e6f846
commit 363f066567
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNode.java
View file

@ -30,10 +30,9 @@ public class CPPASTNode extends ASTNode implements IASTNode {
public IASTTranslationUnit getTranslationUnit() { public IASTTranslationUnit getTranslationUnit() {
if( this instanceof IASTTranslationUnit ) return (IASTTranslationUnit) this; if( this instanceof IASTTranslationUnit ) return (IASTTranslationUnit) this;
IASTNode node = getParent(); IASTNode node = getParent();
while( ! (node instanceof IASTTranslationUnit )) while(node != null && !(node instanceof IASTTranslationUnit))
{
node = node.getParent(); node = node.getParent();
}
return (IASTTranslationUnit) node; return (IASTTranslationUnit) node;
} }

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
View file

@ -52,6 +52,9 @@ public class DOMCompletionContributor implements ICompletionContributor {
// Find all bindings // Find all bindings
List allBindings = new ArrayList(); List allBindings = new ArrayList();
for (int i = 0; i < names.length; ++i) { for (int i = 0; i < names.length; ++i) {
if (names[i].getTranslationUnit() == null)
// The node isn't properly hooked up, must have backtracked out of this node
continue;
IBinding[] bindings = names[i].resolvePrefix(); IBinding[] bindings = names[i].resolvePrefix();
if (bindings != null) if (bindings != null)
for (int j = 0; j < bindings.length; ++j) { for (int j = 0; j < bindings.length; ++j) {