averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Push lookup with private-discriminators into the AST as Module::lookupMember.

Browse Source 
Since the primary purpose here is to go from a mangled name to a decl, and
discriminators are only valid in the context of a particular module, it
makes sense to make this an API on Module. Eventually this will also support
lookup into a type or its extensions, limited by module and discriminator.

Swift SVN r21754
This commit is contained in:
Jordan Rose
2014-09-06 00:18:04 +00:00
parent 6e485700c6
commit 9aa8c5c133
3 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/AST/Module.cpp
View File

@@ -399,6 +399,53 @@ void Module::lookupValue(AccessPathTy AccessPath, DeclName Name,
FORWARD(lookupValue, (AccessPath, Name, LookupKind, Result));
}
void Module::lookupMember(SmallVectorImpl<ValueDecl*> &results,
const DeclContext *DC, LookupName name,
bool lookIntoExtensions) const {
switch (DC->getContextKind()) {
case DeclContextKind::AbstractClosureExpr:
case DeclContextKind::Initializer:
case DeclContextKind::TopLevelCodeDecl:
case DeclContextKind::AbstractFunctionDecl:
llvm_unreachable("This context does not support lookup.");
case DeclContextKind::FileUnit:
llvm_unreachable("Use FileUnit::lookupValue instead.");
case DeclContextKind::ExtensionDecl:
llvm_unreachable("Use ExtensionDecl::lookupDirect instead.");
case DeclContextKind::Module: {
assert(DC == this);
size_t oldSize = results.size();
lookupValue({}, name.Name, NLKind::QualifiedLookup, results);
if (name.PrivateDiscriminator.empty()) {
auto newEnd = std::remove_if(results.begin()+oldSize, results.end(),
[=](ValueDecl *VD) -> bool {
return VD->getAccessibility() <= Accessibility::Private;
});
results.erase(newEnd, results.end());
} else {
auto newEnd = std::remove_if(results.begin()+oldSize, results.end(),
[=](const ValueDecl *VD) -> bool {
if (VD->getAccessibility() > Accessibility::Private)
return true;
auto enclosingFile =
cast<FileUnit>(VD->getDeclContext()->getModuleScopeContext());
auto discriminator = enclosingFile->getDiscriminatorForPrivateValue(VD);
return discriminator != name.PrivateDiscriminator;
});
results.erase(newEnd, results.end());
}
return;
}
case DeclContextKind::NominalTypeDecl:
llvm_unreachable("Unimplemented");
}
}
void BuiltinUnit::lookupValue(Module::AccessPathTy accessPath, DeclName name,
NLKind lookupKind,
SmallVectorImpl<ValueDecl*> &result) const {