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, 38 insertions, 0 deletions

diff --git a/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala b/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala
new file mode 100644
index 000000000..fa80a2769
--- /dev/null
+++ b/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala
@@ -0,0 +1,38 @@
+package dotty.tools
+package dotc
+package core
+package tasty
+
+
+import util.Positions._
+import collection.mutable
+import TastyBuffer.Addr
+
+object PositionUnpickler {
+  type AddrToPosition = mutable.HashMap[Addr, Position]
+}
+
+/** Unpickler for tree positions */
+class PositionUnpickler(reader: TastyReader) {
+  import PositionUnpickler._
+  import reader._
+
+  def unpickle(): (Position, AddrToPosition) = {
+    val positions = new mutable.HashMap[Addr, Position] // Dotty deviation: Can't use new AddrToPosition here. TODO: fix this!
+    val sourceLength = readNat()
+    def readDelta() = if (isAtEnd) 0 else readInt()
+    var curIndex: Addr = Addr(readDelta())
+    while (!isAtEnd) {
+      val delta1 = readDelta()
+      val delta2 = readDelta()
+      val (startDelta, endDelta, indexDelta) =
+        if (delta2 <= 0) (delta1, -delta2, readDelta())
+        else if (delta1 < 0) (0, -delta1, delta2)
+        else (delta1, 0, delta2)
+      positions(curIndex) = Position(startDelta, endDelta, startDelta)
+        // make non-synthetic position; will be made synthetic by normalization.
+      curIndex += indexDelta
+    }
+    (Position(0, sourceLength), positions)
+  }
+}