Rename Raw{Expr|Type} to Tree{Expr|Type}

Author: nicolasstucki

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

@@ -34,7 +34,7 @@ object PickledQuotes {
   def quotedExprToTree(expr: quoted.Expr[_])(implicit ctx: Context): Tree = expr match {
     case expr: TastyExpr[_] => unpickleExpr(expr)
     case expr: ValueExpr[_] => Literal(Constant(expr.value))
-    case expr: RawExpr[Tree] @unchecked => expr.tree
+    case expr: TreeExpr[Tree] @unchecked => expr.tree
     case expr: FunctionAppliedTo[_, _] =>
       functionAppliedTo(quotedExprToTree(expr.f), quotedExprToTree(expr.x))
   }
@@ -43,7 +43,7 @@ object PickledQuotes {
   def quotedTypeToTree(expr: quoted.Type[_])(implicit ctx: Context): Tree = expr match {
     case expr: TastyType[_] => unpickleType(expr)
     case expr: TaggedType[_] => classTagToTypeTree(expr.ct)
-    case expr: RawType[Tree] @unchecked => expr.tree
+    case expr: TreeType[Tree] @unchecked => expr.tree
   }
 
   /** Unpickle the tree contained in the TastyExpr */

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

@@ -21,8 +21,8 @@ import typer.Checking
 import config.Config
 import dotty.tools.dotc.core.quoted.PickledQuotes
 import scala.quoted
-import scala.quoted.Types.RawType
-import scala.quoted.Exprs.RawExpr
+import scala.quoted.Types.TreeType
+import scala.quoted.Exprs.TreeExpr
 
 /** Unpickler for typed trees
  *  @param reader          the reader from which to unpickle
@@ -1102,12 +1102,12 @@ class TreeUnpickler(reader: TastyReader,
       if (isType) {
         val quotedType =
           if (args.isEmpty) splice.asInstanceOf[quoted.Type[_]]
-          else splice.asInstanceOf[Seq[Any] => quoted.Type[_]](args.map(tree => new RawType(tree)))
+          else splice.asInstanceOf[Seq[Any] => quoted.Type[_]](args.map(tree => new TreeType(tree)))
         PickledQuotes.quotedTypeToTree(quotedType)
       } else {
         val quotedExpr =
           if (args.isEmpty) splice.asInstanceOf[quoted.Expr[_]]
-          else splice.asInstanceOf[Seq[Any] => quoted.Expr[_]](args.map(tree => new RawExpr(tree)))
+          else splice.asInstanceOf[Seq[Any] => quoted.Expr[_]](args.map(tree => new TreeExpr(tree)))
         PickledQuotes.quotedExprToTree(quotedExpr)
       }
 

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

@@ -73,8 +73,8 @@ class Interpreter(implicit ctx: Context) {
 
     tree match {
       case Quoted(quotedTree) =>
-        if (tree.isTerm) new scala.quoted.Exprs.RawExpr(quotedTree)
-        else new scala.quoted.Types.RawType(quotedTree)
+        if (tree.isTerm) new scala.quoted.Exprs.TreeExpr(quotedTree)
+        else new scala.quoted.Types.TreeType(quotedTree)
 
       case Literal(Constant(c)) => c.asInstanceOf[Object]
 

library/src/scala/quoted/Expr.scala

@@ -19,7 +19,9 @@ object Expr {
 
 }
 
-/** All implementations of Expr[T] */
+/** All implementations of Expr[T].
+ *  These should never be used directly.
+ */
 object Exprs {
   /** An Expr backed by a pickled TASTY tree */
   final class TastyExpr[T](val tasty: Pickled, val args: Seq[Any]) extends Expr[T] {
@@ -33,8 +35,8 @@ object Exprs {
     override def toString: String = s"Expr($value)"
   }
 
-  /** An Expr backed by a tree */
-  final class RawExpr[Tree](val tree: Tree) extends quoted.Expr[Any] {
+  /** An Expr backed by a tree. Only the current compiler trees are allowed. */
+  final class TreeExpr[Tree](val tree: Tree) extends quoted.Expr[Any] {
     override def toString: String = s"Expr(<raw>)"
   }
 

library/src/scala/quoted/Type.scala

@@ -21,7 +21,9 @@ object Type {
   implicit def DoubleTag: Type[Double] = new TaggedType[Double]
 }
 
-/** Implementations of Type[T] */
+/** 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] {
@@ -34,7 +36,7 @@ object Types {
   }
 
   /** An Type backed by a tree */
-  final class RawType[Tree](val tree: Tree) extends quoted.Type[Any] {
+  final class TreeType[Tree](val tree: Tree) extends quoted.Type[Any] {
     override def toString: String = s"Type(<raw>)"
   }
 }