Move internal quoted.Type implementations to internal package

Author: nicolasstucki

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

@@ -15,7 +15,6 @@ import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.core.tasty.{PositionPickler, TastyPickler, TastyPrinter, TastyString}
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 
-import scala.quoted.Types._
 import scala.internal.quoted._
 import scala.reflect.ClassTag
 

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

@@ -33,8 +33,7 @@ import config.Printers.pickling
 import core.quoted.PickledQuotes
 
 import scala.quoted
-import scala.quoted.Types.TreeType
-import scala.internal.quoted.TastyTreeExpr
+import scala.internal.quoted.{TastyTreeExpr, TreeType}
 import scala.annotation.constructorOnly
 import scala.annotation.internal.sharable
 

compiler/src/dotty/tools/dotc/tastyreflect/KernelImpl.scala

@@ -1768,7 +1768,7 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
   /** Convert `Type` to an `quoted.Type[_]` */
   def QuotedType_seal(self: Type)(implicit ctx: Context): scala.quoted.Type[_] = {
     val dummySpan = ctx.owner.span // FIXME
-    new scala.quoted.Types.TreeType(tpd.TypeTree(self).withSpan(dummySpan))
+    new scala.internal.quoted.TreeType(tpd.TypeTree(self).withSpan(dummySpan))
   }
 
   //

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

@@ -105,7 +105,7 @@ object Splicer {
       new scala.internal.quoted.TastyTreeExpr(Inlined(EmptyTree, Nil, tree).withSpan(tree.span))
 
     protected def interpretTypeQuote(tree: Tree)(implicit env: Env): Object =
-      new scala.quoted.Types.TreeType(tree)
+      new scala.internal.quoted.TreeType(tree)
 
     protected def interpretLiteral(value: Any)(implicit env: Env): Object =
       value.asInstanceOf[Object]

library/src-2.x/scala/quoted/Type.scala

@@ -1,48 +1,53 @@
-package scala.quoted
+package scala
 
-import scala.quoted.Types.TaggedType
-import scala.reflect.ClassTag
-import scala.runtime.quoted.Unpickler.Pickled
+package quoted {
+  import scala.internal.quoted.TaggedType
 
-sealed abstract class Type[T] {
-  type `$splice` = T
-}
-
-/** Some basic type tags, currently incomplete */
-object Type {
+  sealed abstract class Type[T] {
+    type `$splice` = T
+  }
 
-  implicit class TypeOps[T](tpe: Type[T]) {
-    /** Show a source code like representation of this type */
-    def show(implicit toolbox: Toolbox): String = toolbox.show(tpe.asInstanceOf[Type[Any]])
+  /** Some basic type tags, currently incomplete */
+  object Type {
+
+    implicit class TypeOps[T](tpe: Type[T]) {
+      /** Show a source code like representation of this type */
+      def show(implicit toolbox: Toolbox): String = toolbox.show(tpe.asInstanceOf[Type[Any]])
+    }
+
+    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]
   }
 
-  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]
 }
 
-/** All implementations of Type[T].
- *  These should never be used directly.
- */
-object Types {
-  /** A Type backed by a pickled TASTY tree */
-  final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] {
-    override def toString(): String = s"Type(<pickled tasty>)"
-  }
+package internal {
+  package quoted {
+    import scala.quote.Type
+    import scala.reflect.ClassTag
+    import scala.runtime.quoted.Unpickler.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)"
-  }
+    /** A Type backed by a pickled TASTY tree */
+    final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] {
+      override def toString(): String = s"Type(<pickled tasty>)"
+    }
+
+    /** 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)"
+    }
+
+    /** An Type backed by a tree */
+    final class TreeType[Tree](val typeTree: Tree) extends quoted.Type[Any] {
+      override def toString: String = s"Type(<tasty tree>)"
+    }
 
-  /** An Type backed by a tree */
-  final class TreeType[Tree](val typeTree: Tree) extends quoted.Type[Any] {
-    override def toString: String = s"Type(<tasty tree>)"
   }
 }

library/src-3.x/scala/quoted/Type.scala

@@ -1,48 +1,53 @@
-package scala.quoted
+package scala
 
