Move TastyFormat to separate sbt project

bishabosha · bishabosha · commit a7bdb9faeb8a · 2019-11-25T17:27:00.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -14,6 +14,8 @@ 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 `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`
diff --git a/compiler/src/dotty/tools/dotc/core/NameTags.scala b/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 {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala
@@ -3,6 +3,8 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat.SOURCE
+
 import ast._
 import ast.Trees._
 import ast.Trees.WithLazyField
@@ -12,7 +14,6 @@ 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)
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala
@@ -3,10 +3,11 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat.SOURCE
+
 import util.Spans._
 import collection.{mutable, Map}
 import TastyBuffer.{Addr, NameRef}
-import TastyFormat.SOURCE
 import Names.TermName
 
 /** Unpickler for tree positions */
@@ -61,4 +62,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, "")
 }
-
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala
@@ -20,7 +20,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() = {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyHeaderUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyHeaderUnpickler.scala
@@ -4,8 +4,7 @@ package tasty
 
 import java.util.UUID
 
-import dotty.tools.dotc.core.tasty.TastyFormat.{MajorVersion, MinorVersion, header}
-import dotty.tools.dotc.core.tasty.TastyUnpickler.UnpickleException
+import dotty.tools.tasty.TastyFormat.{MajorVersion, MinorVersion, header}
 
 class TastyHeaderUnpickler(reader: TastyReader) {
   import reader._
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
@@ -3,7 +3,8 @@ package dotc
 package core
 package tasty
 
-import TastyFormat._
+import dotty.tools.tasty.TastyFormat._
+
 import collection.mutable
 import TastyBuffer._
 import core.Symbols.{Symbol, ClassSymbol}
@@ -78,4 +79,3 @@ class TastyPickler(val rootCls: ClassSymbol) {
 
   val treePkl: TreePickler = new TreePickler(this)
 }
-
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala
@@ -49,7 +49,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
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala
@@ -2,14 +2,14 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat.NameTags._
+
 import scala.collection.mutable
-import TastyFormat.NameTags._
 import TastyBuffer.NameRef
 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
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
@@ -3,9 +3,10 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat._
+
 import ast.Trees._
 import ast.{untpd, tpd}
-import TastyFormat._
 import Contexts._, Symbols._, Types._, Names._, Constants._, Decorators._, Annotations._, Flags._
 import typer.Inliner
 import NameKinds._
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -33,6 +33,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 +51,6 @@ class TreeUnpickler(reader: TastyReader,
                     posUnpicklerOpt: Option[PositionUnpickler],
                     commentUnpicklerOpt: Option[CommentUnpickler],
                     splices: Seq[Any]) {
-  import TastyFormat._
   import TreeUnpickler._
   import tpd._
 
@@ -1454,5 +1455,3 @@ object TreeUnpickler {
 
   class TreeWithoutOwner extends Exception
 }
-
-
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/UnpickleException.scala b/compiler/src/dotty/tools/dotc/core/tasty/UnpickleException.scala
@@ -0,0 +1,3 @@
+package dotty.tools.dotc.core.tasty
+
+class UnpickleException(msg: String) extends RuntimeException(msg)
diff --git a/compiler/test/dotty/Properties.scala b/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")
 
diff --git a/language-server/src/dotty/tools/languageserver/decompiler/TastyDecompilerService.scala b/language-server/src/dotty/tools/languageserver/decompiler/TastyDecompilerService.scala
@@ -6,7 +6,7 @@ import java.net.URI
 import java.nio.file._
 import java.util.concurrent.CompletableFuture
 
-import dotc.core.tasty.TastyUnpickler.UnpickleException
+import dotc.core.tasty.UnpickleException
 import dotc.fromtasty.TastyFileUtil
 
 import org.eclipse.lsp4j.jsonrpc.services._
diff --git a/project/Build.scala b/project/Build.scala
@@ -298,12 +298,13 @@ object Build {
       // compiler instances. This cache is invalidated based on timestamps
       // however this is only implemented on jars, directories are never
       // invalidated.
+      val tastyCore = packageBin.in(`tasty-core`, Compile).value
       val dottyLibrary = packageBin.in(`dotty-library`, Compile).value
       val dottyInterfaces = packageBin.in(`dotty-interfaces`, Compile).value
       val dottyCompiler = packageBin.in(`dotty-compiler`, Compile).value
       val dottyDoc = packageBin.in(`dotty-doc`, Compile).value
 
-      val allJars = Seq(dottyLibrary, dottyInterfaces, dottyCompiler, dottyDoc) ++ externalNonBootstrappedDeps.map(_.data)
+      val allJars = Seq(tastyCore, dottyLibrary, dottyInterfaces, dottyCompiler, dottyDoc) ++ externalNonBootstrappedDeps.map(_.data)
 
       makeScalaInstance(
         state.value,
@@ -512,6 +513,7 @@ object Build {
           "-Ddotty.tests.classes.dottyInterfaces=" + jars("dotty-interfaces"),
           "-Ddotty.tests.classes.dottyLibrary=" + jars("dotty-library"),
           "-Ddotty.tests.classes.dottyCompiler=" + jars("dotty-compiler"),
+          "-Ddotty.tests.classes.tastyCore=" + jars("tasty-core"),
           "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
           "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
           "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
@@ -675,6 +677,7 @@ object Build {
           // library on the compiler classpath since the non-bootstrapped one
           // may not be binary-compatible.
           "dotty-library"       -> packageBin.in(`dotty-library-bootstrapped`, Compile).value,
+          "tasty-core"          -> packageBin.in(`tasty-core-bootstrapped`, Compile).value,
         ).mapValues(_.getAbsolutePath)
       }
     }.value,
@@ -726,6 +729,11 @@ object Build {
     case Bootstrapped => `dotty-library-bootstrapped`
   }
 
+  def tastyCore(implicit mode: Mode): Project = mode match {
+    case NonBootstrapped => `tasty-core`
+    case Bootstrapped => `tasty-core-bootstrapped`
+  }
+
   /** The dotty standard library compiled with the Scala.js back-end, to produce
    *  the corresponding .sjsir files.
    *
@@ -743,6 +751,9 @@ object Build {
         (unmanagedSourceDirectories in (`dotty-library-bootstrapped`, Compile)).value,
     )
 
+  lazy val `tasty-core` = project.in(file("tasty")).asTastyCore(NonBootstrapped)
+  lazy val `tasty-core-bootstrapped`: Project = project.in(file("tasty")).asTastyCore(Bootstrapped)
+
   lazy val `dotty-staging` = project.in(file("staging")).
     withCommonSettings(Bootstrapped).
     // We want the compiler to be present in the compiler classpath when compiling this project but not
@@ -1263,8 +1274,9 @@ object Build {
 
     // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
     def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
-      aggregate(`dotty-interfaces`, dottyLibrary, dottyCompiler, dottyDoc, `dotty-sbt-bridge`).
+      aggregate(`dotty-interfaces`, dottyLibrary, dottyCompiler, tastyCore, dottyDoc, `dotty-sbt-bridge`).
       bootstrappedAggregate(`scala-library`, `scala-compiler`, `scala-reflect`, scalap, `dotty-language-server`, `dotty-staging`).
+      dependsOn(tastyCore).
       dependsOn(dottyCompiler).
       dependsOn(dottyLibrary).
       nonBootstrappedSettings(
@@ -1274,6 +1286,7 @@ object Build {
     def asDottyCompiler(implicit mode: Mode): Project = project.withCommonSettings.
       dependsOn(`dotty-interfaces`).
       dependsOn(dottyLibrary).
+      dependsOn(tastyCore).
       settings(dottyCompilerSettings)
 
     def asDottyLibrary(implicit mode: Mode): Project = project.withCommonSettings.
@@ -1282,6 +1295,9 @@ object Build {
       ).
       settings(dottyLibrarySettings)
 
+    def asTastyCore(implicit mode: Mode): Project = project.withCommonSettings.
+      dependsOn(dottyLibrary)
+
     def asDottyDoc(implicit mode: Mode): Project = project.withCommonSettings.
       dependsOn(dottyCompiler, dottyCompiler % "test->test").
       settings(dottyDocSettings)
@@ -1294,7 +1310,7 @@ object Build {
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.
-      dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, `dotty-staging`, dottyDoc).
+      dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `dotty-staging`, dottyDoc).
       settings(commonDistSettings).
       bootstrappedSettings(
         target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala
@@ -1,6 +1,4 @@
-package dotty.tools.dotc
-package core
-package tasty
+package dotty.tools.tasty
 
 /************************************************************
 Notation:

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class TastyPrinter(bytes: Array[Byte])(implicit ctx: Context) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`class TreeSectionUnpickler extends SectionUnpickler[String](TreePickler.sectionName) {`
`52`		`- import TastyFormat._`
	`52`	`+ import dotty.tools.tasty.TastyFormat._`
`53`	`53`
`54`	`54`	`private val sb: StringBuilder = new StringBuilder`
`55`	`55`