Skip to content

Commit 42d4c8a

Browse files
meg-guptameg-gupta
committed
Follow up of #2564 
1 parent bc189ce commit 42d4c8a

File tree

14 files changed

+56
-308
lines changed

14 files changed

+56
-308
lines changed

‎CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -542,42 +542,17 @@ public let TYPE_NODES: [Node] = [
542542
elementChoices: [.lifetimeSpecifierArgument]
543543
),
544544

545-
Node(
546-
kind: .lifetimeSpecifierArguments,
547-
base: .syntax,
548-
experimentalFeature: .nonescapableTypes,
549-
nameForDiagnostics: nil,
550-
documentation: """
551-
An optional argument passed to a type parameter.
552-
553-
### Example
554-
`borrow(data)` in `func foo(data: Array<Item>) -> borrow(data) ComplexReferenceType`
555-
""",
556-
children: [
557-
Child(
558-
name: "arguments",
559-
kind: .collection(kind: .lifetimeSpecifierArgumentList, collectionElementName: "Arguments"),
560-
documentation: """
561-
The function parameters that the lifetime of the annotated type depends on.
562-
"""
563-
)
564-
]
565-
),
566-
567545
Node(
568546
kind: .lifetimeTypeSpecifier,
569547
base: .syntax,
570548
experimentalFeature: .nonescapableTypes,
571549
nameForDiagnostics: "lifetime specifier",
572550
documentation: "A specifier that specifies function parameter on whose lifetime a type depends",
573-
traits: [
574-
"Parenthesized"
575-
],
576551
children: [
577552
Child(
578553
name: "dependsOnKeyword",
579554
kind: .token(choices: [.keyword(.dependsOn)]),
580-
documentation: "The specifier token that's attached to the type."
555+
documentation: "lifetime dependence specifier on the return type"
581556
),
582557
Child(
583558
name: "leftParen",
@@ -586,11 +561,12 @@ public let TYPE_NODES: [Node] = [
586561
Child(
587562
name: "scopedKeyword",
588563
kind: .token(choices: [.keyword(.scoped)]),
564+
documentation: "lifetime of return value is scoped to the lifetime of the original value",
589565
isOptional: true
590566
),
591567
Child(
592568
name: "arguments",
593-
kind: .node(kind: .lifetimeSpecifierArguments)
569+
kind: .collection(kind: .lifetimeSpecifierArgumentList, collectionElementName: "Arguments")
594570
),
595571
Child(
596572
name: "rightParen",

‎CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ class ValidateSyntaxNodes: XCTestCase {
550550
node: .yieldedExpressionsClause,
551551
message: "could conform to trait 'Parenthesized' but does not"
552552
),
553+
ValidationFailure(node: .lifetimeTypeSpecifier, message: "could conform to trait 'Parenthesized' but does not"),
553554
]
554555
)
555556
}

‎Sources/SwiftParser/Types.swift

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -901,25 +901,23 @@ extension Parser.Lookahead {
901901

902902
extension Parser {
903903
private mutating func parseLifetimeTypeSpecifier() -> RawTypeSpecifierListSyntax.Element {
904-
let specifier = self.eat(TokenSpec(.dependsOn))
904+
let (unexpectedBeforeDependsOnKeyword, dependsOnKeyword) = self.expect(.keyword(.dependsOn))
905905

906906
guard let leftParen = self.consume(if: .leftParen) else {
907907
// If there is no left paren, add an entirely missing detail. Otherwise, we start to consume the following type
908908
// name as a token inside the detail, which leads to confusing recovery results.
909-
let arguments = RawLifetimeSpecifierArgumentsSyntax(
910-
arguments: RawLifetimeSpecifierArgumentListSyntax(
911-
elements: [
912-
RawLifetimeSpecifierArgumentSyntax(parameter: missingToken(.identifier), trailingComma: nil, arena: arena)
913-
],
914-
arena: self.arena
915-
),
909+
let lifetimeSpecifierArgumentList = RawLifetimeSpecifierArgumentListSyntax(
910+
elements: [
911+
RawLifetimeSpecifierArgumentSyntax(parameter: missingToken(.identifier), trailingComma: nil, arena: arena)
912+
],
916913
arena: self.arena
917914
)
918915
let lifetimeSpecifier = RawLifetimeTypeSpecifierSyntax(
919-
dependsOnKeyword: specifier,
916+
unexpectedBeforeDependsOnKeyword,
917+
dependsOnKeyword: dependsOnKeyword,
920918
leftParen: missingToken(.leftParen),
921919
scopedKeyword: nil,
922-
arguments: arguments,
920+
arguments: lifetimeSpecifierArgumentList,
923921
rightParen: missingToken(.rightParen),
924922
arena: self.arena
925923
)
@@ -947,15 +945,12 @@ extension Parser {
947945
} while keepGoing != nil && self.hasProgressed(&loopProgress)
948946
let lifetimeSpecifierArgumentList = RawLifetimeSpecifierArgumentListSyntax(elements: arguments, arena: self.arena)
949947
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
950-
let argumentsSyntax = RawLifetimeSpecifierArgumentsSyntax(
951-
arguments: lifetimeSpecifierArgumentList,
952-
arena: self.arena
953-
)
954948
let lifetimeSpecifier = RawLifetimeTypeSpecifierSyntax(
955-
dependsOnKeyword: specifier,
949+
unexpectedBeforeDependsOnKeyword,
950+
dependsOnKeyword: dependsOnKeyword,
956951
leftParen: leftParen,
957952
scopedKeyword: scoped,
958-
arguments: argumentsSyntax,
953+
arguments: lifetimeSpecifierArgumentList,
959954
unexpectedBeforeRightParen,
960955
rightParen: rightParen,
961956
arena: self.arena
@@ -981,7 +976,7 @@ extension Parser {
981976
SPECIFIER_PARSING: while canHaveParameterSpecifier {
982977
if let (_, specifierHandle) = self.at(anyIn: SimpleTypeSpecifierSyntax.SpecifierOptions.self) {
983978
specifiers.append(parseSimpleTypeSpecifier(specifierHandle: specifierHandle))
984-
} else if self.at(TokenSpec(.dependsOn)) {
979+
} else if self.at(.keyword(.dependsOn)) {
985980
if self.experimentalFeatures.contains(.nonescapableTypes) {
986981
specifiers.append(parseLifetimeTypeSpecifier())
987982
} else {

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,12 +2009,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
20092009
return "trailingComma"
20102010
case \LifetimeSpecifierArgumentSyntax.unexpectedAfterTrailingComma:
20112011
return "unexpectedAfterTrailingComma"
2012-
case \LifetimeSpecifierArgumentsSyntax.unexpectedBeforeArguments:
2013-
return "unexpectedBeforeArguments"
2014-
case \LifetimeSpecifierArgumentsSyntax.arguments:
2015-
return "arguments"
2016-
case \LifetimeSpecifierArgumentsSyntax.unexpectedAfterArguments:
2017-
return "unexpectedAfterArguments"
20182012
case \LifetimeTypeSpecifierSyntax.unexpectedBeforeDependsOnKeyword:
20192013
return "unexpectedBeforeDependsOnKeyword"
20202014
case \LifetimeTypeSpecifierSyntax.dependsOnKeyword:

‎Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,20 +1374,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
13741374
visitAnyPost(node._syntaxNode)
13751375
}
13761376

1377-
#if compiler(>=5.8)
1378-
@_spi(ExperimentalLanguageFeatures)
1379-
#endif
1380-
override open func visit(_ node: LifetimeSpecifierArgumentsSyntax) -> SyntaxVisitorContinueKind {
1381-
return visitAny(node._syntaxNode)
1382-
}
1383-
1384-
#if compiler(>=5.8)
1385-
@_spi(ExperimentalLanguageFeatures)
1386-
#endif
1387-
override open func visitPost(_ node: LifetimeSpecifierArgumentsSyntax) {
1388-
visitAnyPost(node._syntaxNode)
1389-
}
1390-
13911377
#if compiler(>=5.8)
13921378
@_spi(ExperimentalLanguageFeatures)
13931379
#endif

‎Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,6 @@ extension Syntax {
16811681
.node(LayoutRequirementSyntax.self),
16821682
.node(LifetimeSpecifierArgumentListSyntax.self),
16831683
.node(LifetimeSpecifierArgumentSyntax.self),
1684-
.node(LifetimeSpecifierArgumentsSyntax.self),
16851684
.node(LifetimeTypeSpecifierSyntax.self),
16861685
.node(MacroDeclSyntax.self),
16871686
.node(MacroExpansionDeclSyntax.self),

‎Sources/SwiftSyntax/generated/SyntaxEnum.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,6 @@ public enum SyntaxEnum: Sendable {
191191
#if compiler(>=5.8)
192192
@_spi(ExperimentalLanguageFeatures)
193193
#endif
194-
case lifetimeSpecifierArguments(LifetimeSpecifierArgumentsSyntax)
195-
#if compiler(>=5.8)
196-
@_spi(ExperimentalLanguageFeatures)
197-
#endif
198194
case lifetimeTypeSpecifier(LifetimeTypeSpecifierSyntax)
199195
case macroDecl(MacroDeclSyntax)
200196
case macroExpansionDecl(MacroExpansionDeclSyntax)
@@ -651,8 +647,6 @@ public extension Syntax {
651647
return .lifetimeSpecifierArgumentList(LifetimeSpecifierArgumentListSyntax(self)!)
652648
case .lifetimeSpecifierArgument:
653649
return .lifetimeSpecifierArgument(LifetimeSpecifierArgumentSyntax(self)!)
654-
case .lifetimeSpecifierArguments:
655-
return .lifetimeSpecifierArguments(LifetimeSpecifierArgumentsSyntax(self)!)
656650
case .lifetimeTypeSpecifier:
657651
return .lifetimeTypeSpecifier(LifetimeTypeSpecifierSyntax(self)!)
658652
case .macroDecl:

‎Sources/SwiftSyntax/generated/SyntaxKind.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,6 @@ public enum SyntaxKind: Sendable {
191191
#if compiler(>=5.8)
192192
@_spi(ExperimentalLanguageFeatures)
193193
#endif
194-
case lifetimeSpecifierArguments
195-
#if compiler(>=5.8)
196-
@_spi(ExperimentalLanguageFeatures)
197-
#endif
198194
case lifetimeTypeSpecifier
199195
case macroDecl
200196
case macroExpansionDecl
@@ -776,8 +772,6 @@ public enum SyntaxKind: Sendable {
776772
return LifetimeSpecifierArgumentListSyntax.self
777773
case .lifetimeSpecifierArgument:
778774
return LifetimeSpecifierArgumentSyntax.self
779-
case .lifetimeSpecifierArguments:
780-
return LifetimeSpecifierArgumentsSyntax.self
781775
case .lifetimeTypeSpecifier:
782776
return LifetimeTypeSpecifierSyntax.self
783777
case .macroDecl:

‎Sources/SwiftSyntax/generated/SyntaxRewriter.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,16 +1225,6 @@ open class SyntaxRewriter {
12251225
return visitChildren(node)
12261226
}
12271227

1228-
/// Visit a `LifetimeSpecifierArgumentsSyntax`.
1229-
/// - Parameter node: the node that is being visited
1230-
/// - Returns: the rewritten node
1231-
#if compiler(>=5.8)
1232-
@_spi(ExperimentalLanguageFeatures)
1233-
#endif
1234-
open func visit(_ node: LifetimeSpecifierArgumentsSyntax) -> LifetimeSpecifierArgumentsSyntax {
1235-
return visitChildren(node)
1236-
}
1237-
12381228
/// Visit a `LifetimeTypeSpecifierSyntax`.
12391229
/// - Parameter node: the node that is being visited
12401230
/// - Returns: the rewritten node
@@ -2820,10 +2810,6 @@ open class SyntaxRewriter {
28202810
return {
28212811
self.visitImpl($0, LifetimeSpecifierArgumentSyntax.self, self.visit)
28222812
}
2823-
case .lifetimeSpecifierArguments:
2824-
return {
2825-
self.visitImpl($0, LifetimeSpecifierArgumentsSyntax.self, self.visit)
2826-
}
28272813
case .lifetimeTypeSpecifier:
28282814
return {
28292815
self.visitImpl($0, LifetimeTypeSpecifierSyntax.self, self.visit)
@@ -3642,8 +3628,6 @@ open class SyntaxRewriter {
36423628
return visitImpl(node, LifetimeSpecifierArgumentListSyntax.self, visit)
36433629
case .lifetimeSpecifierArgument:
36443630
return visitImpl(node, LifetimeSpecifierArgumentSyntax.self, visit)
3645-
case .lifetimeSpecifierArguments:
3646-
return visitImpl(node, LifetimeSpecifierArgumentsSyntax.self, visit)
36473631
case .lifetimeTypeSpecifier:
36483632
return visitImpl(node, LifetimeTypeSpecifierSyntax.self, visit)
36493633
case .macroDecl:

‎Sources/SwiftSyntax/generated/SyntaxTraits.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,6 @@ extension LabeledSpecializeArgumentSyntax: WithTrailingCommaSyntax {}
779779

780780
extension LifetimeSpecifierArgumentSyntax: WithTrailingCommaSyntax {}
781781

782-
extension LifetimeTypeSpecifierSyntax: ParenthesizedSyntax {}
783-
784782
extension MacroDeclSyntax: NamedDeclSyntax, WithAttributesSyntax, WithGenericParametersSyntax, WithModifiersSyntax {}
785783

786784
extension MacroExpansionDeclSyntax: FreestandingMacroExpansionSyntax, WithAttributesSyntax, WithModifiersSyntax {}

0 commit comments

Comments
 (0)