ch02 reorganize packages

src/main/scala/ch02/aggregateAndCount.scala

@@ -1,18 +1,17 @@
-package ch02.aggregateAndCount
+package ch02
+package agg
 
 import scalanative.unsigned.UnsignedRichInt // .toUSize
 import scalanative.unsafe.{Ptr, CSize, CQuote, CString, sizeof, stackalloc}
 import scalanative.libc.{stdio, stdlib, string}, stdio.FILE
-import ch02.common
-import common.{qsort, NGramData, byCount, WrappedArray}
 
 val lineBuffer = stdlib.malloc(1024) // 0.5
 val tempWordBuffer = stdlib.malloc(1024)
 val blockSize = 1048576 // ~ 1MB - too big? (same)
 
 @main
 def aggregateAndCount(args: String*): Unit =
-  val array = common.makeWrappedArray(blockSize)
+  val array = makeWrappedArray(blockSize)
   val readStart = System.currentTimeMillis()
   val linesRead = readAllLines(stdio.stdin, array) // NEW, different
   val readElapsed = System.currentTimeMillis() - readStart
@@ -42,7 +41,7 @@ def readAllLines(fd: Ptr[FILE], array: WrappedArray[NGramData]): Long =
   var linesRead = 0L
 
   while stdio.fgets(lineBuffer, 1024, fd) != null do
-    if array.used >= array.capacity - 1 then common.growWrappedArray(array, blockSize)
+    if array.used >= array.capacity - 1 then growWrappedArray(array, blockSize)
     parseAndCompare(lineBuffer, array) // this is the main difference!
     linesRead += 1
 

src/main/scala/ch02/common.scala

@@ -1,4 +1,4 @@
-package ch02.common
+package ch02
 
 import scalanative.unsigned.UnsignedRichInt // .toUSize
 import scalanative.unsafe.{Ptr, sizeof, CString, CStruct4, CFuncPtr2, CQuote, extern}

src/main/scala/ch02/sortByCount.scala

@@ -1,10 +1,9 @@
-package ch02.sortByCount
+package ch02
+package sort
 
 import scalanative.unsigned.UnsignedRichInt // .toUSize
 import scalanative.unsafe.{Ptr, CQuote, CSize, sizeof}
 import scalanative.libc.{stdio, stdlib, string}
-import ch02.common
-import common.{qsort, NGramData, byCount}
 
 // this temporary space is used to read the string in each line of the file.
 val tempWord: Ptr[Byte] = stdlib.malloc(1024) // 0.5
@@ -62,12 +61,12 @@ def parseLine(lineBuffer: Ptr[Byte], data: Ptr[NGramData]): Unit =
 def sortByCount(args: String*): Unit =
   val blockSize = 1048576 // 2^20 NGramData items = 2^20 * 20 bytes = 20 MB
   val lineBuffer = stdlib.malloc(1024) // 0.5
-  var array = common.makeWrappedArray(blockSize)
+  var array = makeWrappedArray(blockSize)
   val readStart = System.currentTimeMillis()
 
   // pipe file into stdin, then read line by line (fgets respects newlines)
   while stdio.fgets(lineBuffer, 1024, stdio.stdin) != null do // reads <= 1024 - 1 chars
-    if array.used >= array.capacity then common.growWrappedArray(array, blockSize)
+    if array.used >= array.capacity then growWrappedArray(array, blockSize)
     parseLine(lineBuffer, array.data + array.used) // parse CURRENT line
     array.used += 1