functionalscript 0.0.433 → 0.0.435

package/Cargo.lock

@@ -7,7 +7,7 @@ name = "nanocom"
 version = "0.1.2"
 
 [[package]]
-name = "rtest"
+name = "testrust"
 version = "0.1.0"
 dependencies = [
  "nanocom",

package/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
 members = [
     "com/rust/nanocom",
-    "com/rust/rtest"
+    "com/test/rust"
 ]

package/com/{cpp/test → test/cpp}/build.cjs

@@ -1,7 +1,7 @@
 const fs = require('node:fs')
 const cp = require('node:child_process')
 const os = require('node:os');
-const cpp = require('../test.f.cjs').result
+const cpp = require('../../cpp/test.f.cjs').result
 const { string: { join }, list: { flat } } = require('../../../types/module.f.cjs')
 
 fs.writeFileSync('_result.hpp', cpp)

package/com/{cs/test → test/cs}/build.cjs

@@ -1,6 +1,6 @@
 const fs = require('node:fs')
 const cp = require('node:child_process')
-const cs = require('../test.f.cjs').result
+const cs = require('../../cs/test.f.cjs').result
 
 fs.writeFileSync('_result.cs', cs)
 try {

package/fsm/module.f.cjs

@@ -15,7 +15,7 @@ const byteSet = require('../types/byte_set/module.f.cjs')
  */
 
 /** @type {(faId: string) => string} */
-const escape = faId => todo()
+const escape = faId => faId.replaceAll('\\', '\\\\').replaceAll('|', '\\|')
 
 /** @type {(grammar: Grammar) => Dfa} */
 const dfa = grammar => todo()

package/fsm/test.f.cjs

@@ -0,0 +1,14 @@
+const _ = require('./module.f.cjs')
+
+module.exports = {
+    escape: [
+        () => {
+            const result = _.escape('abc')
+            if (result !== 'abc') { throw result }
+        },
+        () => {
+            const result = _.escape('\\a|b|c\\')
+            if (result !== '\\\\a\\|b\\|c\\\\') { throw result }
+        }
+    ]
+}

package/package.json

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

package/types/sorted_list/module.f.cjs

@@ -0,0 +1,38 @@
+const compare = require("../function/compare/module.f.cjs")
+const list = require("../list/module.f.cjs")
+const { next, toArray } = list
+
+/**
+ * @template T
+ * @typedef {list.List<T>} SortedList
+ */
+
+/**
+ * @template T
+ * @typedef {(a: T) => (b: T) => compare.Sign} Cmp
+ */
+
+/** @typedef {number} Byte */
+
+/**
+ * @template T
+ * @typedef {SortedList<[Byte, readonly string[]]>} RangeMap
+ */
+
+/** @type {<T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>} */
+const merge = cmp => a => b => () => {
+    const aResult = next(a)
+    if (aResult === undefined) { return b }
+    const bResult = next(b)
+    if (bResult === undefined) { return a }
+    switch (cmp(aResult.first)(bResult.first)) {
+        case -1: return { first: aResult.first, tail: merge(cmp)(aResult.tail)(b) }
+        case 0: return { first: aResult.first, tail: merge(cmp)(aResult.tail)(bResult.tail) }
+        case 1: return { first: bResult.first, tail: merge(cmp)(a)(bResult.tail) }
+    }
+}
+
+module.exports = {
+    /** @readonly */
+    merge
+}

package/types/sorted_list/test.f.cjs

@@ -0,0 +1,33 @@
+const _ = require('./module.f.cjs')
+const { unsafeCmp } = require('../function/compare/module.f.cjs')
+const json = require('../../json/module.f.cjs')
+const { sort } = require('../../types/object/module.f.cjs')
+const { toArray, countdown, length } = require('../list/module.f.cjs')
+const map = require('../map/module.f.cjs')
+const { flip } = require('../function/module.f.cjs')
+
+/** @type {(a: readonly json.Unknown[]) => string} */
+const stringify = a => json.stringify(sort)(a)
+
+/** @type {<T>(a: T) => (b: T) => map.Sign} */
+const reverseCmp = flip(unsafeCmp)
+
+module.exports = {
+    sortedMergre: [
+        () => {
+            const result = stringify(toArray(_.merge(unsafeCmp)([2, 3, 4])([1, 3, 5])))
+            if (result !== '[1,2,3,4,5]') { throw result }
+        },
+        () => {
+            const result = stringify(toArray(_.merge(unsafeCmp)([1, 2, 3])([])))
+            if (result !== '[1,2,3]') { throw result }
+        },
+        () => {
+            const n = 10_000
+            const list = countdown(n)
+            const result = _.merge(reverseCmp)(list)(list)
+            const len = length(result)
+            if (len != n) { throw result }
+        }
+    ]
+}