Remove the DeclName nod in favor of IdentifierExprSyntax

`DeclName` was only used for attributes and has the same structure as `IdentifierExprSyntax`. Let’s use `IdentifierExprSyntax` instead.

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -295,35 +295,6 @@ public let ATTRIBUTE_NODES: [Node] = [
     ]
   ),
 
-  Node(
-    kind: .declName,
-    base: .syntax,
-    nameForDiagnostics: "declaration name",
-    children: [
-      Child(
-        name: "BaseName",
-        deprecatedName: "DeclBaseName",
-        kind: .token(choices: [
-          .token(tokenKind: "IdentifierToken"),
-          .token(tokenKind: "BinaryOperatorToken"),
-          .keyword(text: "init"),
-          .keyword(text: "self"),
-          .keyword(text: "Self"),
-        ]),
-        nameForDiagnostics: "base name",
-        documentation: "The base name of the protocol's requirement."
-      ),
-      Child(
-        name: "Arguments",
-        deprecatedName: "DeclNameArguments",
-        kind: .node(kind: .declNameArguments),
-        nameForDiagnostics: "arguments",
-        documentation: "The argument labels of the protocol's requirement if it is a function requirement.",
-        isOptional: true
-      ),
-    ]
-  ),
-
   // The argument of the derivative registration attribute
   // '@derivative(of: ...)' and the transpose registration attribute
   // '@transpose(of: ...)'.
@@ -591,7 +562,7 @@ public let ATTRIBUTE_NODES: [Node] = [
       Child(
         name: "DeclName",
         deprecatedName: "Declname",
-        kind: .node(kind: .declName)
+        kind: .node(kind: .identifierExpr)
       ),
     ]
   ),
