Skip to content

Commit 267a56c

Browse files
ahoppenahoppen
committed
Remove last usage of TokenList for closure specifiers
1 parent 9193688 commit 267a56c

File tree

23 files changed

+607
-587
lines changed

23 files changed

+607
-587
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
public let ATTRIBUTE_NODES: [Node] = [
16-
Node(name: "TokenList",
17-
nameForDiagnostics: "token list",
18-
kind: "SyntaxCollection",
19-
element: "Token"),
20-
2116
Node(name: "Attribute",
2217
nameForDiagnostics: "attribute",
2318
description: "An `@` attribute.",

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

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,37 @@ public let EXPR_NODES: [Node] = [
659659
kind: "Type")
660660
]),
661661

662+
Node(name: "ClosureCaptureItemSpecifier",
663+
nameForDiagnostics: "closure capture specifier",
664+
kind: "Syntax",
665+
children: [
666+
Child(name: "Specifier",
667+
kind: "ContextualKeywordToken",
668+
textChoices: [
669+
"weak",
670+
"unowned"
671+
]),
672+
Child(name: "LeftParen",
673+
kind: "LeftParenToken",
674+
isOptional: true,
675+
tokenChoices: [
676+
"LeftParen"
677+
]),
678+
Child(name: "Detail",
679+
kind: "ContextualKeywordToken",
680+
isOptional: true,
681+
textChoices: [
682+
"safe",
683+
"unsafe"
684+
]),
685+
Child(name: "RightParen",
686+
kind: "RightParenToken",
687+
isOptional: true,
688+
tokenChoices: [
689+
"RightParen"
690+
])
691+
]),
692+
662693
Node(name: "ClosureCaptureItem",
663694
nameForDiagnostics: "closure capture item",
664695
kind: "Syntax",
@@ -667,9 +698,8 @@ public let EXPR_NODES: [Node] = [
667698
],
668699
children: [
669700
Child(name: "Specifier",
670-
kind: "TokenList",
671-
isOptional: true,
672-
collectionElementName: "SpecifierToken"),
701+
kind: "ClosureCaptureItemSpecifier",
702+
isOptional: true),
673703
Child(name: "Name",
674704
kind: "IdentifierToken",
675705
isOptional: true,

‎Sources/SwiftParser/Expressions.swift

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,39 +2333,42 @@ extension Parser {
23332333
}
23342334

23352335
@_spi(RawSyntax)
2336-
public mutating func parseClosureCaptureSpecifiers() -> RawTokenListSyntax? {
2337-
var specifiers = [RawTokenSyntax]()
2338-
do {
2339-
// Check for the strength specifier: "weak", "unowned", or
2340-
// "unowned(safe/unsafe)".
2341-
if let weakKeyword = self.consume(if: .keyword(.weak)) {
2342-
specifiers.append(weakKeyword)
2343-
} else if let unownedKeyword = self.consume(if: .keyword(.unowned)) {
2344-
specifiers.append(unownedKeyword)
2345-
if let lparen = self.consume(if: .leftParen) {
2346-
specifiers.append(lparen)
2347-
if self.currentToken.tokenText == "safe" {
2348-
specifiers.append(self.expectWithoutRecovery(.keyword(.safe)))
2349-
} else {
2350-
specifiers.append(self.expectWithoutRecovery(.keyword(.unsafe)))
2351-
}
2352-
specifiers.append(self.expectWithoutRecovery(.rightParen))
2353-
}
2354-
} else if self.at(.identifier) || self.at(.keyword(.self)) {
2355-
let next = self.peek()
2356-
// "x = 42", "x," and "x]" are all strong captures of x.
2357-
guard
2358-
next.rawTokenKind == .equal || next.rawTokenKind == .comma
2359-
|| next.rawTokenKind == .rightSquareBracket || next.rawTokenKind == .period
2360-
else {
2361-
return nil
2362-
}
2336+
public mutating func parseClosureCaptureSpecifiers() -> RawClosureCaptureItemSpecifierSyntax? {
2337+
// Check for the strength specifier: "weak", "unowned", or
2338+
// "unowned(safe/unsafe)".
2339+
if let weakContextualKeyword = self.consume(if: .keyword(.weak)) {
2340+
return RawClosureCaptureItemSpecifierSyntax(
2341+
specifier: weakContextualKeyword,
2342+
leftParen: nil,
2343+
detail: nil,
2344+
rightParen: nil,
2345+
arena: self.arena
2346+
)
2347+
} else if let unownedContextualKeyword = self.consume(if: .keyword(.unowned)) {
2348+
if let lparen = self.consume(if: .leftParen) {
2349+
let (unexpectedBeforeDetail, detail) = self.expectAny([.keyword(.safe), .keyword(.unsafe)], default: .keyword(.safe))
2350+
let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
2351+
return RawClosureCaptureItemSpecifierSyntax(
2352+
specifier: unownedContextualKeyword,
2353+
leftParen: lparen,
2354+
unexpectedBeforeDetail,
2355+
detail: detail,
2356+
unexpectedBeforeRParen,
2357+
rightParen: rparen,
2358+
arena: self.arena
2359+
)
23632360
} else {
2364-
return nil
2361+
return RawClosureCaptureItemSpecifierSyntax(
2362+
specifier: unownedContextualKeyword,
2363+
leftParen: nil,
2364+
detail: nil,
2365+
rightParen: nil,
2366+
arena: self.arena
2367+
)
23652368
}
2369+
} else {
2370+
return nil
23662371
}
2367-
// Squash all tokens, if any, as the specifier of the captured item.
2368-
return RawTokenListSyntax(elements: specifiers, arena: self.arena)
23692372
}
23702373
}
23712374

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
283283
- <doc:SwiftSyntax/TupleExprElementSyntax>
284284
- <doc:SwiftSyntax/ArrayElementSyntax>
285285
- <doc:SwiftSyntax/DictionaryElementSyntax>
286+
- <doc:SwiftSyntax/ClosureCaptureItemSpecifierSyntax>
286287
- <doc:SwiftSyntax/ClosureCaptureItemSyntax>
287288
- <doc:SwiftSyntax/ClosureCaptureItemListSyntax>
288289
- <doc:SwiftSyntax/ClosureCaptureSignatureSyntax>
@@ -338,7 +339,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
338339
- <doc:SwiftSyntax/PrecedenceGroupNameElementSyntax>
339340
- <doc:SwiftSyntax/PrecedenceGroupAssignmentSyntax>
340341
- <doc:SwiftSyntax/PrecedenceGroupAssociativitySyntax>
341-
- <doc:SwiftSyntax/TokenListSyntax>
342342
- <doc:SwiftSyntax/AttributeSyntax>
343343
- <doc:SwiftSyntax/AttributeListSyntax>
344344
- <doc:SwiftSyntax/SpecializeAttributeSpecListSyntax>

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

Lines changed: 83 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,6 +3192,86 @@ public struct RawTypeExprSyntax: RawExprSyntaxNodeProtocol {
31923192
}
31933193
}
31943194

3195+
@_spi(RawSyntax)
3196+
public struct RawClosureCaptureItemSpecifierSyntax: RawSyntaxNodeProtocol {
3197+
3198+
@_spi(RawSyntax)
3199+
public var layoutView: RawSyntaxLayoutView {
3200+
return raw.layoutView!
3201+
}
3202+
3203+
public static func isKindOf(_ raw: RawSyntax) -> Bool {
3204+
return raw.kind == .closureCaptureItemSpecifier
3205+
}
3206+
3207+
public var raw: RawSyntax
3208+
init(raw: RawSyntax) {
3209+
assert(Self.isKindOf(raw))
3210+
self.raw = raw
3211+
}
3212+
3213+
public init?<Node: RawSyntaxNodeProtocol>(_ other: Node) {
3214+
guard Self.isKindOf(other.raw) else { return nil }
3215+
self.init(raw: other.raw)
3216+
}
3217+
3218+
public init(
3219+
_ unexpectedBeforeSpecifier: RawUnexpectedNodesSyntax? = nil,
3220+
specifier: RawTokenSyntax,
3221+
_ unexpectedBetweenSpecifierAndLeftParen: RawUnexpectedNodesSyntax? = nil,
3222+
leftParen: RawTokenSyntax?,
3223+
_ unexpectedBetweenLeftParenAndDetail: RawUnexpectedNodesSyntax? = nil,
3224+
detail: RawTokenSyntax?,
3225+
_ unexpectedBetweenDetailAndRightParen: RawUnexpectedNodesSyntax? = nil,
3226+
rightParen: RawTokenSyntax?,
3227+
_ unexpectedAfterRightParen: RawUnexpectedNodesSyntax? = nil,
3228+
arena: __shared SyntaxArena
3229+
) {
3230+
let raw = RawSyntax.makeLayout(
3231+
kind: .closureCaptureItemSpecifier, uninitializedCount: 9, arena: arena) { layout in
3232+
layout.initialize(repeating: nil)
3233+
layout[0] = unexpectedBeforeSpecifier?.raw
3234+
layout[1] = specifier.raw
3235+
layout[2] = unexpectedBetweenSpecifierAndLeftParen?.raw
3236+
layout[3] = leftParen?.raw
3237+
layout[4] = unexpectedBetweenLeftParenAndDetail?.raw
3238+
layout[5] = detail?.raw
3239+
layout[6] = unexpectedBetweenDetailAndRightParen?.raw
3240+
layout[7] = rightParen?.raw
3241+
layout[8] = unexpectedAfterRightParen?.raw
3242+
}
3243+
self.init(raw: raw)
3244+
}
3245+
3246+
public var unexpectedBeforeSpecifier: RawUnexpectedNodesSyntax? {
3247+
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
3248+
}
3249+
public var specifier: RawTokenSyntax {
3250+
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
3251+
}
3252+
public var unexpectedBetweenSpecifierAndLeftParen: RawUnexpectedNodesSyntax? {
3253+
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
3254+
}
3255+
public var leftParen: RawTokenSyntax? {
3256+
layoutView.children[3].map(RawTokenSyntax.init(raw:))
3257+
}
3258+
public var unexpectedBetweenLeftParenAndDetail: RawUnexpectedNodesSyntax? {
3259+
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
3260+
}
3261+
public var detail: RawTokenSyntax? {
3262+
layoutView.children[5].map(RawTokenSyntax.init(raw:))
3263+
}
3264+
public var unexpectedBetweenDetailAndRightParen: RawUnexpectedNodesSyntax? {
3265+
layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
3266+
}
3267+
public var rightParen: RawTokenSyntax? {
3268+
layoutView.children[7].map(RawTokenSyntax.init(raw:))
3269+
}
3270+
public var unexpectedAfterRightParen: RawUnexpectedNodesSyntax? {
3271+
layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
3272+
}
3273+
}
3274+
31953275
@_spi(RawSyntax)
31963276
public struct RawClosureCaptureItemSyntax: RawSyntaxNodeProtocol {
31973277

@@ -3217,7 +3297,7 @@ public struct RawClosureCaptureItemSyntax: RawSyntaxNodeProtocol {
32173297

32183298
public init(
32193299
_ unexpectedBeforeSpecifier: RawUnexpectedNodesSyntax? = nil,
3220-
specifier: RawTokenListSyntax?,
3300+
specifier: RawClosureCaptureItemSpecifierSyntax?,
32213301
_ unexpectedBetweenSpecifierAndName: RawUnexpectedNodesSyntax? = nil,
32223302
name: RawTokenSyntax?,
32233303
_ unexpectedBetweenNameAndAssignToken: RawUnexpectedNodesSyntax? = nil,
@@ -3250,8 +3330,8 @@ public struct RawClosureCaptureItemSyntax: RawSyntaxNodeProtocol {
32503330
public var unexpectedBeforeSpecifier: RawUnexpectedNodesSyntax? {
32513331
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
32523332
}
3253-
public var specifier: RawTokenListSyntax? {
3254-
layoutView.children[1].map(RawTokenListSyntax.init(raw:))
3333+
public var specifier: RawClosureCaptureItemSpecifierSyntax? {
3334+
layoutView.children[1].map(RawClosureCaptureItemSpecifierSyntax.init(raw:))
32553335
}
32563336
public var unexpectedBetweenSpecifierAndName: RawUnexpectedNodesSyntax? {
32573337
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
@@ -10335,46 +10415,6 @@ public struct RawEditorPlaceholderDeclSyntax: RawDeclSyntaxNodeProtocol {
1033510415
}
1033610416
}
1033710417

10338-
@_spi(RawSyntax)
10339-
public struct RawTokenListSyntax: RawSyntaxNodeProtocol {
10340-
10341-
@_spi(RawSyntax)
10342-
public var layoutView: RawSyntaxLayoutView {
10343-
return raw.layoutView!
10344-
}
10345-
10346-
public static func isKindOf(_ raw: RawSyntax) -> Bool {
10347-
return raw.kind == .tokenList
10348-
}
10349-
10350-
public var raw: RawSyntax
10351-
init(raw: RawSyntax) {
10352-
assert(Self.isKindOf(raw))
10353-
self.raw = raw
10354-
}
10355-
10356-
public init?<Node: RawSyntaxNodeProtocol>(_ other: Node) {
10357-
guard Self.isKindOf(other.raw) else { return nil }
10358-
self.init(raw: other.raw)
10359-
}
10360-
10361-
public init(elements: [RawTokenSyntax], arena: __shared SyntaxArena) {
10362-
let raw = RawSyntax.makeLayout(
10363-
kind: .tokenList, uninitializedCount: elements.count, arena: arena) { layout in
10364-
guard var ptr = layout.baseAddress else { return }
10365-
for elem in elements {
10366-
ptr.initialize(to: elem.raw)
10367-
ptr += 1
10368-
}
10369-
}
10370-
self.init(raw: raw)
10371-
}
10372-
10373-
public var elements: [RawTokenSyntax] {
10374-
layoutView.children.map { RawTokenSyntax(raw: $0!) }
10375-
}
10376-
}
10377-
1037810418
@_spi(RawSyntax)
1037910419
public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
1038010420
@frozen // FIXME: Not actually stable, works around a miscompile

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,22 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
484484
assertNoError(kind, 1, verify(layout[1], as: RawTypeSyntax.self))
485485
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
486486
break
487+
case .closureCaptureItemSpecifier:
488+
assert(layout.count == 9)
489+
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
490+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
491+
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
492+
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self))
493+
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
494+
assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax?.self))
495+
assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
496+
assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self))
497+
assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self))
498+
break
487499
case .closureCaptureItem:
488500
assert(layout.count == 11)
489501
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
490-
assertNoError(kind, 1, verify(layout[1], as: RawTokenListSyntax?.self))
502+
assertNoError(kind, 1, verify(layout[1], as: RawClosureCaptureItemSpecifierSyntax?.self))
491503
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
492504
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self))
493505
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -1533,11 +1545,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
15331545
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
15341546
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
15351547
break
1536-
case .tokenList:
1537-
for (index, element) in layout.enumerated() {
1538-
assertNoError(kind, index, verify(element, as: RawTokenSyntax.self))
1539-
}
1540-
break
15411548
case .attribute:
15421549
assert(layout.count == 11)
15431550
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))

