Add splices to the unpickler

Author: nicolasstucki

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

@@ -38,14 +38,18 @@ class DottyUnpickler(bytes: Array[Byte]) extends ClassfileParser.Embedded {
 
   val unpickler = new TastyUnpickler(bytes)
   private val posUnpicklerOpt = unpickler.unpickle(new PositionsSectionUnpickler)
-  private val treeUnpickler = unpickler.unpickle(new TreeSectionUnpickler(posUnpicklerOpt)).get
+  private val treeUnpickler = unpickler.unpickle(treeSectionUnpickler(posUnpicklerOpt)).get
 
   /** Enter all toplevel classes and objects into their scopes
    *  @param roots          a set of SymDenotations that should be overwritten by unpickling
    */
   def enter(roots: Set[SymDenotation])(implicit ctx: Context): Unit =
     treeUnpickler.enterTopLevel(roots)
 
+  protected def treeSectionUnpickler(posUnpicklerOpt: Option[PositionUnpickler]): TreeSectionUnpickler = {
+    new TreeSectionUnpickler(posUnpicklerOpt)
+  }
+
   /** Only used if `-Yretain-trees` is set. */
   private[this] var myBody: List[Tree] = _
   /** The unpickled trees, and the source file they come from. */

compiler/src/dotty/tools/dotc/interpreter/Expressions.scala

@@ -3,13 +3,11 @@ package dotty.tools.dotc.quoted
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Scopes._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
-import dotty.tools.dotc.interpreter.Expressions.exprToTree
 import dotty.tools.dotc.typer.FrontEnd
 import dotty.tools.dotc.util.Positions._
 import dotty.tools.dotc.util.SourceFile
@@ -20,6 +18,7 @@ import scala.quoted.Expr
 /** Frontend that receives scala.quoted.Expr as input */
 class ExprFrontend(putInClass: Boolean) extends FrontEnd {
   import tpd._
+  import PickledQuotes.quotedToTree
 
   override def isTyper = false
 
@@ -28,7 +27,7 @@ class ExprFrontend(putInClass: Boolean) extends FrontEnd {
       case exprUnit: ExprCompilationUnit =>
         val tree =
           if (putInClass) inClass(exprUnit.expr)
-          else exprToTree(exprUnit.expr)
+          else quotedToTree(exprUnit.expr)
         val source = new SourceFile("", Seq())
         CompilationUnit.mkCompilationUnit(source, tree, forceTrees = true)
     }
@@ -43,7 +42,7 @@ class ExprFrontend(putInClass: Boolean) extends FrontEnd {
     cls.enter(ctx.newDefaultConstructor(cls), EmptyScope)
     val meth = ctx.newSymbol(cls, nme.apply, Method, ExprType(defn.AnyType), coord = coord).entered
 
-    val quoted = exprToTree(expr)(ctx.withOwner(meth))
+    val quoted = quotedToTree(expr)(ctx.withOwner(meth))
 
     val run = DefDef(meth, quoted)
     val classTree = ClassDef(cls, DefDef(cls.primaryConstructor.asTerm), run :: Nil)

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

@@ -1,21 +1,20 @@
-package dotty.tools.dotc.interpreter
+package dotty.tools.dotc.quoted
 
 import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.config.Printers._
+import dotty.tools.dotc.core.Constants.Constant
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.NameKinds._
-import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.tasty._
+import dotty.tools.dotc.interpreter.RawQuoted
 
 object PickledQuotes {
   import tpd._
 
-  /** TODO */
+  /** Pickle the quote into a TASTY string */
   def pickleQuote(tree: Tree)(implicit ctx: Context): String = {
     if (ctx.reporter.hasErrors) "<error>"
     else {
@@ -25,10 +24,17 @@ object PickledQuotes {
     }
   }
 
-  /** TODO */
-  def unpickleQuote(expr: quoted.TastyQuoted)(implicit ctx: Context): Tree = {
+  /** Transform the expression into it's fully spliced Tree */
+  def quotedToTree(expr: quoted.Quoted)(implicit ctx: Context): Tree = expr match {
+    case expr: quoted.TastyQuoted => unpickleQuote(expr)
+    case expr: quoted.ValueExpr[_] => Literal(Constant(expr.value))
+    case expr: RawQuoted => expr.tree
+  }
+
+  /** Unpickle the tree contained in the TastyQuoted */
+  private def unpickleQuote(expr: quoted.TastyQuoted)(implicit ctx: Context): Tree = {
     val tastyBytes = TastyString.stringToTasty(expr.tasty)
-    val unpickled = unpickle(tastyBytes)
+    val unpickled = unpickle(tastyBytes, expr.args.map { case arg: quoted.Quoted => quotedToTree(arg) })
     unpickled match {
       case PackageDef(_, (vdef: ValDef) :: Nil) => vdef.rhs
     }
@@ -72,8 +78,8 @@ object PickledQuotes {
   }
 
   /** Unpickle TASTY bytes into it's tree */
-  private def unpickle(bytes: Array[Byte])(implicit ctx: Context): Tree = {
-    val unpickler = new DottyUnpickler(bytes)
+  private def unpickle(bytes: Array[Byte], splices: Seq[Any])(implicit ctx: Context): Tree = {
+    val unpickler = new QuoteUnpickler(bytes, splices)
     unpickler.enter(roots = Set(defn.RootPackage))
     val tree = unpickler.body.head
     if (pickling ne noPrinter) {

compiler/src/dotty/tools/dotc/interpreter/PickledQuotes.scala renamed to compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala

@@ -0,0 +1,23 @@
+package dotty.tools.dotc.quoted
+
+import dotty.tools.dotc.core.tasty._
+
+object QuoteUnpickler {
+  class QuotedTreeSectionUnpickler(posUnpickler: Option[PositionUnpickler], splices: Seq[Any])
+    extends DottyUnpickler.TreeSectionUnpickler(posUnpickler) {
+    override def unpickle(reader: TastyReader, nameAtRef: TastyUnpickler.NameTable) =
+      new TreeUnpickler(reader, nameAtRef, posUnpickler, splices)
+  }
+}
+
+/** A class for unpickling quoted Tasty trees and symbols.
+ *  @param bytes         the bytearray containing the Tasty file from which we unpickle
+ *  @param splices       splices that will fill the holes in the quote
+ */
+class QuoteUnpickler(bytes: Array[Byte], splices: Seq[Any]) extends DottyUnpickler(bytes) {
+  import DottyUnpickler._
+  import QuoteUnpickler._
+
+  protected override def treeSectionUnpickler(posUnpicklerOpt: Option[PositionUnpickler]): TreeSectionUnpickler =
+    new QuotedTreeSectionUnpickler(posUnpicklerOpt, splices)
+}

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

@@ -13,9 +13,10 @@ import tasty.TreePickler.Hole
 import MegaPhase.MiniPhase
 import SymUtils._
 import NameKinds.OuterSelectName
+
 import scala.collection.mutable
 import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.interpreter.PickledQuotes
+import dotty.tools.dotc.quoted.PickledQuotes
 
 
 /** Translates quoted terms and types to `unpickle` method calls.

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

@@ -6,6 +6,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.interpreter._
+import dotty.tools.dotc.quoted.PickledQuotes
 
 import scala.quoted
 
@@ -28,7 +29,7 @@ object Splicer {
   /** Splice the Tree for a Quoted expression which is constructed via a reflective call to the given method */
   private def reflectiveSplice(tree: Tree)(implicit ctx: Context): Tree = {
     val interpreter = new Interpreter
-    interpreter.interpretTree[quoted.Expr[_]](tree).map(Expressions.exprToTree(_)).getOrElse(tree)
+    interpreter.interpretTree[quoted.Expr[_]](tree).map(PickledQuotes.quotedToTree(_)).getOrElse(tree)
   }
 
 }