Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse most of the # things (#line, #keyPath, #colorLiteral, etc.) as macro expansion expressions #1123

Closed
wants to merge 4 commits into from
Closed

Parse most of the # things (#line, #keyPath, #colorLiteral, etc.) as macro expansion expressions #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f486b94
Stop parsing #keyPath and #selector as special grammar productions
DougGregor Dec 7, 2022
b7cfd13
Remove the syntax nodes for #selector and #keyPath.
DougGregor Dec 7, 2022
50b4924
Eliminate more vestiges of #line/#column/etc as special syntax nodes.
DougGregor Dec 7, 2022
768cc39
Regenerate sources
DougGregor Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 0 additions & 197 deletions CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,6 @@ public let EXPR_NODES: [Node] = [
kind: "Expr")
]),

Node(name: "PoundColumnExpr",
nameForDiagnostics: nil,
kind: "Expr",
children: [
Child(name: "PoundColumn",
kind: "PoundColumnToken",
tokenChoices: [
"PoundColumn"
])
]),

Node(name: "TupleExprElementList",
nameForDiagnostics: nil,
kind: "SyntaxCollection",
Expand Down Expand Up @@ -229,72 +218,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",
Expand Down Expand Up @@ -1162,97 +1085,6 @@ public let EXPR_NODES: [Node] = [
])
]),

Node(name: "ObjcNamePiece",
nameForDiagnostics: nil,
kind: "Syntax",
children: [
Child(name: "Name",
kind: "IdentifierToken",
tokenChoices: [
"Identifier"
]),
Child(name: "Dot",
kind: "PeriodToken",
isOptional: true,
tokenChoices: [
"Period"
])
]),

Node(name: "ObjcName",
nameForDiagnostics: nil,
kind: "SyntaxCollection",
element: "ObjcNamePiece"),

Node(name: "ObjcKeyPathExpr",
nameForDiagnostics: "'#keyPath' expression",
kind: "Expr",
traits: [
"Parenthesized"
],
children: [
Child(name: "KeyPath",
kind: "PoundKeyPathToken",
tokenChoices: [
"PoundKeyPath"
]),
Child(name: "LeftParen",
kind: "LeftParenToken",
tokenChoices: [
"LeftParen"
]),
Child(name: "Name",
kind: "ObjcName",
collectionElementName: "NamePiece"),
Child(name: "RightParen",
kind: "RightParenToken",
tokenChoices: [
"RightParen"
])
]),

Node(name: "ObjcSelectorExpr",
nameForDiagnostics: "'#selector' expression",
kind: "Expr",
traits: [
"Parenthesized"
],
children: [
Child(name: "PoundSelector",
kind: "PoundSelectorToken",
tokenChoices: [
"PoundSelector"
]),
Child(name: "LeftParen",
kind: "LeftParenToken",
tokenChoices: [
"LeftParen"
]),
Child(name: "Kind",
kind: "ContextualKeywordToken",
isOptional: true,
tokenChoices: [
"ContextualKeyword"
],
textChoices: [
"getter",
"setter"
]),
Child(name: "Colon",
kind: "ColonToken",
isOptional: true,
tokenChoices: [
"Colon"
]),
Child(name: "Name",
kind: "Expr"),
Child(name: "RightParen",
kind: "RightParenToken",
tokenChoices: [
"RightParen"
])
]),

Node(name: "MacroExpansionExpr",
nameForDiagnostics: "pound literal expression",
kind: "Expr",
Expand Down Expand Up @@ -1317,35 +1149,6 @@ public let EXPR_NODES: [Node] = [
])
]),

Node(name: "ObjectLiteralExpr",
nameForDiagnostics: "object literal",
kind: "Expr",
traits: [
"Parenthesized"
],
children: [
Child(name: "Identifier",
kind: "Token",
tokenChoices: [
"PoundColorLiteral",
"PoundFileLiteral",
"PoundImageLiteral"
]),
Child(name: "LeftParen",
kind: "LeftParenToken",
tokenChoices: [
"LeftParen"
]),
Child(name: "Arguments",
kind: "TupleExprElementList",
collectionElementName: "Argument"),
Child(name: "RightParen",
kind: "RightParenToken",
tokenChoices: [
"RightParen"
])
]),

