Skip to content

Commit 6397ce3

Browse files
ahoppenahoppen
committed
Revert UnresolvedInfixOpertor and UnresolvedArrowExpr renames
1 parent 588e568 commit 6397ce3

32 files changed

+675
-691
lines changed

‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public let EXPR_NODES: [Node] = [
6666
// arrow-expr -> 'async'? 'throws'? '->'
6767
// NOTE: This appears only in SequenceExpr.
6868
Node(
69-
kind: .unresolvedArrowExpr,
69+
kind: .arrowExpr,
7070
base: .expr,
7171
nameForDiagnostics: nil,
7272
children: [
@@ -149,7 +149,7 @@ public let EXPR_NODES: [Node] = [
149149
// An operator like + or -.
150150
// NOTE: This appears only in SequenceExpr.
151151
Node(
152-
kind: .unresolvedInfixOperatorExpr,
152+
kind: .binaryOperatorExpr,
153153
base: .expr,
154154
nameForDiagnostics: "operator",
155155
children: [

‎CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
3232
case arrayElementList
3333
case arrayExpr
3434
case arrayType
35+
case arrowExpr
3536
case asExpr
3637
case assignmentExpr
3738
case associatedTypeDecl
@@ -44,6 +45,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
4445
case availabilityLabeledArgument
4546
case awaitExpr
4647
case backDeployedAttributeArguments
48+
case binaryOperatorExpr
4749
case booleanLiteralExpr
4850
case borrowExpr
4951
case breakStmt
@@ -286,9 +288,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
286288
case unavailableFromAsyncAttributeArguments
287289
case underscorePrivateAttributeArguments
288290
case unexpectedNodes
289-
case unresolvedArrowExpr
290291
case unresolvedAsExpr
291-
case unresolvedInfixOperatorExpr
292292
case unresolvedIsExpr
293293
case unresolvedTernaryExpr
294294
case valueBindingPattern
@@ -434,8 +434,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
434434
case .switchCaseItemList: return "caseItemList"
435435
case .typeAliasDecl: return "typealiasDecl"
436436
case .unavailableFromAsyncAttributeArguments: return "unavailableFromAsyncArguments"
437-
case .unresolvedArrowExpr: return "arrowExpr"
438-
case .unresolvedInfixOperatorExpr: return "binaryOperatorExpr"
439437
case .yieldStmtArgument: return "yieldExprListElement"
440438
case .yieldStmtArgumentClause: return "yieldList"
441439
case .yieldStmtArgumentList: return "yieldExprList"

‎CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public extension Child {
132132
ExprSyntax(
133133
SequenceExprSyntax {
134134
IdentifierExprSyntax(identifier: .identifier(varName))
135-
UnresolvedInfixOperatorExprSyntax(text: "==")
135+
BinaryOperatorExprSyntax(text: "==")
136136
NilLiteralExprSyntax()
137137
}
138138
)
@@ -143,13 +143,13 @@ public extension Child {
143143
ExprSyntax(
144144
SequenceExprSyntax {
145145
MemberAccessExprSyntax(base: type.forceUnwrappedIfNeeded(expr: IdentifierExprSyntax(identifier: .identifier(varName))), name: "text")
146-
UnresolvedInfixOperatorExprSyntax(text: "==")
146+
BinaryOperatorExprSyntax(text: "==")
147147
StringLiteralExprSyntax(content: textChoice)
148148
}
149149
)
150150
)
151151
}
152-
let disjunction = ExprListSyntax(preconditionChoices.flatMap { [$0, ExprSyntax(UnresolvedInfixOperatorExprSyntax(text: "||"))] }.dropLast())
152+
let disjunction = ExprListSyntax(preconditionChoices.flatMap { [$0, ExprSyntax(BinaryOperatorExprSyntax(text: "||"))] }.dropLast())
153153
return FunctionCallExprSyntax(callee: ExprSyntax("precondition")) {
154154
TupleExprElementSyntax(expression: SequenceExprSyntax(elements: disjunction))
155155
}

‎Sources/SwiftOperators/OperatorTable+Folding.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extension OperatorTable {
6060
errorHandler: OperatorErrorHandler = { throw $0 }
6161
) rethrows -> PrecedenceGroupName? {
6262
// A binary operator.
63-
if let binaryExpr = expr.as(UnresolvedInfixOperatorExprSyntax.self) {
63+
if let binaryExpr = expr.as(BinaryOperatorExprSyntax.self) {
6464
let operatorName = binaryExpr.operator.text
6565
return try lookupOperatorPrecedenceGroupName(
6666
operatorName,
@@ -85,7 +85,7 @@ extension OperatorTable {
8585
}
8686

8787
// The arrow operator has fixed precedence.
88-
if expr.is(UnresolvedArrowExprSyntax.self) {
88+
if expr.is(ArrowExprSyntax.self) {
8989
return "FunctionArrowPrecedence"
9090
}
9191

@@ -137,7 +137,7 @@ extension OperatorTable {
137137
// which will be one of the unresolved infix operators.
138138

139139
// An operator such as '+'.
140-
if let binaryOperatorExpr = op.as(UnresolvedInfixOperatorExprSyntax.self) {
140+
if let binaryOperatorExpr = op.as(BinaryOperatorExprSyntax.self) {
141141
return ExprSyntax(
142142
InfixOperatorExprSyntax(
143143
leftOperand: lhs,
@@ -205,7 +205,7 @@ extension OperatorTable {
205205
}
206206

207207
// An arrow expression (->).
208-
if let arrowExpr = op.as(UnresolvedArrowExprSyntax.self) {
208+
if let arrowExpr = op.as(ArrowExprSyntax.self) {
209209
return ExprSyntax(
210210
InfixOperatorExprSyntax(
211211
leftOperand: lhs,

‎Sources/SwiftParser/Expressions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ extension Parser {
264264
case (.binaryOperator, let handle)?:
265265
// Parse the operator.
266266
let operatorToken = self.eat(handle)
267-
let op = RawUnresolvedInfixOperatorExprSyntax(operator: operatorToken, arena: arena)
267+
let op = RawBinaryOperatorExprSyntax(operator: operatorToken, arena: arena)
268268
return (RawExprSyntax(op), nil)
269269

270270
case (.infixQuestionMark, let handle)?:
@@ -332,7 +332,7 @@ extension Parser {
332332

333333
let unexpectedAfterArrow = self.parseMisplacedEffectSpecifiers(&effectSpecifiers)
334334

335-
let op = RawUnresolvedArrowExprSyntax(
335+
let op = RawArrowExprSyntax(
336336
effectSpecifiers: effectSpecifiers,
337337
unexpectedBeforeArrow,
338338
arrow: arrow,

‎Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
468468

469469
// MARK: - Specialized diagnostic generation
470470

471-
public override func visit(_ node: UnresolvedArrowExprSyntax) -> SyntaxVisitorContinueKind {
471+
public override func visit(_ node: ArrowExprSyntax) -> SyntaxVisitorContinueKind {
472472
if shouldSkip(node) {
473473
return .skipChildren
474474
}

‎Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ extension SyntaxKind {
5757
return "'await' expression"
5858
case .backDeployedAttributeArguments:
5959
return "'@backDeployed' arguments"
60+
case .binaryOperatorExpr:
61+
return "operator"
6062
case .booleanLiteralExpr:
6163
return "bool literal"
6264
case .borrowExpr:
@@ -385,8 +387,6 @@ extension SyntaxKind {
385387
return "@_private argument"
386388
case .unresolvedAsExpr:
387389
return "'as'"
388-
case .unresolvedInfixOperatorExpr:
389-
return "operator"
390390
case .unresolvedIsExpr:
391391
return "'is'"
392392
case .unresolvedTernaryExpr:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,11 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
9494
- <doc:SwiftSyntax/ExprSyntaxProtocol>
9595
- <doc:SwiftSyntax/MissingExprSyntax>
9696
- <doc:SwiftSyntax/ArrayExprSyntax>
97+
- <doc:SwiftSyntax/ArrowExprSyntax>
9798
- <doc:SwiftSyntax/AsExprSyntax>
9899
- <doc:SwiftSyntax/AssignmentExprSyntax>
99100
- <doc:SwiftSyntax/AwaitExprSyntax>
101+
- <doc:SwiftSyntax/BinaryOperatorExprSyntax>
100102
- <doc:SwiftSyntax/BooleanLiteralExprSyntax>
101103
- <doc:SwiftSyntax/BorrowExprSyntax>
102104
- <doc:SwiftSyntax/CanImportExprSyntax>
@@ -138,9 +140,7 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
138140
- <doc:SwiftSyntax/TryExprSyntax>
139141
- <doc:SwiftSyntax/TupleExprSyntax>
140142
- <doc:SwiftSyntax/TypeExprSyntax>
141-
- <doc:SwiftSyntax/UnresolvedArrowExprSyntax>
142143
- <doc:SwiftSyntax/UnresolvedAsExprSyntax>
143-
- <doc:SwiftSyntax/UnresolvedInfixOperatorExprSyntax>
144144
- <doc:SwiftSyntax/UnresolvedIsExprSyntax>
145145
- <doc:SwiftSyntax/UnresolvedTernaryExprSyntax>
146146

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,16 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
185185
return "rightSquare"
186186
case \ArrayTypeSyntax.unexpectedAfterRightSquare:
187187
return "unexpectedAfterRightSquare"
188+
case \ArrowExprSyntax.unexpectedBeforeEffectSpecifiers:
189+
return "unexpectedBeforeEffectSpecifiers"
190+
case \ArrowExprSyntax.effectSpecifiers:
191+
return "effectSpecifiers"
192+
case \ArrowExprSyntax.unexpectedBetweenEffectSpecifiersAndArrow:
193+
return "unexpectedBetweenEffectSpecifiersAndArrow"
194+
case \ArrowExprSyntax.arrow:
195+
return "arrow"
196+
case \ArrowExprSyntax.unexpectedAfterArrow:
197+
return "unexpectedAfterArrow"
188198
case \AsExprSyntax.unexpectedBeforeExpression:
189199
return "unexpectedBeforeExpression"
190200
case \AsExprSyntax.expression:
@@ -341,6 +351,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
341351
return "platforms"
342352
case \BackDeployedAttributeArgumentsSyntax.unexpectedAfterPlatforms:
343353
return "unexpectedAfterPlatforms"
354+
case \BinaryOperatorExprSyntax.unexpectedBeforeOperator:
355+
return "unexpectedBeforeOperator"
356+
case \BinaryOperatorExprSyntax.operator:
357+
return "operator"
358+
case \BinaryOperatorExprSyntax.unexpectedAfterOperator:
359+
return "unexpectedAfterOperator"
344360
case \BooleanLiteralExprSyntax.unexpectedBeforeLiteral:
345361
return "unexpectedBeforeLiteral"
346362
case \BooleanLiteralExprSyntax.literal:
@@ -3331,16 +3347,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
33313347
return "filename"
33323348
case \UnderscorePrivateAttributeArgumentsSyntax.unexpectedAfterFilename:
33333349
return "unexpectedAfterFilename"
3334-
case \UnresolvedArrowExprSyntax.unexpectedBeforeEffectSpecifiers:
3335-
return "unexpectedBeforeEffectSpecifiers"
3336-
case \UnresolvedArrowExprSyntax.effectSpecifiers:
3337-
return "effectSpecifiers"
3338-
case \UnresolvedArrowExprSyntax.unexpectedBetweenEffectSpecifiersAndArrow:
3339-
return "unexpectedBetweenEffectSpecifiersAndArrow"
3340-
case \UnresolvedArrowExprSyntax.arrow:
3341-
return "arrow"
3342-
case \UnresolvedArrowExprSyntax.unexpectedAfterArrow:
3343-
return "unexpectedAfterArrow"
33443350
case \UnresolvedAsExprSyntax.unexpectedBeforeAsKeyword:
33453351
return "unexpectedBeforeAsKeyword"
33463352
case \UnresolvedAsExprSyntax.asKeyword:
@@ -3351,12 +3357,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
33513357
return "questionOrExclamationMark"
33523358
case \UnresolvedAsExprSyntax.unexpectedAfterQuestionOrExclamationMark:
33533359
return "unexpectedAfterQuestionOrExclamationMark"
3354-
case \UnresolvedInfixOperatorExprSyntax.unexpectedBeforeOperator:
3355-
return "unexpectedBeforeOperator"
3356-
case \UnresolvedInfixOperatorExprSyntax.operator:
3357-
return "operator"
3358-
case \UnresolvedInfixOperatorExprSyntax.unexpectedAfterOperator:
3359-
return "unexpectedAfterOperator"
33603360
case \UnresolvedIsExprSyntax.unexpectedBeforeIsKeyword:
33613361
return "unexpectedBeforeIsKeyword"
33623362
case \UnresolvedIsExprSyntax.isKeyword:

0 commit comments

Comments
 (0)