Wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/config/Printers.scala

@@ -60,6 +60,5 @@ object Printers {
 // tests/run-staging/shonan-hmm failed
 // tests/run-staging/staged-tuples failed
 // tests/run-staging/staged-streams_1.scala failed
-// tests/run-staging/quote-nested-3.scala failed
 // tests/run-staging/quote-lib.scala failed
 // tests/run-staging/shonan-hmm-simple.scala failed

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

@@ -71,22 +71,25 @@ object PickledQuotes {
 
     val evaluateHoles = new TreeMap {
       override def transform(tree: tpd.Tree)(implicit ctx: Context): tpd.Tree = tree match {
-        case Hole(isType, idx, args) =>
-          assert(!isType)
-          val splice = splices(idx)
-          def wrap(arg: Tree) =
+        case Hole(isTerm, idx, args) =>
+          val reifiedArgs = args.map { arg =>
             if (arg.isTerm) (qctx: scala.quoted.QuoteContext) ?=> new TastyTreeExpr(arg, QuoteContext.scopeId)
             else new TreeType(arg, QuoteContext.scopeId)
-          val reifiedArgs = args.map(wrap)
+          }
+          val splice = splices(idx)
 
-          val splice1 = splice.asInstanceOf[Seq[Any] => scala.quoted.QuoteContext ?=> quoted.Expr[?]]
-          val quotedExpr = splice1(reifiedArgs)(using dotty.tools.dotc.quoted.QuoteContext())
-          val filled = PickledQuotes.quotedExprToTree(quotedExpr)
+          if isTerm then
+            val splice1 = splice.asInstanceOf[Seq[Any] => scala.quoted.QuoteContext ?=> quoted.Expr[?]]
+            val quotedExpr = splice1(reifiedArgs)(using dotty.tools.dotc.quoted.QuoteContext())
+            val filled = PickledQuotes.quotedExprToTree(quotedExpr)
 
-          // We need to make sure a hole is created with the source file of the surrounding context, even if
-          // it filled with contents a different source file.
-          if filled.source == ctx.source then filled
-          else filled.cloneIn(ctx.source).withSpan(tree.span)
+            // We need to make sure a hole is created with the source file of the surrounding context, even if
+            // it filled with contents a different source file.
+            if filled.source == ctx.source then filled
+            else filled.cloneIn(ctx.source).withSpan(tree.span)
+          else
+            val quotedType = splice.asInstanceOf[Seq[Any] => quoted.Type[?]](reifiedArgs)
+            PickledQuotes.quotedTypeToTree(quotedType)
 
         case tree =>
           if tree.isDef then
@@ -125,8 +128,10 @@ object PickledQuotes {
     class ReplaceSplicedTyped(typeSpliceMap: Map[Symbol, Type]) extends TypeMap() {
       override def apply(tp: Type): Type = {
         val tp1 = tp match {
-          case tp: TypeRef if tp.typeSymbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) =>
-            typeSpliceMap(tp.symbol)
+          case tp: TypeRef =>
+            typeSpliceMap.get(tp.symbol) match
+              case Some(t) if tp.typeSymbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) => t
+              case None => tp
           case _ => tp
         }
         mapOver(tp1)

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

@@ -26,7 +26,8 @@ object TreePickler {
     override def isTerm: Boolean = isTermHole
     override def isType: Boolean = !isTermHole
     override def fallbackToText(printer: Printer): Text =
-      s"[[$idx|" ~~ printer.toTextGlobal(tpe) ~~ "|" ~~ printer.toTextGlobal(args, ", ") ~~ "]]"
+      if isTermHole then s"{{{ $idx |" ~~ printer.toTextGlobal(tpe) ~~ "|" ~~ printer.toTextGlobal(args, ", ") ~~ "}}}"
+      else s"[[[ $idx |" ~~ printer.toTextGlobal(tpe) ~~ "|" ~~ printer.toTextGlobal(args, ", ") ~~ "]]]"
   }
 }
 

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

@@ -1216,7 +1216,7 @@ class TreeUnpickler(reader: TastyReader,
               val idx = readNat()
               val tpe = readType()
               val args = until(end)(readTerm())
-              TreePickler.Hole(false, idx, args).withType(tpe)
+              TreePickler.Hole(true, idx, args).withType(tpe)
             case _ =>
               readPathTerm()
           }
@@ -1252,7 +1252,7 @@ class TreeUnpickler(reader: TastyReader,
           val idx = readNat()
           val tpe = readType()
           val args = until(end)(readTerm())
-          TreePickler.Hole(true, idx, args).withType(tpe)
+          TreePickler.Hole(false, idx, args).withType(tpe)
         case _ =>
           if (isTypeTreeTag(nextByte)) readTerm()
           else {
@@ -1294,13 +1294,6 @@ class TreeUnpickler(reader: TastyReader,
       owner => new LazyReader(localReader, owner, ctx.mode, ctx.source, op)
     }
 
-    def readHole(end: Addr, isType: Boolean)(implicit ctx: Context): Tree = { // TODO inline by hand
-      val idx = readNat()
-      val tpe = readType()
-      val args = until(end)(readTerm())
-      TreePickler.Hole(isType, idx, args).withType(tpe)
-    }
-
 // ------ Setting positions ------------------------------------------------
 
     /** Pickled span for `addr`. */