Skip to content

Commit 5ba5cd3

Browse files
ahoppenahoppen
committed
Rename children that refer to a MemberDeclBlock from members to memberBlock
Previously, we frequently had patterns where we did `node.members.members`, which doesn’t read very nice. `node.memberBlock.members` is much nicer.
1 parent e92c961 commit 5ba5cd3

File tree

20 files changed

+294
-234
lines changed

20 files changed

+294
-234
lines changed

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public let DECL_NODES: [Node] = [
196196
isOptional: true
197197
),
198198
Child(
199-
name: "Members",
199+
name: "MemberBlock",
200200
kind: .node(kind: "MemberDeclBlock")
201201
),
202202
]
@@ -312,7 +312,7 @@ public let DECL_NODES: [Node] = [
312312
isOptional: true
313313
),
314314
Child(
315-
name: "Members",
315+
name: "MemberBlock",
316316
kind: .node(kind: "MemberDeclBlock")
317317
),
318318
]
@@ -654,7 +654,7 @@ public let DECL_NODES: [Node] = [
654654
isOptional: true
655655
),
656656
Child(
657-
name: "Members",
657+
name: "MemberBlock",
658658
kind: .node(kind: "MemberDeclBlock"),
659659
description: "The cases and other members of this enum."
660660
),
@@ -709,7 +709,7 @@ public let DECL_NODES: [Node] = [
709709
isOptional: true
710710
),
711711
Child(
712-
name: "Members",
712+
name: "MemberBlock",
713713
kind: .node(kind: "MemberDeclBlock")
714714
),
715715
]
@@ -1722,7 +1722,7 @@ public let DECL_NODES: [Node] = [
17221722
isOptional: true
17231723
),
17241724
Child(
1725-
name: "Members",
1725+
name: "MemberBlock",
17261726
kind: .node(kind: "MemberDeclBlock")
17271727
),
17281728
]
@@ -1824,7 +1824,7 @@ public let DECL_NODES: [Node] = [
18241824
isOptional: true
18251825
),
18261826
Child(
1827-
name: "Members",
1827+
name: "MemberBlock",
18281828
kind: .node(kind: "MemberDeclBlock")
18291829
),
18301830
]

