functionalscript 0.0.474 → 0.0.475

package/fsm/module.f.cjs

@@ -1,9 +1,9 @@
 const list = require('../types/list/module.f.cjs')
 const { equal, isEmpty, fold, toArray, scan, foldScan } = list
 const byteSet = require('../types/byte_set/module.f.cjs')
-const { toRangeMap } = byteSet
+const { toRangeMap, union: byteSetUnion, one, empty } = byteSet
 const sortedSet = require('../types/sorted_set/module.f.cjs')
-const { intersect, union } = sortedSet
+const { intersect, union: sortedSetUnion } = sortedSet
 const rangeMap = require('../types/range_map/module.f.cjs')
 const { merge } = rangeMap
 const { unsafeCmp } = require('../types/function/compare/module.f.cjs')
@@ -11,6 +11,7 @@ const operator = require("../types/function/operator/module.f.cjs")
 const { strictEqual } = operator
 const { stringify } = require('../json/module.f.cjs')
 const { identity } = require('../types/function/module.f.cjs')
+const { stringToList } = require('../text/utf16/module.f.cjs')
 
 /** @typedef {readonly[string, byteSet.ByteSet, string]} Rule */
 
@@ -24,8 +25,23 @@ const { identity } = require('../types/function/module.f.cjs')
 
 const stringifyIdentity = stringify(identity)
 
+/** @type {(s: string) => byteSet.ByteSet} */
+const toRange = s => {
+    const [b, e] = toArray(stringToList(s))
+    return byteSet.range([b, e])
+}
+
+/** @type {operator.Fold<number, byteSet.ByteSet>} */
+const toUnionOp = i => bs => byteSetUnion(bs)(one(i))
+
+/** @type {(s: string) => byteSet.ByteSet} */
+const toUnion = s => {
+    const codePoints = stringToList(s)
+    return fold(toUnionOp)(empty)(codePoints)
+}
+
 /** @type {rangeMap.Operators<sortedSet.SortedSet<string>>} */
-const mergeOp = { union: union(unsafeCmp), equal: equal(strictEqual) }
+const mergeOp = { union: sortedSetUnion(unsafeCmp), equal: equal(strictEqual) }
 
 /** @type {(s: string) => (set: sortedSet.SortedSet<string>) => boolean} */
 const hasState = s => set => !isEmpty(intersect(unsafeCmp)([s])(set))
@@ -57,6 +73,11 @@ const addEntry = grammar => set => dfa => {
     return fold(addEntry(grammar))(newDfa)(newStates)
 }
 
+/** @type {string[]} */
+const emptyState = []
+
+const emptyStateStringify = stringifyIdentity(emptyState)
+
 const initialState = ['']
 
 const initialStateStringify = stringifyIdentity(initialState)
@@ -65,7 +86,10 @@ const initialStateStringify = stringifyIdentity(initialState)
 const dfa = grammar => addEntry(grammar)(initialState)({})
 
 /** @type {(dfa: Dfa) => operator.Fold<number, string>} */
-const runOp = dfa => input => s => rangeMap.get(input)(dfa[s])
+const runOp = dfa => input => s => {
+    const state = rangeMap.get(input)(dfa[s])
+    return state === undefined ? emptyStateStringify : state
+}
 
 /** @type {(dfa: Dfa) => (input: list.List<number>) => list.List<string>} */
 const run = dfa => input => foldScan(runOp(dfa))(initialStateStringify)(input)
@@ -74,5 +98,9 @@ module.exports = {
     /** @readonly */
     dfa,
     /** @readonly */
-    run
+    run,
+    /** @readonly */
+    toRange,
+    /** @readonly */
+    toUnion
 }

package/fsm/test.f.cjs

@@ -4,21 +4,19 @@ const { sort, fromEntries } = require('../types/object/module.f.cjs')
 const json = require('../json/module.f.cjs')
 const { identity } = require('../types/function/module.f.cjs')
 const { toArray } = require('../types/list/module.f.cjs')
-
-/** @type {(c: string) => number} */
-const toCharCode = c => c.charCodeAt(0)
+const { stringToList } = require('../text/utf16/module.f.cjs')
 
 const stringifyIdentity = json.stringify(identity)
 
 const buildDfa = () => {
-    const lowercaseAlpha = byteSet.range([toCharCode('a'), toCharCode('z')])
-    const uppercaseAlpha = byteSet.range([toCharCode('A'), toCharCode('Z')])
+    const lowercaseAlpha = _.toRange('az')
+    const uppercaseAlpha = _.toRange('AZ')
     const alpha = byteSet.union(lowercaseAlpha)(uppercaseAlpha)
-    const idSymbol = byteSet.union(byteSet.one(toCharCode('_')))(byteSet.one(toCharCode('$')))
+    const idSymbol = _.toUnion('_$')
     const idBegin = byteSet.union(alpha)(idSymbol)
-    const digit = byteSet.range([toCharCode('0'), toCharCode('9')])
+    const digit = _.toRange('09')
     const idNext = byteSet.union(idBegin)(digit)
-    const dot = byteSet.one(toCharCode('.'))
+    const dot = _.toUnion('.')
 
     /** @type {_.Grammar} */
     const grammar = [
@@ -85,7 +83,7 @@ module.exports = {
     run: [
         () => {
             const dfa = buildDfa()
-            const input = [toCharCode('a'), toCharCode('1')]
+            const input = stringToList('a1')
             const result = stringifyIdentity(toArray(_.run(dfa)(input)))
 
             const expectedOutput = [
@@ -97,7 +95,7 @@ module.exports = {
         },
         () => {
             const dfa = buildDfa()
-            const input = [toCharCode('0'), toCharCode('.'), toCharCode('1')]
+            const input = stringToList('0.1')
             const result = stringifyIdentity(toArray(_.run(dfa)(input)))
 
             const expectedOutput = [
@@ -108,5 +106,29 @@ module.exports = {
             const expectedResult = stringifyIdentity(expectedOutput)
             if (result !== expectedResult) { throw result }
         },
+        () => {
+            const dfa = buildDfa()
+            const input = stringToList('//')
+            const result = stringifyIdentity(toArray(_.run(dfa)(input)))
+
+            const expectedOutput = [
+                '[]',
+                '[]'
+            ]
+            const expectedResult = stringifyIdentity(expectedOutput)
+            if (result !== expectedResult) { throw result }
+        },
+        () => {
+            const dfa = buildDfa()
+            const input = stringToList('::')
+            const result = stringifyIdentity(toArray(_.run(dfa)(input)))
+
+            const expectedOutput = [
+                '[]',
+                '[]'
+            ]
+            const expectedResult = stringifyIdentity(expectedOutput)
+            if (result !== expectedResult) { throw result }
+        }
     ]
 }

package/package.json

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