Skip to content

Commit 419ee26

Browse files
tshortlitshortli
authored
Merge pull request #1307 from tshortli/se0376-rename-backdeploy-5.8
[5.8][SE-0376] Rename @_backDeploy(before:) to @backDeployed(before:)
2 parents dc1a32f + 3e013b9 commit 419ee26

File tree

20 files changed

+160
-107
lines changed

20 files changed

+160
-107
lines changed

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeKinds.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,8 +1289,8 @@ public let DECL_ATTR_KINDS: [Attribute] = [
12891289
"APIStableToRemove",
12901290
code: 128,
12911291
swiftName: "exclusivity"),
1292-
DeclAttribute(name: "_backDeploy",
1293-
className: "BackDeploy",
1292+
DeclAttribute(name: "backDeployed",
1293+
className: "BackDeployed",
12941294
options:
12951295
"OnAbstractFunction",
12961296
"OnAccessor",
@@ -1304,6 +1304,9 @@ public let DECL_ATTR_KINDS: [Attribute] = [
13041304
"APIStableToAdd",
13051305
"APIBreakingToRemove",
13061306
code: 129,
1307+
swiftName: "backDeployed"),
1308+
DeclAttributeAlias(name: "_backDeploy",
1309+
className: "BackDeployed",
13071310
swiftName: "_backDeploy"),
13081311
SimpleDeclAttribute(name: "_moveOnly",
13091312
className: "MoveOnly",

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public let ATTRIBUTE_NODES: [Node] = [
107107
kind: "DerivativeRegistrationAttributeArguments"),
108108
Child(name: "NamedAttributeString",
109109
kind: "NamedAttributeStringArgument"),
110-
Child(name: "BackDeployArguments",
111-
kind: "BackDeployAttributeSpecList"),
110+
Child(name: "BackDeployedArguments",
111+
kind: "BackDeployedAttributeSpecList"),
112112
Child(name: "ConventionArguments",
113113
kind: "ConventionAttributeArguments"),
114114
Child(name: "ConventionWitnessMethodArguments",
@@ -550,9 +550,9 @@ public let ATTRIBUTE_NODES: [Node] = [
550550
isOptional: true)
551551
]),
552552

553-
Node(name: "BackDeployAttributeSpecList",
554-
nameForDiagnostics: "'@_backDeploy' arguments",
555-
description: "A collection of arguments for the `@_backDeploy` attribute",
553+
Node(name: "BackDeployedAttributeSpecList",
554+
nameForDiagnostics: "'@backDeployed' arguments",
555+
description: "A collection of arguments for the `@backDeployed` attribute",
556556
kind: "Syntax",
557557
children: [
558558
Child(name: "BeforeLabel",

‎Sources/SwiftParser/generated/DeclarationAttribute.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ extension Parser {
208208

209209
case exclusivity = "exclusivity"
210210

211+
case backDeployed = "backDeployed"
212+
211213
case _backDeploy = "_backDeploy"
212214

213215
case _moveOnly = "_moveOnly"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
358358
- <doc:SwiftSyntax/DerivativeRegistrationAttributeArgumentsSyntax>
359359
- <doc:SwiftSyntax/QualifiedDeclNameSyntax>
360360
- <doc:SwiftSyntax/FunctionDeclNameSyntax>
361-
- <doc:SwiftSyntax/BackDeployAttributeSpecListSyntax>
361+
- <doc:SwiftSyntax/BackDeployedAttributeSpecListSyntax>
362362
- <doc:SwiftSyntax/BackDeployVersionListSyntax>
363363
- <doc:SwiftSyntax/BackDeployVersionArgumentSyntax>
364364
- <doc:SwiftSyntax/OpaqueReturnTypeOfAttributeArgumentsSyntax>

‎Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10540,14 +10540,14 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
1054010540
case `differentiableArguments`(RawDifferentiableAttributeArgumentsSyntax)
1054110541
case `derivativeRegistrationArguments`(RawDerivativeRegistrationAttributeArgumentsSyntax)
1054210542
case `namedAttributeString`(RawNamedAttributeStringArgumentSyntax)
10543-
case `backDeployArguments`(RawBackDeployAttributeSpecListSyntax)
10543+
case `backDeployedArguments`(RawBackDeployedAttributeSpecListSyntax)
1054410544
case `conventionArguments`(RawConventionAttributeArgumentsSyntax)
1054510545
case `conventionWitnessMethodArguments`(RawConventionWitnessMethodAttributeArgumentsSyntax)
1054610546
case `opaqueReturnTypeOfAttributeArguments`(RawOpaqueReturnTypeOfAttributeArgumentsSyntax)
1054710547
case `tokenList`(RawTokenListSyntax)
1054810548

1054910549
public static func isKindOf(_ raw: RawSyntax) -> Bool {
10550-
return RawTokenSyntax.isKindOf(raw) || RawStringLiteralExprSyntax.isKindOf(raw) || RawAvailabilitySpecListSyntax.isKindOf(raw) || RawSpecializeAttributeSpecListSyntax.isKindOf(raw) || RawObjCSelectorSyntax.isKindOf(raw) || RawImplementsAttributeArgumentsSyntax.isKindOf(raw) || RawDifferentiableAttributeArgumentsSyntax.isKindOf(raw) || RawDerivativeRegistrationAttributeArgumentsSyntax.isKindOf(raw) || RawNamedAttributeStringArgumentSyntax.isKindOf(raw) || RawBackDeployAttributeSpecListSyntax.isKindOf(raw) || RawConventionAttributeArgumentsSyntax.isKindOf(raw) || RawConventionWitnessMethodAttributeArgumentsSyntax.isKindOf(raw) || RawOpaqueReturnTypeOfAttributeArgumentsSyntax.isKindOf(raw) || RawTokenListSyntax.isKindOf(raw)
10550+
return RawTokenSyntax.isKindOf(raw) || RawStringLiteralExprSyntax.isKindOf(raw) || RawAvailabilitySpecListSyntax.isKindOf(raw) || RawSpecializeAttributeSpecListSyntax.isKindOf(raw) || RawObjCSelectorSyntax.isKindOf(raw) || RawImplementsAttributeArgumentsSyntax.isKindOf(raw) || RawDifferentiableAttributeArgumentsSyntax.isKindOf(raw) || RawDerivativeRegistrationAttributeArgumentsSyntax.isKindOf(raw) || RawNamedAttributeStringArgumentSyntax.isKindOf(raw) || RawBackDeployedAttributeSpecListSyntax.isKindOf(raw) || RawConventionAttributeArgumentsSyntax.isKindOf(raw) || RawConventionWitnessMethodAttributeArgumentsSyntax.isKindOf(raw) || RawOpaqueReturnTypeOfAttributeArgumentsSyntax.isKindOf(raw) || RawTokenListSyntax.isKindOf(raw)
1055110551
}
1055210552

1055310553
public var raw: RawSyntax {
@@ -10561,7 +10561,7 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
1056110561
case .differentiableArguments(let node): return node.raw
1056210562
case .derivativeRegistrationArguments(let node): return node.raw
1056310563
case .namedAttributeString(let node): return node.raw
10564-
case .backDeployArguments(let node): return node.raw
10564+
case .backDeployedArguments(let node): return node.raw
1056510565
case .conventionArguments(let node): return node.raw
1056610566
case .conventionWitnessMethodArguments(let node): return node.raw
1056710567
case .opaqueReturnTypeOfAttributeArguments(let node): return node.raw
@@ -10606,8 +10606,8 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
1060610606
self = .namedAttributeString(node)
1060710607
return
1060810608
}
10609-
if let node = RawBackDeployAttributeSpecListSyntax(other) {
10610-
self = .backDeployArguments(node)
10609+
if let node = RawBackDeployedAttributeSpecListSyntax(other) {
10610+
self = .backDeployedArguments(node)
1061110611
return
1061210612
}
1061310613
if let node = RawConventionAttributeArgumentsSyntax(other) {
@@ -12073,15 +12073,15 @@ public struct RawFunctionDeclNameSyntax: RawSyntaxNodeProtocol {
1207312073
}
1207412074

1207512075
@_spi(RawSyntax)
12076-
public struct RawBackDeployAttributeSpecListSyntax: RawSyntaxNodeProtocol {
12076+
public struct RawBackDeployedAttributeSpecListSyntax: RawSyntaxNodeProtocol {
1207712077

1207812078
@_spi(RawSyntax)
1207912079
public var layoutView: RawSyntaxLayoutView {
1208012080
return raw.layoutView!
1208112081
}
1208212082

1208312083
public static func isKindOf(_ raw: RawSyntax) -> Bool {
12084-
return raw.kind == .backDeployAttributeSpecList
12084+
return raw.kind == .backDeployedAttributeSpecList
1208512085
}
1208612086

1208712087
public var raw: RawSyntax
@@ -12106,7 +12106,7 @@ public struct RawBackDeployAttributeSpecListSyntax: RawSyntaxNodeProtocol {
1210612106
arena: __shared SyntaxArena
1210712107
) {
1210812108
let raw = RawSyntax.makeLayout(
12109-
kind: .backDeployAttributeSpecList, uninitializedCount: 7, arena: arena) { layout in
12109+
kind: .backDeployedAttributeSpecList, uninitializedCount: 7, arena: arena) { layout in
1211012110
layout.initialize(repeating: nil)
1211112111
layout[0] = unexpectedBeforeBeforeLabel?.raw
1211212112
layout[1] = beforeLabel.raw

‎Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
17811781
assertNoError(kind, 3, verify(layout[3], as: RawDeclNameArgumentsSyntax?.self))
17821782
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
17831783
break
1784-
case .backDeployAttributeSpecList:
1784+
case .backDeployedAttributeSpecList:
17851785
assert(layout.count == 7)
17861786
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
17871787
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))

‎Sources/SwiftSyntax/generated/Misc.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ extension Syntax {
4646
.node(AvailabilitySpecListSyntax.self),
4747
.node(AvailabilityVersionRestrictionSyntax.self),
4848
.node(AwaitExprSyntax.self),
49-
.node(BackDeployAttributeSpecListSyntax.self),
5049
.node(BackDeployVersionArgumentSyntax.self),
5150
.node(BackDeployVersionListSyntax.self),
51+
.node(BackDeployedAttributeSpecListSyntax.self),
5252
.node(BinaryOperatorExprSyntax.self),
5353
.node(BooleanLiteralExprSyntax.self),
5454
.node(BreakStmtSyntax.self),
@@ -344,12 +344,12 @@ extension SyntaxKind {
344344
return AvailabilityVersionRestrictionSyntax.self
345345
case .awaitExpr:
346346
return AwaitExprSyntax.self
347-
case .backDeployAttributeSpecList:
348-
return BackDeployAttributeSpecListSyntax.self
349347
case .backDeployVersionArgument:
350348
return BackDeployVersionArgumentSyntax.self
351349
case .backDeployVersionList:
352350
return BackDeployVersionListSyntax.self
351+
case .backDeployedAttributeSpecList:
352+
return BackDeployedAttributeSpecListSyntax.self
353353
case .binaryOperatorExpr:
354354
return BinaryOperatorExprSyntax.self
355355
case .booleanLiteralExpr:
@@ -877,12 +877,12 @@ extension SyntaxKind {
877877
return "'@available' argument"
878878
case .awaitExpr:
879879
return "'await' expression"
880-
case .backDeployAttributeSpecList:
881-
return "'@_backDeploy' arguments"
882880
case .backDeployVersionArgument:
883881
return "version"
884882
case .backDeployVersionList:
885883
return "version list"
884+
case .backDeployedAttributeSpecList:
885+
return "'@backDeployed' arguments"
886886
case .binaryOperatorExpr:
887887
return nil
888888
case .booleanLiteralExpr:

‎Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,27 +273,27 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
273273
visitAnyPost(node._syntaxNode)
274274
}
275275

276-
override open func visit(_ node: BackDeployAttributeSpecListSyntax) -> SyntaxVisitorContinueKind {
276+
override open func visit(_ node: BackDeployVersionArgumentSyntax) -> SyntaxVisitorContinueKind {
277277
return visitAny(node._syntaxNode)
278278
}
279279

280-
override open func visitPost(_ node: BackDeployAttributeSpecListSyntax) {
280+
override open func visitPost(_ node: BackDeployVersionArgumentSyntax) {
281281
visitAnyPost(node._syntaxNode)
282282
}
283283

284-
override open func visit(_ node: BackDeployVersionArgumentSyntax) -> SyntaxVisitorContinueKind {
284+
override open func visit(_ node: BackDeployVersionListSyntax) -> SyntaxVisitorContinueKind {
285285
return visitAny(node._syntaxNode)
286286
}
287287

288-
override open func visitPost(_ node: BackDeployVersionArgumentSyntax) {
288+
override open func visitPost(_ node: BackDeployVersionListSyntax) {
289289
visitAnyPost(node._syntaxNode)
290290
}
291291

292-
override open func visit(_ node: BackDeployVersionListSyntax) -> SyntaxVisitorContinueKind {
292+
override open func visit(_ node: BackDeployedAttributeSpecListSyntax) -> SyntaxVisitorContinueKind {
293293
return visitAny(node._syntaxNode)
294294
}
295295

296-
override open func visitPost(_ node: BackDeployVersionListSyntax) {
296+
override open func visitPost(_ node: BackDeployedAttributeSpecListSyntax) {
297297
visitAnyPost(node._syntaxNode)
298298
}
299299

‎Sources/SwiftSyntax/generated/SyntaxEnum.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public enum SyntaxEnum {
7272

7373
case awaitExpr(AwaitExprSyntax)
7474

75-
case backDeployAttributeSpecList(BackDeployAttributeSpecListSyntax)
76-
7775
case backDeployVersionArgument(BackDeployVersionArgumentSyntax)
7876

7977
case backDeployVersionList(BackDeployVersionListSyntax)
8078

79+
case backDeployedAttributeSpecList(BackDeployedAttributeSpecListSyntax)
80+
8181
case binaryOperatorExpr(BinaryOperatorExprSyntax)
8282

8383
case booleanLiteralExpr(BooleanLiteralExprSyntax)
@@ -605,12 +605,12 @@ public extension Syntax {
605605
return .availabilityVersionRestriction(AvailabilityVersionRestrictionSyntax(self)!)
606606
case .awaitExpr:
607607
return .awaitExpr(AwaitExprSyntax(self)!)
608-
case .backDeployAttributeSpecList:
609-
return .backDeployAttributeSpecList(BackDeployAttributeSpecListSyntax(self)!)
610608
case .backDeployVersionArgument:
611609
return .backDeployVersionArgument(BackDeployVersionArgumentSyntax(self)!)
612610
case .backDeployVersionList:
613611
return .backDeployVersionList(BackDeployVersionListSyntax(self)!)
612+
case .backDeployedAttributeSpecList:
613+
return .backDeployedAttributeSpecList(BackDeployedAttributeSpecListSyntax(self)!)
614614
case .binaryOperatorExpr:
615615
return .binaryOperatorExpr(BinaryOperatorExprSyntax(self)!)
616616
case .booleanLiteralExpr:

‎Sources/SwiftSyntax/generated/SyntaxKind.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public enum SyntaxKind {
7272

7373
case awaitExpr
7474

75-
case backDeployAttributeSpecList
76-
7775
case backDeployVersionArgument
7876

7977
case backDeployVersionList
8078

79+
case backDeployedAttributeSpecList
80+
8181
case binaryOperatorExpr
8282

8383
case booleanLiteralExpr

0 commit comments

Comments
 (0)