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

AST: Fold forAllImportedModules() into forAllVisibleModules()

Browse Source
This commit is contained in:
Slava Pestov
2018-04-26 22:03:54 -07:00
parent 0c32c54e36
commit a12f42cc36
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AST/Module.cpp
View File

@@ -1127,18 +1127,15 @@ bool ModuleDecl::isSystemModule() const {
return false;
}
static bool forAllImportedModules(ModuleDecl *topLevel,
ModuleDecl::AccessPathTy thisPath,
llvm::function_ref<bool(ModuleDecl::ImportedModule)> fn) {
using ImportedModule = ModuleDecl::ImportedModule;
bool ModuleDecl::forAllVisibleModules(AccessPathTy thisPath,
llvm::function_ref<bool(ImportedModule)> fn) {
llvm::SmallSet<ImportedModule, 32, ModuleDecl::OrderImportedModules> visited;
SmallVector<ImportedModule, 32> stack;
topLevel->getImportedModules(stack, ModuleDecl::ImportFilter::Public);
getImportedModules(stack, ModuleDecl::ImportFilter::Public);
// Make sure the top-level module is first; we want pre-order-ish traversal.
stack.push_back(ImportedModule(thisPath, topLevel));
stack.push_back(ImportedModule(thisPath, this));
while (!stack.empty()) {
auto next = stack.pop_back_val();
@@ -1167,11 +1164,6 @@ static bool forAllImportedModules(ModuleDecl *topLevel,
return true;
}
bool ModuleDecl::forAllVisibleModules(AccessPathTy thisPath,
llvm::function_ref<bool(ImportedModule)> fn) {
return forAllImportedModules(this, thisPath, fn);
}
bool FileUnit::forAllVisibleModules(
llvm::function_ref<bool(ModuleDecl::ImportedModule)> fn) {
if (!getParentModule()->forAllVisibleModules(ModuleDecl::AccessPathTy(), fn))