@@ -21,15 +21,15 @@ extension OperatorPrecedence {
21
21
private struct PrecedenceBound {
22
22
let groupName : PrecedenceGroupName ?
23
23
let isStrict : Bool
24
- let syntax : SyntaxProtocol ?
24
+ let syntax : Syntax ?
25
25
}
26
26
27
27
/// Determine whether we should consider an operator in the given group
28
28
/// based on the specified bound.
29
29
private func shouldConsiderOperator(
30
30
fromGroup groupName: PrecedenceGroupName ? ,
31
31
in bound: PrecedenceBound ,
32
- operatorSyntax: SyntaxProtocol ? ,
32
+ operatorSyntax: Syntax ,
33
33
errorHandler: OperatorPrecedenceErrorHandler = { throw $0 }
34
34
) rethrows -> Bool {
35
35
guard let boundGroupName = bound. groupName else {
@@ -60,7 +60,7 @@ extension OperatorPrecedence {
60
60
if let binaryExpr = expr. as ( BinaryOperatorExprSyntax . self) {
61
61
let operatorName = binaryExpr. operatorToken. text
62
62
return try lookupOperatorPrecedenceGroupName (
63
- operatorName, referencedFrom: binaryExpr. operatorToken,
63
+ operatorName, referencedFrom: Syntax ( binaryExpr. operatorToken) ,
64
64
errorHandler: errorHandler
65
65
)
66
66
}
@@ -176,9 +176,9 @@ extension OperatorPrecedence {
176
176
/// Determine the associativity between two precedence groups.
177
177
private func associativity(
178
178
firstGroup: PrecedenceGroupName ? ,
179
- firstGroupSyntax: SyntaxProtocol ? ,
179
+ firstGroupSyntax: Syntax ? ,
180
180
secondGroup: PrecedenceGroupName ? ,
181
- secondGroupSyntax: SyntaxProtocol ? ,
181
+ secondGroupSyntax: Syntax ? ,
182
182
errorHandler: OperatorPrecedenceErrorHandler = { throw $0 }
183
183
) rethrows -> Associativity {
184
184
guard let firstGroup = firstGroup, let secondGroup = secondGroup else {
@@ -235,7 +235,7 @@ extension OperatorPrecedence {
235
235
let opPrecedence = try lookupPrecedence (
236
236
of: op, errorHandler: errorHandler)
237
237
if try ! shouldConsiderOperator(
238
- fromGroup: opPrecedence, in: bound, operatorSyntax: op
238
+ fromGroup: opPrecedence, in: bound, operatorSyntax: Syntax ( op )
239
239
) {
240
240
return nil
241
241
}
@@ -280,17 +280,17 @@ extension OperatorPrecedence {
280
280
// If the second operator's precedence is lower than the
281
281
// precedence bound, break out of the loop.
282
282
if try ! shouldConsiderOperator(
283
- fromGroup: op2Precedence, in: bound, operatorSyntax: op1,
283
+ fromGroup: op2Precedence, in: bound, operatorSyntax: Syntax ( op1) ,
284
284
errorHandler: errorHandler
285
285
) {
286
286
break
287
287
}
288
288
289
289
let associativity = try associativity (
290
290
firstGroup: op1Precedence,
291
- firstGroupSyntax: op1,
291
+ firstGroupSyntax: Syntax ( op1) ,
292
292
secondGroup: op2Precedence,
293
- secondGroupSyntax: op2,
293
+ secondGroupSyntax: Syntax ( op2) ,
294
294
errorHandler: errorHandler
295
295
)
296
296
@@ -313,7 +313,7 @@ extension OperatorPrecedence {
313
313
rhs = try fold (
314
314
rhs, rest: & rest,
315
315
bound: PrecedenceBound (
316
- groupName: op1Precedence, isStrict: true , syntax: op1
316
+ groupName: op1Precedence, isStrict: true , syntax: Syntax ( op1)
317
317
) ,
318
318
errorHandler: errorHandler
319
319
)
@@ -324,7 +324,7 @@ extension OperatorPrecedence {
324
324
rhs = try fold (
325
325
rhs, rest: & rest,
326
326
bound: PrecedenceBound (
327
- groupName: op1Precedence, isStrict: false , syntax: op1
327
+ groupName: op1Precedence, isStrict: false , syntax: Syntax ( op1)
328
328
) ,
329
329
errorHandler: errorHandler
330
330
)
0 commit comments