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

Bug 472818 - HeuristicResolver: reuse code between findConcreteScopeForType() and resolveUnknownType()

Browse source 
Change-Id: Ie840609aca27fed218ee7ea649c1fd55e33fce59
This commit is contained in:
Nathan Ridge 2016-01-31 03:00:01 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent bab94bb9d0
commit 01a74ee5f7
1 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/HeuristicResolver.java
View file

@ -16,7 +16,6 @@ import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.dom.ast.ICompositeType;
import org.eclipse.cdt.core.dom.ast.IEnumerator; import org.eclipse.cdt.core.dom.ast.IEnumerator;
import org.eclipse.cdt.core.dom.ast.IField;
import org.eclipse.cdt.core.dom.ast.IFunction; import org.eclipse.cdt.core.dom.ast.IFunction;
import org.eclipse.cdt.core.dom.ast.IPointerType; import org.eclipse.cdt.core.dom.ast.IPointerType;
import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.IScope;
@ -40,42 +39,12 @@ public class HeuristicResolver {
* @param point the point of instantiation for name lookups * @param point the point of instantiation for name lookups
*/ */
public static IScope findConcreteScopeForType(IType type, IASTNode point) { public static IScope findConcreteScopeForType(IType type, IASTNode point) {
if (type instanceof ICPPDeferredClassInstance) { if (type instanceof ICPPUnknownType) {
// If this scope is for a deferred-class-instance, use the scope of the primary template. type = resolveUnknownType((ICPPUnknownType) type, point);
ICPPDeferredClassInstance instance = (ICPPDeferredClassInstance) type; }
return instance.getClassTemplate().getCompositeScope(); if (type instanceof ICompositeType) {
} else if (type instanceof TypeOfDependentExpression) { return ((ICompositeType) type).getCompositeScope();
// If this scope is for the id-expression of a field reference, and the field owner
// is a deferred-class-instance, look up the field in the scope of the primary template,
// and use the scope of the resulting field type.
ICPPEvaluation evaluation = ((TypeOfDependentExpression) type).getEvaluation();
if (evaluation instanceof EvalID) {
EvalID evalId = (EvalID) evaluation;
ICPPEvaluation fieldOwner = evalId.getFieldOwner();
if (fieldOwner != null) {
IType fieldOwnerType = fieldOwner.getType(point);
if (fieldOwnerType instanceof ICPPDeferredClassInstance) {
ICPPDeferredClassInstance instance = (ICPPDeferredClassInstance) fieldOwnerType;
IScope scope = instance.getClassTemplate().getCompositeScope();
LookupData lookup = new LookupData(evalId.getName(), evalId.getTemplateArgs(), point);
lookup.qualified = evalId.isQualified();
try {
CPPSemantics.lookup(lookup, scope);
} catch (DOMException e) {
return null;
}
IBinding[] bindings = lookup.getFoundBindings();
if (bindings.length == 1 && bindings[0] instanceof IField) {
IType fieldType = ((IField) bindings[0]).getType();
if (fieldType instanceof ICompositeType) {
return ((ICompositeType) fieldType).getCompositeScope();
}
}
}
}
}
} }
// TODO(nathanridge): Handle more cases.
return null; return null;
} }