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

Pull out addAdditionalImports in preparation for next step.

Browse Source
This commit is contained in:
David Ungar
2017-08-27 19:08:47 -07:00
parent 0a95f3f725
commit d40196d99a
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Frontend/Frontend.cpp
View File

@@ -261,6 +261,32 @@ ModuleDecl *CompilerInstance::getMainModule() {
return MainModule;
}
static void addAdditionalInitialImportsTo(SourceFile *SF,
ModuleDecl *underlying,
ModuleDecl *importedHeaderModule,
SmallVectorImpl<ModuleDecl *> &importModules) {
if (!underlying && !importedHeaderModule && importModules.empty())
return;
using ImportPair =
std::pair<ModuleDecl::ImportedModule, SourceFile::ImportOptions>;
SmallVector<ImportPair, 4> additionalImports;
if (underlying)
additionalImports.push_back({ { /*accessPath=*/{}, underlying },
SourceFile::ImportFlags::Exported });
if (importedHeaderModule)
additionalImports.push_back({ { /*accessPath=*/{}, importedHeaderModule },
SourceFile::ImportFlags::Exported });
if (!importModules.empty()) {
for (auto &importModule : importModules) {
additionalImports.push_back({ { /*accessPath=*/{}, importModule }, {} });
}
}
SF->addImports(additionalImports);
}
void CompilerInstance::performSema() {
const FrontendOptions &options = Invocation.getFrontendOptions();
const InputFileKind Kind = Invocation.getInputKind();
@@ -365,35 +391,12 @@ void CompilerInstance::performSema() {
}
}
auto addAdditionalInitialImports = [&](SourceFile *SF) {
if (!underlying && !importedHeaderModule && importModules.empty())
return;
using ImportPair =
std::pair<ModuleDecl::ImportedModule, SourceFile::ImportOptions>;
SmallVector<ImportPair, 4> additionalImports;
if (underlying)
additionalImports.push_back({ { /*accessPath=*/{}, underlying },
SourceFile::ImportFlags::Exported });
if (importedHeaderModule)
additionalImports.push_back({ { /*accessPath=*/{}, importedHeaderModule },
SourceFile::ImportFlags::Exported });
if (!importModules.empty()) {
for (auto &importModule : importModules) {
additionalImports.push_back({ { /*accessPath=*/{}, importModule }, {} });
}
}
SF->addImports(additionalImports);
};
if (Kind == InputFileKind::IFK_Swift_REPL) {
auto *SingleInputFile =
new (*Context) SourceFile(*MainModule, Invocation.getSourceFileKind(),
None, modImpKind, Invocation.getLangOptions().KeepTokensInSourceFile);
MainModule->addFile(*SingleInputFile);
addAdditionalInitialImports(SingleInputFile);
addAdditionalInitialImportsTo(SingleInputFile, underlying, importedHeaderModule, importModules);
return;
}
@@ -422,7 +425,7 @@ void CompilerInstance::performSema() {
MainBufferID, modImpKind,
Invocation.getLangOptions().KeepTokensInSourceFile);
MainModule->addFile(*MainFile);
addAdditionalInitialImports(MainFile);
addAdditionalInitialImportsTo(MainFile, underlying, importedHeaderModule, importModules);
if (MainBufferID == PrimaryBufferID)
setPrimarySourceFile(MainFile);
@@ -449,7 +452,7 @@ void CompilerInstance::performSema() {
modImpKind,
Invocation.getLangOptions().KeepTokensInSourceFile);
MainModule->addFile(*NextInput);
addAdditionalInitialImports(NextInput);
addAdditionalInitialImportsTo(NextInput, underlying, importedHeaderModule, importModules);
if (BufferID == PrimaryBufferID)
setPrimarySourceFile(NextInput);