Skip to content

Commit cf079aa

Browse files
committed
Ensure that by name parameters are inlined
1 parent 68b75fc commit cf079aa

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed

compiler/src/dotty/tools/dotc/transform/Splicer.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ object Splicer {
4646
*/
4747
private def getLiftedArgs(call: Tree, bindings: List[Tree])(implicit ctx: Context): List[Any] = {
4848
val bindMap = bindings.map {
49-
case vdef: ValOrDefDef => (vdef.rhs, ref(vdef.symbol))
49+
case vdef: ValDef => (vdef.rhs, ref(vdef.symbol))
50+
case ddef: DefDef => (ddef.rhs, ddef.rhs)
5051
}.toMap
5152
def allArgs(call: Tree, acc: List[List[Tree]]): List[List[Tree]] = call match {
5253
case call: Apply => allArgs(call.fun, call.args :: acc)

tests/run/quote-impure-by-name.check

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1 + {Index.zero[String("bar"), scala.Tuple2[String("baz"), scala.Unit]]}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import scala.quoted._
2+
3+
import dotty.tools.dotc.quoted.Toolbox._
4+
5+
class Index[K, Keys](val index: String) extends AnyVal {
6+
override def toString: String = index
7+
}
8+
object Index {
9+
10+
implicit def zero[K, T]: Index[K, (K, T)] = new Index("0")
11+
12+
implicit inline def succ[K, H, T](implicit prev: => Index[K, T]): Index[K, (H, T)] = ~succImpl('(prev))('[K], '[H], '[T])
13+
14+
def succImpl[K, H, T](prev: Expr[Index[K, T]])(implicit k: Type[K], h: Type[H], t: Type[T]): Expr[Index[K, (H, T)]] = {
15+
val value = s"1 + {${prev.show}}"
16+
'(new Index(~value.toExpr))
17+
}
18+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
object Test {
2+
3+
def main(args: Array[String]): Unit = {
4+
println(Index.succ["bar", "foo", ("bar", ("baz", Unit))])
5+
}
6+
}

0 commit comments

Comments
 (0)