‎Sources/SwiftSyntax/generated/Misc.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ extension Syntax {
6060
.node(ClassDeclSyntax.self),
6161
.node(ClassRestrictionTypeSyntax.self),
6262
.node(ClosureCaptureItemListSyntax.self),
63+
.node(ClosureCaptureItemSpecifierSyntax.self),
6364
.node(ClosureCaptureItemSyntax.self),
6465
.node(ClosureCaptureSignatureSyntax.self),
6566
.node(ClosureExprSyntax.self),
@@ -247,7 +248,6 @@ extension Syntax {
247248
.node(TargetFunctionEntrySyntax.self),
248249
.node(TernaryExprSyntax.self),
249250
.node(ThrowStmtSyntax.self),
250-
.node(TokenListSyntax.self),
251251
.node(TryExprSyntax.self),
252252
.node(TupleExprElementListSyntax.self),
253253
.node(TupleExprElementSyntax.self),
@@ -370,6 +370,8 @@ extension SyntaxKind {
370370
return ClassRestrictionTypeSyntax.self
371371
case .closureCaptureItemList:
372372
return ClosureCaptureItemListSyntax.self
373+
case .closureCaptureItemSpecifier:
374+
return ClosureCaptureItemSpecifierSyntax.self
373375
case .closureCaptureItem:
374376
return ClosureCaptureItemSyntax.self
375377
case .closureCaptureSignature:
@@ -744,8 +746,6 @@ extension SyntaxKind {
744746
return TernaryExprSyntax.self
745747
case .throwStmt:
746748
return ThrowStmtSyntax.self
747-
case .tokenList:
748-
return TokenListSyntax.self
749749
case .tryExpr:
750750
return TryExprSyntax.self
751751
case .tupleExprElementList:
@@ -899,6 +899,8 @@ extension SyntaxKind {
899899
return nil
900900
case .closureCaptureItemList:
901901
return nil
902+
case .closureCaptureItemSpecifier:
903+
return "closure capture specifier"
902904
case .closureCaptureItem:
903905
return "closure capture item"
904906
case .closureCaptureSignature:
@@ -1273,8 +1275,6 @@ extension SyntaxKind {
12731275
return "ternay expression"
12741276
case .throwStmt:
12751277
return "'throw' statement"
1276-
case .tokenList:
1277-
return "token list"
12781278
case .tryExpr:
12791279
return "'try' expression"
12801280
case .tupleExprElementList:

0 commit comments

Comments
 (0)