Eliminate more vestiges of #line/#column/etc as special syntax nodes.

DougGregor · DougGregor · commit 50b4924d8af7 · 2022-12-08T22:48:10.000-08:00
... along with __LINE__, __FILE__, etc., which have no business being
keywords. This can be handled in semantic analysis.
diff --git a/Sources/SwiftParser/Expressions.swift b/Sources/SwiftParser/Expressions.swift
@@ -973,8 +973,6 @@ extension Parser {
   ///     primary-expression → implicit-member-expression
   ///     primary-expression → wildcard-expression
   ///     primary-expression → key-path-expression
-  ///     primary-expression → selector-expression
-  ///     primary-expression → key-path-string-expression
   ///     primary-expression → macro-expansion-expression
   @_spi(RawSyntax)
   public mutating func parsePrimaryExpression(
@@ -1011,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
diff --git a/Sources/SwiftParser/RawTokenKindSubset.swift b/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
diff --git a/Sources/SwiftParser/TokenPrecedence.swift b/Sources/SwiftParser/TokenPrecedence.swift
@@ -108,16 +108,14 @@ 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,
+        .poundAvailableKeyword, .poundSourceLocationKeyword, .poundUnavailableKeyword, .poundHasSymbolKeyword, .pound,
       // Identifiers
         .dollarIdentifier, .identifier,
       // '_' can occur in types to replace a type identifier
         .wildcardKeyword,
-      // String segment, string interpolation anchor and pound don't really fit anywhere else
-        .pound, .stringInterpolationAnchor, .stringSegment:
+      // String segment and string interpolation anchor don't really fit anywhere else
+        .stringInterpolationAnchor, .stringSegment:
       self = .identifierLike
 
       // MARK: Expr keyword
diff --git a/Tests/SwiftSyntaxParserTest/TokenTest.swift b/Tests/SwiftSyntaxParserTest/TokenTest.swift
@@ -120,11 +120,6 @@ public class TokenTests: XCTestCase {
       TokenKind.trueKeyword,
       TokenKind.tryKeyword,
       TokenKind.throwsKeyword,
-      TokenKind.__file__Keyword,
-      TokenKind.__line__Keyword,
-      TokenKind.__column__Keyword,
-      TokenKind.__function__Keyword,
-      TokenKind.__dso_handle__Keyword,
       TokenKind.wildcardKeyword,
     ]
 
diff --git a/gyb_syntax_support/ExprNodes.py b/gyb_syntax_support/ExprNodes.py
@@ -10,12 +10,6 @@
              Child('Expression', kind='Expr'),
          ]),
 
-    # A #column expression.
-    Node('PoundColumnExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundColumn', kind='PoundColumnToken'),
-         ]),
-
     Node('TupleExprElementList', name_for_diagnostics=None, kind='SyntaxCollection',
          element='TupleExprElement'),
 
