Skip to content

Commit 5f0c38a

Browse files
TTOzziTTOzzi
committed
Rename genericParameters to genericParameterClause using CodeGeneration
1 parent 5387d3e commit 5f0c38a

File tree

8 files changed

+204
-247
lines changed

8 files changed

+204
-247
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/SwiftSyntax/SwiftSyntaxCompatibility.swift‎

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

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

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift‎

Lines changed: 8 additions & 8 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"
1210+
case \EnumDeclSyntax.unexpectedBetweenIdentifierAndGenericParameterClause:
1211+
return "unexpectedBetweenIdentifierAndGenericParameterClause"
12121212
case \EnumDeclSyntax.genericParameterClause:
12131213
return "genericParameterClause"
1214-
case \EnumDeclSyntax.unexpectedBetweenGenericParametersAndInheritanceClause:
1215-
return "unexpectedBetweenGenericParametersAndInheritanceClause"
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"
2244+
case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameterClause:
2245+
return "unexpectedBeforeGenericParameterClause"
22462246
case \NamedOpaqueReturnTypeSyntax.genericParameterClause:
22472247
return "genericParameterClause"
2248-
case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParametersAndBaseType:
2249-
return "unexpectedBetweenGenericParametersAndBaseType"
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: 14 additions & 86 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-
genericParameterClause: 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
8365+
layout[8] = unexpectedBetweenIdentifierAndGenericParameterClause?.raw
83668366
layout[9] = genericParameterClause?.raw
8367-
layout[10] = unexpectedBetweenGenericParametersAndInheritanceClause?.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

84148414
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

@@ -8444,54 +8444,6 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
84448444
}
84458445
}
84468446

8447-
public extension RawEnumDeclSyntax {
8448-
@available(*, deprecated, renamed: "genericParameterClause")
8449-
var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
8450-
8451-
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
8452-
init(
8453-
_ unexpectedBeforeAttributes: RawUnexpectedNodesSyntax? = nil,
8454-
attributes: RawAttributeListSyntax?,
8455-
_ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil,
8456-
modifiers: RawModifierListSyntax?,
8457-
_ unexpectedBetweenModifiersAndEnumKeyword: RawUnexpectedNodesSyntax? = nil,
8458-
enumKeyword: RawTokenSyntax,
8459-
_ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil,
8460-
identifier: RawTokenSyntax,
8461-
_ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil,
8462-
genericParameters: RawGenericParameterClauseSyntax?,
8463-
_ unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? = nil,
8464-
inheritanceClause: RawTypeInheritanceClauseSyntax?,
8465-
_ unexpectedBetweenInheritanceClauseAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil,
8466-
genericWhereClause: RawGenericWhereClauseSyntax?,
8467-
_ unexpectedBetweenGenericWhereClauseAndMemberBlock: RawUnexpectedNodesSyntax? = nil,
8468-
memberBlock: RawMemberDeclBlockSyntax,
8469-
_ unexpectedAfterMemberBlock: RawUnexpectedNodesSyntax? = nil,
8470-
arena: __shared SyntaxArena
8471-
) {
8472-
self.init(
8473-
unexpectedBeforeAttributes,
8474-
attributes: attributes,
8475-
unexpectedBetweenAttributesAndModifiers,
8476-
modifiers: modifiers,
8477-
unexpectedBetweenModifiersAndEnumKeyword,
8478-
enumKeyword: enumKeyword,
8479-
unexpectedBetweenEnumKeywordAndIdentifier,
8480-
identifier: identifier,
8481-
unexpectedBetweenIdentifierAndGenericParameters,
8482-
genericParameterClause: genericParameters,
8483-
unexpectedBetweenGenericParametersAndInheritanceClause,
8484-
inheritanceClause: inheritanceClause,
8485-
unexpectedBetweenInheritanceClauseAndGenericWhereClause,
8486-
genericWhereClause: genericWhereClause,
8487-
unexpectedBetweenGenericWhereClauseAndMemberBlock,
8488-
memberBlock: memberBlock,
8489-
unexpectedAfterMemberBlock,
8490-
arena: arena
8491-
)
8492-
}
8493-
}
8494-
84958447
@_spi(RawSyntax)
84968448
public struct RawExposeAttributeArgumentsSyntax: RawSyntaxNodeProtocol {
84978449
@_spi(RawSyntax)
@@ -14924,34 +14876,34 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1492414876
}
1492514877

1492614878
public init(
14927-
_ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
14928-
genericParameterClause: RawGenericParameterClauseSyntax,
14929-
_ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
14879+
_ unexpectedBeforeGenericParameterClause: RawUnexpectedNodesSyntax? = nil,
14880+
genericParameterClause: RawGenericParameterClauseSyntax,
14881+
_ unexpectedBetweenGenericParameterClauseAndBaseType: RawUnexpectedNodesSyntax? = nil,
1493014882
baseType: RawTypeSyntax,
1493114883
_ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
1493214884
arena: __shared SyntaxArena
1493314885
) {
1493414886
let raw = RawSyntax.makeLayout(
1493514887
kind: .namedOpaqueReturnType, uninitializedCount: 5, arena: arena) { layout in
1493614888
layout.initialize(repeating: nil)
14937-
layout[0] = unexpectedBeforeGenericParameters?.raw
14889+
layout[0] = unexpectedBeforeGenericParameterClause?.raw
1493814890
layout[1] = genericParameterClause.raw
14939-
layout[2] = unexpectedBetweenGenericParametersAndBaseType?.raw
14891+
layout[2] = unexpectedBetweenGenericParameterClauseAndBaseType?.raw
1494014892
layout[3] = baseType.raw
1494114893
layout[4] = unexpectedAfterBaseType?.raw
1494214894
}
1494314895
self.init(unchecked: raw)
1494414896
}
1494514897

14946-
public var unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? {
14898+
public var unexpectedBeforeGenericParameterClause: RawUnexpectedNodesSyntax? {
1494714899
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1494814900
}
1494914901

1495014902
public var genericParameterClause: RawGenericParameterClauseSyntax {
1495114903
layoutView.children[1].map(RawGenericParameterClauseSyntax.init(raw:))!
1495214904
}
1495314905

14954-
public var unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? {
14906+
public var unexpectedBetweenGenericParameterClauseAndBaseType: RawUnexpectedNodesSyntax? {
1495514907
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1495614908
}
1495714909

@@ -14964,30 +14916,6 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1496414916
}
1496514917
}
1496614918

14967-
public extension RawNamedOpaqueReturnTypeSyntax {
14968-
@available(*, deprecated, renamed: "genericParameterClause")
14969-
var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
14970-
14971-
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
14972-
init(
14973-
_ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
14974-
genericParameters: RawGenericParameterClauseSyntax,
14975-
_ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
14976-
baseType: RawTypeSyntax,
14977-
_ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
14978-
arena: __shared SyntaxArena
14979-
) {
14980-
self.init(
14981-
unexpectedBeforeGenericParameters,
14982-
genericParameterClause: genericParameters,
14983-
unexpectedBetweenGenericParametersAndBaseType,
14984-
baseType: baseType,
14985-
unexpectedAfterBaseType,
14986-
arena: arena
14987-
)
14988-
}
14989-
}
14990-
1499114919
@_spi(RawSyntax)
1499214920
public struct RawNilLiteralExprSyntax: RawExprSyntaxNodeProtocol {
1499314921
@_spi(RawSyntax)

0 commit comments

Comments
 (0)