@effekt-lang/effekt 0.10.0 → 0.12.0

package/libraries/common/stream.effekt

@@ -11,7 +11,7 @@ import io/error
 /// Describes push streams by emitting values of type `A`.
 effect emit[A](value: A): Unit
 
-/// Describes pull streams by requiring values of type `A`.
+/// Describes pull streams by reading values of type `A`.
 ///
 /// The producer can decide to `stop` emitting values.
 effect read[A](): A / stop
@@ -28,20 +28,14 @@ def for[A, R] { stream: () => R / emit[A] } { action: A => Unit }: R =
     resume(action(value))
   }
 
-/// Like `for[A, R]`, but fixes the result of producing computation to the
-/// common type `Unit`. This simplifies annotating the type of stream
-/// elements `A` without having to also annotate `R`.
+/// Like `for[A, R]`, but ignores the result of the stream, and consequently
+/// works for any type. Use this to annotate the type of stream elements
+/// `A` without having to also annotate `R`.
 ///
 /// e.g. for[Int] { prog() } { el => println(el) }
-def for[A] { stream: () => Unit / emit[A] } { action: A => Unit }: Unit =
-  for[A, Unit]{stream}{action}
-
-def continually[A] { action: () => A }: Nothing / emit[A] = {
-  def go(): Nothing = {
-    do emit(action())
-    go()
-  }
-  go()
+def for[A] { stream: () => Any / emit[A] } { action: A => Unit }: Unit = {
+  for[A, Any]{stream}{action}
+  ()
 }
 
 /// Turns a `list` into a producer of a push stream
@@ -91,23 +85,28 @@ def boundary[R] { program: () => R / stop }: Option[R] =
   try {
     Some(program())
   } with stop {
-    def stop() = None()
+    None()
   }
 
-def exhaustively[A] { program: () => A / stop } { action: A => Unit }: Unit =
+def boundary { program: () => Any / stop }: Unit = {
+  boundary[Any]{program}
+  ()
+}
+
+/// Run `program` forever until `stop` is thrown.
+def exhaustively { program: () => Any / stop }: Unit =
   try {
     def go(): Unit = {
-      action(program())
+      program()
       go()
     }
     go()
   } with stop {
-    def stop() = ()
+    ()
   }
 
 
-// In Effekt lower bounds are inclusive and upper bounds are exclusive
-
+/// In Effekt lower bounds are inclusive and upper bounds are exclusive
 record Indexed[A](index: Int, value: A)
 
 def range(lower: Int, upper: Int): Unit / emit[Int] =
@@ -137,7 +136,7 @@ def index[A, R] { stream: () => R / emit[A] }: R / emit[Indexed[A]] = {
 }
 
 /// If `number` is zero or negative it does nothing
-def take[A, R](number: Int) { stream: () => R / emit[A] }: R / { emit[A], stop } = {
+def limit[A, R](number: Int) { stream: () => R / emit[A] }: R / { emit[A], stop } = {
   if (number <= 0) do stop();
   var i = 1;
   try {
@@ -152,6 +151,13 @@ def take[A, R](number: Int) { stream: () => R / emit[A] }: R / { emit[A], stop }
   }
 }
 
+/// If `number` is zero or negative it does nothing
+def limit[A](number: Int) { stream: () => Any / emit[A] }: Unit / emit[A] =
+  boundary {
+    limit[A, Any](number){stream}
+  }
+
+
 /// If `number` is zero or negative it does nothing
 def replicate[A](number: Int) { action: () => A }: Unit / emit[A] =
   if (number > 0) {
@@ -170,8 +176,8 @@ def sum[R] { stream : () => R / emit[Int] }: (R, Int) = {
   }
 }
 
-def sum { stream : () => Unit / emit[Int] }: Int =
-  sum[Unit]{stream}.second
+def sum { stream : () => Any / emit[Int] }: Int =
+  sum[Any]{stream}.second
 
 def collectList[A, R] { stream: () => R / emit[A] }: (R, List[A]) =
   try {
@@ -181,8 +187,8 @@ def collectList[A, R] { stream: () => R / emit[A] }: (R, List[A]) =
     (r, Cons(v, vs))
   }
 
-def collectList[A] { stream: () => Unit / emit[A] }: List[A] =
-  collectList[A, Unit]{stream}.second
+def collectList[A] { stream: () => Any / emit[A] }: List[A] =
+  collectList[A, Any]{stream}.second
 
 def collectArray[A, R] { stream: () => R / emit[A] }: (R, Array[A]) = {
   var i = 0
@@ -197,8 +203,8 @@ def collectArray[A, R] { stream: () => R / emit[A] }: (R, Array[A]) = {
   }
 }
 
-def collectArray[A] { stream: () => Unit / emit[A] }: Array[A] =
-  collectArray[A, Unit]{stream}.second
+def collectArray[A] { stream: () => Any / emit[A] }: Array[A] =
+  collectArray[A, Any]{stream}.second
 
 def collectBytes[R] { stream: () => R / emit[Byte] }: (R, ByteArray) = {
   var i = 0
@@ -213,10 +219,10 @@ def collectBytes[R] { stream: () => R / emit[Byte] }: (R, ByteArray) = {
   }
 }
 
-def collectBytes { stream: () => Unit / emit[Byte] }: ByteArray =
-  collectBytes[Unit]{stream}.second
+def collectBytes { stream: () => Any / emit[Byte] }: ByteArray =
+  collectBytes[Any]{stream}.second
 
-def feed[T](list: List[T]) { reader: () => Unit / read[T] } = {
+def feed[T, R](list: List[T]) { reader: () => R / read[T] }: R = {
   var l = list
   try {
     reader()
@@ -232,14 +238,16 @@ def feed[T](list: List[T]) { reader: () => Unit / read[T] } = {
   }
 }
 
-def feed[T](array: Array[T]) { reader: () => Unit / read[T] } = {
+def feed[T, R](array: Array[T]) { reader: () => R / read[T] }: R = {
   var i = 0
   try {
     reader()
   } with read[T] {
     resume {
       if (i < array.size) {
-        array.unsafeGet(i)
+        val c = i
+        i = c + 1
+        array.unsafeGet(c)
       } else {
         do stop()
       }
@@ -247,14 +255,16 @@ def feed[T](array: Array[T]) { reader: () => Unit / read[T] } = {
   }
 }
 
-def feed(bytes: ByteArray) { reader: () => Unit / read[Byte] } = {
+def feed[R](bytes: ByteArray) { reader: () => R / read[Byte] }: R = {
   var i = 0
   try {
     reader()
   } with read[Byte] {
     resume {
       if (i < bytes.size) {
-        bytes.unsafeGet(i)
+        val c = i
+        i = c + 1
+        bytes.unsafeGet(c)
       } else {
         do stop()
       }
@@ -262,7 +272,7 @@ def feed(bytes: ByteArray) { reader: () => Unit / read[Byte] } = {
   }
 }
 
-def source[A, R] { stream: () => Unit / emit[A] } { reader: () => R / read[A] }: R = {
+def source[A, R] { stream: () => Any / emit[A] } { reader: () => R / read[A] }: R = {
   var next = box { None() }
   next = box {
     try {
@@ -282,6 +292,21 @@ def source[A, R] { stream: () => Unit / emit[A] } { reader: () => R / read[A] }:
   }
 }
 
+def source[A] { stream: () => Any / emit[A] } { reader: () => Any / read[A] }: Unit = {
+  source[A, Any]{stream}{reader}
+  ()
+}
+
+/// Combines two streams together producing a stream of pairs in lockstep.
+/// Given two streams of length `n` and `m`, it produces a stream of length `min(n, m)`.
+def zip[A, B] { stream1: () => Any / emit[A] } { stream2: () => Any / emit[B] } { action: (A, B) => Any }: Unit = {
+  with source[A] { stream1 }
+  with source[B] { stream2 }
+
+  exhaustively {
+    action(do read[A](), do read[B]())
+  }
+}
 
 def writeFile[R](path: String) { stream: () => R / emit[Byte] }: R / Exception[IOError] = {
 
@@ -407,13 +432,15 @@ def feed(string: String) { reader: () => Unit / read[Char] } =
 
 def each(string: String): Unit / emit[Char] =
   feed(string) {
-    exhaustively[Char] { do read() } { char => do emit(char) }
+    exhaustively {
+      do emit[Char](do read[Char]())
+    }
   }
 
 def collectString[R] { stream: () => R / emit[Char] }: (R, String) = {
-  val (result, bytes) = collectBytes { encodeUTF8 { stream } }
+  val (result, bytes) = collectBytes[R] { encodeUTF8 { stream } }
   (result, bytes.toString)
 }
 
-def collectString { stream: () => Unit / emit[Char] }: String =
-  collectString[Unit]{stream}.second
+def collectString { stream: () => Any / emit[Char] }: String =
+  collectString[Any]{stream}.second

package/libraries/js/effekt_runtime.js

@@ -113,22 +113,23 @@ function SHIFT(p, body, ks, k) {
   cont = { stack: meta.stack, prompt: meta.prompt, backup: meta.arena.backup(), rest: cont }
   meta = meta.rest
 
-  function resumeComp(c, ks, k) {
-    let meta = { stack: k, prompt: ks.prompt, arena: ks.arena, rest: ks.rest }
-    let toRewind = cont
-    while (!!toRewind) {
-      meta = { stack: toRewind.stack, prompt: toRewind.prompt, arena: toRewind.backup(), rest: meta }
-      toRewind = toRewind.rest
-    }
+  const k1 = meta.stack
+  meta.stack = null
+  return body(cont, meta, k1)
+}
 
-    const k2 = meta.stack // TODO instead copy meta here, like elsewhere?
-    meta.stack = null
-    return () => c(meta, k2)
+// Rewind stack `cont` back onto `k` :: `ks` and resume with c
+function RESUME(cont, c, ks, k) {
+  let meta = { stack: k, prompt: ks.prompt, arena: ks.arena, rest: ks.rest }
+  let toRewind = cont
+  while (!!toRewind) {
+    meta = { stack: toRewind.stack, prompt: toRewind.prompt, arena: toRewind.backup(), rest: meta }
+    toRewind = toRewind.rest
   }
 
-  let k1 = meta.stack
+  const k1 = meta.stack // TODO instead copy meta here, like elsewhere?
   meta.stack = null
-  return body(resumeComp, meta, k1)
+  return () => c(meta, k1)
 }
 
 function RUN_TOPLEVEL(comp) {
@@ -210,4 +211,4 @@ $effekt.run = RUN
  *
  * If a runtime is available, use `$effekt.run`, instead.
  */
-$effekt.runToplevel = RUN_TOPLEVEL
+$effekt.runToplevel = RUN_TOPLEVEL

package/licenses/eclipse public license, version 2.0 - epl-2.0.html

@@ -1,4 +1,4 @@
-<!doctype html><html lang=en><head><meta charset=utf-8><meta http-equiv=x-ua-compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Eclipse Public License 2.0 (EPL) | The Eclipse Foundation</title><meta property="og:title" content="Eclipse Public License 2.0 (EPL) | The Eclipse Foundation"><meta name=twitter:title content="Eclipse Public License 2.0 (EPL) | The Eclipse Foundation"><meta name=description content="The Eclipse Foundation provides our global community of individuals and organisations with a mature, scalable, and business-friendly environment for open source …"><meta property="og:description" content="The Eclipse Foundation provides our global community of individuals and organisations with a mature, scalable, and business-friendly environment for open source …"><meta name=twitter:description content="The Eclipse Foundation provides our global community of individuals and organisations with a mature, scalable, and business-friendly environment for open source …"><meta name=author content="Wayne Beaton"><link href=/favicon.ico rel=icon type=image/x-icon><meta property="og:image" content="https://www.eclipse.org/images/logos/eclipse-foundation-400x400.png"><meta name=twitter:image content="https://www.eclipse.org/images/logos/eclipse-foundation-400x400.png"><meta name=twitter:card content="summary"><meta name=twitter:site content="@eclipsefdn"><meta name=twitter:creator content="@eclipsefdn"><meta property="og:url" content="https://www.eclipse.org/legal/epl-2.0/"><meta property="og:type" content="website"><meta property="og:site_name" content="Eclipse Foundation"><meta name=keywords content="epl,epl-2.0,legal,foundation,eclipse,eclipse public license,license,licenses"><meta name=generator content="Hugo 0.110.0"><link rel=canonical href=https://www.eclipse.org/legal/epl-2.0/><link rel=alternate href=/legal/epl-2.0/index.xml type=application/rss+xml title><link rel=stylesheet href="/public/css/styles.css?v=1731870966"><script>(function(e,t,n,s,o){e[s]=e[s]||[],e[s].push({"gtm.start":(new Date).getTime(),event:"gtm.js"});var a=t.getElementsByTagName(n)[0],i=t.createElement(n),r=s!="dataLayer"?"&l="+s:"";i.async=!0,i.src="https://www.googletagmanager.com/gtm.js?id="+o+r,a.parentNode.insertBefore(i,a)})(window,document,"script","dataLayer","GTM-5WLCZXC")</script><script>var tableClasses="table"</script><link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel=stylesheet type=text/css></head><body><noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5WLCZXC" height=0 width=0 style=display:none;visibility:hidden></iframe></noscript><a class=sr-only href=#content>Skip to main content</a><header class="header-wrapper header-wrapper" id=header><div class=header-toolbar><div class=container><div class=header-toolbar-row><div class="toolbar-btn toolbar-search-btn dropdown"><button class=dropdown-toggle id=toolbar-search type=button data-toggle=dropdown tabindex=0 aria-label=Search>
+<!doctype html><html lang=en><head><meta charset=utf-8><meta http-equiv=x-ua-compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Eclipse Public License 2.0 (EPL) | The Eclipse Foundation</title><meta property="og:title" content="Eclipse Public License 2.0 (EPL) | The Eclipse Foundation"><meta name=twitter:title content="Eclipse Public License 2.0 (EPL) | The Eclipse Foundation"><meta name=description content="The Eclipse Foundation provides our global community of individuals and organisations with a mature, scalable, and business-friendly environment for open source …"><meta property="og:description" content="The Eclipse Foundation provides our global community of individuals and organisations with a mature, scalable, and business-friendly environment for open source …"><meta name=twitter:description content="The Eclipse Foundation provides our global community of individuals and organisations with a mature, scalable, and business-friendly environment for open source …"><meta name=author content="Wayne Beaton"><link href=/favicon.ico rel=icon type=image/x-icon><meta property="og:image" content="https://www.eclipse.org/images/logos/eclipse-foundation-400x400.png"><meta name=twitter:image content="https://www.eclipse.org/images/logos/eclipse-foundation-400x400.png"><meta name=twitter:card content="summary"><meta name=twitter:site content="@eclipsefdn"><meta name=twitter:creator content="@eclipsefdn"><meta property="og:url" content="https://www.eclipse.org/legal/epl-2.0/"><meta property="og:type" content="website"><meta property="og:site_name" content="Eclipse Foundation"><meta name=keywords content="epl,epl-2.0,legal,foundation,eclipse,eclipse public license,license,licenses"><meta name=generator content="Hugo 0.110.0"><link rel=canonical href=https://www.eclipse.org/legal/epl-2.0/><link rel=alternate href=/legal/epl-2.0/index.xml type=application/rss+xml title><link rel=stylesheet href="/public/css/styles.css?v=1733080574"><script>(function(e,t,n,s,o){e[s]=e[s]||[],e[s].push({"gtm.start":(new Date).getTime(),event:"gtm.js"});var a=t.getElementsByTagName(n)[0],i=t.createElement(n),r=s!="dataLayer"?"&l="+s:"";i.async=!0,i.src="https://www.googletagmanager.com/gtm.js?id="+o+r,a.parentNode.insertBefore(i,a)})(window,document,"script","dataLayer","GTM-5WLCZXC")</script><script>var tableClasses="table"</script><link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel=stylesheet type=text/css></head><body><noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5WLCZXC" height=0 width=0 style=display:none;visibility:hidden></iframe></noscript><a class=sr-only href=#content>Skip to main content</a><header class="header-wrapper header-wrapper" id=header><div class=header-toolbar><div class=container><div class=header-toolbar-row><div class="toolbar-btn toolbar-search-btn dropdown"><button class=dropdown-toggle id=toolbar-search type=button data-toggle=dropdown tabindex=0 aria-label=Search>
 <i class="fa fa-search fa-lg" aria-role=none></i></button><div class="toolbar-search-bar-wrapper dropdown-menu dropdown-menu-right" aria-labelledby=toolbar-search><form action=https://www.eclipse.org/home/search method=get><div class=search-bar><input class=search-bar-input name=q placeholder=Search>
 <button>
 <i class="fa fa-search" type=submit></i></button></div></form></div></div><div class="toolbar-btn toolbar-user-menu-btn dropdown"><button class=dropdown-toggle id=toolbar-user-menu type=button data-toggle=dropdown tabindex=0 aria-label="User Menu">
@@ -57,5 +57,5 @@ open source software collaboration and innovation.</p></div><div class=mega-menu
 <i class="fa fa-linkedin fa-stack-1x fa-inverse" aria-hidden=true></i>
 <span class=sr-only>Linkedin account</span></span></a></li></ul></div></div><div class="footer-sections row equal-height-md font-bold"><div class=col-md-15><div class=row><section id=footer-eclipse-foundation class="footer-section col-sm-8"><div class=menu-heading>Eclipse Foundation</div><ul class=nav><li><a href=https://www.eclipse.org/org/>About</a></li><li><a href=https://projects.eclipse.org/>Projects</a></li><li><a href=https://www.eclipse.org/collaborations/>Collaborations</a></li><li><a href=https://www.eclipse.org/membership/>Membership</a></li><li><a href=https://www.eclipse.org/sponsor/>Sponsor</a></li></ul></section><section id=footer-legal class="footer-section col-sm-8"><div class=menu-heading>Legal</div><ul class=nav><li><a href=https://www.eclipse.org/legal/privacy/>Privacy Policy</a></li><li><a href=https://www.eclipse.org/legal/terms-of-use/>Terms of Use</a></li><li><a href=https://www.eclipse.org/legal/compliance/>Compliance</a></li><li><a href=https://www.eclipse.org/org/documents/Community_Code_of_Conduct.php>Code of Conduct</a></li><li><a href=https://www.eclipse.org/legal/>Legal Resources</a></li><li><a class=toolbar-manage-cookies href=# onclick=event.preventDefault()>Manage Cookies</a></li></ul></section><section id=footer-more class="footer-section col-sm-8"><div class=menu-heading>More</div><ul class=nav><li><a href=https://www.eclipse.org/security/>Report a Vulnerability</a></li><li><a href=https://status.eclipse.org/>Service Status</a></li><li><a href=https://www.eclipse.org/org/foundation/contact.php>Contact Us</a></li><li><a href=https://www.eclipse.org/projects/support/>Support</a></li></ul></section></div></div><div id=footer-end class="footer-section col-md-8 col-md-offset-1 col-sm-24"><div class=footer-end-newsletter><form id=mc-embedded-subscribe-form action=https://eclipsecon.us6.list-manage.com/subscribe/post method=post novalidate target=_blank><label class=footer-end-newsletter-label for=email>Subscribe to our Newsletter</label><div class=footer-end-newsletter-input-wrapper><input class=footer-end-newsletter-input type=email id=email name=EMAIL autocomplete=email placeholder="Enter your email address"><div><i class="fa fa-solid fa-envelope fa-lg" aria-hidden=true></i></div></div><input type=hidden name=u value=eaf9e1f06f194eadc66788a85>
 <input type=hidden name=id value=46e57eacf1>
-<input id=mc-embedded-subscribe type=submit name=subscribe hidden></form></div></div></div><div class="col-sm-24 margin-top-20"><div class=row><div id=copyright class=col-md-16><p id=copyright-text>Copyright &copy; Eclipse Foundation AISBL. All Rights Reserved.</p></div></div></div><a href=# class=scrollup>Back to the top</a></div></footer><div id=footer-js><script src="/public/js/main.js?v1.0?v=1731870966"></script>
+<input id=mc-embedded-subscribe type=submit name=subscribe hidden></form></div></div></div><div class="col-sm-24 margin-top-20"><div class=row><div id=copyright class=col-md-16><p id=copyright-text>Copyright &copy; Eclipse Foundation AISBL. All Rights Reserved.</p></div></div></div><a href=# class=scrollup>Back to the top</a></div></footer><div id=footer-js><script src="/public/js/main.js?v1.0?v=1733080574"></script>
 <script>(function(){})(jQuery,document)</script></div></body></html>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@effekt-lang/effekt",
   "author": "Jonathan Brachthäuser",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/effekt-lang/effekt.git"