mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-08 16:55:38 +02:00
Code Issues Wiki Activity

Bug 489710 - Name resolution problem with inherited constructor

Browse source 
Change-Id: Ic2a090a79e9d4414217e5f8f15ee70a64bb77885
This commit is contained in:
Sergey Prigogin 2016-03-16 19:54:59 -07:00
parent a29e37cffc
commit 31e3379235
2 changed files with 75 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
View file

@ -4390,6 +4390,66 @@ public class AST2TemplateTests extends AST2TestBase {
parseAndCheckBindings(); parseAndCheckBindings();
} }
// template<typename... Ts>
// struct E {};
//
// template<int I, typename T>
// struct D;
//
// template<int I, typename T, typename... Us>
// struct D<I, E<T, Us...>> : D<I - 1, E<Us...>> {};
//
// template<typename T, typename... Us>
// struct D<0, E<T, Us...>> {
// typedef T type;
// };
//
// template <typename... Ts>
// class A;
//
// template <typename T>
// struct F {
// using type = T;
// };
//
// template <int N, typename T>
// struct C;
//
// template <int N, typename... Ts>
// struct C<N, A<Ts...>> {
// using type = typename D<N, E<F<Ts>...>>::type::type;
// };
//
// template <int I, typename T>
// struct B : public B<I - 1, T> {
// using U = typename C<I, T>::type;
// using Base = B<I - 1, T>;
// using Base::Base;
//
// B(const U& value);
// };
//
// template <typename... Ts>
// struct B<-1, A<Ts...>> {};
//
// template <typename... Ts>
// struct A : public B<sizeof...(Ts) - 1, A<Ts...>> {
// using B = B<sizeof...(Ts) - 1, A>;
// using B::B;
// };
//
// struct X {};
// struct Y {};
//
// void waldo(const A<X, Y>& p);
//
// void test() {
// waldo(X());
// waldo(Y());
// }
public void testInheritedConstructor_489710() throws Exception {
parseAndCheckBindings();
}
// template <typename T> // template <typename T>
// struct A { // struct A {

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

@ -42,6 +42,7 @@ import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.IScope;
import org.eclipse.cdt.core.dom.ast.ISemanticProblem; import org.eclipse.cdt.core.dom.ast.ISemanticProblem;
import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNameSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNameSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNewExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNewExpression;
@ -155,8 +156,7 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
} }
} }
private ICPPBase[] findInheritedConstructorsSourceBases( private ICPPBase[] findInheritedConstructorsSourceBases(ICPPASTCompositeTypeSpecifier compositeTypeSpec) {
ICPPASTCompositeTypeSpecifier compositeTypeSpec) {
ICPPBase[] bases = ClassTypeHelper.getBases(getClassType(), compositeTypeSpec); ICPPBase[] bases = ClassTypeHelper.getBases(getClassType(), compositeTypeSpec);
if (bases.length == 0) if (bases.length == 0)
return bases; return bases;
@ -173,9 +173,8 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
IBinding parent = qualifier[qualifier.length - 1].resolveBinding(); IBinding parent = qualifier[qualifier.length - 1].resolveBinding();
if (!(parent instanceof IType) || parent instanceof IProblemBinding) if (!(parent instanceof IType) || parent instanceof IProblemBinding)
continue; continue;
IType type = SemanticUtil.getNestedType((IType) parent, TDEF); if (isConstructorNameForType(qName.getLastName().getSimpleID(), (IType) parent)) {
if (type instanceof IBinding && IType type = SemanticUtil.getNestedType((IType) parent, TDEF);
Arrays.equals(((IBinding) type).getNameCharArray(), qName.getLastName().getSimpleID())) {
for (ICPPBase base : bases) { for (ICPPBase base : bases) {
IType baseClass = base.getBaseClassType(); IType baseClass = base.getBaseClassType();
if (type.isSameType(baseClass)) { if (type.isSameType(baseClass)) {
@ -189,6 +188,17 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
return trim(results, n); return trim(results, n);
} }
private static boolean isConstructorNameForType(char[] lastName, IType type) {
while (type instanceof IBinding) {
if (Arrays.equals(((IBinding) type).getNameCharArray(), lastName))
return true;
if (!(type instanceof ITypedef))
break;
type = ((ITypedef) type).getType();
}
return false;
}
static ICPPMethod[] createInheritedConsructors(ICPPClassScope scope, char[] className, static ICPPMethod[] createInheritedConsructors(ICPPClassScope scope, char[] className,
ICPPBase[] bases, IType[][] existingConstructorParamTypes, IASTNode point) { ICPPBase[] bases, IType[][] existingConstructorParamTypes, IASTNode point) {
ICPPMethod[] inheritedConstructors = ICPPMethod.EMPTY_CPPMETHOD_ARRAY; ICPPMethod[] inheritedConstructors = ICPPMethod.EMPTY_CPPMETHOD_ARRAY;