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

Improved fix for: Name resolution for qualified member declarations, bug 222026.

Browse source
This commit is contained in:
Markus Schorn 2008-03-12 15:31:10 +00:00
parent cdaae2fcba
commit 96a8f08969
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java
View file

@ -17,6 +17,7 @@
package org.eclipse.cdt.internal.core.dom.parser.cpp; package org.eclipse.cdt.internal.core.dom.parser.cpp;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.IName;
import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
@ -38,6 +39,7 @@ import org.eclipse.cdt.core.parser.util.ArrayUtil;
import org.eclipse.cdt.core.parser.util.CharArrayObjectMap; import org.eclipse.cdt.core.parser.util.CharArrayObjectMap;
import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.core.parser.util.CharArrayUtils;
import org.eclipse.cdt.core.parser.util.ObjectSet; import org.eclipse.cdt.core.parser.util.ObjectSet;
import org.eclipse.cdt.internal.core.dom.parser.ASTInternal;
import org.eclipse.cdt.internal.core.dom.parser.IASTInternalScope; import org.eclipse.cdt.internal.core.dom.parser.IASTInternalScope;
import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding; import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -84,11 +86,11 @@ abstract public class CPPScope implements ICPPScope, IASTInternalScope {
return; return;
//name belongs to a different scope, don't add it here except it names this scope //name belongs to a different scope, don't add it here except it names this scope
final IASTName[] ns= ((ICPPASTQualifiedName) name).getNames(); final ICPPASTQualifiedName qname = (ICPPASTQualifiedName) name;
final IASTName ln= ns[ns.length-1]; final IASTName[] ns= qname.getNames();
if (CPPVisitor.getContainingScope(name) != CPPVisitor.getContainingScope(ln)) if (!canDenoteScopeMember(qname))
return; return;
c= ln.toCharArray(); c= ns[ns.length-1].toCharArray();
} }
else { else {
c= name.toCharArray(); c= name.toCharArray();
@ -108,6 +110,28 @@ abstract public class CPPScope implements ICPPScope, IASTInternalScope {
} }
} }
boolean canDenoteScopeMember(ICPPASTQualifiedName name) {
IScope scope= this;
IASTName[] na= name.getNames();
try {
for (int i= na.length-2; i >= 0; i++) {
if (scope == null)
return false;
IASTName n= na[i];
final IName scopeName = scope.getScopeName();
if (scopeName == null || !CharArrayUtils.equals(scopeName.toCharArray(), n.toCharArray()))
return false;
scope= scope.getParent();
}
if (!name.isFullyQualified() || scope == null) {
return true;
}
return ASTInternal.getPhysicalNodeOfScope(scope) instanceof IASTTranslationUnit;
} catch (DOMException e) {
return false;
}
}
public IBinding getBinding(IASTName name, boolean forceResolve, IIndexFileSet fileSet) throws DOMException { public IBinding getBinding(IASTName name, boolean forceResolve, IIndexFileSet fileSet) throws DOMException {
IBinding binding= getBindingInAST(name, forceResolve); IBinding binding= getBindingInAST(name, forceResolve);
if (binding == null) { if (binding == null) {

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

@ -1875,12 +1875,12 @@ public class CPPSemantics {
//A qualified name implies the name actually belongs to a different scope, and should //A qualified name implies the name actually belongs to a different scope, and should
//not be considered here, except the qualifier names the scope itself //not be considered here, except the qualifier names the scope itself
final IASTName[] qn= ((ICPPASTQualifiedName) potential).getNames(); final ICPPASTQualifiedName qname = (ICPPASTQualifiedName) potential;
final IASTName ln= qn[qn.length-1]; if (scope instanceof CPPScope == false || ((CPPScope) scope).canDenoteScopeMember(qname))
if (CPPVisitor.getContainingScope(ln) != scope) return false;
return false;
potential= ln; final IASTName[] qn= qname.getNames();
potential= qn[qn.length-1];
} }
char[] c = potential.toCharArray(); char[] c = potential.toCharArray();
char [] n = data.name(); char [] n = data.name();