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

AST: Introduce abstraction for extension/type decl inheritance clauses.

Browse Source 
Wrap the `InheritedEntry` array available on both `ExtensionDecl` and
`TypeDecl` in a new `InheritedTypes` class. This class will provide shared
conveniences for working with inherited type clauses. NFC.
This commit is contained in:
Allan Shortlidge
2023-09-05 17:08:05 -07:00
parent 2c3c3c1933
commit 0dd8f4c492
33 changed files with 221 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -479,11 +479,11 @@ class InheritedProtocolCollector {
/// If \p skipExtra is true then avoid recording any extra protocols to
/// print, such as synthesized conformances or conformances to non-public
/// protocols.
void recordProtocols(ArrayRef<InheritedEntry> directlyInherited,
const Decl *D, bool skipExtra = false) {
void recordProtocols(InheritedTypes directlyInherited, const Decl *D,
bool skipExtra = false) {
llvm::Optional<AvailableAttrList> availableAttrs;
for (InheritedEntry inherited : directlyInherited) {
for (InheritedEntry inherited : directlyInherited.getEntries()) {
Type inheritedTy = inherited.getType();
if (!inheritedTy || !inheritedTy->isExistentialType())
continue;
@@ -526,7 +526,7 @@ class InheritedProtocolCollector {
/// For each type directly inherited by \p extension, record any protocols
/// that we would have printed in ConditionalConformanceProtocols.
void recordConditionalConformances(const ExtensionDecl *extension) {
for (TypeLoc inherited : extension->getInherited()) {
for (TypeLoc inherited : extension->getInherited().getEntries()) {
Type inheritedTy = inherited.getType();
if (!inheritedTy || !inheritedTy->isExistentialType())
continue;
@@ -551,7 +551,7 @@ public:
///
/// \sa recordProtocols
static void collectProtocols(PerTypeMap &map, const Decl *D) {
ArrayRef<InheritedEntry> directlyInherited;
InheritedTypes directlyInherited = InheritedTypes(D);
const NominalTypeDecl *nominal;
const IterableDeclContext *memberContext;
@@ -565,7 +565,6 @@ public:
return true;
};
if ((nominal = dyn_cast<NominalTypeDecl>(D))) {
directlyInherited = nominal->getInherited();
memberContext = nominal;
} else if (auto *extension = dyn_cast<ExtensionDecl>(D)) {
@@ -573,7 +572,6 @@ public:
return;
}
nominal = extension->getExtendedNominal();
directlyInherited = extension->getInherited();
memberContext = extension;
} else {
return;