Skip to content

Commit fddaa84

Browse files
mininnymininny
committed
Update codegenerated files
1 parent 7c81c27 commit fddaa84

File tree

11 files changed

+68
-68
lines changed

11 files changed

+68
-68
lines changed

‎Sources/SwiftIDEUtils/generated/SyntaxClassification.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ extension RawTokenKind {
200200
return .none
201201
case .wildcard:
202202
return .none
203-
case .eof:
203+
case .endOfFile:
204204
return .none
205205
}
206206
}

‎Sources/SwiftParser/generated/IsLexerClassified.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ extension TokenKind {
140140
@_spi(Diagnostics) @_spi(Testing)
141141
public var isLexerClassifiedKeyword: Bool {
142142
switch self {
143-
case .eof:
144-
return false
145143
case .poundAvailableKeyword:
146144
return true
147145
case .poundElseKeyword:

‎Sources/SwiftParser/generated/TokenSpecStaticMembers.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
@_spi(RawSyntax) import SwiftSyntax
1616

1717
extension TokenSpec {
18-
static var eof: TokenSpec {
19-
return TokenSpec(.eof)
20-
}
21-
2218
static var arrow: TokenSpec {
2319
return TokenSpec(.arrow)
2420
}
@@ -207,6 +203,10 @@ extension TokenSpec {
207203
return TokenSpec(.wildcard)
208204
}
209205

206+
static var endOfFile: TokenSpec {
207+
return TokenSpec(.endOfFile)
208+
}
209+
210210
static func keyword(_ keyword: Keyword) -> TokenSpec {
211211
return TokenSpec(keyword)
212212
}

‎Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
extension TokenKind {
1818
var nameForDiagnostics: String {
1919
switch self {
20-
case .eof:
21-
return "end of file"
2220
case .arrow:
2321
return #"->"#
2422
case .atSign:
@@ -113,6 +111,8 @@ extension TokenKind {
113111
return #"token"#
114112
case .wildcard:
115113
return #"wildcard"#
114+
case .endOfFile:
115+
return #"end of file"#
116116
case .keyword(let keyword):
117117
return String(syntaxText: keyword.defaultText)
118118
}

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2847,12 +2847,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
28472847
return "unexpectedBeforeStatements"
28482848
case \SourceFileSyntax.statements:
28492849
return "statements"
2850-
case \SourceFileSyntax.unexpectedBetweenStatementsAndEOFToken:
2851-
return "unexpectedBetweenStatementsAndEOFToken"
2852-
case \SourceFileSyntax.eofToken:
2853-
return "eofToken"
2854-
case \SourceFileSyntax.unexpectedAfterEOFToken:
2855-
return "unexpectedAfterEOFToken"
2850+
case \SourceFileSyntax.unexpectedBetweenStatementsAndEndOfFileToken:
2851+
return "unexpectedBetweenStatementsAndEndOfFileToken"
2852+
case \SourceFileSyntax.endOfFileToken:
2853+
return "endOfFileToken"
2854+
case \SourceFileSyntax.unexpectedAfterEndOfFileToken:
2855+
return "unexpectedAfterEndOfFileToken"
28562856
case \SpecializeExprSyntax.unexpectedBeforeExpression:
28572857
return "unexpectedBeforeExpression"
28582858
case \SpecializeExprSyntax.expression:

‎Sources/SwiftSyntax/generated/TokenKind.swift

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
/// Enumerates the kinds of tokens in the Swift language.
1616
public enum TokenKind: Hashable {
17-
case eof
1817
case arrow
1918
case atSign
2019
case backslash
@@ -63,6 +62,7 @@ public enum TokenKind: Hashable {
6362
case stringSegment(String)
6463
case unknown(String)
6564
case wildcard
65+
case endOfFile
6666

6767
/// The textual representation of this token kind.
6868
@_spi(Testing)
@@ -164,8 +164,8 @@ public enum TokenKind: Hashable {
164164
return text
165165
case .wildcard:
166166
return #"_"#
167-
case .eof:
168-
return ""
167+
case .endOfFile:
168+
return #""#
169169
}
170170
}
171171

@@ -245,8 +245,8 @@ public enum TokenKind: Hashable {
245245
return #"""#
246246
case .wildcard:
247247
return #"_"#
248-
case .eof:
249-
return ""
248+
case .endOfFile:
249+
return #""#
250250
default:
251251
return ""
252252
}
@@ -259,8 +259,6 @@ public enum TokenKind: Hashable {
259259
/// quote characters in a string literal.
260260
public var isPunctuation: Bool {
261261
switch self {
262-
case .eof:
263-
return false
264262
case .arrow:
265263
return true
266264
case .atSign:
@@ -357,15 +355,15 @@ public enum TokenKind: Hashable {
357355
return false
358356
case .wildcard:
359357
return false
358+
case .endOfFile:
359+
return false
360360
}
361361
}
362362
}
363363

364364
extension TokenKind: Equatable {
365365
public static func == (lhs: TokenKind, rhs: TokenKind) -> Bool {
366366
switch (lhs, rhs) {
367-
case (.eof, .eof):
368-
return true
369367
case (.arrow, .arrow):
370368
return true
371369
case (.atSign, .atSign):
@@ -462,6 +460,8 @@ extension TokenKind: Equatable {
462460
return lhsText == rhsText
463461
case (.wildcard, .wildcard):
464462
return true
463+
case (.endOfFile, .endOfFile):
464+
return true
465465
default:
466466
return false
467467
}
@@ -475,7 +475,6 @@ extension TokenKind: Equatable {
475475
@frozen // FIXME: Not actually stable, works around a miscompile
476476
@_spi(RawSyntax)
477477
public enum RawTokenKind: UInt8, Equatable, Hashable {
478-
case eof
479478
case arrow
480479
case atSign
481480
case backslash
@@ -524,12 +523,11 @@ public enum RawTokenKind: UInt8, Equatable, Hashable {
524523
case stringSegment
525524
case unknown
526525
case wildcard
526+
case endOfFile
527527

528528
@_spi(RawSyntax)
529529
public var defaultText: SyntaxText? {
530530
switch self {
531-
case .eof:
532-
return ""
533531
case .arrow:
534532
return #"->"#
535533
case .atSign:
@@ -600,6 +598,8 @@ public enum RawTokenKind: UInt8, Equatable, Hashable {
600598
return #"""#
601599
case .wildcard:
602600
return #"_"#
601+
case .endOfFile:
602+
return #""#
603603
default:
604604
return nil
605605
}
@@ -612,8 +612,6 @@ public enum RawTokenKind: UInt8, Equatable, Hashable {
612612
/// quote characters in a string literal.
613613
public var isPunctuation: Bool {
614614
switch self {
615-
case .eof:
616-
return false
617615
case .arrow:
618616
return true
619617
case .atSign:
@@ -710,6 +708,8 @@ public enum RawTokenKind: UInt8, Equatable, Hashable {
710708
return false
711709
case .wildcard:
712710
return false
711+
case .endOfFile:
712+
return false
713713
}
714714
}
715715
}
@@ -719,8 +719,6 @@ extension TokenKind {
719719
@_spi(RawSyntax)
720720
public static func fromRaw(kind rawKind: RawTokenKind, text: String) -> TokenKind {
721721
switch rawKind {
722-
case .eof:
723-
return .eof
724722
case .arrow:
725723
precondition(text.isEmpty || rawKind.defaultText.map(String.init) == text)
726724
return .arrow
@@ -855,6 +853,9 @@ extension TokenKind {
855853
case .wildcard:
856854
precondition(text.isEmpty || rawKind.defaultText.map(String.init) == text)
857855
return .wildcard
856+
case .endOfFile:
857+
precondition(text.isEmpty || rawKind.defaultText.map(String.init) == text)
858+
return .endOfFile
858859
}
859860
}
860861

@@ -863,8 +864,6 @@ extension TokenKind {
863864
@_spi(RawSyntax)
864865
public func decomposeToRaw() -> (rawKind: RawTokenKind, string: String?) {
865866
switch self {
866-
case .eof:
867-
return (.eof, nil)
868867
case .arrow:
869868
return (.arrow, nil)
870869
case .atSign:
@@ -961,6 +960,8 @@ extension TokenKind {
961960
return (.unknown, str)
962961
case .wildcard:
963962
return (.wildcard, nil)
963+
case .endOfFile:
964+
return (.endOfFile, nil)
964965
}
965966
}
966967
}

‎Sources/SwiftSyntax/generated/Tokens.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,14 +711,15 @@ extension TokenSyntax {
711711
)
712712
}
713713

714-
public static func eof(
714+
public static func endOfFileToken(
715715
leadingTrivia: Trivia = [],
716+
trailingTrivia: Trivia = [],
716717
presence: SourcePresence = .present
717718
) -> TokenSyntax {
718719
return TokenSyntax(
719-
.eof,
720+
.endOfFile,
720721
leadingTrivia: leadingTrivia,
721-
trailingTrivia: [],
722+
trailingTrivia: trailingTrivia,
722723
presence: presence
723724

724725
)

‎Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18680,19 +18680,19 @@ public struct RawSourceFileSyntax: RawSyntaxNodeProtocol {
1868018680
public init(
1868118681
_ unexpectedBeforeStatements: RawUnexpectedNodesSyntax? = nil,
1868218682
statements: RawCodeBlockItemListSyntax,
18683-
_ unexpectedBetweenStatementsAndEOFToken: RawUnexpectedNodesSyntax? = nil,
18684-
eofToken: RawTokenSyntax,
18685-
_ unexpectedAfterEOFToken: RawUnexpectedNodesSyntax? = nil,
18683+
_ unexpectedBetweenStatementsAndEndOfFileToken: RawUnexpectedNodesSyntax? = nil,
18684+
endOfFileToken: RawTokenSyntax,
18685+
_ unexpectedAfterEndOfFileToken: RawUnexpectedNodesSyntax? = nil,
1868618686
arena: __shared SyntaxArena
1868718687
) {
1868818688
let raw = RawSyntax.makeLayout(
1868918689
kind: .sourceFile, uninitializedCount: 5, arena: arena) { layout in
1869018690
layout.initialize(repeating: nil)
1869118691
layout[0] = unexpectedBeforeStatements?.raw
1869218692
layout[1] = statements.raw
18693-
layout[2] = unexpectedBetweenStatementsAndEOFToken?.raw
18694-
layout[3] = eofToken.raw
18695-
layout[4] = unexpectedAfterEOFToken?.raw
18693+
layout[2] = unexpectedBetweenStatementsAndEndOfFileToken?.raw
18694+
layout[3] = endOfFileToken.raw
18695+
layout[4] = unexpectedAfterEndOfFileToken?.raw
1869618696
}
1869718697
self.init(unchecked: raw)
1869818698
}
@@ -18705,15 +18705,15 @@ public struct RawSourceFileSyntax: RawSyntaxNodeProtocol {
1870518705
layoutView.children[1].map(RawCodeBlockItemListSyntax.init(raw:))!
1870618706
}
1870718707

18708-
public var unexpectedBetweenStatementsAndEOFToken: RawUnexpectedNodesSyntax? {
18708+
public var unexpectedBetweenStatementsAndEndOfFileToken: RawUnexpectedNodesSyntax? {
1870918709
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1871018710
}
1871118711

18712-
public var eofToken: RawTokenSyntax {
18712+
public var endOfFileToken: RawTokenSyntax {
1871318713
layoutView.children[3].map(RawTokenSyntax.init(raw:))!
1871418714
}
1871518715

18716-
public var unexpectedAfterEOFToken: RawUnexpectedNodesSyntax? {
18716+
public var unexpectedAfterEndOfFileToken: RawUnexpectedNodesSyntax? {
1871718717
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
1871818718
}
1871918719
}

‎Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2293,7 +2293,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
22932293
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
22942294
assertNoError(kind, 1, verify(layout[1], as: RawCodeBlockItemListSyntax.self))
22952295
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
2296-
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.eof)]))
2296+
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.endOfFile)]))
22972297
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
22982298
case .specializeAttributeSpecList:
22992299
for (index, element) in layout.enumerated() {

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16303,7 +16303,7 @@ public struct SameTypeRequirementSyntax: SyntaxProtocol, SyntaxHashable {
1630316303
/// ### Children
1630416304
///
1630516305
/// - `statements`: ``CodeBlockItemListSyntax``
16306-
/// - `eofToken`: `''`
16306+
/// - `endOfFileToken`: `''`
1630716307
public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1630816308
public let _syntaxNode: Syntax
1630916309

@@ -16326,9 +16326,9 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1632616326
leadingTrivia: Trivia? = nil,
1632716327
_ unexpectedBeforeStatements: UnexpectedNodesSyntax? = nil,
1632816328
statements: CodeBlockItemListSyntax,
16329-
_ unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? = nil,
16330-
eofToken: TokenSyntax = .eof(),
16331-
_ unexpectedAfterEOFToken: UnexpectedNodesSyntax? = nil,
16329+
_ unexpectedBetweenStatementsAndEndOfFileToken: UnexpectedNodesSyntax? = nil,
16330+
endOfFileToken: TokenSyntax = .endOfFileToken(),
16331+
_ unexpectedAfterEndOfFileToken: UnexpectedNodesSyntax? = nil,
1633216332
trailingTrivia: Trivia? = nil
1633316333

1633416334
) {
@@ -16337,16 +16337,16 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1633716337
let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
1633816338
unexpectedBeforeStatements,
1633916339
statements,
16340-
unexpectedBetweenStatementsAndEOFToken,
16341-
eofToken,
16342-
unexpectedAfterEOFToken
16340+
unexpectedBetweenStatementsAndEndOfFileToken,
16341+
endOfFileToken,
16342+
unexpectedAfterEndOfFileToken
1634316343
))) { (arena, _) in
1634416344
let layout: [RawSyntax?] = [
1634516345
unexpectedBeforeStatements?.raw,
1634616346
statements.raw,
16347-
unexpectedBetweenStatementsAndEOFToken?.raw,
16348-
eofToken.raw,
16349-
unexpectedAfterEOFToken?.raw
16347+
unexpectedBetweenStatementsAndEndOfFileToken?.raw,
16348+
endOfFileToken.raw,
16349+
unexpectedAfterEndOfFileToken?.raw
1635016350
]
1635116351
let raw = RawSyntax.makeLayout(
1635216352
kind: SyntaxKind.sourceFile,
@@ -16403,7 +16403,7 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1640316403
return SourceFileSyntax(newData)
1640416404
}
1640516405

16406-
public var unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? {
16406+
public var unexpectedBetweenStatementsAndEndOfFileToken: UnexpectedNodesSyntax? {
1640716407
get {
1640816408
return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
1640916409
}
@@ -16412,7 +16412,7 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1641216412
}
1641316413
}
1641416414

16415-
public var eofToken: TokenSyntax {
16415+
public var endOfFileToken: TokenSyntax {
1641616416
get {
1641716417
return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
1641816418
}
@@ -16421,7 +16421,7 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1642116421
}
1642216422
}
1642316423

16424-
public var unexpectedAfterEOFToken: UnexpectedNodesSyntax? {
16424+
public var unexpectedAfterEndOfFileToken: UnexpectedNodesSyntax? {
1642516425
get {
1642616426
return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
1642716427
}
@@ -16434,9 +16434,9 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
1643416434
return .layout([
1643516435
\Self.unexpectedBeforeStatements,
1643616436
\Self.statements,
16437-
\Self.unexpectedBetweenStatementsAndEOFToken,
16438-
\Self.eofToken,
16439-
\Self.unexpectedAfterEOFToken
16437+
\Self.unexpectedBetweenStatementsAndEndOfFileToken,
16438+
\Self.endOfFileToken,
16439+
\Self.unexpectedAfterEndOfFileToken
1644016440
])
1644116441
}
1644216442
}

0 commit comments

Comments
 (0)