@grain/stdlib 0.4.6 → 0.5.2

package/buffer.gr

@@ -14,6 +14,7 @@ import Exception from "runtime/exception"
 import Int32 from "int32"
 import Bytes from "bytes"
 import String from "string"
+import Char from "char"
 import { coerceNumberToWasmI32 } from "runtime/numbers"
 
 record Buffer {
@@ -22,18 +23,11 @@ record Buffer {
   mut data: Bytes,
 }
 
-@disableGC
-let mut _SIZE_OFFSET = 1n
+@unsafe
+let mut _SIZE_OFFSET = 4n
 
-@disableGC
-let mut _VALUE_OFFSET = 1n
-
-@disableGC
-let initOffsets = () => {
-  _SIZE_OFFSET = 4n
-  _VALUE_OFFSET = 8n
-}
-initOffsets()
+@unsafe
+let mut _VALUE_OFFSET = 8n
 
 let _8BIT_LEN = 1
 
@@ -44,45 +38,34 @@ let _32BIT_LEN = 4
 let _64BIT_LEN = 8
 
 /* Gets the size of a Bytes via its ptr */
-@disableGC
+@unsafe
 let getSize = ptr => WasmI32.load(ptr, _SIZE_OFFSET)
 
 /* Doubles the size of buffer's underlying byte sequence, if the given size is larger than the size of a buffer's underlying byte sequence */
 let autogrow = (len, buf) => {
-  while (buf.len + len > Bytes.length(buf.data)) {
-    let mut n = Bytes.length(buf.data)
-    if (n == 0) n = 4
-    // Make sure bytes of 0 length grow too
-    buf.data = Bytes.resize(0, n, buf.data)
-  }
-}
+  let requiredMinimumSize = buf.len + len
+  let currentSize = Bytes.length(buf.data)
 
-/* Gets the pointer for a char's bytes following the char's tag */
-@disableGC
-let rec getCharAsWasmI32 = char => {
-  let c = WasmI32.fromGrain(char)
-  WasmI32.load(c, 4n)
-}
+  if (requiredMinimumSize > currentSize) {
+    let mut newSize = if (currentSize > 0) {
+      currentSize
+    } else {
+      // Make sure bytes of 0 length grow too
+      4
+    }
 
-/* Gets the UTF-8 byte length of a char */
-@disableGC
-let rec getCharByteLength = byte => {
-  let (+) = WasmI32.add
-  let (&) = WasmI32.and
-  let (==) = WasmI32.eq
-  if ((byte & 0x80n) == 0x00n) {
-    1n
-  } else if ((byte & 0xF0n) == 0xF0n) {
-    4n
-  } else if ((byte & 0xE0n) == 0xE0n) {
-    3n
-  } else {
-    2n
+    while (newSize < requiredMinimumSize) {
+      newSize *= 2
+    }
+
+    let growBy = newSize - currentSize
+
+    buf.data = Bytes.resize(0, growBy, buf.data)
   }
 }
 
 /* Memcopies bytes from a source byte sequence to a destination byte sequence via pointers */
-@disableGC
+@unsafe
 let rec appendBytes = (srcOff, dstOff, len, src, dst) => {
   let (+) = WasmI32.add
   Memory.copy(dst + _VALUE_OFFSET + dstOff, src + _VALUE_OFFSET + srcOff, len)
@@ -100,21 +83,21 @@ let checkIsIndexInBounds = (i, len, buf) => {
 let addInt8help = (value, buffer) => {
   autogrow(_8BIT_LEN, buffer)
   let index = buffer.len
-  buffer.len = buffer.len + _8BIT_LEN
+  buffer.len += _8BIT_LEN
   Bytes.setInt8(index, value, buffer.data)
 }
 
 let addInt16help = (value, buffer) => {
   autogrow(_16BIT_LEN, buffer)
   let index = buffer.len
-  buffer.len = buffer.len + _16BIT_LEN
+  buffer.len += _16BIT_LEN
   Bytes.setInt16(index, value, buffer.data)
 }
 
 let addInt32help = (value, buffer) => {
   autogrow(_32BIT_LEN, buffer)
   let index = buffer.len
-  buffer.len = buffer.len + _32BIT_LEN
+  buffer.len += _32BIT_LEN
   Bytes.setInt32(index, value, buffer.data)
 }
 
@@ -159,7 +142,7 @@ export let length = buffer => buffer.len
  * @since v0.4.0
  */
 export let clear = buffer => {
-  Bytes.fill(0x0l, buffer.data)
+  Bytes.clear(buffer.data)
   buffer.len = 0
 }
 
@@ -187,10 +170,8 @@ export let reset = buffer => {
  *
  * @since v0.4.0
  */
-@disableGC
-export let rec truncate = (length, buffer) => {
-  Memory.incRef(WasmI32.fromGrain((<)))
-  Memory.incRef(WasmI32.fromGrain((>)))
+@unsafe
+export let truncate = (length, buffer) => {
   if (length < 0 || length > buffer.len) throw Exception.IndexOutOfBounds
 
   let (+) = WasmI32.add
@@ -199,11 +180,6 @@ export let rec truncate = (length, buffer) => {
   let off = coerceNumberToWasmI32(length)
   let ret = Memory.fill(src + _VALUE_OFFSET + off, 0n, size)
   buffer.len = length
-
-  Memory.decRef(WasmI32.fromGrain(length))
-  Memory.decRef(WasmI32.fromGrain(buffer))
-  Memory.decRef(WasmI32.fromGrain(truncate))
-  void
 }
 
 /**
@@ -215,12 +191,7 @@ export let rec truncate = (length, buffer) => {
  * @since v0.4.0
  */
 export let toBytes = buffer => {
-  let len = Bytes.length(buffer.data)
-  if (buffer.len == len) {
-    buffer.data
-  } else {
-    Bytes.slice(0, buffer.len, buffer.data)
-  }
+  Bytes.slice(0, buffer.len, buffer.data)
 }
 
 /**
@@ -264,70 +235,6 @@ export let toStringSlice = (start, length, buffer) => {
   Bytes.toString(toBytesSlice(start, length, buffer))
 }
 
-/**
- * Appends the bytes of a char to a buffer.
- *
- * @param char: The character to append to the buffer
- * @param buffer: The buffer to mutate
- *
- * @since v0.4.0
- */
-@disableGC
-export let rec addChar = (char: Char, buffer: Buffer) => {
-  let n = getCharAsWasmI32(char)
-  let bytelen = getCharByteLength(n)
-  match (bytelen) {
-    1n => {
-      let c = Conv.toInt32(n)
-      Memory.incRef(WasmI32.fromGrain(addInt8help))
-      Memory.incRef(WasmI32.fromGrain(c))
-      Memory.incRef(WasmI32.fromGrain(buffer))
-      addInt8help(c, buffer)
-      Memory.decRef(WasmI32.fromGrain(c))
-      void
-    },
-    2n => {
-      let c = Conv.toInt32(n)
-      Memory.incRef(WasmI32.fromGrain(addInt16help))
-      Memory.incRef(WasmI32.fromGrain(c))
-      Memory.incRef(WasmI32.fromGrain(buffer))
-      addInt16help(c, buffer)
-      Memory.decRef(WasmI32.fromGrain(c))
-      void
-    },
-    3n => {
-      let (<) = WasmI32.ltU
-      let (+) = WasmI32.add
-      let (*) = WasmI32.mul
-      let (&) = WasmI32.and
-      let (>>) = WasmI32.shrU
-      for (let mut i = 0n; i < 3n; i += 1n) {
-        let c = Conv.toInt32(n >> i * 8n & 0xffn)
-        Memory.incRef(WasmI32.fromGrain(addInt8help))
-        Memory.incRef(WasmI32.fromGrain(c))
-        Memory.incRef(WasmI32.fromGrain(buffer))
-        addInt8help(c, buffer)
-        Memory.decRef(WasmI32.fromGrain(c))
-        void
-      }
-    },
-    _ => {
-      let c = Conv.toInt32(n)
-      Memory.incRef(WasmI32.fromGrain(addInt32help))
-      Memory.incRef(WasmI32.fromGrain(c))
-      Memory.incRef(WasmI32.fromGrain(buffer))
-      addInt32help(c, buffer)
-      Memory.decRef(WasmI32.fromGrain(c))
-      void
-    },
-  }
-
-  Memory.decRef(WasmI32.fromGrain(char))
-  Memory.decRef(WasmI32.fromGrain(buffer))
-  Memory.decRef(WasmI32.fromGrain(addChar))
-  void
-}
-
 /**
  * Appends a byte sequence to a buffer.
  *
@@ -336,15 +243,10 @@ export let rec addChar = (char: Char, buffer: Buffer) => {
  *
  * @since v0.4.0
  */
-@disableGC
-export let rec addBytes = (bytes, buffer) => {
-  Memory.incRef(WasmI32.fromGrain(Bytes.length))
-  Memory.incRef(WasmI32.fromGrain(bytes))
+@unsafe
+export let addBytes = (bytes, buffer) => {
   let bytelen = Bytes.length(bytes)
 
-  Memory.incRef(WasmI32.fromGrain(autogrow))
-  Memory.incRef(WasmI32.fromGrain(bytelen))
-  Memory.incRef(WasmI32.fromGrain(buffer))
   autogrow(bytelen, buffer)
 
   let off = coerceNumberToWasmI32(buffer.len)
@@ -353,15 +255,7 @@ export let rec addBytes = (bytes, buffer) => {
   let dst = WasmI32.fromGrain(buffer.data)
   appendBytes(0n, off, len, src, dst)
 
-  Memory.incRef(WasmI32.fromGrain((+)))
-  Memory.incRef(WasmI32.fromGrain(buffer.len))
-  Memory.incRef(WasmI32.fromGrain(bytelen))
-  buffer.len = buffer.len + bytelen
-
-  Memory.decRef(WasmI32.fromGrain(bytes))
-  Memory.decRef(WasmI32.fromGrain(buffer))
-  Memory.decRef(WasmI32.fromGrain(addBytes))
-  void
+  buffer.len += bytelen
 }
 
 /**
@@ -372,15 +266,10 @@ export let rec addBytes = (bytes, buffer) => {
  *
  * @since v0.4.0
  */
-@disableGC
-export let rec addString = (string, buffer) => {
-  Memory.incRef(WasmI32.fromGrain(String.byteLength))
-  Memory.incRef(WasmI32.fromGrain(string))
+@unsafe
+export let addString = (string, buffer) => {
   let bytelen = String.byteLength(string)
 
-  Memory.incRef(WasmI32.fromGrain(autogrow))
-  Memory.incRef(WasmI32.fromGrain(bytelen))
-  Memory.incRef(WasmI32.fromGrain(buffer))
   autogrow(bytelen, buffer)
 
   let off = coerceNumberToWasmI32(buffer.len)
@@ -389,66 +278,38 @@ export let rec addString = (string, buffer) => {
   let dst = WasmI32.fromGrain(buffer.data)
   appendBytes(0n, off, len, src, dst)
 
-  Memory.incRef(WasmI32.fromGrain((+)))
-  Memory.incRef(WasmI32.fromGrain(buffer.len))
-  Memory.incRef(WasmI32.fromGrain(bytelen))
-  buffer.len = buffer.len + bytelen
+  buffer.len += bytelen
+}
 
-  Memory.decRef(WasmI32.fromGrain(string))
-  Memory.decRef(WasmI32.fromGrain(buffer))
-  Memory.decRef(WasmI32.fromGrain(addString))
-  void
+/**
+ * Appends the bytes of a char to a buffer.
+ *
+ * @param char: The character to append to the buffer
+ * @param buffer: The buffer to mutate
+ *
+ * @since v0.4.0
+ */
+export let addChar = (char, buffer) => {
+  addString(Char.toString(char), buffer)
 }
 
 /**
  * Appends the bytes of a subset of a string to a buffer.
  *
  * @param start: The char offset into the string
- * @param length: The number of bytes to append
+ * @param end: The end offset into the string
  * @param string: The string to append
  * @param buffer: The buffer to mutate
  *
  * @since v0.4.0
+ * @history v0.5.0: Now takes the end offset instead of length
  */
-@disableGC
-export let rec addStringSlice = (start: Number, length, string, buffer) => {
-  // Handle negative start index (needed before #1071 is fixed)
-  let start = {
-    // this is a block to avoid making all of these operators
-    // overriden in the whole function
-    let (<<) = WasmI32.shl
-    let (>>) = WasmI32.shrS
-    let (+) = WasmI32.add
-    let (!=) = WasmI32.ne
-    let (&) = WasmI32.and
-    Memory.incRef(WasmI32.fromGrain(String.length))
-    Memory.incRef(WasmI32.fromGrain(string))
-    let strlen = WasmI32.fromGrain(String.length(string)) >> 1n
-    let mut startW = WasmI32.fromGrain(start)
-    if ((startW & 1n) != 1n) {
-      throw InvalidArgument("Invalid start index")
-    }
-    startW = startW >> 1n
-    if (WasmI32.ltS(startW, 0n)) {
-      WasmI32.toGrain(WasmI32.shl(startW + strlen, 1n) + 1n)
-    } else {
-      start
-    }
-  }
-  let end = start + length
-  Memory.incRef(WasmI32.fromGrain(String.slice))
-  // no incref for start since we know it's a simple num. Add back for good measure after #1071 is fixed!
-  Memory.incRef(WasmI32.fromGrain(end))
-  Memory.incRef(WasmI32.fromGrain(string))
+@unsafe
+export let addStringSlice = (start: Number, end, string, buffer) => {
   let slice = String.slice(start, end, string)
 
-  Memory.incRef(WasmI32.fromGrain(String.byteLength))
-  Memory.incRef(WasmI32.fromGrain(slice))
   let bytelen = String.byteLength(slice)
 
-  Memory.incRef(WasmI32.fromGrain(autogrow))
-  Memory.incRef(WasmI32.fromGrain(bytelen))
-  Memory.incRef(WasmI32.fromGrain(buffer))
   autogrow(bytelen, buffer)
 
   let srcOff = 0n
@@ -456,24 +317,12 @@ export let rec addStringSlice = (start: Number, length, string, buffer) => {
   let src = WasmI32.fromGrain(slice)
   let dst = WasmI32.fromGrain(buffer.data)
   appendBytes(srcOff, dstOff, coerceNumberToWasmI32(bytelen), src, dst)
-  Memory.decRef(WasmI32.fromGrain(slice))
 
-  Memory.incRef(WasmI32.fromGrain((+)))
-  Memory.incRef(WasmI32.fromGrain(buffer.len))
-  Memory.incRef(WasmI32.fromGrain(bytelen))
-  buffer.len = buffer.len + bytelen
-  Memory.decRef(WasmI32.fromGrain(bytelen))
-
-  Memory.decRef(WasmI32.fromGrain(start))
-  Memory.decRef(WasmI32.fromGrain(length))
-  Memory.decRef(WasmI32.fromGrain(string))
-  Memory.decRef(WasmI32.fromGrain(buffer))
-  Memory.decRef(WasmI32.fromGrain(addStringSlice))
-  void
+  buffer.len += bytelen
 }
 
 /**
- * Appends the bytes of a subset of a byte seuqnece to a buffer.
+ * Appends the bytes of a subset of a byte sequence to a buffer.
  *
  * @param start: The byte offset into the byte sequence
  * @param length: The number of bytes to append
@@ -482,8 +331,8 @@ export let rec addStringSlice = (start: Number, length, string, buffer) => {
  *
  * @since v0.4.0
  */
-@disableGC
-export let rec addBytesSlice =
+@unsafe
+export let addBytesSlice =
   (
     start: Number,
     length: Number,
@@ -508,9 +357,6 @@ export let rec addBytesSlice =
     throw Exception.IndexOutOfBounds
   }
 
-  Memory.incRef(WasmI32.fromGrain(autogrow))
-  Memory.incRef(WasmI32.fromGrain(length))
-  Memory.incRef(WasmI32.fromGrain(buffer))
   autogrow(length, buffer)
 
   let dstOff = coerceNumberToWasmI32(buffer.len)
@@ -518,17 +364,7 @@ export let rec addBytesSlice =
   let dst = WasmI32.fromGrain(buffer.data)
   appendBytes(srcOff, dstOff, len, src, dst)
 
-  Memory.incRef(WasmI32.fromGrain((+)))
-  Memory.incRef(WasmI32.fromGrain(buffer.len))
-  Memory.incRef(WasmI32.fromGrain(length))
-  buffer.len = buffer.len + length
-
-  Memory.decRef(WasmI32.fromGrain(start))
-  Memory.decRef(WasmI32.fromGrain(length))
-  Memory.decRef(WasmI32.fromGrain(bytes))
-  Memory.decRef(WasmI32.fromGrain(buffer))
-  Memory.decRef(WasmI32.fromGrain(addBytesSlice))
-  void
+  buffer.len += length
 }
 
 /**
@@ -752,7 +588,7 @@ export let setFloat32 = (index, value, buffer) => {
 export let addFloat32 = (value, buffer) => {
   autogrow(_32BIT_LEN, buffer)
   let index = buffer.len
-  buffer.len = buffer.len + _32BIT_LEN
+  buffer.len += _32BIT_LEN
   setFloat32(index, value, buffer)
 }
 
@@ -795,7 +631,7 @@ export let setInt64 = (index, value, buffer) => {
 export let addInt64 = (value, buffer) => {
   autogrow(_64BIT_LEN, buffer)
   let index = buffer.len
-  buffer.len = buffer.len + _64BIT_LEN
+  buffer.len += _64BIT_LEN
   setInt64(index, value, buffer)
 }
 
@@ -838,6 +674,6 @@ export let setFloat64 = (index, value, buffer) => {
 export let addFloat64 = (value, buffer) => {
   autogrow(_64BIT_LEN, buffer)
   let index = buffer.len
-  buffer.len = buffer.len + _64BIT_LEN
+  buffer.len += _64BIT_LEN
   setFloat64(index, value, buffer)
 }

package/buffer.md

@@ -240,7 +240,7 @@ Returns:
 |----|-----------|
 |`String`|A string made with a subset of data copied from the buffer|
 
-### Buffer.**addChar**
+### Buffer.**addBytes**
 
 <details disabled>
 <summary tabindex="-1">Added in <code>0.4.0</code></summary>
@@ -248,19 +248,19 @@ No other changes yet.
 </details>
 
 ```grain
-addChar : (Char, Buffer) -> Void
+addBytes : (Bytes, Buffer) -> Void
 ```
 
-Appends the bytes of a char to a buffer.
+Appends a byte sequence to a buffer.
 
 Parameters:
 
 |param|type|description|
 |-----|----|-----------|
-|`char`|`Char`|The character to append to the buffer|
+|`bytes`|`Bytes`|The byte sequence to append|
 |`buffer`|`Buffer`|The buffer to mutate|
 
-### Buffer.**addBytes**
+### Buffer.**addString**
 
 <details disabled>
 <summary tabindex="-1">Added in <code>0.4.0</code></summary>
@@ -268,19 +268,19 @@ No other changes yet.
 </details>
 
 ```grain
-addBytes : (Bytes, Buffer) -> Void
+addString : (String, Buffer) -> Void
 ```
 
-Appends a byte sequence to a buffer.
+Appends the bytes of a string to a buffer.
 
 Parameters:
 
 |param|type|description|
 |-----|----|-----------|
-|`bytes`|`Bytes`|The byte sequence to append|
+|`string`|`String`|The string to append|
 |`buffer`|`Buffer`|The buffer to mutate|
 
-### Buffer.**addString**
+### Buffer.**addChar**
 
 <details disabled>
 <summary tabindex="-1">Added in <code>0.4.0</code></summary>
@@ -288,23 +288,30 @@ No other changes yet.
 </details>
 
 ```grain
-addString : (String, Buffer) -> Void
+addChar : (Char, Buffer) -> Void
 ```
 
-Appends the bytes of a string to a buffer.
+Appends the bytes of a char to a buffer.
 
 Parameters:
 
 |param|type|description|
 |-----|----|-----------|
-|`string`|`String`|The string to append|
+|`char`|`Char`|The character to append to the buffer|
 |`buffer`|`Buffer`|The buffer to mutate|
 
 ### Buffer.**addStringSlice**
 
-<details disabled>
-<summary tabindex="-1">Added in <code>0.4.0</code></summary>
-No other changes yet.
+<details>
+<summary>Added in <code>0.4.0</code></summary>
+<table>
+<thead>
+<tr><th>version</th><th>changes</th></tr>
+</thead>
+<tbody>
+<tr><td><code>0.5.0</code></td><td>Now takes the end offset instead of length</td></tr>
+</tbody>
+</table>
 </details>
 
 ```grain
@@ -318,7 +325,7 @@ Parameters:
 |param|type|description|
 |-----|----|-----------|
 |`start`|`Number`|The char offset into the string|
-|`length`|`Number`|The number of bytes to append|
+|`end`|`Number`|The end offset into the string|
 |`string`|`String`|The string to append|
 |`buffer`|`Buffer`|The buffer to mutate|
 
@@ -333,7 +340,7 @@ No other changes yet.
 addBytesSlice : (Number, Number, Bytes, Buffer) -> Void
 ```
 
-Appends the bytes of a subset of a byte seuqnece to a buffer.
+Appends the bytes of a subset of a byte sequence to a buffer.
 
 Parameters: