Merge pull request #2045 from kimdv/kimdv/1975-remove-qualifieddeclnamesyntax-in-favor-of-memberaccessexprsyntax

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -340,7 +340,7 @@ public let ATTRIBUTE_NODES: [Node] = [
       ),
       Child(
         name: "OriginalDeclName",
-        kind: .node(kind: .qualifiedDeclName),
+        kind: .node(kind: .expr),
         documentation: "The referenced original declaration name."
       ),
       Child(
@@ -776,43 +776,6 @@ public let ATTRIBUTE_NODES: [Node] = [
     ]
   ),
 
-  // An optionally qualified declaration name.
-  // Currently used only for `@derivative` and `@transpose` attribute.
-  // TODO(TF-1066): Use module qualified name syntax/parsing instead of custom
-  // qualified name syntax/parsing.
-  //
-  // qualified-decl-name ->
-  //     base-type? '.'? (identifier | operator) decl-name-arguments?
-  // base-type ->
-  //     member-type-identifier | base-type-identifier
-  Node(
-    kind: .qualifiedDeclName,
-    base: .syntax,
-    nameForDiagnostics: "declaration name",
-    documentation: "An optionally qualified function declaration name (e.g. `+(_:_:)`, `A.B.C.foo(_:_:)`).",
-    children: [
-      Child(
-        name: "BaseType",
-        kind: .node(kind: .type),
-        nameForDiagnostics: "base type",
-        documentation: "The base type of the qualified name, optionally specified.",
-        isOptional: true
-      ),
-      Child(
-        name: "Period",
-        deprecatedName: "Dot",
-        kind: .token(choices: [.token(.period)]),
-        isOptional: true
-      ),
-      Child(
-        name: "DeclName",
-        kind: .node(kind: .declReferenceExpr),
-        nameForDiagnostics: "name",
-        documentation: "The name of the referenced function."
-      ),
-    ]
-  ),
-
   // The argument of '@_specialize(...)'
   // specialize-attr-spec-list -> labeled-specialize-entry
   //                                  specialize-spec-attr-list?

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -1183,11 +1183,13 @@ public let EXPR_NODES: [Node] = [
     kind: .memberAccessExpr,
     base: .expr,
     nameForDiagnostics: "member access",
+    documentation: "An expression that access a member like a function or a property.",
     children: [
       Child(
         name: "Base",
         kind: .node(kind: .expr),
         nameForDiagnostics: "base",
+        documentation: "The base of the member access, optionally specified.",
         isOptional: true
       ),
       Child(
@@ -1198,7 +1200,8 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "DeclName",
         kind: .node(kind: .declReferenceExpr),
-        nameForDiagnostics: "name"
+        nameForDiagnostics: "name",
+        documentation: "The name of the referenced function or a property."
       ),
     ]
   ),

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -237,7 +237,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case primaryAssociatedTypeClause
   case primaryAssociatedTypeList
   case protocolDecl
-  case qualifiedDeclName
   case regexLiteralExpr
   case repeatStmt
   case returnClause

Sources/SwiftParser/Names.swift

