functionalscript 0.0.151 → 0.0.155

package/lib/map/index.js

@@ -1,5 +1,5 @@
 const { optionMap } = require("..")
-const { getVisitor, setVisitor, values, struct } = require("../tree")
+const { getVisitor, setVisitor, values } = require("../tree")
 
 /** @typedef {import("../tree/cmp").Sign} Sign */
 
@@ -29,7 +29,7 @@ const { getVisitor, setVisitor, values, struct } = require("../tree")
  *  readonly get: (name: string) => T|undefined
  *  readonly set: (name: string) => (value: T) => Map<T> 
  *  readonly entries: () => Iterable<Entry<T>>
- *  readonly struct: () => Iterable<string>
+ *  readonly root: undefined|TNode<Entry<T>>
  * }} Map
  */
 
@@ -37,16 +37,16 @@ const { getVisitor, setVisitor, values, struct } = require("../tree")
 const cmp = a => ([b]) => a < b ? -1 : a === b ? 0 : 1
 
 /** @type {<T>(node: TNode<Entry<T>>) => Map<T>} */
-const create = node => ({
-    get: name => optionMap(([,value]) => value)(getVisitor(cmp(name))(node)),
-    set: name => value => { 
-        const result = setVisitor(cmp(name))(() => [name, value])(node)
+const create = root => ({
+    get: name => optionMap(([,value]) => value)(getVisitor(cmp(name))(root)),
+    set: name => value => {
+        const result = setVisitor(cmp(name))(() => [name, value])(root)
         if ('replace' in result) { return create(result.replace) }
         if ('overflow' in result) { return create(result.overflow) }
         throw ''
     },
-    entries: () => values(node),
-    struct: () => struct(node),
+    entries: () => values(root),
+    root,
 })
 
 /** 
@@ -54,17 +54,17 @@ const create = node => ({
  *  readonly get: (name: string) => undefined
  *  readonly set: (name: string) => <T>(value: T) => Map<T>
  *  readonly entries: () => []
- *  readonly struct: () => []
+ *  readonly root: undefined
  * }} 
  */
-const map = {
+const empty = {
     get: () => undefined,
     set: name => value => create([[name, value]]),
     entries: () => [],
-    struct: () => [],
+    root: undefined
 }
 
 module.exports = {
     /** @readonly */
-    map,
+    empty,
 }

package/lib/map/test.js

@@ -1,8 +1,8 @@
-const { map } = require('.')
+const { empty } = require('.')
 const lib = require('..')
 
 {
-    let m = map.set('a')(1)
+    let m = empty.set('a')(1)
 
     if (m.get('a') !== 1) { throw 'error' }
     if (m.get('b') !== undefined) { throw 'error' }
@@ -41,7 +41,7 @@ const lib = require('..')
 }
 
 {
-    const m = map.set('x')(12).set('y')(44)
+    const m = empty.set('x')(12).set('y')(44)
     lib.panic_if('map.get(\'x\')')(m.get('x') !== 12)
     lib.panic_if('map.get(\'y\')')(m.get('y') !== 44)
     lib.panic_if('map.get(\'a\')')(m.get('a') !== undefined)
@@ -52,8 +52,8 @@ const lib = require('..')
 
 {
     /** @type {import('.').Map<number>} */
-    let m = map
-    for (let i = 0; i < 100; ++i) {
+    let m = empty
+    for (let i = 0; i < 1_000_000; ++i) {
         m = m.set((i*i).toString())(i)
         /*
         console.log()

package/lib/tree/index.js

@@ -319,49 +319,7 @@ const values = node => ({
     }
 })
 
-/**
- * @typedef {{}}
- */
-
-/** @type {(offset: string) => <T>(_: TNode<T>) => Iterable<string>} */
-const struct = offset => node => ({
-    *[Symbol.iterator]() {
-        const next = `${offset}  `
-        switch (node.length) {
-            case 1: {
-                yield `${offset}- [1]:`
-                yield `${next}- ${node[0]}`
-                return
-            }
-            case 2: {
-                yield `${offset}- [2]:`
-                yield `${next}- ${node[0]}`
-                yield `${next}- ${node[1]}`
-                return
-            }
-            case 3: {
-                yield  `${offset}- [3]:`
-                yield* struct(next)(node[0])
-                yield  `${next}- ${node[1]}`
-                yield* struct(next)(node[2])
-                return
-            }
-            default: {
-                yield `${offset}- [5]:`
-                yield* struct(next)(node[0])
-                yield  `${next}- ${node[1]}`
-                yield* struct(next)(node[2])
-                yield  `${next}- ${node[3]}`
-                yield* struct(next)(node[4])
-                return
-            }
-        }
-    }
-})
-
 module.exports = {
-    /** @readonly */
-    struct: struct(''),
     /** @readonly */
     values,
     /** 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.151",
+  "version": "0.0.155",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {