@grain/stdlib 0.6.6 → 0.7.0

package/bigint.md

@@ -37,7 +37,7 @@ No other changes yet.
 </details>
 
 ```grain
-fromNumber : (number: Number) => BigInt
+fromNumber: (number: Number) => BigInt
 ```
 
 Converts a Number to a BigInt.
@@ -62,7 +62,7 @@ No other changes yet.
 </details>
 
 ```grain
-toNumber : (num: BigInt) => Number
+toNumber: (num: BigInt) => Number
 ```
 
 Converts a BigInt to a Number.
@@ -87,7 +87,7 @@ No other changes yet.
 </details>
 
 ```grain
-incr : (num: BigInt) => BigInt
+incr: (num: BigInt) => BigInt
 ```
 
 Increments the value by one.
@@ -122,7 +122,7 @@ No other changes yet.
 </details>
 
 ```grain
-decr : (num: BigInt) => BigInt
+decr: (num: BigInt) => BigInt
 ```
 
 Decrements the value by one.
@@ -157,7 +157,7 @@ No other changes yet.
 </details>
 
 ```grain
-neg : (num: BigInt) => BigInt
+neg: (num: BigInt) => BigInt
 ```
 
 Negates the given operand.
@@ -192,7 +192,7 @@ No other changes yet.
 </details>
 
 ```grain
-abs : (num: BigInt) => BigInt
+abs: (num: BigInt) => BigInt
 ```
 
 Returns the absolute value of the given operand.
@@ -234,7 +234,7 @@ BigInt.abs(-1t) == 1t
 </details>
 
 ```grain
-(+) : (num1: BigInt, num2: BigInt) => BigInt
+(+): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the sum of its operands.
@@ -274,7 +274,7 @@ assert 1t + 1t == 2t
 </details>
 
 ```grain
-(-) : (num1: BigInt, num2: BigInt) => BigInt
+(-): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the difference of its operands.
@@ -314,7 +314,7 @@ assert 3t - 1t == 2t
 </details>
 
 ```grain
-(*) : (num1: BigInt, num2: BigInt) => BigInt
+(*): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the product of its operands.
@@ -354,7 +354,7 @@ assert 3t * 3t == 9t
 </details>
 
 ```grain
-(/) : (num1: BigInt, num2: BigInt) => BigInt
+(/): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the quotient of its operands using signed (truncated) division
@@ -388,7 +388,7 @@ No other changes yet.
 </details>
 
 ```grain
-rem : (num1: BigInt, num2: BigInt) => BigInt
+rem: (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the remainder of the division of its operands using signed (truncated) division
@@ -421,7 +421,7 @@ No other changes yet.
 </details>
 
 ```grain
-quotRem : (num1: BigInt, num2: BigInt) => (BigInt, BigInt)
+quotRem: (num1: BigInt, num2: BigInt) => (BigInt, BigInt)
 ```
 
 Computes the quotient and remainder of its operands using signed (truncated) division.
@@ -453,7 +453,7 @@ No other changes yet.
 </details>
 
 ```grain
