Skip to content

Commit 8cf6e74

Browse files
committed
Remove unused nodes
These nodes weren’t used in SwiftParser, so we can remove them. rdar://103448455
1 parent e0c30d7 commit 8cf6e74

37 files changed

+33
-4126
lines changed

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ public let ATTRIBUTE_NODES: [Node] = [
1818
kind: "SyntaxCollection",
1919
element: "Token"),
2020

21-
Node(name: "NonEmptyTokenList",
22-
nameForDiagnostics: "token list",
23-
kind: "SyntaxCollection",
24-
element: "Token",
25-
omitWhenEmpty: true),
26-
2721
Node(name: "CustomAttribute",
2822
nameForDiagnostics: "attribute",
2923
description: "A custom `@` attribute.",
@@ -531,25 +525,6 @@ public let ATTRIBUTE_NODES: [Node] = [
531525
isOptional: true)
532526
]),
533527

534-
Node(name: "FunctionDeclName",
535-
nameForDiagnostics: "function declaration name",
536-
description: "A function declaration name (e.g. `foo(_:_:)`).",
537-
kind: "Syntax",
538-
children: [
539-
Child(name: "Name",
540-
kind: "Token",
541-
description: "The base name of the referenced function.",
542-
tokenChoices: [
543-
"Identifier",
544-
"PrefixOperator",
545-
"SpacedBinaryOperator"
546-
]),
547-
Child(name: "Arguments",
548-
kind: "DeclNameArguments",
549-
description: "The argument labels of the referenced function, optionallyspecified.",
550-
isOptional: true)
551-
]),
552-
553528
Node(name: "BackDeployAttributeSpecList",
554529
nameForDiagnostics: "'@_backDeploy' arguments",
555530
description: "A collection of arguments for the `@_backDeploy` attribute",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/CommonNodes.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ public let COMMON_NODES: [Node] = [
8888
Child(name: "Expr",
8989
kind: "Expr"),
9090
Child(name: "TokenList",
91-
kind: "TokenList"),
92-
Child(name: "NonEmptyTokenList",
93-
kind: "NonEmptyTokenList")
91+
kind: "TokenList")
9492
]),
9593
Child(name: "Semicolon",
9694
kind: "SemicolonToken",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -919,20 +919,6 @@ public let DECL_NODES: [Node] = [
919919
])
920920
]),
921921

922-
Node(name: "AccessLevelModifier",
923-
nameForDiagnostics: "access level modifier",
924-
kind: "Syntax",
925-
children: [
926-
Child(name: "Name",
927-
kind: "IdentifierToken",
928-
tokenChoices: [
929-
"Identifier"
930-
]),
931-
Child(name: "Modifier",
932-
kind: "DeclModifierDetail",
933-
isOptional: true)
934-
]),
935-
936922
Node(name: "AccessPathComponent",
937923
nameForDiagnostics: nil,
938924
kind: "Syntax",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

Lines changed: 0 additions & 25 deletions
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",
@@ -261,20 +250,6 @@ public let EXPR_NODES: [Node] = [
261250
element: "Expr",
262251
elementName: "Expression"),
263252

264-
Node(name: "SymbolicReferenceExpr",
265-
nameForDiagnostics: nil,
266-
kind: "Expr",
267-
children: [
268-
Child(name: "Identifier",
269-
kind: "IdentifierToken",
270-
tokenChoices: [
271-
"Identifier"
272-
]),
273-
Child(name: "GenericArgumentClause",
274-
kind: "GenericArgumentClause",
275-
isOptional: true)
276-
]),
277-
278253
Node(name: "PrefixOperatorExpr",
279254
nameForDiagnostics: "prefix operator expression",
280255
kind: "Expr",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/PatternNodes.swift

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,6 @@ public let PATTERN_NODES: [Node] = [
2626
kind: "Type")
2727
]),
2828

