make new wrapper classes to avoid passing in tasty explicitly

Author: bishabosha

compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala

@@ -13,12 +13,11 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.core.tasty.TastyPrinter
-import dotty.tools.dotc.core.tasty.experimental.DottyTasty
+import dotty.tools.dotc.core.tasty.experimental.{DottyTasty, PositionPickler, TastyPickler}
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.dotc.tastyreflect.ReflectionImpl
 
-import dotty.tools.tasty.experimental.{ TastyPickler, PositionPickler }
 import dotty.tools.tasty.TastyString
 
 import scala.internal.quoted._
@@ -100,16 +99,14 @@ object PickledQuotes {
 
   /** Pickle tree into it's TASTY bytes s*/
   private def pickle(tree: Tree)(implicit ctx: Context): Array[Byte] = {
-    val pickler = new TastyPickler(DottyTasty)(defn.RootClass)
+    val pickler = new TastyPickler(defn.RootClass)
     val treePkl = pickler.treePkl
     treePkl.pickle(tree :: Nil)
     treePkl.compactify()
     pickler.addrOfTree = treePkl.buf.addrOfTree
     pickler.addrOfSym = treePkl.addrOfSym
-    if (tree.span.exists) {
-      val pospkl = new PositionPickler(DottyTasty)(pickler, treePkl.buf.addrOfTree)
-      pospkl.picklePositions(tree :: Nil)
-    }
+    if (tree.span.exists)
+      new PositionPickler(pickler, treePkl.buf.addrOfTree).picklePositions(tree :: Nil)
 
     if (quotePickling ne noPrinter)
       println(i"**** pickling quote of \n${tree.show}")

compiler/src/dotty/tools/dotc/core/tasty/experimental/CommentPickler.scala

@@ -0,0 +1,10 @@
+package dotty.tools.dotc.core.tasty.experimental
+
+import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.core.Contexts.Context
+
+import dotty.tools.tasty.experimental.{TastyPickler, CommentPickler => CommentPicklerImpl}
+import dotty.tools.tasty.TastyBuffer.Addr
+
+class CommentPickler(pickler: TastyPickler[DottyTasty.type], addrOfTree: tpd.Tree => Addr)(implicit ctx: Context)
+  extends CommentPicklerImpl(DottyTasty)(pickler, addrOfTree)

compiler/src/dotty/tools/dotc/core/tasty/experimental/DottyKernel.scala

@@ -588,7 +588,7 @@ object DottyKernel extends TastyKernel {
 
   private inline def defn(given ctx: Context) = ctx.definitions
 
-  def defn_throwMethod(given ctx: Context): TermSymbol = defn.throwMethod
+  def defn_throwMethod(given Context): TermSymbol = defn.throwMethod
   def defn_BodyAnnot(given Context): ClassSymbol = defn.BodyAnnot
 
   def Name_toTermName(name: Name): TermName = name.toTermName
@@ -677,8 +677,8 @@ object DottyKernel extends TastyKernel {
   def DefDef_vparamss(tree: DefDef): List[List[ValDef]] = tree.vparamss
   def TypeDef_rhs(tree: TypeDef): Tree = tree.rhs
 
-  def ImportSelector_imported(tree: untpd_ImportSelector): untpd.Ident = tree.imported
-  def ImportSelector_renamed(tree: untpd_ImportSelector): untpd.Tree = tree.renamed
+  def ImportSelector_imported(tree: untpd_ImportSelector): untpd_Ident = tree.imported
+  def ImportSelector_renamed(tree: untpd_ImportSelector): untpd_Tree = tree.renamed
   def ImportSelector_bound(tree: untpd_ImportSelector): untpd_Tree = tree.bound
 
   def Template_decomposeBody(tree: Template)(given Context): (List[Tree], List[Tree]) =
@@ -722,7 +722,7 @@ object DottyKernel extends TastyKernel {
   def NamedType_symbol(tpe: NamedType)(given Context): Symbol = tpe.symbol
   def NamedType_prefix(tpe: NamedType): Type = tpe.prefix
   def NamedType_designator(tpe: NamedType): Designator = tpe.designator
-  def NamedType_hasNoPrefix(tpe: NamedType): Boolean = tpe.prefix `eq` Types.NoPrefix
+  def NamedType_hasNoPrefix(tpe: NamedType): Boolean = tpe.prefix == Types.NoPrefix
   def NamedType_isType(tpe: NamedType): Boolean = tpe.isType
 
   def TypeAlias_alias(tpe: TypeAlias): Type = tpe.alias

compiler/src/dotty/tools/dotc/core/tasty/experimental/PositionPickler.scala

@@ -0,0 +1,9 @@
+package dotty.tools.dotc.core.tasty.experimental
+
+import dotty.tools.dotc.ast.untpd
+
+import dotty.tools.tasty.experimental.{TastyPickler, PositionPickler => PositionPicklerImpl}
+import dotty.tools.tasty.TastyBuffer.Addr
+
+class PositionPickler(pickler: TastyPickler[DottyTasty.type], addrOfTree: untpd.Tree => Addr)
+  extends PositionPicklerImpl(DottyTasty)(pickler, addrOfTree)

compiler/src/dotty/tools/dotc/core/tasty/experimental/TastyPickler.scala

@@ -0,0 +1,7 @@
+package dotty.tools.dotc.core.tasty.experimental
+
+import dotty.tools.dotc.core.Symbols.ClassSymbol
+
+import dotty.tools.tasty.experimental.{TastyPickler => TastyPicklerImpl}
+
+class TastyPickler(rootCls: ClassSymbol) extends TastyPicklerImpl(DottyTasty)(rootCls)

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

@@ -13,13 +13,10 @@ import Flags.Module
 import reporting.ThrowingReporter
 import collection.mutable
 
-import dotty.tools.dotc.core.tasty.experimental.DottyTasty
+import dotty.tools.dotc.core.tasty.experimental.{DottyTasty, PositionPickler, CommentPickler, TastyPickler}
 
 import dotty.tools.dotc.core.tasty.{TastyPrinter, DottyUnpickler}
 
-import dotty.tools.tasty._
-import dotty.tools.tasty.experimental._
-
 object Pickler {
   val name: String = "pickler"
 }
@@ -42,7 +39,7 @@ class Pickler extends Phase {
 
   // Maps that keep a record if -Ytest-pickler is set.
   private val beforePickling = new mutable.HashMap[ClassSymbol, String]
-  private val picklers = new mutable.HashMap[ClassSymbol, TastyPickler[DottyTasty.type]]
+  private val picklers = new mutable.HashMap[ClassSymbol, TastyPickler]
 
   /** Drop any elements of this list that are linked module classes of other elements in the list */
   private def dropCompanionModuleClasses(clss: List[ClassSymbol])(implicit ctx: Context): List[ClassSymbol] = {
@@ -60,7 +57,7 @@ class Pickler extends Phase {
       tree <- sliceTopLevel(unit.tpdTree, cls)
     }
     {
-      val pickler = new TastyPickler(DottyTasty)(cls)
+      val pickler = new TastyPickler(cls)
       if (ctx.settings.YtestPickler.value) {
         beforePickling(cls) = tree.show
         picklers(cls) = pickler
@@ -70,15 +67,11 @@ class Pickler extends Phase {
       treePkl.compactify()
       pickler.addrOfTree = treePkl.buf.addrOfTree
       pickler.addrOfSym = treePkl.addrOfSym
-      if (tree.span.exists) {
-        val pospkl = new PositionPickler(DottyTasty)(pickler, treePkl.buf.addrOfTree)
-        pospkl.picklePositions(tree :: Nil)
-      }
+      if (tree.span.exists)
+        new PositionPickler(pickler, treePkl.buf.addrOfTree).picklePositions(tree :: Nil)
 
-      if (!ctx.settings.YdropComments.value) {
-        val compkl = new CommentPickler(DottyTasty)(pickler, treePkl.buf.addrOfTree)
-        compkl.pickleComment(tree)
-      }
+      if (!ctx.settings.YdropComments.value)
+        new CommentPickler(pickler, treePkl.buf.addrOfTree).pickleComment(tree)
 
       // other pickle sections go here.
       val pickled = pickler.assembleParts()

tasty/src/dotty/tools/tasty/experimental/CommentPickler.scala

@@ -5,7 +5,7 @@ import TastyBuffer.{Addr, NoAddr}
 
 import java.nio.charset.Charset
 
-class CommentPickler[T <: Tasty with Singleton](val tasty: T)(pickler: TastyPickler[tasty.type], addrOfTree: tasty.untpd.Tree => Addr)(implicit ctx: pickler.tasty.Context) {
+class CommentPickler[T <: Tasty](val tasty: T)(pickler: TastyPickler[tasty.type], addrOfTree: tasty.Tree => Addr)(implicit ctx: tasty.Context) {
   import tasty.{_, given}
   private val buf = new TastyBuffer(5000)
   pickler.newSection("Comments", buf)

tasty/src/dotty/tools/tasty/experimental/NameBuffer.scala

@@ -7,7 +7,7 @@ import dotty.tools.tasty._
 import TastyBuffer._
 import scala.io.Codec
 
-class NameBuffer[T <: Tasty with Singleton](given val tasty: T) extends TastyBuffer(10000) {
+class NameBuffer[T <: Tasty](given val tasty: T) extends TastyBuffer(10000) {
   import tasty.{_, given}
   import NameBuffer._
 

tasty/src/dotty/tools/tasty/experimental/PositionPickler.scala

@@ -6,7 +6,7 @@ import TastyBuffer._
 
 import collection.mutable
 
-class PositionPickler[T <: Tasty with Singleton](val tasty: T)(val pickler: TastyPickler[tasty.type], addrOfTree: tasty.untpd.Tree => Addr) {
+class PositionPickler[T <: Tasty](val tasty: T)(val pickler: TastyPickler[tasty.type], addrOfTree: tasty.untpd.Tree => Addr) {
   import tasty.{_,given}
   val buf: TastyBuffer = new TastyBuffer(5000)
   pickler.newSection("Positions", buf)

tasty/src/dotty/tools/tasty/experimental/TastyPickler.scala

@@ -6,7 +6,7 @@ import dotty.tools.tasty.{TastyFormat, TastyBuffer, TastyHash}
 import TastyFormat._
 import TastyBuffer._
 
-class TastyPickler[T <: Tasty with Singleton](val tasty: T)(val rootCls: tasty.ClassSymbol) { self =>
+class TastyPickler[T <: Tasty](val tasty: T)(val rootCls: tasty.ClassSymbol) { self =>
   import tasty.{_, given}
 
   private val sections = mutable.ArrayBuffer.empty[(NameRef, TastyBuffer)]
@@ -64,7 +64,7 @@ class TastyPickler[T <: Tasty with Singleton](val tasty: T)(val rootCls: tasty.C
    *  Note that trees are looked up by reference equality,
    *  so one can reliably use this function only directly after `pickler`.
    */
-  var addrOfTree: untpd.Tree => Addr = (_ => NoAddr)
+  var addrOfTree: Tree => Addr = (_ => NoAddr)
 
   /**
    * Addresses in TASTY file of symbols, stored by pickling.

tasty/src/dotty/tools/tasty/experimental/TreeBuffer.scala

@@ -1,12 +1,12 @@
 package dotty.tools.tasty.experimental
 
-import dotty.tools.tasty.util.Util.{dble}
+import dotty.tools.tasty.util.Util.dble
 import dotty.tools.tasty.TastyBuffer
-import dotty.tools.tasty.TastyBuffer.{Addr, NoAddr, AddrWidth}
+import TastyBuffer.{Addr, NoAddr, AddrWidth}
 
 import util.Util.bestFit
 
-class TreeBuffer[T <: Tasty with Singleton](given val tasty: T) extends TastyBuffer(50000) {
+class TreeBuffer[T <: Tasty](given val tasty: T) extends TastyBuffer(50000) {
   import tasty.{_, given}
   import Printers.pickling
 

tasty/src/dotty/tools/tasty/experimental/TreePickler.scala

@@ -9,7 +9,7 @@ object TreePickler {
   val sectionName = "ASTs"
 }
 
-class TreePickler[T <: Tasty with Singleton](val tasty: T)(val pickler: TastyPickler[tasty.type]) {
+class TreePickler[T <: Tasty](val tasty: T)(val pickler: TastyPickler[tasty.type]) {
   import tasty.{_, given}
   val buf = TreeBuffer[tasty.type](given tasty)
   pickler.newSection(TreePickler.sectionName, buf)