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

ModulePrinting: Fix several issues pointed by Ben.

Browse Source
This commit is contained in:
Xi Ge
2016-03-08 17:57:40 -08:00
parent ce12c6dc95
commit 09cd9c1f9d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -259,7 +259,7 @@ void swift::ide::printSubmoduleInterface(
NoImportSubModules.insert(*It);
}
}
llvm::StringMap<std::unique_ptr<std::vector<Decl*>>> FileRangedDecls;
llvm::StringMap<std::vector<Decl*>> FileRangedDecls;
// Separate the declarations that we are going to print into different
// buckets.
for (Decl *D : Decls) {
@@ -330,7 +330,7 @@ void swift::ide::printSubmoduleInterface(
if (std::find(GroupNames.begin(), GroupNames.end(),
Target.getValue()) != GroupNames.end()) {
FileRangedDecls.insert(std::make_pair(D->getSourceFileName().getValue(),
llvm::make_unique<std::vector<Decl*>>())).first->getValue()->push_back(D);
std::vector<Decl*>())).first->getValue().push_back(D);
}
}
continue;
@@ -343,8 +343,8 @@ void swift::ide::printSubmoduleInterface(
llvm::SetVector<Decl*> PrintLineAfter;
if (!GroupNames.empty()) {
assert(SwiftDecls.empty());
for (auto It = FileRangedDecls.begin(); It != FileRangedDecls.end(); ++ It) {
auto &DeclsInFile = *It->getValue();
for (auto &Entry : FileRangedDecls) {
auto &DeclsInFile = Entry.getValue();
std::sort(DeclsInFile.begin(), DeclsInFile.end(),
[](Decl* LHS, Decl *RHS) {
assert(LHS->getSourceOrder().hasValue());