Skip to content

Commit 99eacab

Browse files
committed
Rename strange-sounding "group syntax" to "operator syntax".
1 parent 5039ad5 commit 99eacab

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Sources/SwiftOperatorPrecedence/OperatorPrecedence+Folding.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ extension OperatorPrecedence {
176176
/// Determine the associativity between two precedence groups.
177177
private func associativity(
178178
firstGroup: PrecedenceGroupName?,
179-
firstGroupSyntax: Syntax?,
179+
firstOperatorSyntax: Syntax?,
180180
secondGroup: PrecedenceGroupName?,
181-
secondGroupSyntax: Syntax?,
181+
secondOperatorSyntax: Syntax?,
182182
errorHandler: OperatorPrecedenceErrorHandler = { throw $0 }
183183
) rethrows -> Associativity {
184184
guard let firstGroup = firstGroup, let secondGroup = secondGroup else {
@@ -189,7 +189,7 @@ extension OperatorPrecedence {
189189
if firstGroup == secondGroup {
190190
guard let group = precedenceGraph.lookupGroup(firstGroup) else {
191191
try errorHandler(
192-
.missingGroup(firstGroup, referencedFrom: firstGroupSyntax))
192+
.missingGroup(firstGroup, referencedFrom: firstOperatorSyntax))
193193
return .none
194194
}
195195

@@ -198,7 +198,7 @@ extension OperatorPrecedence {
198198

199199
let prec = try precedenceGraph.precedence(
200200
relating: firstGroup, to: secondGroup,
201-
startSyntax: firstGroupSyntax, endSyntax: secondGroupSyntax,
201+
startSyntax: firstOperatorSyntax, endSyntax: secondOperatorSyntax,
202202
errorHandler: errorHandler
203203
)
204204

@@ -288,9 +288,9 @@ extension OperatorPrecedence {
288288

289289
let associativity = try associativity(
290290
firstGroup: op1Precedence,
291-
firstGroupSyntax: Syntax(op1),
291+
firstOperatorSyntax: Syntax(op1),
292292
secondGroup: op2Precedence,
293-
secondGroupSyntax: Syntax(op2),
293+
secondOperatorSyntax: Syntax(op2),
294294
errorHandler: errorHandler
295295
)
296296

Sources/SwiftOperatorPrecedence/OperatorPrecedence+Semantics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ extension Operator {
7373

7474
name = syntax.identifier.text
7575

76-
if let groupSyntax = syntax.operatorPrecedenceAndTypes?
76+
if let operatorSyntax = syntax.operatorPrecedenceAndTypes?
7777
.precedenceGroupAndDesignatedTypes {
78-
precedenceGroup = groupSyntax.firstToken?.text
78+
precedenceGroup = operatorSyntax.firstToken?.text
7979
} else {
8080
precedenceGroup = nil
8181
}

Sources/SwiftOperatorPrecedence/PrecedenceGraph.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ struct PrecedenceGraph {
7272

7373
var stack: [(PrecedenceGroupName, Syntax?)] =
7474
[(initialGroupName, initialSyntax)]
75-
while let (currentGroupName, currentGroupSyntax) = stack.popLast() {
75+
while let (currentGroupName, currentOperatorSyntax) = stack.popLast() {
7676
guard let currentGroup = lookupGroup(currentGroupName) else {
7777
try errorHandler(
78-
.missingGroup(currentGroupName, referencedFrom: currentGroupSyntax))
78+
.missingGroup(currentGroupName, referencedFrom: currentOperatorSyntax))
7979
continue
8080
}
8181

0 commit comments

Comments
 (0)