mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-28 19:35:36 +02:00
Code Issues Wiki Activity

Fix name lookup in PDOMCPPClassType, fixes 41.120 firefox problems (226.516 left)

Browse source
This commit is contained in:
Markus Schorn 2006-12-06 16:27:51 +00:00
parent 3c449d0ac8
commit 2e79fba079
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
View file

@ -313,7 +313,7 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
return super.find( name ); return super.find( name );
} }
static protected boolean isConstructorReference( IASTName name ){ public static boolean isConstructorReference( IASTName name ){
if( name.getPropertyInParent() == CPPSemantics.STRING_LOOKUP_PROPERTY ) return false; if( name.getPropertyInParent() == CPPSemantics.STRING_LOOKUP_PROPERTY ) return false;
IASTNode node = name.getParent(); IASTNode node = name.getParent();
if( node instanceof ICPPASTTemplateId ) if( node instanceof ICPPASTTemplateId )

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
View file

@ -37,6 +37,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPField;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
import org.eclipse.cdt.internal.core.Util; import org.eclipse.cdt.internal.core.Util;
import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding; import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPClassScope;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPSemantics; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPSemantics;
import org.eclipse.cdt.internal.core.index.IIndexType; import org.eclipse.cdt.internal.core.index.IIndexType;
import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.PDOM;
@ -378,6 +379,14 @@ ICPPClassScope, IPDOMMemberOwner, IIndexType {
public IBinding getBinding(IASTName name, boolean resolve) throws DOMException { public IBinding getBinding(IASTName name, boolean resolve) throws DOMException {
try { try {
if (getDBName().equals(name.toCharArray())) {
if (CPPClassScope.isConstructorReference(name)){
return CPPSemantics.resolveAmbiguities(name, getConstructors());
}
//9.2 ... The class-name is also inserted into the scope of the class itself
return this;
}
BindingCollector visitor= new BindingCollector(name.toCharArray()); BindingCollector visitor= new BindingCollector(name.toCharArray());
accept(visitor); accept(visitor);
return CPPSemantics.resolveAmbiguities(name, visitor.getBindings()); return CPPSemantics.resolveAmbiguities(name, visitor.getBindings());