Skip to content

Commit 7e90576

Browse files
TTOzziTTOzzi
committed
Rename genericParameters to genericParameterClause for consistency
1 parent 5eb8f82 commit 7e90576

File tree

11 files changed

+243
-71
lines changed

11 files changed

+243
-71
lines changed

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ public let DECL_NODES: [Node] = [
749749
description: "Declares the name of this enum. If the name matches a reserved keyword use backticks to escape it."
750750
),
751751
Child(
752-
name: "GenericParameters",
752+
name: "GenericParameterClause",
753753
kind: .node(kind: "GenericParameterClause"),
754754
nameForDiagnostics: "generic parameter clause",
755755
description: "The generic parameters, if any, for this enum declaration.",

‎CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public let TYPE_NODES: [Node] = [
322322
kind: "Type",
323323
children: [
324324
Child(
325-
name: "GenericParameters",
325+
name: "GenericParameterClause",
326326
kind: .node(kind: "GenericParameterClause")
327327
),
328328
Child(

‎Sources/SwiftParser/Nominals.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ extension RawEnumDeclSyntax: NominalTypeDeclarationTrait {
189189
enumKeyword: introducerKeyword,
190190
unexpectedBeforeIdentifier,
191191
identifier: identifier,
192-
genericParameters: primaryOrGenerics,
192+
genericParameterClause: primaryOrGenerics,
193193
inheritanceClause: inheritanceClause,
194194
genericWhereClause: genericWhereClause,
195195
memberBlock: memberBlock,

‎Sources/SwiftParser/Types.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ extension Parser {
10451045
let baseType = self.parseType()
10461046
return RawTypeSyntax(
10471047
RawNamedOpaqueReturnTypeSyntax(
1048-
genericParameters: generics,
1048+
genericParameterClause: generics,
10491049
baseType: baseType,
10501050
arena: self.arena
10511051
)

‎Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
126126
return "attributes"
127127
case \EnumDeclSyntax.modifiers:
128128
return "modifiers"
129-
case \EnumDeclSyntax.genericParameters:
129+
case \EnumDeclSyntax.genericParameterClause:
130130
return "generic parameter clause"
131131
case \EnumDeclSyntax.inheritanceClause:
132132
return "inheritance clause"

‎Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,175 @@ public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
2828

2929
@available(*, deprecated, renamed: "WithAttributesSyntax")
3030
public typealias AttributedSyntax = WithAttributesSyntax
31+
32+
public extension RawNamedOpaqueReturnTypeSyntax {
33+
@available(*, deprecated, renamed: "unexpectedBeforeGenericParameterClause")
34+
var unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? { unexpectedBeforeGenericParameterClause }
35+
36+
@available(*, deprecated, renamed: "genericParameterClause")
37+
var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
38+
39+
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
40+
var unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndBaseType }
41+
42+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
43+
init(
44+
_ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
45+
genericParameters: RawGenericParameterClauseSyntax,
46+
_ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
47+
baseType: RawTypeSyntax,
48+
_ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
49+
arena: __shared SyntaxArena
50+
) {
51+
self.init(
52+
unexpectedBeforeGenericParameters,
53+
genericParameterClause: genericParameters,
54+
unexpectedBetweenGenericParametersAndBaseType,
55+
baseType: baseType,
56+
unexpectedAfterBaseType,
57+
arena: arena
58+
)
59+
}
60+
}
61+
62+
public extension RawEnumDeclSyntax {
63+
@available(*, deprecated, renamed: "unexpectedBetweenIdentifierAndGenericParameterClause")
64+
var unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? { unexpectedBetweenIdentifierAndGenericParameterClause }
65+
66+
@available(*, deprecated, renamed: "genericParameterClause")
67+
var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
68+
69+
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndInheritanceClause")
70+
var unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndInheritanceClause }
71+
72+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
73+
init(
74+
_ unexpectedBeforeAttributes: RawUnexpectedNodesSyntax? = nil,
75+
attributes: RawAttributeListSyntax?,
76+
_ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil,
77+
modifiers: RawModifierListSyntax?,
78+
_ unexpectedBetweenModifiersAndEnumKeyword: RawUnexpectedNodesSyntax? = nil,
79+
enumKeyword: RawTokenSyntax,
80+
_ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil,
81+
identifier: RawTokenSyntax,
82+
_ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil,
83+
genericParameters: RawGenericParameterClauseSyntax?,
84+
_ unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? = nil,
85+
inheritanceClause: RawTypeInheritanceClauseSyntax?,
86+
_ unexpectedBetweenInheritanceClauseAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil,
87+
genericWhereClause: RawGenericWhereClauseSyntax?,
88+
_ unexpectedBetweenGenericWhereClauseAndMemberBlock: RawUnexpectedNodesSyntax? = nil,
89+
memberBlock: RawMemberDeclBlockSyntax,
90+
_ unexpectedAfterMemberBlock: RawUnexpectedNodesSyntax? = nil,
91+
arena: __shared SyntaxArena
92+
) {
93+
self.init(
94+
unexpectedBeforeAttributes,
95+
attributes: attributes,
96+
unexpectedBetweenAttributesAndModifiers,
97+
modifiers: modifiers,
98+
unexpectedBetweenModifiersAndEnumKeyword,
99+
enumKeyword: enumKeyword,
100+
unexpectedBetweenEnumKeywordAndIdentifier,
101+
identifier: identifier,
102+
unexpectedBetweenIdentifierAndGenericParameters,
103+
genericParameterClause: genericParameters,
104+
unexpectedBetweenGenericParametersAndInheritanceClause,
105+
inheritanceClause: inheritanceClause,
106+
unexpectedBetweenInheritanceClauseAndGenericWhereClause,
107+
genericWhereClause: genericWhereClause,
108+
unexpectedBetweenGenericWhereClauseAndMemberBlock,
109+
memberBlock: memberBlock,
110+
unexpectedAfterMemberBlock,
111+
arena: arena
112+
)
113+
}
114+
}
115+
116+
public extension EnumDeclSyntax {
117+
@available(*, deprecated, renamed: "unexpectedBetweenIdentifierAndGenericParameterClause")
118+
var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? { unexpectedBetweenIdentifierAndGenericParameterClause }
119+
120+
@available(*, deprecated, renamed: "genericParameterClause")
121+
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
122+
123+
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndInheritanceClause")
124+
var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndInheritanceClause }
125+
126+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
127+
init(
128+
leadingTrivia: Trivia? = nil,
129+
_ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
130+
attributes: AttributeListSyntax? = nil,
131+
_ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil,
132+
modifiers: ModifierListSyntax? = nil,
133+
_ unexpectedBetweenModifiersAndEnumKeyword: UnexpectedNodesSyntax? = nil,
134+
enumKeyword: TokenSyntax = .keyword(.enum),
135+
_ unexpectedBetweenEnumKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
136+
identifier: TokenSyntax,
137+
_ unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? = nil,
138+
genericParameters: GenericParameterClauseSyntax? = nil,
139+
_ unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? = nil,
140+
inheritanceClause: TypeInheritanceClauseSyntax? = nil,
141+
_ unexpectedBetweenInheritanceClauseAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
142+
genericWhereClause: GenericWhereClauseSyntax? = nil,
143+
_ unexpectedBetweenGenericWhereClauseAndMemberBlock: UnexpectedNodesSyntax? = nil,
144+
memberBlock: MemberDeclBlockSyntax,
145+
_ unexpectedAfterMemberBlock: UnexpectedNodesSyntax? = nil,
146+
trailingTrivia: Trivia? = nil
147+
) {
148+
self.init(
149+
leadingTrivia: leadingTrivia,
150+
unexpectedBeforeAttributes,
151+
attributes: attributes,
152+
unexpectedBetweenAttributesAndModifiers,
153+
modifiers: modifiers,
154+
unexpectedBetweenModifiersAndEnumKeyword,
155+
enumKeyword: enumKeyword,
156+
unexpectedBetweenEnumKeywordAndIdentifier,
157+
identifier: identifier,
158+
unexpectedBetweenIdentifierAndGenericParameters,
159+
genericParameterClause: genericParameters,
160+
unexpectedBetweenGenericParametersAndInheritanceClause,
161+
inheritanceClause: inheritanceClause,
162+
unexpectedBetweenInheritanceClauseAndGenericWhereClause,
163+
genericWhereClause: genericWhereClause,
164+
unexpectedBetweenGenericWhereClauseAndMemberBlock,
165+
memberBlock: memberBlock,
166+
unexpectedAfterMemberBlock,
167+
trailingTrivia: trailingTrivia
168+
)
169+
}
170+
}
171+
172+
public extension NamedOpaqueReturnTypeSyntax {
173+
@available(*, deprecated, renamed: "unexpectedBeforeGenericParameterClause")
174+
var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? { unexpectedBeforeGenericParameterClause }
175+
176+
@available(*, deprecated, renamed: "genericParameterClause")
177+
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
178+
179+
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
180+
var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndBaseType }
181+
182+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
183+
init(
184+
leadingTrivia: Trivia? = nil,
185+
_ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
186+
genericParameters: GenericParameterClauseSyntax,
187+
_ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
188+
baseType: some TypeSyntaxProtocol,
189+
_ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
190+
trailingTrivia: Trivia? = nil
191+
) {
192+
self.init(
193+
leadingTrivia: leadingTrivia,
194+
unexpectedBeforeGenericParameters,
195+
genericParameterClause: genericParameters,
196+
unexpectedBetweenGenericParametersAndBaseType,
197+
baseType: baseType,
198+
unexpectedAfterBaseType,
199+
trailingTrivia: trailingTrivia
200+
)
201+
}
202+
}

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,12 +1207,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
12071207
return "unexpectedBetweenEnumKeywordAndIdentifier"
12081208
case \EnumDeclSyntax.identifier:
12091209
return "identifier"
1210-
case \EnumDeclSyntax.unexpectedBetweenIdentifierAndGenericParameters:
1211-
return "unexpectedBetweenIdentifierAndGenericParameters"
1212-
case \EnumDeclSyntax.genericParameters:
1213-
return "genericParameters"
1214-
case \EnumDeclSyntax.unexpectedBetweenGenericParametersAndInheritanceClause:
1215-
return "unexpectedBetweenGenericParametersAndInheritanceClause"
1210+
case \EnumDeclSyntax.unexpectedBetweenIdentifierAndGenericParameterClause:
1211+
return "unexpectedBetweenIdentifierAndGenericParameterClause"
1212+
case \EnumDeclSyntax.genericParameterClause:
1213+
return "genericParameterClause"
1214+
case \EnumDeclSyntax.unexpectedBetweenGenericParameterClauseAndInheritanceClause:
1215+
return "unexpectedBetweenGenericParameterClauseAndInheritanceClause"
12161216
case \EnumDeclSyntax.inheritanceClause:
12171217
return "inheritanceClause"
12181218
case \EnumDeclSyntax.unexpectedBetweenInheritanceClauseAndGenericWhereClause:
@@ -2241,12 +2241,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
22412241
return "closure"
22422242
case \MultipleTrailingClosureElementSyntax.unexpectedAfterClosure:
22432243
return "unexpectedAfterClosure"
2244-
case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameters:
2245-
return "unexpectedBeforeGenericParameters"
2246-
case \NamedOpaqueReturnTypeSyntax.genericParameters:
2247-
return "genericParameters"
2248-
case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParametersAndBaseType:
2249-
return "unexpectedBetweenGenericParametersAndBaseType"
2244+
case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameterClause:
2245+
return "unexpectedBeforeGenericParameterClause"
2246+
case \NamedOpaqueReturnTypeSyntax.genericParameterClause:
2247+
return "genericParameterClause"
2248+
case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParameterClauseAndBaseType:
2249+
return "unexpectedBetweenGenericParameterClauseAndBaseType"
22502250
case \NamedOpaqueReturnTypeSyntax.baseType:
22512251
return "baseType"
22522252
case \NamedOpaqueReturnTypeSyntax.unexpectedAfterBaseType:

‎Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8340,9 +8340,9 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
83408340
enumKeyword: RawTokenSyntax,
83418341
_ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil,
83428342
identifier: RawTokenSyntax,
8343-
_ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil,
8344-
genericParameters: RawGenericParameterClauseSyntax?,
8345-
_ unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? = nil,
8343+
_ unexpectedBetweenIdentifierAndGenericParameterClause: RawUnexpectedNodesSyntax? = nil,
8344+
genericParameterClause: RawGenericParameterClauseSyntax?,
8345+
_ unexpectedBetweenGenericParameterClauseAndInheritanceClause: RawUnexpectedNodesSyntax? = nil,
83468346
inheritanceClause: RawTypeInheritanceClauseSyntax?,
83478347
_ unexpectedBetweenInheritanceClauseAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil,
83488348
genericWhereClause: RawGenericWhereClauseSyntax?,
@@ -8362,9 +8362,9 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
83628362
layout[5] = enumKeyword.raw
83638363
layout[6] = unexpectedBetweenEnumKeywordAndIdentifier?.raw
83648364
layout[7] = identifier.raw
8365-
layout[8] = unexpectedBetweenIdentifierAndGenericParameters?.raw
8366-
layout[9] = genericParameters?.raw
8367-
layout[10] = unexpectedBetweenGenericParametersAndInheritanceClause?.raw
8365+
layout[8] = unexpectedBetweenIdentifierAndGenericParameterClause?.raw
8366+
layout[9] = genericParameterClause?.raw
8367+
layout[10] = unexpectedBetweenGenericParameterClauseAndInheritanceClause?.raw
83688368
layout[11] = inheritanceClause?.raw
83698369
layout[12] = unexpectedBetweenInheritanceClauseAndGenericWhereClause?.raw
83708370
layout[13] = genericWhereClause?.raw
@@ -8407,15 +8407,15 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
84078407
layoutView.children[7].map(RawTokenSyntax.init(raw:))!
84088408
}
84098409

8410-
public var unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? {
8410+
public var unexpectedBetweenIdentifierAndGenericParameterClause: RawUnexpectedNodesSyntax? {
84118411
layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
84128412
}
84138413

8414-
public var genericParameters: RawGenericParameterClauseSyntax? {
8414+
public var genericParameterClause: RawGenericParameterClauseSyntax? {
84158415
layoutView.children[9].map(RawGenericParameterClauseSyntax.init(raw:))
84168416
}
84178417

8418-
public var unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? {
8418+
public var unexpectedBetweenGenericParameterClauseAndInheritanceClause: RawUnexpectedNodesSyntax? {
84198419
layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
84208420
}
84218421

@@ -14876,34 +14876,34 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1487614876
}
1487714877

1487814878
public init(
14879-
_ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
14880-
genericParameters: RawGenericParameterClauseSyntax,
14881-
_ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
14879+
_ unexpectedBeforeGenericParameterClause: RawUnexpectedNodesSyntax? = nil,
14880+
genericParameterClause: RawGenericParameterClauseSyntax,
14881+
_ unexpectedBetweenGenericParameterClauseAndBaseType: RawUnexpectedNodesSyntax? = nil,
1488214882
baseType: RawTypeSyntax,
1488314883
_ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
1488414884
arena: __shared SyntaxArena
1488514885
) {
1488614886
let raw = RawSyntax.makeLayout(
1488714887
kind: .namedOpaqueReturnType, uninitializedCount: 5, arena: arena) { layout in
1488814888
layout.initialize(repeating: nil)
14889-
layout[0] = unexpectedBeforeGenericParameters?.raw
14890-
layout[1] = genericParameters.raw
14891-
layout[2] = unexpectedBetweenGenericParametersAndBaseType?.raw
14889+
layout[0] = unexpectedBeforeGenericParameterClause?.raw
14890+
layout[1] = genericParameterClause.raw
14891+
layout[2] = unexpectedBetweenGenericParameterClauseAndBaseType?.raw
1489214892
layout[3] = baseType.raw
1489314893
layout[4] = unexpectedAfterBaseType?.raw
1489414894
}
1489514895
self.init(unchecked: raw)
1489614896
}
1489714897

14898-
public var unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? {
14898+
public var unexpectedBeforeGenericParameterClause: RawUnexpectedNodesSyntax? {
1489914899
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1490014900
}
1490114901

14902-
public var genericParameters: RawGenericParameterClauseSyntax {
14902+
public var genericParameterClause: RawGenericParameterClauseSyntax {
1490314903
layoutView.children[1].map(RawGenericParameterClauseSyntax.init(raw:))!
1490414904
}
1490514905

14906-
public var unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? {
14906+
public var unexpectedBetweenGenericParameterClauseAndBaseType: RawUnexpectedNodesSyntax? {
1490714907
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1490814908
}
1490914909

0 commit comments

Comments
 (0)