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 357320: Class template usage in method defined outside of class body.

Browse source
This commit is contained in:
Markus Schorn 2011-09-19 11:42:22 +02:00
parent 38c0bca120
commit 1772ed2b55
2 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPTemplateResolutionTest.java
View file

@ -1866,4 +1866,16 @@ public class IndexCPPTemplateResolutionTest extends IndexBindingResolutionTestBa
IBinding[] friends = ct.getFriends();
assertEquals(0, friends.length); // not yet supported
}
// template<class T> struct C1 {
// typedef int iterator;
// iterator m1();
// };
// template<class T> typename C1<T>::iterator C1<T>::m1() {
// return 0;
// }
public void testUsageOfClassTemplateOutsideOfClassBody_357320() throws Exception {
getBindingFromASTName("m1", 0, ICPPMethod.class);
}
}

56
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
View file

@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.eclipse.cdt.core.dom.IName;
import org.eclipse.cdt.core.dom.ast.ASTTypeUtil;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.DOMException;
@ -241,41 +240,44 @@ public class CPPTemplates {
static IBinding isUsedInClassTemplateScope(ICPPClassTemplate ct, IASTName name) {
try {
IASTName start= name;
IScope scope;
ICPPASTFunctionDefinition func= CPPVisitor.findEnclosingFunctionDefinition(name);
if (func != null) {
start= ASTQueries.findInnermostDeclarator(func.getDeclarator()).getName();
start= start.getLastName();
name= ASTQueries.findInnermostDeclarator(func.getDeclarator()).getName().getLastName();
scope= CPPVisitor.getContainingScope(name);
} else {
scope= CPPVisitor.getContainingScope(name);
if (!(scope instanceof IASTInternalScope))
return null;
}
IScope scope= CPPVisitor.getContainingScope(start);
while (scope instanceof IASTInternalScope) {
while (scope != null) {
if (scope instanceof ISemanticProblem)
return null;
final IASTInternalScope internalScope = (IASTInternalScope) scope;
if (scope instanceof ICPPClassScope) {
final IName scopeName = internalScope.getScopeName();
if (scopeName instanceof IASTName) {
IBinding b= ((IASTName) scopeName).resolveBinding();
if (b instanceof IType && ct.isSameType((IType) b)) {
return CPPTemplates.instantiateWithinClassTemplate(ct);
}
if (b instanceof ICPPClassTemplatePartialSpecialization) {
ICPPClassTemplatePartialSpecialization pspec= (ICPPClassTemplatePartialSpecialization) b;
if (ct.isSameType(pspec.getPrimaryClassTemplate())) {
return CPPTemplates.instantiateWithinClassTemplate(pspec);
}
} else if (b instanceof ICPPClassSpecialization) {
ICPPClassSpecialization specialization= (ICPPClassSpecialization) b;
if (ct.isSameType(specialization.getSpecializedBinding())) {
return specialization;
}
ICPPClassType b= ((ICPPClassScope) scope).getClassType();
if (b != null && ct.isSameType(b)) {
return CPPTemplates.instantiateWithinClassTemplate(ct);
}
if (b instanceof ICPPClassTemplatePartialSpecialization) {
ICPPClassTemplatePartialSpecialization pspec= (ICPPClassTemplatePartialSpecialization) b;
if (ct.isSameType(pspec.getPrimaryClassTemplate())) {
return CPPTemplates.instantiateWithinClassTemplate(pspec);
}
} else if (b instanceof ICPPClassSpecialization) {
ICPPClassSpecialization specialization= (ICPPClassSpecialization) b;
if (ct.isSameType(specialization.getSpecializedBinding())) {
return specialization; }
}
}
scope= CPPVisitor.getContainingScope(internalScope.getPhysicalNode());
if (scope == internalScope)
return null;
if (scope instanceof IASTInternalScope) {
IASTInternalScope internalScope= (IASTInternalScope) scope;
scope= CPPVisitor.getContainingScope(internalScope.getPhysicalNode());
if (scope == internalScope)
return null;
} else {
scope= scope.getParent();
}
}
} catch (DOMException e) {
}