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

Converting ModuleDecl::ImportedModule from std::pair to a dedicated struct. (#31360)

Browse Source
This commit is contained in:
Daniel Sweeney
2020-04-30 21:26:03 -06:00
committed by GitHub
parent f503a2d58a
commit ea526c6383
25 changed files with 211 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -47,9 +47,9 @@ version::Version swift::InterfaceFormatVersion({1, 0});
static void diagnoseScopedImports(DiagnosticEngine &diags,
ArrayRef<ModuleDecl::ImportedModule> imports){
for (const ModuleDecl::ImportedModule &importPair : imports) {
if (importPair.first.empty())
if (importPair.accessPath.empty())
continue;
diags.diagnose(importPair.first.front().Loc,
diags.diagnose(importPair.accessPath.front().Loc,
diag::module_interface_scoped_import_unsupported);
}
}
@@ -115,10 +115,11 @@ static void printImports(raw_ostream &out,
M->getImportedModules(publicImports, ModuleDecl::ImportFilterKind::Public);
llvm::SmallSet<ModuleDecl::ImportedModule, 8,
ModuleDecl::OrderImportedModules> publicImportSet;
publicImportSet.insert(publicImports.begin(), publicImports.end());
for (auto import : allImports) {
auto importedModule = import.second;
auto importedModule = import.importedModule;
if (importedModule->isOnoneSupportModule() ||
importedModule->isBuiltinModule()) {
continue;
@@ -140,9 +141,9 @@ static void printImports(raw_ostream &out,
// Write the access path we should be honoring but aren't.
// (See diagnoseScopedImports above.)
if (!import.first.empty()) {
if (!import.accessPath.empty()) {
out << "/*";
for (const auto &accessPathElem : import.first)
for (const auto &accessPathElem : import.accessPath)
out << "." << accessPathElem.Item;
out << "*/";
}