Skip to content

Commit 54cc9fb

Browse files
committed
Fix compilation error: all green again
It depends on the following fix to the compiler: scala/scala3#6581
1 parent a4acea0 commit 54cc9fb

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

scalatest.dotty/src/main/scala/org/scalatest/DiagrammedExprMacro.scala

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ object DiagrammedExprMacro {
4040
def default: Term =
4141
'{ DiagrammedExpr.simpleExpr[R](${expr.seal.cast[R]}, ${ getAnchor(expr) } ) }.unseal
4242

43-
def lets(xs: List[Term])(body: List[Term] => Term): Term = {
44-
def rec(xs: List[Term], acc: List[Term]): Term = xs match {
45-
case Nil => body(acc)
46-
case x :: xs => let(x) { (x: Term) => rec(xs, x :: acc) }
47-
}
48-
rec(xs, Nil)
49-
}
50-
5143
def getAnchorForSelect(sel: Select): Expr[Int] = {
5244
if (sel.name == "unary_!")
5345
(sel.pos.startColumn - rootPosition.startColumn).toExpr
@@ -90,7 +82,6 @@ object DiagrammedExprMacro {
9082
case Block(stats, expr) =>
9183
// call parse recursively using the expr argument if it is a block
9284
Block(stats, parse(refl)(expr))
93-
9485
case Apply(sel @ Select(lhs, op), rhs :: Nil) =>
9586
val anchor = getAnchorForSelect(sel.asInstanceOf[Select])
9687
op match {
@@ -128,7 +119,7 @@ object DiagrammedExprMacro {
128119
let(right) { r =>
129120
val left = l.seal.cast[DiagrammedExpr[T]]
130121
val right = r.seal.cast[DiagrammedExpr[_]]
131-
val res = apply('{$left.value}.unseal, op, Nil, '{$right.value}.unseal :: Nil).seal.cast[R]
122+
val res = apply(Select.unique(l, "value"), op, Nil, Select.unique(r, "value") :: Nil).seal.cast[R]
132123
'{ DiagrammedExpr.applyExpr[R]($left, $right :: Nil, $res, $anchor) }.unseal
133124
}
134125
}
@@ -147,7 +138,7 @@ object DiagrammedExprMacro {
147138
lets(rights) { rs =>
148139
val left = l.seal.cast[DiagrammedExpr[T]]
149140
val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])
150-
val res = Select.overloaded('{$left.value}.unseal, op, Nil, rs).seal.cast[R]
141+
val res = Select.overloaded(Select.unique(l, "value"), op, Nil, rs.map(r => Select.unique(r, "value"))).seal.cast[R]
151142
'{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal
152143
}
153144
}
@@ -165,7 +156,7 @@ object DiagrammedExprMacro {
165156
lets(rights) { rs =>
166157
val left = l.seal.cast[DiagrammedExpr[T]]
167158
val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])
168-
val res = Select.overloaded('{$left.value}.unseal, op, targs.map(_.tpe), rs).seal.cast[R]
159+
val res = Select.overloaded(Select.unique(l, "value"), op, targs.map(_.tpe), rs.map(r => Select.unique(r, "value"))).seal.cast[R]
169160
'{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal
170161
}
171162
}

0 commit comments

Comments
 (0)