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

[IDE] Teach type checker about conditional conformance extensions.

Browse Source 
Before conditional conformances, the archetypes in conformance
extensions (i.e. extension Foo: SomeProtocol) were equivalent to those
in the type decl, with the same protocol bounds and so on. The code for
printing "synthesized" members relied on this fact. This commit teaches
that code to deal with archetypes in the conditional conformance
extension when required.

Fixes rdar://problem/36553066 and SR-6930.
This commit is contained in:
Huon Wilson
2018-02-13 01:32:24 +11:00
parent 715ca9d27d
commit cb60dbeee2
14 changed files with 870 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -81,15 +81,16 @@ private:
return OtherPrinter.printModuleRef(Mod, Name);
}
void printSynthesizedExtensionPre(const ExtensionDecl *ED,
const NominalTypeDecl *NTD,
TypeOrExtensionDecl Target,
Optional<BracketOptions> Bracket) override {
return OtherPrinter.printSynthesizedExtensionPre(ED, NTD, Bracket);
return OtherPrinter.printSynthesizedExtensionPre(ED, Target, Bracket);
}
void printSynthesizedExtensionPost(const ExtensionDecl *ED,
const NominalTypeDecl *NTD,
Optional<BracketOptions> Bracket) override {
return OtherPrinter.printSynthesizedExtensionPost(ED, NTD, Bracket);
void
printSynthesizedExtensionPost(const ExtensionDecl *ED,
TypeOrExtensionDecl Target,
Optional<BracketOptions> Bracket) override {
return OtherPrinter.printSynthesizedExtensionPost(ED, Target, Bracket);
}
void printStructurePre(PrintStructureKind Kind, const Decl *D) override {
@@ -589,20 +590,22 @@ void swift::ide::printSubmoduleInterface(
if (IsTopLevelDecl) {
// Print the part that should be merged with the type decl.
pAnalyzer->forEachExtensionMergeGroup(
SynthesizedExtensionAnalyzer::MergeGroupKind::MergeableWithTypeDef,
[&](ArrayRef<ExtensionAndIsSynthesized> Decls){
for (auto ET : Decls) {
AdjustedOptions.BracketOptions = {ET.first, false,
Decls.back().first == ET.first, true};
if (ET.second)
AdjustedOptions.initForSynthesizedExtension(NTD);
ET.first->print(Printer, AdjustedOptions);
if (ET.second)
AdjustedOptions.clearSynthesizedExtension();
if (AdjustedOptions.BracketOptions.shouldCloseExtension(ET.first))
Printer << "\n";
}
});
SynthesizedExtensionAnalyzer::MergeGroupKind::
MergeableWithTypeDef,
[&](ArrayRef<ExtensionInfo> Decls) {
for (auto ET : Decls) {
AdjustedOptions.BracketOptions = {
ET.Ext, false, Decls.back().Ext == ET.Ext, true};
if (ET.IsSynthesized)
AdjustedOptions.initForSynthesizedExtension(NTD);
ET.Ext->print(Printer, AdjustedOptions);
if (ET.IsSynthesized)
AdjustedOptions.clearSynthesizedExtension();
if (AdjustedOptions.BracketOptions.shouldCloseExtension(
ET.Ext))
Printer << "\n";
}
});
}
// If the printed Decl is not the top-level one, reset analyzer.
@@ -611,28 +614,36 @@ void swift::ide::printSubmoduleInterface(
// Print the rest as synthesized extensions.
pAnalyzer->forEachExtensionMergeGroup(
// For top-level decls, only constraint extensions are to print;
// Since the rest are merged into the main body.
IsTopLevelDecl ?
SynthesizedExtensionAnalyzer::MergeGroupKind::UnmergeableWithTypeDef :
// For sub-decls, all extensions should be printed.
SynthesizedExtensionAnalyzer::MergeGroupKind::All,
[&](ArrayRef<ExtensionAndIsSynthesized> Decls){
for (auto ET : Decls) {
AdjustedOptions.BracketOptions = {ET.first,
Decls.front().first == ET.first,
Decls.back().first == ET.first, true};
if (AdjustedOptions.BracketOptions.shouldOpenExtension(ET.first))
Printer << "\n";
if (ET.second)
AdjustedOptions.initForSynthesizedExtension(NTD);
ET.first->print(Printer, AdjustedOptions);
if (ET.second)
AdjustedOptions.clearSynthesizedExtension();
if (AdjustedOptions.BracketOptions.shouldCloseExtension(ET.first))
Printer << "\n";
}
});
// For top-level decls, only constraint extensions need to be
// printed, since the rest are merged into the main body.
IsTopLevelDecl ? SynthesizedExtensionAnalyzer::MergeGroupKind::
UnmergeableWithTypeDef
:
// For sub-decls, all extensions should be printed.
SynthesizedExtensionAnalyzer::MergeGroupKind::All,
[&](ArrayRef<ExtensionInfo> Decls) {
for (auto ET : Decls) {
AdjustedOptions.BracketOptions = {
ET.Ext, Decls.front().Ext == ET.Ext,
Decls.back().Ext == ET.Ext, true};
if (AdjustedOptions.BracketOptions.shouldOpenExtension(
ET.Ext))
Printer << "\n";
if (ET.IsSynthesized) {
if (ET.EnablingExt)
AdjustedOptions.initForSynthesizedExtension(
ET.EnablingExt);
else
AdjustedOptions.initForSynthesizedExtension(NTD);
}
ET.Ext->print(Printer, AdjustedOptions);
if (ET.IsSynthesized)
AdjustedOptions.clearSynthesizedExtension();
if (AdjustedOptions.BracketOptions.shouldCloseExtension(
ET.Ext))
Printer << "\n";
}
});
AdjustedOptions.BracketOptions = BracketOptions();
}
}