From ae8ef43d2c807da536331eaeec022e35aa4299c1 Mon Sep 17 00:00:00 2001 From: Yong He Date: Sun, 14 Jan 2018 16:52:02 -0500 Subject: Fixup field lookup from a member function defined in an extension This fixes item 2 in #361 Modifies existing extension-multi-interface.slang test case to cover the additional scenario. --- source/slang/lookup.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'source/slang') diff --git a/source/slang/lookup.cpp b/source/slang/lookup.cpp index 376d9bd6d..19503d63f 100644 --- a/source/slang/lookup.cpp +++ b/source/slang/lookup.cpp @@ -345,7 +345,19 @@ void DoLookupImpl( // Now perform "local" lookup in the context of the container, // as if we were looking up a member directly. - // + + // if we are currently in an extension decl, perform local lookup + // in the target decl we are extending + if (auto extDeclRef = containerDeclRef.As()) + { + if (auto targetDeclRef = extDeclRef.getDecl()->targetType->AsDeclRefType()) + { + if (auto aggDeclRef = targetDeclRef->declRef.As()) + { + containerDeclRef = extDeclRef.Substitute(aggDeclRef); + } + } + } DoLocalLookupImpl( session, name, containerDeclRef, request, result, breadcrumbs); -- cgit v1.2.3