Skip to content

Commit 8d501d2

Browse files
ahoppenahoppen
authored
Merge pull request #1686 from TTOzzi/rename-genericParameters-of-EnumDeclSyntax
Rename genericParameters to genericParameterClause for consistency.
2 parents 3ed9dcf + 5c39a2d commit 8d501d2

File tree

11 files changed

+159
-71
lines changed

11 files changed

+159
-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: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,91 @@ public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
2828

2929
@available(*, deprecated, renamed: "WithAttributesSyntax")
3030
public typealias AttributedSyntax = WithAttributesSyntax
31+
32+
public extension EnumDeclSyntax {
33+
@available(*, deprecated, renamed: "unexpectedBetweenIdentifierAndGenericParameterClause")
34+
var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? { unexpectedBetweenIdentifierAndGenericParameterClause }
35+
36+
@available(*, deprecated, renamed: "genericParameterClause")
37+
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
38+
39+
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndInheritanceClause")
40+
var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndInheritanceClause }
41+
42+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
43+
init(
44+
leadingTrivia: Trivia? = nil,
45+
_ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
46+
attributes: AttributeListSyntax? = nil,
47+
_ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil,
48+
modifiers: ModifierListSyntax? = nil,
49+
_ unexpectedBetweenModifiersAndEnumKeyword: UnexpectedNodesSyntax? = nil,
50+
enumKeyword: TokenSyntax = .keyword(.enum),
51+
_ unexpectedBetweenEnumKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
52+
identifier: TokenSyntax,
53+
_ unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? = nil,
54+
genericParameters: GenericParameterClauseSyntax? = nil,
55+
_ unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? = nil,
56+
inheritanceClause: TypeInheritanceClauseSyntax? = nil,
57+
_ unexpectedBetweenInheritanceClauseAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
58+
genericWhereClause: GenericWhereClauseSyntax? = nil,
59+
_ unexpectedBetweenGenericWhereClauseAndMemberBlock: UnexpectedNodesSyntax? = nil,
60+
memberBlock: MemberDeclBlockSyntax,
61+
_ unexpectedAfterMemberBlock: UnexpectedNodesSyntax? = nil,
62+
trailingTrivia: Trivia? = nil
63+
) {
64+
self.init(
65+
leadingTrivia: leadingTrivia,
66+
unexpectedBeforeAttributes,
67+
attributes: attributes,
68+
unexpectedBetweenAttributesAndModifiers,
69+
modifiers: modifiers,
70+
unexpectedBetweenModifiersAndEnumKeyword,
71+
enumKeyword: enumKeyword,
72+
unexpectedBetweenEnumKeywordAndIdentifier,
73+
identifier: identifier,
74+
unexpectedBetweenIdentifierAndGenericParameters,
75+
genericParameterClause: genericParameters,
76+
unexpectedBetweenGenericParametersAndInheritanceClause,
77+
inheritanceClause: inheritanceClause,
78+
unexpectedBetweenInheritanceClauseAndGenericWhereClause,
79+
genericWhereClause: genericWhereClause,
80+
unexpectedBetweenGenericWhereClauseAndMemberBlock,
81+
memberBlock: memberBlock,
82+
unexpectedAfterMemberBlock,
83+
trailingTrivia: trailingTrivia
84+
)
85+
}
86+
}
87+
88+
public extension NamedOpaqueReturnTypeSyntax {
89+
@available(*, deprecated, renamed: "unexpectedBeforeGenericParameterClause")
90+
var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? { unexpectedBeforeGenericParameterClause }
91+
92+
@available(*, deprecated, renamed: "genericParameterClause")
93+
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
94+
95+
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
96+
var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndBaseType }
97+
98+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
99+
init(
100+
leadingTrivia: Trivia? = nil,
101+
_ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
102+
genericParameters: GenericParameterClauseSyntax,
103+
_ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
104+
baseType: some TypeSyntaxProtocol,
105+
_ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
106+
trailingTrivia: Trivia? = nil
107+
) {
108+
self.init(
109+
leadingTrivia: leadingTrivia,
110+
unexpectedBeforeGenericParameters,
111+
genericParameterClause: genericParameters,
112+
unexpectedBetweenGenericParametersAndBaseType,
113+
baseType: baseType,
114+
unexpectedAfterBaseType,
115+
trailingTrivia: trailingTrivia
116+
)
117+
}
118+
}