‎CodeGeneration/Sources/SyntaxSupport/Traits.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public let TRAITS: [Trait] = [
4141
children: [
4242
Child(name: "Attributes", kind: .node(kind: "AttributeList"), isOptional: true),
4343
Child(name: "Modifiers", kind: .node(kind: "ModifierList"), isOptional: true),
44-
Child(name: "Members", kind: .node(kind: "MemberDeclBlock")),
44+
Child(name: "MemberBlock", kind: .node(kind: "MemberDeclBlock")),
4545
]
4646
),
4747
Trait(

‎Sources/SwiftParser/Declarations.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ extension Parser {
419419
} else {
420420
whereClause = nil
421421
}
422-
let members = self.parseMemberDeclList(introducer: extensionKeyword)
422+
let memberBlock = self.parseMemberDeclList(introducer: extensionKeyword)
423423
return RawExtensionDeclSyntax(
424424
attributes: attrs.attributes,
425425
modifiers: attrs.modifiers,
@@ -428,7 +428,7 @@ extension Parser {
428428
extendedType: type,
429429
inheritanceClause: inheritance,
430430
genericWhereClause: whereClause,
431-
members: members,
431+
memberBlock: memberBlock,
432432
arena: self.arena
433433
)
434434
}

‎Sources/SwiftParser/Nominals.swift‎

Lines changed: 74 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protocol NominalTypeDeclarationTrait {
2525
primaryOrGenerics: PrimaryOrGenerics?,
2626
inheritanceClause: RawTypeInheritanceClauseSyntax?,
2727
genericWhereClause: RawGenericWhereClauseSyntax?,
28-
members: RawMemberDeclBlockSyntax,
28+
memberBlock: RawMemberDeclBlockSyntax,
2929
arena: __shared SyntaxArena
3030
)
3131

@@ -43,10 +43,22 @@ extension RawProtocolDeclSyntax: NominalTypeDeclarationTrait {
4343
primaryOrGenerics: RawPrimaryAssociatedTypeClauseSyntax?,
4444
inheritanceClause: RawTypeInheritanceClauseSyntax?,
4545
genericWhereClause: RawGenericWhereClauseSyntax?,
46-
members: RawMemberDeclBlockSyntax,
46+
memberBlock: RawMemberDeclBlockSyntax,
4747
arena: __shared SyntaxArena
4848
) {
49-
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, protocolKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, primaryAssociatedTypeClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
49+
self.init(
50+
attributes: attributes,
51+
modifiers: modifiers,
52+
unexpectedBeforeIntroducerKeyword,
53+
protocolKeyword: introducerKeyword,
54+
unexpectedBeforeIdentifier,
55+
identifier: identifier,
56+
primaryAssociatedTypeClause: primaryOrGenerics,
57+
inheritanceClause: inheritanceClause,
58+
genericWhereClause: genericWhereClause,
59+
memberBlock: memberBlock,
60+
arena: arena
61+
)
5062
}
5163

5264
static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawPrimaryAssociatedTypeClauseSyntax? {
@@ -65,10 +77,22 @@ extension RawClassDeclSyntax: NominalTypeDeclarationTrait {
6577
primaryOrGenerics: RawGenericParameterClauseSyntax?,
6678
inheritanceClause: RawTypeInheritanceClauseSyntax?,
6779
genericWhereClause: RawGenericWhereClauseSyntax?,
68-
members: RawMemberDeclBlockSyntax,
80+
memberBlock: RawMemberDeclBlockSyntax,
6981
arena: __shared SyntaxArena
7082
) {
71-
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, classKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
83+
self.init(
84+
attributes: attributes,
85+
modifiers: modifiers,
86+
unexpectedBeforeIntroducerKeyword,
87+
classKeyword: introducerKeyword,
88+
unexpectedBeforeIdentifier,
89+
identifier: identifier,
90+
genericParameterClause: primaryOrGenerics,
91+
inheritanceClause: inheritanceClause,
92+
genericWhereClause: genericWhereClause,
93+
memberBlock: memberBlock,
94+
arena: arena
95+
)
7296
}
7397

7498
static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -87,10 +111,22 @@ extension RawActorDeclSyntax: NominalTypeDeclarationTrait {
87111
primaryOrGenerics: RawGenericParameterClauseSyntax?,
88112
inheritanceClause: RawTypeInheritanceClauseSyntax?,
89113
genericWhereClause: RawGenericWhereClauseSyntax?,
90-
members: RawMemberDeclBlockSyntax,
114+
memberBlock: RawMemberDeclBlockSyntax,
91115
arena: __shared SyntaxArena
92116
) {
93-
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, actorKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
117+
self.init(
118+
attributes: attributes,
119+
modifiers: modifiers,
120+
unexpectedBeforeIntroducerKeyword,
121+
actorKeyword: introducerKeyword,
122+
unexpectedBeforeIdentifier,
123+
identifier: identifier,
124+
genericParameterClause: primaryOrGenerics,
125+
inheritanceClause: inheritanceClause,
126+
genericWhereClause: genericWhereClause,
127+
memberBlock: memberBlock,
128+
arena: arena
129+
)
94130
}
95131

96132
static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -109,10 +145,22 @@ extension RawStructDeclSyntax: NominalTypeDeclarationTrait {
109145
primaryOrGenerics: RawGenericParameterClauseSyntax?,
110146
inheritanceClause: RawTypeInheritanceClauseSyntax?,
111147
genericWhereClause: RawGenericWhereClauseSyntax?,
112-
members: RawMemberDeclBlockSyntax,
148+
memberBlock: RawMemberDeclBlockSyntax,
113149
arena: __shared SyntaxArena
114150
) {
115-
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, structKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
151+
self.init(
152+
attributes: attributes,
153+
modifiers: modifiers,
154+
unexpectedBeforeIntroducerKeyword,
155+
structKeyword: introducerKeyword,
156+
unexpectedBeforeIdentifier,
157+
identifier: identifier,
158+
genericParameterClause: primaryOrGenerics,
159+
inheritanceClause: inheritanceClause,
160+
genericWhereClause: genericWhereClause,
161+
memberBlock: memberBlock,
162+
arena: arena
163+
)
116164
}
117165

118166
static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -131,10 +179,22 @@ extension RawEnumDeclSyntax: NominalTypeDeclarationTrait {
131179
primaryOrGenerics: RawGenericParameterClauseSyntax?,
132180
inheritanceClause: RawTypeInheritanceClauseSyntax?,
133181
genericWhereClause: RawGenericWhereClauseSyntax?,
134-
members: RawMemberDeclBlockSyntax,
182+
memberBlock: RawMemberDeclBlockSyntax,
135183
arena: __shared SyntaxArena
136184
) {
137-
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, enumKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameters: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
185+
self.init(
186+
attributes: attributes,
187+
modifiers: modifiers,
188+
unexpectedBeforeIntroducerKeyword,
189+
enumKeyword: introducerKeyword,
190+
unexpectedBeforeIdentifier,
191+
identifier: identifier,
192+
genericParameters: primaryOrGenerics,
193+
inheritanceClause: inheritanceClause,
194+
genericWhereClause: genericWhereClause,
195+
memberBlock: memberBlock,
196+
arena: arena
197+
)
138198
}
139199

140200
static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -162,7 +222,7 @@ extension Parser {
162222
primaryOrGenerics: nil,
163223
inheritanceClause: nil,
164224
genericWhereClause: nil,
165-
members: RawMemberDeclBlockSyntax(
225+
memberBlock: RawMemberDeclBlockSyntax(
166226
leftBrace: RawTokenSyntax(missing: .leftBrace, arena: self.arena),
167227
members: RawMemberDeclListSyntax(elements: [], arena: self.arena),
168228
rightBrace: RawTokenSyntax(missing: .rightBrace, arena: self.arena),
@@ -194,7 +254,7 @@ extension Parser {
194254
whereClause = nil
195255
}
196256

197-
let members = self.parseMemberDeclList(introducer: introducerKeyword)
257+
let memberBlock = self.parseMemberDeclList(introducer: introducerKeyword)
198258
return T.init(
199259
attributes: attrs.attributes,
200260
modifiers: attrs.modifiers,
@@ -205,7 +265,7 @@ extension Parser {
205265
primaryOrGenerics: primaryOrGenerics,
206266
inheritanceClause: inheritance,
207267
genericWhereClause: whereClause,
208-
members: members,
268+
memberBlock: memberBlock,
209269
arena: self.arena
210270
)
211271
}

‎Sources/SwiftParserDiagnostics/PresenceUtils.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class PresentMaker: SyntaxRewriter {
7878
modifiers: node.modifiers,
7979
structKeyword: .keyword(.struct, presence: .missing),
8080
identifier: .identifier("<#declaration#>", leadingTrivia: leadingTriviaBeforePlaceholder),
81-
members: MemberDeclBlockSyntax(
81+
memberBlock: MemberDeclBlockSyntax(
8282
leftBrace: .leftBraceToken(presence: .missing),
8383
members: MemberDeclListSyntax([]),
8484
rightBrace: .rightBraceToken(presence: .missing)

‎Sources/SwiftSyntax/generated/SyntaxTraits.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public protocol DeclGroupSyntax: SyntaxProtocol {
102102
set
103103
}
104104

105-
var members: MemberDeclBlockSyntax {
105+
var memberBlock: MemberDeclBlockSyntax {
106106
get
107107
set
108108
}

0 commit comments

Comments
 (0)