-import scala.quoted.Types.TaggedType
-import scala.reflect.ClassTag
-import scala.runtime.quoted.Unpickler.Pickled
+package quoted {
+  import scala.internal.quoted.TaggedType
 
-sealed abstract class Type[T <: AnyKind] {
-  type `$splice` = T
-}
-
-/** Some basic type tags, currently incomplete */
-object Type {
+  sealed abstract class Type[T <: AnyKind] {
+    type `$splice` = T
+  }
 
-  implicit object TypeOps {
-    /** Show a source code like representation of this type */
-    def (tpe: Type[T]) show[T] given Toolbox: String = the[Toolbox].show(tpe.asInstanceOf[Type[Any]])
+  /** Some basic type tags, currently incomplete */
+  object Type {
+
+    implicit object TypeOps {
+      /** Show a source code like representation of this type */
+      def (tpe: Type[T]) show[T] given Toolbox: String = the[Toolbox].show(tpe.asInstanceOf[Type[Any]])
+    }
+
+    implied UnitTag for Type[Unit] = new TaggedType[Unit]
+    implied BooleanTag for Type[Boolean] = new TaggedType[Boolean]
+    implied ByteTag for Type[Byte] = new TaggedType[Byte]
+    implied CharTag for Type[Char] = new TaggedType[Char]
+    implied ShortTag for Type[Short] = new TaggedType[Short]
+    implied IntTag for Type[Int] = new TaggedType[Int]
+    implied LongTag for Type[Long] = new TaggedType[Long]
+    implied FloatTag for Type[Float] = new TaggedType[Float]
+    implied DoubleTag for Type[Double] = new TaggedType[Double]
   }
 
-  implied UnitTag for Type[Unit] = new TaggedType[Unit]
-  implied BooleanTag for Type[Boolean] = new TaggedType[Boolean]
-  implied ByteTag for Type[Byte] = new TaggedType[Byte]
-  implied CharTag for Type[Char] = new TaggedType[Char]
-  implied ShortTag for Type[Short] = new TaggedType[Short]
-  implied IntTag for Type[Int] = new TaggedType[Int]
-  implied LongTag for Type[Long] = new TaggedType[Long]
-  implied FloatTag for Type[Float] = new TaggedType[Float]
-  implied DoubleTag for Type[Double] = new TaggedType[Double]
 }
 
-/** All implementations of Type[T].
- *  These should never be used directly.
- */
-object Types {
-  /** A Type backed by a pickled TASTY tree */
-  final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] {
-    override def toString(): String = s"Type(<pickled tasty>)"
-  }
+package internal {
+  package quoted {
+    import scala.quoted.Type
+    import scala.reflect.ClassTag
+    import scala.runtime.quoted.Unpickler.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)"
-  }
+    /** A Type backed by a pickled TASTY tree */
+    final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] {
+      override def toString(): String = s"Type(<pickled tasty>)"
+    }
+
+    /** 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)"
+    }
+
+    /** An Type backed by a tree */
+    final class TreeType[Tree](val typeTree: Tree) extends Type[Any] {
+      override def toString: String = s"Type(<tasty tree>)"
+    }
 
-  /** An Type backed by a tree */
-  final class TreeType[Tree](val typeTree: Tree) extends quoted.Type[Any] {
-    override def toString: String = s"Type(<tasty tree>)"
   }
 }

library/src/scala/runtime/quoted/Unpickler.scala

@@ -1,7 +1,6 @@
 package scala.runtime.quoted
 
-import scala.quoted.Types.TastyType
-import scala.internal.quoted.{LiftedExpr, TastyExpr}
+import scala.internal.quoted.{LiftedExpr, TastyExpr, TastyType}
 import scala.quoted.{Expr, Type}
 
 /** Provides methods to unpickle `Expr` and `Type` trees. */
@@ -20,7 +19,7 @@ object Unpickler {
   /** Lift the `value` to an `Expr` tree.
    *  Values can only be of type Boolean, Byte, Short, Char, Int, Long, Float, Double, Unit, String, Null or Class.
    */
-  def liftedExpr[T](value: T): LiftedExpr[T] = new LiftedExpr[T](value)
+  def liftedExpr[T](value: T): Expr[T] = new LiftedExpr[T](value)
 
   /** Unpickle `repr` which represents a pickled `Type` tree,
    *  replacing splice nodes with `args`