Remove TastyQuoted and RawQuoted abstractions

Author: nicolasstucki

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

@@ -31,7 +31,7 @@ object PickledQuotes {
 
   /** Transform the expression into its fully spliced Tree */
   def quotedExprToTree(expr: quoted.Expr[_])(implicit ctx: Context): Tree = expr match {
-    case expr: TastyExpr[_] => unpickleQuote(expr)
+    case expr: TastyExpr[_] => unpickleExpr(expr)
     case expr: ConstantExpr[_] => Literal(Constant(expr.value))
     case expr: RawExpr[Tree] @unchecked => expr.tree
     case expr: FunctionAppliedTo[_, _] =>
@@ -40,19 +40,27 @@ object PickledQuotes {
 
   /** Transform the expression into its fully spliced TypeTree */
   def quotedTypeToTree(expr: quoted.Type[_])(implicit ctx: Context): Tree = expr match {
-    case expr: TastyType[_] => unpickleQuote(expr)
+    case expr: TastyType[_] => unpickleType(expr)
     case expr: TaggedType[_] => classTagToTypeTree(expr.ct)
     case expr: RawType[Tree] @unchecked => expr.tree
   }
 
-  /** Unpickle the tree contained in the TastyQuoted */
-  private def unpickleQuote(expr: TastyQuoted)(implicit ctx: Context): Tree = {
+  /** Unpickle the tree contained in the TastyExpr */
+  private def unpickleExpr(expr: TastyExpr[_])(implicit ctx: Context): Tree = {
     val tastyBytes = TastyString.unpickle(expr.tasty)
     val unpickled = unpickle(tastyBytes, expr.args)
+    unpickled match {
+      case PackageDef(_, (vdef: ValDef) :: Nil) => vdef.rhs
+    }
+  }
+
+  /** Unpickle the tree contained in the TastyType */
+  private def unpickleType(ttpe: TastyType[_])(implicit ctx: Context): Tree = {
+    val tastyBytes = TastyString.unpickle(ttpe.tasty)
+    val unpickled = unpickle(tastyBytes, ttpe.args)
     unpickled match {
       case PackageDef(_, (vdef: ValDef) :: Nil) =>
-        if (vdef.name == "$quote".toTermName) vdef.rhs
-        else vdef.rhs.asInstanceOf[TypeApply].args.head
+        vdef.rhs.asInstanceOf[TypeApply].args.head
     }
   }
 

library/src/scala/quoted/Quoted.scala

@@ -8,24 +8,10 @@ abstract class Quoted
 
 object Quoted {
 
-  /** A quote backed by a pickled TASTY tree */
-  trait TastyQuoted extends Quoted {
-    def tasty: Pickled
-    def args: Seq[Any]
-  }
-
-  /** Quoted for which its internal representation is its tree.
-   *  - Used for trees that cannot be serialized, such as references to local symbols that will be spliced in.
-   *  - Used for trees that do not need to be serialized to avoid the overhead of serialization/deserialization.
-   */
-  trait RawQuoted[Tree] extends quoted.Quoted {
-    def tree: Tree
-  }
-
   // Implementations of Expr[T]
 
   /** An Expr backed by a pickled TASTY tree */
-  final class TastyExpr[T](val tasty: Pickled, val args: Seq[Any]) extends Expr[T] with TastyQuoted {
+  final class TastyExpr[T](val tasty: Pickled, val args: Seq[Any]) extends Expr[T] {
     override def toString(): String = s"Expr(<pickled>)"
   }
 
@@ -35,7 +21,9 @@ object Quoted {
   }
 
   /** An Expr backed by a tree */
-  final class RawExpr[Tree](val tree: Tree) extends quoted.Expr[Any] with RawQuoted[Tree]
+  final class RawExpr[Tree](val tree: Tree) extends quoted.Expr[Any] {
+    override def toString: String = s"Expr(<raw>)"
+  }
 
   /** An Expr representing `'{(~f).apply(~x)}` but it is beta-reduced when the closure is known */
   final class FunctionAppliedTo[T, U](val f: Expr[T => U], val x: Expr[T]) extends Expr[U] {
@@ -45,7 +33,7 @@ object Quoted {
   // Implementations of Type[T]
 
   /** A Type backed by a pickled TASTY tree */
-  final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] with TastyQuoted {
+  final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] {
     override def toString(): String = s"Type(<pickled>)"
   }
 
@@ -55,6 +43,8 @@ object Quoted {
   }
 
   /** An Type backed by a tree */
-  final class RawType[Tree](val tree: Tree) extends quoted.Type[Any] with RawQuoted[Tree]
+  final class RawType[Tree](val tree: Tree) extends quoted.Type[Any] {
+    override def toString: String = s"Type(<raw>)"
+  }
 
 }