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/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
   }
 }