Skip to content

Commit 252d12c

Browse files
committed
Perform a couple of renames on differentiability attribute nodes
Mostly change parameter to argument where the parameter is actually an argument.
1 parent be8dc65 commit 252d12c

25 files changed

+616
-438
lines changed

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ public let ATTRIBUTE_NODES: [Node] = [
371371
isOptional: true
372372
),
373373
Child(
374-
name: "Parameters",
374+
name: "Arguments",
375375
deprecatedName: "DiffParams",
376376
kind: .node(kind: .differentiabilityWithRespectToArgument),
377377
isOptional: true
@@ -382,7 +382,7 @@ public let ATTRIBUTE_NODES: [Node] = [
382382
// differentiability-param-list ->
383383
// differentiability-param differentiability-param-list?
384384
Node(
385-
kind: .differentiabilityParameterList,
385+
kind: .differentiabilityArgumentList,
386386
base: .syntaxCollection,
387387
nameForDiagnostics: "differentiability parameters",
388388
elementChoices: [.differentiabilityArgument]
@@ -392,14 +392,15 @@ public let ATTRIBUTE_NODES: [Node] = [
392392
Node(
393393
kind: .differentiabilityArgument,
394394
base: .syntax,
395-
nameForDiagnostics: "differentiability parameter",
396-
documentation: "A differentiability parameter: either the \"self\" identifier, a function parameter name, or a function parameter index.",
395+
nameForDiagnostics: "differentiability argument",
396+
documentation: "A differentiability argument: either the \"self\" identifier, a function parameter name, or a function parameter index.",
397397
traits: [
398398
"WithTrailingComma"
399399
],
400400
children: [
401401
Child(
402-
name: "Parameter",
402+
name: "Argument",
403+
deprecatedName: "Parameter",
403404
kind: .token(choices: [.token(tokenKind: "IdentifierToken"), .token(tokenKind: "IntegerLiteralToken"), .keyword(text: "self")])
404405
),
405406
Child(
@@ -429,18 +430,21 @@ public let ATTRIBUTE_NODES: [Node] = [
429430
documentation: "The colon separating \"wrt\" and the parameter list."
430431
),
431432
Child(
432-
name: "Parameters",
433+
name: "Arguments",
434+
deprecatedName: "Parameters",
433435
kind: .nodeChoices(choices: [
434436
Child(
435-
name: "Parameter",
437+
name: "Argument",
438+
deprecatedName: "Parameter",
436439
kind: .node(kind: .differentiabilityArgument)
437440
),
438441
Child(
439-
name: "ParameterList",
442+
name: "ArgumentList",
443+
deprecatedName: "ParameterList",
440444
kind: .node(kind: .differentiabilityArguments)
441445
),
442446
]),
443-
nameForDiagnostics: "parameters"
447+
nameForDiagnostics: "arguments"
444448
),
445449
]
446450
),
@@ -449,16 +453,17 @@ public let ATTRIBUTE_NODES: [Node] = [
449453
Node(
450454
kind: .differentiabilityArguments,
451455
base: .syntax,
452-
nameForDiagnostics: "differentiability parameters",
453-
documentation: "The differentiability parameters.",
456+
nameForDiagnostics: "differentiability arguments",
457+
documentation: "The differentiability arguments.",
454458
children: [
455459
Child(
456460
name: "LeftParen",
457461
kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
458462
),
459463
Child(
460-
name: "DifferentiabilityParameters",
461-
kind: .collection(kind: .differentiabilityParameterList, collectionElementName: "DifferentiabilityParam"),
464+
name: "Arguments",
465+
deprecatedName: "DifferentiabilityParameters",
466+
kind: .collection(kind: .differentiabilityArgumentList, collectionElementName: "Argument"),
462467
documentation: "The parameters for differentiation."
463468
),
464469
Child(
@@ -493,16 +498,16 @@ public let ATTRIBUTE_NODES: [Node] = [
493498
isOptional: true
494499
),
495500
Child(
496-
name: "Parameters",
501+
name: "Arguments",
497502
deprecatedName: "DiffParams",
498503
kind: .node(kind: .differentiabilityWithRespectToArgument),
499504
isOptional: true
500505
),
501506
Child(
502-
name: "ParametersComma",
507+
name: "ArgumentsComma",
503508
deprecatedName: "DiffParamsComma",
504509
kind: .token(choices: [.token(tokenKind: "CommaToken")]),
505-
documentation: "The comma following the differentiability parameters clause, if it exists.",
510+
documentation: "The comma following the differentiability arguments clause, if it exists.",
506511
isOptional: true
507512
),
508513
Child(
@@ -595,7 +600,7 @@ public let ATTRIBUTE_NODES: [Node] = [
595600
kind: .effectsAttributeArgumentList,
596601
base: .syntaxCollection,
597602
nameForDiagnostics: "@_effects arguments",
598-
documentation: "The arguments of the '@_effect' attribute. These will be parsed during the SIL stage.",
603+
documentation: "The arguments of the '@_effects' attribute. These will be parsed during the SIL stage.",
599604
elementChoices: [.token]
600605
),
601606

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
102102
case dictionaryType
103103
case differentiabilityArgument
104104
case differentiabilityArguments
105-
case differentiabilityParameterList
105+
case differentiabilityArgumentList
106106
case differentiabilityWithRespectToArgument
107107
case differentiableAttributeArguments
108108
case discardAssignmentExpr
@@ -392,7 +392,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
392392
case .designatedType: return "designatedTypeElement"
393393
case .differentiabilityArgument: return "differentiabilityParam"
394394
case .differentiabilityArguments: return "differentiabilityParams"
395-
case .differentiabilityParameterList: return "differentiabilityParamList"
395+
case .differentiabilityArgumentList: return "differentiabilityParamList"
396396
case .differentiabilityWithRespectToArgument: return "differentiabilityParamsClause"
397397
case .documentationAttributeArgumentList: return "documentationAttributeArguments"
398398
case .dynamicReplacementAttributeArguments: return "dynamicReplacementArguments"

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class ValidateSyntaxNodes: XCTestCase {
252252
),
253253
ValidationFailure(
254254
node: .differentiableAttributeArguments,
255-
message: "child 'ParametersComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
255+
message: "child 'ArgumentsComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
256256
),
257257
ValidationFailure(
258258
node: .poundSourceLocationArguments,

Sources/SwiftParser/Attributes.swift

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -402,14 +402,14 @@ extension Parser {
402402
kindSpecifierComma = nil
403403
}
404404

405-
let parameters: RawDifferentiabilityWithRespectToArgumentSyntax?
406-
let parametersComma: RawTokenSyntax?
405+
let arguments: RawDifferentiabilityWithRespectToArgumentSyntax?
406+
let argumentsComma: RawTokenSyntax?
407407
if self.at(.keyword(.wrt)) {
408-
parameters = self.parseDifferentiabilityWithRespectToArgument()
409-
parametersComma = self.consume(if: .comma)
408+
arguments = self.parseDifferentiabilityWithRespectToArgument()
409+
argumentsComma = self.consume(if: .comma)
410410
} else {
411-
parameters = nil
412-
parametersComma = nil
411+
arguments = nil
412+
argumentsComma = nil
413413
}
414414

415415
let whereClause: RawGenericWhereClauseSyntax?
@@ -421,8 +421,8 @@ extension Parser {
421421
return RawDifferentiableAttributeArgumentsSyntax(
422422
kindSpecifier: kindSpecifier,
423423
kindSpecifierComma: kindSpecifierComma,
424-
parameters: parameters,
425-
parametersComma: parametersComma,
424+
arguments: arguments,
425+
argumentsComma: argumentsComma,
426426
genericWhereClause: whereClause,
427427
arena: self.arena
428428
)
@@ -434,10 +434,10 @@ extension Parser {
434434

435435
guard let leftParen = self.consume(if: .leftParen) else {
436436
// If no opening '(' for parameter list, parse a single parameter.
437-
let param =
437+
let argument =
438438
self.parseDifferentiabilityArgument()
439439
?? RawDifferentiabilityArgumentSyntax(
440-
parameter: missingToken(.identifier),
440+
argument: missingToken(.identifier),
441441
trailingComma: nil,
442442
arena: self.arena
443443
)
@@ -446,7 +446,7 @@ extension Parser {
446446
wrtLabel: wrt,
447447
unexpectedBeforeColon,
448448
colon: colon,
449-
parameters: .parameter(param),
449+
arguments: .argument(argument),
450450
arena: self.arena
451451
)
452452
}
@@ -461,10 +461,10 @@ extension Parser {
461461
}
462462
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
463463

464-
let parameters = RawDifferentiabilityParameterListSyntax(elements: elements, arena: self.arena)
464+
let arguments = RawDifferentiabilityArgumentListSyntax(elements: elements, arena: self.arena)
465465
let list = RawDifferentiabilityArgumentsSyntax(
466466
leftParen: leftParen,
467-
differentiabilityParameters: parameters,
467+
arguments: arguments,
468468
unexpectedBeforeRightParen,
469469
rightParen: rightParen,
470470
arena: self.arena
@@ -473,34 +473,34 @@ extension Parser {
473473
wrtLabel: wrt,
474474
unexpectedBeforeColon,
475475
colon: colon,
476-
parameters: .parameterList(list),
476+
arguments: .argumentList(list),
477477
arena: self.arena
478478
)
479479
}
480480

481481
mutating func parseDifferentiabilityArgument() -> RawDifferentiabilityArgumentSyntax? {
482-
switch self.at(anyIn: DifferentiabilityArgumentSyntax.ParameterOptions.self) {
482+
switch self.at(anyIn: DifferentiabilityArgumentSyntax.ArgumentOptions.self) {
483483
case (.identifier, let handle)?:
484484
let token = self.eat(handle)
485485
let comma = self.consume(if: .comma)
486486
return RawDifferentiabilityArgumentSyntax(
487-
parameter: token,
487+
argument: token,
488488
trailingComma: comma,
489489
arena: self.arena
490490
)
491491
case (.integerLiteral, let handle)?:
492492
let token = self.eat(handle)
493493
let comma = self.consume(if: .comma)
494494
return RawDifferentiabilityArgumentSyntax(
495-
parameter: token,
495+
argument: token,
496496
trailingComma: comma,
497497
arena: self.arena
498498
)
499499
case (.self, let handle)?:
500500
let token = self.eat(handle)
501501
let comma = self.consume(if: .comma)
502502
return RawDifferentiabilityArgumentSyntax(
503-
parameter: token,
503+
argument: token,
504504
trailingComma: comma,
505505
arena: self.arena
506506
)
@@ -568,11 +568,11 @@ extension Parser {
568568
(unexpectedBeforeAccessor, accessor) = (nil, nil)
569569
}
570570
let comma = self.consume(if: .comma)
571-
let parameters: RawDifferentiabilityWithRespectToArgumentSyntax?
571+
let arguments: RawDifferentiabilityWithRespectToArgumentSyntax?
572572
if comma != nil {
573-
parameters = self.parseDifferentiabilityWithRespectToArgument()
573+
arguments = self.parseDifferentiabilityWithRespectToArgument()
574574
} else {
575-
parameters = nil
575+
arguments = nil
576576
}
577577
return RawDerivativeAttributeArgumentsSyntax(
578578
unexpectedBeforeOfLabel,
@@ -584,7 +584,7 @@ extension Parser {
584584
unexpectedBeforeAccessor,
585585
accessorSpecifier: accessor,
586586
comma: comma,
587-
parameters: parameters,
587+
arguments: arguments,
588588
arena: self.arena
589589
)
590590
}

Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ extension DerivativeAttributeArgumentsSyntax {
722722
}
723723

724724
extension DifferentiabilityArgumentSyntax {
725-
enum ParameterOptions: TokenSpecSet {
725+
enum ArgumentOptions: TokenSpecSet {
726726
case identifier
727727
case integerLiteral
728728
case `self`

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
9696
return "key type"
9797
case \DictionaryTypeSyntax.value:
9898
return "value type"
99-
case \DifferentiabilityWithRespectToArgumentSyntax.parameters:
100-
return "parameters"
99+
case \DifferentiabilityWithRespectToArgumentSyntax.arguments:
100+
return "arguments"
101101
case \DoStmtSyntax.body:
102102
return "body"
103103
case \DocumentationAttributeArgumentSyntax.label:

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ extension SyntaxKind {
125125
return "dictionary"
126126
case .dictionaryType:
127127
return "dictionary type"
128+
case .differentiabilityArgumentList:
129+
return "differentiability parameters"
128130
case .differentiabilityArgument:
129-
return "differentiability parameter"
131+
return "differentiability argument"
130132
case .differentiabilityArguments:
131-
return "differentiability parameters"
132-
case .differentiabilityParameterList:
133-
return "differentiability parameters"
133+
return "differentiability arguments"
134134
case .differentiabilityWithRespectToArgument:
135135
return "'@differentiable' argument"
136136
case .differentiableAttributeArguments:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
235235
- <doc:SwiftSyntax/DesignatedTypeSyntax>
236236
- <doc:SwiftSyntax/DictionaryElementListSyntax>
237237
- <doc:SwiftSyntax/DictionaryElementSyntax>
238-
- <doc:SwiftSyntax/DifferentiabilityParameterListSyntax>
238+
- <doc:SwiftSyntax/DifferentiabilityArgumentListSyntax>
239239
- <doc:SwiftSyntax/DifferentiabilityArgumentSyntax>
240240
- <doc:SwiftSyntax/DocumentationAttributeArgumentListSyntax>
241241
- <doc:SwiftSyntax/DocumentationAttributeArgumentSyntax>

0 commit comments

Comments
 (0)