Simplify RawQuoted instantiations

Author: nicolasstucki

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

@@ -20,7 +20,7 @@ import config.Printers.pickling
 import typer.Checking
 import config.Config
 import dotty.tools.dotc.quoted.PickledQuotes
-import dotty.tools.dotc.interpreter.RawExpr
+import dotty.tools.dotc.interpreter.RawQuoted
 import scala.quoted.Expr
 
 /** Unpickler for typed trees
@@ -1035,7 +1035,7 @@ class TreeUnpickler(reader: TastyReader,
               val splice = splices(idx)
               val expr =
                 if (args.isEmpty) splice.asInstanceOf[Expr[_]]
-                else splice.asInstanceOf[Seq[Any] => Expr[_]](args.map(arg => new RawExpr(arg)))
+                else splice.asInstanceOf[Seq[Any] => Expr[_]](args.map(RawQuoted.apply))
               PickledQuotes.quotedToTree(expr)
             case _ =>
               readPathTerm()

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

@@ -54,9 +54,9 @@ class Interpreter(implicit ctx: Context) {
     try {
       tree match {
         case Apply(_, quote :: Nil) if tree.symbol eq defn.quoteMethod =>
-          new RawExpr(quote)
+          RawQuoted(quote)
         case TypeApply(_, quote :: Nil) if tree.symbol eq defn.typeQuoteMethod =>
-          new RawType(quote)
+          RawQuoted(quote)
 
         case Literal(Constant(c)) =>
           c.asInstanceOf[AnyRef]

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

@@ -10,3 +10,13 @@ trait RawQuoted extends quoted.Quoted {
   def tree: tpd.Tree
   override def toString: String = s"${this.getClass.getName}(${tree.toString})"
 }
+
+object RawQuoted {
+
+  def apply(tree: tpd.Tree): RawQuoted =
+    if (tree.isTerm) new RawExpr(tree)
+    else new RawType(tree)
+
+  private final class RawExpr(val tree: tpd.Tree) extends quoted.Expr[Any] with RawQuoted
+  private final class RawType(val tree: tpd.Tree) extends quoted.Type[Any] with RawQuoted
+}