Merge pull request #7616 from dotty-staging/independent-tasty-lib

Independent tasty-core library

Author: bishabosha

build.sbt

@@ -14,6 +14,9 @@ val `dotty-staging` = Build.`dotty-staging`
 val `dotty-language-server` = Build.`dotty-language-server`
 val `dotty-bench` = Build.`dotty-bench`
 val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
+val `tasty-core` = Build.`tasty-core`
+val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
+val `tasty-core-scala2` = Build.`tasty-core-scala2`
 val `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -20,13 +20,13 @@ import Decorators._
 
 import java.io.DataOutputStream
 
+import dotty.tools.tasty.{ TastyBuffer, TastyHeaderUnpickler }
 
 import scala.tools.asm
 import scala.tools.asm.Handle
 import scala.tools.asm.tree._
 import tpd._
 import StdNames._
-import dotty.tools.dotc.core.tasty.{TastyBuffer, TastyHeaderUnpickler}
 import dotty.tools.io._
 
 class GenBCode extends Phase {

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

@@ -1,8 +1,6 @@
-package dotty.tools
-package dotc
-package core
+package dotty.tools.dotc.core
 
-import tasty.TastyFormat
+import dotty.tools.tasty.TastyFormat
 
 /** The possible tags of a NameKind */
 object NameTags extends TastyFormat.NameTags {

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -3,10 +3,11 @@ package dotc
 package core
 package classfile
 
+import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler }
+
 import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._
 import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._
 import NameKinds.DefaultGetterName
-import dotty.tools.dotc.core.tasty.{TastyHeaderUnpickler, TastyReader}
 import ast.tpd._
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, IOException }
 
@@ -1183,4 +1184,3 @@ class ClassfileParser(
  throw new RuntimeException("bad constant pool tag " + in.buf(start) + " at byte " + start)
  }
 }
-

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

@@ -12,11 +12,13 @@ import dotty.tools.dotc.core.Mode
 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.{PositionPickler, TastyPickler, TastyPrinter, TastyString}
+import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.dotc.tastyreflect.ReflectionImpl
 
+import dotty.tools.tasty.TastyString
+
 import scala.internal.quoted._
 import scala.reflect.ClassTag
 

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

@@ -4,6 +4,8 @@ import dotty.tools.dotc.core.tasty._
 import dotty.tools.dotc.core.tasty.TastyUnpickler.NameTable
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 
+import dotty.tools.tasty.TastyReader
+
 object QuoteUnpickler {
  class QuotedTreeSectionUnpickler(posUnpickler: Option[PositionUnpickler], splices: Seq[Any])
  extends DottyUnpickler.TreeSectionUnpickler(posUnpickler, None) {

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

@@ -3,7 +3,9 @@ package dotty.tools.dotc.core.tasty
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Comments.{Comment, CommentsContext, ContextDocstrings}
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.tasty.TastyBuffer.{Addr, NoAddr}
+
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer.{Addr, NoAddr}
 
 import java.nio.charset.Charset
 
@@ -40,4 +42,3 @@ class CommentPickler(pickler: TastyPickler, addrOfTree: tpd.Tree => Addr)(implic
  }
  }
 }
-

compiler/src/dotty/tools/dotc/core/tasty/CommentUnpickler.scala

@@ -1,9 +1,11 @@
 package dotty.tools.dotc.core.tasty
 
 import dotty.tools.dotc.core.Comments.Comment
-import dotty.tools.dotc.core.tasty.TastyBuffer.Addr
 import dotty.tools.dotc.util.Spans.Span
 
+import dotty.tools.tasty.{TastyReader, TastyBuffer}
+import TastyBuffer.Addr
+
 import scala.collection.mutable.HashMap
 
 import java.nio.charset.Charset
@@ -29,4 +31,3 @@ class CommentUnpickler(reader: TastyReader) {
  def commentAt(addr: Addr): Option[Comment] =
  comments.get(addr)
 }
-

compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala

@@ -10,6 +10,8 @@ import classfile.ClassfileParser
 import Names.SimpleName
 import TreeUnpickler.UnpickleMode
 
+import dotty.tools.tasty.TastyReader
+
 object DottyUnpickler {
 
  /** Exception thrown if classfile is corrupted */

compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala

@@ -3,11 +3,13 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer._
+
 import collection.mutable
 import Names.{Name, chrs, SimpleName, DerivedName, TypeName}
 import NameKinds._
 import Decorators._
-import TastyBuffer._
 import scala.io.Codec
 
 class NameBuffer extends TastyBuffer(10000) {