Represent quoted macro trees with tasty.Term

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala

@@ -41,7 +41,8 @@ object PickledQuotes {
         case value: Class[_] => ref(defn.Predef_classOf).appliedToType(classToType(value))
         case value=> Literal(Constant(value))
       }
-    case expr: TreeExpr[Tree] @unchecked => expr.tree
+    case expr: TreeExpr @unchecked =>
+      dotty.tools.dotc.tasty.internal.Term.tree(expr.term)
     case expr: FunctionAppliedTo[_, _] =>
       functionAppliedTo(quotedExprToTree(expr.f), quotedExprToTree(expr.x))
   }

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -1140,7 +1140,10 @@ class TreeUnpickler(reader: TastyReader,
       val idx = readNat()
       val args = until(end)(readTerm())
       val splice = splices(idx)
-      val reifiedArgs = args.map(arg => if (arg.isTerm) new TreeExpr(arg) else new TreeType(arg))
+      def wrap(arg: Tree) =
+        if (arg.isTerm) new TreeExpr(dotty.tools.dotc.tasty.internal.Term(arg))
+        else new TreeType(arg) // TODO use tasty type
+      val reifiedArgs = args.map(wrap)
       if (isType) {
         val quotedType =
           if (reifiedArgs.isEmpty) splice.asInstanceOf[quoted.Type[_]]

compiler/src/dotty/tools/dotc/quoted/Toolbox.scala

@@ -9,7 +9,7 @@ import dotty.tools.dotc.tasty.internal.Term
 
 import scala.quoted.Expr
 import scala.runtime.BoxedUnit
-import scala.quoted.Exprs.LiftedExpr
+import scala.quoted.Exprs.{LiftedExpr, TreeExpr}
 import scala.runtime.quoted._
 import scala.tasty.trees.Term
 
@@ -45,8 +45,10 @@ object Toolbox {
       case _ => new QuoteDriver().show(expr, showSettings)
     }
 
-    def toTasty(expr: Expr[T]): Term =
-      new QuoteDriver().withTree(expr, (tree, ctx) => Term(tree)(ctx), Settings.run())
+    def toTasty(expr: Expr[T]): Term = expr match {
+      case expr: TreeExpr => expr.term
+      case _ => new QuoteDriver().withTree(expr, (tree, ctx) => Term(tree)(ctx), Settings.run())
+    }
 
   }
 

compiler/src/dotty/tools/dotc/tasty/internal/Term.scala

@@ -155,6 +155,8 @@ object Term {
     case _ => None
   }
 
+  def tree(term: trees.Term): tpd.Tree = term.asInstanceOf[Impl].tree
+
   private[tasty] class Impl(val tree: tpd.Tree)(implicit val ctx: Context) extends trees.Term with Positioned {
 
     assert(tree.isTerm || tree.isInstanceOf[Trees.NamedArg[_]] || tree.isInstanceOf[Trees.SeqLiteral[_]])

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

@@ -60,7 +60,8 @@ object Splicer {
           case (arg, tp) =>
             assert(!tp.hasAnnotation(defn.InlineParamAnnot))
             // Replace argument by its binding
-            new scala.quoted.Exprs.TreeExpr(bindMap.getOrElse(arg, arg))
+            val term = dotty.tools.dotc.tasty.internal.Term(bindMap.getOrElse(arg, arg))
+            new scala.quoted.Exprs.TreeExpr(term)
         }
         args1 ::: liftArgs(tp.resType, args.tail)
       case tp: PolyType =>

library/src/scala/quoted/Expr.scala

@@ -2,13 +2,12 @@ package scala.quoted
 
 import scala.runtime.quoted.Toolbox
 import scala.runtime.quoted.Unpickler.Pickled
-import scala.tasty.trees.Term
 
 sealed abstract class Expr[T] {
   final def unary_~ : T = throw new Error("~ should have been compiled away")
   final def run(implicit toolbox: Toolbox[T]): T = toolbox.run(this)
   final def show(implicit toolbox: Toolbox[T]): String = toolbox.show(this)
-  final def toTasty(implicit toolbox: Toolbox[T]): Term = toolbox.toTasty(this)
+  final def toTasty(implicit toolbox: Toolbox[T]): scala.tasty.trees.Term = toolbox.toTasty(this)
 }
 
 object Expr {
@@ -36,7 +35,7 @@ object Exprs {
   }
 
   /** An Expr backed by a tree. Only the current compiler trees are allowed. */
-  final class TreeExpr[Tree](val tree: Tree) extends quoted.Expr[Any] {
+  final class TreeExpr(val term: scala.tasty.trees.Term) extends quoted.Expr[Any] {
     override def toString: String = s"Expr(<raw>)"
   }
 

tests/run/quote-tasty-position.check

@@ -0,0 +1,4 @@
+6
+7
+8
+9

tests/run/quote-tasty-position/quoted_1.scala

@@ -0,0 +1,8 @@
+import scala.quoted._
+
+import dotty.tools.dotc.quoted.Toolbox._
+
+object Lines {
+  inline def line(dummy: Int): Int = ~lineImpl('(dummy))
+  def lineImpl(dummy: Expr[Int]): Expr[Int] = (dummy.toTasty.pos.startLine + 1).toExpr
+}

tests/run/quote-tasty-position/quoted_2.scala

@@ -0,0 +1,11 @@
+
+import Lines._
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(line(0))
+    println(line(0))
+    println(line(0))
+    println(line(0))
+  }
+}