mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

Bug 485710 - When determining the set of associated namespaces for

Browse source 
argument-dependent lookup, do not consider the base classes of enclosing
classes

Change-Id: Iefa3b8b18102553bd46ca84dd6c90b5ff245e178
Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
This commit is contained in:
Nathan Ridge 2016-01-12 20:30:30 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent 3d814869df
commit 59765dc380
2 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
View file

@ -10609,6 +10609,33 @@ public class AST2CPPTests extends AST2TestBase {
public void testADLForFunctionObject_388287() throws Exception {
parseAndCheckBindings();
}
// namespace A {
// template <typename T>
// void foo(T);
// }
//
// namespace B {
// template <typename T>
// void foo(T);
//
// struct S {};
// }
//
// struct outer : B::S {
// struct waldo {};
// enum E { };
// };
//
// using A::foo;
//
// int main() {
// foo(outer::waldo{});
// foo(outer::E{});
// }
public void testADL_485710() throws Exception {
parseAndCheckBindings();
}
// template <bool> struct A {};
// template <>

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

@ -746,7 +746,7 @@ public class CPPSemantics {
ObjectSet<IType> handled = new ObjectSet<>(2);
for (IType p : ps) {
try {
getAssociatedScopes(p, namespaces, friendFns, handled, data.getTranslationUnit());
getAssociatedScopes(p, namespaces, friendFns, handled, data.getTranslationUnit(), true);
} catch (DOMException e) {
}
}
@ -776,7 +776,8 @@ public class CPPSemantics {
// 3.4.2-2
private static void getAssociatedScopes(IType t, Set<ICPPNamespaceScope> namespaces,
Set<ICPPFunction> friendFns, ObjectSet<IType> handled, CPPASTTranslationUnit tu) throws DOMException {
Set<ICPPFunction> friendFns, ObjectSet<IType> handled, CPPASTTranslationUnit tu,
boolean lookInBaseClasses) throws DOMException {
t = getNestedType(t, TDEF | CVTYPE | PTR | ARRAY | REF);
// No point getting namespaces associated with a dependent type - we don't know what they
// are yet.
@ -789,18 +790,21 @@ public class CPPSemantics {
IBinding owner= ((IBinding) t).getOwner();
if (owner instanceof ICPPClassType) {
getAssociatedScopes((IType) owner, namespaces, friendFns, handled, tu);
getAssociatedScopes((IType) owner, namespaces, friendFns, handled, tu,
false /* do not look at base classes of the enclosing class */);
} else {
getAssociatedNamespaceScopes(getContainingNamespaceScope((IBinding) t, tu), namespaces);
}
}
if (t instanceof ICPPClassType && !(t instanceof ICPPClassTemplate)) {
ICPPClassType ct= (ICPPClassType) t;
ICPPBase[] bases = ClassTypeHelper.getBases(ct, tu);
for (ICPPBase base : bases) {
IBinding b = base.getBaseClass();
if (b instanceof IType)
getAssociatedScopes((IType) b, namespaces, friendFns, handled, tu);
if (lookInBaseClasses) {
ICPPBase[] bases = ClassTypeHelper.getBases(ct, tu);
for (ICPPBase base : bases) {
IBinding b = base.getBaseClass();
if (b instanceof IType)
getAssociatedScopes((IType) b, namespaces, friendFns, handled, tu, true);
}
}
// Furthermore, if T is a class template ...
// * ... types of the template arguments for template type parameters
@ -816,26 +820,26 @@ public class CPPSemantics {
ICPPTemplateArgument[] args = ((ICPPTemplateInstance) ct).getTemplateArguments();
for (ICPPTemplateArgument arg : args) {
if (arg.isTypeValue()) {
getAssociatedScopes(arg.getTypeValue(), namespaces, friendFns, handled, tu);
getAssociatedScopes(arg.getTypeValue(), namespaces, friendFns, handled, tu, true);
}
}
}
}
} else if (t instanceof IFunctionType) {
IFunctionType ft = (IFunctionType) t;
getAssociatedScopes(ft.getReturnType(), namespaces, friendFns, handled, tu);
getAssociatedScopes(ft.getReturnType(), namespaces, friendFns, handled, tu, true);
IType[] ps = ft.getParameterTypes();
for (IType pt : ps) {
getAssociatedScopes(pt, namespaces, friendFns, handled, tu);
getAssociatedScopes(pt, namespaces, friendFns, handled, tu, true);
}
} else if (t instanceof ICPPPointerToMemberType) {
final ICPPPointerToMemberType pmt = (ICPPPointerToMemberType) t;
getAssociatedScopes(pmt.getMemberOfClass(), namespaces, friendFns, handled, tu);
getAssociatedScopes(pmt.getType(), namespaces, friendFns, handled, tu);
getAssociatedScopes(pmt.getMemberOfClass(), namespaces, friendFns, handled, tu, true);
getAssociatedScopes(pmt.getType(), namespaces, friendFns, handled, tu, true);
} else if (t instanceof FunctionSetType) {
FunctionSetType fst= (FunctionSetType) t;
for (ICPPFunction fn : fst.getFunctionSet().getBindings()) {
getAssociatedScopes(fn.getType(), namespaces, friendFns, handled, tu);
getAssociatedScopes(fn.getType(), namespaces, friendFns, handled, tu, true);
}
}
}