Skip to content

Commit b9a3830

Browse files
ahoppenahoppen
committed
Address review comments
1 parent fcee3e1 commit b9a3830

File tree

10 files changed

+51
-52
lines changed

10 files changed

+51
-52
lines changed

‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ public let EXPR_NODES: [Node] = [
14011401
isOptional: true
14021402
),
14031403
Child(
1404-
name: "BaseExpression",
1404+
name: "Base",
14051405
deprecatedName: "PostfixExpression",
14061406
kind: .node(kind: .expr)
14071407
),

‎CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ class ValidateSyntaxNodes: XCTestCase {
646646
)
647647
}
648648

649-
func testChildrenDontEndWithExprEtc() {
649+
func testChildrenDontEndWithNodeKind() {
650650
var failures: [ValidationFailure] = []
651651

652652
let forbiddenSuffixes = ["Decl", "Declaration", "Expr", "Expression", "Pattern", "Stmt", "Statement", "Syntax", "Type"]
@@ -687,7 +687,6 @@ class ValidateSyntaxNodes: XCTestCase {
687687
ValidationFailure(node: .sameTypeRequirement, message: "child 'RightType' should not end with 'Type'"),
688688
// MARK: Adjective + Expr
689689
ValidationFailure(node: .functionCallExpr, message: "child 'CalledExpression' should not end with 'Expression'"),
690-
ValidationFailure(node: .prefixOperatorExpr, message: "child 'BaseExpression' should not end with 'Expression'"),
691690
ValidationFailure(node: .subscriptExpr, message: "child 'CalledExpression' should not end with 'Expression'"),
692691
]
693692
)

‎Sources/SwiftParser/Expressions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ extension Parser {
627627
return RawExprSyntax(
628628
RawPrefixOperatorExprSyntax(
629629
operator: op,
630-
baseExpression: postfix,
630+
base: postfix,
631631
arena: self.arena
632632
)
633633
)

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2671,12 +2671,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
26712671
return "unexpectedBeforeOperator"
26722672
case \PrefixOperatorExprSyntax.operator:
26732673
return "operator"
2674-
case \PrefixOperatorExprSyntax.unexpectedBetweenOperatorAndBaseExpression:
2675-
return "unexpectedBetweenOperatorAndBaseExpression"
2676-
case \PrefixOperatorExprSyntax.baseExpression:
2677-
return "baseExpression"
2678-
case \PrefixOperatorExprSyntax.unexpectedAfterBaseExpression:
2679-
return "unexpectedAfterBaseExpression"
2674+
case \PrefixOperatorExprSyntax.unexpectedBetweenOperatorAndBase:
2675+
return "unexpectedBetweenOperatorAndBase"
2676+
case \PrefixOperatorExprSyntax.base:
2677+
return "base"
2678+
case \PrefixOperatorExprSyntax.unexpectedAfterBase:
2679+
return "unexpectedAfterBase"
26802680
case \PrimaryAssociatedTypeClauseSyntax.unexpectedBeforeLeftAngle:
26812681
return "unexpectedBeforeLeftAngle"
26822682
case \PrimaryAssociatedTypeClauseSyntax.leftAngle:

‎Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5869,37 +5869,37 @@ extension PrefixOperatorExprSyntax {
58695869
}
58705870
}
58715871

5872-
@available(*, deprecated, renamed: "unexpectedBetweenOperatorAndBaseExpression")
5872+
@available(*, deprecated, renamed: "unexpectedBetweenOperatorAndBase")
58735873
public var unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? {
58745874
get {
5875-
return unexpectedBetweenOperatorAndBaseExpression
5875+
return unexpectedBetweenOperatorAndBase
58765876
}
58775877
set {
5878-
unexpectedBetweenOperatorAndBaseExpression = newValue
5878+
unexpectedBetweenOperatorAndBase = newValue
58795879
}
58805880
}
58815881

5882-
@available(*, deprecated, renamed: "baseExpression")
5882+
@available(*, deprecated, renamed: "base")
58835883
public var postfixExpression: ExprSyntax {
58845884
get {
5885-
return baseExpression
5885+
return base
58865886
}
58875887
set {
5888-
baseExpression = newValue
5888+
base = newValue
58895889
}
58905890
}
58915891

5892-
@available(*, deprecated, renamed: "unexpectedAfterBaseExpression")
5892+
@available(*, deprecated, renamed: "unexpectedAfterBase")
58935893
public var unexpectedAfterPostfixExpression: UnexpectedNodesSyntax? {
58945894
get {
5895-
return unexpectedAfterBaseExpression
5895+
return unexpectedAfterBase
58965896
}
58975897
set {
5898-
unexpectedAfterBaseExpression = newValue
5898+
unexpectedAfterBase = newValue
58995899
}
59005900
}
59015901

5902-
@available(*, deprecated, message: "Use an initializer with operator, baseExpression argument(s).")
5902+
@available(*, deprecated, message: "Use an initializer with operator, base argument(s).")
59035903
@_disfavoredOverload
59045904
public init(
59055905
leadingTrivia: Trivia? = nil,
@@ -5916,7 +5916,7 @@ extension PrefixOperatorExprSyntax {
59165916
unexpectedBeforeOperatorToken,
59175917
operator: operatorToken,
59185918
unexpectedBetweenOperatorTokenAndPostfixExpression,
5919-
baseExpression: postfixExpression,
5919+
base: postfixExpression,
59205920
unexpectedAfterPostfixExpression,
59215921
trailingTrivia: trailingTrivia
59225922
)

‎Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17622,19 +17622,19 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
1762217622
public init(
1762317623
_ unexpectedBeforeOperator: RawUnexpectedNodesSyntax? = nil,
1762417624
operator: RawTokenSyntax?,
17625-
_ unexpectedBetweenOperatorAndBaseExpression: RawUnexpectedNodesSyntax? = nil,
17626-
baseExpression: RawExprSyntax,
17627-
_ unexpectedAfterBaseExpression: RawUnexpectedNodesSyntax? = nil,
17625+
_ unexpectedBetweenOperatorAndBase: RawUnexpectedNodesSyntax? = nil,
17626+
base: RawExprSyntax,
17627+
_ unexpectedAfterBase: RawUnexpectedNodesSyntax? = nil,
1762817628
arena: __shared SyntaxArena
1762917629
) {
1763017630
let raw = RawSyntax.makeLayout(
1763117631
kind: .prefixOperatorExpr, uninitializedCount: 5, arena: arena) { layout in
1763217632
layout.initialize(repeating: nil)
1763317633
layout[0] = unexpectedBeforeOperator?.raw
1763417634
layout[1] = `operator`?.raw
17635-
layout[2] = unexpectedBetweenOperatorAndBaseExpression?.raw
17636-
layout[3] = baseExpression.raw
17637-
layout[4] = unexpectedAfterBaseExpression?.raw
17635+
layout[2] = unexpectedBetweenOperatorAndBase?.raw
17636+
layout[3] = base.raw
17637+
layout[4] = unexpectedAfterBase?.raw
1763817638
}
1763917639
self.init(unchecked: raw)
1764017640
}
@@ -17647,15 +17647,15 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
1764717647
layoutView.children[1].map(RawTokenSyntax.init(raw:))
1764817648
}
1764917649

17650-
public var unexpectedBetweenOperatorAndBaseExpression: RawUnexpectedNodesSyntax? {
17650+
public var unexpectedBetweenOperatorAndBase: RawUnexpectedNodesSyntax? {
1765117651
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1765217652
}
1765317653

17654-
public var baseExpression: RawExprSyntax {
17654+
public var base: RawExprSyntax {
1765517655
layoutView.children[3].map(RawExprSyntax.init(raw:))!
1765617656
}
1765717657

17658-
public var unexpectedAfterBaseExpression: RawUnexpectedNodesSyntax? {
17658+
public var unexpectedAfterBase: RawUnexpectedNodesSyntax? {
1765917659
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
1766017660
}
1766117661
}

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5017,7 +5017,7 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
50175017
/// ### Children
50185018
///
50195019
/// - `operator`: `<prefixOperator>`?
5020-
/// - `baseExpression`: ``ExprSyntax``
5020+
/// - `base`: ``ExprSyntax``
50215021
public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
50225022
public let _syntaxNode: Syntax
50235023

@@ -5043,9 +5043,9 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
50435043
leadingTrivia: Trivia? = nil,
50445044
_ unexpectedBeforeOperator: UnexpectedNodesSyntax? = nil,
50455045
operator: TokenSyntax? = nil,
5046-
_ unexpectedBetweenOperatorAndBaseExpression: UnexpectedNodesSyntax? = nil,
5047-
baseExpression: some ExprSyntaxProtocol,
5048-
_ unexpectedAfterBaseExpression: UnexpectedNodesSyntax? = nil,
5046+
_ unexpectedBetweenOperatorAndBase: UnexpectedNodesSyntax? = nil,
5047+
base: some ExprSyntaxProtocol,
5048+
_ unexpectedAfterBase: UnexpectedNodesSyntax? = nil,
50495049
trailingTrivia: Trivia? = nil
50505050

50515051
) {
@@ -5054,16 +5054,16 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
50545054
let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
50555055
unexpectedBeforeOperator,
50565056
`operator`,
5057-
unexpectedBetweenOperatorAndBaseExpression,
5058-
baseExpression,
5059-
unexpectedAfterBaseExpression
5057+
unexpectedBetweenOperatorAndBase,
5058+
base,
5059+
unexpectedAfterBase
50605060
))) { (arena, _) in
50615061
let layout: [RawSyntax?] = [
50625062
unexpectedBeforeOperator?.raw,
50635063
`operator`?.raw,
5064-
unexpectedBetweenOperatorAndBaseExpression?.raw,
5065-
baseExpression.raw,
5066-
unexpectedAfterBaseExpression?.raw
5064+
unexpectedBetweenOperatorAndBase?.raw,
5065+
base.raw,
5066+
unexpectedAfterBase?.raw
50675067
]
50685068
let raw = RawSyntax.makeLayout(
50695069
kind: SyntaxKind.prefixOperatorExpr,
@@ -5096,7 +5096,7 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
50965096
}
50975097
}
50985098

