Rename DeclEffectSpecifiers to FunctionEffectSpecifiers

StevenWong12 · StevenWong12 · commit 057fd9c35b64 · 2023-04-10T16:42:46.000+08:00
diff --git a/CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift b/CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift
@@ -107,7 +107,7 @@ public let COMMON_NODES: [Node] = [
 
   // funtion-effect-specifiers -> (async | reasync)? (throws | rethrows)?
   Node(
-    name: "DeclEffectSpecifiers",
+    name: "FunctionEffectSpecifiers",
     nameForDiagnostics: "effect specifiers",
     kind: "Syntax",
     traits: [
diff --git a/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift b/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
@@ -756,7 +756,7 @@ public let DECL_NODES: [Node] = [
   ),
 
   // function-signature ->
-  //   '(' parameter-list? ')' decl-effect-specifiers? return-clause?
+  //   '(' parameter-list? ')' function-effect-specifiers? return-clause?
   Node(
     name: "FunctionSignature",
     nameForDiagnostics: "function signature",
@@ -768,7 +768,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "EffectSpecifiers",
-        kind: .node(kind: "DeclEffectSpecifiers"),
+        kind: .node(kind: "FunctionEffectSpecifiers"),
         isOptional: true
       ),
       Child(
diff --git a/Sources/SwiftParser/Declarations.swift b/Sources/SwiftParser/Declarations.swift
@@ -1392,7 +1392,7 @@ extension Parser {
   public mutating func parseFunctionSignature(allowOutput: Bool = true) -> RawFunctionSignatureSyntax {
     let input = self.parseParameterClause(for: .functionParameters)
 
-    var effectSpecifiers = self.parseDeclEffectSpecifiers()
+    var effectSpecifiers = self.parseFunctionEffectSpecifiers()
 
     var output: RawReturnClauseSyntax?
 
@@ -1456,7 +1456,7 @@ extension Parser {
 
     let indices = self.parseParameterClause(for: .indices)
 
-    var misplacedEffectSpecifiers: RawDeclEffectSpecifiersSyntax?
+    var misplacedEffectSpecifiers: RawFunctionEffectSpecifiersSyntax?
     let result = self.parseFunctionReturnClause(effectSpecifiers: &misplacedEffectSpecifiers, allowNamedOpaqueResultType: true)
 
     // Parse a 'where' clause if present.
diff --git a/Sources/SwiftParser/Specifiers.swift b/Sources/SwiftParser/Specifiers.swift
@@ -173,7 +173,7 @@ extension RawEffectSpecifiersTrait {
   }
 }
 
-extension RawDeclEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
+extension RawFunctionEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
   enum MisspelledAsyncSpecifiers: TokenSpecSet {
     case await
 
@@ -503,8 +503,8 @@ extension Parser {
     return parseEffectSpecifiers(RawTypeEffectSpecifiersSyntax.self)
   }
 
-  mutating func parseDeclEffectSpecifiers() -> RawDeclEffectSpecifiersSyntax? {
-    return parseEffectSpecifiers(RawDeclEffectSpecifiersSyntax.self)
+  mutating func parseFunctionEffectSpecifiers() -> RawFunctionEffectSpecifiersSyntax? {
+    return parseEffectSpecifiers(RawFunctionEffectSpecifiersSyntax.self)
   }
 
   mutating func parseAccessorEffectSpecifiers() -> RawAccessorEffectSpecifiersSyntax? {
diff --git a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
@@ -541,7 +541,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     return .visitChildren
   }
 
-  public override func visit(_ node: DeclEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
+  public override func visit(_ node: FunctionEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
     return handleEffectSpecifiers(node)
   }
 
diff --git a/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md b/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md
@@ -295,7 +295,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/ConformanceRequirementSyntax>
 - <doc:SwiftSyntax/ConventionAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/ConventionWitnessMethodAttributeArgumentsSyntax>
-- <doc:SwiftSyntax/DeclEffectSpecifiersSyntax>
 - <doc:SwiftSyntax/DeclModifierDetailSyntax>
 - <doc:SwiftSyntax/DeclNameArgumentsSyntax>
 - <doc:SwiftSyntax/DeclNameSyntax>
@@ -306,6 +305,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/DynamicReplacementArgumentsSyntax>
 - <doc:SwiftSyntax/ExposeAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/ExpressionSegmentSyntax>
+- <doc:SwiftSyntax/FunctionEffectSpecifiersSyntax>
 - <doc:SwiftSyntax/FunctionSignatureSyntax>
 - <doc:SwiftSyntax/GenericArgumentClauseSyntax>
 - <doc:SwiftSyntax/GenericParameterClauseSyntax>
diff --git a/Sources/SwiftSyntax/generated/Misc.swift b/Sources/SwiftSyntax/generated/Misc.swift
@@ -78,7 +78,6 @@ extension Syntax {
           .node(ContinueStmtSyntax.self), 
           .node(ConventionAttributeArgumentsSyntax.self), 
           .node(ConventionWitnessMethodAttributeArgumentsSyntax.self), 
-          .node(DeclEffectSpecifiersSyntax.self), 
           .node(DeclModifierDetailSyntax.self), 
           .node(DeclModifierSyntax.self), 
           .node(DeclNameArgumentListSyntax.self), 
@@ -124,6 +123,7 @@ extension Syntax {
           .node(ForgetStmtSyntax.self), 
           .node(FunctionCallExprSyntax.self), 
           .node(FunctionDeclSyntax.self), 
+          .node(FunctionEffectSpecifiersSyntax.self), 
           .node(FunctionParameterListSyntax.self), 
           .node(FunctionParameterSyntax.self), 
           .node(FunctionSignatureSyntax.self), 
@@ -411,8 +411,6 @@ extension SyntaxKind {
       return ConventionAttributeArgumentsSyntax.self
     case .conventionWitnessMethodAttributeArguments:
       return ConventionWitnessMethodAttributeArgumentsSyntax.self
-    case .declEffectSpecifiers:
-      return DeclEffectSpecifiersSyntax.self
     case .declModifierDetail:
       return DeclModifierDetailSyntax.self
     case .declModifier:
@@ -503,6 +501,8 @@ extension SyntaxKind {
       return FunctionCallExprSyntax.self
     case .functionDecl:
       return FunctionDeclSyntax.self
+    case .functionEffectSpecifiers:
+      return FunctionEffectSpecifiersSyntax.self
     case .functionParameterList:
       return FunctionParameterListSyntax.self
     case .functionParameter:
@@ -942,8 +942,6 @@ extension SyntaxKind {
       return "@convention(...) arguments"
     case .conventionWitnessMethodAttributeArguments:
       return "@convention(...) arguments for witness methods"
-    case .declEffectSpecifiers:
-      return "effect specifiers"
     case .declModifierDetail:
       return nil
     case .declModifier:
@@ -1034,6 +1032,8 @@ extension SyntaxKind {
       return "function call"
     case .functionDecl:
       return "function"
+    case .functionEffectSpecifiers:
+      return "effect specifiers"
     case .functionParameterList:
       return "parameter list"
     case .functionParameter:
diff --git a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift
@@ -549,14 +549,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
   
-  override open func visit(_ node: DeclEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
-    return visitAny(node._syntaxNode)
-  }
-  
-  override open func visitPost(_ node: DeclEffectSpecifiersSyntax) {
-    visitAnyPost(node._syntaxNode)
-  }
-  
   override open func visit(_ node: DeclModifierDetailSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }
@@ -917,6 +909,14 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
   
+  override open func visit(_ node: FunctionEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+  
+  override open func visitPost(_ node: FunctionEffectSpecifiersSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
+  
   override open func visit(_ node: FunctionParameterListSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }
diff --git a/Sources/SwiftSyntax/generated/SyntaxEnum.swift b/Sources/SwiftSyntax/generated/SyntaxEnum.swift
@@ -78,7 +78,6 @@ public enum SyntaxEnum {
   case continueStmt(ContinueStmtSyntax)
   case conventionAttributeArguments(ConventionAttributeArgumentsSyntax)
   case conventionWitnessMethodAttributeArguments(ConventionWitnessMethodAttributeArgumentsSyntax)
-  case declEffectSpecifiers(DeclEffectSpecifiersSyntax)
   case declModifierDetail(DeclModifierDetailSyntax)
   case declModifier(DeclModifierSyntax)
   case declNameArgumentList(DeclNameArgumentListSyntax)
@@ -124,6 +123,7 @@ public enum SyntaxEnum {
   case forgetStmt(ForgetStmtSyntax)
   case functionCallExpr(FunctionCallExprSyntax)
   case functionDecl(FunctionDeclSyntax)
+  case functionEffectSpecifiers(FunctionEffectSpecifiersSyntax)
   case functionParameterList(FunctionParameterListSyntax)
   case functionParameter(FunctionParameterSyntax)
   case functionSignature(FunctionSignatureSyntax)
@@ -410,8 +410,6 @@ public extension Syntax {
       return .conventionAttributeArguments(ConventionAttributeArgumentsSyntax(self)!)
     case .conventionWitnessMethodAttributeArguments:
       return .conventionWitnessMethodAttributeArguments(ConventionWitnessMethodAttributeArgumentsSyntax(self)!)
-    case .declEffectSpecifiers:
-      return .declEffectSpecifiers(DeclEffectSpecifiersSyntax(self)!)
     case .declModifierDetail:
       return .declModifierDetail(DeclModifierDetailSyntax(self)!)
     case .declModifier:
@@ -502,6 +500,8 @@ public extension Syntax {
       return .functionCallExpr(FunctionCallExprSyntax(self)!)
     case .functionDecl:
       return .functionDecl(FunctionDeclSyntax(self)!)
+    case .functionEffectSpecifiers:
+      return .functionEffectSpecifiers(FunctionEffectSpecifiersSyntax(self)!)
     case .functionParameterList:
       return .functionParameterList(FunctionParameterListSyntax(self)!)
     case .functionParameter:
diff --git a/Sources/SwiftSyntax/generated/SyntaxKind.swift b/Sources/SwiftSyntax/generated/SyntaxKind.swift
@@ -78,7 +78,6 @@ public enum SyntaxKind {
   case continueStmt
   case conventionAttributeArguments
   case conventionWitnessMethodAttributeArguments
-  case declEffectSpecifiers
   case declModifierDetail
   case declModifier
   case declNameArgumentList
@@ -124,6 +123,7 @@ public enum SyntaxKind {
   case forgetStmt
   case functionCallExpr
   case functionDecl
+  case functionEffectSpecifiers
   case functionParameterList
   case functionParameter
   case functionSignature
diff --git a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift
@@ -459,13 +459,6 @@ open class SyntaxRewriter {
     return Syntax(visitChildren(node)).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self)
   }
   
-  /// Visit a `DeclEffectSpecifiersSyntax`.
-  ///   - Parameter node: the node that is being visited
-  ///   - Returns: the rewritten node
-  open func visit(_ node: DeclEffectSpecifiersSyntax) -> DeclEffectSpecifiersSyntax {
-    return Syntax(visitChildren(node)).cast(DeclEffectSpecifiersSyntax.self)
-  }
-  
   /// Visit a `DeclModifierDetailSyntax`.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
@@ -781,6 +774,13 @@ open class SyntaxRewriter {
     return DeclSyntax(visitChildren(node))
   }
   
+  /// Visit a `FunctionEffectSpecifiersSyntax`.
+  ///   - Parameter node: the node that is being visited
+  ///   - Returns: the rewritten node
+  open func visit(_ node: FunctionEffectSpecifiersSyntax) -> FunctionEffectSpecifiersSyntax {
+    return Syntax(visitChildren(node)).cast(FunctionEffectSpecifiersSyntax.self)
+  }
+  
   /// Visit a `FunctionParameterListSyntax`.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
@@ -2801,20 +2801,6 @@ open class SyntaxRewriter {
     return Syntax(visit(node))
   }
   
-  /// Implementation detail of visit(_:). Do not call directly.
-  private func visitImplDeclEffectSpecifiersSyntax(_ data: SyntaxData) -> Syntax {
-    let node = DeclEffectSpecifiersSyntax(data)
-    // Accessing _syntaxNode directly is faster than calling Syntax(node)
-    visitPre(node._syntaxNode)
-    defer { 
-      visitPost(node._syntaxNode) 
-    }
-    if let newNode = visitAny(node._syntaxNode) { 
-      return newNode 
-    }
-    return Syntax(visit(node))
-  }
-  
   /// Implementation detail of visit(_:). Do not call directly.
   private func visitImplDeclModifierDetailSyntax(_ data: SyntaxData) -> Syntax {
     let node = DeclModifierDetailSyntax(data)
@@ -3445,6 +3431,20 @@ open class SyntaxRewriter {
     return Syntax(visit(node))
   }
   
+  /// Implementation detail of visit(_:). Do not call directly.
+  private func visitImplFunctionEffectSpecifiersSyntax(_ data: SyntaxData) -> Syntax {
+    let node = FunctionEffectSpecifiersSyntax(data)
+    // Accessing _syntaxNode directly is faster than calling Syntax(node)
+    visitPre(node._syntaxNode)
+    defer { 
+      visitPost(node._syntaxNode) 
+    }
+    if let newNode = visitAny(node._syntaxNode) { 
+      return newNode 
+    }
+    return Syntax(visit(node))
+  }
+  
   /// Implementation detail of visit(_:). Do not call directly.
   private func visitImplFunctionParameterListSyntax(_ data: SyntaxData) -> Syntax {
     let node = FunctionParameterListSyntax(data)
@@ -5767,8 +5767,6 @@ open class SyntaxRewriter {
       return visitImplConventionAttributeArgumentsSyntax
     case .conventionWitnessMethodAttributeArguments:
       return visitImplConventionWitnessMethodAttributeArgumentsSyntax
-    case .declEffectSpecifiers:
-      return visitImplDeclEffectSpecifiersSyntax
     case .declModifierDetail:
       return visitImplDeclModifierDetailSyntax
     case .declModifier:
@@ -5859,6 +5857,8 @@ open class SyntaxRewriter {
       return visitImplFunctionCallExprSyntax
     case .functionDecl:
       return visitImplFunctionDeclSyntax
+    case .functionEffectSpecifiers:
+      return visitImplFunctionEffectSpecifiersSyntax
     case .functionParameterList:
       return visitImplFunctionParameterListSyntax
     case .functionParameter:
@@ -6301,8 +6301,6 @@ open class SyntaxRewriter {
       return visitImplConventionAttributeArgumentsSyntax(data)
     case .conventionWitnessMethodAttributeArguments:
       return visitImplConventionWitnessMethodAttributeArgumentsSyntax(data)
-    case .declEffectSpecifiers:
-      return visitImplDeclEffectSpecifiersSyntax(data)
     case .declModifierDetail:
       return visitImplDeclModifierDetailSyntax(data)
     case .declModifier:
@@ -6393,6 +6391,8 @@ open class SyntaxRewriter {
       return visitImplFunctionCallExprSyntax(data)
     case .functionDecl:
       return visitImplFunctionDeclSyntax(data)
+    case .functionEffectSpecifiers:
+      return visitImplFunctionEffectSpecifiersSyntax(data)
     case .functionParameterList:
       return visitImplFunctionParameterListSyntax(data)
     case .functionParameter:
diff --git a/Sources/SwiftSyntax/generated/SyntaxTraits.swift b/Sources/SwiftSyntax/generated/SyntaxTraits.swift
@@ -483,8 +483,6 @@ extension CodeBlockSyntax: BracedSyntax, WithStatementsSyntax {}
 
 extension ConditionElementSyntax: WithTrailingCommaSyntax {}
 
-extension DeclEffectSpecifiersSyntax: EffectSpecifiersSyntax {}
-
 extension DeclModifierDetailSyntax: ParenthesizedSyntax {}
 
 extension DeclNameArgumentsSyntax: ParenthesizedSyntax {}
@@ -515,6 +513,8 @@ extension ForInStmtSyntax: WithCodeBlockSyntax {}
 
 extension FunctionDeclSyntax: IdentifiedDeclSyntax, AttributedSyntax {}
 
+extension FunctionEffectSpecifiersSyntax: EffectSpecifiersSyntax {}
+
 extension FunctionParameterSyntax: WithTrailingCommaSyntax, AttributedSyntax {}
 
 extension FunctionTypeSyntax: ParenthesizedSyntax {}
diff --git a/Sources/SwiftSyntax/generated/SyntaxTransform.swift b/Sources/SwiftSyntax/generated/SyntaxTransform.swift
diff --git a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ extension RawEffectSpecifiersTrait {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`-extension RawDeclEffectSpecifiersSyntax: RawEffectSpecifiersTrait {`
	`176`	`+extension RawFunctionEffectSpecifiersSyntax: RawEffectSpecifiersTrait {`
`177`	`177`	`enum MisspelledAsyncSpecifiers: TokenSpecSet {`
`178`	`178`	`case await`
`179`	`179`
`@@ -503,8 +503,8 @@ extension Parser {`
`503`	`503`	`return parseEffectSpecifiers(RawTypeEffectSpecifiersSyntax.self)`
`504`	`504`	`}`
`505`	`505`
`506`		`- mutating func parseDeclEffectSpecifiers() -> RawDeclEffectSpecifiersSyntax? {`
`507`		`- return parseEffectSpecifiers(RawDeclEffectSpecifiersSyntax.self)`
	`506`	`+ mutating func parseFunctionEffectSpecifiers() -> RawFunctionEffectSpecifiersSyntax? {`
	`507`	`+ return parseEffectSpecifiers(RawFunctionEffectSpecifiersSyntax.self)`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`mutating func parseAccessorEffectSpecifiers() -> RawAccessorEffectSpecifiersSyntax? {`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {`
`541`	`541`	`return .visitChildren`
`542`	`542`	`}`
`543`	`543`
`544`		`- public override func visit(_ node: DeclEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {`
	`544`	`+ public override func visit(_ node: FunctionEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {`
`545`	`545`	`return handleEffectSpecifiers(node)`
`546`	`546`	`}`
`547`	`547`