Move TastyTreeExpr and TreeType out of the library

Now that Expr and Type are not sealed these do not need to be in the library

Author: nicolasstucki

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

@@ -15,7 +15,7 @@ import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 import dotty.tools.dotc.quoted.QuoteContext
-import dotty.tools.dotc.tastyreflect.ReflectionImpl
+import dotty.tools.dotc.tastyreflect.{ReflectionImpl, TastyTreeExpr, TreeType}
 
 import dotty.tools.tasty.TastyString
 

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

@@ -38,7 +38,7 @@ import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.tasty.TastyFormat._
 
 import scala.quoted
-import scala.internal.quoted.{TastyTreeExpr, TreeType}
+import dotty.tools.dotc.tastyreflect.{TastyTreeExpr, TreeType}
 import scala.annotation.constructorOnly
 import scala.annotation.internal.sharable
 

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

@@ -35,10 +35,10 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
   //
 
   def unpickleExpr(repr: Unpickler.PickledQuote, args: Unpickler.PickledExprArgs): scala.quoted.Expr[?] =
-    new scala.internal.quoted.TastyTreeExpr(PickledQuotes.unpickleExpr(repr, args), compilerId)
+    new TastyTreeExpr(PickledQuotes.unpickleExpr(repr, args), compilerId)
 
   def unpickleType(repr: Unpickler.PickledQuote, args: Unpickler.PickledTypeArgs): scala.quoted.Type[?] =
-    new scala.internal.quoted.TreeType(PickledQuotes.unpickleType(repr, args), compilerId)
+    new TreeType(PickledQuotes.unpickleType(repr, args), compilerId)
 
   //
   // CONTEXT
@@ -1779,7 +1779,7 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
   /** Convert `Term` to an `quoted.Expr[Any]`  */
   def QuotedExpr_seal(self: Term)(given ctx: Context): scala.quoted.Expr[Any] = self.tpe.widen match {
     case _: Types.MethodType | _: Types.PolyType => throw new Exception("Cannot seal a partially applied Term. Try eta-expanding the term first.")
-    case _ => new scala.internal.quoted.TastyTreeExpr(self, compilerId)
+    case _ => new TastyTreeExpr(self, compilerId)
   }
 
   /** Checked cast to a `quoted.Expr[U]` */
@@ -1799,7 +1799,7 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
   /** Convert `Type` to an `quoted.Type[?]` */
   def QuotedType_seal(self: Type)(given ctx: Context): scala.quoted.Type[?] = {
     val dummySpan = ctx.owner.span // FIXME
-    new scala.internal.quoted.TreeType(tpd.TypeTree(self).withSpan(dummySpan), compilerId)
+    new TreeType(tpd.TypeTree(self).withSpan(dummySpan), compilerId)
   }
 
   //
@@ -1988,4 +1988,3 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
 
   private def compilerId: Int = rootContext.outersIterator.toList.last.hashCode()
 }
-

library/src/scala/internal/quoted/TastyTreeExpr.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/TastyTreeExpr.scala

@@ -1,15 +1,13 @@
-package scala.internal.quoted
-
-import scala.quoted.Expr
+package dotty.tools.dotc.tastyreflect
 
 /** An Expr backed by a tree. Only the current compiler trees are allowed.
-  *
-  *  These expressions are used for arguments of macros. They contain and actual tree
-  *  from the program that is being expanded by the macro.
-  *
-  *  May contain references to code defined outside this TastyTreeExpr instance.
-  */
-final class TastyTreeExpr[Tree](val tree: Tree, val scopeId: Int) extends Expr[Any] {
+ *
+ *  These expressions are used for arguments of macros. They contain and actual tree
+ *  from the program that is being expanded by the macro.
+ *
+ *  May contain references to code defined outside this TastyTreeExpr instance.
+ */
+final class TastyTreeExpr[Tree](val tree: Tree, val scopeId: Int) extends scala.quoted.Expr[Any] {
   override def equals(that: Any): Boolean = that match {
     case that: TastyTreeExpr[_] =>
       // TastyTreeExpr are wrappers around trees, therfore they are equals if their trees are equal.

library/src/scala/internal/quoted/TreeType.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/TreeType.scala

@@ -1,4 +1,4 @@
-package scala.internal.quoted
+package dotty.tools.dotc.tastyreflect
 
 /** An Type backed by a tree */
 final class TreeType[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quoted.Type[Any] {

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

@@ -17,7 +17,7 @@ import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.{NameKinds, TypeErasure}
 import dotty.tools.dotc.core.Constants.Constant
-import dotty.tools.dotc.tastyreflect.ReflectionImpl
+import dotty.tools.dotc.tastyreflect.{ReflectionImpl, TastyTreeExpr, TreeType}
 
 import scala.util.control.NonFatal
 import dotty.tools.dotc.util.SourcePosition
@@ -246,10 +246,10 @@ object Splicer {
     }
 
     private def interpretQuote(tree: Tree)(implicit env: Env): Object =
-      new scala.internal.quoted.TastyTreeExpr(Inlined(EmptyTree, Nil, tree).withSpan(tree.span), QuoteContext.scopeId)
+      new TastyTreeExpr(Inlined(EmptyTree, Nil, tree).withSpan(tree.span), QuoteContext.scopeId)
 
     private def interpretTypeQuote(tree: Tree)(implicit env: Env): Object =
-      new scala.internal.quoted.TreeType(tree, QuoteContext.scopeId)
+      new TreeType(tree, QuoteContext.scopeId)
 
     private def interpretLiteral(value: Any)(implicit env: Env): Object =
       value.asInstanceOf[Object]

library/src/scala/quoted/Expr.scala

@@ -4,7 +4,7 @@ import scala.quoted.show.SyntaxHighlight
 
 /** Quoted expression of type `T`
  *
- *  Restriction: only the QuoteContext implementation is allowed to extend this trait.
+ *  Restriction: only the QuoteContext.tasty.internal implementation is allowed to extend this trait.
  *  Any other implementation will result in an undefined behavior.
  */
 trait Expr[+T] {

library/src/scala/quoted/Type.scala

@@ -4,7 +4,7 @@ import scala.quoted.show.SyntaxHighlight
 
 /** Quoted type (or kind) `T`
  *
- *  Restriction: only the QuoteContext implementation is allowed to extend this trait.
+ *  Restriction: only the QuoteContext.tasty.internal implementation is allowed to extend this trait.
  *  Any other implementation will result in an undefined behavior.
  */
 trait Type[T <: AnyKind] {