@effekt-lang/effekt 0.4.0 → 0.6.0

package/libraries/common/array.effekt

@@ -4,15 +4,11 @@ import effekt
 import exception
 import list
 
-/**
- * A mutable 0-indexed fixed-sized array.
- */
+/// A mutable 0-indexed fixed-sized array.
 extern type Array[T]
 
-/**
- * Allocates a new array of size `size`, keeping its values _undefined_.
- * Prefer using `array` constructor instead to ensure that values are defined.
- */
+/// Allocates a new array of size `size`, keeping its values _undefined_.
+/// Prefer using `array` constructor instead to ensure that values are defined.
 extern global def allocate[T](size: Int): Array[T] =
   js "(new Array(${size}))"
   chez "(make-vector ${size})" // creates an array filled with 0s on CS
@@ -21,9 +17,7 @@ extern global def allocate[T](size: Int): Array[T] =
     ret %Pos %z
   """
 
-/**
- * Creates a new Array of size `size` filled with the value `init`
- */
+/// Creates a new Array of size `size` filled with the value `init`
 def array[T](size: Int, init: T): Array[T] = {
   val arr = allocate[T](size);
   each(0, size) { i =>
@@ -32,9 +26,7 @@ def array[T](size: Int, init: T): Array[T] = {
   arr
 }
 
-/**
- * Converts a List `list` to an Array
- */
+/// Converts a List `list` to an Array
 def fromList[T](list: List[T]): Array[T] = {
   val listSize = list.size();
   val arr = allocate(listSize);
@@ -45,9 +37,7 @@ def fromList[T](list: List[T]): Array[T] = {
   return arr;
 }
 
-/**
- * Gets the length of the array in constant time.
- */
+/// Gets the length of the array in constant time.
 extern pure def size[T](arr: Array[T]): Int =
   js "${arr}.length"
   chez "(vector-length ${arr})"
@@ -56,12 +46,10 @@ extern pure def size[T](arr: Array[T]): Int =
     ret %Int %z
   """
 
-/**
- * Gets the element of the `arr` at given `index` in constant time.
- * Unchecked Precondition: `index` is in bounds (0 ≤ index < arr.size)
- *
- * Prefer using `get` instead.
- */
+/// Gets the element of the `arr` at given `index` in constant time.
+/// Unchecked Precondition: `index` is in bounds (0 ≤ index < arr.size)
+///
+/// Prefer using `get` instead.
 extern global def unsafeGet[T](arr: Array[T], index: Int): T =
   js "${arr}[${index}]"
   chez "(vector-ref ${arr} ${index})"
@@ -77,12 +65,10 @@ extern js """
   }
 """
 
- /**
- * Sets the element of the `arr` at given `index` to `value` in constant time.
- * Unchecked Precondition: `index` is in bounds (0 ≤ index < arr.size)
- *
- * Prefer using `set` instead.
- */
+/// Sets the element of the `arr` at given `index` to `value` in constant time.
+/// Unchecked Precondition: `index` is in bounds (0 ≤ index < arr.size)
+///
+/// Prefer using `set` instead.
 extern global def unsafeSet[T](arr: Array[T], index: Int, value: T): Unit =
   js "array$set(${arr}, ${index}, ${value})"
   chez "(begin (vector-set! ${arr} ${index} ${value}) #f)"
