Skip to content

Commit 2a4dad8

Browse files
hborlahborla
committed
Regenerate Swift sources for the addition of PackElementExpr.
1 parent 68062a1 commit 2a4dad8

File tree

17 files changed

+392
-3
lines changed

17 files changed

+392
-3
lines changed

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,22 @@ public let EXPR_NODES: [Node] = [
213213
])
214214
]),
215215

216+
Node(name: "PackElementExpr",
217+
nameForDiagnostics: nil,
218+
kind: "Expr",
219+
children: [
220+
Child(name: "EachKeyword",
221+
kind: "ContextualKeywordToken",
222+
tokenChoices: [
223+
"ContextualKeyword"
224+
],
225+
textChoices: [
226+
"each"
227+
]),
228+
Child(name: "PackRefExpr",
229+
kind: "Expr")
230+
]),
231+
216232
Node(name: "SequenceExpr",
217233
nameForDiagnostics: nil,
218234
kind: "Expr",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
112112
- <doc:SwiftSyntax/NilLiteralExprSyntax>
113113
- <doc:SwiftSyntax/DiscardAssignmentExprSyntax>
114114
- <doc:SwiftSyntax/AssignmentExprSyntax>
115+
- <doc:SwiftSyntax/PackElementExprSyntax>
115116
- <doc:SwiftSyntax/SequenceExprSyntax>
116117
- <doc:SwiftSyntax/SymbolicReferenceExprSyntax>
117118
- <doc:SwiftSyntax/PrefixOperatorExprSyntax>

‎Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public struct RawExprSyntax: RawExprSyntaxNodeProtocol {
6565

6666
public static func isKindOf(_ raw: RawSyntax) -> Bool {
6767
switch raw.kind {
68-
case .missingExpr, .inOutExpr, .poundColumnExpr, .tryExpr, .awaitExpr, .moveExpr, .identifierExpr, .superRefExpr, .nilLiteralExpr, .discardAssignmentExpr, .assignmentExpr, .sequenceExpr, .symbolicReferenceExpr, .prefixOperatorExpr, .binaryOperatorExpr, .arrowExpr, .infixOperatorExpr, .floatLiteralExpr, .tupleExpr, .arrayExpr, .dictionaryExpr, .integerLiteralExpr, .booleanLiteralExpr, .unresolvedTernaryExpr, .ternaryExpr, .memberAccessExpr, .unresolvedIsExpr, .isExpr, .unresolvedAsExpr, .asExpr, .typeExpr, .closureExpr, .unresolvedPatternExpr, .functionCallExpr, .subscriptExpr, .optionalChainingExpr, .forcedValueExpr, .postfixUnaryExpr, .specializeExpr, .stringLiteralExpr, .regexLiteralExpr, .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr, .editorPlaceholderExpr: return true
68+
case .missingExpr, .inOutExpr, .poundColumnExpr, .tryExpr, .awaitExpr, .moveExpr, .identifierExpr, .superRefExpr, .nilLiteralExpr, .discardAssignmentExpr, .assignmentExpr, .packElementExpr, .sequenceExpr, .symbolicReferenceExpr, .prefixOperatorExpr, .binaryOperatorExpr, .arrowExpr, .infixOperatorExpr, .floatLiteralExpr, .tupleExpr, .arrayExpr, .dictionaryExpr, .integerLiteralExpr, .booleanLiteralExpr, .unresolvedTernaryExpr, .ternaryExpr, .memberAccessExpr, .unresolvedIsExpr, .isExpr, .unresolvedAsExpr, .asExpr, .typeExpr, .closureExpr, .unresolvedPatternExpr, .functionCallExpr, .subscriptExpr, .optionalChainingExpr, .forcedValueExpr, .postfixUnaryExpr, .specializeExpr, .stringLiteralExpr, .regexLiteralExpr, .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr, .editorPlaceholderExpr: return true
6969
default: return false
7070
}
7171
}
@@ -1585,6 +1585,66 @@ public struct RawAssignmentExprSyntax: RawExprSyntaxNodeProtocol {
15851585
}
15861586
}
15871587

1588+
@_spi(RawSyntax)
1589+
public struct RawPackElementExprSyntax: RawExprSyntaxNodeProtocol {
1590+
1591+
@_spi(RawSyntax)
1592+
public var layoutView: RawSyntaxLayoutView {
1593+
return raw.layoutView!
1594+
}
1595+
1596+
public static func isKindOf(_ raw: RawSyntax) -> Bool {
1597+
return raw.kind == .packElementExpr
1598+
}
1599+
1600+
public var raw: RawSyntax
1601+
init(raw: RawSyntax) {
1602+
assert(Self.isKindOf(raw))
1603+
self.raw = raw
1604+
}
1605+
1606+
public init?<Node: RawSyntaxNodeProtocol>(_ other: Node) {
1607+
guard Self.isKindOf(other.raw) else { return nil }
1608+
self.init(raw: other.raw)
1609+
}
1610+
1611+
public init(
1612+
_ unexpectedBeforeEachKeyword: RawUnexpectedNodesSyntax? = nil,
1613+
eachKeyword: RawTokenSyntax,
1614+
_ unexpectedBetweenEachKeywordAndPackRefExpr: RawUnexpectedNodesSyntax? = nil,
1615+
packRefExpr: RawExprSyntax,
1616+
_ unexpectedAfterPackRefExpr: RawUnexpectedNodesSyntax? = nil,
1617+
arena: __shared SyntaxArena
1618+
) {
1619+
let raw = RawSyntax.makeLayout(
1620+
kind: .packElementExpr, uninitializedCount: 5, arena: arena) { layout in
1621+
layout.initialize(repeating: nil)
1622+
layout[0] = unexpectedBeforeEachKeyword?.raw
1623+
layout[1] = eachKeyword.raw
1624+
layout[2] = unexpectedBetweenEachKeywordAndPackRefExpr?.raw
1625+
layout[3] = packRefExpr.raw
1626+
layout[4] = unexpectedAfterPackRefExpr?.raw
1627+
}
1628+
self.init(raw: raw)
1629+
}
1630+
1631+
public var unexpectedBeforeEachKeyword: RawUnexpectedNodesSyntax? {
1632+
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1633+
}
1634+
public var eachKeyword: RawTokenSyntax {
1635+
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1636+
}
1637+
public var unexpectedBetweenEachKeywordAndPackRefExpr: RawUnexpectedNodesSyntax? {
1638+
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1639+
}
1640+
public var packRefExpr: RawExprSyntax {
1641+
layoutView.children[3].map(RawExprSyntax.init(raw:))!
1642+
}
1643+
public var unexpectedAfterPackRefExpr: RawUnexpectedNodesSyntax? {
1644+
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
1645+
}
1646+
}
1647+
15881648
@_spi(RawSyntax)
15891649
public struct RawSequenceExprSyntax: RawExprSyntaxNodeProtocol {
15901650

‎Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,14 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
264264
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
265265
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
266266
break
267+
case .packElementExpr:
268+
assert(layout.count == 5)
269+
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
270+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
271+
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
272+
assertNoError(kind, 3, verify(layout[3], as: RawExprSyntax.self))
273+
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
274+
break
267275
case .sequenceExpr:
268276
assert(layout.count == 3)
269277
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))

