Pickling modularization reorg

The pickling package got rather large and confusing with three
separate tasks that each had their own conventions: read JVM classfiles,
read Scala2 pickle info, read Tasty. The classes for each task are now in
separate packages.

1 files changed, 70 insertions, 0 deletions

diff --git a/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
new file mode 100644
index 000000000..f53a97c0c
--- /dev/null
+++ b/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
@@ -0,0 +1,70 @@
+package dotty.tools
+package dotc
+package core
+package tasty
+
+import TastyFormat._
+import collection.mutable
+import TastyBuffer._
+import java.util.UUID
+import core.Symbols.Symbol
+import ast.tpd
+
+class TastyPickler {
+
+  private val sections = new mutable.ArrayBuffer[(TastyName.NameRef, TastyBuffer)]
+
+  private val headerBuffer = {
+    val buf = new TastyBuffer(24)
+    for (ch <- header) buf.writeByte(ch.toByte)
+    buf.writeNat(MajorVersion)
+    buf.writeNat(MinorVersion)
+    val uuid = UUID.randomUUID()
+    buf.writeUncompressedLong(uuid.getMostSignificantBits)
+    buf.writeUncompressedLong(uuid.getLeastSignificantBits)
+    buf
+  }
+
+  val nameBuffer = new NameBuffer
+
+  def newSection(name: String, buf: TastyBuffer) =
+    sections += ((nameBuffer.nameIndex(name), buf))
+
+  def assembleParts(): Array[Byte] = {
+    def lengthWithLength(buf: TastyBuffer) = {
+      buf.assemble()
+      buf.length + natSize(buf.length)
+    }
+    val totalSize =
+      headerBuffer.length +
+      lengthWithLength(nameBuffer) + {
+        for ((nameRef, buf) <- sections) yield
+          natSize(nameRef.index) + lengthWithLength(buf)
+      }.sum
+    val all = new TastyBuffer(totalSize)
+    all.writeBytes(headerBuffer.bytes, headerBuffer.length)
+    all.writeNat(nameBuffer.length)
+    all.writeBytes(nameBuffer.bytes, nameBuffer.length)
+    for ((nameRef, buf) <- sections) {
+      all.writeNat(nameRef.index)
+      all.writeNat(buf.length)
+      all.writeBytes(buf.bytes, buf.length)
+    }
+    assert(all.length == totalSize && all.bytes.length == totalSize, s"totalSize = $totalSize, all.length = ${all.length}, all.bytes.length = ${all.bytes.length}")
+    all.bytes
+  }
+
+  /**
+   * Addresses in TASTY file of trees, stored by pickling.
+   * Note that trees are checked for reference equality,
+   * so one can reliably use this function only directly after `pickler`
+   */
+  var addrOfTree: tpd.Tree => Option[Addr] = (_ => None)
+
+  /**
+   * Addresses in TASTY file of symbols, stored by pickling.
+   * Note that trees are checked for reference equality,
+   * so one can reliably use this function only dirrectly after `pickler`
+   */
+  var addrOfSym: Symbol => Option[Addr] = (_ => None)
+}