Remove asTree

nicolasstucki · nicolasstucki · commit 5d46d3391b02 · 2020-12-08T14:53:45.000+01:00
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -80,7 +80,6 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
   object reflect extends reflectModule:
 
     extension (expr: Expr[Any]):
-      def asTree: Tree = expr.asTerm
       def asTerm: Term =
         val exprImpl = expr.asInstanceOf[ExprImpl]
         exprImpl.checkScopeId(QuotesImpl.this.hashCode)
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -79,7 +79,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    *  import scala.quoted._
    *  def f(expr: Expr[Int])(using Quotes) =
    *    import quotes.reflect._
-   *    val ast: Term = expr.asTerm // or `expr.asTree`
+   *    val ast: Term = expr.asTerm
    *    ...
    *  ```
    *
@@ -204,18 +204,10 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
    */
   trait reflectModule { self: reflect.type =>
 
-    extension (expr: Expr[Any]):
-
-      /** Returns the `Tree` representation this expression.
-       *  Same as `asTerm` but typed as a `Tree`.
-       */
-      def asTree: Tree
-
-      /** Returns the `Term` representation this expression */
+    /** Returns the `Term` representation this expression */
+    extension (expr: Expr[Any])
       def asTerm: Term
 
-    end extension
-
     ///////////////
     //   TREES   //
     ///////////////
@@ -229,8 +221,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
     /** Methods of the module object `val Tree` */
     trait TreeModule { this: Tree.type =>
       /** Returns the Term representation this expression */
-      @deprecated("Use `expr.asTree` instead (must `import quotes.reflect._`). This will be removed in 3.0.0-RC1", "3.0.0-M3")
-      def of(expr: Expr[Any]): Tree = expr.asTree
+      @deprecated("Use `expr.asTerm` instead (must `import quotes.reflect._`). This will be removed in 3.0.0-RC1", "3.0.0-M3")
+      def of(expr: Expr[Any]): Tree = expr.asTerm
     }
 
     /** Makes extension methods on `Tree` available without any imports */
diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala
@@ -10,7 +10,7 @@ object Macro {
     sc match {
       case '{ StringContext(${Varargs(parts)}: _*) } =>
         for (part @ Const(s) <- parts)
-          report.error(s, part.asTree.pos)
+          report.error(s, part.asTerm.pos)
     }
     '{}
   }
diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala
@@ -10,7 +10,7 @@ object Macro {
     sc match {
       case '{ StringContext(${Varargs(parts)}: _*) } =>
         for (part @ Const(s) <- parts)
-          report.error(s, part.asTree.pos)
+          report.error(s, part.asTerm.pos)
     }
     '{}
   }
diff --git a/tests/neg-macros/i6976/Macro_1.scala b/tests/neg-macros/i6976/Macro_1.scala
@@ -7,6 +7,6 @@ object macros {
 
   def mcrImpl(body: Expr[Any])(using ctx: Quotes) : Expr[Any] = {
     import ctx.reflect._
-    body.asTree match { case Block(_, _) => '{2} }
+    body.asTerm match { case Block(_, _) => '{2} }
   }
 }
diff --git a/tests/neg-macros/i7698.scala b/tests/neg-macros/i7698.scala
@@ -6,7 +6,7 @@ trait Show[T] {
 
 def showInterpolatorImpl(sc: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using Quotes): Expr[String] =
   import quotes.reflect._
-  argsExpr.asTree match
+  argsExpr.asTerm match
     case '{ $arg: $t } => // error
     case '[ Int ] => // error
   ???
diff --git a/tests/neg-macros/i9801/Macro_1.scala b/tests/neg-macros/i9801/Macro_1.scala
@@ -16,6 +16,6 @@ def impl(prog: Expr[Double])(using Quotes) : Expr[Double] =
     triggerStackOverflow(0)
   } catch {
     case e =>
-      quotes.reflect.report.error(e.getMessage, prog.asTree.pos)
+      quotes.reflect.report.error(e.getMessage, prog.asTerm.pos)
       '{ 42.0 }
   }
diff --git a/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala
@@ -15,7 +15,7 @@ object Asserts {
   def impl(cond: Expr[Boolean])(using Quotes) : Expr[Unit] = {
     import quotes.reflect._
 
-    val tree = cond.asTree
+    val tree = cond.asTerm
 
     def isOps(tpe: TypeRepr): Boolean = tpe match {
       case tpe: TermRef => tpe.termSymbol.isDefDef && tpe.name == "Ops"// TODO check that the parent is Asserts
diff --git a/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala
@@ -15,7 +15,7 @@ object Asserts {
   def impl(cond: Expr[Boolean])(using Quotes) : Expr[Unit] = {
     import quotes.reflect._
 
-    val tree = cond.asTree
+    val tree = cond.asTerm
 
     def isOps(tpe: TypeRepr): Boolean = tpe match {
       case tpe: TermRef => tpe.termSymbol.isDefDef && tpe.name == "Ops"// TODO check that the parent is Asserts
diff --git a/tests/pending/run/tasty-comments/quoted_1.scala b/tests/pending/run/tasty-comments/quoted_1.scala
@@ -9,7 +9,7 @@ object Macros {
   def impl[T](x: Expr[T])(using Quotes) : Expr[Unit] = {
     import quotes.reflect._
 
-    val tree = x.asTree
+    val tree = x.asTerm
     tree.symbol.comment.map(_.raw) match {
       case Some(str) => '{ println(${str}) }
       case None => '{ println() }
diff --git a/tests/pos-macros/i8325/Macro_1.scala b/tests/pos-macros/i8325/Macro_1.scala
@@ -13,7 +13,7 @@ object A:
 
   def transformImplExpr[A:Type](using Quotes)(expr: Expr[A]): Expr[A] = {
      import quotes.reflect._
-     expr.asTree match {
+     expr.asTerm match {
          case Inlined(x,y,z) => transformImplExpr(z.asExpr.asInstanceOf[Expr[A]])
          case Apply(fun,args) =>  '{  A.pure(${Apply(fun,args).asExpr.asInstanceOf[Expr[A]]}) }
          case other => expr
diff --git a/tests/pos-macros/i9251/Macro_1.scala b/tests/pos-macros/i9251/Macro_1.scala
@@ -21,7 +21,7 @@ object Async {
   def checkPrintTypeImpl[F[_]:Type,T:Type](f: Expr[T])(using Quotes): Expr[Unit] =
     import quotes.reflect._
 
-    val fu = f.asTree
+    val fu = f.asTerm
     fu match
       case Inlined(_,_,Block(_,Apply(TypeApply(Select(q,n),tparams),List(param)))) =>
         param.tpe match
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala
@@ -7,7 +7,7 @@ object Foo {
 
   def inspectBodyImpl(x: Expr[Int])(using Quotes) : Expr[String] = {
     import quotes.reflect._
-    x.asTree match {
+    x.asTerm match {
       case Inlined(None, Nil, arg) => Expr(arg.symbol.tree.showExtractors)
       case arg => Expr(arg.symbol.tree.showExtractors) // TODO should all by name parameters be in an inline node?
     }
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala
@@ -7,7 +7,7 @@ object Foo {
 
   def inspectBodyImpl(x: Expr[Int])(using Quotes) : Expr[String] = {
     import quotes.reflect._
-    x.asTree match {
+    x.asTerm match {
       case Inlined(None, Nil, arg) => Expr(arg.symbol.tree.showExtractors)
       case arg => Expr(arg.symbol.tree.showExtractors) // TODO should all by name parameters be in an inline node?
     }
diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala
@@ -12,7 +12,7 @@ object Macros {
 
     val output = myTraverser(buff)
 
-    val tree = x.asTree
+    val tree = x.asTerm
     output.traverseTree(tree)(Symbol.spliceOwner)
     '{print(${Expr(buff.result())})}
   }
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala
@@ -13,7 +13,7 @@ object Foo {
       if sym.isClassDef || sym.isDefDef || sym.isValDef then Expr(sym.tree.showExtractors)
       else '{"NO DEFINTION"}
 
-    x.asTree match {
+    x.asTerm match {
       case Inlined(None, Nil, arg) => definitionString(arg.symbol)
       case arg => definitionString(arg.symbol) // TODO should all by name parameters be in an inline node
     }
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala
@@ -12,7 +12,7 @@ object Foo {
       if sym.isClassDef || sym.isDefDef || sym.isValDef then Expr(sym.tree.showExtractors)
       else '{"NO DEFINTION"}
 
-    x.asTree match {
+    x.asTerm match {
       case Inlined(None, Nil, arg) => definitionString(arg.symbol)
       case arg => definitionString(arg.symbol) // TODO should all by name parameters be in an inline node
     }
diff --git a/tests/run-macros/exports/Macro_2.scala b/tests/run-macros/exports/Macro_2.scala
@@ -18,11 +18,11 @@ private def visitExportsTreeMapImpl[T: Type](e: Expr[T], f: Expr[T => Any])(usin
 
 private def visitExportsShowImpl[T: Type](e: Expr[T])(using Quotes): Expr[Any] =
   import quotes.reflect._
-  '{println(${Expr(e.asTree.show)})}
+  '{println(${Expr(e.asTerm.show)})}
 
 private def visitExportsShowExtractImpl[T: Type](e: Expr[T])(using Quotes): Expr[Any] =
   import quotes.reflect._
-  '{println(${Expr(e.asTree.showExtractors)})}
+  '{println(${Expr(e.asTerm.showExtractors)})}
 
 private object IdempotentExprMap extends ExprMap {
 
@@ -43,7 +43,7 @@ private def traverseExportsImpl(e: Expr[Any], f: Expr[String => Any])(using Quot
   }
 
   val res =
-    ExportAccumulator.foldTree(mutable.Buffer.empty, e.asTree)(Symbol.spliceOwner).mkString(", ")
+    ExportAccumulator.foldTree(mutable.Buffer.empty, e.asTerm)(Symbol.spliceOwner).mkString(", ")
 
   '{ $f(${Expr(res)}) }
 }
diff --git a/tests/run-macros/i10011/Macro_1.scala b/tests/run-macros/i10011/Macro_1.scala
@@ -5,5 +5,5 @@ inline def printPos[T](inline expr: T): (Int, Int) =
 
 private def printPos[T](expr: Expr[T])(using Quotes): Expr[(Int, Int)] =
   import quotes.reflect._
-  val pos = expr.asTree.pos
+  val pos = expr.asTerm.pos
   Expr((pos.start, pos.end))
diff --git a/tests/run-macros/i5533/Macro_1.scala b/tests/run-macros/i5533/Macro_1.scala
@@ -10,7 +10,7 @@ object scalatest {
   def assertImpl(condition: Expr[Boolean])(using Quotes) : Expr[Unit] = {
     import quotes.reflect._
 
-    val tree = condition.asTree
+    val tree = condition.asTerm
 
     val expr = tree.asExprOf[Boolean]
 
diff --git a/tests/run-macros/i5941/macro_1.scala b/tests/run-macros/i5941/macro_1.scala
@@ -46,7 +46,7 @@ object Lens {
     }
 
     // exception: getter.asTerm.underlyingArgument
-    getter.asTree match {
+    getter.asTerm match {
       case Function(param :: Nil, Path(o, parts)) if o.symbol == param.symbol =>
         '{
           val setter = (t: T) => (s: S) => ${ setterBody('s.asTerm, 't.asTerm, parts).asExprOf[S] }
diff --git a/tests/run-macros/i6679/Macro_1.scala b/tests/run-macros/i6679/Macro_1.scala
@@ -4,7 +4,7 @@ def makeMatch[A: Type](head : Expr[A])(using qctx : Quotes) : Expr[Unit] = {
   import quotes.reflect._
 
   val sacrifice = '{ $head match { case _ => ??? } }
-  sacrifice.asTree
+  sacrifice.asTerm
 
   '{ println("Ok") }
 }
diff --git a/tests/run-macros/i7887/Macro_1.scala b/tests/run-macros/i7887/Macro_1.scala
@@ -4,7 +4,7 @@ def myMacroImpl(a: quoted.Expr[_])(using qctx: quoted.Quotes) = {
     implicit val t: quoted.Type[A] = a.asTerm.tpe.widen.asType.asInstanceOf[quoted.Type[A]]
     '{
       type T = A
-      ${a.asTree.asExprOf[T]}
+      ${a.asTerm.asExprOf[T]}
     }
   }
 
diff --git a/tests/run-macros/paramSymss/Macro_1.scala b/tests/run-macros/paramSymss/Macro_1.scala
@@ -6,7 +6,7 @@ inline def showParamSyms(inline x: Any): String =
 def showParamSymsExpr(using Quotes)(x: Expr[Any]): Expr[String] =
   import quotes.reflect._
   val '{ $y: Any } = x // Drop Inlined not to access the symbol
-  val sym = y.asTree.symbol
+  val sym = y.asTerm.symbol
   Expr(
     s"""sym: ${sym.show}
        |paramSymss: ${sym.paramSymss.map(_.map(_.show))}
diff --git a/tests/run-macros/quote-matcher-runtime/quoted_1.scala b/tests/run-macros/quote-matcher-runtime/quoted_1.scala
@@ -17,8 +17,8 @@ object Macros {
     }
 
     '{
-      println("Scrutinee: " + ${Expr(a.asTree.show)})
-      println("Pattern: " + ${Expr(b.asTree.show)})
+      println("Scrutinee: " + ${Expr(a.asTerm.show)})
+      println("Pattern: " + ${Expr(b.asTerm.show)})
       println("Result: " + ${Expr(res.toString)})
       println()
     }
diff --git a/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala
@@ -21,7 +21,7 @@ object Macros {
 
       case _ =>
         import quotes.reflect._
-        report.error("Expected explicit DSL", e.asTree.pos)
+        report.error("Expected explicit DSL", e.asTerm.pos)
         '{ ??? }
 
     }
diff --git a/tests/run-macros/reflect-sourceCode/Macro_1.scala b/tests/run-macros/reflect-sourceCode/Macro_1.scala
@@ -6,6 +6,6 @@ object api {
 
   private def reflImpl[T](x: Expr[T])(implicit qctx: Quotes): Expr[String] = {
     import quotes.reflect._
-    Expr(x.asTree.pos.sourceCode.get)
+    Expr(x.asTerm.pos.sourceCode.get)
   }
 }
diff --git a/tests/run-macros/tasty-extractors-3/quoted_1.scala b/tests/run-macros/tasty-extractors-3/quoted_1.scala
@@ -25,7 +25,7 @@ object Macros {
       }
     }
 
-    val tree = x.asTree
+    val tree = x.asTerm
     traverser.traverseTree(tree)(Symbol.spliceOwner)
     '{print(${Expr(buff.result())})}
   }
diff --git a/tests/run-macros/tasty-macro-assert/quoted_1.scala b/tests/run-macros/tasty-macro-assert/quoted_1.scala
@@ -15,7 +15,7 @@ object Asserts {
   def impl(cond: Expr[Boolean])(using Quotes) : Expr[Unit] = {
     import quotes.reflect._
 
-    val tree = cond.asTree
+    val tree = cond.asTerm
 
     def isOps(tpe: TypeRepr): Boolean = tpe match {
       case tpe: TermRef => tpe.termSymbol.isDefDef && tpe.name == "Ops"// TODO check that the parent is Asserts

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ object Macro {`
`10`	`10`	`sc match {`
`11`	`11`	`case '{ StringContext(${Varargs(parts)}: _*) } =>`
`12`	`12`	`for (part @ Const(s) <- parts)`
`13`		`- report.error(s, part.asTree.pos)`
	`13`	`+ report.error(s, part.asTerm.pos)`
`14`	`14`	`}`
`15`	`15`	`'{}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ object macros {`
`7`	`7`
`8`	`8`	`def mcrImpl(body: Expr[Any])(using ctx: Quotes) : Expr[Any] = {`
`9`	`9`	`import ctx.reflect._`
`10`		`- body.asTree match { case Block(_, _) => '{2} }`
	`10`	`+ body.asTerm match { case Block(_, _) => '{2} }`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ def impl(prog: Expr[Double])(using Quotes) : Expr[Double] =`
`16`	`16`	`triggerStackOverflow(0)`
`17`	`17`	`} catch {`
`18`	`18`	`case e =>`
`19`		`- quotes.reflect.report.error(e.getMessage, prog.asTree.pos)`
	`19`	`+ quotes.reflect.report.error(e.getMessage, prog.asTerm.pos)`
`20`	`20`	`'{ 42.0 }`
`21`	`21`	`}`