attempt to pass Ycheck

Author: bishabosha

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

@@ -3,8 +3,8 @@ 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.experimental.{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)
+class CommentPickler(pickler: TastyPickler, addrOfTree: tpd.Tree => Addr)(implicit ctx: Context)
+  extends CommentPicklerImpl(pickler, addrOfTree)

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

@@ -2,8 +2,8 @@ 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.experimental.{PositionPickler => PositionPicklerImpl}
 import dotty.tools.tasty.TastyBuffer.Addr
 
-class PositionPickler(pickler: TastyPickler[DottyTasty.type], addrOfTree: untpd.Tree => Addr)
-  extends PositionPicklerImpl(DottyTasty)(pickler, addrOfTree)
+class PositionPickler(pickler: TastyPickler, addrOfTree: untpd.Tree => Addr)
+  extends PositionPicklerImpl(pickler, addrOfTree)

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

@@ -5,12 +5,12 @@ import TastyBuffer.{Addr, NoAddr}
 
 import java.nio.charset.Charset
 
-class CommentPickler[T <: Tasty](val tasty: T)(pickler: TastyPickler[tasty.type], addrOfTree: tasty.Tree => Addr)(implicit ctx: tasty.Context) {
-  import tasty.{_, given}
+class CommentPickler[T <: Tasty](val pickler: TastyPickler[T], addrOfTree: pickler.tasty.tpd.Tree => Addr)(implicit ctx: pickler.tasty.Context) {
+  import pickler.tasty.{_, given}
   private val buf = new TastyBuffer(5000)
   pickler.newSection("Comments", buf)
 
-  def pickleComment(root: Tree): Unit = {
+  def pickleComment(root: tpd.Tree): Unit = {
     val docCtx = ctx.docCtx
     assert(docCtx.isDefined, "Trying to pickle comments, but there's no `docCtx`.")
     new Traverser(docCtx.get).traverse(root)
@@ -29,9 +29,9 @@ class CommentPickler[T <: Tasty](val tasty: T)(pickler: TastyPickler[tasty.type]
   }
 
   private class Traverser(docCtx: ContextDocstrings) extends TreeTraverser {
-    override def traverse(tree: Tree)(implicit ctx: Context): Unit =
+    override def traverse(tree: tpd.Tree)(implicit ctx: Context): Unit =
       tree match {
-        case md: MemberDef =>
+        case md: tpd.MemberDef =>
           val comment = docCtx.docstring(md.symbol)
           pickleComment(addrOfTree(md), comment)
           traverseChildren(md)

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

@@ -6,8 +6,8 @@ import TastyBuffer._
 
 import collection.mutable
 
-class PositionPickler[T <: Tasty](val tasty: T)(val pickler: TastyPickler[tasty.type], addrOfTree: tasty.untpd.Tree => Addr) {
-  import tasty.{_,given}
+class PositionPickler[T <: Tasty](val pickler: TastyPickler[T], addrOfTree: pickler.tasty.untpd.Tree => Addr) {
+  import pickler.tasty.{_,given}
   val buf: TastyBuffer = new TastyBuffer(5000)
   pickler.newSection("Positions", buf)
 
@@ -18,7 +18,7 @@ class PositionPickler[T <: Tasty](val tasty: T)(val pickler: TastyPickler[tasty.
     (addrDelta << 3) | (toInt(hasStartDelta) << 2) | (toInt(hasEndDelta) << 1) | toInt(hasPoint)
   }
 
-  def picklePositions(roots: List[Tree])(implicit ctx: Context): Unit = {
+  def picklePositions(roots: List[tpd.Tree])(implicit ctx: Context): Unit = {
     var lastIndex = 0
     var lastSpan = Span.empty
     def pickleDeltas(index: Int, span: Span) = {

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

@@ -64,7 +64,7 @@ class TastyPickler[T <: Tasty](val tasty: T)(val rootCls: tasty.ClassSymbol) { s
    *  Note that trees are looked up by reference equality,
    *  so one can reliably use this function only directly after `pickler`.
    */
-  var addrOfTree: Tree => Addr = (_ => NoAddr)
+  var addrOfTree: tpd.Tree => Addr = (_ => NoAddr)
 
   /**
    * Addresses in TASTY file of symbols, stored by pickling.
@@ -73,5 +73,5 @@ class TastyPickler[T <: Tasty](val tasty: T)(val rootCls: tasty.ClassSymbol) { s
    */
   var addrOfSym: Symbol => Option[Addr] = (_ => None)
 
-  val treePkl = new TreePickler(tasty)(self.asInstanceOf[TastyPickler[tasty.type]])
+  val treePkl = new TreePickler(self)
 }

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

@@ -6,7 +6,7 @@ import TastyBuffer.{Addr, NoAddr, AddrWidth}
 
 import util.Util.bestFit
 
-class TreeBuffer[T <: Tasty](given val tasty: T) extends TastyBuffer(50000) {
+class TreeBuffer[T <: Tasty](val tasty: T) extends TastyBuffer(50000) {
   import tasty.{_, given}
   import Printers.pickling
 

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

@@ -9,15 +9,16 @@ object TreePickler {
   val sectionName = "ASTs"
 }
 
-class TreePickler[T <: Tasty](val tasty: T)(val pickler: TastyPickler[tasty.type]) {
-  import tasty.{_, given}
-  val buf = TreeBuffer[tasty.type](given tasty)
+class TreePickler[T <: Tasty](val pickler: TastyPickler[T]) {
+  import pickler.tasty.{_, given}
+  val buf = TreeBuffer[pickler.tasty.type](pickler.tasty)
   pickler.newSection(TreePickler.sectionName, buf)
   import TreePickler._
   import buf._
   import pickler.nameBuffer.nameIndex
   import Constants._
   import Symbols.{_,given}
+  import tpd._
 
   private val symRefs = Symbols.newMutableSymbolMap[Addr]
   private val forwardSymRefs = Symbols.newMutableSymbolMap[List[Addr]]

tasty/src/dotty/tools/tasty/experimental/bridge/AnnotationOps.scala

@@ -3,6 +3,7 @@ package dotty.tools.tasty.experimental.bridge
 import reflect.ClassTag
 
 trait AnnotationOps extends Core with
+  self: TreeOps with PositionOps with ContextOps with SourceFileOps with SymbolOps =>
 
   given ClassTag[Annotation] = internal.Annotation_CT
 
@@ -13,5 +14,5 @@ trait AnnotationOps extends Core with
       def unapply(annot: Annotation)(given Context): Option[Symbol] = internal.Annotation_Child_unapply(annot)
 
   given AnnotationOps: (annot: Annotation) with
-    def tree(given Context): Tree = internal.Annotation_tree(annot)
+    def tree(given Context): tpd.Tree = internal.Annotation_tree(annot)
     def symbol(given Context): Symbol = internal.Annotation_symbol(annot)

tasty/src/dotty/tools/tasty/experimental/bridge/Core.scala

@@ -22,53 +22,6 @@ trait Core with
 
   type Positioned = internal.Positioned
 
-  type Tree = internal.Tree
-  type MemberDef = internal.MemberDef
-  type Hole = internal.Hole
-  type Template = internal.Template
-  type ValOrDefDef = internal.ValOrDefDef
-  type TypeDef = internal.TypeDef
-  type ValDef = internal.ValDef
-  type DefDef = internal.DefDef
-  type RefTree = internal.RefTree
-  type Ident = internal.Ident
-  type Select = internal.Select
-  type This = internal.This
-  type Apply = internal.Apply
-  type TypeApply = internal.TypeApply
-  type Literal = internal.Literal
-  type Super = internal.Super
-  type New = internal.New
-  type Typed = internal.Typed
-  type NamedArg = internal.NamedArg
-  type Assign = internal.Assign
-  type Block = internal.Block
-  type If = internal.If
-  type Closure = internal.Closure
-  type Match = internal.Match
-  type CaseDef = internal.CaseDef
-  type Labeled = internal.Labeled
-  type Return = internal.Return
-  type WhileDo = internal.WhileDo
-  type Try = internal.Try
-  type SeqLiteral = internal.SeqLiteral
-  type Inlined = internal.Inlined
-  type Bind = internal.Bind
-  type Alternative = internal.Alternative
-  type UnApply = internal.UnApply
-  type Import = internal.Import
-  type PackageDef = internal.PackageDef
-  type TypeTree = internal.TypeTree
-  type SingletonTypeTree = internal.SingletonTypeTree
-  type RefinedTypeTree = internal.RefinedTypeTree
-  type AppliedTypeTree = internal.AppliedTypeTree
-  type MatchTypeTree = internal.MatchTypeTree
-  type ByNameTypeTree = internal.ByNameTypeTree
-  type Annotated = internal.Annotated
-  type LambdaTypeTree = internal.LambdaTypeTree
-  type TypeBoundsTree = internal.TypeBoundsTree
-  type Thicket = internal.Thicket
-
   type Type = internal.Type
   type AppliedType = internal.AppliedType
   type ConstantType = internal.ConstantType