29-
Node(name: "EnumCasePattern",
30-
nameForDiagnostics: "enum case pattern",
31-
kind: "Pattern",
32-
children: [
33-
Child(name: "Type",
34-
kind: "Type",
35-
isOptional: true),
36-
Child(name: "Period",
37-
kind: "PeriodToken",
38-
tokenChoices: [
39-
"Period"
40-
]),
41-
Child(name: "CaseName",
42-
kind: "IdentifierToken",
43-
tokenChoices: [
44-
"Identifier"
45-
]),
46-
Child(name: "AssociatedTuple",
47-
kind: "TuplePattern",
48-
isOptional: true)
49-
]),
50-
5129
Node(name: "IsTypePattern",
5230
nameForDiagnostics: "'is' pattern",
5331
kind: "Pattern",
@@ -61,19 +39,6 @@ public let PATTERN_NODES: [Node] = [
6139
kind: "Type")
6240
]),
6341

64-
Node(name: "OptionalPattern",
65-
nameForDiagnostics: "optional pattern",
66-
kind: "Pattern",
67-
children: [
68-
Child(name: "SubPattern",
69-
kind: "Pattern"),
70-
Child(name: "QuestionMark",
71-
kind: "PostfixQuestionMarkToken",
72-
tokenChoices: [
73-
"PostfixQuestionMark"
74-
])
75-
]),
76-
7742
Node(name: "IdentifierPattern",
7843
nameForDiagnostics: "pattern",
7944
kind: "Pattern",
@@ -86,21 +51,6 @@ public let PATTERN_NODES: [Node] = [
8651
])
8752
]),
8853

89-
Node(name: "AsTypePattern",
90-
nameForDiagnostics: "'as' pattern",
91-
kind: "Pattern",
92-
children: [
93-
Child(name: "Pattern",
94-
kind: "Pattern"),
95-
Child(name: "AsKeyword",
96-
kind: "AsToken",
97-
tokenChoices: [
98-
"As"
99-
]),
100-
Child(name: "Type",
101-
kind: "Type")
102-
]),
103-
10454
Node(name: "TuplePattern",
10555
nameForDiagnostics: "tuple pattern",
10656
kind: "Pattern",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,6 @@ public let STMT_NODES: [Node] = [
8383
kind: "CodeBlock")
8484
]),
8585

