Merge pull request #1178 from ahoppen/ahoppen/remove-unused-nodes

Remove unused nodes

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

@@ -18,12 +18,6 @@ public let ATTRIBUTE_NODES: [Node] = [
        kind: "SyntaxCollection",
        element: "Token"),
 
-  Node(name: "NonEmptyTokenList",
-       nameForDiagnostics: "token list",
-       kind: "SyntaxCollection",
-       element: "Token",
-       omitWhenEmpty: true),
-
   Node(name: "CustomAttribute",
        nameForDiagnostics: "attribute",
        description: "A custom `@` attribute.",
@@ -531,25 +525,6 @@ public let ATTRIBUTE_NODES: [Node] = [
                isOptional: true)
        ]),
 
-  Node(name: "FunctionDeclName",
-       nameForDiagnostics: "function declaration name",
-       description: "A function declaration name (e.g. `foo(_:_:)`).",
-       kind: "Syntax",
-       children: [
-         Child(name: "Name",
-               kind: "Token",
-               description: "The base name of the referenced function.",
-               tokenChoices: [
-                 "Identifier",
-                 "PrefixOperator",
-                 "SpacedBinaryOperator"
-               ]),
-         Child(name: "Arguments",
-               kind: "DeclNameArguments",
-               description: "The argument labels of the referenced function, optionallyspecified.",
-               isOptional: true)
-       ]),
-
   Node(name: "BackDeployAttributeSpecList",
        nameForDiagnostics: "'@_backDeploy' arguments",
        description: "A collection of arguments for the `@_backDeploy` attribute",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/CommonNodes.swift

@@ -88,9 +88,7 @@ public let COMMON_NODES: [Node] = [
                  Child(name: "Expr",
                        kind: "Expr"),
                  Child(name: "TokenList",
-                       kind: "TokenList"),
-                 Child(name: "NonEmptyTokenList",
-                       kind: "NonEmptyTokenList")
+                       kind: "TokenList")
                ]),
          Child(name: "Semicolon",
                kind: "SemicolonToken",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

@@ -919,20 +919,6 @@ public let DECL_NODES: [Node] = [
                ])
        ]),
 
-  Node(name: "AccessLevelModifier",
-       nameForDiagnostics: "access level modifier",
-       kind: "Syntax",
-       children: [
-         Child(name: "Name",
-               kind: "IdentifierToken",
-               tokenChoices: [
-                 "Identifier"
-               ]),
-         Child(name: "Modifier",
-               kind: "DeclModifierDetail",
-               isOptional: true)
-       ]),
-
   Node(name: "AccessPathComponent",
        nameForDiagnostics: nil,
        kind: "Syntax",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

@@ -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",
@@ -274,20 +263,6 @@ public let EXPR_NODES: [Node] = [
        element: "Expr",
        elementName: "Expression"),
 
-  Node(name: "SymbolicReferenceExpr",
-       nameForDiagnostics: nil,
-       kind: "Expr",
-       children: [
-         Child(name: "Identifier",
-               kind: "IdentifierToken",
-               tokenChoices: [
-                 "Identifier"
-               ]),
-         Child(name: "GenericArgumentClause",
-               kind: "GenericArgumentClause",
-               isOptional: true)
-       ]),
-
   Node(name: "PrefixOperatorExpr",
        nameForDiagnostics: "prefix operator expression",
        kind: "Expr",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/PatternNodes.swift

@@ -26,28 +26,6 @@ public let PATTERN_NODES: [Node] = [
                kind: "Type")
        ]),
 
-  Node(name: "EnumCasePattern",
-       nameForDiagnostics: "enum case pattern",
-       kind: "Pattern",
-       children: [
-         Child(name: "Type",
-               kind: "Type",
-               isOptional: true),
-         Child(name: "Period",
-               kind: "PeriodToken",
-               tokenChoices: [
-                 "Period"
-               ]),
-         Child(name: "CaseName",
-               kind: "IdentifierToken",
-               tokenChoices: [
-                 "Identifier"
-               ]),
-         Child(name: "AssociatedTuple",
-               kind: "TuplePattern",
-               isOptional: true)
-       ]),
-
   Node(name: "IsTypePattern",
        nameForDiagnostics: "'is' pattern",
        kind: "Pattern",
@@ -61,19 +39,6 @@ public let PATTERN_NODES: [Node] = [
                kind: "Type")
        ]),
 
-  Node(name: "OptionalPattern",
-       nameForDiagnostics: "optional pattern",
-       kind: "Pattern",
-       children: [
-         Child(name: "SubPattern",
-               kind: "Pattern"),
-         Child(name: "QuestionMark",
-               kind: "PostfixQuestionMarkToken",
-               tokenChoices: [
-                 "PostfixQuestionMark"
-               ])
-       ]),
-
   Node(name: "IdentifierPattern",
        nameForDiagnostics: "pattern",
        kind: "Pattern",
@@ -86,21 +51,6 @@ public let PATTERN_NODES: [Node] = [
                ])
        ]),
 
-  Node(name: "AsTypePattern",
-       nameForDiagnostics: "'as' pattern",
-       kind: "Pattern",
-       children: [
-         Child(name: "Pattern",
-               kind: "Pattern"),
-         Child(name: "AsKeyword",
-               kind: "AsToken",
-               tokenChoices: [
-                 "As"
-               ]),
-         Child(name: "Type",
-               kind: "Type")
-       ]),
-
   Node(name: "TuplePattern",
        nameForDiagnostics: "tuple pattern",
        kind: "Pattern",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift

@@ -83,14 +83,6 @@ public let STMT_NODES: [Node] = [
                kind: "CodeBlock")
        ]),
 