5099-
public var unexpectedBetweenOperatorAndBaseExpression: UnexpectedNodesSyntax? {
5099+
public var unexpectedBetweenOperatorAndBase: UnexpectedNodesSyntax? {
51005100
get {
51015101
return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
51025102
}
@@ -5105,7 +5105,7 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
51055105
}
51065106
}
51075107

5108-
public var baseExpression: ExprSyntax {
5108+
public var base: ExprSyntax {
51095109
get {
51105110
return ExprSyntax(data.child(at: 3, parent: Syntax(self))!)
51115111
}
@@ -5114,7 +5114,7 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
51145114
}
51155115
}
51165116

5117-
public var unexpectedAfterBaseExpression: UnexpectedNodesSyntax? {
5117+
public var unexpectedAfterBase: UnexpectedNodesSyntax? {
51185118
get {
51195119
return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
51205120
}
@@ -5127,9 +5127,9 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
51275127
return .layout([
51285128
\Self.unexpectedBeforeOperator,
51295129
\Self.operator,
5130-
\Self.unexpectedBetweenOperatorAndBaseExpression,
5131-
\Self.baseExpression,
5132-
\Self.unexpectedAfterBaseExpression
5130+
\Self.unexpectedBetweenOperatorAndBase,
5131+
\Self.base,
5132+
\Self.unexpectedAfterBase
51335133
])
51345134
}
51355135
}

