Rename TASTy reflection method to reflect/reify

Author: nicolasstucki

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

@@ -8,16 +8,16 @@ import dotty.tools.dotc.reporting.diagnostic.MessageContainer
 trait QuotedOpsImpl extends scala.tasty.reflect.QuotedOps with TastyCoreImpl {
 
   def QuotedExprDeco[T](x: scala.quoted.Expr[T]): QuotedExprAPI = new QuotedExprAPI {
-    def toTasty(implicit ctx: Context): Term = PickledQuotes.quotedExprToTree(x)
+    def reflect(implicit ctx: Context): Term = PickledQuotes.quotedExprToTree(x)
   }
 
   def QuotedTypeDeco[T](x: scala.quoted.Type[T]): QuotedTypeAPI = new QuotedTypeAPI {
-    def toTasty(implicit ctx: Context): TypeTree = PickledQuotes.quotedTypeToTree(x)
+    def reflect(implicit ctx: Context): TypeTree = PickledQuotes.quotedTypeToTree(x)
   }
 
   def TermToQuoteDeco(term: Term): TermToQuotedAPI = new TermToQuotedAPI {
 
-    def toExpr[T: scala.quoted.Type](implicit ctx: Context): scala.quoted.Expr[T] = {
+    def reify[T: scala.quoted.Type](implicit ctx: Context): scala.quoted.Expr[T] = {
       typecheck(ctx)
       new scala.quoted.Exprs.TastyTreeExpr(term).asInstanceOf[scala.quoted.Expr[T]]
     }
@@ -28,7 +28,7 @@ trait QuotedOpsImpl extends scala.tasty.reflect.QuotedOps with TastyCoreImpl {
       ctx0.typerState.setReporter(new Reporter {
         def doReport(m: MessageContainer)(implicit ctx: Context): Unit = ()
       })
-      val tp = QuotedTypeDeco(implicitly[scala.quoted.Type[T]]).toTasty
+      val tp = QuotedTypeDeco(implicitly[scala.quoted.Type[T]]).reflect
       ctx0.typer.typed(term, tp.tpe)
       if (ctx0.reporter.hasErrors) {
         val stack = new Exception().getStackTrace

library/src/scala/tasty/reflect/QuotedOps.scala

@@ -4,17 +4,20 @@ package scala.tasty.reflect
 trait QuotedOps extends TastyCore {
 
   trait QuotedExprAPI {
-    def toTasty(implicit ctx: Context): Term
+    /** View this expression `Expr[T]` as a `Term` */
+    def reflect(implicit ctx: Context): Term
   }
   implicit def QuotedExprDeco[T](expr: quoted.Expr[T]): QuotedExprAPI
 
   trait QuotedTypeAPI {
-    def toTasty(implicit ctx: Context): TypeTree
+    /** View this expression `Type[T]` as a `TypeTree` */
+    def reflect(implicit ctx: Context): TypeTree
   }
   implicit def QuotedTypeDeco[T](tpe: quoted.Type[T]): QuotedTypeAPI
 
   trait TermToQuotedAPI {
-    def toExpr[T: scala.quoted.Type](implicit ctx: Context): scala.quoted.Expr[T]
+    /** Convert `Term` to an `Expr[T]` and check that it conforms to `T` */
+    def reify[T: scala.quoted.Type](implicit ctx: Context): scala.quoted.Expr[T]
   }
   implicit def TermToQuoteDeco(term: Term): TermToQuotedAPI
 

library/src/scala/tasty/util/ConstantExtractor.scala

@@ -25,6 +25,6 @@ class ConstantExtractor[T <: Tasty with Singleton](val tasty: T) {
       case Term.Inlined(_, Nil, e) => const(e)
       case _  => None
     }
-    const(expr.toTasty)
+    const(expr.reflect)
   }
 }

tests/neg/tasty-macro-assert-2/quoted_1.scala

@@ -17,7 +17,7 @@ object Asserts {
   def impl(cond: Expr[Boolean])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
 
-    val tree = cond.toTasty
+    val tree = cond.reflect
 
     def isOps(tpe: TypeOrBounds): Boolean = tpe match {
       case Type.SymRef(IsDefSymbol(sym), _) => sym.name == "Ops" // TODO check that the parent is Asserts
@@ -34,7 +34,7 @@ object Asserts {
 
     tree match {
       case Term.Inlined(_, Nil, Term.Apply(Term.Select(OpsTree(left), op, _), right :: Nil)) =>
-        '(assertTrue(~left.toExpr[Boolean])) // Buggy code. To generate the errors
+        '(assertTrue(~left.reify[Boolean])) // Buggy code. To generate the errors
       case _ =>
         '(assertTrue(~cond))
     }

tests/neg/tasty-macro-assert/quoted_1.scala

@@ -17,7 +17,7 @@ object Asserts {
   def impl(cond: Expr[Boolean])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
 
-    val tree = cond.toTasty
+    val tree = cond.reflect
 
     def isOps(tpe: TypeOrBounds): Boolean = tpe match {
       case Type.SymRef(IsDefSymbol(sym), _) => sym.name == "Ops" // TODO check that the parent is Asserts
@@ -34,7 +34,7 @@ object Asserts {
 
     tree match {
       case Term.Inlined(_, Nil, Term.Apply(Term.Select(OpsTree(left), op, _), right :: Nil)) =>
-        '(assertTrue(~left.toExpr[Boolean])) // Buggy code. To generate the errors
+        '(assertTrue(~left.reify[Boolean])) // Buggy code. To generate the errors
       case _ =>
         '(assertTrue(~cond))
     }

tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala

@@ -13,7 +13,7 @@ object Foo {
       case IsValSymbol(sym) => sym.tree.show.toExpr
       case IsBindSymbol(sym) => sym.tree.show.toExpr
     }
-    x.toTasty match {
+    x.reflect match {
       case Term.Inlined(None, Nil, arg) => definitionString(arg)
       case arg => definitionString(arg) // TODO should all by name parameters be in an inline node?
     }

tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala

@@ -13,7 +13,7 @@ object Foo {
       case IsValSymbol(sym) => sym.tree.show.toExpr
       case IsBindSymbol(sym) => sym.tree.show.toExpr
     }
-    x.toTasty match {
+    x.reflect match {
       case Term.Inlined(None, Nil, arg) => definitionString(arg)
       case arg => definitionString(arg) // TODO should all by name parameters be in an inline node?
     }

tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala

@@ -41,7 +41,7 @@ object Macros {
       }
     }
 
-    val tree = x.toTasty
+    val tree = x.reflect
     output.traverseTree(tree)
     '(print(~buff.result().toExpr))
   }

tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala

@@ -17,7 +17,7 @@ object Foo {
       case _ => '("NO DEFINTION")
     }
 
-    x.toTasty match {
+    x.reflect match {
       case Term.Inlined(None, Nil, arg) => definitionString(arg)
       case arg => definitionString(arg) // TODO should all by name parameters be in an inline node
     }

tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala

@@ -17,7 +17,7 @@ object Foo {
       case _ => '("NO DEFINTION")
     }
 
-    x.toTasty match {
+    x.reflect match {
       case Term.Inlined(None, Nil, arg) => definitionString(arg)
       case arg => definitionString(arg) // TODO should all by name parameters be in an inline node
     }

tests/run-separate-compilation/i5119/Macro_1.scala

@@ -8,6 +8,6 @@ object Macro {
   implicit inline def XmlQuote(sc: => StringContext): StringContextOps = new StringContextOps(sc)
   def impl(sc: Expr[StringContext], args: Expr[Seq[Any]])(implicit tasty: Tasty): Expr[String] = {
     import tasty._
-    (sc.toTasty.underlyingArgument.show + "\n" + args.toTasty.underlyingArgument.show).toExpr
+    (sc.reflect.underlyingArgument.show + "\n" + args.reflect.underlyingArgument.show).toExpr
   }
 }

tests/run-separate-compilation/i5119b/Macro_1.scala

@@ -7,7 +7,7 @@ object Macro {
 
   def impl(arg1: Expr[Any], arg2: Expr[Any])(implicit tasty: Tasty): Expr[String] = {
     import tasty._
-    (arg1.toTasty.underlyingArgument.show + "\n" + arg2.toTasty.underlyingArgument.show).toExpr
+    (arg1.reflect.underlyingArgument.show + "\n" + arg2.reflect.underlyingArgument.show).toExpr
   }
 
 }

tests/run-separate-compilation/tasty-argument-tree-1/quoted_1.scala

@@ -7,7 +7,7 @@ object Macros {
 
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    val tree = x.toTasty
+    val tree = x.reflect
     '{
       println()
       println("tree: " + ~tree.show.toExpr)

tests/run-separate-compilation/tasty-custom-show/quoted_1.scala

@@ -34,7 +34,7 @@ object Macros {
       }
     }
 
-    val tree = x.toTasty
+    val tree = x.reflect
     output.traverseTree(tree)
     '(print(~buff.result().toExpr))
   }

tests/run-separate-compilation/tasty-eval/quoted_1.scala

@@ -22,7 +22,7 @@ object Macros {
     override def value(e: Expr[Int])(implicit tasty: Tasty): Option[Int] = {
       import tasty._
 
-      e.toTasty.tpe match {
+      e.reflect.tpe match {
         case Type.SymRef(IsValSymbol(sym), pre) =>
           sym.tree.tpt.tpe match {
             case Type.ConstantType(Constant.Int(i)) => Some(i)

tests/run-separate-compilation/tasty-extractors-1/quoted_1.scala

@@ -10,7 +10,7 @@ object Macros {
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
 
-    val tree = x.toTasty
+    val tree = x.reflect
     val treeStr = tree.show
     val treeTpeStr = tree.tpe.show
 

tests/run-separate-compilation/tasty-extractors-2/quoted_1.scala

@@ -10,7 +10,7 @@ object Macros {
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
 
-    val tree = x.toTasty
+    val tree = x.reflect
 
     val treeStr = tree.show
     val treeTpeStr = tree.tpe.show

tests/run-separate-compilation/tasty-extractors-3/quoted_1.scala

@@ -20,7 +20,7 @@ object Macros {
       }
     }
 
-    val tree = x.toTasty
+    val tree = x.reflect
     traverser.traverseTree(tree)
     '(print(~buff.result().toExpr))
   }

tests/run-separate-compilation/tasty-extractors-types/quoted_1.scala

@@ -10,7 +10,7 @@ object Macros {
   def impl[T](x: Type[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
 
-    val tree = x.toTasty
+    val tree = x.reflect
     '{
       println(~tree.show.toExpr)
       println(~tree.tpe.show.toExpr)

tests/run-separate-compilation/tasty-indexed-map/quoted_1.scala

@@ -38,8 +38,8 @@ object Index {
       case _ => Nil
     }
 
-    val key = name(k.toTasty.tpe)
-    val keys = name(h.toTasty.tpe) :: names(t.toTasty.tpe)
+    val key = name(k.reflect.tpe)
+    val keys = name(h.reflect.tpe) :: names(t.reflect.tpe)
 
     val index = keys.indexOf(key)
 

tests/run-separate-compilation/tasty-macro-assert/quoted_1.scala

@@ -17,7 +17,7 @@ object Asserts {
   def impl(cond: Expr[Boolean])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
 
-    val tree = cond.toTasty
+    val tree = cond.reflect
 
     def isOps(tpe: TypeOrBounds): Boolean = tpe match {
       case Type.SymRef(IsDefSymbol(sym), _) => sym.name == "Ops"// TODO check that the parent is Asserts
@@ -35,8 +35,8 @@ object Asserts {
     tree match {
       case Term.Inlined(_, Nil, Term.Apply(Term.Select(OpsTree(left), op, _), right :: Nil)) =>
         op match {
-          case "===" => '(assertEquals(~left.toExpr[Any], ~right.toExpr[Any]))
-          case "!==" => '(assertNotEquals(~left.toExpr[Any], ~right.toExpr[Any]))
+          case "===" => '(assertEquals(~left.reify[Any], ~right.reify[Any]))
+          case "!==" => '(assertNotEquals(~left.reify[Any], ~right.reify[Any]))
         }
       case _ =>
         '(assertTrue(~cond))

tests/run-separate-compilation/tasty-subtyping/quoted_1.scala

@@ -12,13 +12,13 @@ object Macros {
 
   def isTypeEqualImpl[T, U](t: Type[T], u: Type[U])(implicit tasty: Tasty): Expr[Boolean] = {
     import tasty._
-    val isTypeEqual = t.toTasty.tpe =:= u.toTasty.tpe
+    val isTypeEqual = t.reflect.tpe =:= u.reflect.tpe
     isTypeEqual.toExpr
   }
 
   def isSubTypeOfImpl[T, U](t: Type[T], u: Type[U])(implicit tasty: Tasty): Expr[Boolean] = {
     import tasty._
-    val isTypeEqual = t.toTasty.tpe <:< u.toTasty.tpe
+    val isTypeEqual = t.reflect.tpe <:< u.reflect.tpe
     isTypeEqual.toExpr
   }
 }

tests/run-separate-compilation/xml-interpolation-1/XmlQuote_1.scala

@@ -27,7 +27,7 @@ object XmlQuote {
 
     def liftListOfAny(lst: List[Term]): Expr[List[Any]] = lst match {
       case x :: xs  =>
-        val head = x.toExpr[Any]
+        val head = x.reify[Any]
         val tail = liftListOfAny(xs)
         '{ ~head :: ~tail }
       case Nil => '(Nil)
@@ -45,7 +45,7 @@ object XmlQuote {
       tree.symbol.fullName == "scala.StringContext$.apply"
 
     // XmlQuote.SCOps(StringContext.apply([p0, ...]: String*)
-    val parts = receiver.toTasty.underlyingArgument match {
+    val parts = receiver.reflect.underlyingArgument match {
       case Apply(conv, List(Apply(fun, List(Typed(Repeated(values), _)))))
           if isSCOpsConversion(conv) &&
              isStringContextApply(fun) &&
@@ -56,7 +56,7 @@ object XmlQuote {
     }
 
     // [a0, ...]: Any*
-    val Typed(Repeated(args0), _) = args.toTasty.underlyingArgument
+    val Typed(Repeated(args0), _) = args.reflect.underlyingArgument
 
     val string = parts.mkString("??")
     '(new Xml(~string.toExpr, ~liftListOfAny(args0)))

tests/run-separate-compilation/xml-interpolation-2/XmlQuote_1.scala

@@ -33,7 +33,7 @@ object XmlQuote {
       tree.symbol.fullName == "scala.StringContext.<init>"
 
     // XmlQuote.SCOps(StringContext.apply([p0, ...]: String*)
-    val parts: List[String] = receiver.toTasty.underlying match {
+    val parts: List[String] = receiver.reflect.underlying match {
       case Apply(conv, List(ctx1)) if isSCOpsConversion(conv) =>
         ctx1 match {
           case Apply(fun, List(Typed(Repeated(values), _))) if isStringContextApply(fun) =>
@@ -48,13 +48,13 @@ object XmlQuote {
     }
 
     // [a0, ...]: Any*
-    val args2: Expr[List[Any]] = args.toTasty.underlyingArgument match {
+    val args2: Expr[List[Any]] = args.reflect.underlyingArgument match {
       case Typed(Repeated(args0), _) => // statically known args, make list directly
         def liftListOfAny(lst: List[Expr[Any]]): Expr[List[Any]] = lst match {
           case x :: xs  => '{ ~x :: ~liftListOfAny(xs) }
           case Nil => '(Nil)
         }
-        liftListOfAny(args0.map(_.toExpr[Any]))
+        liftListOfAny(args0.map(_.reify[Any]))
       case _ =>
         '((~args).toList)