Node(name: "YieldExprList",
nameForDiagnostics: "yield list",
kind: "SyntaxCollection",
Expand Down
17 changes: 0 additions & 17 deletions CodeGeneration/Sources/SyntaxSupport/gyb_generated/TokenSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ")"),
Expand Down Expand Up @@ -287,15 +282,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
PunctuatorSpec(name: "StringQuote", kind: "string_quote", text: "\"", classification: "StringLiteral"),
PunctuatorSpec(name: "SingleQuote", kind: "single_quote", text: "\'", classification: "StringLiteral"),
PunctuatorSpec(name: "MultilineStringQuote", kind: "multiline_string_quote", text: "\"\"\"", classification: "StringLiteral"),
PoundKeywordSpec(name: "PoundKeyPath", kind: "pound_keyPath", text: "#keyPath"),
PoundKeywordSpec(name: "PoundLine", kind: "pound_line", text: "#line"),
PoundKeywordSpec(name: "PoundSelector", kind: "pound_selector", text: "#selector"),
PoundKeywordSpec(name: "PoundFile", kind: "pound_file", text: "#file"),
PoundKeywordSpec(name: "PoundFileID", kind: "pound_fileID", text: "#fileID"),
PoundKeywordSpec(name: "PoundFilePath", kind: "pound_filePath", text: "#filePath"),
PoundKeywordSpec(name: "PoundColumn", kind: "pound_column", text: "#column"),
PoundKeywordSpec(name: "PoundFunction", kind: "pound_function", text: "#function"),
PoundKeywordSpec(name: "PoundDsohandle", kind: "pound_dsohandle", text: "#dsohandle"),
PoundKeywordSpec(name: "PoundAssert", kind: "pound_assert", text: "#assert"),
PoundDirectiveKeywordSpec(name: "PoundSourceLocation", kind: "pound_sourceLocation", text: "#sourceLocation"),
PoundDirectiveKeywordSpec(name: "PoundWarning", kind: "pound_warning", text: "#warning"),
Expand All @@ -306,9 +292,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
PoundConditionalDirectiveKeywordSpec(name: "PoundEndif", kind: "pound_endif", text: "#endif"),
PoundConfigSpec(name: "PoundAvailable", kind: "pound_available", text: "#available"),
PoundConfigSpec(name: "PoundUnavailable", kind: "pound_unavailable", text: "#unavailable"),
PoundObjectLiteralSpec(name: "PoundFileLiteral", kind: "pound_fileLiteral", text: "#fileLiteral", nameForDiagnostics: "file reference", protocol: "ExpressibleByFileReferenceLiteral"),
PoundObjectLiteralSpec(name: "PoundImageLiteral", kind: "pound_imageLiteral", text: "#imageLiteral", nameForDiagnostics: "image", protocol: "ExpressibleByImageLiteral"),
PoundObjectLiteralSpec(name: "PoundColorLiteral", kind: "pound_colorLiteral", text: "#colorLiteral", nameForDiagnostics: "color", protocol: "ExpressibleByColorLiteral"),
PoundConfigSpec(name: "PoundHasSymbol", kind: "pound__hasSymbol", text: "#_hasSymbol"),
LiteralSpec(name: "IntegerLiteral", kind: "integer_literal", nameForDiagnostics: "integer literal", classification: "IntegerLiteral"),
LiteralSpec(name: "FloatingLiteral", kind: "floating_literal", nameForDiagnostics: "floating literal", classification: "FloatingLiteral"),
Expand Down
34 changes: 0 additions & 34 deletions Sources/IDEUtils/generated/SyntaxClassification.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -312,24 +302,6 @@ extension RawTokenKind {
return .stringLiteral
case .multilineStringQuote:
return .stringLiteral
case .poundKeyPathKeyword:
return .keyword
case .poundLineKeyword:
return .keyword
case .poundSelectorKeyword:
return .keyword
case .poundFileKeyword:
return .keyword
case .poundFileIDKeyword:
return .keyword
case .poundFilePathKeyword:
return .keyword
case .poundColumnKeyword:
return .keyword
case .poundFunctionKeyword:
return .keyword
case .poundDsohandleKeyword:
return .keyword
case .poundAssertKeyword:
return .keyword
case .poundSourceLocationKeyword:
Expand All @@ -350,12 +322,6 @@ extension RawTokenKind {
return .keyword
case .poundUnavailableKeyword:
return .keyword
case .poundFileLiteralKeyword:
return .objectLiteral
case .poundImageLiteralKeyword:
return .objectLiteral
case .poundColorLiteralKeyword:
return .objectLiteral
case .poundHasSymbolKeyword:
return .keyword
case .integerLiteral:
Expand Down
34 changes: 0 additions & 34 deletions Sources/SwiftBasicFormat/generated/BasicFormat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -250,24 +240,6 @@ open class BasicFormat: SyntaxRewriter {
return true
case .arrow:
return true
case .poundKeyPathKeyword:
return true
case .poundLineKeyword:
return true
case .poundSelectorKeyword:
return true
case .poundFileKeyword:
return true
case .poundFileIDKeyword:
return true
case .poundFilePathKeyword:
return true
case .poundColumnKeyword:
return true
case .poundFunctionKeyword:
return true
case .poundDsohandleKeyword:
return true
case .poundAssertKeyword:
return true
case .poundSourceLocationKeyword:
Expand All @@ -288,12 +260,6 @@ open class BasicFormat: SyntaxRewriter {
return true
case .poundUnavailableKeyword:
return true
case .poundFileLiteralKeyword:
return true
case .poundImageLiteralKeyword:
return true
case .poundColorLiteralKeyword:
return true
case .poundHasSymbolKeyword:
return true
case .spacedBinaryOperator:
Expand Down
Loading