Use Nats to pickle line sizes in TASTy

Author: nicolasstucki

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

@@ -34,18 +34,18 @@ class PositionPickler(
 
   def picklePositions(source: SourceFile, roots: List[Tree], warnings: mutable.ListBuffer[String]): Unit = {
     /** Pickle the number of lines followed by the length of each line */
-    def pickleLineOffsetts(): Unit = {
+    def pickleLineOffsets(): Unit = {
       val content = source.content()
-      buf.writeInt(content.count(_ == '\n') + 1) // number of lines
+      buf.writeNat(content.count(_ == '\n') + 1) // number of lines
       var lastIndex = content.indexOf('\n', 0)
-      buf.writeInt(lastIndex) // size of first line
+      buf.writeNat(lastIndex) // size of first line
       while lastIndex != -1 do
         val nextIndex = content.indexOf('\n', lastIndex + 1)
         val end = if nextIndex != -1 then nextIndex else content.length
-        buf.writeInt(end - lastIndex - 1) // size of the next line
+        buf.writeNat(end - lastIndex - 1) // size of the next line
         lastIndex = nextIndex
     }
-    pickleLineOffsetts()
+    pickleLineOffsets()
 
     var lastIndex = 0
     var lastSpan = Span(0, 0)

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

@@ -22,11 +22,11 @@ class PositionUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName) {
 
   def ensureDefined(): Unit = {
     if (!isDefined) {
-      val lines = readInt()
+      val lines = readNat()
       myLineSizes = new Array[Int](lines)
       var i = 0
       while i < lines do
-        myLineSizes(i) += readInt()
+        myLineSizes(i) += readNat()
         i += 1
 
       mySpans = util.HashMap[Addr, Span]()

tasty/src/dotty/tools/tasty/TastyFormat.scala

@@ -230,7 +230,7 @@ Note: Tree tags are grouped into 5 categories that determine what follows, and t
 
 Standard-Section: "Positions" LinesSizes Assoc*
 
-  LinesSizes    = Int Int*                 // Number of lines followed by the size of each line not counting the trailing `\n`
+  LinesSizes    = Nat Nat*                 // Number of lines followed by the size of each line not counting the trailing `\n`
 
   Assoc         = Header offset_Delta? offset_Delta? point_Delta?
                 | SOURCE nameref_Int