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

Eliminate the 'Module' variant from UnqualifiedLookupResult.

Browse Source 
Make unqualified lookup always provide a declaration for the things it
finds, rather than providing either a module or a declaration. Unify
various code paths in our type checker now that module declarations
come in with the other declarations.

Swift SVN r28286
This commit is contained in:
Doug Gregor
2015-05-07 21:10:55 +00:00
parent 2653a6569b
commit edbb75eef8
13 changed files with 147 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/AST/NameLookup.cpp
View File

@@ -739,7 +739,7 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
// Look for a module with the given name.
if (Name.isSimpleName(M.getName())) {
Results.push_back(Result::getModuleName(&M));
Results.push_back(Result::getModuleMember(&M));
return;
}
@@ -749,7 +749,7 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
if (desiredModule) {
forAllVisibleModules(DC, [&](const Module::ImportedModule &import) -> bool {
if (import.second == desiredModule) {
Results.push_back(Result::getModuleName(import.second));
Results.push_back(Result::getModuleMember(import.second));
return false;
}
return true;
@@ -758,7 +758,7 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
}
TypeDecl* UnqualifiedLookup::getSingleTypeResult() {
if (Results.size() != 1 || !Results.back().hasValueDecl())
if (Results.size() != 1)
return nullptr;
return dyn_cast<TypeDecl>(Results.back().getValueDecl());
}