Skip to content

Commit 5e76f09

Browse files
committed
Update code generation for type specifiers
1 parent 13689d2 commit 5e76f09

18 files changed

+7
-1074
lines changed

Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

-61
Original file line numberDiff line numberDiff line change
@@ -2679,67 +2679,6 @@ extension LayoutRequirementSyntax {
26792679
}
26802680
}
26812681

2682-
extension LifetimeSpecifierArgumentSyntax {
2683-
@_spi(Diagnostics)
2684-
public enum ParameterOptions: TokenSpecSet {
2685-
case identifier
2686-
case `self`
2687-
case integerLiteral
2688-
2689-
init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) {
2690-
switch PrepareForKeywordMatch(lexeme) {
2691-
case TokenSpec(.identifier):
2692-
self = .identifier
2693-
case TokenSpec(.self):
2694-
self = .self
2695-
case TokenSpec(.integerLiteral):
2696-
self = .integerLiteral
2697-
default:
2698-
return nil
2699-
}
2700-
}
2701-
2702-
public init?(token: TokenSyntax) {
2703-
switch token {
2704-
case TokenSpec(.identifier):
2705-
self = .identifier
2706-
case TokenSpec(.self):
2707-
self = .self
2708-
case TokenSpec(.integerLiteral):
2709-
self = .integerLiteral
2710-
default:
2711-
return nil
2712-
}
2713-
}
2714-
2715-
var spec: TokenSpec {
2716-
switch self {
2717-
case .identifier:
2718-
return .identifier
2719-
case .self:
2720-
return .keyword(.self)
2721-
case .integerLiteral:
2722-
return .integerLiteral
2723-
}
2724-
}
2725-
2726-
/// Returns a token that satisfies the `TokenSpec` of this case.
2727-
///
2728-
/// If the token kind of this spec has variable text, e.g. for an identifier, this returns a token with empty text.
2729-
@_spi(Diagnostics)
2730-
public var tokenSyntax: TokenSyntax {
2731-
switch self {
2732-
case .identifier:
2733-
return .identifier("")
2734-
case .self:
2735-
return .keyword(.self)
2736-
case .integerLiteral:
2737-
return .integerLiteral("")
2738-
}
2739-
}
2740-
}
2741-
}
2742-
27432682
extension MemberTypeSyntax {
27442683
@_spi(Diagnostics)
27452684
public enum NameOptions: TokenSpecSet {

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

-2
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
224224
return "size"
225225
case \LayoutRequirementSyntax.alignment:
226226
return "alignment"
227-
case \LifetimeSpecifierArgumentSyntax.parameter:
228-
return "parameter reference"
229227
case \MacroDeclSyntax.attributes:
230228
return "attributes"
231229
case \MacroDeclSyntax.modifiers:

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

-32
Original file line numberDiff line numberDiff line change
@@ -1995,38 +1995,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
19951995
return "rightParen"
19961996
case \LayoutRequirementSyntax.unexpectedAfterRightParen:
19971997
return "unexpectedAfterRightParen"
1998-
case \LifetimeSpecifierArgumentSyntax.unexpectedBeforeParameter:
1999-
return "unexpectedBeforeParameter"
2000-
case \LifetimeSpecifierArgumentSyntax.parameter:
2001-
return "parameter"
2002-
case \LifetimeSpecifierArgumentSyntax.unexpectedBetweenParameterAndTrailingComma:
2003-
return "unexpectedBetweenParameterAndTrailingComma"
2004-
case \LifetimeSpecifierArgumentSyntax.trailingComma:
2005-
return "trailingComma"
2006-
case \LifetimeSpecifierArgumentSyntax.unexpectedAfterTrailingComma:
2007-
return "unexpectedAfterTrailingComma"
2008-
case \LifetimeTypeSpecifierSyntax.unexpectedBeforeDependsOnKeyword:
2009-
return "unexpectedBeforeDependsOnKeyword"
2010-
case \LifetimeTypeSpecifierSyntax.dependsOnKeyword:
2011-
return "dependsOnKeyword"
2012-
case \LifetimeTypeSpecifierSyntax.unexpectedBetweenDependsOnKeywordAndLeftParen:
2013-
return "unexpectedBetweenDependsOnKeywordAndLeftParen"
2014-
case \LifetimeTypeSpecifierSyntax.leftParen:
2015-
return "leftParen"
2016-
case \LifetimeTypeSpecifierSyntax.unexpectedBetweenLeftParenAndScopedKeyword:
2017-
return "unexpectedBetweenLeftParenAndScopedKeyword"
2018-
case \LifetimeTypeSpecifierSyntax.scopedKeyword:
2019-
return "scopedKeyword"
2020-
case \LifetimeTypeSpecifierSyntax.unexpectedBetweenScopedKeywordAndArguments:
2021-
return "unexpectedBetweenScopedKeywordAndArguments"
2022-
case \LifetimeTypeSpecifierSyntax.arguments:
2023-
return "arguments"
2024-
case \LifetimeTypeSpecifierSyntax.unexpectedBetweenArgumentsAndRightParen:
2025-
return "unexpectedBetweenArgumentsAndRightParen"
2026-
case \LifetimeTypeSpecifierSyntax.rightParen:
2027-
return "rightParen"
2028-
case \LifetimeTypeSpecifierSyntax.unexpectedAfterRightParen:
2029-
return "unexpectedAfterRightParen"
20301998
case \MacroDeclSyntax.unexpectedBeforeAttributes:
20311999
return "unexpectedBeforeAttributes"
20322000
case \MacroDeclSyntax.attributes:

Sources/SwiftSyntax/generated/Keyword.swift

-14
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
107107
case `default`
108108
case `defer`
109109
case `deinit`
110-
#if compiler(>=5.8)
111-
@_spi(ExperimentalLanguageFeatures)
112-
#endif
113-
case dependsOn
114110
case deprecated
115111
case derivative
116112
case didSet
@@ -206,10 +202,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
206202
case reverse
207203
case right
208204
case safe
209-
#if compiler(>=5.8)
210-
@_spi(ExperimentalLanguageFeatures)
211-
#endif
212-
case scoped
213205
case `self`
214206
case sending
215207
case `Self`
@@ -438,8 +430,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
438430
self = .repeat
439431
case "return":
440432
self = .return
441-
case "scoped":
442-
self = .scoped
443433
case "static":
444434
self = .static
445435
case "struct":
@@ -573,8 +563,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
573563
self = .canImport
574564
case "consuming":
575565
self = .consuming
576-
case "dependsOn":
577-
self = .dependsOn
578566
case "extension":
579567
self = .extension
580568
case "lowerThan":
@@ -907,7 +895,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
907895
"default",
908896
"defer",
909897
"deinit",
910-
"dependsOn",
911898
"deprecated",
912899
"derivative",
913900
"didSet",
@@ -997,7 +984,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
997984
"reverse",
998985
"right",
999986
"safe",
1000-
"scoped",
1001987
"self",
1002988
"sending",
1003989
"Self",

Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

-42
Original file line numberDiff line numberDiff line change
@@ -1342,48 +1342,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
13421342
visitAnyPost(node._syntaxNode)
13431343
}
13441344

1345-
#if compiler(>=5.8)
1346-
@_spi(ExperimentalLanguageFeatures)
1347-
#endif
1348-
override open func visit(_ node: LifetimeSpecifierArgumentListSyntax) -> SyntaxVisitorContinueKind {
1349-
return visitAny(node._syntaxNode)
1350-
}
1351-
1352-
#if compiler(>=5.8)
1353-
@_spi(ExperimentalLanguageFeatures)
1354-
#endif
1355-
override open func visitPost(_ node: LifetimeSpecifierArgumentListSyntax) {
1356-
visitAnyPost(node._syntaxNode)
1357-
}
1358-
1359-
#if compiler(>=5.8)
1360-
@_spi(ExperimentalLanguageFeatures)
1361-
#endif
1362-
override open func visit(_ node: LifetimeSpecifierArgumentSyntax) -> SyntaxVisitorContinueKind {
1363-
return visitAny(node._syntaxNode)
1364-
}
1365-
1366-
#if compiler(>=5.8)
1367-
@_spi(ExperimentalLanguageFeatures)
1368-
#endif
1369-
override open func visitPost(_ node: LifetimeSpecifierArgumentSyntax) {
1370-
visitAnyPost(node._syntaxNode)
1371-
}
1372-
1373-
#if compiler(>=5.8)
1374-
@_spi(ExperimentalLanguageFeatures)
1375-
#endif
1376-
override open func visit(_ node: LifetimeTypeSpecifierSyntax) -> SyntaxVisitorContinueKind {
1377-
return visitAny(node._syntaxNode)
1378-
}
1379-
1380-
#if compiler(>=5.8)
1381-
@_spi(ExperimentalLanguageFeatures)
1382-
#endif
1383-
override open func visitPost(_ node: LifetimeTypeSpecifierSyntax) {
1384-
visitAnyPost(node._syntaxNode)
1385-
}
1386-
13871345
override open func visit(_ node: MacroDeclSyntax) -> SyntaxVisitorContinueKind {
13881346
return visitAny(node._syntaxNode)
13891347
}

Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

-3
Original file line numberDiff line numberDiff line change
@@ -1677,9 +1677,6 @@ extension Syntax {
16771677
.node(LabeledSpecializeArgumentSyntax.self),
16781678
.node(LabeledStmtSyntax.self),
16791679
.node(LayoutRequirementSyntax.self),
1680-
.node(LifetimeSpecifierArgumentListSyntax.self),
1681-
.node(LifetimeSpecifierArgumentSyntax.self),
1682-
.node(LifetimeTypeSpecifierSyntax.self),
16831680
.node(MacroDeclSyntax.self),
16841681
.node(MacroExpansionDeclSyntax.self),
16851682
.node(MacroExpansionExprSyntax.self),

Sources/SwiftSyntax/generated/SyntaxCollections.swift

+2-77
Original file line numberDiff line numberDiff line change
@@ -884,29 +884,6 @@ public struct LabeledExprListSyntax: SyntaxCollection, SyntaxHashable {
884884
public static let syntaxKind = SyntaxKind.labeledExprList
885885
}
886886

887-
/// - Note: Requires experimental feature `nonescapableTypes`.
888-
///
889-
/// ### Children
890-
///
891-
/// `LifetimeSpecifierArgumentSyntax` `*`
892-
#if compiler(>=5.8)
893-
@_spi(ExperimentalLanguageFeatures)
894-
#endif
895-
public struct LifetimeSpecifierArgumentListSyntax: SyntaxCollection, SyntaxHashable {
896-
public typealias Element = LifetimeSpecifierArgumentSyntax
897-
898-
public let _syntaxNode: Syntax
899-
900-
public init?(_ node: some SyntaxProtocol) {
901-
guard node.raw.kind == .lifetimeSpecifierArgumentList else {
902-
return nil
903-
}
904-
self._syntaxNode = node._syntaxNode
905-
}
906-
907-
public static let syntaxKind = SyntaxKind.lifetimeSpecifierArgumentList
908-
}
909-
910887
/// ### Children
911888
///
912889
/// ``MemberBlockItemSyntax`` `*`
@@ -1675,7 +1652,7 @@ public struct TupleTypeElementListSyntax: SyntaxCollection, SyntaxHashable {
16751652

16761653
/// ### Children
16771654
///
1678-
/// (``SimpleTypeSpecifierSyntax`` | `LifetimeTypeSpecifierSyntax`) `*`
1655+
/// ``SimpleTypeSpecifierSyntax`` `*`
16791656
///
16801657
/// ### Contained in
16811658
///
@@ -1684,46 +1661,28 @@ public struct TypeSpecifierListSyntax: SyntaxCollection, SyntaxHashable {
16841661
public enum Element: SyntaxChildChoices, SyntaxHashable {
16851662
/// A specifier that can be attached to a type to eg. mark a parameter as `inout` or `consuming`
16861663
case simpleTypeSpecifier(SimpleTypeSpecifierSyntax)
1687-
/// A specifier that specifies function parameter on whose lifetime a type depends
1688-
/// - Note: Requires experimental feature `nonescapableTypes`.
1689-
#if compiler(>=5.8)
1690-
@_spi(ExperimentalLanguageFeatures)
1691-
#endif
1692-
case lifetimeTypeSpecifier(LifetimeTypeSpecifierSyntax)
16931664

16941665
public var _syntaxNode: Syntax {
16951666
switch self {
16961667
case .simpleTypeSpecifier(let node):
16971668
return node._syntaxNode
1698-
case .lifetimeTypeSpecifier(let node):
1699-
return node._syntaxNode
17001669
}
17011670
}
17021671

17031672
public init(_ node: SimpleTypeSpecifierSyntax) {
17041673
self = .simpleTypeSpecifier(node)
17051674
}
17061675

1707-
/// - Note: Requires experimental feature `nonescapableTypes`.
1708-
#if compiler(>=5.8)
1709-
@_spi(ExperimentalLanguageFeatures)
1710-
#endif
1711-
public init(_ node: LifetimeTypeSpecifierSyntax) {
1712-
self = .lifetimeTypeSpecifier(node)
1713-
}
1714-
17151676
public init?(_ node: __shared some SyntaxProtocol) {
17161677
if let node = node.as(SimpleTypeSpecifierSyntax.self) {
17171678
self = .simpleTypeSpecifier(node)
1718-
} else if let node = node.as(LifetimeTypeSpecifierSyntax.self) {
1719-
self = .lifetimeTypeSpecifier(node)
17201679
} else {
17211680
return nil
17221681
}
17231682
}
17241683

17251684
public static var structure: SyntaxNodeStructure {
1726-
return .choices([.node(SimpleTypeSpecifierSyntax.self), .node(LifetimeTypeSpecifierSyntax.self)])
1685+
return .choices([.node(SimpleTypeSpecifierSyntax.self)])
17271686
}
17281687

17291688
/// Checks if the current syntax node can be cast to ``SimpleTypeSpecifierSyntax``.
@@ -1747,40 +1706,6 @@ public struct TypeSpecifierListSyntax: SyntaxCollection, SyntaxHashable {
17471706
public func cast(_ syntaxType: SimpleTypeSpecifierSyntax.Type) -> SimpleTypeSpecifierSyntax {
17481707
return self.as(SimpleTypeSpecifierSyntax.self)!
17491708
}
1750-
1751-
/// Checks if the current syntax node can be cast to `LifetimeTypeSpecifierSyntax`.
1752-
///
1753-
/// - Returns: `true` if the node can be cast, `false` otherwise.
1754-
/// - Note: Requires experimental feature `nonescapableTypes`.
1755-
#if compiler(>=5.8)
1756-
@_spi(ExperimentalLanguageFeatures)
1757-
#endif
1758-
public func `is`(_ syntaxType: LifetimeTypeSpecifierSyntax.Type) -> Bool {
1759-
return self.as(syntaxType) != nil
1760-
}
1761-
1762-
/// Attempts to cast the current syntax node to `LifetimeTypeSpecifierSyntax`.
1763-
///
1764-
/// - Returns: An instance of `LifetimeTypeSpecifierSyntax`, or `nil` if the cast fails.
1765-
/// - Note: Requires experimental feature `nonescapableTypes`.
1766-
#if compiler(>=5.8)
1767-
@_spi(ExperimentalLanguageFeatures)
1768-
#endif
1769-
public func `as`(_ syntaxType: LifetimeTypeSpecifierSyntax.Type) -> LifetimeTypeSpecifierSyntax? {
1770-
return LifetimeTypeSpecifierSyntax.init(self)
1771-
}
1772-
1773-
/// Force-casts the current syntax node to `LifetimeTypeSpecifierSyntax`.
1774-
///
1775-
/// - Returns: An instance of `LifetimeTypeSpecifierSyntax`.
1776-
/// - Warning: This function will crash if the cast is not possible. Use `as` to safely attempt a cast.
1777-
/// - Note: Requires experimental feature `nonescapableTypes`.
1778-
#if compiler(>=5.8)
1779-
@_spi(ExperimentalLanguageFeatures)
1780-
#endif
1781-
public func cast(_ syntaxType: LifetimeTypeSpecifierSyntax.Type) -> LifetimeTypeSpecifierSyntax {
1782-
return self.as(LifetimeTypeSpecifierSyntax.self)!
1783-
}
17841709
}
17851710

17861711
public let _syntaxNode: Syntax

Sources/SwiftSyntax/generated/SyntaxEnum.swift

-18
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,6 @@ public enum SyntaxEnum: Sendable {
178178
case labeledSpecializeArgument(LabeledSpecializeArgumentSyntax)
179179
case labeledStmt(LabeledStmtSyntax)
180180
case layoutRequirement(LayoutRequirementSyntax)
181-
#if compiler(>=5.8)
182-
@_spi(ExperimentalLanguageFeatures)
183-
#endif
184-
case lifetimeSpecifierArgumentList(LifetimeSpecifierArgumentListSyntax)
185-
#if compiler(>=5.8)
186-
@_spi(ExperimentalLanguageFeatures)
187-
#endif
188-
case lifetimeSpecifierArgument(LifetimeSpecifierArgumentSyntax)
189-
#if compiler(>=5.8)
190-
@_spi(ExperimentalLanguageFeatures)
191-
#endif
192-
case lifetimeTypeSpecifier(LifetimeTypeSpecifierSyntax)
193181
case macroDecl(MacroDeclSyntax)
194182
case macroExpansionDecl(MacroExpansionDeclSyntax)
195183
case macroExpansionExpr(MacroExpansionExprSyntax)
@@ -641,12 +629,6 @@ extension Syntax {
641629
return .labeledStmt(LabeledStmtSyntax(self)!)
642630
case .layoutRequirement:
643631
return .layoutRequirement(LayoutRequirementSyntax(self)!)
644-
case .lifetimeSpecifierArgumentList:
645-
return .lifetimeSpecifierArgumentList(LifetimeSpecifierArgumentListSyntax(self)!)
646-
case .lifetimeSpecifierArgument:
647-
return .lifetimeSpecifierArgument(LifetimeSpecifierArgumentSyntax(self)!)
648-
case .lifetimeTypeSpecifier:
649-
return .lifetimeTypeSpecifier(LifetimeTypeSpecifierSyntax(self)!)
650632
case .macroDecl:
651633
return .macroDecl(MacroDeclSyntax(self)!)
652634
case .macroExpansionDecl:

0 commit comments

Comments
 (0)