-gcd : (num1: BigInt, num2: BigInt) => BigInt
+gcd: (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the greatest common divisior of the two operands.
@@ -492,7 +492,7 @@ BigInt.gcd(36t, 24t) == 12t
 </details>
 
 ```grain
-(<<) : (num: BigInt, places: Int32) => BigInt
+(<<): (num: BigInt, places: Int32) => BigInt
 ```
 
 Shifts the bits of the value left by the given number of bits.
@@ -532,7 +532,7 @@ assert (10t << 2l) == 40t
 </details>
 
 ```grain
-(>>) : (num: BigInt, places: Int32) => BigInt
+(>>): (num: BigInt, places: Int32) => BigInt
 ```
 
 Shifts the bits of the value right by the given number of bits, preserving the sign bit.
@@ -565,7 +565,7 @@ No other changes yet.
 </details>
 
 ```grain
-eqz : (num: BigInt) => Bool
+eqz: (num: BigInt) => Bool
 ```
 
 Checks if the given value is equal to zero.
@@ -607,7 +607,7 @@ assert BigInt.eqz(1t) == false
 </details>
 
 ```grain
-(==) : (num1: BigInt, num2: BigInt) => Bool
+(==): (num1: BigInt, num2: BigInt) => Bool
 ```
 
 Checks if the first value is equal to the second value.
@@ -652,7 +652,7 @@ assert -10t == -10t
 </details>
 
 ```grain
-(!=) : (num1: BigInt, num2: BigInt) => Bool
+(!=): (num1: BigInt, num2: BigInt) => Bool
 ```
 
 Checks if the first value is not equal to the second value.
@@ -697,7 +697,7 @@ assert -10t != -20t
 </details>
 
 ```grain
-(<) : (num1: BigInt, num2: BigInt) => Bool
+(<): (num1: BigInt, num2: BigInt) => Bool
 ```
 
 Checks if the first value is less than the second value.
@@ -742,7 +742,7 @@ assert -10t < 0t
 </details>
 
 ```grain
-(<=) : (num1: BigInt, num2: BigInt) => Bool
+(<=): (num1: BigInt, num2: BigInt) => Bool
 ```
 
 Checks if the first value is less than or equal to the second value.
@@ -792,7 +792,7 @@ assert 2t <= 3t
 </details>
 
 ```grain
-(>) : (num1: BigInt, num2: BigInt) => Bool
+(>): (num1: BigInt, num2: BigInt) => Bool
 ```
 
 Checks if the first value is greater than the second value.
@@ -837,7 +837,7 @@ assert 0t > -10t
 </details>
 
 ```grain
-(>=) : (num1: BigInt, num2: BigInt) => Bool
+(>=): (num1: BigInt, num2: BigInt) => Bool
 ```
 
 Checks if the first value is greater than or equal to the second value.
@@ -880,7 +880,7 @@ No other changes yet.
 </details>
 
 ```grain
-lnot : (num: BigInt) => BigInt
+lnot: (num: BigInt) => BigInt
 ```
 
 Computes the bitwise NOT of the given value.
@@ -918,7 +918,7 @@ BigInt.lnot(91234t) == -91235t
 </details>
 
 ```grain
-(&) : (num1: BigInt, num2: BigInt) => BigInt
+(&): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the bitwise AND (`&`) on the given operands.
@@ -958,7 +958,7 @@ assert (4t & 3t) == 0t
 </details>
 
 ```grain
-(|) : (num1: BigInt, num2: BigInt) => BigInt
+(|): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the bitwise OR (`|`) on the given operands.
@@ -998,7 +998,7 @@ assert (5t | 3t) == 7t
 </details>
 
 ```grain
-(^) : (num1: BigInt, num2: BigInt) => BigInt
+(^): (num1: BigInt, num2: BigInt) => BigInt
 ```
 
 Computes the bitwise XOR (`^`) on the given operands.
@@ -1031,7 +1031,7 @@ No other changes yet.
 </details>
 
 ```grain
-clz : (num: BigInt) => Int32
+clz: (num: BigInt) => Int32
 ```
 
 Counts the number of leading zero bits in the value.
@@ -1063,7 +1063,7 @@ No other changes yet.
 </details>
 
 ```grain
-ctz : (num: BigInt) => Int64
+ctz: (num: BigInt) => Int64
 ```
 
 Counts the number of trailing zero bits in the value.
@@ -1094,7 +1094,7 @@ No other changes yet.
 </details>
 
 ```grain
-popcnt : (num: BigInt) => Option<Int64>
+popcnt: (num: BigInt) => Option<Int64>
 ```
 
 Counts the number of bits set to `1` in the value, also known as a population count.
@@ -1126,7 +1126,7 @@ No other changes yet.
 </details>
 
 ```grain
-toString : (num: BigInt) => String
+toString: (num: BigInt) => String
 ```
 
 Converts the given operand to a string.

package/buffer.gr

@@ -16,13 +16,17 @@ from "runtime/unsafe/wasmi32" include WasmI32
 from "runtime/unsafe/conv" include Conv
 from "runtime/exception" include Exception
 from "runtime/dataStructures" include DataStructures
-use DataStructures.{ untagChar }
+use DataStructures.{ untagChar, tagSimpleNumber }
 from "int32" include Int32
 from "bytes" include Bytes
 from "string" include String
 from "char" include Char
 from "runtime/numbers" include Numbers
 use Numbers.{ coerceNumberToWasmI32 }
+from "runtime/utf8" include Utf8
+use Utf8.{ usvEncodeLength }
+from "runtime/unsafe/offsets" include Offsets
+use Offsets.{ _BYTES_LEN_OFFSET, _BYTES_DATA_OFFSET }
 
 abstract record Buffer {
   mut len: Number,
@@ -30,12 +34,6 @@ abstract record Buffer {
   mut data: Bytes,
 }
 
-@unsafe
-let _SIZE_OFFSET = 4n
-
-@unsafe
-let _VALUE_OFFSET = 8n
-
 let _8BIT_LEN = 1
 
 let _16BIT_LEN = 2
@@ -46,7 +44,7 @@ let _64BIT_LEN = 8
 
 /* Gets the size of a Bytes via its ptr */
 @unsafe
-let getSize = ptr => WasmI32.load(ptr, _SIZE_OFFSET)
+let getSize = ptr => WasmI32.load(ptr, _BYTES_LEN_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) => {
@@ -75,7 +73,11 @@ let autogrow = (len, buf) => {
 @unsafe
 let appendBytes = (srcOff, dstOff, len, src, dst) => {
   use WasmI32.{ (+) }
-  Memory.copy(dst + _VALUE_OFFSET + dstOff, src + _VALUE_OFFSET + srcOff, len)
+  Memory.copy(
+    dst + _BYTES_DATA_OFFSET + dstOff,
+    src + _BYTES_DATA_OFFSET + srcOff,
+    len
+  )
 }
 
 /*
@@ -237,7 +239,7 @@ provide let truncate = (length, buffer) => {
   let src = WasmI32.fromGrain(buffer.data)
   let size = getSize(src)
   let off = coerceNumberToWasmI32(length)
-  let ret = Memory.fill(src + _VALUE_OFFSET + off, 0n, size - off)
+  let ret = Memory.fill(src + _BYTES_DATA_OFFSET + off, 0n, size - off)
   buffer.len = length
 }
 
@@ -389,48 +391,12 @@ provide let addString = (string, buffer) => {
  */
 @unsafe
 provide let addChar = (char, buffer) => {
-  use WasmI32.{ (-), (*), (&), (|), (>>>), ltU as (<), gtU as (>), leU as (<=) }
   let usv = untagChar(char)
-
-  let bytelen = if (usv < 0x80n) {
-    autogrow(1, buffer)
-    use WasmI32.{ (+) }
-    let off = coerceNumberToWasmI32(buffer.len)
-    let dst = WasmI32.fromGrain(buffer.data) + _VALUE_OFFSET
-    WasmI32.store8(dst, usv, off)
-    1
-  } else {
-    let mut count = 0n
-    let mut bytelen = 0
-    let mut offset = 0n
-    if (usv <= 0x07FFn) {
-      count = 1n
-      bytelen = 2
-      offset = 0xC0n
-    } else if (usv <= 0xFFFFn) {
-      count = 2n
-      bytelen = 3
-      offset = 0xE0n
-    } else {
-      count = 3n
-      bytelen = 4
-      offset = 0xF0n
-    }
-    use WasmI32.{ (+) }
-    autogrow(bytelen, buffer)
-    let off = coerceNumberToWasmI32(buffer.len)
-    let dst = WasmI32.fromGrain(buffer.data) + _VALUE_OFFSET
-    WasmI32.store8(dst, (usv >>> (6n * count)) + offset, off)
-    let mut n = 0n
-    while (count > 0n) {
-      n += 1n
-      let temp = usv >>> (6n * (count - 1n))
-      WasmI32.store8(dst + n, 0x80n | temp & 0x3Fn, off)
-      count -= 1n
-    }
-    bytelen
-  }
-  buffer.len += bytelen
+  let byteCount = tagSimpleNumber(usvEncodeLength(usv))
+  autogrow(byteCount, buffer)
+  let index = buffer.len
+  buffer.len += byteCount
+  Bytes.setChar(index, char, buffer.data)
 }
 
 /**
@@ -514,7 +480,8 @@ provide let addBytesSlice = (
     use WasmI32.{ (-), (<), (>), (>=) }
 
     // bounds check start
-    let bytelen = WasmI32.load(WasmI32.fromGrain(bytes), 4n)
+    let src = WasmI32.fromGrain(bytes)
+    let bytelen = getSize(src)
     let srcOff = coerceNumberToWasmI32(start)
     if (srcOff < 0n || srcOff >= bytelen) {
       throw IndexOutOfBounds
@@ -529,9 +496,9 @@ provide let addBytesSlice = (
     autogrow(length, buffer)
 
     let dstOff = coerceNumberToWasmI32(buffer.len)
-    let src = WasmI32.fromGrain(bytes)
     let dst = WasmI32.fromGrain(buffer.data)
     appendBytes(srcOff, dstOff, len, src, dst)
+    ignore(src)
 
     buffer.len += length
   }