‎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

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,9 +1765,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
17651765
enumKeyword: TokenSyntax = .keyword(.enum),
17661766
_ unexpectedBetweenEnumKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
17671767
identifier: TokenSyntax,
1768-
_ unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? = nil,
1769-
genericParameters: GenericParameterClauseSyntax? = nil,
1770-
_ unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? = nil,
1768+
_ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
1769+
genericParameterClause: GenericParameterClauseSyntax? = nil,
1770+
_ unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? = nil,
17711771
inheritanceClause: TypeInheritanceClauseSyntax? = nil,
17721772
_ unexpectedBetweenInheritanceClauseAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
17731773
genericWhereClause: GenericWhereClauseSyntax? = nil,
@@ -1788,9 +1788,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
17881788
enumKeyword,
17891789
unexpectedBetweenEnumKeywordAndIdentifier,
17901790
identifier,
1791-
unexpectedBetweenIdentifierAndGenericParameters,
1792-
genericParameters,
1793-
unexpectedBetweenGenericParametersAndInheritanceClause,
1791+
unexpectedBetweenIdentifierAndGenericParameterClause,
1792+
genericParameterClause,
1793+
unexpectedBetweenGenericParameterClauseAndInheritanceClause,
17941794
inheritanceClause,
17951795
unexpectedBetweenInheritanceClauseAndGenericWhereClause,
17961796
genericWhereClause,
@@ -1807,9 +1807,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
18071807
enumKeyword.raw,
18081808
unexpectedBetweenEnumKeywordAndIdentifier?.raw,
18091809
identifier.raw,
1810-
unexpectedBetweenIdentifierAndGenericParameters?.raw,
1811-
genericParameters?.raw,
1812-
unexpectedBetweenGenericParametersAndInheritanceClause?.raw,
1810+
unexpectedBetweenIdentifierAndGenericParameterClause?.raw,
1811+
genericParameterClause?.raw,
1812+
unexpectedBetweenGenericParameterClauseAndInheritanceClause?.raw,
18131813
inheritanceClause?.raw,
18141814
unexpectedBetweenInheritanceClauseAndGenericWhereClause?.raw,
18151815
genericWhereClause?.raw,
@@ -1944,7 +1944,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
19441944
}
19451945
}
19461946

1947-
public var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? {
1947+
public var unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? {
19481948
get {
19491949
return data.child(at: 8, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
19501950
}
@@ -1954,7 +1954,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
19541954
}
19551955

19561956
/// The generic parameters, if any, for this enum declaration.
1957-
public var genericParameters: GenericParameterClauseSyntax? {
1957+
public var genericParameterClause: GenericParameterClauseSyntax? {
19581958
get {
19591959
return data.child(at: 9, parent: Syntax(self)).map(GenericParameterClauseSyntax.init)
19601960
}
@@ -1963,7 +1963,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
19631963
}
19641964
}
19651965

1966-
public var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? {
1966+
public var unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? {
19671967
get {
19681968
return data.child(at: 10, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
19691969
}
@@ -2039,9 +2039,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
20392039
\Self.enumKeyword,
20402040
\Self.unexpectedBetweenEnumKeywordAndIdentifier,
20412041
\Self.identifier,
2042-
\Self.unexpectedBetweenIdentifierAndGenericParameters,
2043-
\Self.genericParameters,
2044-
\Self.unexpectedBetweenGenericParametersAndInheritanceClause,
2042+
\Self.unexpectedBetweenIdentifierAndGenericParameterClause,
2043+
\Self.genericParameterClause,
2044+
\Self.unexpectedBetweenGenericParameterClauseAndInheritanceClause,
20452045
\Self.inheritanceClause,
20462046
\Self.unexpectedBetweenInheritanceClauseAndGenericWhereClause,
20472047
\Self.genericWhereClause,

0 commit comments

Comments
 (0)