Move library implemtations of Quoted to one place

Author: nicolasstucki

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

@@ -13,6 +13,8 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.tasty.{TastyPickler, TastyPrinter, TastyString}
 import dotty.tools.dotc.interpreter.RawQuoted
 
+import scala.quoted.Quoted._
+
 import scala.reflect.ClassTag
 
 object PickledQuotes {
@@ -30,20 +32,20 @@ object PickledQuotes {
 
   /** Transform the expression into its fully spliced Tree */
   def quotedToTree(expr: quoted.Quoted)(implicit ctx: Context): Tree = expr match {
-    case expr: quoted.TastyQuoted =>
+    case expr: TastyQuoted =>
       unpickleQuote(expr)
-    case expr: quoted.Liftable.ConstantExpr[_] =>
+    case expr: ConstantExpr[_] =>
       Literal(Constant(expr.value))
-    case expr: quoted.Expr.FunctionAppliedTo[_, _] =>
+    case expr: FunctionAppliedTo[_, _] =>
       functionAppliedTo(quotedToTree(expr.f), quotedToTree(expr.x))
-    case expr: quoted.Type.TaggedPrimitive[_] =>
+    case expr: TaggedType[_] =>
       classTagToTypeTree(expr.ct)
     case expr: RawQuoted =>
       expr.tree
   }
 
   /** Unpickle the tree contained in the TastyQuoted */
-  private def unpickleQuote(expr: quoted.TastyQuoted)(implicit ctx: Context): Tree = {
+  private def unpickleQuote(expr: TastyQuoted)(implicit ctx: Context): Tree = {
     val tastyBytes = TastyString.unpickle(expr.tasty)
     val unpickled = unpickle(tastyBytes, expr.args)
     unpickled match {

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

@@ -6,8 +6,8 @@ import dotty.tools.dotc.core.Constants._
 import dotty.tools.dotc.printing.RefinedPrinter
 
 import scala.quoted.Expr
-import scala.quoted.Liftable.ConstantExpr
 import scala.runtime.BoxedUnit
+import scala.quoted.Quoted.ConstantExpr
 import scala.runtime.quoted._
 
 /** Default runners for quoted expressions */

library/src/scala/quoted/Expr.scala

@@ -1,5 +1,6 @@
 package scala.quoted
 
+import scala.quoted.Quoted.FunctionAppliedTo
 import scala.runtime.quoted.Runner
 
 abstract class Expr[T] extends Quoted {
@@ -16,5 +17,4 @@ object Expr {
     def apply(x: Expr[T]): Expr[U] = new FunctionAppliedTo[T, U](f, x)
   }
 
-  final class FunctionAppliedTo[T, U] private[Expr](val f: Expr[T => U], val x: Expr[T]) extends Expr[U]
 }

library/src/scala/quoted/Liftable.scala

@@ -1,5 +1,7 @@
 package scala.quoted
 
+import scala.quoted.Quoted.ConstantExpr
+
 /** A typeclass for types that can be turned to `quoted.Expr[T]`
  *  without going through an explicit `'(...)` operation.
  */
@@ -18,10 +20,6 @@ object Liftable {
     def toExpr(implicit liftable: Liftable[T]): Expr[T] = liftable.toExpr(x)
   }
 
-  final class ConstantExpr[T] private[Liftable](val value: T) extends Expr[T] {
-    override def toString: String = s"Expr($value)"
-  }
-
   implicit def UnitIsLiftable: Liftable[Unit] = (x: Unit) => new ConstantExpr(x)
   implicit def BooleanIsLiftable: Liftable[Boolean] = (x: Boolean) => new ConstantExpr(x)
   implicit def ByteLiftable: Liftable[Byte] = (x: Byte) => new ConstantExpr(x)

library/src/scala/quoted/Quoted.scala

@@ -1,4 +1,46 @@
 package scala.quoted
 
+import scala.reflect.ClassTag
+import scala.runtime.quoted.Unpickler.Pickled
+
 /** Common superclass of Expr and Type */
 abstract class Quoted
+
+object Quoted {
+
+  /** A quote backed by a pickled TASTY tree */
+  trait TastyQuoted extends Quoted {
+    def tasty: Pickled
+    def args: Seq[Any]
+  }
+
+  // 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 {
+    override def toString(): String = s"Expr(<pickled>)"
+  }
+
+  /** An Expr backed by a value */
+  final class ConstantExpr[T](val value: T) extends Expr[T] {
+    override def toString: String = s"Expr($value)"
+  }
+
+  /** 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] {
+    override def toString: String = s"Expr($f <applied to> $x)"
+  }
+
+  // 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 {
+    override def toString(): String = s"Type(<pickled>)"
+  }
+
+  /** An Type backed by a value */
+  final class TaggedType[T](implicit val ct: ClassTag[T]) extends Type[T] {
+    override def toString: String = s"Type($ct)"
+  }
+
+}

library/src/scala/quoted/TastyExpr.scala

@@ -1,25 +1,20 @@
 package scala.quoted
 
-import scala.reflect.ClassTag
+import scala.quoted.Quoted.TaggedType
 
 abstract class Type[T] extends Quoted {
   type unary_~ = T
 }
 
 /** Some basic type tags, currently incomplete */
 object Type {
-
-  final class TaggedPrimitive[T] private[Type] (implicit val ct: ClassTag[T]) extends Type[T] {
-    override def toString: String = s"Type($ct)"
-  }
-
-  implicit def UnitTag: Type[Unit] = new TaggedPrimitive[Unit]
-  implicit def BooleanTag: Type[Boolean] = new TaggedPrimitive[Boolean]
-  implicit def ByteTag: Type[Byte] = new TaggedPrimitive[Byte]
-  implicit def CharTag: Type[Char] = new TaggedPrimitive[Char]
-  implicit def ShortTag: Type[Short] = new TaggedPrimitive[Short]
-  implicit def IntTag: Type[Int] = new TaggedPrimitive[Int]
-  implicit def LongTag: Type[Long] = new TaggedPrimitive[Long]
-  implicit def FloatTag: Type[Float] = new TaggedPrimitive[Float]
-  implicit def DoubleTag: Type[Double] = new TaggedPrimitive[Double]
+  implicit def UnitTag: Type[Unit] = new TaggedType[Unit]
+  implicit def BooleanTag: Type[Boolean] = new TaggedType[Boolean]
+  implicit def ByteTag: Type[Byte] = new TaggedType[Byte]
+  implicit def CharTag: Type[Char] = new TaggedType[Char]
+  implicit def ShortTag: Type[Short] = new TaggedType[Short]
+  implicit def IntTag: Type[Int] = new TaggedType[Int]
+  implicit def LongTag: Type[Long] = new TaggedType[Long]
+  implicit def FloatTag: Type[Float] = new TaggedType[Float]
+  implicit def DoubleTag: Type[Double] = new TaggedType[Double]
 }

library/src/scala/quoted/TastyQuoted.scala

@@ -1,6 +1,7 @@
 package scala.runtime.quoted
 
-import scala.quoted._
+import scala.quoted.Quoted.{TastyExpr, TastyType}
+import scala.quoted.{Expr, Type}
 
 /** Provides methods to unpickle `Expr` and `Type` trees. */
 object Unpickler {