Skip to content

Commit 768cc39

Browse files
DougGregorDougGregor
committed
Regenerate sources
1 parent 50b4924 commit 768cc39

28 files changed

+3321
-9130
lines changed

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

-197
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ public let EXPR_NODES: [Node] = [
2626
kind: "Expr")
2727
]),
2828

29-
Node(name: "PoundColumnExpr",
30-
nameForDiagnostics: nil,
31-
kind: "Expr",
32-
children: [
33-
Child(name: "PoundColumn",
34-
kind: "PoundColumnToken",
35-
tokenChoices: [
36-
"PoundColumn"
37-
])
38-
]),
39-
4029
Node(name: "TupleExprElementList",
4130
nameForDiagnostics: nil,
4231
kind: "SyntaxCollection",
@@ -229,72 +218,6 @@ public let EXPR_NODES: [Node] = [
229218
element: "Expr",
230219
elementName: "Expression"),
231220

232-
Node(name: "PoundLineExpr",
233-
nameForDiagnostics: nil,
234-
kind: "Expr",
235-
children: [
236-
Child(name: "PoundLine",
237-
kind: "PoundLineToken",
238-
tokenChoices: [
239-
"PoundLine"
240-
])
241-
]),
242-
243-
Node(name: "PoundFileExpr",
244-
nameForDiagnostics: nil,
245-
kind: "Expr",
246-
children: [
247-
Child(name: "PoundFile",
248-
kind: "PoundFileToken",
249-
tokenChoices: [
250-
"PoundFile"
251-
])
252-
]),
253-
254-
Node(name: "PoundFileIDExpr",
255-
nameForDiagnostics: nil,
256-
kind: "Expr",
257-
children: [
258-
Child(name: "PoundFileID",
259-
kind: "PoundFileIDToken",
260-
tokenChoices: [
261-
"PoundFileID"
262-
])
263-
]),
264-
265-
Node(name: "PoundFilePathExpr",
266-
nameForDiagnostics: nil,
267-
kind: "Expr",
268-
children: [
269-
Child(name: "PoundFilePath",
270-
kind: "PoundFilePathToken",
271-
tokenChoices: [
272-
"PoundFilePath"
273-
])
274-
]),
275-
276-
Node(name: "PoundFunctionExpr",
277-
nameForDiagnostics: nil,
278-
kind: "Expr",
279-
children: [
280-
Child(name: "PoundFunction",
281-
kind: "PoundFunctionToken",
282-
tokenChoices: [
283-
"PoundFunction"
284-
])
285-
]),
286-
287-
Node(name: "PoundDsohandleExpr",
288-
nameForDiagnostics: nil,
289-
kind: "Expr",
290-
children: [
291-
Child(name: "PoundDsohandle",
292-
kind: "PoundDsohandleToken",
293-
tokenChoices: [
294-
"PoundDsohandle"
295-
])
296-
]),
297-
298221
Node(name: "SymbolicReferenceExpr",
299222
nameForDiagnostics: nil,
300223
kind: "Expr",
@@ -1162,97 +1085,6 @@ public let EXPR_NODES: [Node] = [
11621085
])
11631086
]),
11641087

