Move rootContext and rootPosition to kernel

Author: nicolasstucki

compiler/src/dotty/tools/dotc/consumetasty/TastyConsumerPhase.scala

@@ -11,7 +11,7 @@ class TastyConsumerPhase(consumer: TastyConsumer) extends Phase {
   override def phaseName: String = "tastyConsumer"
 
   override def run(implicit ctx: Context): Unit = {
-    val reflect = new ReflectionImpl(ctx)
+    val reflect = ReflectionImpl(ctx)
     consumer(reflect)(ctx.compilationUnit.tpdTree)
   }
 

compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

@@ -43,7 +43,7 @@ class DecompilationPrinter extends Phase {
     } else {
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
-      out.println(new ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
+      out.println(ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
     }
   }
 }

compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala

@@ -35,7 +35,7 @@ class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
     run.printSummary()
     val unit = ctx.run.units.head
 
-    val decompiled = new ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)
+    val decompiled = ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)
     val tree = new TastyHTMLPrinter(unit.pickled.head._2).printContents()
 
     reporter.removeBufferedMessages.foreach(message => System.err.println(message))

compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala

@@ -47,7 +47,7 @@ class QuoteDriver extends Driver {
       val tree1 =
         if (ctx.settings.YshowRawQuoteTrees.value) tree
         else (new TreeCleaner).transform(tree)
-      new ReflectionImpl(ctx).showSourceCode.showTree(tree1)
+      ReflectionImpl(ctx).showSourceCode.showTree(tree1)
     }
     withTree(expr, show, settings)
   }

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

@@ -2,6 +2,7 @@ package dotty.tools.dotc.tastyreflect
 
 trait ContextOpsImpl extends scala.tasty.reflect.ContextOps with CoreImpl {
 
-  val rootContext: Context
+  // overridden to remove the implicit modifier inside the implementation
+  override def rootContext: Context = super.rootContext
 
 }

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

@@ -3,6 +3,6 @@ package tastyreflect
 
 trait CoreImpl extends scala.tasty.reflect.Core {
 
-  final val kernel: KernelImpl = new KernelImpl
+  val kernel: KernelImpl
 
 }

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

@@ -13,7 +13,7 @@ import dotty.tools.dotc.tastyreflect.FromSymbol.{definitionFromSym, packageDefFr
 
 import scala.tasty.reflect.Kernel
 
-class KernelImpl extends Kernel {
+class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.SourcePosition) extends Kernel {
 
   //
   // CONTEXT

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

@@ -1,8 +1,9 @@
 package dotty.tools.dotc.tastyreflect
 
 import dotty.tools.dotc.core._
+import dotty.tools.dotc.util.{SourcePosition, Spans}
 
-class ReflectionImpl(val rootContext: Contexts.Context)
+class ReflectionImpl private (ctx: Contexts.Context, pos: SourcePosition)
     extends scala.tasty.Reflection
     with CoreImpl
     with CaseDefOpsImpl
@@ -22,4 +23,18 @@ class ReflectionImpl(val rootContext: Contexts.Context)
     with SymbolOpsImpl
     with TreeOpsImpl
     with TypeOrBoundsTreesOpsImpl
-    with TypeOrBoundsOpsImpl
+    with TypeOrBoundsOpsImpl {
+
+  val kernel: KernelImpl = new KernelImpl(ctx, pos)
+
+}
+
+object ReflectionImpl {
+
+  def apply(rootContext: Contexts.Context): ReflectionImpl =
+    apply(rootContext, SourcePosition(rootContext.source, Spans.NoSpan))
+
+  def apply(rootContext: Contexts.Context, rootPosition: SourcePosition): ReflectionImpl =
+    new ReflectionImpl(rootContext, rootPosition)
+
+}

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

@@ -4,8 +4,6 @@ import dotty.tools.dotc.util.{SourcePosition, Spans}
 
 trait RootPositionImpl extends scala.tasty.reflect.RootPosition with ContextOpsImpl with CoreImpl {
 
-  def rootPosition: SourcePosition = SourcePosition(rootContext.source, Spans.NoSpan)
-
   protected def withDefaultPos[T <: Tree](fn: Context => T)(implicit ctx: Context): T = {
     fn(ctx.withSource(rootPosition.source)).withSpan(rootPosition.span)
   }

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -106,11 +106,7 @@ object Splicer {
     protected def interpretVarargs(args: List[Object])(implicit env: Env): Object =
       args.toSeq
 
-    protected def interpretTastyContext()(implicit env: Env): Object = {
-      new ReflectionImpl(ctx) {
-        override def rootPosition: SourcePosition = pos
-      }
-    }
+    protected def interpretTastyContext()(implicit env: Env): Object = ReflectionImpl(ctx, pos)
 
     protected def interpretStaticMethodCall(moduleClass: Symbol, fn: Symbol, args: => List[Object])(implicit env: Env): Object = {
       val (inst, clazz) =

library/src/scala/tasty/reflect/ContextOps.scala

@@ -12,6 +12,6 @@ trait ContextOps extends Core {
   }
 
   /** Context of the macro expansion */
-  implicit def rootContext: Context
+  implicit def rootContext: Context = kernel.rootContext
 
 }

library/src/scala/tasty/reflect/Kernel.scala

@@ -115,6 +115,12 @@ package scala.tasty.reflect
  */
 trait Kernel {
 
+  /** Context of the macro expansion */
+  def rootContext: Context
+
+  /** Root position of this tasty context. For macros it corresponds to the expansion site. */
+  def rootPosition: Position
+
   //
   // CONTEXT
   //

library/src/scala/tasty/reflect/RootPosition.scala

@@ -3,6 +3,6 @@ package scala.tasty.reflect
 trait RootPosition extends Core {
 
   /** Root position of this tasty context. For macros it corresponds to the expansion site. */
-  def rootPosition: Position
+  def rootPosition: Position = kernel.rootPosition
 
 }