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

Refactoring: Moving the logic of collecting synthesized extensions to Analyzer. NFC.

Browse Source
This commit is contained in:
Xi Ge
2016-03-02 16:06:04 -08:00
parent d12f1f0665
commit 3f20eb242d
3 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -168,35 +168,6 @@ static void adjustPrintOptions(PrintOptions &AdjustedOptions) {
AdjustedOptions.PrintDefaultParameterPlaceholder = true;
}
void findExtensionsFromConformingProtocols(Decl *D,
llvm::SmallPtrSetImpl<ExtensionDecl*> &Results) {
NominalTypeDecl* NTD = dyn_cast<NominalTypeDecl>(D);
if (!NTD || NTD->getKind() == DeclKind::Protocol)
return;
std::vector<NominalTypeDecl*> Unhandled;
auto addTypeLocNominal = [&](TypeLoc TL){
if (TL.getType()) {
if (auto D = TL.getType()->getAnyNominal()) {
Unhandled.push_back(D);
}
}
};
for (auto TL : NTD->getInherited()) {
addTypeLocNominal(TL);
}
while(!Unhandled.empty()) {
NominalTypeDecl* Back = Unhandled.back();
Unhandled.pop_back();
for (ExtensionDecl *E : Back->getExtensions()) {
if(E->isConstrainedExtension())
Results.insert(E);
for (auto TL : Back->getInherited()) {
addTypeLocNominal(TL);
}
}
}
}
ArrayRef<StringRef>
swift::ide::collectModuleGroups(Module *M, std::vector<StringRef> &Scratch) {
for (auto File : M->getFiles()) {
@@ -476,14 +447,12 @@ void swift::ide::printSubmoduleInterface(
// Print synthesized extensions.
llvm::SmallPtrSet<ExtensionDecl *, 10> ExtensionsFromConformances;
findExtensionsFromConformingProtocols(D, ExtensionsFromConformances);
SynthesizedExtensionAnalyzer Analyzer(NTD);
Analyzer.findSynthesizedExtensions(ExtensionsFromConformances);
AdjustedOptions.initArchetypeTransformerForSynthesizedExtensions(NTD);
for (auto ET : ExtensionsFromConformances) {
if (!shouldPrint(ET, AdjustedOptions))
continue;
SynthesizedExtensionAnalyzer Analyzer(ET, NTD);
if (!Analyzer.isApplicable())
continue;
Printer << "\n";
ET->print(Printer, AdjustedOptions);
Printer << "\n";