Independent tasty-core library

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) {

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

@@ -3,16 +3,18 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat.SOURCE
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer._
+
 import ast._
 import ast.Trees._
 import ast.Trees.WithLazyField
 import util.{SourceFile, NoSource}
 import core._
 import Contexts._, Symbols._, Annotations._, Decorators._
 import collection.mutable
-import TastyBuffer._
 import util.Spans._
-import TastyFormat.SOURCE
 
 class PositionPickler(pickler: TastyPickler, addrOfTree: untpd.Tree => Addr) {
   val buf: TastyBuffer = new TastyBuffer(5000)

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

@@ -3,10 +3,12 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{TastyFormat, TastyBuffer, TastyReader}
+import TastyFormat.SOURCE
+import TastyBuffer.{Addr, NameRef}
+
 import util.Spans._
 import collection.{mutable, Map}
-import TastyBuffer.{Addr, NameRef}
-import TastyFormat.SOURCE
 import Names.TermName
 
 /** Unpickler for tree positions */
@@ -61,4 +63,3 @@ class PositionUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName) {
   def spanAt(addr: Addr): Span = spans.getOrElse(addr, NoSpan)
   def sourcePathAt(addr: Addr): String = sourcePaths.getOrElse(addr, "")
 }
-

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

@@ -2,11 +2,13 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{TastyBuffer, TastyReader}
+import TastyBuffer.NameRef
+
 import Contexts._, Decorators._
 import Names.{Name, TermName}
 import StdNames.nme
 import TastyUnpickler._
-import TastyBuffer.NameRef
 import util.Spans.offsetToInt
 import printing.Highlighting._
 
@@ -20,7 +22,7 @@ class TastyClassName(bytes: Array[Byte]) {
   def readName(): Option[(TermName, TermName)] = unpickle(new TreeSectionUnpickler)
 
   class TreeSectionUnpickler extends SectionUnpickler[(TermName, TermName)](TreePickler.sectionName) {
-    import TastyFormat._
+    import dotty.tools.tasty.TastyFormat._
     def unpickle(reader: TastyReader, tastyName: NameTable): (TermName, TermName) = {
       import reader._
       def readName() = {

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

@@ -2,10 +2,11 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyBuffer.NameRef
+
 import Contexts._, Decorators._
 import Names.Name
 import TastyUnpickler._
-import TastyBuffer.NameRef
 import util.Spans.offsetToInt
 import printing.Highlighting._
 

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

@@ -3,9 +3,11 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{TastyBuffer, TastyFormat, TastyHash}
 import TastyFormat._
-import collection.mutable
 import TastyBuffer._
+
+import collection.mutable
 import core.Symbols.{Symbol, ClassSymbol}
 import ast.tpd
 import Decorators._
@@ -78,4 +80,3 @@ class TastyPickler(val rootCls: ClassSymbol) {
 
   val treePkl: TreePickler = new TreePickler(this)
 }
-

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

@@ -2,10 +2,12 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{TastyBuffer, TastyReader}
+import TastyBuffer.{Addr, NameRef}
+
 import Contexts._, Decorators._
 import Names.Name
 import TastyUnpickler._
-import TastyBuffer.{Addr, NameRef}
 import util.Spans.offsetToInt
 import printing.Highlighting._
 
@@ -49,7 +51,7 @@ class TastyPrinter(bytes: Array[Byte])(implicit ctx: Context) {
   }
 
   class TreeSectionUnpickler extends SectionUnpickler[String](TreePickler.sectionName) {
-    import TastyFormat._
+    import dotty.tools.tasty.TastyFormat._
 
     private val sb: StringBuilder = new StringBuilder
 

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

@@ -1,4 +1,4 @@
-package dotty.tools.dotc.core.tasty
+package dotty.tools.tasty
 
 import java.io._
 import java.util.Base64
@@ -25,4 +25,3 @@ object TastyString {
     Base64.getDecoder().decode(string.result().getBytes(UTF_8))
   }
 }
-

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

@@ -2,14 +2,15 @@ package dotty.tools.dotc
 package core
 package tasty
 
-import scala.collection.mutable
+import dotty.tools.tasty.{TastyFormat, TastyBuffer, TastyReader, TastyHeaderUnpickler}
 import TastyFormat.NameTags._
 import TastyBuffer.NameRef
+
+import scala.collection.mutable
 import Names.{TermName, termName, EmptyTermName}
 import NameKinds._
 
 object TastyUnpickler {
-  class UnpickleException(msg: String) extends RuntimeException(msg)
 
   abstract class SectionUnpickler[R](val name: String) {
     def unpickle(reader: TastyReader, nameAtRef: NameTable): R

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

@@ -3,8 +3,11 @@ package dotc
 package core
 package tasty
 
-import util.Util.{bestFit, dble}
+import dotty.tools.tasty.util.Util.dble
+import dotty.tools.tasty.TastyBuffer
 import TastyBuffer.{Addr, NoAddr, AddrWidth}
+
+import util.Util.bestFit
 import config.Printers.pickling
 import ast.untpd.Tree
 

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

@@ -3,14 +3,15 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat._
+import dotty.tools.tasty.TastyBuffer._
+
 import ast.Trees._
 import ast.{untpd, tpd}
-import TastyFormat._
 import Contexts._, Symbols._, Types._, Names._, Constants._, Decorators._, Annotations._, Flags._
 import typer.Inliner
 import NameKinds._
 import StdNames.nme
-import TastyBuffer._
 import transform.SymUtils._
 import printing.Printer
 import printing.Texts._

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

@@ -24,6 +24,8 @@ import ast.{TreeTypeMap, Trees, tpd, untpd}
 import Trees._
 import Decorators._
 import transform.SymUtils._
+
+import dotty.tools.tasty.{TastyBuffer, TastyReader}
 import TastyBuffer._
 
 import scala.annotation.{switch, tailrec}
@@ -33,6 +35,8 @@ import config.Printers.pickling
 import core.quoted.PickledQuotes
 import dotty.tools.dotc.quoted.QuoteContext
 
+import dotty.tools.tasty.TastyFormat._
+
 import scala.quoted
 import scala.internal.quoted.{TastyTreeExpr, TreeType}
 import scala.annotation.constructorOnly
@@ -49,7 +53,6 @@ class TreeUnpickler(reader: TastyReader,
                     posUnpicklerOpt: Option[PositionUnpickler],
                     commentUnpicklerOpt: Option[CommentUnpickler],
                     splices: Seq[Any]) {
-  import TastyFormat._
   import TreeUnpickler._
   import tpd._
 
@@ -1454,5 +1457,3 @@ object TreeUnpickler {
 
   class TreeWithoutOwner extends Exception
 }
-
-

compiler/src/dotty/tools/dotc/util/Util.scala

@@ -1,5 +1,4 @@
 package dotty.tools.dotc.util
-import reflect.ClassTag
 
 object Util {
 
@@ -23,10 +22,4 @@ object Util {
     else recur(0, length, initMid)
   }
 
-  /** An array twice the size of given array, with existing elements copied over */
-  def dble[T: ClassTag](arr: Array[T]): Array[T] = {
-    val arr1 = new Array[T](arr.length * 2)
-    System.arraycopy(arr, 0, arr1, 0, arr.length)
-    arr1
-  }
 }

compiler/test/dotty/Properties.scala

@@ -53,6 +53,9 @@ object Properties {
   /** dotty-staging jar */
   def dottyStaging: String = sys.props("dotty.tests.classes.dottyStaging")
 
+  /** tasty-core jar */
+  def tastyCore: String = sys.props("dotty.tests.classes.tastyCore")
+
   /** compiler-interface jar */
   def compilerInterface: String = sys.props("dotty.tests.classes.compilerInterface")
 

compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala

@@ -50,6 +50,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
       compileDir("compiler/src/dotty/tools/dotc/typer", withCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/util", withCompilerOptions),
       compileDir("compiler/src/dotty/tools/io", withCompilerOptions),
+      compileDir("tasty/src/dotty/tools/tasty", withCompilerOptions),
       compileList(
         "testIssue6460",
         List(
@@ -163,7 +164,8 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
       compileFile("tests/pos/pickleinf.scala", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/core/classfile", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/core/tasty", picklingWithCompilerOptions),
-      compileDir("compiler/src/dotty/tools/dotc/core/unpickleScala2", picklingWithCompilerOptions)
+      compileDir("compiler/src/dotty/tools/dotc/core/unpickleScala2", picklingWithCompilerOptions),
+      compileDir("tasty/src/dotty/tools/tasty", picklingWithCompilerOptions)
     ).limitThreads(4).checkCompile()
   }