-  Node(name: "ExpressionStmt",
-       nameForDiagnostics: "expression",
-       kind: "Stmt",
-       children: [
-         Child(name: "Expression",
-               kind: "Expr")
-       ]),
-
   Node(name: "SwitchCaseList",
        nameForDiagnostics: nil,
        kind: "SyntaxCollection",
@@ -499,14 +491,6 @@ public let STMT_NODES: [Node] = [
        kind: "SyntaxCollection",
        element: "ConditionElement"),
 
-  Node(name: "DeclarationStmt",
-       nameForDiagnostics: "declaration",
-       kind: "Stmt",
-       children: [
-         Child(name: "Declaration",
-               kind: "Decl")
-       ]),
-
   Node(name: "ThrowStmt",
        nameForDiagnostics: "'throw' statement",
        kind: "Stmt",

Sources/SwiftParserDiagnostics/PresenceUtils.swift

@@ -97,8 +97,14 @@ class PresentMaker: SyntaxRewriter {
 
   override func visit(_ node: MissingStmtSyntax) -> StmtSyntax {
     return StmtSyntax(
-      ExpressionStmtSyntax(
-        expression: IdentifierExprSyntax(identifier: .identifier("<#statement#>"))
+      DoStmtSyntax(
+        doKeyword: .doKeyword(presence: .missing),
+        UnexpectedNodesSyntax([Syntax(TokenSyntax.identifier("<#statement#>"))]),
+        body: CodeBlockSyntax(
+          leftBrace: .leftBraceToken(presence: .missing),
+          statements: CodeBlockItemListSyntax([]),
+          rightBrace: .rightBraceToken(presence: .missing)
+        )
       )
     )
   }

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

@@ -88,7 +88,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/ContinueStmtSyntax>
 - <doc:SwiftSyntax/WhileStmtSyntax>
 - <doc:SwiftSyntax/DeferStmtSyntax>
-- <doc:SwiftSyntax/ExpressionStmtSyntax>
 - <doc:SwiftSyntax/RepeatWhileStmtSyntax>
 - <doc:SwiftSyntax/GuardStmtSyntax>
 - <doc:SwiftSyntax/ForInStmtSyntax>
@@ -98,7 +97,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/YieldStmtSyntax>
 - <doc:SwiftSyntax/FallthroughStmtSyntax>
 - <doc:SwiftSyntax/BreakStmtSyntax>
-- <doc:SwiftSyntax/DeclarationStmtSyntax>
 - <doc:SwiftSyntax/ThrowStmtSyntax>
 - <doc:SwiftSyntax/IfStmtSyntax>
 - <doc:SwiftSyntax/PoundAssertStmtSyntax>
@@ -108,7 +106,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/ExprSyntax>
 - <doc:SwiftSyntax/ExprSyntaxProtocol>
 - <doc:SwiftSyntax/InOutExprSyntax>
-- <doc:SwiftSyntax/PoundColumnExprSyntax>
 - <doc:SwiftSyntax/TryExprSyntax>
 - <doc:SwiftSyntax/AwaitExprSyntax>
 - <doc:SwiftSyntax/MoveExprSyntax>
@@ -121,7 +118,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/PackExpansionExprSyntax>
 - <doc:SwiftSyntax/PackElementExprSyntax>
 - <doc:SwiftSyntax/SequenceExprSyntax>
-- <doc:SwiftSyntax/SymbolicReferenceExprSyntax>
 - <doc:SwiftSyntax/PrefixOperatorExprSyntax>
 - <doc:SwiftSyntax/BinaryOperatorExprSyntax>
 - <doc:SwiftSyntax/ArrowExprSyntax>
@@ -180,11 +176,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 
 - <doc:SwiftSyntax/PatternSyntax>
 - <doc:SwiftSyntax/PatternSyntaxProtocol>
-- <doc:SwiftSyntax/EnumCasePatternSyntax>
 - <doc:SwiftSyntax/IsTypePatternSyntax>
-- <doc:SwiftSyntax/OptionalPatternSyntax>
 - <doc:SwiftSyntax/IdentifierPatternSyntax>
-- <doc:SwiftSyntax/AsTypePatternSyntax>
 - <doc:SwiftSyntax/TuplePatternSyntax>
 - <doc:SwiftSyntax/WildcardPatternSyntax>
 - <doc:SwiftSyntax/ExpressionPatternSyntax>
@@ -324,7 +317,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/InitializerClauseSyntax>
 - <doc:SwiftSyntax/FunctionParameterSyntax>
 - <doc:SwiftSyntax/ModifierListSyntax>
-- <doc:SwiftSyntax/AccessLevelModifierSyntax>
 - <doc:SwiftSyntax/AccessPathComponentSyntax>
 - <doc:SwiftSyntax/AccessPathSyntax>
 - <doc:SwiftSyntax/AccessorParameterSyntax>
@@ -344,7 +336,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/PrecedenceGroupAssignmentSyntax>
 - <doc:SwiftSyntax/PrecedenceGroupAssociativitySyntax>
 - <doc:SwiftSyntax/TokenListSyntax>
-- <doc:SwiftSyntax/NonEmptyTokenListSyntax>
 - <doc:SwiftSyntax/CustomAttributeSyntax>
 - <doc:SwiftSyntax/AttributeSyntax>
 - <doc:SwiftSyntax/AttributeListSyntax>
@@ -364,7 +355,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/DifferentiabilityParamSyntax>
 - <doc:SwiftSyntax/DerivativeRegistrationAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/QualifiedDeclNameSyntax>
-- <doc:SwiftSyntax/FunctionDeclNameSyntax>
 - <doc:SwiftSyntax/BackDeployAttributeSpecListSyntax>
 - <doc:SwiftSyntax/BackDeployVersionListSyntax>
 - <doc:SwiftSyntax/BackDeployVersionArgumentSyntax>