Skip to content

Commit 057fd9c

Browse files
StevenWong12StevenWong12
committed
Rename DeclEffectSpecifiers to FunctionEffectSpecifiers 
1 parent fa3697d commit 057fd9c

17 files changed

+321
-321
lines changed

‎CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public let COMMON_NODES: [Node] = [
107107

108108
// funtion-effect-specifiers -> (async | reasync)? (throws | rethrows)?
109109
Node(
110-
name: "DeclEffectSpecifiers",
110+
name: "FunctionEffectSpecifiers",
111111
nameForDiagnostics: "effect specifiers",
112112
kind: "Syntax",
113113
traits: [

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ public let DECL_NODES: [Node] = [
756756
),
757757

758758
// function-signature ->
759-
// '(' parameter-list? ')' decl-effect-specifiers? return-clause?
759+
// '(' parameter-list? ')' function-effect-specifiers? return-clause?
760760
Node(
761761
name: "FunctionSignature",
762762
nameForDiagnostics: "function signature",
@@ -768,7 +768,7 @@ public let DECL_NODES: [Node] = [
768768
),
769769
Child(
770770
name: "EffectSpecifiers",
771-
kind: .node(kind: "DeclEffectSpecifiers"),
771+
kind: .node(kind: "FunctionEffectSpecifiers"),
772772
isOptional: true
773773
),
774774
Child(

‎Sources/SwiftParser/Declarations.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ extension Parser {
13921392
public mutating func parseFunctionSignature(allowOutput: Bool = true) -> RawFunctionSignatureSyntax {
13931393
let input = self.parseParameterClause(for: .functionParameters)
13941394

1395-
var effectSpecifiers = self.parseDeclEffectSpecifiers()
1395+
var effectSpecifiers = self.parseFunctionEffectSpecifiers()
13961396

13971397
var output: RawReturnClauseSyntax?
13981398

@@ -1456,7 +1456,7 @@ extension Parser {
14561456

14571457
let indices = self.parseParameterClause(for: .indices)
14581458

1459-
var misplacedEffectSpecifiers: RawDeclEffectSpecifiersSyntax?
1459+
var misplacedEffectSpecifiers: RawFunctionEffectSpecifiersSyntax?
14601460
let result = self.parseFunctionReturnClause(effectSpecifiers: &misplacedEffectSpecifiers, allowNamedOpaqueResultType: true)
14611461

14621462
// Parse a 'where' clause if present.

‎Sources/SwiftParser/Specifiers.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ extension RawEffectSpecifiersTrait {
173173
}
174174
}
175175

176-
extension RawDeclEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
176+
extension RawFunctionEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
177177
enum MisspelledAsyncSpecifiers: TokenSpecSet {
178178
case await
179179

@@ -503,8 +503,8 @@ extension Parser {
503503
return parseEffectSpecifiers(RawTypeEffectSpecifiersSyntax.self)
504504
}
505505

506-
mutating func parseDeclEffectSpecifiers() -> RawDeclEffectSpecifiersSyntax? {
507-
return parseEffectSpecifiers(RawDeclEffectSpecifiersSyntax.self)
506+
mutating func parseFunctionEffectSpecifiers() -> RawFunctionEffectSpecifiersSyntax? {
507+
return parseEffectSpecifiers(RawFunctionEffectSpecifiersSyntax.self)
508508
}
509509

510510
mutating func parseAccessorEffectSpecifiers() -> RawAccessorEffectSpecifiersSyntax? {

‎Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
541541
return .visitChildren
542542
}
543543

544-
public override func visit(_ node: DeclEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
544+
public override func visit(_ node: FunctionEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
545545
return handleEffectSpecifiers(node)
546546
}
547547

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
295295
- <doc:SwiftSyntax/ConformanceRequirementSyntax>
296296
- <doc:SwiftSyntax/ConventionAttributeArgumentsSyntax>
297297
- <doc:SwiftSyntax/ConventionWitnessMethodAttributeArgumentsSyntax>
298-
- <doc:SwiftSyntax/DeclEffectSpecifiersSyntax>
299298
- <doc:SwiftSyntax/DeclModifierDetailSyntax>
300299
- <doc:SwiftSyntax/DeclNameArgumentsSyntax>
301300
- <doc:SwiftSyntax/DeclNameSyntax>
@@ -306,6 +305,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
306305
- <doc:SwiftSyntax/DynamicReplacementArgumentsSyntax>
307306
- <doc:SwiftSyntax/ExposeAttributeArgumentsSyntax>
308307
- <doc:SwiftSyntax/ExpressionSegmentSyntax>
308+
- <doc:SwiftSyntax/FunctionEffectSpecifiersSyntax>
309309
- <doc:SwiftSyntax/FunctionSignatureSyntax>
310310
- <doc:SwiftSyntax/GenericArgumentClauseSyntax>
311311
- <doc:SwiftSyntax/GenericParameterClauseSyntax>

‎Sources/SwiftSyntax/generated/Misc.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ extension Syntax {
7878
.node(ContinueStmtSyntax.self),
7979
.node(ConventionAttributeArgumentsSyntax.self),
8080
.node(ConventionWitnessMethodAttributeArgumentsSyntax.self),
81-
.node(DeclEffectSpecifiersSyntax.self),
8281
.node(DeclModifierDetailSyntax.self),
8382
.node(DeclModifierSyntax.self),
8483
.node(DeclNameArgumentListSyntax.self),
@@ -124,6 +123,7 @@ extension Syntax {
124123
.node(ForgetStmtSyntax.self),
125124
.node(FunctionCallExprSyntax.self),
126125
.node(FunctionDeclSyntax.self),
126+
.node(FunctionEffectSpecifiersSyntax.self),
127127
.node(FunctionParameterListSyntax.self),
128128
.node(FunctionParameterSyntax.self),
129129
.node(FunctionSignatureSyntax.self),
@@ -411,8 +411,6 @@ extension SyntaxKind {
411411
return ConventionAttributeArgumentsSyntax.self
412412
case .conventionWitnessMethodAttributeArguments:
413413
return ConventionWitnessMethodAttributeArgumentsSyntax.self
414-
case .declEffectSpecifiers:
415-
return DeclEffectSpecifiersSyntax.self
416414
case .declModifierDetail:
417415
return DeclModifierDetailSyntax.self
418416
case .declModifier:
@@ -503,6 +501,8 @@ extension SyntaxKind {
503501
return FunctionCallExprSyntax.self
504502
case .functionDecl:
505503
return FunctionDeclSyntax.self
504+
case .functionEffectSpecifiers:
505+
return FunctionEffectSpecifiersSyntax.self
506506
case .functionParameterList:
507507
return FunctionParameterListSyntax.self
508508
case .functionParameter:
@@ -942,8 +942,6 @@ extension SyntaxKind {
942942
return "@convention(...) arguments"
943943
case .conventionWitnessMethodAttributeArguments:
944944
return "@convention(...) arguments for witness methods"
945-
case .declEffectSpecifiers:
946-
return "effect specifiers"
947945
case .declModifierDetail:
948946
return nil
949947
case .declModifier:
@@ -1034,6 +1032,8 @@ extension SyntaxKind {
10341032
return "function call"
10351033
case .functionDecl:
10361034
return "function"
1035+
case .functionEffectSpecifiers:
1036+
return "effect specifiers"
10371037
case .functionParameterList:
10381038
return "parameter list"
10391039
case .functionParameter:

‎Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -549,14 +549,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
549549
visitAnyPost(node._syntaxNode)
550550
}
551551

552-
override open func visit(_ node: DeclEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
553-
return visitAny(node._syntaxNode)
554-
}
555-
556-
override open func visitPost(_ node: DeclEffectSpecifiersSyntax) {
557-
visitAnyPost(node._syntaxNode)
558-
}
559-
560552
override open func visit(_ node: DeclModifierDetailSyntax) -> SyntaxVisitorContinueKind {
561553
return visitAny(node._syntaxNode)
562554
}
@@ -917,6 +909,14 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
917909
visitAnyPost(node._syntaxNode)
918910
}
919911

912+
override open func visit(_ node: FunctionEffectSpecifiersSyntax) -> SyntaxVisitorContinueKind {
913+
return visitAny(node._syntaxNode)
914+
}
915+
916+
override open func visitPost(_ node: FunctionEffectSpecifiersSyntax) {
917+
visitAnyPost(node._syntaxNode)
918+
}
919+
920920
override open func visit(_ node: FunctionParameterListSyntax) -> SyntaxVisitorContinueKind {
921921
return visitAny(node._syntaxNode)
922922
}

‎Sources/SwiftSyntax/generated/SyntaxEnum.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public enum SyntaxEnum {
7878
case continueStmt(ContinueStmtSyntax)
7979
case conventionAttributeArguments(ConventionAttributeArgumentsSyntax)
8080
case conventionWitnessMethodAttributeArguments(ConventionWitnessMethodAttributeArgumentsSyntax)
81-
case declEffectSpecifiers(DeclEffectSpecifiersSyntax)
8281
case declModifierDetail(DeclModifierDetailSyntax)
8382
case declModifier(DeclModifierSyntax)
8483
case declNameArgumentList(DeclNameArgumentListSyntax)
@@ -124,6 +123,7 @@ public enum SyntaxEnum {
124123
case forgetStmt(ForgetStmtSyntax)
125124
case functionCallExpr(FunctionCallExprSyntax)
126125
case functionDecl(FunctionDeclSyntax)
126+
case functionEffectSpecifiers(FunctionEffectSpecifiersSyntax)
127127
case functionParameterList(FunctionParameterListSyntax)
128128
case functionParameter(FunctionParameterSyntax)
129129
case functionSignature(FunctionSignatureSyntax)
@@ -410,8 +410,6 @@ public extension Syntax {
410410
return .conventionAttributeArguments(ConventionAttributeArgumentsSyntax(self)!)
411411
case .conventionWitnessMethodAttributeArguments:
412412
return .conventionWitnessMethodAttributeArguments(ConventionWitnessMethodAttributeArgumentsSyntax(self)!)
413-
case .declEffectSpecifiers:
414-
return .declEffectSpecifiers(DeclEffectSpecifiersSyntax(self)!)
415413
case .declModifierDetail:
416414
return .declModifierDetail(DeclModifierDetailSyntax(self)!)
417415
case .declModifier:
@@ -502,6 +500,8 @@ public extension Syntax {
502500
return .functionCallExpr(FunctionCallExprSyntax(self)!)
503501
case .functionDecl:
504502
return .functionDecl(FunctionDeclSyntax(self)!)
503+
case .functionEffectSpecifiers:
504+
return .functionEffectSpecifiers(FunctionEffectSpecifiersSyntax(self)!)
505505
case .functionParameterList:
506506
return .functionParameterList(FunctionParameterListSyntax(self)!)
507507
case .functionParameter:

‎Sources/SwiftSyntax/generated/SyntaxKind.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public enum SyntaxKind {
7878
case continueStmt
7979
case conventionAttributeArguments
8080
case conventionWitnessMethodAttributeArguments
81-
case declEffectSpecifiers
8281
case declModifierDetail
8382
case declModifier
8483
case declNameArgumentList
@@ -124,6 +123,7 @@ public enum SyntaxKind {
124123
case forgetStmt
125124
case functionCallExpr
126125
case functionDecl
126+
case functionEffectSpecifiers
127127
case functionParameterList
128128
case functionParameter
129129
case functionSignature

‎Sources/SwiftSyntax/generated/SyntaxRewriter.swift

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -459,13 +459,6 @@ open class SyntaxRewriter {
459459
return Syntax(visitChildren(node)).cast(ConventionWitnessMethodAttributeArgumentsSyntax.self)
460460
}
461461

462-
/// Visit a `DeclEffectSpecifiersSyntax`.
463-
/// - Parameter node: the node that is being visited
464-
/// - Returns: the rewritten node
465-
open func visit(_ node: DeclEffectSpecifiersSyntax) -> DeclEffectSpecifiersSyntax {
466-
return Syntax(visitChildren(node)).cast(DeclEffectSpecifiersSyntax.self)
467-
}
468-
469462
/// Visit a `DeclModifierDetailSyntax`.
470463
/// - Parameter node: the node that is being visited
471464
/// - Returns: the rewritten node
@@ -781,6 +774,13 @@ open class SyntaxRewriter {
781774
return DeclSyntax(visitChildren(node))
782775
}
783776

777+
/// Visit a `FunctionEffectSpecifiersSyntax`.
778+
/// - Parameter node: the node that is being visited
779+
/// - Returns: the rewritten node
780+
open func visit(_ node: FunctionEffectSpecifiersSyntax) -> FunctionEffectSpecifiersSyntax {
781+
return Syntax(visitChildren(node)).cast(FunctionEffectSpecifiersSyntax.self)
782+
}
783+
784784
/// Visit a `FunctionParameterListSyntax`.
785785
/// - Parameter node: the node that is being visited
786786
/// - Returns: the rewritten node
@@ -2801,20 +2801,6 @@ open class SyntaxRewriter {
28012801
return Syntax(visit(node))
28022802
}
28032803

2804-
/// Implementation detail of visit(_:). Do not call directly.
2805-
private func visitImplDeclEffectSpecifiersSyntax(_ data: SyntaxData) -> Syntax {
2806-
let node = DeclEffectSpecifiersSyntax(data)
2807-
// Accessing _syntaxNode directly is faster than calling Syntax(node)
2808-
visitPre(node._syntaxNode)
2809-
defer {
2810-
visitPost(node._syntaxNode)
2811-
}
2812-
if let newNode = visitAny(node._syntaxNode) {
2813-
return newNode
2814-
}
2815-
return Syntax(visit(node))
2816-
}
2817-
28182804
/// Implementation detail of visit(_:). Do not call directly.
28192805
private func visitImplDeclModifierDetailSyntax(_ data: SyntaxData) -> Syntax {
28202806
let node = DeclModifierDetailSyntax(data)
@@ -3445,6 +3431,20 @@ open class SyntaxRewriter {
34453431
return Syntax(visit(node))
34463432
}
34473433

3434+
/// Implementation detail of visit(_:). Do not call directly.
3435+
private func visitImplFunctionEffectSpecifiersSyntax(_ data: SyntaxData) -> Syntax {
3436+
let node = FunctionEffectSpecifiersSyntax(data)
3437+
// Accessing _syntaxNode directly is faster than calling Syntax(node)
3438+
visitPre(node._syntaxNode)
3439+
defer {
3440+
visitPost(node._syntaxNode)
3441+
}
3442+
if let newNode = visitAny(node._syntaxNode) {
3443+
return newNode
3444+
}
3445+
return Syntax(visit(node))
3446+
}
3447+
34483448
/// Implementation detail of visit(_:). Do not call directly.
34493449
private func visitImplFunctionParameterListSyntax(_ data: SyntaxData) -> Syntax {
34503450
let node = FunctionParameterListSyntax(data)
@@ -5767,8 +5767,6 @@ open class SyntaxRewriter {
57675767
return visitImplConventionAttributeArgumentsSyntax
57685768
case .conventionWitnessMethodAttributeArguments:
57695769
return visitImplConventionWitnessMethodAttributeArgumentsSyntax
5770-
case .declEffectSpecifiers:
5771-
return visitImplDeclEffectSpecifiersSyntax
57725770
case .declModifierDetail:
57735771
return visitImplDeclModifierDetailSyntax
57745772
case .declModifier:
@@ -5859,6 +5857,8 @@ open class SyntaxRewriter {
58595857
return visitImplFunctionCallExprSyntax
58605858
case .functionDecl:
58615859
return visitImplFunctionDeclSyntax
5860+
case .functionEffectSpecifiers:
5861+
return visitImplFunctionEffectSpecifiersSyntax
58625862
case .functionParameterList:
58635863
return visitImplFunctionParameterListSyntax
58645864
case .functionParameter:
@@ -6301,8 +6301,6 @@ open class SyntaxRewriter {
63016301
return visitImplConventionAttributeArgumentsSyntax(data)
63026302
case .conventionWitnessMethodAttributeArguments:
63036303
return visitImplConventionWitnessMethodAttributeArgumentsSyntax(data)
6304-
case .declEffectSpecifiers:
6305-
return visitImplDeclEffectSpecifiersSyntax(data)
63066304
case .declModifierDetail:
63076305
return visitImplDeclModifierDetailSyntax(data)
63086306
case .declModifier:
@@ -6393,6 +6391,8 @@ open class SyntaxRewriter {
63936391
return visitImplFunctionCallExprSyntax(data)
63946392
case .functionDecl:
63956393
return visitImplFunctionDeclSyntax(data)
6394+
case .functionEffectSpecifiers:
6395+
return visitImplFunctionEffectSpecifiersSyntax(data)
63966396
case .functionParameterList:
63976397
return visitImplFunctionParameterListSyntax(data)
63986398
case .functionParameter:

‎Sources/SwiftSyntax/generated/SyntaxTraits.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,6 @@ extension CodeBlockSyntax: BracedSyntax, WithStatementsSyntax {}
483483

484484
extension ConditionElementSyntax: WithTrailingCommaSyntax {}
485485

486-
extension DeclEffectSpecifiersSyntax: EffectSpecifiersSyntax {}
487-
488486
extension DeclModifierDetailSyntax: ParenthesizedSyntax {}
489487

490488
extension DeclNameArgumentsSyntax: ParenthesizedSyntax {}
@@ -515,6 +513,8 @@ extension ForInStmtSyntax: WithCodeBlockSyntax {}
515513

516514
extension FunctionDeclSyntax: IdentifiedDeclSyntax, AttributedSyntax {}
517515

516+
extension FunctionEffectSpecifiersSyntax: EffectSpecifiersSyntax {}
517+
518518
extension FunctionParameterSyntax: WithTrailingCommaSyntax, AttributedSyntax {}
519519

520520
extension FunctionTypeSyntax: ParenthesizedSyntax {}

0 commit comments

Comments
 (0)