Preextend TreeAccumulator, TreeTraverser and TreeMap in Reflection

nicolasstucki · nicolasstucki · commit 06da51f8b92d · 2020-02-05T12:14:41.000+01:00
diff --git a/library/src/scala/internal/quoted/Matcher.scala b/library/src/scala/internal/quoted/Matcher.scala
@@ -156,9 +156,7 @@ private[quoted] object Matcher {
               if patternHole.symbol == internal.Definitions_InternalQuoted_patternHole =>
             def bodyFn(lambdaArgs: List[Tree]): Tree = {
               val argsMap = args.map(_.symbol).zip(lambdaArgs.asInstanceOf[List[Term]]).toMap
-              new scala.tasty.reflect.TreeMap {
-                val reflect: qctx.tasty.type = qctx.tasty
-                import reflect.{given,  _}
+              new TreeMap {
                 override def transformTerm(tree: Term)(given ctx: Context): Term =
                   tree match
                     case tree: Ident => summon[Env].get(tree.symbol).flatMap(argsMap.get).getOrElse(tree)
@@ -320,9 +318,7 @@ private[quoted] object Matcher {
 
       /** Return all free variables of the term defined in the pattern (i.e. defined in `Env`) */
       def freePatternVars(term: Term)(given ctx: Context, env: Env): Set[Symbol] =
-        val accumulator = new scala.tasty.reflect.TreeAccumulator[Set[Symbol]] {
-          val reflect: qctx.tasty.type = qctx.tasty
-          import reflect.{given, _}
+        val accumulator = new TreeAccumulator[Set[Symbol]] {
           def foldTree(x: Set[Symbol], tree: Tree)(given ctx: Context): Set[Symbol] =
             tree match
               case tree: Ident if env.contains(tree.symbol) => foldOverTree(x + tree.symbol, tree)
diff --git a/library/src/scala/quoted/unsafe/UnsafeExpr.scala b/library/src/scala/quoted/unsafe/UnsafeExpr.scala
@@ -65,8 +65,7 @@ object UnsafeExpr {
   private def bodyFn[t](given qctx: QuoteContext)(e: qctx.tasty.Term, params: List[qctx.tasty.ValDef], args: List[qctx.tasty.Term]): qctx.tasty.Term = {
     import qctx.tasty.{given, _}
     val map = params.map(_.symbol).zip(args).toMap
-    new scala.tasty.reflect.TreeMap {
-      val reflect: qctx.tasty.type = qctx.tasty
+    new TreeMap {
       override def transformTerm(tree: Term)(given ctx: Context): Term =
         super.transformTerm(tree) match
           case tree: Ident => map.getOrElse(tree.symbol, tree)
diff --git a/library/src/scala/tasty/Reflection.scala b/library/src/scala/tasty/Reflection.scala
@@ -2731,6 +2731,21 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
   //   UTILS   //
   ///////////////
 
+  /** TASTy Reflect tree accumulator */
+  trait TreeAccumulator[X] extends reflect.TreeAccumulator[X] {
+    val reflect: self.type = self
+  }
+
+  /** TASTy Reflect tree traverser */
+  trait TreeTraverser extends reflect.TreeTraverser {
+    val reflect: self.type = self
+  }
+
+  /** TASTy Reflect tree map */
+  trait TreeMap extends reflect.TreeMap {
+    val reflect: self.type = self
+  }
+
   // TODO extract from Reflection
 
   /** Bind the `rhs` to a `val` and use it in `body` */
diff --git a/tests/pos-macros/treemap-unapply/Macro.scala b/tests/pos-macros/treemap-unapply/Macro.scala
@@ -1,10 +1,8 @@
 import scala.quoted.{ given _, _ }
 
 inline def mcr(x: => Unit): Unit = ${mcrImpl('x)}
-def mcrImpl(x: Expr[Unit])(using qctx: QuoteContext) : Expr[Unit] =
-  import qctx.tasty.{ given _, _ }
+def mcrImpl(x: Expr[Unit])(using ctx: QuoteContext) : Expr[Unit] =
+  import ctx.tasty.{ given _, _ }
   val tr: Term = x.unseal
-  object m extends scala.tasty.reflect.TreeMap {
-    val reflect: qctx.tasty.type = qctx.tasty
-  }
+  object m extends TreeMap
   m.transformTerm(tr).seal.cast[Unit]
diff --git a/tests/run-custom-args/tasty-inspector/tasty-comment-inspector/Test.scala b/tests/run-custom-args/tasty-inspector/tasty-comment-inspector/Test.scala
@@ -1,5 +1,4 @@
 import scala.tasty.Reflection
-import scala.tasty.reflect.TreeTraverser
 import scala.tasty.inspector._
 
 object Test {
@@ -10,10 +9,10 @@ object Test {
 
 class CommentInspector extends TastyInspector {
 
-  def processCompilationUnit(reflect0: Reflection)(root: reflect0.Tree): Unit = {
-    import reflect0.{_, given _}
+  def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = {
+    import reflect.{_, given _}
     object Traverser extends TreeTraverser {
-      val reflect: reflect0.type = reflect0
+
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {
         case tree: Definition =>
           tree.symbol.comment match {
@@ -26,7 +25,7 @@ class CommentInspector extends TastyInspector {
       }
 
     }
-    Traverser.traverseTree(root)(reflect0.rootContext)
+    Traverser.traverseTree(root)(reflect.rootContext)
   }
 
 }
diff --git a/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala b/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala
@@ -1,5 +1,4 @@
 import scala.tasty.Reflection
-import scala.tasty.reflect.TreeTraverser
 import scala.tasty.inspector._
 
 object Test {
@@ -10,10 +9,10 @@ object Test {
 
 class DBInspector extends TastyInspector {
 
-  protected def processCompilationUnit(reflect0: Reflection)(root: reflect0.Tree): Unit = {
-    import reflect0.{_, given _}
+  protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = {
+    import reflect.{_, given _}
     object Traverser extends TreeTraverser {
-      val reflect: reflect0.type = reflect0
+
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {
         case tree: Definition =>
           println(tree.showExtractors)
@@ -23,7 +22,7 @@ class DBInspector extends TastyInspector {
       }
 
     }
-    Traverser.traverseTree(root)(reflect0.rootContext)
+    Traverser.traverseTree(root)(reflect.rootContext)
   }
 
 }
diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala b/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala
@@ -1,15 +1,14 @@
 package scala.tasty.interpreter
 
 import scala.tasty.Reflection
-import scala.tasty.reflect.TreeTraverser
 import scala.tasty.inspector.TastyInspector
 
 class TastyInterpreter extends TastyInspector {
 
-  protected def processCompilationUnit(reflect0: Reflection)(root: reflect0.Tree): Unit = {
-    import reflect0.{_, given _}
+  protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = {
+    import reflect.{_, given _}
     object Traverser extends TreeTraverser {
-      val reflect: reflect0.type = reflect0
+
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {
         // TODO: check the correct sig and object enclosement for main
         case DefDef("main", _, _, _, Some(rhs)) =>
@@ -21,6 +20,6 @@ class TastyInterpreter extends TastyInspector {
           super.traverseTree(tree)
       }
     }
-    Traverser.traverseTree(root)(reflect0.rootContext)
+    Traverser.traverseTree(root)(reflect.rootContext)
   }
 }
diff --git a/tests/run-macros/tasty-custom-show/quoted_1.scala b/tests/run-macros/tasty-custom-show/quoted_1.scala
@@ -12,8 +12,7 @@ object Macros {
 
     val buff = new StringBuilder
 
-    val output = new scala.tasty.reflect.TreeTraverser {
-      val reflect: qctx.tasty.type = qctx.tasty
+    val output = new TreeTraverser {
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = {
         // Use custom Show[_] here
         val printer = dummyShow
diff --git a/tests/run-macros/tasty-extractors-3/quoted_1.scala b/tests/run-macros/tasty-extractors-3/quoted_1.scala
@@ -11,8 +11,7 @@ object Macros {
     import qctx.tasty.{_, given _}
 
     val buff = new StringBuilder
-    val traverser = new scala.tasty.reflect.TreeTraverser {
-      val reflect: qctx.tasty.type = qctx.tasty
+    val traverser = new TreeTraverser {
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {
         case tree: TypeBoundsTree =>
           buff.append(tree.tpe.showExtractors)
diff --git a/tests/run-macros/tasty-tree-map/quoted_1.scala b/tests/run-macros/tasty-tree-map/quoted_1.scala
@@ -6,9 +6,7 @@ object Macros {
 
   def impl[T: Type](x: Expr[T])(using qctx: QuoteContext) : Expr[T] = {
     import qctx.tasty.{_, given _}
-    val identityMap = new scala.tasty.reflect.TreeMap {
-      val reflect: qctx.tasty.type = qctx.tasty
-    }
+    val identityMap = new TreeMap { }
     val transformed = identityMap.transformTerm(x.unseal).seal.cast[T]
     transformed
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import scala.tasty.Reflection`
`2`		`-import scala.tasty.reflect.TreeTraverser`
`3`	`2`	`import scala.tasty.inspector._`
`4`	`3`
`5`	`4`	`object Test {`
`@@ -10,10 +9,10 @@ object Test {`
`10`	`9`
`11`	`10`	`class CommentInspector extends TastyInspector {`
`12`	`11`
`13`		`- def processCompilationUnit(reflect0: Reflection)(root: reflect0.Tree): Unit = {`
`14`		`- import reflect0.{_, given _}`
	`12`	`+ def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = {`
	`13`	`+ import reflect.{_, given _}`
`15`	`14`	`object Traverser extends TreeTraverser {`
`16`		`- val reflect: reflect0.type = reflect0`
	`15`	`+`
`17`	`16`	`override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {`
`18`	`17`	`case tree: Definition =>`
`19`	`18`	`tree.symbol.comment match {`
`@@ -26,7 +25,7 @@ class CommentInspector extends TastyInspector {`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`}`
`29`		`- Traverser.traverseTree(root)(reflect0.rootContext)`
	`28`	`+ Traverser.traverseTree(root)(reflect.rootContext)`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`	`1`	`package scala.tasty.interpreter`
`2`	`2`
`3`	`3`	`import scala.tasty.Reflection`
`4`		`-import scala.tasty.reflect.TreeTraverser`
`5`	`4`	`import scala.tasty.inspector.TastyInspector`
`6`	`5`
`7`	`6`	`class TastyInterpreter extends TastyInspector {`
`8`	`7`
`9`		`- protected def processCompilationUnit(reflect0: Reflection)(root: reflect0.Tree): Unit = {`
`10`		`- import reflect0.{_, given _}`
	`8`	`+ protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = {`
	`9`	`+ import reflect.{_, given _}`
`11`	`10`	`object Traverser extends TreeTraverser {`
`12`		`- val reflect: reflect0.type = reflect0`
	`11`	`+`
`13`	`12`	`override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {`
`14`	`13`	`// TODO: check the correct sig and object enclosement for main`
`15`	`14`	`case DefDef("main", _, _, _, Some(rhs)) =>`
`@@ -21,6 +20,6 @@ class TastyInterpreter extends TastyInspector {`
`21`	`20`	`super.traverseTree(tree)`
`22`	`21`	`}`
`23`	`22`	`}`
`24`		`- Traverser.traverseTree(root)(reflect0.rootContext)`
	`23`	`+ Traverser.traverseTree(root)(reflect.rootContext)`
`25`	`24`	`}`
`26`	`25`	`}`