Put rootContext directly in Tasty

nicolasstucki · nicolasstucki · commit 59a74e9033fa · 2018-06-17T20:04:18.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala
@@ -15,7 +15,7 @@ import scala.quoted
 import scala.reflect.ClassTag
 import scala.tasty.util.{Show, ShowExtractors, ShowSourceCode}
 
-class TastyImpl(rootContext: Contexts.Context) extends scala.tasty.Tasty { self =>
+class TastyImpl(val rootContext: Contexts.Context) extends scala.tasty.Tasty { self =>
 
   // ===== Quotes ===================================================
 
@@ -43,10 +43,6 @@ class TastyImpl(rootContext: Contexts.Context) extends scala.tasty.Tasty { self
     def owner: Definition = FromSymbol.definition(ctx.owner)(ctx)
   }
 
-  object Context extends ContextProvider {
-    def rootContext: Context = self.rootContext
-  }
-
   // ===== Id =======================================================
 
   type Id = untpd.Ident
diff --git a/library/src/scala/tasty/Tasty.scala b/library/src/scala/tasty/Tasty.scala
@@ -34,10 +34,7 @@ abstract class Tasty { tasty =>
   }
   implicit def ContextDeco(ctx: Context): ContextAPI
 
-  val Context: ContextProvider
-  abstract class ContextProvider {
-    implicit def rootContext: Context
-  }
+  implicit def rootContext: Context
 
   // ===== Id =======================================================
 
diff --git a/library/src/scala/tasty/util/ConstantExtractor.scala b/library/src/scala/tasty/util/ConstantExtractor.scala
@@ -18,7 +18,7 @@ import scala.tasty.Tasty
 class ConstantExtractor[T <: Tasty with Singleton](val tasty: T) {
   import tasty._
 
-  def unapply[T](expr: Expr[T])(implicit ctx: Context): Option[T] = {
+  def unapply[T](expr: Expr[T]): Option[T] = {
     def const(tree: Term): Option[T] = tree match {
       case Term.Literal(c) => Some(c.value.asInstanceOf[T])
       case Term.Block(Nil, e) => const(e)
diff --git a/library/src/scala/tasty/util/ShowExtractors.scala b/library/src/scala/tasty/util/ShowExtractors.scala
@@ -3,7 +3,7 @@ package scala.tasty.util
 import scala.tasty.Tasty
 
 class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty0) {
-  import tasty._
+  import tasty.{rootContext => _, _}
 
   def showTree(tree: Tree)(implicit ctx: Context): String =
     new Buffer().visitTree(tree).result()
diff --git a/library/src/scala/tasty/util/ShowSourceCode.scala b/library/src/scala/tasty/util/ShowSourceCode.scala
@@ -4,7 +4,7 @@ package util
 import scala.annotation.switch
 
 class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty0) {
-  import tasty._
+  import tasty.{rootContext => _, _}
 
   def showTree(tree: Tree)(implicit ctx: Context): String =
     (new Buffer).printTree(tree).result()
diff --git a/library/src/scala/tasty/util/TreeAccumulator.scala b/library/src/scala/tasty/util/TreeAccumulator.scala
@@ -3,7 +3,7 @@ package scala.tasty.util
 import scala.tasty.Tasty
 
 abstract class TreeAccumulator[X, T <: Tasty with Singleton](val tasty: T) {
-  import tasty._
+  import tasty.{rootContext => _, _}
 
   // Ties the knot of the traversal: call `foldOver(x, tree))` to dive in the `tree` node.
   def foldTree(x: X, tree: Tree)(implicit ctx: Context): X
diff --git a/library/src/scala/tasty/util/TreeTraverser.scala b/library/src/scala/tasty/util/TreeTraverser.scala
@@ -3,7 +3,7 @@ package scala.tasty.util
 import scala.tasty.Tasty
 
 abstract class TreeTraverser[T <: Tasty with Singleton](tasty0: T) extends TreeAccumulator[Unit, T](tasty0) {
-  import tasty._
+  import tasty.{rootContext => _, _}
 
   def traverseTree(tree: Tree)(implicit ctx: Context): Unit = traverseTreeChildren(tree)
   def traverseTypeTree(tree: TypeOrBoundsTree)(implicit ctx: Context): Unit = traverseTypeTreeChildren(tree)
diff --git a/tests/neg/tasty-macro-assert/quoted_1.scala b/tests/neg/tasty-macro-assert/quoted_1.scala
@@ -16,7 +16,6 @@ object Asserts {
 
   def impl(cond: Expr[Boolean])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val tree = cond.toTasty
 
diff --git a/tests/run/tasty-custom-show/quoted_1.scala b/tests/run/tasty-custom-show/quoted_1.scala
@@ -12,8 +12,6 @@ object Macros {
 
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
-
 
     val buff = new StringBuilder
 
diff --git a/tests/run/tasty-eval/quoted_1.scala b/tests/run/tasty-eval/quoted_1.scala
@@ -21,7 +21,6 @@ object Macros {
   implicit def intIsEvalable: Valuable[Int] = new Valuable[Int] {
     override def value(e: Expr[Int])(implicit tasty: Tasty): Option[Int] = {
       import tasty._
-      import Context._
 
       e.toTasty.tpe match {
         case Type.SymRef(ValDef(_, tpt, _), pre) =>
diff --git a/tests/run/tasty-extractors-1/quoted_1.scala b/tests/run/tasty-extractors-1/quoted_1.scala
@@ -10,7 +10,6 @@ object Macros {
 
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val tree = x.toTasty
     val treeStr = tree.show
diff --git a/tests/run/tasty-extractors-2/quoted_1.scala b/tests/run/tasty-extractors-2/quoted_1.scala
@@ -10,7 +10,6 @@ object Macros {
 
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val tree = x.toTasty
 
diff --git a/tests/run/tasty-extractors-3/quoted_1.scala b/tests/run/tasty-extractors-3/quoted_1.scala
@@ -12,7 +12,6 @@ object Macros {
 
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val buff = new StringBuilder
     val traverser = new TreeTraverser(tasty) {
diff --git a/tests/run/tasty-extractors-constants-1/quoted_1.scala b/tests/run/tasty-extractors-constants-1/quoted_1.scala
@@ -11,7 +11,6 @@ object Macros {
 
   def impl(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val buff = new StringBuilder
     def stagedPrintln(x: Any): Unit = buff append java.util.Objects.toString(x) append "\n"
diff --git a/tests/run/tasty-extractors-constants-2/quoted_1.scala b/tests/run/tasty-extractors-constants-2/quoted_1.scala
@@ -46,7 +46,6 @@ object Macros {
 
   def power(n: Expr[Int], x: Expr[Double])(implicit tasty: Tasty): Expr[Double] = {
     import tasty._
-    import Context._
 
     val Constant = new ConstantExtractor(tasty)
     n match {
diff --git a/tests/run/tasty-extractors-owners/quoted_1.scala b/tests/run/tasty-extractors-owners/quoted_1.scala
@@ -11,7 +11,6 @@ object Macros {
 
   def impl[T](x: Expr[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val buff = new StringBuilder
 
diff --git a/tests/run/tasty-extractors-types/quoted_1.scala b/tests/run/tasty-extractors-types/quoted_1.scala
@@ -11,7 +11,6 @@ object Macros {
 
   def impl[T](x: Type[T])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val tree = x.toTasty
     '{
diff --git a/tests/run/tasty-indexed-map/quoted_1.scala b/tests/run/tasty-indexed-map/quoted_1.scala
@@ -28,7 +28,6 @@ object Index {
 
   def succImpl[K, H, T](tasty: Tasty)(implicit k: Type[K], h: Type[H], t: Type[T]): Expr[Index[K, (H, T)]] = {
     import tasty._
-    import Context._
 
     def name(tp: TypeOrBounds): String = tp match {
       case Type.ConstantType(Constant.String(str)) => str
diff --git a/tests/run/tasty-linenumber/quoted_1.scala b/tests/run/tasty-linenumber/quoted_1.scala
@@ -15,7 +15,6 @@ object LineNumber {
 
   def lineImpl(x: Type[Unit])(implicit tasty: Tasty): Expr[LineNumber] = {
     import tasty._
-    import Context._
 
     '(new LineNumber(~x.toTasty.pos.startLine.toExpr))
   }
diff --git a/tests/run/tasty-location/quoted_1.scala b/tests/run/tasty-location/quoted_1.scala
@@ -13,7 +13,6 @@ object Location {
 
   def impl(implicit tasty: Tasty): Expr[Location] = {
     import tasty._
-    import Context._
 
     def listOwnerNames(definition: Definition, acc: List[String]): List[String] = definition match {
       case ValDef(name, _, _) => listOwnerNames(definition.owner, name :: acc)
diff --git a/tests/run/tasty-macro-assert/quoted_1.scala b/tests/run/tasty-macro-assert/quoted_1.scala
@@ -16,7 +16,6 @@ object Asserts {
 
   def impl(cond: Expr[Boolean])(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._
-    import Context._
 
     val tree = cond.toTasty
 
diff --git a/tests/run/tasty-positioned/quoted_1.scala b/tests/run/tasty-positioned/quoted_1.scala
@@ -16,7 +16,6 @@ object Positioned {
 
   def impl[T](x: Expr[T])(implicit ev: Type[T], tasty: Tasty): Expr[Positioned[T]] = {
     import tasty.{Position => _, _}
-    import Context._
 
     val pos = x.toTasty.pos
 

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,7 @@ abstract class Tasty { tasty =>`
`34`	`34`	`}`
`35`	`35`	`implicit def ContextDeco(ctx: Context): ContextAPI`
`36`	`36`
`37`		`- val Context: ContextProvider`
`38`		`- abstract class ContextProvider {`
`39`		`- implicit def rootContext: Context`
`40`		`- }`
	`37`	`+ implicit def rootContext: Context`
`41`	`38`
`42`	`39`	`// ===== Id =======================================================`
`43`	`40`