Skip to content

Commit 5ebb5c5

Browse files
committed
Remove all vestigates of the __FILE__ et al keywords
1 parent 1f4602e commit 5ebb5c5

File tree

4 files changed

+0
-52
lines changed

4 files changed

+0
-52
lines changed

Sources/SwiftParser/Expressions.swift

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,36 +1009,6 @@ extension Parser {
10091009
booleanLiteral: tok,
10101010
arena: self.arena
10111011
))
1012-
case (.__file__Keyword, let handle)?:
1013-
let tok = self.eat(handle)
1014-
return RawExprSyntax(RawPoundFileExprSyntax(
1015-
poundFile: tok,
1016-
arena: self.arena
1017-
))
1018-
case (.__function__Keyword, let handle)?:
1019-
let tok = self.eat(handle)
1020-
return RawExprSyntax(RawPoundFunctionExprSyntax(
1021-
poundFunction: tok,
1022-
arena: self.arena
1023-
))
1024-
case (.__line__Keyword, let handle)?:
1025-
let tok = self.eat(handle)
1026-
return RawExprSyntax(RawPoundLineExprSyntax(
1027-
poundLine: tok,
1028-
arena: self.arena
1029-
))
1030-
case (.__column__Keyword, let handle)?:
1031-
let tok = self.eat(handle)
1032-
return RawExprSyntax(RawPoundColumnExprSyntax(
1033-
poundColumn: tok,
1034-
arena: self.arena
1035-
))
1036-
case (.__dso_handle__Keyword, let handle)?:
1037-
let tok = self.eat(handle)
1038-
return RawExprSyntax(RawPoundDsohandleExprSyntax(
1039-
poundDsohandle: tok,
1040-
arena: self.arena
1041-
))
10421012
case (.identifier, let handle)?, (.selfKeyword, let handle)?, (.initKeyword, let handle)?:
10431013
// If we have "case let x." or "case let x(", we parse x as a normal
10441014
// name, not a binding, because it is the start of an enum pattern or

Sources/SwiftParser/RawTokenKindSubset.swift

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -681,11 +681,6 @@ enum ParameterModifier: RawTokenKindSubset {
681681
}
682682

683683
enum PrimaryExpressionStart: RawTokenKindSubset {
684-
case __column__Keyword
685-
case __dso_handle__Keyword
686-
case __file__Keyword
687-
case __function__Keyword
688-
case __line__Keyword
689684
case anyKeyword
690685
case capitalSelfKeyword
691686
case dollarIdentifier
@@ -710,11 +705,6 @@ enum PrimaryExpressionStart: RawTokenKindSubset {
710705

711706
init?(lexeme: Lexer.Lexeme) {
712707
switch lexeme.tokenKind {
713-
case .__column__Keyword: self = .__column__Keyword
714-
case .__dso_handle__Keyword: self = .__dso_handle__Keyword
715-
case .__file__Keyword: self = .__file__Keyword
716-
case .__function__Keyword: self = .__function__Keyword
717-
case .__line__Keyword: self = .__line__Keyword
718708
case .anyKeyword: self = .anyKeyword
719709
case .capitalSelfKeyword: self = .capitalSelfKeyword
720710
case .dollarIdentifier: self = .dollarIdentifier
@@ -742,11 +732,6 @@ enum PrimaryExpressionStart: RawTokenKindSubset {
742732

743733
var rawTokenKind: SwiftSyntax.RawTokenKind {
744734
switch self {
745-
case .__column__Keyword: return .__column__Keyword
746-
case .__dso_handle__Keyword: return .__dso_handle__Keyword
747-
case .__file__Keyword: return .__file__Keyword
748-
case .__function__Keyword: return .__function__Keyword
749-
case .__line__Keyword: return .__line__Keyword
750735
case .anyKeyword: return .anyKeyword
751736
case .capitalSelfKeyword: return .capitalSelfKeyword
752737
case .dollarIdentifier: return .dollarIdentifier

Sources/SwiftParser/TokenPrecedence.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ public enum TokenPrecedence: Comparable {
108108
case
109109
// Literals
110110
.capitalSelfKeyword, .falseKeyword, .floatingLiteral, .integerLiteral, .nilKeyword, .regexLiteral, .selfKeyword, .stringLiteral, .superKeyword, .trueKeyword,
111-
// Legacy literals
112-
.__column__Keyword, .__dso_handle__Keyword, .__file__Keyword, .__function__Keyword, .__line__Keyword,
113111
// Pound literals
114112
.poundAvailableKeyword, .poundColorLiteralKeyword, .poundColumnKeyword, .poundDsohandleKeyword, .poundFileIDKeyword, .poundFileKeyword, .poundFileLiteralKeyword, .poundFilePathKeyword, .poundFunctionKeyword, .poundImageLiteralKeyword, .poundKeyPathKeyword, .poundLineKeyword, .poundSelectorKeyword, .poundSourceLocationKeyword, .poundUnavailableKeyword, .poundHasSymbolKeyword,
115113
// Identifiers

Tests/SwiftSyntaxParserTest/TokenTest.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ public class TokenTests: XCTestCase {
120120
TokenKind.trueKeyword,
121121
TokenKind.tryKeyword,
122122
TokenKind.throwsKeyword,
123-
TokenKind.__file__Keyword,
124-
TokenKind.__line__Keyword,
125-
TokenKind.__column__Keyword,
126-
TokenKind.__function__Keyword,
127-
TokenKind.__dso_handle__Keyword,
128123
TokenKind.wildcardKeyword,
129124
]
130125

0 commit comments

Comments
 (0)