Skip to content

Commit 821f5a4

Browse files
ahoppenahoppen
committed
WIP
1 parent ff97614 commit 821f5a4

22 files changed

+162
-154
lines changed

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public let DECL_NODES: [Node] = [
5656
),
5757
Child(
5858
name: "Accessors",
59-
kind: .collection(kind: .accessorList, collectionElementName: "Accessor")
59+
kind: .collection(kind: .accessorDeclList, collectionElementName: "Accessor")
6060
),
6161
Child(
6262
name: "RightBrace",
@@ -198,7 +198,7 @@ public let DECL_NODES: [Node] = [
198198
),
199199

200200
Node(
201-
kind: .accessorList,
201+
kind: .accessorDeclList,
202202
base: .syntaxCollection,
203203
nameForDiagnostics: nil,
204204
elementChoices: [.accessorDecl]

‎CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
2525
case accessorDecl
2626
case accessorEffectSpecifiers
2727
case accessorInitEffects
28-
case accessorList
28+
case accessorDeclList
2929
case accessorParameters
3030
case actorDecl
3131
case arrayElementList
@@ -374,6 +374,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
374374
/// deprecated.
375375
public var deprecatedRawValue: String? {
376376
switch self {
377+
case .accessorDeclList: return "accessorList"
377378
case .importPathComponentList: return "accessPath"
378379
case .importPathComponent: return "accessPathComponent"
379380
case .documentationAttributeArgumentList: return "documentationAttributeArguments"

‎Sources/SwiftBasicFormat/BasicFormat.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ open class BasicFormat: SyntaxRewriter {
117117
}
118118

119119
private func childrenSeparatedByNewline(_ node: Syntax) -> Bool {
120-
switch node.as(SyntaxEnum.self) {
121-
case .accessorList:
120+
switch node.kind {
121+
case .accessorDeclList:
122122
return true
123123
case .codeBlockItemList:
124124
return true

‎Sources/SwiftParser/Declarations.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ extension Parser {
14201420
RawAccessorBlockSyntax(
14211421
unexpectedBeforeLBrace,
14221422
leftBrace: lbrace,
1423-
accessors: RawAccessorListSyntax(elements: elements, arena: self.arena),
1423+
accessors: RawAccessorDeclListSyntax(elements: elements, arena: self.arena),
14241424
unexpectedBeforeRBrace,
14251425
rightBrace: rbrace,
14261426
arena: self.arena
@@ -1452,7 +1452,7 @@ extension Parser {
14521452
RawAccessorBlockSyntax(
14531453
unexpectedBeforeLBrace,
14541454
leftBrace: lbrace,
1455-
accessors: RawAccessorListSyntax(elements: elements, arena: self.arena),
1455+
accessors: RawAccessorDeclListSyntax(elements: elements, arena: self.arena),
14561456
unexpectedBeforeRBrace,
14571457
rightBrace: rbrace,
14581458
arena: self.arena

‎Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
204204

205205
- <doc:SwiftSyntax/SyntaxChildren>
206206
- <doc:SwiftSyntax/SyntaxChildrenIndex>
207-
- <doc:SwiftSyntax/AccessorListSyntax>
207+
- <doc:SwiftSyntax/AccessorDeclListSyntax>
208208
- <doc:SwiftSyntax/ArrayElementListSyntax>
209209
- <doc:SwiftSyntax/ArrayElementSyntax>
210210
- <doc:SwiftSyntax/AttributeListSyntax>

‎Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ public typealias AccessPathSyntax = ImportPathComponentListSyntax
1818
@available(*, deprecated, renamed: "ImportPathComponentSyntax")
1919
public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
2020

21+
@available(*, deprecated, renamed: "AccessorDeclListSyntax")
22+
public typealias AccessorListSyntax = AccessorDeclListSyntax
23+
2124
@available(*, deprecated, renamed: "AccessorParametersSyntax")
2225
public typealias AccessorParameterSyntax = AccessorParametersSyntax
2326

@@ -147,6 +150,10 @@ public extension SyntaxKind {
147150
return .importPathComponent
148151
}
149152

153+
static var accessorList: Self {
154+
return .accessorDeclList
155+
}
156+
150157
static var accessorParameter: Self {
151158
return .accessorParameters
152159
}

‎Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,35 +69,35 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
6969
visitAnyPost(node._syntaxNode)
7070
}
7171

72-
override open func visit(_ node: AccessorDeclSyntax) -> SyntaxVisitorContinueKind {
72+
override open func visit(_ node: AccessorDeclListSyntax) -> SyntaxVisitorContinueKind {
7373
return visitAny(node._syntaxNode)
7474
}
7575

76-
override open func visitPost(_ node: AccessorDeclSyntax) {
76+
override open func visitPost(_ node: AccessorDeclListSyntax) {
7777
visitAnyPost(node._syntaxNode)
7878
}
7979

80-
override open func visit(_ node: AccessorEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
80+
override open func visit(_ node: AccessorDeclSyntax) -> SyntaxVisitorContinueKind {
8181
return visitAny(node._syntaxNode)
8282
}
8383

84-
override open func visitPost(_ node: AccessorEffectSpecifiersSyntax) {
84+
override open func visitPost(_ node: AccessorDeclSyntax) {
8585
visitAnyPost(node._syntaxNode)
8686
}
8787

88-
override open func visit(_ node: AccessorInitEffectsSyntax) -> SyntaxVisitorContinueKind {
88+
override open func visit(_ node: AccessorEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
8989
return visitAny(node._syntaxNode)
9090
}
9191

92-
override open func visitPost(_ node: AccessorInitEffectsSyntax) {
92+
override open func visitPost(_ node: AccessorEffectSpecifiersSyntax) {
9393
visitAnyPost(node._syntaxNode)
9494
}
9595

96-
override open func visit(_ node: AccessorListSyntax) -> SyntaxVisitorContinueKind {
96+
override open func visit(_ node: AccessorInitEffectsSyntax) -> SyntaxVisitorContinueKind {
9797
return visitAny(node._syntaxNode)
9898
}
9999

100-
override open func visitPost(_ node: AccessorListSyntax) {
100+
override open func visitPost(_ node: AccessorInitEffectsSyntax) {
101101
visitAnyPost(node._syntaxNode)
102102
}
103103

‎Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,10 @@ extension Syntax {
689689
.node(TokenSyntax.self),
690690
.node(AccessesEffectSyntax.self),
691691
.node(AccessorBlockSyntax.self),
692+
.node(AccessorDeclListSyntax.self),
692693
.node(AccessorDeclSyntax.self),
693694
.node(AccessorEffectSpecifiersSyntax.self),
694695
.node(AccessorInitEffectsSyntax.self),
695-
.node(AccessorListSyntax.self),
696696
.node(AccessorParametersSyntax.self),
697697
.node(ActorDeclSyntax.self),
698698
.node(ArrayElementListSyntax.self),

‎Sources/SwiftSyntax/generated/SyntaxCollections.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
/// ### Contained in
2020
///
2121
/// - ``AccessorBlockSyntax``.``AccessorBlockSyntax/accessors``
22-
public struct AccessorListSyntax: SyntaxCollection, SyntaxHashable {
22+
public struct AccessorDeclListSyntax: SyntaxCollection, SyntaxHashable {
2323
public typealias Element = AccessorDeclSyntax
2424

2525
public let _syntaxNode: Syntax
2626

2727
public init?(_ node: some SyntaxProtocol) {
28-
guard node.raw.kind == .accessorList else {
28+
guard node.raw.kind == .accessorDeclList else {
2929
return nil
3030
}
3131
self._syntaxNode = node._syntaxNode
3232
}
3333

34-
public static let syntaxKind = SyntaxKind.accessorList
34+
public static let syntaxKind = SyntaxKind.accessorDeclList
3535
}
3636

3737
/// ### Children

‎Sources/SwiftSyntax/generated/SyntaxEnum.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ public enum SyntaxEnum {
1717
case token(TokenSyntax)
1818
case accessesEffect(AccessesEffectSyntax)
1919
case accessorBlock(AccessorBlockSyntax)
20+
case accessorDeclList(AccessorDeclListSyntax)
2021
case accessorDecl(AccessorDeclSyntax)
2122
case accessorEffectSpecifiers(AccessorEffectSpecifiersSyntax)
2223
case accessorInitEffects(AccessorInitEffectsSyntax)
23-
case accessorList(AccessorListSyntax)
2424
case accessorParameters(AccessorParametersSyntax)
2525
case actorDecl(ActorDeclSyntax)
2626
case arrayElementList(ArrayElementListSyntax)
@@ -305,14 +305,14 @@ public extension Syntax {
305305
return .accessesEffect(AccessesEffectSyntax(self)!)
306306
case .accessorBlock:
307307
return .accessorBlock(AccessorBlockSyntax(self)!)
308+
case .accessorDeclList:
309+
return .accessorDeclList(AccessorDeclListSyntax(self)!)
308310
case .accessorDecl:
309311
return .accessorDecl(AccessorDeclSyntax(self)!)
310312
case .accessorEffectSpecifiers:
311313
return .accessorEffectSpecifiers(AccessorEffectSpecifiersSyntax(self)!)
312314
case .accessorInitEffects:
313315
return .accessorInitEffects(AccessorInitEffectsSyntax(self)!)
314-
case .accessorList:
315-
return .accessorList(AccessorListSyntax(self)!)
316316
case .accessorParameters:
317317
return .accessorParameters(AccessorParametersSyntax(self)!)
318318
case .actorDecl:

‎Sources/SwiftSyntax/generated/SyntaxKind.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ public enum SyntaxKind: CaseIterable {
1717
case token
1818
case accessesEffect
1919
case accessorBlock
20+
case accessorDeclList
2021
case accessorDecl
2122
case accessorEffectSpecifiers
2223
case accessorInitEffects
23-
case accessorList
2424
case accessorParameters
2525
case actorDecl
2626
case arrayElementList
@@ -296,7 +296,7 @@ public enum SyntaxKind: CaseIterable {
296296

297297
public var isSyntaxCollection: Bool {
298298
switch self {
299-
case .accessorList:
299+
case .accessorDeclList:
300300
return true
301301
case .arrayElementList:
302302
return true
@@ -424,14 +424,14 @@ public enum SyntaxKind: CaseIterable {
424424
return AccessesEffectSyntax.self
425425
case .accessorBlock:
426426
return AccessorBlockSyntax.self
427+
case .accessorDeclList:
428+
return AccessorDeclListSyntax.self
427429
case .accessorDecl:
428430
return AccessorDeclSyntax.self
429431
case .accessorEffectSpecifiers:
430432
return AccessorEffectSpecifiersSyntax.self
431433
case .accessorInitEffects:
432434
return AccessorInitEffectsSyntax.self
433-
case .accessorList:
434-
return AccessorListSyntax.self
435435
case .accessorParameters:
436436
return AccessorParametersSyntax.self
437437
case .actorDecl:

‎Sources/SwiftSyntax/generated/SyntaxRewriter.swift

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@ open class SyntaxRewriter {
9494
return Syntax(visitChildren(node)).cast(AccessorBlockSyntax.self)
9595
}
9696

97+
/// Visit a ``AccessorDeclListSyntax``.
98+
/// - Parameter node: the node that is being visited
99+
/// - Returns: the rewritten node
100+
open func visit(_ node: AccessorDeclListSyntax) -> AccessorDeclListSyntax {
101+
return Syntax(visitChildren(node)).cast(AccessorDeclListSyntax.self)
102+
}
103+
97104
/// Visit a ``AccessorDeclSyntax``.
98105
/// - Parameter node: the node that is being visited
99106
/// - Returns: the rewritten node
@@ -115,13 +122,6 @@ open class SyntaxRewriter {
115122
return Syntax(visitChildren(node)).cast(AccessorInitEffectsSyntax.self)
116123
}
117124

118-
/// Visit a ``AccessorListSyntax``.
119-
/// - Parameter node: the node that is being visited
120-
/// - Returns: the rewritten node
121-
open func visit(_ node: AccessorListSyntax) -> AccessorListSyntax {
122-
return Syntax(visitChildren(node)).cast(AccessorListSyntax.self)
123-
}
124-
125125
/// Visit a ``AccessorParametersSyntax``.
126126
/// - Parameter node: the node that is being visited
127127
/// - Returns: the rewritten node
@@ -2090,8 +2090,8 @@ open class SyntaxRewriter {
20902090
}
20912091

20922092
/// Implementation detail of visit(_:). Do not call directly.
2093-
private func visitImplAccessorDeclSyntax(_ data: SyntaxData) -> Syntax {
2094-
let node = AccessorDeclSyntax(data)
2093+
private func visitImplAccessorDeclListSyntax(_ data: SyntaxData) -> Syntax {
2094+
let node = AccessorDeclListSyntax(data)
20952095
// Accessing _syntaxNode directly is faster than calling Syntax(node)
20962096
visitPre(node._syntaxNode)
20972097
defer {
@@ -2104,8 +2104,8 @@ open class SyntaxRewriter {
21042104
}
21052105

21062106
/// Implementation detail of visit(_:). Do not call directly.
2107-
private func visitImplAccessorEffectSpecifiersSyntax(_ data: SyntaxData) -> Syntax {
2108-
let node = AccessorEffectSpecifiersSyntax(data)
2107+
private func visitImplAccessorDeclSyntax(_ data: SyntaxData) -> Syntax {
2108+
let node = AccessorDeclSyntax(data)
21092109
// Accessing _syntaxNode directly is faster than calling Syntax(node)
21102110
visitPre(node._syntaxNode)
21112111
defer {
@@ -2118,8 +2118,8 @@ open class SyntaxRewriter {
21182118
}
21192119

21202120
/// Implementation detail of visit(_:). Do not call directly.
2121-
private func visitImplAccessorInitEffectsSyntax(_ data: SyntaxData) -> Syntax {
2122-
let node = AccessorInitEffectsSyntax(data)
2121+
private func visitImplAccessorEffectSpecifiersSyntax(_ data: SyntaxData) -> Syntax {
2122+
let node = AccessorEffectSpecifiersSyntax(data)
21232123
// Accessing _syntaxNode directly is faster than calling Syntax(node)
21242124
visitPre(node._syntaxNode)
21252125
defer {
@@ -2132,8 +2132,8 @@ open class SyntaxRewriter {
21322132
}
21332133

21342134
/// Implementation detail of visit(_:). Do not call directly.
2135-
private func visitImplAccessorListSyntax(_ data: SyntaxData) -> Syntax {
2136-
let node = AccessorListSyntax(data)
2135+
private func visitImplAccessorInitEffectsSyntax(_ data: SyntaxData) -> Syntax {
2136+
let node = AccessorInitEffectsSyntax(data)
21372137
// Accessing _syntaxNode directly is faster than calling Syntax(node)
21382138
visitPre(node._syntaxNode)
21392139
defer {
@@ -5999,14 +5999,14 @@ open class SyntaxRewriter {
59995999
return visitImplAccessesEffectSyntax
60006000
case .accessorBlock:
60016001
return visitImplAccessorBlockSyntax
6002+
case .accessorDeclList:
6003+
return visitImplAccessorDeclListSyntax
60026004
case .accessorDecl:
60036005
return visitImplAccessorDeclSyntax
60046006
case .accessorEffectSpecifiers:
60056007
return visitImplAccessorEffectSpecifiersSyntax
60066008
case .accessorInitEffects:
60076009
return visitImplAccessorInitEffectsSyntax
6008-
case .accessorList:
6009-
return visitImplAccessorListSyntax
60106010
case .accessorParameters:
60116011
return visitImplAccessorParametersSyntax
60126012
case .actorDecl:
@@ -6565,14 +6565,14 @@ open class SyntaxRewriter {
65656565
return visitImplAccessesEffectSyntax(data)
65666566
case .accessorBlock:
65676567
return visitImplAccessorBlockSyntax(data)
6568+
case .accessorDeclList:
6569+
return visitImplAccessorDeclListSyntax(data)
65686570
case .accessorDecl:
65696571
return visitImplAccessorDeclSyntax(data)
65706572
case .accessorEffectSpecifiers:
65716573
return visitImplAccessorEffectSpecifiersSyntax(data)
65726574
case .accessorInitEffects:
65736575
return visitImplAccessorInitEffectsSyntax(data)
6574-
case .accessorList:
6575-
return visitImplAccessorListSyntax(data)
65766576
case .accessorParameters:
65776577
return visitImplAccessorParametersSyntax(data)
65786578
case .actorDecl:

0 commit comments

Comments
 (0)