functionalscript 0.0.569 → 0.0.570

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.569",
+  "version": "0.0.570",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "scripts": {
     "tsc": "tsc",

package/types/bigint/module.f.cjs

@@ -44,17 +44,33 @@ const scalar_mul = ({ 0: _0, add }) => a => n => {
     }
 }
 
-/** @type {(a: bigint) => bigint} */
-const log2 = a => {
-    // Possible optimization: use a binary search in 32 bit value
-    let i = -1n
-    while (a > 0n) {
-        ++i
-        a >>= 1n
+const bit_len = (/** @type {bigint} */v) => {
+    if (v < 0n) { v = -v }
+    if (v === 0n) { return 0n }
+    let result = 1n
+    let i = 1n
+    while (true) {
+        const n = v >> i
+        if (n === 0n) {
+            break
+        }
+        v = n
+        result += i
+        i <<= 1n
     }
-    return i
+    while (i !== 0n) {
+        i >>= 1n
+        const n = v >> i
+        if (n !== 0n) {
+            result += i
+            v = n
+        }
+    }
+    return result
 }
 
+const log2 = (/** @type {bigint} */v) => v <= 0n ? -1n : bit_len(v) - 1n
+
 module.exports = {
     /** @readonly */
     addition,
@@ -70,4 +86,6 @@ module.exports = {
     scalar_mul,
     /** @readonly */
     log2,
+    /** @readonly */
+    bit_len,
 }

package/types/bigint/test.f.cjs

@@ -1,4 +1,4 @@
-const { sum, abs, serialize, log2 } = require('./module.f.cjs')
+const { sum, abs, serialize, log2, bit_len } = require('./module.f.cjs')
 
 module.exports = {
     sum: () => {
@@ -69,6 +69,48 @@ module.exports = {
         () => {
             const result = log2(16n)
             if (result !== 4n) { throw result }
+        },
+        () => {
+            // max for Bun (131_072 Bytes)
+            const v = 1_048_575n
+            const result = log2(1n << v)
+            if (result !== v) { throw result }
         }
-    ]
+    ],
+    bit_len: {
+        0: () => {
+            const s = bit_len(0n)
+            if (s !== 0n) { throw s }
+        },
+        m: () => {
+            let i = 0n
+            while (i < 10_000n) {
+                const s = bit_len(1n << i)
+                if (s !== i + 1n) { throw [s, i] }
+                i += 1n
+            }
+        },
+        big: () => {
+            const s = bit_len(1n << 1_000_000n)
+            if (s !== 1_000_001n) { throw s }
+        },
+        neg: [
+            () => {
+                const s = bit_len(-1n)
+                if (s !== 1n) { throw s }
+            },
+            () => {
+                const s = bit_len(-2n)
+                if (s !== 2n) { throw s }
+            },
+            () => {
+                const s = bit_len(-3n)
+                if (s !== 2n) { throw s }
+            },
+            () => {
+                const s = bit_len(-4n)
+                if (s !== 3n) { throw s }
+            },
+        ]
+    }
 }