@@ -91,9 +77,7 @@ extern global def unsafeSet[T](arr: Array[T], index: Int, value: T): Unit =
     ret %Pos %z
   """
 
-/**
- * Creates a copy of `arr`
- */
+/// Creates a copy of `arr`
 def copy[T](arr: Array[T]): Array[T] = {
   with on[OutOfBounds].default { <> }; // should not happen
   val len = arr.size;
@@ -102,10 +86,8 @@ def copy[T](arr: Array[T]): Array[T] = {
   newArray
 }
 
-/**
- * Copies `length`-many elements from `from` to `to`
- * starting at `start` (in `from`) and `offset` (in `to`)
- */
+/// Copies `length`-many elements from `from` to `to`
+/// starting at `start` (in `from`) and `offset` (in `to`)
 def copy[T](from: Array[T], start: Int, to: Array[T], offset: Int, length: Int): Unit / Exception[OutOfBounds] = {
   val startValid  = start >= 0 && start + length <= from.size
   val offsetValid = offset >= 0 && offset + length <= to.size
@@ -122,26 +104,20 @@ def copy[T](from: Array[T], start: Int, to: Array[T], offset: Int, length: Int):
 
 // Derived operations:
 
-/**
- * Gets the element of the `arr` at given `index` in constant time,
- * throwing an `Exception[OutOfBounds]` unless `0 ≤ index < arr.size`.
- */
+/// Gets the element of the `arr` at given `index` in constant time,
+/// throwing an `Exception[OutOfBounds]` unless `0 ≤ index < arr.size`.
 def get[T](arr: Array[T], index: Int): T / Exception[OutOfBounds] =
   if (index >= 0 && index < arr.size) arr.unsafeGet(index)
   else do raise(OutOfBounds(), "Array index out of bounds: " ++ show(index))
 
-/**
- * Sets the element of the `arr` at given `index` to `value` in constant time,
- * throwing an `Exception[OutOfBounds]` unless `0 ≤ index < arr.size`.
- */
+/// Sets the element of the `arr` at given `index` to `value` in constant time,
+/// throwing an `Exception[OutOfBounds]` unless `0 ≤ index < arr.size`.
 def set[T](arr: Array[T], index: Int, value: T): Unit / Exception[OutOfBounds] =
   if (index >= 0 && index < arr.size) unsafeSet(arr, index, value)
   else do raise(OutOfBounds(), "Array index out of bounds: " ++ show(index))
 
-/**
- * Builds a new Array of size `size` from a computation `index` which gets an index
- * and returns a value that will be on that position in the resulting array
- */
+/// Builds a new Array of size `size` from a computation `index` which gets an index
+/// and returns a value that will be on that position in the resulting array
 def build[T](size: Int) { index: Int => T }: Array[T] = {
   val arr = allocate[T](size);
   each(0, size) { i =>

package/libraries/common/bench.effekt

@@ -2,13 +2,11 @@ module bench
 
 type Nanos = Int
 
-/**
- * The current time (since UNIX Epoch) in nanoseconds.
- *
- * The actual precision varies across the different backends.
- * - js: Milliseconds
- * - chez: Microseconds
- */
+/// The current time (since UNIX Epoch) in nanoseconds.
+///
+/// The actual precision varies across the different backends.
+/// - js: Milliseconds
+/// - chez: Microseconds
 extern io def timestamp(): Nanos =
   js "Date.now() * 1000000"
   chez "(timestamp)"
@@ -32,12 +30,10 @@ extern jsNode """
   const { performance } = require('node:perf_hooks');
 """
 
-/**
- * High-precision timestamp in nanoseconds that should be for measurements.
- *
- * This timestamp should only be used for **relative** measurements,
- * as gives no guarantees on the absolute time (unlike a UNIX timestamp).
- */
+/// High-precision timestamp in nanoseconds that should be for measurements.
+///
+/// This timestamp should only be used for **relative** measurements,
+/// as gives no guarantees on the absolute time (unlike a UNIX timestamp).
 extern io def relativeTimestamp(): Nanos =
   js "Math.round(performance.now() * 1000000)"
   default { timestamp() }
@@ -48,9 +44,7 @@ namespace Duration {
   def diff(fromNanos: Nanos, toNanos: Nanos): Duration = toNanos - fromNanos
 }
 
-/**
- * Runs the block and returns the time in nanoseconds
- */
+/// Runs the block and returns the time in nanoseconds
 def timed { block: => Unit }: Duration = {
   val before = relativeTimestamp()
   block()
@@ -70,9 +64,7 @@ def measure(warmup: Int, iterations: Int) { block: => Unit }: Unit = {
   run(iterations, true)
 }
 
-/**
- * Takes a duration in nanoseconds and formats it in milliseconds with precision of two decimal digits.
- */
+/// Takes a duration in nanoseconds and formats it in milliseconds with precision of two decimal digits.
 def formatMs(nanos: Nanos): String = {
   val micros = nanos / 1000000
   val sub = (nanos.mod(1000000).toDouble / 10000.0).round

package/libraries/common/buffer.effekt

@@ -9,34 +9,22 @@ import array
 
 record BufferOverflow()
 
-/**
- * Fixed-size ring buffers (queues) where one can write
- * elements to the head and read from the tail.
- */
+/// Fixed-size ring buffers (queues) where one can write
+/// elements to the head and read from the tail.
 interface Buffer[T] {
-  /**
-   * The remaining capacity
-   */
+  /// The remaining capacity
   def capacity(): Int
 
-  /**
-   * Is this buffer full?
-   */
+  /// Is this buffer full?
   def full?(): Bool
 
-  /**
-   * Is this buffer empty?
-   */
+  /// Is this buffer empty?
   def empty?(): Bool
 
-  /**
-   * Read an element from the tail of the buffer
-   */
+  /// Read an element from the tail of the buffer
   def read(): Option[T]
 
-  /**
-   * Write an element to the head of the buffer
-   */
+  /// Write an element to the head of the buffer
   def write(el: T): Unit / Exception[BufferOverflow]
 }
 
@@ -120,4 +108,4 @@ namespace examples {
     println(ringbuffer.read());
     println(ringbuffer.read());
   }
-}
+}

package/libraries/common/bytes.effekt

@@ -1,15 +1,11 @@
 module bytes
 
-/**
- * A memory managed, mutable, fixed-length buffer of bytes.
- */
+/// A memory managed, mutable, fixed-length buffer of bytes.
 extern type Bytes
   // = llvm "%Pos"
   // = js "Uint8Array"
 
-/**
- * Allocates new bytes with the given `capacity`, setting its values to `0`.
- */
+/// Allocates new bytes with the given `capacity`, setting its values to `0`.
 extern io def bytes(capacity: Int): Bytes =
   js "(new Uint8Array(${capacity}))"
   llvm """