1165-
Node(name: "ObjcNamePiece",
1166-
nameForDiagnostics: nil,
1167-
kind: "Syntax",
1168-
children: [
1169-
Child(name: "Name",
1170-
kind: "IdentifierToken",
1171-
tokenChoices: [
1172-
"Identifier"
1173-
]),
1174-
Child(name: "Dot",
1175-
kind: "PeriodToken",
1176-
isOptional: true,
1177-
tokenChoices: [
1178-
"Period"
1179-
])
1180-
]),
1181-
1182-
Node(name: "ObjcName",
1183-
nameForDiagnostics: nil,
1184-
kind: "SyntaxCollection",
1185-
element: "ObjcNamePiece"),
1186-
1187-
Node(name: "ObjcKeyPathExpr",
1188-
nameForDiagnostics: "'#keyPath' expression",
1189-
kind: "Expr",
1190-
traits: [
1191-
"Parenthesized"
1192-
],
1193-
children: [
1194-
Child(name: "KeyPath",
1195-
kind: "PoundKeyPathToken",
1196-
tokenChoices: [
1197-
"PoundKeyPath"
1198-
]),
1199-
Child(name: "LeftParen",
1200-
kind: "LeftParenToken",
1201-
tokenChoices: [
1202-
"LeftParen"
1203-
]),
1204-
Child(name: "Name",
1205-
kind: "ObjcName",
1206-
collectionElementName: "NamePiece"),
1207-
Child(name: "RightParen",
1208-
kind: "RightParenToken",
1209-
tokenChoices: [
1210-
"RightParen"
1211-
])
1212-
]),
1213-
1214-
Node(name: "ObjcSelectorExpr",
1215-
nameForDiagnostics: "'#selector' expression",
1216-
kind: "Expr",
1217-
traits: [
1218-
"Parenthesized"
1219-
],
1220-
children: [
1221-
Child(name: "PoundSelector",
1222-
kind: "PoundSelectorToken",
1223-
tokenChoices: [
1224-
"PoundSelector"
1225-
]),
1226-
Child(name: "LeftParen",
1227-
kind: "LeftParenToken",
1228-
tokenChoices: [
1229-
"LeftParen"
1230-
]),
1231-
Child(name: "Kind",
1232-
kind: "ContextualKeywordToken",
1233-
isOptional: true,
1234-
tokenChoices: [
1235-
"ContextualKeyword"
1236-
],
1237-
textChoices: [
1238-
"getter",
1239-
"setter"
1240-
]),
1241-
Child(name: "Colon",
1242-
kind: "ColonToken",
1243-
isOptional: true,
1244-
tokenChoices: [
1245-
"Colon"
1246-
]),
1247-
Child(name: "Name",
1248-
kind: "Expr"),
1249-
Child(name: "RightParen",
1250-
kind: "RightParenToken",
1251-
tokenChoices: [
1252-
"RightParen"
1253-
])
1254-
]),
1255-
12561088
Node(name: "MacroExpansionExpr",
12571089
nameForDiagnostics: "pound literal expression",
12581090
kind: "Expr",
@@ -1317,35 +1149,6 @@ public let EXPR_NODES: [Node] = [
13171149
])
13181150
]),
13191151

