Fix bug when feeding strings

effekt-lang · Nov 25, 2024 · b69033d · b69033d
1 parent b541ce7
commit b69033d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/effekt/jvm/src/test/scala/effekt/StdlibTests.scala b/effekt/jvm/src/test/scala/effekt/StdlibTests.scala
@@ -23,7 +23,8 @@ abstract class StdlibChezTests extends StdlibTests {
   override def ignored: List[File] = List(
     // Not implemented yet
     examplesDir / "stdlib" / "bytearray",
-    examplesDir / "stdlib" / "io"
+    examplesDir / "stdlib" / "io",
+    examplesDir / "stdlib" / "stream" / "characters.effekt"
   )
 }
 class StdlibChezSchemeMonadicTests extends StdlibChezTests {
@@ -44,6 +45,7 @@ class StdlibLLVMTests extends StdlibTests {
 
     // Valgrind leak/failure
     examplesDir / "stdlib" / "bytearray" / "bytearray.effekt",
+    examplesDir / "stdlib" / "stream" / "characters.effekt",
     examplesDir / "stdlib" / "io" / "filesystem" / "async_file_io.effekt",
     examplesDir / "stdlib" / "io" / "filesystem" / "files.effekt",
     examplesDir / "stdlib" / "io" / "filesystem" / "wordcount.effekt",

diff --git a/examples/stdlib/stream/characters.check b/examples/stdlib/stream/characters.check
@@ -0,0 +1,6 @@
+H (72)
+e (101)
+l (108)
+l (108)
+o (111)
+Cons(H, Cons(e, Cons(l, Cons(l, Cons(o, Nil())))))
diff --git a/examples/stdlib/stream/characters.effekt b/examples/stdlib/stream/characters.effekt
@@ -0,0 +1,11 @@
+import stream
+
+def main() = {
+  for[Char] { each("Hello") } { c =>
+    println(show(c) ++ " (" ++ show(c.toInt) ++ ")")
+  }
+
+  val list = collectList[Char] { each("Hello") }
+  println(list.map { c => c.show })
+}
+
diff --git a/libraries/common/stream.effekt b/libraries/common/stream.effekt
@@ -244,7 +244,9 @@ def feed[T, R](array: Array[T]) { reader: () => R / read[T] }: R = {
   } with read[T] {
     resume {
       if (i < array.size) {
-        array.unsafeGet(i)
+        val c = i
+        i = c + 1
+        array.unsafeGet(c)
       } else {
         do stop()
       }
@@ -259,7 +261,9 @@ def feed[R](bytes: ByteArray) { reader: () => R / read[Byte] }: R = {
   } with read[Byte] {
     resume {
       if (i < bytes.size) {
-        bytes.unsafeGet(i)
+        val c = i
+        i = c + 1
+        bytes.unsafeGet(c)
       } else {
         do stop()
       }