Skip to content

Commit 16ca7ed

Browse files
committed
Improve naming and documentation for internal operations.
Plus, remove an unnecessary function whose optionality was unused.
1 parent 98c6e5d commit 16ca7ed

File tree

3 files changed

+10
-26
lines changed

3 files changed

+10
-26
lines changed

Sources/SwiftOperatorPrecedence/OperatorPrecedence+Folding.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extension OperatorPrecedence {
2929
private func shouldConsiderOperator(
3030
fromGroup groupName: PrecedenceGroupName?,
3131
in bound: PrecedenceBound,
32-
fromGroupSyntax: SyntaxProtocol?,
32+
operatorSyntax: SyntaxProtocol?,
3333
errorHandler: OperatorPrecedenceErrorHandler = { throw $0 }
3434
) rethrows -> Bool {
3535
guard let boundGroupName = bound.groupName else {
@@ -44,9 +44,9 @@ extension OperatorPrecedence {
4444
return !bound.isStrict
4545
}
4646

47-
return try precedence(
47+
return try precedenceGraph.precedence(
4848
relating: groupName, to: boundGroupName,
49-
startSyntax: fromGroupSyntax, endSyntax: bound.syntax,
49+
startSyntax: operatorSyntax, endSyntax: bound.syntax,
5050
errorHandler: errorHandler
5151
) != .lowerThan
5252
}
@@ -196,7 +196,7 @@ extension OperatorPrecedence {
196196
return group.associativity
197197
}
198198

199-
let prec = try precedence(
199+
let prec = try precedenceGraph.precedence(
200200
relating: firstGroup, to: secondGroup,
201201
startSyntax: firstGroupSyntax, endSyntax: secondGroupSyntax,
202202
errorHandler: errorHandler
@@ -235,7 +235,7 @@ extension OperatorPrecedence {
235235
let opPrecedence = try lookupPrecedence(
236236
of: op, errorHandler: errorHandler)
237237
if try !shouldConsiderOperator(
238-
fromGroup: opPrecedence, in: bound, fromGroupSyntax: op
238+
fromGroup: opPrecedence, in: bound, operatorSyntax: op
239239
) {
240240
return nil
241241
}
@@ -280,7 +280,7 @@ extension OperatorPrecedence {
280280
// If the second operator's precedence is lower than the
281281
// precedence bound, break out of the loop.
282282
if try !shouldConsiderOperator(
283-
fromGroup: op2Precedence, in: bound, fromGroupSyntax: op1,
283+
fromGroup: op2Precedence, in: bound, operatorSyntax: op1,
284284
errorHandler: errorHandler
285285
) {
286286
break

Sources/SwiftOperatorPrecedence/OperatorPrecedence.swift

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,4 @@ extension OperatorPrecedence {
7575

7676
return op.precedenceGroup
7777
}
78-
79-
/// Determine the relative precedence between two precedence groups.
80-
func precedence(
81-
relating startGroupName: PrecedenceGroupName?,
82-
to endGroupName: PrecedenceGroupName?,
83-
startSyntax: SyntaxProtocol?,
84-
endSyntax: SyntaxProtocol?,
85-
errorHandler: OperatorPrecedenceErrorHandler = { throw $0 }
86-
) rethrows -> Precedence {
87-
guard let startGroupName = startGroupName, let endGroupName = endGroupName
88-
else {
89-
return .unrelated
90-
}
91-
92-
return try precedenceGraph.precedence(
93-
relating: startGroupName, to: endGroupName,
94-
startSyntax: startSyntax, endSyntax: endSyntax,
95-
errorHandler: errorHandler
96-
)
97-
}
9878
}

Sources/SwiftOperatorPrecedence/PrecedenceGraph.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ struct PrecedenceGraph {
107107
///
108108
/// Follow the precedence relationships among the precedence groups to
109109
/// determine the precedence of the start group relative to the end group.
110+
///
111+
/// - Returns: Precedence.lowerThan if startGroupName has lower precedence
112+
/// than endGroupName, Precedence.higherThan if startGroupName has higher
113+
/// precedence than endGroup name, and Precedence.unrelated otherwise.
110114
func precedence(
111115
relating startGroupName: PrecedenceGroupName,
112116
to endGroupName: PrecedenceGroupName,

0 commit comments

Comments
 (0)