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

Add a mode to Module::forAllVisibleModules that includes private imports.

Browse Source 
Also, remove the mode that left the current module out of the callback.
That's easy enough to check for.

No functionality change yet, but groundwork for the next commit (as well
as some possible uses in LLDB).

Swift SVN r12616
This commit is contained in:
Jordan Rose
2014-01-20 23:25:04 +00:00
parent 0f1cf52d34
commit fd48fb3144
2 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/AST/Module.cpp
View File

@@ -963,7 +963,8 @@ bool Module::isSystemModule() const {
template<bool respectVisibility, typename Callback>
static bool forAllImportedModules(Module *topLevel,
Optional<Module::AccessPathTy> thisPath,
Module::AccessPathTy thisPath,
bool includePrivateTopLevelImports,
const Callback &fn) {
using ImportedModule = Module::ImportedModule;
using AccessPathTy = Module::AccessPathTy;
@@ -972,17 +973,14 @@ static bool forAllImportedModules(Module *topLevel,
SmallVector<ImportedModule, 32> queue;
AccessPathTy overridingPath;
if (thisPath.hasValue()) {
if (respectVisibility)
overridingPath = thisPath.getValue();
queue.push_back(ImportedModule(overridingPath, topLevel));
} else {
visited.insert(ImportedModule({}, topLevel));
}
if (respectVisibility)
overridingPath = thisPath;
queue.push_back(ImportedModule(overridingPath, topLevel));
// Even if we're processing the top-level module like any other, we still want
// to include non-exported modules.
topLevel->getImportedModules(queue, !respectVisibility);
// Even if we're processing the top-level module like any other, we may
// still want to include non-exported modules.
includePrivateTopLevelImports |= !respectVisibility;
topLevel->getImportedModules(queue, includePrivateTopLevelImports);
while (!queue.empty()) {
auto next = queue.pop_back_val();
@@ -1010,9 +1008,11 @@ static bool forAllImportedModules(Module *topLevel,
return true;
}
bool Module::forAllVisibleModules(Optional<AccessPathTy> thisPath,
bool Module::forAllVisibleModules(AccessPathTy thisPath,
bool includePrivateTopLevelImports,
std::function<bool(ImportedModule)> fn) {
return forAllImportedModules<true>(this, thisPath, fn);
return forAllImportedModules<true>(this, thisPath,
includePrivateTopLevelImports, fn);
}
bool