Merge pull request #3910 from dotty-staging/use-lists-for-quote-args

Use List for quote arguments as is done with quote pickled strings

Author: nicolasstucki

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

@@ -19,16 +19,12 @@ object PickledQuotes {
   import tpd._
 
   /** Pickle the quote into strings */
-  def pickleQuote(tree: Tree)(implicit ctx: Context): Tree = {
-    if (ctx.reporter.hasErrors) Literal(Constant("<error>"))
+  def pickleQuote(tree: Tree)(implicit ctx: Context): scala.runtime.quoted.Unpickler.Pickled = {
+    if (ctx.reporter.hasErrors) Nil
     else {
       val encapsulated = encapsulateQuote(tree)
       val pickled = pickle(encapsulated)
-      TastyString.pickle(pickled).foldRight[Tree](ref(defn.NilModule)) { (x, acc) =>
-        acc.select("::".toTermName)
-          .appliedToType(defn.StringType)
-          .appliedTo(Literal(Constant(x)))
-      }
+      TastyString.pickle(pickled)
     }
   }
 

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

@@ -265,12 +265,17 @@ class ReifyQuotes extends MacroTransform {
       if (inSplice)
         makeHole(body1, splices, quote.tpe)
       else {
+        def liftList(list: List[Tree], tpe: Type): Tree = {
+          list.foldRight[Tree](ref(defn.NilModule)) { (x, acc) =>
+            acc.select("::".toTermName).appliedToType(tpe).appliedTo(x)
+          }
+        }
         val isType = quote.tpe.isRef(defn.QuotedTypeClass)
         ref(if (isType) defn.Unpickler_unpickleType else defn.Unpickler_unpickleExpr)
           .appliedToType(if (isType) body1.tpe else body1.tpe.widen)
           .appliedTo(
-            PickledQuotes.pickleQuote(body1),
-            SeqLiteral(splices, TypeTree(defn.AnyType)))
+            liftList(PickledQuotes.pickleQuote(body1).map(x => Literal(Constant(x))), defn.StringType),
+            liftList(splices, defn.AnyType))
       }
     }.withPos(quote.pos)