@@ -872,7 +843,7 @@ public let ATTRIBUTE_NODES: [Node] = [
       Child(
         name: "DeclName",
         deprecatedName: "Declname",
-        kind: .node(kind: .declName),
+        kind: .node(kind: .identifierExpr),
         nameForDiagnostics: "declaration name",
         documentation: "The value for this argument"
       ),

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -84,7 +84,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case declModifier
   case declModifierDetail
   case declModifierList
-  case declName
   case declNameArgument
   case declNameArgumentList
   case declNameArguments

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -464,11 +464,6 @@ class ValidateSyntaxNodes: XCTestCase {
           message:
             "child 'Arguments' is named inconsistently with 'IdentifierExprSyntax.DeclNameArguments', which has the same type ('DeclNameArgumentsSyntax')"
         ),
-        ValidationFailure(
-          node: .declName,
-          message:
-            "child 'Arguments' is named inconsistently with 'IdentifierExprSyntax.DeclNameArguments', which has the same type ('DeclNameArgumentsSyntax')"
-        ),
         // MARK: Alternate names for InitializerClauseSyntax
         // The cases below don’t have intializers but just a syntactic element that happens to be spelled the same
         ValidationFailure(

Sources/SwiftParser/Attributes.swift

@@ -682,9 +682,9 @@ extension Parser {
         let ident = self.eat(handle)
         let (unexpectedBeforeColon, colon) = self.expect(.colon)
         let (targetFunction, args) = self.parseDeclNameRef([.zeroArgCompoundNames, .keywordsUsingSpecialNames, .operators])
-        let declName = RawDeclNameSyntax(
-          baseName: targetFunction,
-          arguments: args,
+        let declName = RawIdentifierExprSyntax(
+          identifier: targetFunction,
+          declNameArguments: args,
           arena: self.arena
         )
         let comma = self.consume(if: .comma)
@@ -1031,7 +1031,7 @@ extension Parser {
         .zeroArgCompoundNames, .keywordsUsingSpecialNames, .operators,
       ])
     }
-    let method = RawDeclNameSyntax(baseName: base, arguments: args, arena: self.arena)
+    let method = RawIdentifierExprSyntax(identifier: base, declNameArguments: args, arena: self.arena)
     return RawDynamicReplacementAttributeArgumentsSyntax(
       unexpectedBeforeLabel,
       forLabel: label,

Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

@@ -652,48 +652,6 @@ extension DeclModifierSyntax {
   }
 }
 
-extension DeclNameSyntax {
-  enum BaseNameOptions: TokenSpecSet {
-    case identifier
-    case binaryOperator
-    case `init`
-    case `self`
-    case `Self`
-    
-    init?(lexeme: Lexer.Lexeme) {
-      switch PrepareForKeywordMatch(lexeme) {
-      case TokenSpec(.identifier):
-        self = .identifier
-      case TokenSpec(.binaryOperator):
-        self = .binaryOperator
-      case TokenSpec(.`init`):
-        self = .`init`
-      case TokenSpec(.`self`):
-        self = .`self`
-      case TokenSpec(.`Self`):
-        self = .`Self`
-      default:
-        return nil
-      }
-    }
-    
-    var spec: TokenSpec {
-      switch self {
-      case .identifier:
-        return .identifier
-      case .binaryOperator:
-        return .binaryOperator
-      case .`init`:
-        return .keyword(.`init`)
-      case .`self`:
-        return .keyword(.`self`)
-      case .`Self`:
-        return .keyword(.`Self`)
-      }
-    }
-  }
-}
-
 extension DerivativeAttributeArgumentsSyntax {
   enum AccessorSpecifierOptions: TokenSpecSet {
     case get

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -78,10 +78,6 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "statements"
   case \ContinueStmtSyntax.label:
     return "label"
-  case \DeclNameSyntax.baseName:
-    return "base name"
-  case \DeclNameSyntax.arguments:
-    return "arguments"
   case \DeinitializerDeclSyntax.attributes:
     return "attributes"
   case \DeinitializerDeclSyntax.modifiers:

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -105,8 +105,6 @@ extension SyntaxKind {
       return "'copy' expression"
     case .declModifier:
       return "modifier"
-    case .declName:
-      return "declaration name"
     case .deferStmt:
       return "'defer' statement"
     case .deinitializerDecl:

Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

@@ -321,7 +321,6 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
 - <doc:SwiftSyntax/ConventionWitnessMethodAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/DeclModifierDetailSyntax>
 - <doc:SwiftSyntax/DeclNameArgumentsSyntax>
-- <doc:SwiftSyntax/DeclNameSyntax>
 - <doc:SwiftSyntax/DeinitializerEffectSpecifiersSyntax>
 - <doc:SwiftSyntax/DerivativeAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/DifferentiabilityArgumentsSyntax>

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -793,16 +793,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightParen"
   case \DeclNameArgumentsSyntax.unexpectedAfterRightParen:
     return "unexpectedAfterRightParen"
-  case \DeclNameSyntax.unexpectedBeforeBaseName:
-    return "unexpectedBeforeBaseName"
-  case \DeclNameSyntax.baseName:
-    return "baseName"
-  case \DeclNameSyntax.unexpectedBetweenBaseNameAndArguments:
-    return "unexpectedBetweenBaseNameAndArguments"
-  case \DeclNameSyntax.arguments:
-    return "arguments"
-  case \DeclNameSyntax.unexpectedAfterArguments:
-    return "unexpectedAfterArguments"
   case \DeferStmtSyntax.unexpectedBeforeDeferKeyword:
     return "unexpectedBeforeDeferKeyword"
   case \DeferStmtSyntax.deferKeyword:

Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

@@ -1558,81 +1558,6 @@ extension ConsumeExprSyntax {
   }
 }
 
-extension DeclNameSyntax {
-  @available(*, deprecated, renamed: "unexpectedBeforeBaseName")
-  public var unexpectedBeforeDeclBaseName: UnexpectedNodesSyntax? {
-    get {
-      return unexpectedBeforeBaseName
-    }
-    set {
-      unexpectedBeforeBaseName = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "baseName")
-  public var declBaseName: TokenSyntax {
-    get {
-      return baseName
-    }
-    set {
-      baseName = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "unexpectedBetweenBaseNameAndArguments")
-  public var unexpectedBetweenDeclBaseNameAndDeclNameArguments: UnexpectedNodesSyntax? {
-    get {
-      return unexpectedBetweenBaseNameAndArguments
-    }
-    set {
-      unexpectedBetweenBaseNameAndArguments = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "arguments")
-  public var declNameArguments: DeclNameArgumentsSyntax? {
-    get {
-      return arguments
-    }
-    set {
-      arguments = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "unexpectedAfterArguments")
-  public var unexpectedAfterDeclNameArguments: UnexpectedNodesSyntax? {
-    get {
-      return unexpectedAfterArguments
-    }
-    set {
-      unexpectedAfterArguments = newValue
-    }
-  }
-  
-  @available(*, deprecated, message: "Use an initializer with baseName, arguments argument(s).")
-  @_disfavoredOverload
-  public init(
-      leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeDeclBaseName: UnexpectedNodesSyntax? = nil,
-      declBaseName: TokenSyntax,
-      _ unexpectedBetweenDeclBaseNameAndDeclNameArguments: UnexpectedNodesSyntax? = nil,
-      declNameArguments: DeclNameArgumentsSyntax? = nil,
-      _ unexpectedAfterDeclNameArguments: UnexpectedNodesSyntax? = nil,
-      trailingTrivia: Trivia? = nil
-    
-  ) {
-    self.init(
-        leadingTrivia: leadingTrivia, 
-        unexpectedBeforeDeclBaseName, 
-        baseName: declBaseName, 
-        unexpectedBetweenDeclBaseNameAndDeclNameArguments, 
-        arguments: declNameArguments, 
-        unexpectedAfterDeclNameArguments, 
-        trailingTrivia: trailingTrivia
-      )
-  }
-}
-
 extension DerivativeAttributeArgumentsSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenPeriodAndAccessorSpecifier")
   public var unexpectedBetweenPeriodAndAccessorKind: UnexpectedNodesSyntax? {
@@ -2300,7 +2225,7 @@ extension DynamicReplacementAttributeArgumentsSyntax {
   }
 
   @available(*, deprecated, renamed: "declName")
-  public var declname: DeclNameSyntax {
+  public var declname: IdentifierExprSyntax {
     get {
       return declName
     }
@@ -2328,7 +2253,7 @@ extension DynamicReplacementAttributeArgumentsSyntax {
       _ unexpectedBetweenForLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndDeclname: UnexpectedNodesSyntax? = nil,
-      declname: DeclNameSyntax,
+      declname: IdentifierExprSyntax,
       _ unexpectedAfterDeclname: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
 
@@ -7118,7 +7043,7 @@ extension SpecializeTargetFunctionArgumentSyntax {
   }
 
   @available(*, deprecated, renamed: "declName")
-  public var declname: DeclNameSyntax {
+  public var declname: IdentifierExprSyntax {
     get {
       return declName
     }
@@ -7146,7 +7071,7 @@ extension SpecializeTargetFunctionArgumentSyntax {
       _ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndDeclname: UnexpectedNodesSyntax? = nil,
-      declname: DeclNameSyntax,
+      declname: IdentifierExprSyntax,
       _ unexpectedBetweenDeclnameAndTrailingComma: UnexpectedNodesSyntax? = nil,
       trailingComma: TokenSyntax? = nil,
       _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,