Skip to content

Commit 2e588a3

Browse files
committed
[generated] Re-generate code
1 parent 395908e commit 2e588a3

File tree

15 files changed

+300
-10
lines changed

15 files changed

+300
-10
lines changed

Sources/SwiftParser/Statements.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -849,13 +849,7 @@ extension Parser.Lookahead {
849849
///
850850
/// - Note: This function must be kept in sync with `parseStatement()`.
851851
/// - Seealso: ``Parser/parseStatement()``
852-
<<<<<<< HEAD
853-
mutating func atStartOfStatement(allowRecovery: Bool = false) -> Bool {
854-
||||||| parent of a2c4f722 (Introduce `then` statements)
855-
mutating func isStartOfStatement(allowRecovery: Bool = false) -> Bool {
856-
=======
857-
mutating func isStartOfStatement(allowRecovery: Bool = false, preferExpr: Bool = false) -> Bool {
858-
>>>>>>> a2c4f722 (Introduce `then` statements)
852+
mutating func atStartOfStatement(allowRecovery: Bool = false, preferExpr: Bool = false) -> Bool {
859853
if (self.at(anyIn: SwitchCaseStart.self) != nil || self.at(.atSign)) && withLookahead({ $0.atStartOfSwitchCaseItem() }) {
860854
// We consider SwitchCaseItems statements so we don't parse the start of a new case item as trailing parts of an expression.
861855
return true

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,8 @@ extension SyntaxKind {
357357
return "'switch' statement"
358358
case .ternaryExpr:
359359
return "ternay expression"
360+
case .thenStmt:
361+
return "'then' statement"
360362
case .throwStmt:
361363
return "'throw' statement"
362364
case .tryExpr:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
174174
- <doc:SwiftSyntax/LabeledStmtSyntax>
175175
- <doc:SwiftSyntax/RepeatStmtSyntax>
176176
- <doc:SwiftSyntax/ReturnStmtSyntax>
177+
- <doc:SwiftSyntax/ThenStmtSyntax>
177178
- <doc:SwiftSyntax/ThrowStmtSyntax>
178179
- <doc:SwiftSyntax/WhileStmtSyntax>
179180
- <doc:SwiftSyntax/YieldStmtSyntax>

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,6 +3059,16 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
30593059
return "elseExpression"
30603060
case \TernaryExprSyntax.unexpectedAfterElseExpression:
30613061
return "unexpectedAfterElseExpression"
3062+
case \ThenStmtSyntax.unexpectedBeforeThenKeyword:
3063+
return "unexpectedBeforeThenKeyword"
3064+
case \ThenStmtSyntax.thenKeyword:
3065+
return "thenKeyword"
3066+
case \ThenStmtSyntax.unexpectedBetweenThenKeywordAndExpression:
3067+
return "unexpectedBetweenThenKeywordAndExpression"
3068+
case \ThenStmtSyntax.expression:
3069+
return "expression"
3070+
case \ThenStmtSyntax.unexpectedAfterExpression:
3071+
return "unexpectedAfterExpression"
30623072
case \ThrowStmtSyntax.unexpectedBeforeThrowKeyword:
30633073
return "unexpectedBeforeThrowKeyword"
30643074
case \ThrowStmtSyntax.throwKeyword:

Sources/SwiftSyntax/generated/Keyword.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ public enum Keyword: UInt8, Hashable {
196196
case swift
197197
case `switch`
198198
case target
199+
case then
199200
case `throw`
200201
case `throws`
201202
case transpose
@@ -307,6 +308,8 @@ public enum Keyword: UInt8, Hashable {
307308
self = .`Self`
308309
case "some":
309310
self = .some
311+
case "then":
312+
self = .then
310313
case "true":
311314
self = .`true`
312315
case "Type":
@@ -945,6 +948,7 @@ public enum Keyword: UInt8, Hashable {
945948
"swift",
946949
"switch",
947950
"target",
951+
"then",
948952
"throw",
949953
"throws",
950954
"transpose",

Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,6 +1989,14 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
19891989
visitAnyPost(node._syntaxNode)
19901990
}
19911991

1992+
override open func visit(_ node: ThenStmtSyntax) -> SyntaxVisitorContinueKind {
1993+
return visitAny(node._syntaxNode)
1994+
}
1995+
1996+
override open func visitPost(_ node: ThenStmtSyntax) {
1997+
visitAnyPost(node._syntaxNode)
1998+
}
1999+
19922000
override open func visit(_ node: ThrowStmtSyntax) -> SyntaxVisitorContinueKind {
19932001
return visitAny(node._syntaxNode)
19942002
}

Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ public struct StmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
486486

487487
public init?(_ node: some SyntaxProtocol) {
488488
switch node.raw.kind {
489-
case .breakStmt, .continueStmt, .deferStmt, .discardStmt, .doStmt, .expressionStmt, .fallThroughStmt, .forStmt, .guardStmt, .labeledStmt, .missingStmt, .repeatStmt, .returnStmt, .throwStmt, .whileStmt, .yieldStmt:
489+
case .breakStmt, .continueStmt, .deferStmt, .discardStmt, .doStmt, .expressionStmt, .fallThroughStmt, .forStmt, .guardStmt, .labeledStmt, .missingStmt, .repeatStmt, .returnStmt, .thenStmt, .throwStmt, .whileStmt, .yieldStmt:
490490
self._syntaxNode = node._syntaxNode
491491
default:
492492
return nil
@@ -498,7 +498,7 @@ public struct StmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
498498
/// is undefined.
499499
internal init(_ data: SyntaxData) {
500500
switch data.raw.kind {
501-
case .breakStmt, .continueStmt, .deferStmt, .discardStmt, .doStmt, .expressionStmt, .fallThroughStmt, .forStmt, .guardStmt, .labeledStmt, .missingStmt, .repeatStmt, .returnStmt, .throwStmt, .whileStmt, .yieldStmt:
501+
case .breakStmt, .continueStmt, .deferStmt, .discardStmt, .doStmt, .expressionStmt, .fallThroughStmt, .forStmt, .guardStmt, .labeledStmt, .missingStmt, .repeatStmt, .returnStmt, .thenStmt, .throwStmt, .whileStmt, .yieldStmt:
502502
break
503503
default:
504504
preconditionFailure("Unable to create StmtSyntax from \(data.raw.kind)")
@@ -547,6 +547,7 @@ public struct StmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
547547
.node(MissingStmtSyntax.self),
548548
.node(RepeatStmtSyntax.self),
549549
.node(ReturnStmtSyntax.self),
550+
.node(ThenStmtSyntax.self),
550551
.node(ThrowStmtSyntax.self),
551552
.node(WhileStmtSyntax.self),
552553
.node(YieldStmtSyntax.self)
@@ -929,6 +930,7 @@ extension Syntax {
929930
.node(SwitchDefaultLabelSyntax.self),
930931
.node(SwitchExprSyntax.self),
931932
.node(TernaryExprSyntax.self),
933+
.node(ThenStmtSyntax.self),
932934
.node(ThrowStmtSyntax.self),
933935
.node(TryExprSyntax.self),
934936
.node(TupleExprSyntax.self),

Sources/SwiftSyntax/generated/SyntaxEnum.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ public enum SyntaxEnum {
257257
case switchDefaultLabel(SwitchDefaultLabelSyntax)
258258
case switchExpr(SwitchExprSyntax)
259259
case ternaryExpr(TernaryExprSyntax)
260+
case thenStmt(ThenStmtSyntax)
260261
case throwStmt(ThrowStmtSyntax)
261262
case tryExpr(TryExprSyntax)
262263
case tupleExpr(TupleExprSyntax)
@@ -781,6 +782,8 @@ public extension Syntax {
781782
return .switchExpr(SwitchExprSyntax(self)!)
782783
case .ternaryExpr:
783784
return .ternaryExpr(TernaryExprSyntax(self)!)
785+
case .thenStmt:
786+
return .thenStmt(ThenStmtSyntax(self)!)
784787
case .throwStmt:
785788
return .throwStmt(ThrowStmtSyntax(self)!)
786789
case .tryExpr:

Sources/SwiftSyntax/generated/SyntaxKind.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ public enum SyntaxKind: CaseIterable {
257257
case switchDefaultLabel
258258
case switchExpr
259259
case ternaryExpr
260+
case thenStmt
260261
case throwStmt
261262
case tryExpr
262263
case tupleExpr
@@ -900,6 +901,8 @@ public enum SyntaxKind: CaseIterable {
900901
return SwitchExprSyntax.self
901902
case .ternaryExpr:
902903
return TernaryExprSyntax.self
904+
case .thenStmt:
905+
return ThenStmtSyntax.self
903906
case .throwStmt:
904907
return ThrowStmtSyntax.self
905908
case .tryExpr:

Sources/SwiftSyntax/generated/SyntaxRewriter.swift

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,6 +1774,13 @@ open class SyntaxRewriter {
17741774
return ExprSyntax(visitChildren(node))
17751775
}
17761776

1777+
/// Visit a ``ThenStmtSyntax``.
1778+
/// - Parameter node: the node that is being visited
1779+
/// - Returns: the rewritten node
1780+
open func visit(_ node: ThenStmtSyntax) -> StmtSyntax {
1781+
return StmtSyntax(visitChildren(node))
1782+
}
1783+
17771784
/// Visit a ``ThrowStmtSyntax``.
17781785
/// - Parameter node: the node that is being visited
17791786
/// - Returns: the rewritten node
@@ -5421,6 +5428,20 @@ open class SyntaxRewriter {
54215428
return Syntax(visit(node))
54225429
}
54235430

5431+
/// Implementation detail of visit(_:). Do not call directly.
5432+
private func visitImplThenStmtSyntax(_ data: SyntaxData) -> Syntax {
5433+
let node = ThenStmtSyntax(data)
5434+
// Accessing _syntaxNode directly is faster than calling Syntax(node)
5435+
visitPre(node._syntaxNode)
5436+
defer {
5437+
visitPost(node._syntaxNode)
5438+
}
5439+
if let newNode = visitAny(node._syntaxNode) {
5440+
return newNode
5441+
}
5442+
return Syntax(visit(node))
5443+
}
5444+
54245445
/// Implementation detail of visit(_:). Do not call directly.
54255446
private func visitImplThrowStmtSyntax(_ data: SyntaxData) -> Syntax {
54265447
let node = ThrowStmtSyntax(data)
@@ -6395,6 +6416,8 @@ open class SyntaxRewriter {
63956416
return visitImplSwitchExprSyntax
63966417
case .ternaryExpr:
63976418
return visitImplTernaryExprSyntax
6419+
case .thenStmt:
6420+
return visitImplThenStmtSyntax
63986421
case .throwStmt:
63996422
return visitImplThrowStmtSyntax
64006423
case .tryExpr:
@@ -6953,6 +6976,8 @@ open class SyntaxRewriter {
69536976
return visitImplSwitchExprSyntax(data)
69546977
case .ternaryExpr:
69556978
return visitImplTernaryExprSyntax(data)
6979+
case .thenStmt:
6980+
return visitImplThenStmtSyntax(data)
69566981
case .throwStmt:
69576982
return visitImplThrowStmtSyntax(data)
69586983
case .tryExpr:

Sources/SwiftSyntax/generated/SyntaxTransform.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,11 @@ public protocol SyntaxTransformVisitor {
12291229
/// - Returns: the sum of whatever the child visitors return.
12301230
func visit(_ node: TernaryExprSyntax) -> ResultType
12311231

1232+
/// Visiting ``ThenStmtSyntax`` specifically.
1233+
/// - Parameter node: the node we are visiting.
1234+
/// - Returns: the sum of whatever the child visitors return.
1235+
func visit(_ node: ThenStmtSyntax) -> ResultType
1236+
12321237
/// Visiting ``ThrowStmtSyntax`` specifically.
12331238
/// - Parameter node: the node we are visiting.
12341239
/// - Returns: the sum of whatever the child visitors return.
@@ -3089,6 +3094,13 @@ extension SyntaxTransformVisitor {
30893094
visitAny(Syntax(node))
30903095
}
30913096

3097+
/// Visiting ``ThenStmtSyntax`` specifically.
3098+
/// - Parameter node: the node we are visiting.
3099+
/// - Returns: nil by default.
3100+
public func visit(_ node: ThenStmtSyntax) -> ResultType {
3101+
visitAny(Syntax(node))
3102+
}
3103+
30923104
/// Visiting ``ThrowStmtSyntax`` specifically.
30933105
/// - Parameter node: the node we are visiting.
30943106
/// - Returns: nil by default.
@@ -3801,6 +3813,8 @@ extension SyntaxTransformVisitor {
38013813
return visit(derived)
38023814
case .ternaryExpr(let derived):
38033815
return visit(derived)
3816+
case .thenStmt(let derived):
3817+
return visit(derived)
38043818
case .throwStmt(let derived):
38053819
return visit(derived)
38063820
case .tryExpr(let derived):

Sources/SwiftSyntax/generated/SyntaxVisitor.swift

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2938,6 +2938,18 @@ open class SyntaxVisitor {
29382938
open func visitPost(_ node: TernaryExprSyntax) {
29392939
}
29402940

2941+
/// Visiting ``ThenStmtSyntax`` specifically.
2942+
/// - Parameter node: the node we are visiting.
2943+
/// - Returns: how should we continue visiting.
2944+
open func visit(_ node: ThenStmtSyntax) -> SyntaxVisitorContinueKind {
2945+
return .visitChildren
2946+
}
2947+
2948+
/// The function called after visiting ``ThenStmtSyntax`` and its descendants.
2949+
/// - node: the node we just finished visiting.
2950+
open func visitPost(_ node: ThenStmtSyntax) {
2951+
}
2952+
29412953
/// Visiting ``ThrowStmtSyntax`` specifically.
29422954
/// - Parameter node: the node we are visiting.
29432955
/// - Returns: how should we continue visiting.
@@ -5996,6 +6008,17 @@ open class SyntaxVisitor {
59966008
visitPost(node)
59976009
}
59986010

6011+
/// Implementation detail of doVisit(_:_:). Do not call directly.
6012+
private func visitImplThenStmtSyntax(_ data: SyntaxData) {
6013+
let node = ThenStmtSyntax(data)
6014+
let needsChildren = (visit(node) == .visitChildren)
6015+
// Avoid calling into visitChildren if possible.
6016+
if needsChildren && !node.raw.layoutView!.children.isEmpty {
6017+
visitChildren(node)
6018+
}
6019+
visitPost(node)
6020+
}
6021+
59996022
/// Implementation detail of doVisit(_:_:). Do not call directly.
60006023
private func visitImplThrowStmtSyntax(_ data: SyntaxData) {
60016024
let node = ThrowStmtSyntax(data)
@@ -6839,6 +6862,8 @@ open class SyntaxVisitor {
68396862
visitImplSwitchExprSyntax(data)
68406863
case .ternaryExpr:
68416864
visitImplTernaryExprSyntax(data)
6865+
case .thenStmt:
6866+
visitImplThenStmtSyntax(data)
68426867
case .throwStmt:
68436868
visitImplThrowStmtSyntax(data)
68446869
case .tryExpr:

Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18737,7 +18737,7 @@ public struct RawStmtSyntax: RawStmtSyntaxNodeProtocol {
1873718737

1873818738
public static func isKindOf(_ raw: RawSyntax) -> Bool {
1873918739
switch raw.kind {
18740-
case .breakStmt, .continueStmt, .deferStmt, .discardStmt, .doStmt, .expressionStmt, .fallThroughStmt, .forStmt, .guardStmt, .labeledStmt, .missingStmt, .repeatStmt, .returnStmt, .throwStmt, .whileStmt, .yieldStmt:
18740+
case .breakStmt, .continueStmt, .deferStmt, .discardStmt, .doStmt, .expressionStmt, .fallThroughStmt, .forStmt, .guardStmt, .labeledStmt, .missingStmt, .repeatStmt, .returnStmt, .thenStmt, .throwStmt, .whileStmt, .yieldStmt:
1874118741
return true
1874218742
default:
1874318743
return false
@@ -20229,6 +20229,76 @@ public struct RawTernaryExprSyntax: RawExprSyntaxNodeProtocol {
2022920229
}
2023020230
}
2023120231

20232+
@_spi(RawSyntax)
20233+
public struct RawThenStmtSyntax: RawStmtSyntaxNodeProtocol {
20234+
@_spi(RawSyntax)
20235+
public var layoutView: RawSyntaxLayoutView {
20236+
return raw.layoutView!
20237+
}
20238+
20239+
public static func isKindOf(_ raw: RawSyntax) -> Bool {
20240+
return raw.kind == .thenStmt
20241+
}
20242+
20243+
public var raw: RawSyntax
20244+
20245+
init(raw: RawSyntax) {
20246+
precondition(Self.isKindOf(raw))
20247+
self.raw = raw
20248+
}
20249+
20250+
private init(unchecked raw: RawSyntax) {
20251+
self.raw = raw
20252+
}
20253+
20254+
public init?(_ other: some RawSyntaxNodeProtocol) {
20255+
guard Self.isKindOf(other.raw) else {
20256+
return nil
20257+
}
20258+
self.init(unchecked: other.raw)
20259+
}
20260+
20261+
public init(
20262+
_ unexpectedBeforeThenKeyword: RawUnexpectedNodesSyntax? = nil,
20263+
thenKeyword: RawTokenSyntax,
20264+
_ unexpectedBetweenThenKeywordAndExpression: RawUnexpectedNodesSyntax? = nil,
20265+
expression: RawExprSyntax,
20266+
_ unexpectedAfterExpression: RawUnexpectedNodesSyntax? = nil,
20267+
arena: __shared SyntaxArena
20268+
) {
20269+
let raw = RawSyntax.makeLayout(
20270+
kind: .thenStmt, uninitializedCount: 5, arena: arena) { layout in
20271+
layout.initialize(repeating: nil)
20272+
layout[0] = unexpectedBeforeThenKeyword?.raw
20273+
layout[1] = thenKeyword.raw
20274+
layout[2] = unexpectedBetweenThenKeywordAndExpression?.raw
20275+
layout[3] = expression.raw
20276+
layout[4] = unexpectedAfterExpression?.raw
20277+
}
20278+
self.init(unchecked: raw)
20279+
}
20280+
20281+
public var unexpectedBeforeThenKeyword: RawUnexpectedNodesSyntax? {
20282+
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
20283+
}
20284+
20285+
public var thenKeyword: RawTokenSyntax {
20286+
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
20287+
}
20288+
20289+
public var unexpectedBetweenThenKeywordAndExpression: RawUnexpectedNodesSyntax? {
20290+
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
20291+
}
20292+
20293+
public var expression: RawExprSyntax {
20294+
layoutView.children[3].map(RawExprSyntax.init(raw:))!
20295+
}
20296+
20297+
public var unexpectedAfterExpression: RawUnexpectedNodesSyntax? {
20298+
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
20299+
}
20300+
}
20301+
2023220302
@_spi(RawSyntax)
2023320303
public struct RawThrowStmtSyntax: RawStmtSyntaxNodeProtocol {
2023420304
@_spi(RawSyntax)

Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,6 +2439,13 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
24392439
assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self))
24402440
assertNoError(kind, 9, verify(layout[9], as: RawExprSyntax.self))
24412441
assertNoError(kind, 10, verify(layout[10], as: RawUnexpectedNodesSyntax?.self))
2442+
case .thenStmt:
2443+
assert(layout.count == 5)
2444+
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
2445+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.keyword("then")]))
2446+
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
2447+
assertNoError(kind, 3, verify(layout[3], as: RawExprSyntax.self))
2448+
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
24422449
case .throwStmt:
24432450
assert(layout.count == 5)
24442451
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))

0 commit comments

Comments
 (0)