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

Fixed a couple of NPEs in resolvePrefix.

Browse source
This commit is contained in:
Doug Schaefer 2005-10-18 20:27:14 +00:00
parent 97c3f29d23
commit a73e7e9970
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
View file

@ -1906,9 +1906,12 @@ public class CVisitor {
} }
} }
IPDOM pdom = name.getTranslationUnit().getPDOM(); IASTTranslationUnit tu = name.getTranslationUnit();
if (pdom != null) if (tu != null) {
result = (IBinding[])ArrayUtil.addAll(IBinding.class, result, pdom.resolvePrefix(name)); IPDOM pdom = tu.getPDOM();
if (pdom != null)
result = (IBinding[])ArrayUtil.addAll(IBinding.class, result, pdom.resolvePrefix(name));
}
return (IBinding[]) ArrayUtil.trim( IBinding.class, result ); return (IBinding[]) ArrayUtil.trim( IBinding.class, result );
} }

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSemantics.java
View file

@ -1878,7 +1878,7 @@ public class CPPSemantics {
return ( pointOfDecl < ((ASTNode)node).getOffset() ); return ( pointOfDecl < ((ASTNode)node).getOffset() );
} }
return false; return true; // TODO - I changed this to true
} }
static private IBinding resolveAmbiguities( CPPSemantics.LookupData data, IASTName name ) throws DOMException { static private IBinding resolveAmbiguities( CPPSemantics.LookupData data, IASTName name ) throws DOMException {
@ -3272,9 +3272,12 @@ public class CPPSemantics {
} }
} }
IPDOM pdom = name.getTranslationUnit().getPDOM(); IASTTranslationUnit tu = name.getTranslationUnit();
if (pdom != null) if (tu != null) {
result = (IBinding[])ArrayUtil.addAll(IBinding.class, result, pdom.resolvePrefix(name)); IPDOM pdom = tu.getPDOM();
if (pdom != null)
result = (IBinding[])ArrayUtil.addAll(IBinding.class, result, pdom.resolvePrefix(name));
}
return (IBinding[]) ArrayUtil.trim( IBinding.class, result ); return (IBinding[]) ArrayUtil.trim( IBinding.class, result );
} }