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

[AST] Completely replace Module with ModuleDecl

Browse Source 
The typedef `swift::Module` was a temporary solution that allowed
`swift::Module` to be renamed to `swift::ModuleDecl` without requiring
every single callsite to be modified.

Modify all the callsites, and get rid of the typedef.
This commit is contained in:
Brian Gesiak
2017-01-07 17:06:35 -05:00
parent c0ecff1344
commit 663b92ece9
87 changed files with 561 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
View File

@@ -314,8 +314,8 @@ CodeCompletionViewRef CodeCompletionOrganizer::takeResultsView() {
//===----------------------------------------------------------------------===//
ImportDepth::ImportDepth(ASTContext &context, CompilerInvocation &invocation) {
llvm::DenseSet<Module *> seen;
std::deque<std::pair<Module *, uint8_t>> worklist;
llvm::DenseSet<ModuleDecl *> seen;
std::deque<std::pair<ModuleDecl *, uint8_t>> worklist;
StringRef mainModule = invocation.getModuleName();
auto *main = context.getLoadedModule(context.getIdentifier(mainModule));
@@ -331,8 +331,8 @@ ImportDepth::ImportDepth(ASTContext &context, CompilerInvocation &invocation) {
// Private imports from this module.
// FIXME: only the private imports from the current source file.
SmallVector<Module::ImportedModule, 16> mainImports;
main->getImportedModules(mainImports, Module::ImportFilter::Private);
SmallVector<ModuleDecl::ImportedModule, 16> mainImports;
main->getImportedModules(mainImports, ModuleDecl::ImportFilter::Private);
for (auto &import : mainImports) {
uint8_t depth = 1;
if (auxImports.count(import.second->getName().str()))
@@ -342,7 +342,7 @@ ImportDepth::ImportDepth(ASTContext &context, CompilerInvocation &invocation) {
// Fill depths with BFS over module imports.
while (!worklist.empty()) {
Module *module;
ModuleDecl *module;
uint8_t depth;
std::tie(module, depth) = worklist.front();
worklist.pop_front();
@@ -359,7 +359,7 @@ ImportDepth::ImportDepth(ASTContext &context, CompilerInvocation &invocation) {
}
// Add imports to the worklist.
SmallVector<Module::ImportedModule, 16> imports;
SmallVector<ModuleDecl::ImportedModule, 16> imports;
module->getImportedModules(imports);
for (auto &import : imports) {
uint8_t next = std::max(depth, uint8_t(depth + 1)); // unsigned wrap