functionalscript 0.0.511 → 0.0.514

package/.github/workflows/ci.yml

@@ -10,8 +10,21 @@ on:
   pull_request:
 
 jobs:
-  node:
+  locks:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 16
+    - run: npm install
+    - uses: actions/upload-artifact@v3
+      with:
+        name: package-lock.json
+        path: package-lock.json
 
+  node:
+    needs: locks
     runs-on: ubuntu-latest
 
     strategy:
@@ -21,10 +34,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+    - uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
+    - uses: actions/download-artifact@v3
+      with:
+        name: package-lock.json
     - run: npm ci
     - run: npm test
     - run: npm run version
@@ -49,3 +64,25 @@ jobs:
     - uses: actions/checkout@v2
     - run: curl https://bun.sh/install | bash
     - run: /home/runner/.bun/bin/bun ./dev/test.mjs
+
+  COM:
+    needs: locks
+    strategy:
+      matrix:
+        os: ['ubuntu-latest', 'windows-latest', 'macos-12']
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 19
+    - uses: actions/download-artifact@v3
+      with:
+        name: package-lock.json
+    - uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7
+    - run: npm ci
+    - run: npm run comtest

package/.github/workflows/npm-publish.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           node-version: 19
           registry-url: https://registry.npmjs.org/
-      - run: npm ci
+      # - run: npm ci
       - run: npm run version
       - run: npm publish
         env:

package/com/test/build.f.cjs

@@ -62,7 +62,7 @@ const output = platform => name => {
 }
 
 /** @type {Func} */
-const cpp = ({dirname, platform}) => ({
+const cpp = ({ dirname, platform }) => ({
     file: {
         name: `${dirname}/cpp/_result.hpp`,
         content: cppContent(),
@@ -77,7 +77,7 @@ const cpp = ({dirname, platform}) => ({
 })
 
 /** @type {Func} */
-const cs = ({dirname, platform}) => ({
+const cs = ({ dirname, platform }) => ({
     file: {
         name: `${dirname}/cs/_result.cs`,
         content: csContent,
@@ -85,18 +85,18 @@ const cs = ({dirname, platform}) => ({
     line: [
         platform === 'win32'
             ? ['dotnet', 'run', '--project', `${dirname}/cs/cs.csproj`]
-        // .Net on Linux and MacOS doesn't properly support COM object marshalling
+            // .Net on Linux and MacOS doesn't properly support COM object marshalling
             : ['dotnet', 'build', `${dirname}/cs/cs.csproj`]
     ],
 })
 
 /** @type {Func} */
-const rust = ({dirname}) => ({
+const rust = ({ dirname }) => ({
     file: {
         name: `${dirname}/rust/src/_result.rs`,
         content: rustContent,
     },
-    line: [['cargo', 'build']]
+    line: [['cargo', 'build' /**, '--locked' */]]
 })
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.511",
+  "version": "0.0.514",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.14.6",
     "typescript": "^4.9.5"
   }
 }

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 = {

package/.github/workflows/com.yml

@@ -1,31 +0,0 @@
-# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: COM Test
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  COM:
-
-    strategy:
-      matrix:
-        os: ['ubuntu-latest', 'windows-latest', 'macos-12']
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js 19
-      uses: actions/setup-node@v2
-      with:
-        node-version: 19
-    - uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 7
-    - run: npm ci
-    - run: npm run comtest

package/Cargo.lock

@@ -1,14 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "nanocom"
-version = "0.2.1"
-
-[[package]]
-name = "testrust"
-version = "0.1.0"
-dependencies = [
- "nanocom",
-]