Mark original eof interfaces as deprecated, and clean up some code

Author: mininny

CodeGeneration/Sources/SyntaxSupport/TokenSpec.swift

@@ -183,6 +183,7 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   PunctuatorSpec(name: "Comma", kind: "comma", text: ",", requiresTrailingSpace: true),
   MiscSpec(name: "DollarIdentifier", kind: "dollarident", nameForDiagnostics: "dollar identifier", classification: "DollarIdentifier"),
   PunctuatorSpec(name: "Ellipsis", kind: "ellipsis", text: "..."),
+  MiscSpec(name: "EndOfFile", kind: "eof", nameForDiagnostics: "end of file", text: ""),
   PunctuatorSpec(name: "Equal", kind: "equal", text: "=", requiresLeadingSpace: true, requiresTrailingSpace: true),
   PunctuatorSpec(name: "ExclamationMark", kind: "exclaim_postfix", text: "!"),
   MiscSpec(name: "ExtendedRegexDelimiter", kind: "extended_regex_delimiter", nameForDiagnostics: "extended delimiter", classification: "RegexLiteral"),
@@ -222,7 +223,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   MiscSpec(name: "StringSegment", kind: "string_segment", nameForDiagnostics: "string segment", classification: "StringLiteral"),
   MiscSpec(name: "Unknown", kind: "unknown", nameForDiagnostics: "token"),
   MiscSpec(name: "Wildcard", kind: "_", nameForDiagnostics: "wildcard", text: "_"),
-  MiscSpec(name: "EndOfFile", kind: "eof", nameForDiagnostics: "end of file", text: "")
 ]
 
 public let SYNTAX_TOKEN_MAP = Dictionary(

Sources/SwiftParser/TokenPrecedence.swift

@@ -169,7 +169,7 @@ enum TokenPrecedence: Comparable {
     .semicolon,
       // Arrow is a strong indicator in a function type that we are now in the return type
       .arrow,
-      // EOF is here because it is a very stong marker and doesn't belong anywhere else
+      // `endOfFile` is here because it is a very stong marker and doesn't belong anywhere else
       .endOfFile:
       self = .strongPunctuator
 

Sources/SwiftParser/TopLevel.swift

@@ -46,12 +46,12 @@ extension Parser {
   ///     source-file → top-level-declaration?
   mutating func parseSourceFile() -> RawSourceFileSyntax {
     let items = self.parseTopLevelCodeBlockItems()
-    let unexpectedBeforeEof = consumeRemainingTokens()
-    let eof = self.consume(if: .endOfFile)!
+    let unexpectedBeforeEndOfFileToken = consumeRemainingTokens()
+    let endOfFile = self.consume(if: .endOfFile)!
     return .init(
       statements: items,
-      RawUnexpectedNodesSyntax(unexpectedBeforeEof, arena: self.arena),
-      endOfFileToken: eof,
+      RawUnexpectedNodesSyntax(unexpectedBeforeEndOfFileToken, arena: self.arena),
+      endOfFileToken: endOfFile,
       arena: self.arena
     )
   }

Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

@@ -51,6 +51,9 @@ public extension TokenKind {
   static var rightSquareBracket: TokenKind {
     return .rightSquare
   }
+  
+  @available(*, deprecated, renamed: "endOfFile")
+  static var eof: TokenKind { .endOfFile }
 }
 
 public extension TokenSyntax {
@@ -79,6 +82,19 @@ public extension TokenSyntax {
       presence: presence
     )
   }
+    
+  @available(*, deprecated, renamed: "endOfFileToken")
+  static func eof(
+    leadingTrivia: Trivia = [],
+    trailingTrivia: Trivia = [],
+    presence: SourcePresence = .present
+  ) -> TokenSyntax {
+    return .endOfFileToken(
+      leadingTrivia: leadingTrivia,
+      trailingTrivia: trailingTrivia,
+      presence: presence
+    )
+  }
 }
 
 //==========================================================================//