@@ -55,9 +51,7 @@ extern io def write(b: Bytes, index: Int, value: Byte): Unit =
     ret %Pos zeroinitializer
   """
 
-/**
- * Returns an *aliased* slice of b starting at offset with the given length
- */
+/// Returns an *aliased* slice of b starting at offset with the given length
 def slice(b: Bytes, offset: Int, length: Int): Bytes = {
   def validOffset() = offset >= 0 && offset < b.size
   def validLength() = length >= 0 && (offset + length) <= b.size
@@ -66,9 +60,7 @@ def slice(b: Bytes, offset: Int, length: Int): Bytes = {
 }
 
 
-/**
- * Returns a view into the buffer, with the length truncated to n
- */
+/// Returns a view into the buffer, with the length truncated to n
 def truncated(b: Bytes, n: Int): Bytes =
   b.slice(0, n)
 
@@ -88,9 +80,7 @@ extern pure def toUTF8(b: Bytes): String =
   """
 
 namespace unsafe {
-  /**
-   * Unsafe: offset and length are not checked.
-   */
+  /// Unsafe: offset and length are not checked.
   extern io def slice(b: Bytes, offset: Int, length: Int): Bytes =
     js "new Uint8Array(${b}.buffer, ${offset}, ${length})"
     llvm """

package/libraries/common/dequeue.effekt

@@ -1,11 +1,11 @@
 module dequeue
 
 
-// An implementation of a functional dequeue, using Okasaki's
-// bankers dequeue implementation.
-//
-// Translation from the Haskell implementation:
-//   https://hackage.haskell.org/package/dequeue-0.1.12/docs/src/Data-Dequeue.html#Dequeue
+/// An implementation of a functional dequeue, using Okasaki's
+/// bankers dequeue implementation.
+///
+/// Translation from the Haskell implementation:
+///   https://hackage.haskell.org/package/dequeue-0.1.12/docs/src/Data-Dequeue.html#Dequeue
 record Dequeue[R](front: List[R], frontSize: Int, rear: List[R], rearSize: Int)
 
 def emptyQueue[R](): Dequeue[R] = Dequeue(Nil(), 0, Nil(), 0)

package/libraries/common/effekt.effekt

@@ -144,13 +144,12 @@ extern io def random(): Double =
 
 // Equality
 // ========
-/**
- * Result of comparison between two objects according to some order:
- *
- * - `Less()` means that the first object is *before* the first in the order,
- * - `Equal()` means that the two objects are the same in the order,
- * - and `Greater()` means that the second object is *before* the first in the order.
- */
+
+/// Result of comparison between two objects according to some order:
+///
+/// - `Less()` means that the first object is *before* the first in the order,
+/// - `Equal()` means that the two objects are the same in the order,
+/// - and `Greater()` means that the second object is *before* the first in the order.
 type Ordering {
   Less();
   Equal();
@@ -160,7 +159,8 @@ type Ordering {
 extern pure def genericCompareImpl[R](x: R, y: R): Int =
   js "$effekt.compare(${x}, ${y})"
 
- // Compares two values of the same type, returning an `Ordering`.
+/// Compares two values of the same type, returning an `Ordering`.
+/// Only available on the JavaScript backend.
 def genericCompare[R](x: R, y: R): Ordering = {
   genericCompareImpl(x, y) match {
     case -1 => Less()
@@ -182,9 +182,7 @@ def println(o: Ordering): Unit = println(o.show)
 // Comparison ops
 // ==============
 
-/**
- * Structural equality: Not available in the LLVM backend
- */
+/// Structural equality: Not available in the LLVM backend
 extern pure def equals[R](x: R, y: R): Bool =
   js "$effekt.equals(${x}, ${y})"
   chez "(equal? ${x} ${y})"
@@ -550,11 +548,19 @@ def infixAnd { first: => Bool } { second: => Bool }: Bool =
 
 // Bitwise operations
 // ==================
+
+/// Arithmetic left shift
 extern pure def bitwiseShl(x: Int, y: Int): Int =
   js "(${x} << ${y})"
   chez "(ash ${x} ${y})"
   llvm "%z = shl %Int ${x}, ${y} ret %Int %z"
 
+/// Arithmetic right shift
+extern pure def bitwiseShr(x: Int, y: Int): Int =
+  js "(${x} >> ${y})"
+  chez "(ash ${x} (- ${y}))"
+  llvm "%z = ashr %Int ${x}, ${y} ret %Int %z"
+
 extern pure def bitwiseAnd(x: Int, y: Int): Int =
   js "(${x} & ${y})"
   chez "(logand ${x} ${y})"
@@ -586,16 +592,12 @@ extern pure def toInt(n: Byte): Int =
 //   chez: #f
 //   llvm: null?
 
-/**
- * The value used by the FFI to represent undefined values
- */
+/// The value used by the FFI to represent undefined values
 extern pure def undefined[A](): A =
   js "undefined"
   chez "#f"
 
-/**
- * Is an FFI value undefined?
- */
+/// Is an FFI value undefined?
 extern pure def isUndefined[A](value: A): Bool =
   js "(${value} === undefined || ${value} === null)"
   chez "(eq? ${value} #f)"
@@ -630,9 +632,7 @@ def loop { f: {Control} => Unit }: Unit = try {
   def continue() = loop { f }
 }
 
-/**
- * Calls provided action repeatedly. `start` is inclusive, `end` is not.
- */
+/// Calls provided action repeatedly. `start` is inclusive, `end` is not.
 def each(start: Int, end: Int) { action: (Int) => Unit } = {
   def loop(i: Int): Unit =
     if (i < end) { action(i); loop(i + 1) }
@@ -640,9 +640,7 @@ def each(start: Int, end: Int) { action: (Int) => Unit } = {
   loop(start)
 }
 
-/**
- * Calls provided action repeatedly with support for breaking. `start` is inclusive, `end` is not.
- */
+/// Calls provided action repeatedly with support for breaking. `start` is inclusive, `end` is not.
 def each(start: Int, end: Int) { action: (Int) {Control} => Unit } = {
   var i = start;
   loop { {l} =>

package/libraries/common/io/console.effekt

@@ -7,9 +7,7 @@ interface Console {
   def writeLine(content: String): Unit
 }
 
-/**
- * Handler for the console effect, using the Console available in js
- */
+/// Handler for the console effect, using the Console available in js
 def console[R] { program: () => R / Console }: R = {
   val c = js::newConsole()
   try {
@@ -40,8 +38,7 @@ namespace js {
     jsNode "${console}.close()"
 
   extern async def readLine(console: JSConsole): String =
-    jsNode "$effekt.callcc(callback => ${console}.once('line', callback))"
-
+    jsNode "$effekt.capture(k => ${console}.once('line', k))"
   extern io def writeLine(console: JSConsole, message: String): Unit =
     jsNode "${console}.output.write(${message} + '\\n')"
 }

package/libraries/common/io/error.effekt

@@ -1,18 +1,16 @@
 module io/error
 
-/**
- * Errors defined by libuv that can occur in IO operations.
- *
- * In addition to the named error codes, we also assign each error a
- * (positive) integer value that is stable across the different platforms.
- *
- * For the mapping of IOError and code values, see function fromCode.
- *
- * While stable, this integer value is supposed to only be used internally.
- * All user-facing operations should use values of type IOError, instead.
- *
- * see: https://docs.libuv.org/en/v1.x/errors.html
- */
+/// Errors defined by libuv that can occur in IO operations.
+///
+/// In addition to the named error codes, we also assign each error a
+/// (positive) integer value that is stable across the different platforms.
+///
+/// For the mapping of IOError and code values, see function fromCode.
+///
+/// While stable, this integer value is supposed to only be used internally.
+/// All user-facing operations should use values of type IOError, instead.
+///
+/// see: https://docs.libuv.org/en/v1.x/errors.html
 type IOError {
   E2BIG();
   EACCES();
@@ -97,11 +95,9 @@ type IOError {
   EUNATCH()
 }
 
-/**
- * Corresponding error message for a libuv error
- *
- * see: https://docs.libuv.org/en/v1.x/errors.html
- */
+/// Corresponding error message for a libuv error
+///
+/// see: https://docs.libuv.org/en/v1.x/errors.html
 def message(error: IOError): String = error match {
   case E2BIG() => "argument list too long"
   case EACCES() => "permission denied"
@@ -186,11 +182,9 @@ def message(error: IOError): String = error match {
   case EUNATCH() => "protocol driver not attached"
 }
 
-/**
- * Corresponding name of a libuv error
- *
- * see: https://docs.libuv.org/en/v1.x/errors.html
- */
+/// Corresponding name of a libuv error
+///
+/// see: https://docs.libuv.org/en/v1.x/errors.html
 def name(error: IOError): String = error match {
   case E2BIG() => "E2BIG"
   case EACCES() => "EACCES"
@@ -275,11 +269,9 @@ def name(error: IOError): String = error match {
   case EUNATCH() => "EUNATCH"
 }
 
-/**
- * Translates a integer code value to an IOError.
- *
- * See documentation of type IOError for further information.
- */
+/// Translates a integer code value to an IOError.
+///
+/// See documentation of type IOError for further information.
 def fromNumber(number: Int): IOError = number match {
   case 1 => EPERM()
   case 2 => ENOENT()

package/libraries/common/io/filesystem.effekt

@@ -6,10 +6,8 @@ import io
 import io/error
 
 
-/**
- * Represents the file opening modes with their respective flags
- * Backends rely on the order of these
- */
+/// Represents the file opening modes with their respective flags
+/// Backends rely on the order of these
 type Mode {
   // Most common modes
   ReadOnly()            // 'r'  exception if does not exist
@@ -30,15 +28,11 @@ type Mode {
 }
 
 
-/**
- * A file descriptor. Should not be inspected.
- */
+/// A file descriptor. Should not be inspected.
 type File = Int
 
 
-/**
- * Reads a file at given path as utf8 encoded string.
- */
+/// Reads a file at given path as utf8 encoded string.
 def readFile(path: String): String / Exception[IOError] = {
   val fd = open(path, ReadOnly());
   with on[IOError].finalize { close(fd) }
@@ -71,9 +65,7 @@ def readFile(path: String): String / Exception[IOError] = {
   go()
 }
 
-/**
- * Writes the (utf8 encoded) string `contents` into the specified file.
- */
+/// Writes the (utf8 encoded) string `contents` into the specified file.
 def writeFile(path: String, contents: String): Unit / Exception[IOError] = {
   val fd = open(path, WriteOnly());
   with on[IOError].finalize { close(fd) }
@@ -100,21 +92,17 @@ def writeFile(path: String, contents: String): Unit / Exception[IOError] = {
 }
 
 
-/**
- * An abstract interface applications can program against.
- *
- * Can be interpreted with the `filesystem` handler, or virtualized etc.
- *
- * See example below.
- */
+/// An abstract interface applications can program against.
+///
+/// Can be interpreted with the `filesystem` handler, or virtualized etc.
+///
+/// See example below.
 interface Files {
   def readFile(path: String): String
   def writeFile(path: String, contents: String): Unit
 }
 
-/**
- * Using the file system via node.js
- */
+/// Using the file system via node.js
 def filesystem[R] { program: => R / Files }: R / Exception[IOError] = // TODO move Exception to be bidirectional
   try { program() }
   with Files {
@@ -220,28 +208,28 @@ namespace internal {
   """
 
   extern async def open(path: String, mode: Mode): Int =
-    jsNode "$effekt.callcc(callback => open(${path}, ${mode}, callback))"
+    jsNode "$effekt.capture(k => open(${path}, ${mode}, k))"
     llvm """
       call void @c_fs_open(%Pos ${path}, %Pos ${mode}, %Stack %stack)
       ret void
     """
 
   extern async def read(fd: Int, buffer: Bytes, offset: Int): Int =
-    jsNode "$effekt.callcc(callback => read(${fd}, ${buffer}, ${offset}, callback))"
+    jsNode "$effekt.capture(k => read(${fd}, ${buffer}, ${offset}, k))"
     llvm """
       call void @c_fs_read(%Int ${fd}, %Pos ${buffer}, %Int ${offset}, %Stack %stack)
       ret void
     """
 
   extern async def write(fd: Int, buffer: Bytes, offset: Int): Int =
-    jsNode "$effekt.callcc(callback => write(${fd}, ${buffer}, ${offset}, callback))"
+    jsNode "$effekt.capture(k => write(${fd}, ${buffer}, ${offset}, k))"
     llvm """
       call void @c_fs_write(%Int ${fd}, %Pos ${buffer}, %Int ${offset}, %Stack %stack)
       ret void
     """
 
   extern async def close(fd: Int): Int =
-    jsNode "$effekt.callcc(callback => close(${fd}, callback))"
+    jsNode "$effekt.capture(k => close(${fd}, k))"
     llvm """
       call void @c_fs_close(%Int ${fd}, %Stack %stack)
       ret void

package/libraries/common/io/network.effekt

@@ -18,16 +18,16 @@ namespace js {
   extern io def server(): JSServer =
     jsNode "net.createServer()"
   extern io def listen(server: JSServer, port: Int, host: String, listener: JSSocket => Unit at {io, async, global}): Unit =
-    jsNode "listen(${server}, ${port}, ${host}, (socket) => (${listener})(socket).run())"
+    jsNode "listen(${server}, ${port}, ${host}, (socket) => $effekt.runToplevel((ks, k) => (${listener})(socket, ks, k)))"
 
   extern async def send(socket: JSSocket, data: Bytes): Unit =
-    jsNode "$effekt.callcc(callback => ${socket}.write(${data}, callback))"
+    jsNode "$effekt.capture(k => ${socket}.write(${data}, k))"
 
   extern async def receive(socket: JSSocket): Bytes =
-    jsNode "$effekt.callcc(callback => ${socket}.once('data', callback))"
+    jsNode "$effekt.capture(k => ${socket}.once('data', k))"
 
   extern async def end(socket: JSSocket): Unit =
-    jsNode "$effekt.callcc(callback => ${socket}.end(callback))"
+    jsNode "$effekt.capture(k => ${socket}.end(k))"
 }
 
 interface Socket {

package/libraries/common/io/time.effekt

@@ -5,7 +5,7 @@ extern llvm """
 """
 
 extern async def wait(millis: Int): Unit =
-  js "$effekt.callcc(callback => setTimeout(() => callback($effekt.unit), ${millis}))"
+  js "$effekt.capture(k => setTimeout(() => k($effekt.unit), ${millis}))"
   llvm """
     call void @c_timer_start(%Int ${millis}, %Stack %stack)
     ret void