‎Sources/SwiftSyntax/generated/Misc.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ extension Syntax {
197197
.node(OptionalChainingExprSyntax.self),
198198
.node(OptionalPatternSyntax.self),
199199
.node(OptionalTypeSyntax.self),
200+
.node(PackElementExprSyntax.self),
200201
.node(PackExpansionTypeSyntax.self),
201202
.node(PackReferenceTypeSyntax.self),
202203
.node(ParameterClauseSyntax.self),
@@ -645,6 +646,8 @@ extension SyntaxKind {
645646
return OptionalPatternSyntax.self
646647
case .optionalType:
647648
return OptionalTypeSyntax.self
649+
case .packElementExpr:
650+
return PackElementExprSyntax.self
648651
case .packExpansionType:
649652
return PackExpansionTypeSyntax.self
650653
case .packReferenceType:
@@ -1176,6 +1179,8 @@ extension SyntaxKind {
11761179
return "optional pattern"
11771180
case .optionalType:
11781181
return "optional type"
1182+
case .packElementExpr:
1183+
return nil
11791184
case .packExpansionType:
11801185
return "variadic expansion"
11811186
case .packReferenceType:

‎Sources/SwiftSyntax/gyb_generated/SyntaxAnyVisitor.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,13 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
242242
override open func visitPost(_ node: AssignmentExprSyntax) {
243243
visitAnyPost(node._syntaxNode)
244244
}
245+
override open func visit(_ node: PackElementExprSyntax) -> SyntaxVisitorContinueKind {
246+
return visitAny(node._syntaxNode)
247+
}
248+
249+
override open func visitPost(_ node: PackElementExprSyntax) {
250+
visitAnyPost(node._syntaxNode)
251+
}
245252
override open func visit(_ node: SequenceExprSyntax) -> SyntaxVisitorContinueKind {
246253
return visitAny(node._syntaxNode)
247254
}

‎Sources/SwiftSyntax/gyb_generated/SyntaxBaseNodes.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
215215

216216
public init?<S: SyntaxProtocol>(_ node: S) {
217217
switch node.raw.kind {
218-
case .missingExpr, .inOutExpr, .poundColumnExpr, .tryExpr, .awaitExpr, .moveExpr, .identifierExpr, .superRefExpr, .nilLiteralExpr, .discardAssignmentExpr, .assignmentExpr, .sequenceExpr, .symbolicReferenceExpr, .prefixOperatorExpr, .binaryOperatorExpr, .arrowExpr, .infixOperatorExpr, .floatLiteralExpr, .tupleExpr, .arrayExpr, .dictionaryExpr, .integerLiteralExpr, .booleanLiteralExpr, .unresolvedTernaryExpr, .ternaryExpr, .memberAccessExpr, .unresolvedIsExpr, .isExpr, .unresolvedAsExpr, .asExpr, .typeExpr, .closureExpr, .unresolvedPatternExpr, .functionCallExpr, .subscriptExpr, .optionalChainingExpr, .forcedValueExpr, .postfixUnaryExpr, .specializeExpr, .stringLiteralExpr, .regexLiteralExpr, .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr, .editorPlaceholderExpr:
218+
case .missingExpr, .inOutExpr, .poundColumnExpr, .tryExpr, .awaitExpr, .moveExpr, .identifierExpr, .superRefExpr, .nilLiteralExpr, .discardAssignmentExpr, .assignmentExpr, .packElementExpr, .sequenceExpr, .symbolicReferenceExpr, .prefixOperatorExpr, .binaryOperatorExpr, .arrowExpr, .infixOperatorExpr, .floatLiteralExpr, .tupleExpr, .arrayExpr, .dictionaryExpr, .integerLiteralExpr, .booleanLiteralExpr, .unresolvedTernaryExpr, .ternaryExpr, .memberAccessExpr, .unresolvedIsExpr, .isExpr, .unresolvedAsExpr, .asExpr, .typeExpr, .closureExpr, .unresolvedPatternExpr, .functionCallExpr, .subscriptExpr, .optionalChainingExpr, .forcedValueExpr, .postfixUnaryExpr, .specializeExpr, .stringLiteralExpr, .regexLiteralExpr, .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr, .editorPlaceholderExpr:
219219
self._syntaxNode = node._syntaxNode
220220
default:
221221
return nil
@@ -229,7 +229,7 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
229229
// Assert that the kind of the given data matches in debug builds.
230230
#if DEBUG
231231
switch data.raw.kind {
232-
case .missingExpr, .inOutExpr, .poundColumnExpr, .tryExpr, .awaitExpr, .moveExpr, .identifierExpr, .superRefExpr, .nilLiteralExpr, .discardAssignmentExpr, .assignmentExpr, .sequenceExpr, .symbolicReferenceExpr, .prefixOperatorExpr, .binaryOperatorExpr, .arrowExpr, .infixOperatorExpr, .floatLiteralExpr, .tupleExpr, .arrayExpr, .dictionaryExpr, .integerLiteralExpr, .booleanLiteralExpr, .unresolvedTernaryExpr, .ternaryExpr, .memberAccessExpr, .unresolvedIsExpr, .isExpr, .unresolvedAsExpr, .asExpr, .typeExpr, .closureExpr, .unresolvedPatternExpr, .functionCallExpr, .subscriptExpr, .optionalChainingExpr, .forcedValueExpr, .postfixUnaryExpr, .specializeExpr, .stringLiteralExpr, .regexLiteralExpr, .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr, .editorPlaceholderExpr:
232+
case .missingExpr, .inOutExpr, .poundColumnExpr, .tryExpr, .awaitExpr, .moveExpr, .identifierExpr, .superRefExpr, .nilLiteralExpr, .discardAssignmentExpr, .assignmentExpr, .packElementExpr, .sequenceExpr, .symbolicReferenceExpr, .prefixOperatorExpr, .binaryOperatorExpr, .arrowExpr, .infixOperatorExpr, .floatLiteralExpr, .tupleExpr, .arrayExpr, .dictionaryExpr, .integerLiteralExpr, .booleanLiteralExpr, .unresolvedTernaryExpr, .ternaryExpr, .memberAccessExpr, .unresolvedIsExpr, .isExpr, .unresolvedAsExpr, .asExpr, .typeExpr, .closureExpr, .unresolvedPatternExpr, .functionCallExpr, .subscriptExpr, .optionalChainingExpr, .forcedValueExpr, .postfixUnaryExpr, .specializeExpr, .stringLiteralExpr, .regexLiteralExpr, .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr, .editorPlaceholderExpr:
233233
break
234234
default:
235235
fatalError("Unable to create ExprSyntax from \(data.raw.kind)")
@@ -278,6 +278,7 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
278278
.node(NilLiteralExprSyntax.self),
279279
.node(DiscardAssignmentExprSyntax.self),
280280
.node(AssignmentExprSyntax.self),
281+
.node(PackElementExprSyntax.self),
281282
.node(SequenceExprSyntax.self),
282283
.node(SymbolicReferenceExprSyntax.self),
283284
.node(PrefixOperatorExprSyntax.self),

‎Sources/SwiftSyntax/gyb_generated/SyntaxEnum.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public enum SyntaxEnum {
4343
case nilLiteralExpr(NilLiteralExprSyntax)
4444
case discardAssignmentExpr(DiscardAssignmentExprSyntax)
4545
case assignmentExpr(AssignmentExprSyntax)
46+
case packElementExpr(PackElementExprSyntax)
4647
case sequenceExpr(SequenceExprSyntax)
4748
case exprList(ExprListSyntax)
4849
case symbolicReferenceExpr(SymbolicReferenceExprSyntax)
@@ -340,6 +341,8 @@ public extension Syntax {
340341
return .discardAssignmentExpr(DiscardAssignmentExprSyntax(self)!)
341342
case .assignmentExpr:
342343
return .assignmentExpr(AssignmentExprSyntax(self)!)
344+
case .packElementExpr:
345+
return .packElementExpr(PackElementExprSyntax(self)!)
343346
case .sequenceExpr:
344347
return .sequenceExpr(SequenceExprSyntax(self)!)
345348
case .exprList:

‎Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,37 @@ public enum SyntaxFactory {
692692
return AssignmentExprSyntax(data)
693693
}
694694
}
695+
@available(*, deprecated, message: "Use initializer on PackElementExprSyntax")
696+
public static func makePackElementExpr(_ unexpectedBeforeEachKeyword: UnexpectedNodesSyntax? = nil, eachKeyword: TokenSyntax, _ unexpectedBetweenEachKeywordAndPackRefExpr: UnexpectedNodesSyntax? = nil, packRefExpr: ExprSyntax, _ unexpectedAfterPackRefExpr: UnexpectedNodesSyntax? = nil) -> PackElementExprSyntax {
697+
let layout: [RawSyntax?] = [
698+
unexpectedBeforeEachKeyword?.raw,
699+
eachKeyword.raw,
700+
unexpectedBetweenEachKeywordAndPackRefExpr?.raw,
701+
packRefExpr.raw,
702+
unexpectedAfterPackRefExpr?.raw,
703+
]
704+
return withExtendedLifetime(SyntaxArena()) { arena in
705+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.packElementExpr,
706+
from: layout, arena: arena)
707+
let data = SyntaxData.forRoot(raw)
708+
return PackElementExprSyntax(data)
709+
}
710+
}
711+
712+
@available(*, deprecated, message: "Use initializer on PackElementExprSyntax")
713+
public static func makeBlankPackElementExpr(presence: SourcePresence = .present) -> PackElementExprSyntax {
714+
return withExtendedLifetime(SyntaxArena()) { arena in
715+
let data = SyntaxData.forRoot(RawSyntax.makeLayout(kind: .packElementExpr,
716+
from: [
717+
nil,
718+
RawSyntax.makeMissingToken(kind: TokenKind.contextualKeyword(""), arena: arena),
719+
nil,
720+
RawSyntax.makeEmptyLayout(kind: SyntaxKind.missingExpr, arena: arena),
721+
nil,
722+
], arena: arena))
723+
return PackElementExprSyntax(data)
724+
}
725+
}
695726
@available(*, deprecated, message: "Use initializer on SequenceExprSyntax")
696727
public static func makeSequenceExpr(_ unexpectedBeforeElements: UnexpectedNodesSyntax? = nil, elements: ExprListSyntax, _ unexpectedAfterElements: UnexpectedNodesSyntax? = nil) -> SequenceExprSyntax {
697728
let layout: [RawSyntax?] = [

‎Sources/SwiftSyntax/gyb_generated/SyntaxKind.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public enum SyntaxKind {
4343
case nilLiteralExpr
4444
case discardAssignmentExpr
4545
case assignmentExpr
46+
case packElementExpr
4647
case sequenceExpr
4748
case exprList
4849
case symbolicReferenceExpr

0 commit comments

Comments
 (0)