functionalscript 0.0.513 → 0.0.514

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.513",
+  "version": "0.0.514",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/types/bigfloat/module.f.cjs

@@ -4,6 +4,8 @@ const { todo } = require('../../dev/module.f.cjs')
 
 /** @typedef {readonly[bigint,number]} BigFloat */
 
+/** @typedef {readonly[BigFloat,bigint]} BigFloatWithRemainder */
+
 const twoPow53 = 0b0010_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000n
 const twoPow54 = 0b0100_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000n
 
@@ -44,20 +46,25 @@ const pow = base => exp => base ** BigInt(exp)
 
 const pow5 = pow(5n)
 
-/** @type {(div: BigFloat) => (p: bigint) => BigFloat} */
-const divide = ([m, e]) => div => {
+/** @type {(b: BigFloat) => (mul: bigint) => BigFloat} */
+const multiply = ([m, e]) => mul => [m * mul, e]
+
+/** @type {(b: BigFloat) => (div: bigint) => BigFloatWithRemainder} */
+const divide = ([m, e]) => div => [[m / div, e], m % div]
+
+/** @type {(b: BigFloatWithRemainder) => BigFloat} */
+const round53 = ([[m, e], r]) => {
     const mabs = abs(m)
-    const q = mabs / div
     const s = BigInt(sign(m))
-    const [q53, e53] = decreaseMantissa([q, e])(twoPow54)
-    const r = q53 & 1n
-    const q52 = q53 >> 1n
-    const e52 = e53 + 1
-    if (r === 1n && mabs === q * div && q === q53 >> BigInt(e - e53)) {
-        const odd = q52 & 1n
-        return [s * (q52 + odd), e52]
+    const [m54, e54] = decreaseMantissa([mabs, e])(twoPow54)
+    const o54 = m54 & 1n
+    const m53 = m54 >> 1n
+    const e53 = e54 + 1
+    if (o54 === 1n && r === 0n && mabs === m54 >> BigInt(e - e54)) {
+        const odd = m53 & 1n
+        return multiply([m53 + odd, e53])(s)
     }
-    return [s * (q52 + r), e52]
+    return multiply([m53 + o54, e53])(s)
 }
 
 /** @type {(dec: BigFloat) => BigFloat} */
@@ -68,11 +75,16 @@ const decToBin = dec => {
     if (dec[1] >= 0) {
         /** @type {BigFloat} */
         const bin = [dec[0] * pow5(dec[1]), dec[1]]
-        return divide(increaseMantissa(bin)(twoPow53))(1n)
+        const inc = increaseMantissa(bin)(twoPow53)
+        return round53([inc, 0n])
     }
     const p = pow5(-dec[1])
     const [m, e] = increaseMantissa(dec)(p * twoPow53)
-    return divide([m, e])(p)
+    const mAbs = abs(m)
+    const s = BigInt(sign(m))
+    const qr = divide([mAbs, e])(p)
+    const r53 = round53(qr)
+    return multiply(r53)(s)
 }
 
 module.exports = {