1320-
Node(name: "ObjectLiteralExpr",
1321-
nameForDiagnostics: "object literal",
1322-
kind: "Expr",
1323-
traits: [
1324-
"Parenthesized"
1325-
],
1326-
children: [
1327-
Child(name: "Identifier",
1328-
kind: "Token",
1329-
tokenChoices: [
1330-
"PoundColorLiteral",
1331-
"PoundFileLiteral",
1332-
"PoundImageLiteral"
1333-
]),
1334-
Child(name: "LeftParen",
1335-
kind: "LeftParenToken",
1336-
tokenChoices: [
1337-
"LeftParen"
1338-
]),
1339-
Child(name: "Arguments",
1340-
kind: "TupleExprElementList",
1341-
collectionElementName: "Argument"),
1342-
Child(name: "RightParen",
1343-
kind: "RightParenToken",
1344-
tokenChoices: [
1345-
"RightParen"
1346-
])
1347-
]),
1348-
13491152
Node(name: "YieldExprList",
13501153
nameForDiagnostics: "yield list",
13511154
kind: "SyntaxCollection",

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/TokenSpec.swift

-17
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
254254
ExprKeywordSpec(name: "True", text: "true"),
255255
ExprKeywordSpec(name: "Try", text: "try", requiresTrailingSpace: true),
256256
ExprKeywordSpec(name: "Throws", text: "throws", requiresTrailingSpace: true),
257-
KeywordSpec(name: "__FILE__", text: "__FILE__", requiresTrailingSpace: true),
258-
KeywordSpec(name: "__LINE__", text: "__LINE__", requiresTrailingSpace: true),
259-
KeywordSpec(name: "__COLUMN__", text: "__COLUMN__", requiresTrailingSpace: true),
260-
KeywordSpec(name: "__FUNCTION__", text: "__FUNCTION__", requiresTrailingSpace: true),
261-
KeywordSpec(name: "__DSO_HANDLE__", text: "__DSO_HANDLE__", requiresTrailingSpace: true),
262257
PatternKeywordSpec(name: "Wildcard", text: "_", requiresTrailingSpace: true),
263258
PunctuatorSpec(name: "LeftParen", kind: "l_paren", text: "("),
264259
PunctuatorSpec(name: "RightParen", kind: "r_paren", text: ")"),
@@ -287,15 +282,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
287282
PunctuatorSpec(name: "StringQuote", kind: "string_quote", text: "\"", classification: "StringLiteral"),
288283
PunctuatorSpec(name: "SingleQuote", kind: "single_quote", text: "\'", classification: "StringLiteral"),
289284
PunctuatorSpec(name: "MultilineStringQuote", kind: "multiline_string_quote", text: "\"\"\"", classification: "StringLiteral"),
290-
PoundKeywordSpec(name: "PoundKeyPath", kind: "pound_keyPath", text: "#keyPath"),
291-
PoundKeywordSpec(name: "PoundLine", kind: "pound_line", text: "#line"),
292-
PoundKeywordSpec(name: "PoundSelector", kind: "pound_selector", text: "#selector"),
293-
PoundKeywordSpec(name: "PoundFile", kind: "pound_file", text: "#file"),
294-
PoundKeywordSpec(name: "PoundFileID", kind: "pound_fileID", text: "#fileID"),
295-
PoundKeywordSpec(name: "PoundFilePath", kind: "pound_filePath", text: "#filePath"),
296-
PoundKeywordSpec(name: "PoundColumn", kind: "pound_column", text: "#column"),
297-
PoundKeywordSpec(name: "PoundFunction", kind: "pound_function", text: "#function"),
298-
PoundKeywordSpec(name: "PoundDsohandle", kind: "pound_dsohandle", text: "#dsohandle"),
299285
PoundKeywordSpec(name: "PoundAssert", kind: "pound_assert", text: "#assert"),
300286
PoundDirectiveKeywordSpec(name: "PoundSourceLocation", kind: "pound_sourceLocation", text: "#sourceLocation"),
301287
PoundDirectiveKeywordSpec(name: "PoundWarning", kind: "pound_warning", text: "#warning"),
@@ -306,9 +292,6 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
306292
PoundConditionalDirectiveKeywordSpec(name: "PoundEndif", kind: "pound_endif", text: "#endif"),
307293
PoundConfigSpec(name: "PoundAvailable", kind: "pound_available", text: "#available"),
308294
PoundConfigSpec(name: "PoundUnavailable", kind: "pound_unavailable", text: "#unavailable"),
309-
PoundObjectLiteralSpec(name: "PoundFileLiteral", kind: "pound_fileLiteral", text: "#fileLiteral", nameForDiagnostics: "file reference", protocol: "ExpressibleByFileReferenceLiteral"),
310-
PoundObjectLiteralSpec(name: "PoundImageLiteral", kind: "pound_imageLiteral", text: "#imageLiteral", nameForDiagnostics: "image", protocol: "ExpressibleByImageLiteral"),
311-
PoundObjectLiteralSpec(name: "PoundColorLiteral", kind: "pound_colorLiteral", text: "#colorLiteral", nameForDiagnostics: "color", protocol: "ExpressibleByColorLiteral"),
312295
PoundConfigSpec(name: "PoundHasSymbol", kind: "pound__hasSymbol", text: "#_hasSymbol"),
313296
LiteralSpec(name: "IntegerLiteral", kind: "integer_literal", nameForDiagnostics: "integer literal", classification: "IntegerLiteral"),
314297
LiteralSpec(name: "FloatingLiteral", kind: "floating_literal", nameForDiagnostics: "floating literal", classification: "FloatingLiteral"),

‎Sources/IDEUtils/generated/SyntaxClassification.swift

-34
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,6 @@ extension RawTokenKind {
246246
return .keyword
247247
case .throwsKeyword:
248248
return .keyword
249-
case .__file__Keyword:
250-
return .keyword
251-
case .__line__Keyword:
252-
return .keyword
253-
case .__column__Keyword:
254-
return .keyword
255-
case .__function__Keyword:
256-
return .keyword
257-
case .__dso_handle__Keyword:
258-
return .keyword
259249
case .wildcardKeyword:
260250
return .keyword
261251
case .leftParen:
@@ -312,24 +302,6 @@ extension RawTokenKind {
312302
return .stringLiteral
313303
case .multilineStringQuote:
314304
return .stringLiteral
315-
case .poundKeyPathKeyword:
316-
return .keyword
317-
case .poundLineKeyword:
318-
return .keyword
319-
case .poundSelectorKeyword:
320-
return .keyword
321-
case .poundFileKeyword:
322-
return .keyword
323-
case .poundFileIDKeyword:
324-
return .keyword
325-
case .poundFilePathKeyword:
326-
return .keyword
327-
case .poundColumnKeyword:
328-
return .keyword
329-
case .poundFunctionKeyword:
330-
return .keyword
331-
case .poundDsohandleKeyword:
332-
return .keyword
333305
case .poundAssertKeyword:
334306
return .keyword
335307
case .poundSourceLocationKeyword:
@@ -350,12 +322,6 @@ extension RawTokenKind {
350322
return .keyword
351323
case .poundUnavailableKeyword:
352324
return .keyword
353-
case .poundFileLiteralKeyword:
354-
return .objectLiteral
355-
case .poundImageLiteralKeyword:
356-
return .objectLiteral
357-
case .poundColorLiteralKeyword:
358-
return .objectLiteral
359325
case .poundHasSymbolKeyword:
360326
return .keyword
361327
case .integerLiteral:

‎Sources/SwiftBasicFormat/generated/BasicFormat.swift

-34
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,6 @@ open class BasicFormat: SyntaxRewriter {
226226
return true
227227
case .throwsKeyword:
228228
return true
229-
case .__file__Keyword:
230-
return true
231-
case .__line__Keyword:
232-
return true
233-
case .__column__Keyword:
234-
return true
235-
case .__function__Keyword:
236-
return true
237-
case .__dso_handle__Keyword:
238-
return true
239229
case .wildcardKeyword:
240230
return true
241231
case .leftAngle:
@@ -250,24 +240,6 @@ open class BasicFormat: SyntaxRewriter {
250240
return true
251241
case .arrow:
252242
return true
253-
case .poundKeyPathKeyword:
254-
return true
255-
case .poundLineKeyword:
256-
return true
257-
case .poundSelectorKeyword:
258-
return true
259-
case .poundFileKeyword:
260-
return true
261-
case .poundFileIDKeyword:
262-
return true
263-
case .poundFilePathKeyword:
264-
return true
265-
case .poundColumnKeyword:
266-
return true
267-
case .poundFunctionKeyword:
268-
return true
269-
case .poundDsohandleKeyword:
270-
return true
271243
case .poundAssertKeyword:
272244
return true
273245
case .poundSourceLocationKeyword:
@@ -288,12 +260,6 @@ open class BasicFormat: SyntaxRewriter {
288260
return true
289261
case .poundUnavailableKeyword:
290262
return true
291-
case .poundFileLiteralKeyword:
292-
return true
293-
case .poundImageLiteralKeyword:
294-
return true
295-
case .poundColorLiteralKeyword:
296-
return true
297263
case .poundHasSymbolKeyword:
298264
return true
299265
case .spacedBinaryOperator:

0 commit comments

Comments
 (0)