averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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

16
lib/AST/ASTWalker.cpp
View File

@@ -164,8 +164,9 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
if (auto *typeRepr = ED->getExtendedTypeRepr())
if (doIt(typeRepr))
return true;
for (auto &Inherit : ED->getInherited()) {
if (auto *const TyR = Inherit.getTypeRepr())
auto inheritedTypes = ED->getInherited();
for (auto i : inheritedTypes.getIndices()) {
if (auto *const TyR = inheritedTypes.getTypeRepr(i))
if (doIt(TyR))
return true;
}
@@ -276,7 +277,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
}
bool visitGenericTypeParamDecl(GenericTypeParamDecl *GTPD) {
for (const auto &Inherit: GTPD->getInherited()) {
for (const auto &Inherit : GTPD->getInherited().getEntries()) {
if (auto *const TyR = Inherit.getTypeRepr())
if (doIt(TyR))
return true;
@@ -285,7 +286,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
}
bool visitAssociatedTypeDecl(AssociatedTypeDecl *ATD) {
for (const auto &Inherit: ATD->getInherited()) {
for (const auto &Inherit : ATD->getInherited().getEntries()) {
if (auto *const TyR = Inherit.getTypeRepr())
if (doIt(TyR))
return true;
@@ -310,9 +311,10 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
bool WalkGenerics = visitGenericParamListIfNeeded(NTD);
for (const auto &Inherit : NTD->getInherited()) {
if (auto *const TyR = Inherit.getTypeRepr())
if (doIt(Inherit.getTypeRepr()))
auto inheritedTypes = NTD->getInherited();
for (auto i : inheritedTypes.getIndices()) {
if (auto *const TyR = inheritedTypes.getTypeRepr(i))
if (doIt(TyR))
return true;
}