86-
Node(name: "ExpressionStmt",
87-
nameForDiagnostics: "expression",
88-
kind: "Stmt",
89-
children: [
90-
Child(name: "Expression",
91-
kind: "Expr")
92-
]),
93-
9486
Node(name: "SwitchCaseList",
9587
nameForDiagnostics: nil,
9688
kind: "SyntaxCollection",
@@ -499,14 +491,6 @@ public let STMT_NODES: [Node] = [
499491
kind: "SyntaxCollection",
500492
element: "ConditionElement"),
501493

502-
Node(name: "DeclarationStmt",
503-
nameForDiagnostics: "declaration",
504-
kind: "Stmt",
505-
children: [
506-
Child(name: "Declaration",
507-
kind: "Decl")
508-
]),
509-
510494
Node(name: "ThrowStmt",
511495
nameForDiagnostics: "'throw' statement",
512496
kind: "Stmt",

Sources/SwiftParserDiagnostics/PresenceUtils.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,14 @@ class PresentMaker: SyntaxRewriter {
9797

9898
override func visit(_ node: MissingStmtSyntax) -> StmtSyntax {
9999
return StmtSyntax(
100-
ExpressionStmtSyntax(
101-
expression: IdentifierExprSyntax(identifier: .identifier("<#statement#>"))
100+
DoStmtSyntax(
101+
doKeyword: .doKeyword(presence: .missing),
102+
UnexpectedNodesSyntax([Syntax(TokenSyntax.identifier("<#statement#>"))]),
103+
body: CodeBlockSyntax(
104+
leftBrace: .leftBraceToken(presence: .missing),
105+
statements: CodeBlockItemListSyntax([]),
106+
rightBrace: .rightBraceToken(presence: .missing)
107+
)
102108
)
103109
)
104110
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
8383
- <doc:SwiftSyntax/ContinueStmtSyntax>
8484
- <doc:SwiftSyntax/WhileStmtSyntax>
8585
- <doc:SwiftSyntax/DeferStmtSyntax>
86-
- <doc:SwiftSyntax/ExpressionStmtSyntax>
8786
- <doc:SwiftSyntax/RepeatWhileStmtSyntax>
8887
- <doc:SwiftSyntax/GuardStmtSyntax>
8988
- <doc:SwiftSyntax/ForInStmtSyntax>
@@ -93,7 +92,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
9392
- <doc:SwiftSyntax/YieldStmtSyntax>
9493
- <doc:SwiftSyntax/FallthroughStmtSyntax>
9594
- <doc:SwiftSyntax/BreakStmtSyntax>
96-
- <doc:SwiftSyntax/DeclarationStmtSyntax>
9795
- <doc:SwiftSyntax/ThrowStmtSyntax>
9896
- <doc:SwiftSyntax/IfStmtSyntax>
9997
- <doc:SwiftSyntax/PoundAssertStmtSyntax>
@@ -103,7 +101,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
103101
- <doc:SwiftSyntax/ExprSyntax>
104102
- <doc:SwiftSyntax/ExprSyntaxProtocol>
105103
- <doc:SwiftSyntax/InOutExprSyntax>
106-
- <doc:SwiftSyntax/PoundColumnExprSyntax>
107104
- <doc:SwiftSyntax/TryExprSyntax>
108105
- <doc:SwiftSyntax/AwaitExprSyntax>
109106
- <doc:SwiftSyntax/MoveExprSyntax>
@@ -115,7 +112,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
115112
- <doc:SwiftSyntax/AssignmentExprSyntax>
116113
- <doc:SwiftSyntax/PackElementExprSyntax>
117114
- <doc:SwiftSyntax/SequenceExprSyntax>
118-
- <doc:SwiftSyntax/SymbolicReferenceExprSyntax>
119115
- <doc:SwiftSyntax/PrefixOperatorExprSyntax>
120116
- <doc:SwiftSyntax/BinaryOperatorExprSyntax>
121117
- <doc:SwiftSyntax/ArrowExprSyntax>
@@ -174,11 +170,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
174170

175171
- <doc:SwiftSyntax/PatternSyntax>
176172
- <doc:SwiftSyntax/PatternSyntaxProtocol>
177-
- <doc:SwiftSyntax/EnumCasePatternSyntax>
178173
- <doc:SwiftSyntax/IsTypePatternSyntax>
179-
- <doc:SwiftSyntax/OptionalPatternSyntax>
180174
- <doc:SwiftSyntax/IdentifierPatternSyntax>
181-
- <doc:SwiftSyntax/AsTypePatternSyntax>
182175
- <doc:SwiftSyntax/TuplePatternSyntax>
183176
- <doc:SwiftSyntax/WildcardPatternSyntax>
184177
- <doc:SwiftSyntax/ExpressionPatternSyntax>
@@ -318,7 +311,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
318311
- <doc:SwiftSyntax/InitializerClauseSyntax>
319312
- <doc:SwiftSyntax/FunctionParameterSyntax>
320313
- <doc:SwiftSyntax/ModifierListSyntax>
321-
- <doc:SwiftSyntax/AccessLevelModifierSyntax>
322314
- <doc:SwiftSyntax/AccessPathComponentSyntax>
323315
- <doc:SwiftSyntax/AccessPathSyntax>
324316
- <doc:SwiftSyntax/AccessorParameterSyntax>
@@ -338,7 +330,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
338330
- <doc:SwiftSyntax/PrecedenceGroupAssignmentSyntax>
339331
- <doc:SwiftSyntax/PrecedenceGroupAssociativitySyntax>
340332
- <doc:SwiftSyntax/TokenListSyntax>
341-
- <doc:SwiftSyntax/NonEmptyTokenListSyntax>
342333
- <doc:SwiftSyntax/CustomAttributeSyntax>
343334
- <doc:SwiftSyntax/AttributeSyntax>
344335
- <doc:SwiftSyntax/AttributeListSyntax>
@@ -358,7 +349,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
358349
- <doc:SwiftSyntax/DifferentiabilityParamSyntax>
359350
- <doc:SwiftSyntax/DerivativeRegistrationAttributeArgumentsSyntax>
360351
- <doc:SwiftSyntax/QualifiedDeclNameSyntax>
361-
- <doc:SwiftSyntax/FunctionDeclNameSyntax>
362352
- <doc:SwiftSyntax/BackDeployAttributeSpecListSyntax>
363353
- <doc:SwiftSyntax/BackDeployVersionListSyntax>
364354
- <doc:SwiftSyntax/BackDeployVersionArgumentSyntax>

0 commit comments

Comments
 (0)