Merge pull request #5398 from dotty-staging/refactor-tasty-reflect

Refcatorings in TASTy reflection interface

Author: nicolasstucki

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

@@ -2,7 +2,7 @@ package dotty.tools.dotc.consumetasty
 
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.tastyreflect.TastyImpl
+import dotty.tools.dotc.tastyreflect.ReflectionImpl
 
 import scala.tasty.file.TastyConsumer
 
@@ -11,8 +11,8 @@ class TastyConsumerPhase(consumer: TastyConsumer) extends Phase {
   override def phaseName: String = "tastyConsumer"
 
   override def run(implicit ctx: Context): Unit = {
-    val tasty = new TastyImpl(ctx)
-    consumer(tasty)(ctx.compilationUnit.tpdTree)
+    val reflect = new ReflectionImpl(ctx)
+    consumer(reflect)(ctx.compilationUnit.tpdTree)
   }
 
 }

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -691,11 +691,11 @@ class Definitions {
   def Unpickler_liftedExpr: TermSymbol = ctx.requiredMethod("scala.runtime.quoted.Unpickler.liftedExpr")
   def Unpickler_unpickleType: TermSymbol = ctx.requiredMethod("scala.runtime.quoted.Unpickler.unpickleType")
 
-  lazy val TastyTastyType: TypeRef = ctx.requiredClassRef("scala.tasty.Tasty")
-  def TastyTastyClass(implicit ctx: Context): ClassSymbol = TastyTastyType.symbol.asClass
+  lazy val TastyReflectionType: TypeRef = ctx.requiredClassRef("scala.tasty.Reflection")
+  def TastyReflectionClass(implicit ctx: Context): ClassSymbol = TastyReflectionType.symbol.asClass
 
-  lazy val TastyTastyModule: TermSymbol = ctx.requiredModule("scala.tasty.Tasty")
-    lazy val TastyTasty_macroContext: TermSymbol = TastyTastyModule.requiredMethod("macroContext")
+  lazy val TastyReflectionModule: TermSymbol = ctx.requiredModule("scala.tasty.Reflection")
+    lazy val TastyReflection_macroContext: TermSymbol = TastyReflectionModule.requiredMethod("macroContext")
 
   lazy val EqType: TypeRef = ctx.requiredClassRef("scala.Eq")
   def EqClass(implicit ctx: Context): ClassSymbol = EqType.symbol.asClass

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

@@ -6,7 +6,7 @@ import java.io.{OutputStream, PrintStream}
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.tasty.TastyPrinter
-import dotty.tools.dotc.tastyreflect.TastyImpl
+import dotty.tools.dotc.tastyreflect.ReflectionImpl
 import dotty.tools.io.File
 
 /** Phase that prints the trees in all loaded compilation units.
@@ -41,7 +41,7 @@ class DecompilationPrinter extends Phase {
     } else {
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
-      out.println(new TastyImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
+      out.println(new ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
     }
   }
 }

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

@@ -3,7 +3,7 @@ package dotty.tools.dotc.quoted
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.Driver
 import dotty.tools.dotc.core.Contexts.{Context, ContextBase, FreshContext}
-import dotty.tools.dotc.tastyreflect.TastyImpl
+import dotty.tools.dotc.tastyreflect.ReflectionImpl
 import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, VirtualDirectory}
 import dotty.tools.repl.AbstractFileClassLoader
 
@@ -47,7 +47,7 @@ class QuoteDriver extends Driver {
       val tree1 =
         if (ctx.settings.YshowRawQuoteTrees.value) tree
         else (new TreeCleaner).transform(tree)
-      new TastyImpl(ctx).showSourceCode.showTree(tree1)
+      new ReflectionImpl(ctx).showSourceCode.showTree(tree1)
     }
     withTree(expr, show, settings)
   }

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

@@ -1,7 +1,7 @@
 package dotty.tools.dotc.tastyreflect
 
 
-trait CaseDefOpsImpl extends scala.tasty.reflect.CaseDefOps with TastyCoreImpl with Helpers {
+trait CaseDefOpsImpl extends scala.tasty.reflect.CaseDefOps with CoreImpl with Helpers {
 
   def CaseDefDeco(caseDef: CaseDef): CaseDefAPI = new CaseDefAPI {
     def pattern(implicit ctx: Context): Pattern = caseDef.pat

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

@@ -3,7 +3,7 @@ package dotty.tools.dotc.tastyreflect
 import dotty.tools.dotc.core.Constants
 
 
-trait ConstantOpsImpl extends scala.tasty.reflect.ConstantOps with TastyCoreImpl {
+trait ConstantOpsImpl extends scala.tasty.reflect.ConstantOps with CoreImpl {
 
   def ConstantDeco(const: Constant): ConstantAPI = new ConstantAPI {
     def value: Any = const.value

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

@@ -2,7 +2,7 @@ package dotty.tools.dotc.tastyreflect
 
 import dotty.tools.dotc.util.{Positions, SourcePosition}
 
-trait ContextOpsImpl extends scala.tasty.reflect.ContextOps with TastyCoreImpl {
+trait ContextOpsImpl extends scala.tasty.reflect.ContextOps with CoreImpl {
 
   val rootContext: Context
 

compiler/src/dotty/tools/dotc/tastyreflect/TastyCoreImpl.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/CoreImpl.scala

@@ -5,7 +5,7 @@ import dotty.tools.dotc.ast.{tpd, untpd}
 import dotty.tools.dotc.core.Constants
 import dotty.tools.dotc.core.Types
 
-trait TastyCoreImpl extends scala.tasty.reflect.TastyCore {
+trait CoreImpl extends scala.tasty.reflect.Core {
 
   type Context = core.Contexts.Context
 

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

@@ -2,7 +2,7 @@ package dotty.tools.dotc.tastyreflect
 
 import dotty.tools.dotc.core.Decorators._
 
-trait IdOpsImpl extends scala.tasty.reflect.IdOps with TastyCoreImpl {
+trait IdOpsImpl extends scala.tasty.reflect.IdOps with CoreImpl {
 
   def IdDeco(id: Id): IdAPI = new IdAPI {
     def pos(implicit ctx: Context): Position = id.pos

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

@@ -3,7 +3,7 @@ package dotty.tools.dotc.tastyreflect
 import dotty.tools.dotc.ast.{Trees, untpd}
 import dotty.tools.dotc.core.StdNames.nme
 
-trait ImportSelectorOpsImpl extends scala.tasty.reflect.ImportSelectorOps with TastyCoreImpl {
+trait ImportSelectorOpsImpl extends scala.tasty.reflect.ImportSelectorOps with CoreImpl {
 
   object SimpleSelector extends SimpleSelectorExtractor {
     def unapply(x: ImportSelector)(implicit ctx: Context): Option[Id] = x match {