‎Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ extension ExpressibleByLiteralSyntax where Self: FloatingPoint, Self: LosslessSt
266266
return ExprSyntax(
267267
PrefixOperatorExprSyntax(
268268
operator: .prefixOperator("-"),
269-
baseExpression: (-self).makeLiteralSyntax()
269+
base: (-self).makeLiteralSyntax()
270270
)
271271
)
272272

‎Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ final class ForwardSlashRegexTests: XCTestCase {
811811
substructure: Syntax(
812812
PrefixOperatorExprSyntax(
813813
operator: .prefixOperator("!!"),
814-
baseExpression: MemberAccessExprSyntax(
814+
base: MemberAccessExprSyntax(
815815
base: RegexLiteralExprSyntax(regex: .regexLiteralPattern("1")),
816816
name: "bitWidth"
817817
)
@@ -1058,7 +1058,7 @@ final class ForwardSlashRegexTests: XCTestCase {
10581058
"""
10591059
_ = /x// comment
10601060
""",
1061-
substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), baseExpression: IdentifierExprSyntax(identifier: "x")))
1061+
substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), base: IdentifierExprSyntax(identifier: "x")))
10621062
)
10631063
}
10641064

@@ -1067,7 +1067,7 @@ final class ForwardSlashRegexTests: XCTestCase {
10671067
"""
10681068
_ = /x // comment
10691069
""",
1070-
substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), baseExpression: IdentifierExprSyntax(identifier: "x")))
1070+
substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), base: IdentifierExprSyntax(identifier: "x")))
10711071
)
10721072
}
10731073

@@ -1076,7 +1076,7 @@ final class ForwardSlashRegexTests: XCTestCase {
10761076
"""
10771077
_ = /x/*comment*/
10781078
""",
1079-
substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), baseExpression: IdentifierExprSyntax(identifier: "x")))
1079+
substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), base: IdentifierExprSyntax(identifier: "x")))
10801080
)
10811081
}
10821082

‎Tests/SwiftParserTest/translated/IfconfigExprTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ final class IfconfigExprTests: XCTestCase {
661661
TupleExprElementSyntax(
662662
expression: PrefixOperatorExprSyntax(
663663
operator: .prefixOperator("<"),
664-
baseExpression: FloatLiteralExprSyntax(digits: .floatingLiteral("10.0"))
664+
base: FloatLiteralExprSyntax(digits: .floatingLiteral("10.0"))
665665
)
666666
)
667667
]),

0 commit comments

Comments
 (0)