functionalscript 0.0.300 → 0.0.301

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.300",
+  "version": "0.0.301",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {

package/sha2/index.js

@@ -6,40 +6,40 @@
  */
 
 /**
- * @typedef {readonly[number, number, number, number, number, number, number, number]} Hash8
+ * @typedef {Int32Array} Hash8
  */
 
-/** @type  {(input: number) => (pos: number) => number} */
+/** @type {(input: number) => (pos: number) => number} */
 const appendOne = input => pos => input | (1 << 31 - pos)
 
-/** @type  {(input: number) => (pos: number) => number} */
-const unsignedMod = a => b => (a % b + b) % b
+/** @type {(input: number) => (pos: number) => number} */
+const mod = a => b => (a % b + b) % b
 
 /** @type  {(input: readonly number[]) => (bits: number) => HashInput} */
 const padding = input => bitsCount =>
 {
     const appendBlockIndex = (bitsCount / 32) | 0
-    const length = (bitsCount + unsignedMod(447 - bitsCount)(512) + 65) / 32
+    const length = (bitsCount + mod(447 - bitsCount)(512) + 65) / 32
     /** @type {(i: number) => number} */
     const f = i =>
         i < appendBlockIndex ?
             input[i] :
         i === appendBlockIndex ?
-            (appendBlockIndex >= input.length ? 0x80000000 : appendOne(input[appendBlockIndex])(bitsCount % 32)) :
-        i === length - 2 ? (bitsCount / 0x100000000) | 0 :
-        i === length - 1 ? bitsCount % 0x100000000 : 0
+            (appendBlockIndex >= input.length ? 0x8000_0000 : appendOne(input[appendBlockIndex])(bitsCount % 32)) :
+        i === length - 2 ? (bitsCount / 0x1_0000_0000) | 0 :
+        i === length - 1 ? bitsCount % 0x1_0000_0000 : 0
     return ({f, length})
 }
 
+/** @type {(n: number) => (d: number) => number} */
+const rotr = n => d => n >>> d | n << (32 - d)
+
 /** @type {(x: number) => (y: number) => (z: number) => number} */
 const ch = x => y => z => x & y ^ ~x & z
 
 /** @type {(x: number) => (y: number) => (z: number) => number} */
 const maj = x => y => z => x & y ^ x & z ^ y & z
 
-/** @type {(n: number) => (d: number) => number} */
-const rotr = n => d => n >>> d | n << (32-d)
-
 /** @type {(n: number) => (d: number) => number} */
 const shr = n => d => n >>> d
 
@@ -55,17 +55,25 @@ const ssig0 = x => rotr(x)(7) ^ rotr(x)(18) ^ shr(x)(3)
 /** @type {(x: number) => number} */
 const ssig1 = x => rotr(x)(17) ^ rotr(x)(19) ^ shr(x)(10)
 
-/** @type {(x: number) => number} */
-const mod2pow32 = x => x % 0x100000000
-
 /** @type {Hash8} */
-const init256 = [0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19]
+const init256 = new Int32Array([0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19])
 
 /** @type {(input: readonly number[]) => (bitsCount: number) => Hash8} */
 const computeSha256 = input => bitsCount => compute(input)(bitsCount)(init256)
 
 /** @type {Hash8} */
-const init224 = [0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4]
+const init224 = new Int32Array([0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4])
+
+const k = new Int32Array([
+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+]);
 
 /** @type {(input: readonly number[]) => (bitsCount: number) => Hash8} */
 const computeSha224 = input => bitsCount => compute(input)(bitsCount)(init224)
@@ -84,21 +92,10 @@ const compute = input => bitsCount => init =>
     let h6 = init[6]
     let h7 = init[7]
 
-    const k = [
-        0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-        0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-        0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-        0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-    ];
-
-    let w = new Array(64)
     const chunkCount = padded.length / 16
     for(let i = 0; i < chunkCount; i++)
     {
+        const w = new Int32Array(64)
         for(let t = 0; t < 16; t++)
         {
             w[t] = padded.f(t + i * 16)
@@ -106,7 +103,7 @@ const compute = input => bitsCount => init =>
 
         for(let t = 16; t < 64; t++)
         {
-            w[t] = mod2pow32(ssig1(w[t - 2]) + w[t - 7] + ssig0(w[t-15]) + w[t - 16])
+            w[t] = (ssig1(w[t - 2]) + w[t - 7] + ssig0(w[t-15]) + w[t - 16]) | 0
         }
 
         let a = h0
@@ -120,29 +117,29 @@ const compute = input => bitsCount => init =>
 
         for(let t = 0; t < 64; t++)
         {
-            let t1 = mod2pow32(h + bsig1(e) + ch(e)(f)(g) + k[t] + w[t])
-            let t2 = mod2pow32(bsig0(a) + maj(a)(b)(c))
+            let t1 = (h + bsig1(e) + ch(e)(f)(g) + k[t] + w[t]) | 0
+            let t2 = (bsig0(a) + maj(a)(b)(c)) | 0
             h = g
             g = f
             f = e
-            e = mod2pow32(d + t1)
+            e = (d + t1) | 0
             d = c
             c = b
             b = a
-            a = mod2pow32(t1 + t2)
+            a = (t1 + t2) | 0
         }
 
-        h0 = mod2pow32(h0 + a)
-        h1 = mod2pow32(h1 + b)
-        h2 = mod2pow32(h2+ c)
-        h3 = mod2pow32(h3 + d)
-        h4 = mod2pow32(h4 + e)
-        h5 = mod2pow32(h5 + f)
-        h6 = mod2pow32(h6 + g)
-        h7 = mod2pow32(h7 + h)
+        h0 = (h0 + a) | 0
+        h1 = (h1 + b) | 0
+        h2 = (h2 + c) | 0
+        h3 = (h3 + d) | 0
+        h4 = (h4 + e) | 0
+        h5 = (h5 + f) | 0
+        h6 = (h6 + g) | 0
+        h7 = (h7 + h) | 0
     }
 
-    return [h0, h1, h2, h3, h4, h5, h6, h7]
+    return new Int32Array([h0, h1, h2, h3, h4, h5, h6, h7])
 }
 
 module.exports = {

package/sha2/test.js

@@ -1,9 +1,13 @@
 const _ = require('.')
 const json = require('../json')
 const { sort } = require('../types/object')
+const list = require('../types/list')
+
+/** @type {(a: number) => number} */
+const toU32 = x => (x + 0x1_0000_0000) % 0x1_0000_0000
 
 /** @type {(a: number) => string} */
-const toHexString = x => x >= 0 ? x.toString(16).padStart(8, '0') : (x + 0x100000000).toString(16).padStart(8, '0')
+const toHexString = x => toU32(x).toString(16).padStart(8, '0')
 
 /** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)
@@ -30,33 +34,33 @@ const stringify = a => json.stringify(sort)(a)
 
 {
     const hash = _.computeSha256([])(0)
-    const result = stringify(hash.map(toHexString))
+    const result = stringify(Array.from(hash).map(toHexString))
     if (result !== '["e3b0c442","98fc1c14","9afbf4c8","996fb924","27ae41e4","649b934c","a495991b","7852b855"]') { throw result }
 }
 
 {
     const hash = _.computeSha224([])(0)
-    const result = stringify(hash.map(toHexString))
+    const result = stringify(Array.from(hash).map(toHexString))
     if (result !== '["d14a028c","2a3a2bc9","476102bb","288234c4","15a2b01f","828ea62a","c5b3e42f","bdd387cb"]') { throw result }
 }
 
 {
     //[0x68656C6C, 0x6F20776F, 0x726C6400] represents phrase 'hello world'
     const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C6400])(88)
-    const result = stringify(hash.map(toHexString))
+    const result = stringify(Array.from(hash).map(toHexString))
     if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
 }
 
 {
     const input = Array(8).fill(0x31313131)
     const result = _.computeSha256(input)(256)
-    if (result[0] !== 0x8a83665f) { throw result[0] }
+    if (toU32(result[0]) !== 0x8a83665f) { throw result[0] }
 }
 
 {
     const input = Array(16).fill(0x31313131)
     const hash = _.computeSha256(input)(512)
-    const result = stringify(hash.map(toHexString))
+    const result = stringify(Array.from(hash).map(toHexString))
     if (result !== '["3138bb9b","c78df27c","473ecfd1","410f7bd4","5ebac1f5","9cf3ff9c","fe4db77a","ab7aedd3"]') { throw result }
 }