Move tracking, pad to streams

Author: marzipankaiser

libraries/common/binstream.effekt

@@ -148,33 +148,6 @@ def x{ body: => Unit / { literal, HexSplices } }: Int = {
   res
 }
 
-// Counting and padding
-// --------------------
-// TODO could also be part of stream library
-
-/// get current position in stream
-effect getPos(): Int
-
-/// Track position in stream, starting with init
-/// Handles getPos and pad
-def tracking[A](init: Int){ body: => Unit / { emit[A], getPos } }: Unit / emit[A] = {
-  var n = init
-  try body()
-  with emit[A] { b => n = n + 1; resume(do emit[A](b)) }
-  with getPos{ resume(n) }
-}
-
-/// Pad to a multiple of fac, by calling gen for each
-def pad[A](fac: Int){ gen: => A }: Unit  / {getPos, emit[A]} = {
-  while(mod(do getPos(), fac) != 0) {
-    do emit[A](gen())
-  }
-}
-
-/// Track how many bytes were emitted
-/// Handles getPos and pad
-def tracking[A]{ body: => Unit / { emit[A], getPos } }: Unit / emit[A] =
-  tracking[A](0){body}
 
 // Sub-Byte
 // ========

libraries/common/stream.effekt

@@ -504,6 +504,33 @@ def tee[A]{ cons1: { => Unit / emit[A] } => Unit }{ cons2: { => Unit / emit[A] }
   }
 }
 
+// Counting and padding
+// --------------------
+
+/// get current position in stream
+effect getPos(): Int
+
+/// Track position in stream, starting with init
+/// Handles getPos
+def tracking[A](init: Int){ body: => Unit / { emit[A], getPos } }: Unit / emit[A] = {
+  var n = init
+  try body()
+  with emit[A] { b => n = n + 1; resume(do emit[A](b)) }
+  with getPos{ resume(n) }
+}
+
+/// Pad to a multiple of fac emitted values, by emitting gen repeatedly
+def pad[A](fac: Int){ gen: => A }: Unit  / {getPos, emit[A]} = {
+  while(mod(do getPos(), fac) != 0) {
+    do emit[A](gen())
+  }
+}
+
+/// Track how many bytes were emitted (in the body)
+/// Handles getPos
+def tracking[A]{ body: => Unit / { emit[A], getPos } }: Unit / emit[A] =
+  tracking[A](0){body}
+
 namespace returning {
 
 /// Canonical handler of push streams that performs `action` for every