@@ -135,42 +129,6 @@
          by a `SequenceExprSyntax`.
          '''),
 
-    # A #line expression.
-    Node('PoundLineExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundLine', kind='PoundLineToken'),
-         ]),
-
-    # A #file expression.
-    Node('PoundFileExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundFile', kind='PoundFileToken'),
-         ]),
-
-    # A #fileID expression.
-    Node('PoundFileIDExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundFileID', kind='PoundFileIDToken'),
-         ]),
-
-    # A #filePath expression.
-    Node('PoundFilePathExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundFilePath', kind='PoundFilePathToken'),
-         ]),
-
-    # A #function expression.
-    Node('PoundFunctionExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundFunction', kind='PoundFunctionToken'),
-         ]),
-
-    # A #dsohandle expression.
-    Node('PoundDsohandleExpr', name_for_diagnostics=None, kind='Expr',
-         children=[
-             Child('PoundDsohandle', kind='PoundDsohandleToken'),
-         ]),
-
     # symbolic-reference-expression -> identifier generic-argument-clause?
     Node('SymbolicReferenceExpr', name_for_diagnostics=None, kind='Expr',
          children=[
@@ -718,21 +676,6 @@
          children=[
              Child('Identifier', kind='IdentifierToken'),
          ]),
-    # #fileLiteral(a, b, c)
-    Node('ObjectLiteralExpr', name_for_diagnostics='object literal', kind='Expr',
-         traits=['Parenthesized'],
-         children=[
-             Child('Identifier', kind='Token',
-                   token_choices=[
-                       'PoundColorLiteralToken',
-                       'PoundFileLiteralToken',
-                       'PoundImageLiteralToken',
-                   ]),
-             Child('LeftParen', kind='LeftParenToken'),
-             Child('Arguments', kind='TupleExprElementList',
-                   collection_element_name='Argument'),
-             Child('RightParen', kind='RightParenToken'),
-         ]),
 
     Node('YieldExprList', name_for_diagnostics='yield list',
          kind='SyntaxCollection',
diff --git a/gyb_syntax_support/Token.py b/gyb_syntax_support/Token.py
@@ -99,24 +99,6 @@ def macro_name(self):
         return "POUND_KEYWORD"
 
 
-class PoundObjectLiteral(PoundKeyword):
-    def __init__(self, name, kind, text, name_for_diagnostics,
-                 protocol, classification='ObjectLiteral'):
-        PoundKeyword.__init__(
-            self,
-            name=name,
-            kind=kind,
-            text=text,
-            name_for_diagnostics=name_for_diagnostics,
-            classification=classification
-        )
-        self.description = name_for_diagnostics
-        self.protocol = protocol
-
-    def macro_name(self):
-        return "POUND_OBJECT_LITERAL"
-
-
 class PoundConfig(PoundKeyword):
     def macro_name(self):
         return "POUND_CONFIG"
@@ -244,12 +226,6 @@ def macro_name(self):
     ExprKeyword('Try', 'try'),
     ExprKeyword('Throws', 'throws'),
 
-    Keyword('__FILE__', '__FILE__'),
-    Keyword('__LINE__', '__LINE__'),
-    Keyword('__COLUMN__', '__COLUMN__'),
-    Keyword('__FUNCTION__', '__FUNCTION__'),
-    Keyword('__DSO_HANDLE__', '__DSO_HANDLE__'),
-
     # Pattern keywords
     PatternKeyword('Wildcard', '_'),
 
@@ -298,15 +274,6 @@ def macro_name(self):
 
     # Keywords prefixed with a '#'.
 
-    PoundKeyword('PoundKeyPath', 'keyPath', text='#keyPath'),
-    PoundKeyword('PoundLine', 'line', text='#line'),
-    PoundKeyword('PoundSelector', 'selector', text='#selector'),
-    PoundKeyword('PoundFile', 'file', text='#file'),
-    PoundKeyword('PoundFileID', 'fileID', text='#fileID'),
-    PoundKeyword('PoundFilePath', 'filePath', text='#filePath'),
-    PoundKeyword('PoundColumn', 'column', text='#column'),
-    PoundKeyword('PoundFunction', 'function', text='#function'),
-    PoundKeyword('PoundDsohandle', 'dsohandle', text='#dsohandle'),
     PoundKeyword('PoundAssert', 'assert', text='#assert'),
 
     PoundDirectiveKeyword('PoundSourceLocation', 'sourceLocation',
@@ -324,19 +291,6 @@ def macro_name(self):
     PoundConfig('PoundAvailable', 'available', text='#available'),
     PoundConfig('PoundUnavailable', 'unavailable', text='#unavailable'),
 
-    PoundObjectLiteral('PoundFileLiteral', 'fileLiteral',
-                       text='#fileLiteral',
-                       name_for_diagnostics='file reference',
-                       protocol='ExpressibleByFileReferenceLiteral'),
-    PoundObjectLiteral('PoundImageLiteral', 'imageLiteral',
-                       text='#imageLiteral',
-                       name_for_diagnostics='image',
-                       protocol='ExpressibleByImageLiteral'),
-    PoundObjectLiteral('PoundColorLiteral', 'colorLiteral',
-                       text='#colorLiteral',
-                       name_for_diagnostics='color',
-                       protocol='ExpressibleByColorLiteral'),
-
     PoundConfig('PoundHasSymbol', '_hasSymbol', text='#_hasSymbol'),
 
     Literal('IntegerLiteral', 'integer_literal', name_for_diagnostics='integer literal',
