Merge pull request #1135 from DougGregor/remove-double-underscored-file

Author: DougGregor

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

@@ -229,72 +229,6 @@ public let EXPR_NODES: [Node] = [
        element: "Expr",
        elementName: "Expression"),
 
-  Node(name: "PoundLineExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "PoundLine",
-               kind: "PoundLineToken",
-               tokenChoices: [
-                 "PoundLine"
-               ])
-       ]),
-
-  Node(name: "PoundFileExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "PoundFile",
-               kind: "PoundFileToken",
-               tokenChoices: [
-                 "PoundFile"
-               ])
-       ]),
-
-  Node(name: "PoundFileIDExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "PoundFileID",
-               kind: "PoundFileIDToken",
-               tokenChoices: [
-                 "PoundFileID"
-               ])
-       ]),
-
-  Node(name: "PoundFilePathExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "PoundFilePath",
-               kind: "PoundFilePathToken",
-               tokenChoices: [
-                 "PoundFilePath"
-               ])
-       ]),
-
-  Node(name: "PoundFunctionExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "PoundFunction",
-               kind: "PoundFunctionToken",
-               tokenChoices: [
-                 "PoundFunction"
-               ])
-       ]),
-
-  Node(name: "PoundDsohandleExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "PoundDsohandle",
-               kind: "PoundDsohandleToken",
-               tokenChoices: [
-                 "PoundDsohandle"
-               ])
-       ]),
-
   Node(name: "SymbolicReferenceExpr",
        nameForDiagnostics: nil,
        kind: "Expr",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/TokenSpec.swift

@@ -254,11 +254,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   ExprKeywordSpec(name: "True", text: "true"),
   ExprKeywordSpec(name: "Try", text: "try", requiresTrailingSpace: true),
   ExprKeywordSpec(name: "Throws", text: "throws", requiresTrailingSpace: true),
-  KeywordSpec(name: "__FILE__", text: "__FILE__", requiresTrailingSpace: true),
-  KeywordSpec(name: "__LINE__", text: "__LINE__", requiresTrailingSpace: true),
-  KeywordSpec(name: "__COLUMN__", text: "__COLUMN__", requiresTrailingSpace: true),
-  KeywordSpec(name: "__FUNCTION__", text: "__FUNCTION__", requiresTrailingSpace: true),
-  KeywordSpec(name: "__DSO_HANDLE__", text: "__DSO_HANDLE__", requiresTrailingSpace: true),
   PatternKeywordSpec(name: "Wildcard", text: "_", requiresTrailingSpace: true),
   PunctuatorSpec(name: "LeftParen", kind: "l_paren", text: "("),
   PunctuatorSpec(name: "RightParen", kind: "r_paren", text: ")"),

Sources/IDEUtils/generated/SyntaxClassification.swift

@@ -246,16 +246,6 @@ extension RawTokenKind {
       return .keyword
     case .throwsKeyword: 
       return .keyword
-    case .__file__Keyword: 
-      return .keyword
-    case .__line__Keyword: 
-      return .keyword
-    case .__column__Keyword: 
-      return .keyword
-    case .__function__Keyword: 
-      return .keyword
-    case .__dso_handle__Keyword: 
-      return .keyword
     case .wildcardKeyword: 
       return .keyword
     case .leftParen: 

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -226,16 +226,6 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case .throwsKeyword: 
       return true
-    case .__file__Keyword: 
-      return true
-    case .__line__Keyword: 
-      return true
-    case .__column__Keyword: 
-      return true
-    case .__function__Keyword: 
-      return true
-    case .__dso_handle__Keyword: 
-      return true
     case .wildcardKeyword: 
       return true
     case .leftAngle: 

Sources/SwiftParser/Expressions.swift

@@ -1009,36 +1009,6 @@ extension Parser {
         booleanLiteral: tok,
         arena: self.arena
       ))
-    case (.__file__Keyword, let handle)?:
-      let tok = self.eat(handle)
-      return RawExprSyntax(RawPoundFileExprSyntax(
-        poundFile: tok,
-        arena: self.arena
-      ))
-    case (.__function__Keyword, let handle)?:
-      let tok = self.eat(handle)
-      return RawExprSyntax(RawPoundFunctionExprSyntax(
-        poundFunction: tok,
-        arena: self.arena
-      ))
-    case (.__line__Keyword, let handle)?:
-      let tok = self.eat(handle)
-      return RawExprSyntax(RawPoundLineExprSyntax(
-        poundLine: tok,
-        arena: self.arena
-      ))
-    case (.__column__Keyword, let handle)?:
-      let tok = self.eat(handle)
-      return RawExprSyntax(RawPoundColumnExprSyntax(
-        poundColumn: tok,
-        arena: self.arena
-      ))
-    case (.__dso_handle__Keyword, let handle)?:
-      let tok = self.eat(handle)
-      return RawExprSyntax(RawPoundDsohandleExprSyntax(
-        poundDsohandle: tok,
-        arena: self.arena
-      ))
     case (.identifier, let handle)?, (.selfKeyword, let handle)?, (.initKeyword, let handle)?:
       // If we have "case let x." or "case let x(", we parse x as a normal
       // name, not a binding, because it is the start of an enum pattern or

Sources/SwiftParser/RawTokenKindSubset.swift

@@ -681,11 +681,6 @@ enum ParameterModifier: RawTokenKindSubset {
 }
 
 enum PrimaryExpressionStart: RawTokenKindSubset {
-  case __column__Keyword
-  case __dso_handle__Keyword
-  case __file__Keyword
-  case __function__Keyword
-  case __line__Keyword
   case anyKeyword
   case capitalSelfKeyword
   case dollarIdentifier
@@ -710,11 +705,6 @@ enum PrimaryExpressionStart: RawTokenKindSubset {
 
   init?(lexeme: Lexer.Lexeme) {
     switch lexeme.tokenKind {
-    case .__column__Keyword: self = .__column__Keyword
-    case .__dso_handle__Keyword: self = .__dso_handle__Keyword
-    case .__file__Keyword: self = .__file__Keyword
-    case .__function__Keyword: self = .__function__Keyword
-    case .__line__Keyword: self = .__line__Keyword
     case .anyKeyword: self = .anyKeyword
     case .capitalSelfKeyword: self = .capitalSelfKeyword
     case .dollarIdentifier: self = .dollarIdentifier
@@ -742,11 +732,6 @@ enum PrimaryExpressionStart: RawTokenKindSubset {
 
   var rawTokenKind: SwiftSyntax.RawTokenKind {
     switch self {
-    case .__column__Keyword: return .__column__Keyword
-    case .__dso_handle__Keyword: return .__dso_handle__Keyword
-    case .__file__Keyword: return .__file__Keyword
-    case .__function__Keyword: return .__function__Keyword
-    case .__line__Keyword: return .__line__Keyword
     case .anyKeyword: return .anyKeyword
     case .capitalSelfKeyword: return .capitalSelfKeyword
     case .dollarIdentifier: return .dollarIdentifier

Sources/SwiftParser/TokenPrecedence.swift

@@ -108,8 +108,6 @@ public enum TokenPrecedence: Comparable {
     case
       // Literals
         .capitalSelfKeyword, .falseKeyword, .floatingLiteral, .integerLiteral, .nilKeyword, .regexLiteral, .selfKeyword, .stringLiteral, .superKeyword, .trueKeyword,
-      // Legacy literals
-        .__column__Keyword, .__dso_handle__Keyword, .__file__Keyword, .__function__Keyword, .__line__Keyword,
       // Pound literals
         .poundAvailableKeyword, .poundColorLiteralKeyword, .poundColumnKeyword, .poundDsohandleKeyword, .poundFileIDKeyword, .poundFileKeyword, .poundFileLiteralKeyword, .poundFilePathKeyword, .poundFunctionKeyword, .poundImageLiteralKeyword, .poundKeyPathKeyword, .poundLineKeyword, .poundSelectorKeyword, .poundSourceLocationKeyword, .poundUnavailableKeyword, .poundHasSymbolKeyword,
       // Identifiers

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

@@ -118,12 +118,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/DiscardAssignmentExprSyntax>
 - <doc:SwiftSyntax/AssignmentExprSyntax>
 - <doc:SwiftSyntax/SequenceExprSyntax>
-- <doc:SwiftSyntax/PoundLineExprSyntax>
-- <doc:SwiftSyntax/PoundFileExprSyntax>
-- <doc:SwiftSyntax/PoundFileIDExprSyntax>
-- <doc:SwiftSyntax/PoundFilePathExprSyntax>
-- <doc:SwiftSyntax/PoundFunctionExprSyntax>
-- <doc:SwiftSyntax/PoundDsohandleExprSyntax>
 - <doc:SwiftSyntax/SymbolicReferenceExprSyntax>
 - <doc:SwiftSyntax/PrefixOperatorExprSyntax>
 - <doc:SwiftSyntax/BinaryOperatorExprSyntax>