functionalscript 0.0.437 → 0.0.438

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.437",
+  "version": "0.0.438",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^18.8.3",
+    "@types/node": "^18.8.4",
     "typescript": "^4.8.4"
   }
 }

package/types/byte_set/module.f.cjs

@@ -10,6 +10,9 @@ const has = n => s => ((s >> BigInt(n)) & 1n) === 1n
 
 const empty = 0n
 
+//                 0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+const universe = 0xFFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFFn
+
 /** @type {(n: Byte) => ByteSet} */
 const one = n => 1n << BigInt(n)
 
@@ -28,7 +31,7 @@ const intersect = a => b => a & b
 const difference = a => b => intersect(a)(complement(b))
 
 /** @type {(n: ByteSet) => ByteSet} */
-const complement = n => ~n
+const complement = n => universe ^ n
 
 // additional operations
 
@@ -43,6 +46,8 @@ module.exports = {
     /** @readonly */
     empty,
     /** @readonly */
+    universe,
+    /** @readonly */
     has,
     /** @readonly */
     set,
@@ -54,4 +59,6 @@ module.exports = {
     setRange,
     /** @readonly */
     range,
+    /** @readonly */
+    complement,
 }

package/types/byte_set/test.f.cjs

@@ -1,4 +1,5 @@
 const _ = require('./module.f.cjs')
+const { every, countdown, map } = require('../list/module.f.cjs')
 
 module.exports = {
     has: [
@@ -37,5 +38,19 @@ module.exports = {
             const result = _.unset(255)(a)
             if (result !== 0n) { throw result }
         }
-    ]
+    ],
+    universe: () => {
+        const x = every(map(v => _.has(v)(_.universe))(countdown(256)))
+        if (!x) { throw x }
+    },
+    compliment: {
+        empty: () => {
+            const r = _.complement(_.empty)
+            if (r !== _.universe) { throw r }
+        },
+        universe: () => {
+            const r = _.complement(_.universe)
+            if (r !== _.empty) { throw r }
+        },
+    }
 }

package/types/nibble_set/module.f.cjs

@@ -1,32 +1,44 @@
-/** @typedef {number} nibbleSet */
-/** @typedef {number} nibble */
+/** @typedef {number} NibbleSet */
+/** @typedef {number} Nibble */
 
 const empty = 0
 
-/** @type {(n: nibble) => (s: nibbleSet) => boolean} */
+const universe = 0xFFFF
+
+/** @type {(n: Nibble) => NibbleSet} */
+const one = n => 1 << n
+
+/** @type {(n: Nibble) => (s: NibbleSet) => boolean} */
 const has = n => s => ((s >> n) & 1) === 1
 
-/** @type {(n: nibble) => (s: nibbleSet) => nibbleSet} */
-const set = n => s => s | (1 << n)
+/** @type {(n: Nibble) => (s: NibbleSet) => NibbleSet} */
+const set = n => s => s | one(n)
+
+/** @type {(n: NibbleSet) => NibbleSet} */
+const complement = s => universe ^ s
 
-/** @type {(n: nibble) => (s: nibbleSet) => nibbleSet} */
-const unset = n => s => s & ~(1 << n)
+/** @type {(n: Nibble) => (s: NibbleSet) => NibbleSet} */
+const unset = n => s => s & complement(one(n))
 
-/** @type {(r: readonly[number, number]) => (s: nibbleSet) => nibbleSet} */
- const setRange = r => s => s | (((1 << (r[1] - r[0] + 1)) - 1 << r[0]))
+/** @type {(r: readonly[number, number]) => NibbleSet} */
+const range = ([a, b]) => one(b - a + 1) - 1 << a
 
-// how to define FA???
-// const stateA = [init, set] ????
+/** @type {(r: readonly[number, number]) => (s: NibbleSet) => NibbleSet} */
+const setRange = r => s => s | range(r)
 
 module.exports = {
     /** @readonly */
     empty,
     /** @readonly */
+    universe,
+    /** @readonly */
     has,
     /** @readonly */
+    complement,
+    /** @readonly */
     set,
     /** @readonly */
     unset,
     /** @readonly */
-    setRange
+    setRange,
 }

package/types/nibble_set/test.f.cjs

@@ -1,3 +1,4 @@
+const { every, map, countdown } = require('../list/module.f.cjs')
 const _ = require('./module.f.cjs')
 
 module.exports = {
@@ -16,7 +17,7 @@ module.exports = {
         },
         () => {
             const s = _.set(15)(_.empty)
-            if (s !== 32768) { throw s }
+            if (s !== 0x8000) { throw s }
             if (_.has(0)(s)) { throw s }
             if (_.has(1)(s)) { throw s }
             if (!_.has(15)(s)) { throw s }
@@ -37,5 +38,19 @@ module.exports = {
     setRange: () => {
         const result = _.setRange([2, 5])(_.empty)
         if (result !== 60) { throw result }
+    },
+    universe: () => {
+        const x = every(map(v => _.has(v)(_.universe))(countdown(16)))
+        if (!x) { throw x }
+    },
+    compliment: {
+        empty: () => {
+            const r = _.complement(_.empty)
+            if (r !== _.universe) { throw r }
+        },
+        universe: () => {
+            const r = _.complement(_.universe)
+            if (r !== _.empty) { throw r }
+        },
     }
 }