@@ -145,11 +145,12 @@ extension Parser {
 }
 
 extension Parser {
-  mutating func parseQualifiedDeclarationName() -> RawQualifiedDeclNameSyntax {
-    let type: RawTypeSyntax?
+  mutating func parseQualifiedDeclarationName() -> RawExprSyntax {
+    let type: RawExprSyntax?
     let period: RawTokenSyntax?
+
     if self.lookahead().canParseBaseTypeForQualifiedDeclName() {
-      type = self.parseQualifiedTypeIdentifier()
+      type = RawExprSyntax(RawTypeExprSyntax(type: self.parseQualifiedTypeIdentifier(), arena: self.arena))
       period = self.consumePrefix(".", as: .period)
     } else {
       type = nil
@@ -161,12 +162,18 @@ extension Parser {
       .keywordsUsingSpecialNames,
       .operators,
     ])
-    return RawQualifiedDeclNameSyntax(
-      baseType: type,
-      period: period,
-      declName: declName,
-      arena: self.arena
-    )
+    if let period = period {
+      return RawExprSyntax(
+        RawMemberAccessExprSyntax(
+          base: type,
+          period: period,
+          declName: declName,
+          arena: self.arena
+        )
+      )
+    } else {
+      return RawExprSyntax(declName)
+    }
   }
 
   mutating func parseQualifiedTypeIdentifier() -> RawTypeSyntax {

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -282,10 +282,6 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "inheritance clause"
   case \ProtocolDeclSyntax.genericWhereClause:
     return "generic where clause"
-  case \QualifiedDeclNameSyntax.baseType:
-    return "base type"
-  case \QualifiedDeclNameSyntax.declName:
-    return "name"
   case \RepeatStmtSyntax.body:
     return "body"
   case \RepeatStmtSyntax.condition:

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -321,8 +321,6 @@ extension SyntaxKind {
       return "primary associated type clause"
     case .protocolDecl:
       return "protocol"
-    case .qualifiedDeclName:
-      return "declaration name"
     case .regexLiteralExpr:
       return "regex literal"
     case .repeatStmt:

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

@@ -333,7 +333,6 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
 - <doc:SwiftSyntax/OriginallyDefinedInAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/PlatformVersionItemListSyntax>
 - <doc:SwiftSyntax/PlatformVersionItemSyntax>
-- <doc:SwiftSyntax/QualifiedDeclNameSyntax>
 - <doc:SwiftSyntax/SpecializeAttributeArgumentListSyntax>
 - <doc:SwiftSyntax/SpecializeAvailabilityArgumentSyntax>
 - <doc:SwiftSyntax/SpecializeTargetFunctionArgumentSyntax>

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -2675,20 +2675,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "memberBlock"
   case \ProtocolDeclSyntax.unexpectedAfterMemberBlock:
     return "unexpectedAfterMemberBlock"
-  case \QualifiedDeclNameSyntax.unexpectedBeforeBaseType:
-    return "unexpectedBeforeBaseType"
-  case \QualifiedDeclNameSyntax.baseType:
-    return "baseType"
-  case \QualifiedDeclNameSyntax.unexpectedBetweenBaseTypeAndPeriod:
-    return "unexpectedBetweenBaseTypeAndPeriod"
-  case \QualifiedDeclNameSyntax.period:
-    return "period"
-  case \QualifiedDeclNameSyntax.unexpectedBetweenPeriodAndDeclName:
-    return "unexpectedBetweenPeriodAndDeclName"
-  case \QualifiedDeclNameSyntax.declName:
-    return "declName"
-  case \QualifiedDeclNameSyntax.unexpectedAfterDeclName:
-    return "unexpectedAfterDeclName"
   case \RegexLiteralExprSyntax.unexpectedBeforeOpeningPounds:
     return "unexpectedBeforeOpeningPounds"
   case \RegexLiteralExprSyntax.openingPounds:

Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

@@ -1703,7 +1703,7 @@ extension DerivativeAttributeArgumentsSyntax {
       _ unexpectedBetweenOfLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndOriginalDeclName: UnexpectedNodesSyntax? = nil,
-      originalDeclName: QualifiedDeclNameSyntax,
+      originalDeclName: some ExprSyntaxProtocol,
       _ unexpectedBetweenOriginalDeclNameAndPeriod: UnexpectedNodesSyntax? = nil,
       period: TokenSyntax? = nil,
       _ unexpectedBetweenPeriodAndAccessorKind: UnexpectedNodesSyntax? = nil,
@@ -6595,65 +6595,6 @@ extension ProtocolDeclSyntax {
   }
 }
 
-extension QualifiedDeclNameSyntax {
-  @available(*, deprecated, renamed: "unexpectedBetweenBaseTypeAndPeriod")
-  public var unexpectedBetweenBaseTypeAndDot: UnexpectedNodesSyntax? {
-    get {
-      return unexpectedBetweenBaseTypeAndPeriod
-    }
-    set {
-      unexpectedBetweenBaseTypeAndPeriod = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "period")
-  public var dot: TokenSyntax? {
-    get {
-      return period
-    }
-    set {
-      period = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "unexpectedBetweenPeriodAndDeclName")
-  public var unexpectedBetweenDotAndDeclName: UnexpectedNodesSyntax? {
-    get {
-      return unexpectedBetweenPeriodAndDeclName
-    }
-    set {
-      unexpectedBetweenPeriodAndDeclName = newValue
-    }
-  }
-  
-  @available(*, deprecated, renamed: "QualifiedDeclNameSyntax(leadingTrivia:_:baseType:_:period:_:declName:_:trailingTrivia:)")
-  @_disfavoredOverload
-  public init(
-      leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeBaseType: UnexpectedNodesSyntax? = nil,
-      baseType: (some TypeSyntaxProtocol)? = TypeSyntax?.none,
-      _ unexpectedBetweenBaseTypeAndDot: UnexpectedNodesSyntax? = nil,
-      dot: TokenSyntax? = nil,
-      _ unexpectedBetweenDotAndDeclName: UnexpectedNodesSyntax? = nil,
-      declName: DeclReferenceExprSyntax,
-      _ unexpectedAfterDeclName: UnexpectedNodesSyntax? = nil,
-      trailingTrivia: Trivia? = nil
-    
-  ) {
-    self.init(
-        leadingTrivia: leadingTrivia, 
-        unexpectedBeforeBaseType, 
-        baseType: baseType, 
-        unexpectedBetweenBaseTypeAndDot, 
-        period: dot, 
-        unexpectedBetweenDotAndDeclName, 
-        declName: declName, 
-        unexpectedAfterDeclName, 
-        trailingTrivia: trailingTrivia
-      )
-  }
-}
-
 extension RegexLiteralExprSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenOpeningPoundsAndOpeningSlash")
   public var unexpectedBetweenOpeningPoundsAndOpenSlash: UnexpectedNodesSyntax? {

Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

@@ -1765,14 +1765,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
 
-  override open func visit(_ node: QualifiedDeclNameSyntax) -> SyntaxVisitorContinueKind {
-    return visitAny(node._syntaxNode)
-  }
-  
-  override open func visitPost(_ node: QualifiedDeclNameSyntax) {
-    visitAnyPost(node._syntaxNode)
-  }
-  
   override open func visit(_ node: RegexLiteralExprSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }