Make unplicke API receive all aguments

This allows us to generate code without nested closures.

Author: nicolasstucki

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

@@ -51,7 +51,7 @@ object PickledQuotes {
   }
 
   /** Unpickle the tree contained in the TastyExpr */
-  def unpickleTerm(pickled: String | List[String], typeHole: Int => Seq[Any] => scala.quoted.Type[?], termHole: Int => Seq[Any] => scala.quoted.QuoteContext => scala.quoted.Expr[?])(using Context): Tree = {
+  def unpickleTerm(pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?])(using Context): Tree = {
     val unpickled = withMode(Mode.ReadPositions)(unpickle(pickled, isType = false))
     val Inlined(call, Nil, expnasion) = unpickled
     val inlineCtx = inlineContext(call)
@@ -61,13 +61,13 @@ object PickledQuotes {
   }
 
   /** Unpickle the tree contained in the TastyType */
-  def unpickleTypeTree(pickled: String | List[String], typeHole: Int => Seq[Any] => scala.quoted.Type[?], termHole: Int => Seq[Any] => scala.quoted.QuoteContext => scala.quoted.Expr[?])(using Context): Tree = {
+  def unpickleTypeTree(pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?])(using Context): Tree = {
     val unpickled = withMode(Mode.ReadPositions)(unpickle(pickled, isType = true))
     spliceTypes(unpickled, typeHole, termHole)
   }
 
   /** Replace all term holes with the spliced terms */
-  private def spliceTerms(tree: Tree, typeHole: Int => Seq[Any] => scala.quoted.Type[?], termHole: Int => Seq[Any] => scala.quoted.QuoteContext => scala.quoted.Expr[?])(using Context): Tree = {
+  private def spliceTerms(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?])(using Context): Tree = {
     val evaluateHoles = new TreeMap {
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
         case Hole(isTerm, idx, args) =>
@@ -76,7 +76,7 @@ object PickledQuotes {
             else new scala.quoted.internal.Type(arg, QuoteContextImpl.scopeId)
           }
           if isTerm then
-            val quotedExpr = termHole(idx)(reifiedArgs)(dotty.tools.dotc.quoted.QuoteContextImpl())
+            val quotedExpr = termHole(idx, reifiedArgs, dotty.tools.dotc.quoted.QuoteContextImpl())
             val filled = PickledQuotes.quotedExprToTree(quotedExpr)
 
             // We need to make sure a hole is created with the source file of the surrounding context, even if
@@ -86,7 +86,7 @@ object PickledQuotes {
           else
             // Replaces type holes generated by PickleQuotes (non-spliced types).
             // These are types defined in a quote and used at the same level in a nested quote.
-            val quotedType = typeHole(idx)(reifiedArgs)
+            val quotedType = typeHole(idx, reifiedArgs)
             PickledQuotes.quotedTypeToTree(quotedType)
         case tree: Select =>
           // Retain selected members
@@ -121,15 +121,15 @@ object PickledQuotes {
   }
 
   /** Replace all type holes generated with the spliced types */
-  private def spliceTypes(tree: Tree, typeHole: Int => Seq[Any] => scala.quoted.Type[?], termHole: Int => Seq[Any] => Any)(using Context): Tree = {
+  private def spliceTypes(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Int], scala.quoted.QuoteContext) => Any)(using Context): Tree = {
     tree match
       case Block(stat :: rest, expr1) if stat.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) =>
         val typeSpliceMap = (stat :: rest).iterator.map {
           case tdef: TypeDef =>
             assert(tdef.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot))
             val tree = tdef.rhs match
               case TypeBoundsTree(_, Hole(_, idx, args), _) =>
-                val quotedType = typeHole(idx)(args)
+                val quotedType = typeHole(idx, args)
                 PickledQuotes.quotedTypeToTree(quotedType)
               case TypeBoundsTree(_, tpt, _) =>
                 tpt

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

@@ -2621,11 +2621,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
 
   end reflect
 
-  def unpickleExpr[T](pickled: String | List[String], typeHole: Int => Seq[Any] => scala.quoted.Type[?], termHole: Int => Seq[Any] => scala.quoted.QuoteContext => scala.quoted.Expr[?]): scala.quoted.Expr[T] =
+  def unpickleExpr[T](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?]): scala.quoted.Expr[T] =
     val tree = PickledQuotes.unpickleTerm(pickled, typeHole, termHole)(using reflect.rootContext)
     new scala.quoted.internal.Expr(tree, hash).asInstanceOf[scala.quoted.Expr[T]]
 
-  def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: Int => Seq[Any] => scala.quoted.Type[?], termHole: Int => Seq[Any] => scala.quoted.QuoteContext => scala.quoted.Expr[?]): scala.quoted.Type[T] =
+  def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?]): scala.quoted.Type[T] =
     val tree = PickledQuotes.unpickleTypeTree(pickled, typeHole, termHole)(using reflect.rootContext)
     new scala.quoted.internal.Type(tree, hash).asInstanceOf[scala.quoted.Type[T]]
 

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

@@ -217,15 +217,26 @@ class PickleQuotes extends MacroTransform {
         // - Remove typeHoles/termHoles casts.
         val splicesList = liftList(splices, defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType), defn.AnyType))
         val holes = SyntheticValDef("holes".toTermName, splicesList)
-        val typeHoles = ref(holes.symbol).asInstance(
-          defn.FunctionType(1).appliedTo(defn.IntType,
-            defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType),
-              defn.QuotedTypeClass.typeRef.appliedTo(defn.AnyType))))
-        val termHoles = ref(holes.symbol).asInstance(
-          defn.FunctionType(1).appliedTo(defn.IntType,
-            defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType),
-              defn.FunctionType(1).appliedTo(defn.QuoteContextClass.typeRef,
-                defn.QuotedExprClass.typeRef.appliedTo(defn.AnyType)))))
+
+        val typeHoles = Lambda(
+          MethodType(List(defn.IntType, defn.SeqType.appliedTo(defn.AnyType)), defn.QuotedTypeClass.typeRef.appliedTo(defn.AnyType)),
+          args =>
+            ref(holes.symbol).asInstance(
+                defn.FunctionType(1).appliedTo(defn.IntType,
+                  defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType),
+                    defn.QuotedTypeClass.typeRef.appliedTo(defn.AnyType))))
+              .select(nme.apply).appliedTo(args(0)).select(nme.apply).appliedTo(args(1))
+        )
+        val termHoles =Lambda(
+          MethodType(List(defn.IntType, defn.SeqType.appliedTo(defn.AnyType), defn.QuoteContextClass.typeRef), defn.QuotedExprClass.typeRef.appliedTo(defn.AnyType)),
+          args =>
+            ref(holes.symbol).asInstance(
+                defn.FunctionType(1).appliedTo(defn.IntType,
+                  defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType),
+                    defn.FunctionType(1).appliedTo(defn.QuoteContextClass.typeRef,
+                      defn.QuotedExprClass.typeRef.appliedTo(defn.AnyType)))))
+              .select(nme.apply).appliedTo(args(0)).select(nme.apply).appliedTo(args(1)).select(nme.apply).appliedTo(args(2))
+        )
 
         val quoteClass = if isType then defn.QuotedTypeClass else defn.QuotedExprClass
         val quotedType = quoteClass.typeRef.appliedTo(originalTp)

library/src/scala/internal/quoted/QuoteContextInternal.scala

@@ -9,12 +9,12 @@ trait QuoteContextInternal { self: QuoteContext =>
   /** Unpickle `repr` which represents a pickled `Expr` tree,
    *  replacing splice nodes with `holes`
    */
-  def unpickleExpr[T](pickled: String | List[String], typeHole: Int => Seq[Any] => Type[?], termHole: Int => Seq[Any] => QuoteContext => Expr[?]): scala.quoted.Expr[T]
+  def unpickleExpr[T](pickled: String | List[String], typeHole: (Int, Seq[Any]) => Type[?], termHole: (Int, Seq[Any], QuoteContext) => Expr[?]): scala.quoted.Expr[T]
 
   /** Unpickle `repr` which represents a pickled `Type` tree,
    *  replacing splice nodes with `holes`
    */
-  def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: Int => Seq[Any] => Type[?], termHole: Int => Seq[Any] => QuoteContext => Expr[?]): scala.quoted.Type[T]
+  def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: (Int, Seq[Any]) => Type[?], termHole: (Int, Seq[Any], QuoteContext) => Expr[?]): scala.quoted.Type[T]
 
   val ExprMatch: ExprMatchModule