functionalscript 0.0.496 → 0.0.498

package/fsc/module.f.cjs

@@ -12,7 +12,7 @@ const { toArray, map } = list
 
 /** @typedef {readonly[readonly string[], ToResult]} Result */
 
-/** @typedef {(a: number) => Result} ToResult */
+/** @typedef {(codePoint: number) => Result} ToResult */
 
 /**
  * @template T
@@ -25,10 +25,10 @@ const { toArray, map } = list
  */
 
 /** @type {ToResult} */
-const unknownSymbol = a => [[`unknown symbol ${a}`], unknownSymbol]
+const unexpectedSymbol = codePoint => [[`unexpected symbol ${codePoint}`], unexpectedSymbol]
 
-/** @type {<T>(a: T) => ToResult} */
-const def = () => unknownSymbol
+/** @type {<T>(state: T) => ToResult} */
+const def = () => unexpectedSymbol
 
 /** @type {<T>(a: CreateToResult<T>) => (b: CreateToResult<T>) => CreateToResult<T>} */
 const union = a => b => {
@@ -77,42 +77,46 @@ const create = a => {
 
 const terminal = -1
 
+/** @type {() => ToResult} */
+const toInit = () => () => [[], init]
+
 const init = create([
-    codePointRange(one(terminal))(() => () => [[], unknownSymbol]),
-    rangeSet(['\t', ' '])(() => () => [[' '], unknownSymbol]),
-    rangeSet(['\n', '\r'])(() => () => [['\n'], unknownSymbol]),
-    range('!')(() => () => [['!'], unknownSymbol]),
-    range('"')(() => () => [['"'], unknownSymbol]),
-    rangeSet(['$', '_', 'AZ', 'az'])(() => c => [[fromCharCode(c)], unknownSymbol]),
-    range('%')(() => () => [['%'], unknownSymbol]),
-    range('&')(() => () => [['&'], unknownSymbol]),
-    range("'")(() => () => [["'"], unknownSymbol]),
-    range('(')(() => () => [['('], unknownSymbol]),
-    range(')')(() => () => [[')'], unknownSymbol]),
-    range('*')(() => () => [['*'], unknownSymbol]),
-    range('+')(() => () => [['+'], unknownSymbol]),
-    range(',')(() => () => [[','], unknownSymbol]),
-    range('-')(() => () => [['-'], unknownSymbol]),
-    range('.')(() => () => [['.'], unknownSymbol]),
-    range('/')(() => () => [['/'], unknownSymbol]),
-    range('09')(() => a => [[fromCharCode(a)], unknownSymbol]),
-    range(':')(() => () => [[':'], unknownSymbol]),
-    range(';')(() => () => [[';'], unknownSymbol]),
-    range('<')(() => () => [['<'], unknownSymbol]),
-    range('=')(() => () => [['='], unknownSymbol]),
-    range('>')(() => () => [['>'], unknownSymbol]),
-    range('?')(() => () => [['?'], unknownSymbol]),
-    range('[')(() => () => [['['], unknownSymbol]),
-    range(']')(() => () => [[']'], unknownSymbol]),
-    range('^')(() => () => [['^'], unknownSymbol]),
-    range('`')(() => () => [['`'], unknownSymbol]),
-    range('{')(() => () => [['{'], unknownSymbol]),
-    range('|')(() => () => [['|'], unknownSymbol]),
-    range('}')(() => () => [['}'], unknownSymbol]),
-    range('~')(() => () => [['~'], unknownSymbol]),
-])
+    codePointRange(one(terminal))(toInit),
+    rangeSet(['\t', ' ', '\n', '\r'])(toInit),
+    range('!')(() => () => [['!'], unexpectedSymbol]),
+    range('"')(() => () => [['"'], unexpectedSymbol]),
+    rangeSet(['$', '_', 'AZ', 'az'])(() => c => [[fromCharCode(c)], unexpectedSymbol]),
+    range('%')(() => () => [['%'], unexpectedSymbol]),
+    range('&')(() => () => [['&'], unexpectedSymbol]),
+    range("'")(() => () => [["'"], unexpectedSymbol]),
+    range('(')(() => () => [['('], unexpectedSymbol]),
+    range(')')(() => () => [[')'], unexpectedSymbol]),
+    range('*')(() => () => [['*'], unexpectedSymbol]),
+    range('+')(() => () => [['+'], unexpectedSymbol]),
+    range(',')(() => () => [[','], unexpectedSymbol]),
+    range('-')(() => () => [['-'], unexpectedSymbol]),
+    range('.')(() => () => [['.'], unexpectedSymbol]),
+    range('/')(() => () => [['/'], unexpectedSymbol]),
+    range('09')(() => a => [[fromCharCode(a)], unexpectedSymbol]),
+    range(':')(() => () => [[':'], unexpectedSymbol]),
+    range(';')(() => () => [[';'], unexpectedSymbol]),
+    range('<')(() => () => [['<'], unexpectedSymbol]),
+    range('=')(() => () => [['='], unexpectedSymbol]),
+    range('>')(() => () => [['>'], unexpectedSymbol]),
+    range('?')(() => () => [['?'], unexpectedSymbol]),
+    range('[')(() => () => [['['], unexpectedSymbol]),
+    range(']')(() => () => [[']'], unexpectedSymbol]),
+    range('^')(() => () => [['^'], unexpectedSymbol]),
+    range('`')(() => () => [['`'], unexpectedSymbol]),
+    range('{')(() => () => [['{'], unexpectedSymbol]),
+    range('|')(() => () => [['|'], unexpectedSymbol]),
+    range('}')(() => () => [['}'], unexpectedSymbol]),
+    range('~')(() => () => [['~'], unexpectedSymbol]),
+])(void 0)
 
 module.exports = {
+    /** @readonly */
+    terminal,
     /** @readonly */
     init,
 }

package/fsc/test.f.cjs

@@ -6,7 +6,7 @@ const s = stringify(i => i)
 /** @type {(v: string) => string} */
 const f = v => {
     const n = one(v)
-    return s(_.init(null)(n)[0])
+    return s(_.init(n)[0])
 }
 
 module.exports = {

package/json/tokenizer/module.f.cjs

@@ -1,7 +1,10 @@
 const operator = require('../../types/function/operator/module.f.cjs')
+const range_map = require('../../types/range_map/module.f.cjs')
+const { merge, fromRange, get } = range_map
 const list = require('../../types/list/module.f.cjs')
-const { contains } = require('../../types/range/module.f.cjs')
-const { empty, stateScan, flat } = list
+const _range = require('../../types/range/module.f.cjs')
+const { one } = _range
+const { empty, stateScan, flat, toArray, reduce: listReduce, scan } = list
 const { fromCharCode } = String
 const {
     range,
@@ -72,11 +75,31 @@ const {
  * } JsonToken
  */
 
-const containsDigit = contains(digitRange)
-const containsDigitOneNine = contains(range('19'))
-const containsSmallAF = contains(range('af'))
-const containsCapitalAF = contains(range('AF'))
-const containsSmallLetter = contains(latinSmallLetterRange)
+const rangeOneNine = range('19')
+
+const rangeSetWhiteSpace = [
+    one(ht),
+    one(lf),
+    one(cr),
+    one(space)
+]
+
+const rangeSetTerminalForNumber = [
+    one(ht),
+    one(lf),
+    one(cr),
+    one(space),
+    one(quotationMark),
+    one(comma),
+    one(leftCurlyBracket),
+    one(rightCurlyBracket),
+    one(leftSquareBracket),
+    one(rightSquareBracket),
+    one(colon)
+]
+
+const rangeSmallAF = range('af')
+const rangeCapitalAF = range('AF')
 
 /**
  * @typedef {|
@@ -111,15 +134,22 @@ const containsSmallLetter = contains(latinSmallLetterRange)
 
 /** @typedef {{ readonly kind: 'escapeChar', readonly value: string}} ParseEscapeCharState */
 
-/** @typedef {{ readonly kind: 'unicodeChar', readonly value: string, readonly unicode: number, readonly hexIndex: number}} ParseUnicodeCharState */
+/**
+ * @typedef {{
+ *  readonly kind: 'unicodeChar'
+ *  readonly value: string
+ *  readonly unicode: number
+ *  readonly hexIndex: number
+ * }} ParseUnicodeCharState
+ */
 
 /**
- *  @typedef {{
- * readonly kind: 'number',
- * readonly numberKind: '0' | '-' | 'int' | '.' | 'fractional' | 'e' | 'e+' | 'e-' | 'expDigits'
- * readonly value: string
+ * @typedef {{
+ *  readonly kind: 'number',
+ *  readonly numberKind: '0' | '-' | 'int' | '.' | 'fractional' | 'e' | 'e+' | 'e-' | 'expDigits'
+ *  readonly value: string
  * }} ParseNumberState
- *  */
+ */
 
 /** @typedef {{ readonly kind: 'invalidNumber'}} InvalidNumberState */
 
@@ -127,192 +157,235 @@ const containsSmallLetter = contains(latinSmallLetterRange)
 
 /** @typedef {number|null} CharCodeOrEof */
 
+/** @typedef {(input: number) => readonly[list.List<JsonToken>, TokenizerState]} ToToken */
+
+/**
+ * @template T
+ * @typedef {(state: T) => ToToken} CreateToToken<T>
+ */
+
+/** @typedef {list.List<_range.Range>} RangeSet */
+
+/**
+ * @template T
+ * @typedef {(def: CreateToToken<T>) => (RangeMapToToken<T>)} RangeFunc<T>
+ */
+
+/**
+ * @template T
+ * @typedef {range_map.RangeMapArray<CreateToToken<T>>} RangeMapToToken<T>
+ */
+
 /** @type {(old: string) => (input: number) => string} */
 const appendChar = old => input => `${old}${fromCharCode(input)}`
 
+/** @type {<T>(def: CreateToToken<T>) => (a: CreateToToken<T>) => (b: CreateToToken<T>) => CreateToToken<T>} */
+const union = def => a => b => {
+    if (a === def || a === b) { return b }
+    if (b === def) { return a }
+    throw [a, b]
+}
+
+/** @type {<T>(def:  CreateToToken<T>) => range_map.RangeMerge<CreateToToken<T>>} */
+const rangeMapMerge = def => merge({
+    union: union(def),
+    equal: operator.strictEqual,
+})
+
+/** @type {<T>(r: _range.Range) => (f: CreateToToken<T>) => RangeFunc<T>} */
+const rangeFunc = r => f => def => fromRange(def)(r)(f)
+
+/** @type {<T>(def:  CreateToToken<T>) => (operator.Scan<RangeFunc<T>, RangeMapToToken<T>>)} */
+const scanRangeOp = def => f => [f(def), scanRangeOp(def)]
+
+/** @type {<T>(def: CreateToToken<T>) => (a: list.List<RangeFunc<T>>) => RangeMapToToken<T>} */
+const reduceRangeMap = def => a => {
+    const rm = scan(scanRangeOp(def))(a)
+    return toArray(listReduce(rangeMapMerge(def))(empty)(rm))
+}
+
+/** @type {<T>(def:  CreateToToken<T>) => (f:  CreateToToken<T>) => (operator.Scan<_range.Range, RangeMapToToken<T>>)} */
+const scanRangeSetOp = def => f => r => [fromRange(def)(r)(f), scanRangeSetOp(def)(f)]
+
+/** @type {<T>(rs: list.List<_range.Range>) => (f: CreateToToken<T>) => RangeFunc<T>} */
+const rangeSetFunc = rs => f => def => {
+    const rm = scan(scanRangeSetOp(def)(f))(rs)
+    return toArray(listReduce(rangeMapMerge(def))(empty)(rm))
+}
+
+/** @type {<T>(def: CreateToToken<T>) => (a: list.List<RangeFunc<T>>) => CreateToToken<T>} */
+const create = def => a => {
+    /** @typedef {typeof def extends CreateToToken<infer T> ? T : never} T */
+    const i = reduceRangeMap(def)(a)
+    /** @type {(v: number) => (i: RangeMapToToken<T>) => (v: T) => ToToken} */
+    const x = get(def)
+    return v => c => x(c)(i)(v)(c)
+}
+
 /** @type {(state: InitialState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const initialStateOp = initialState => input => {
-    if (containsDigitOneNine(input)) {
-        return [empty, { kind: 'number', value: fromCharCode(input), numberKind: 'int' }]
-    }
-    if (containsSmallLetter(input)) {
-        return [empty, { kind: 'keyword', value: fromCharCode(input) }]
-    }
-    if (isWhiteSpace(input)) {
-        return [empty, initialState]
-    }
-    switch (input) {
-        case leftCurlyBracket: return [[{ kind: '{' }], initialState]
-        case rightCurlyBracket: return [[{ kind: '}' }], initialState]
-        case colon: return [[{ kind: ':' }], initialState]
-        case comma: return [[{ kind: ',' }], initialState]
-        case leftSquareBracket: return [[{ kind: '[' }], initialState]
-        case rightSquareBracket: return [[{ kind: ']' }], initialState]
-        case quotationMark: return [empty, { kind: 'string', value: '' }]
-        case digit0: return [empty, { kind: 'number', value: fromCharCode(input), numberKind: '0' }]
-        case hyphenMinus: return [empty, { kind: 'number', value: fromCharCode(input), numberKind: '-' }]
-        default: return [[{ kind: 'error', message: 'unexpected character' }], initialState]
+const initialStateOp = create(state => () => [[{ kind: 'error', message: 'unexpected character' }], state])([
+    rangeFunc(rangeOneNine)(() => input => [empty, { kind: 'number', value: fromCharCode(input), numberKind: 'int' }]),
+    rangeFunc(latinSmallLetterRange)(() => input => [empty, { kind: 'keyword', value: fromCharCode(input) }]),
+    rangeSetFunc(rangeSetWhiteSpace)(state => () => [empty, state]),
+    rangeFunc(one(leftCurlyBracket))(state => () => [[{ kind: '{' }], state]),
+    rangeFunc(one(rightCurlyBracket))(state => () => [[{ kind: '}' }], state]),
+    rangeFunc(one(colon))(state => () => [[{ kind: ':' }], state]),
+    rangeFunc(one(comma))(state => () => [[{ kind: ',' }], state]),
+    rangeFunc(one(leftSquareBracket))(state => () => [[{ kind: '[' }], state]),
+    rangeFunc(one(rightSquareBracket))(state => () => [[{ kind: ']' }], state]),
+    rangeFunc(one(quotationMark))(() => () => [empty, { kind: 'string', value: '' }]),
+    rangeFunc(one(digit0))(() => input => [empty, { kind: 'number', value: fromCharCode(input), numberKind: '0' }]),
+    rangeFunc(one(hyphenMinus))(() => input => [empty, { kind: 'number', value: fromCharCode(input), numberKind: '-' }])
+])
+
+/** @type {(state: any) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const invalidNumberToToken = () => input => tokenizeOp({ kind: 'invalidNumber' })(input)
+
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const fullStopToToken = state => input => {
+    switch (state.numberKind) {
+        case '0':
+        case 'int': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: '.' }]
+        default: return tokenizeOp({ kind: 'invalidNumber' })(input)
     }
 }
 
 /** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const parseNumberStateOp = state => input => {
-    if (input === fullStop) {
-        switch (state.numberKind) {
-            case '0':
-            case 'int': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: '.' }]
-            default: return tokenizeOp({ kind: 'invalidNumber' })(input)
-        }
+const digit0ToToken = state => input => {
+    switch (state.numberKind) {
+        case '0': return tokenizeOp({ kind: 'invalidNumber' })(input)
+        case '-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: '0' }]
+        case '.': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'fractional' }]
+        case 'e':
+        case 'e+':
+        case 'e-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'expDigits' }]
+        default: return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: state.numberKind }]
     }
-    if (input === digit0) {
-        switch (state.numberKind) {
-            case '0': return tokenizeOp({ kind: 'invalidNumber' })(input)
-            case '-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: '0' }]
-            case '.': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'fractional' }]
-            case 'e':
-            case 'e+':
-            case 'e-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'expDigits' }]
-            default: return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: state.numberKind }]
-        }
-    }
-    if (containsDigitOneNine(input)) {
-        switch (state.numberKind) {
-            case '0': return tokenizeOp({ kind: 'invalidNumber' })(input)
-            case '-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'int' }]
-            case '.': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'fractional' }]
-            case 'e':
-            case 'e+':
-            case 'e-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'expDigits' }]
-            default: return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: state.numberKind }]
-        }
-    }
-    if (input === latinSmallLetterE || input === latinCapitalLetterE) {
-        switch (state.numberKind) {
-            case '0':
-            case 'int':
-            case 'fractional': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'e' }]
-            default: return tokenizeOp({ kind: 'invalidNumber' })(input)
-        }
-    }
-    if (input === hyphenMinus) {
-        switch (state.numberKind) {
-            case 'e': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'e-' }]
-            default: return tokenizeOp({ kind: 'invalidNumber' })(input)
-        }
-    }
-    if (input === plusSign) {
-        switch (state.numberKind) {
-            case 'e': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'e+' }]
-            default: return tokenizeOp({ kind: 'invalidNumber' })(input)
-        }
+}
+
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const digit19ToToken = state => input => {
+    switch (state.numberKind) {
+        case '0': return tokenizeOp({ kind: 'invalidNumber' })(input)
+        case '-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'int' }]
+        case '.': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'fractional' }]
+        case 'e':
+        case 'e+':
+        case 'e-': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'expDigits' }]
+        default: return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: state.numberKind }]
     }
-    if (isTerminalForNumber(input)) {
-        switch (state.numberKind) {
-            case '-':
-            case '.':
-            case 'e':
-            case 'e+':
-            case 'e-':
-                {
-                    const next = tokenizeOp({ kind: 'initial' })(input)
-                    return [{ first: { kind: 'error', message: 'invalid number' }, tail: next[0] }, next[1]]
-                }
-            default:
-                {
-                    const next = tokenizeOp({ kind: 'initial' })(input)
-                    return [{ first: { kind: 'number', value: state.value }, tail: next[0] }, next[1]]
-                }
-        }
+}
+
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const expToToken = state => input => {
+    switch (state.numberKind) {
+        case '0':
+        case 'int':
+        case 'fractional': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'e' }]
+        default: return tokenizeOp({ kind: 'invalidNumber' })(input)
     }
-    return tokenizeOp({ kind: 'invalidNumber' })(input)
 }
 
-/** @type {(char: number) => boolean} */
-const isTerminalForNumber = char => {
-    if (isWhiteSpace(char)) {
-        return true;
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const hyphenMinusToToken = state => input => {
+    switch (state.numberKind) {
+        case 'e': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'e-' }]
+        default: return tokenizeOp({ kind: 'invalidNumber' })(input)
     }
-    switch (char) {
-        case quotationMark:
-        case comma:
-        case leftCurlyBracket:
-        case rightCurlyBracket:
-        case leftSquareBracket:
-        case rightSquareBracket:
-        case colon: return true
-        default: return false
+}
+
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const plusSignToToken = state => input => {
+    switch (state.numberKind) {
+        case 'e': return [empty, { kind: 'number', value: appendChar(state.value)(input), numberKind: 'e+' }]
+        default: return tokenizeOp({ kind: 'invalidNumber' })(input)
     }
 }
 
-/** @type {(char: number) => boolean} */
-const isWhiteSpace = char => {
-    switch (char) {
-        case ht:
-        case lf:
-        case cr:
-        case space: return true
-        default: return false
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const terminalToToken = state => input => {
+    switch (state.numberKind) {
+        case '-':
+        case '.':
+        case 'e':
+        case 'e+':
+        case 'e-':
+            {
+                const next = tokenizeOp({ kind: 'initial' })(input)
+                return [{ first: { kind: 'error', message: 'invalid number' }, tail: next[0] }, next[1]]
+            }
+        default:
+            {
+                const next = tokenizeOp({ kind: 'initial' })(input)
+                return [{ first: { kind: 'number', value: state.value }, tail: next[0] }, next[1]]
+            }
     }
 }
 
+/** @type {(state: ParseNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const parseNumberStateOp = create(invalidNumberToToken)([
+    rangeFunc(one(fullStop))(fullStopToToken),
+    rangeFunc(one(digit0))(digit0ToToken),
+    rangeFunc(rangeOneNine)(digit19ToToken),
+    rangeSetFunc([one(latinSmallLetterE), one(latinCapitalLetterE)])(expToToken),
+    rangeFunc(one(hyphenMinus))(hyphenMinusToToken),
+    rangeFunc(one(plusSign))(plusSignToToken),
+    rangeSetFunc(rangeSetTerminalForNumber)(terminalToToken)
+])
+
 /** @type {(state: InvalidNumberState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const invalidNumberStateOp = () => input => {
-    if (isTerminalForNumber(input)) {
+const invalidNumberStateOp = create(() => () => [empty, { kind: 'invalidNumber' }])([
+    rangeSetFunc(rangeSetTerminalForNumber)(() => input => {
         const next = tokenizeOp({ kind: 'initial' })(input)
         return [{ first: { kind: 'error', message: 'invalid number' }, tail: next[0] }, next[1]]
-    }
-    return [empty, { kind: 'invalidNumber' }]
-}
+    })
+])
 
 /** @type {(state: ParseStringState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const parseStringStateOp = state => input => {
-    switch (input) {
-        case quotationMark: return [[{ kind: 'string', value: state.value }], { kind: 'initial' }]
-        case reverseSolidus: return [empty, { kind: 'escapeChar', value: state.value }]
-        default: return [empty, { kind: 'string', value: appendChar(state.value)(input) }]
-    }
-}
+const parseStringStateOp = create(state => input => [empty, { kind: 'string', value: appendChar(state.value)(input) }])([
+    rangeFunc(one(quotationMark))(state => () => [[{ kind: 'string', value: state.value }], { kind: 'initial' }]),
+    rangeFunc(one(reverseSolidus))(state => () => [empty, { kind: 'escapeChar', value: state.value }])
+])
 
 /** @type {(state: ParseEscapeCharState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const parseEscapeCharStateOp = state => input => {
-    switch (input) {
-        case quotationMark:
-        case reverseSolidus:
-        case solidus: return [empty, { kind: 'string', value: appendChar(state.value)(input) }]
-        case latinSmallLetterB: return [empty, { kind: 'string', value: appendChar(state.value)(backspace) }]
-        case latinSmallLetterF: return [empty, { kind: 'string', value: appendChar(state.value)(ff) }]
-        case latinSmallLetterN: return [empty, { kind: 'string', value: appendChar(state.value)(lf) }]
-        case latinSmallLetterR: return [empty, { kind: 'string', value: appendChar(state.value)(cr) }]
-        case latinSmallLetterT: return [empty, { kind: 'string', value: appendChar(state.value)(ht) }]
-        case latinSmallLetterU: return [empty, { kind: 'unicodeChar', value: state.value, unicode: 0, hexIndex: 0 }]
-        default: {
-            const next = tokenizeOp({ kind: 'string', value: state.value })(input)
-            return [{ first: { kind: 'error', message: 'unescaped character' }, tail: next[0] }, next[1]]
-        }
-    }
+const parseEscapeDefault = state => input => {
+    const next = tokenizeOp({ kind: 'string', value: state.value })(input)
+    return [{ first: { kind: 'error', message: 'unescaped character' }, tail: next[0] }, next[1]]
 }
 
-/** @type {(hex: number) => number|null} */
-const hexDigitToNumber = hex => {
-    if (containsDigit(hex)) { return hex - digit0 }
-    if (containsCapitalAF(hex)) { return hex - latinCapitalLetterA + 10 }
-    if (containsSmallAF(hex)) { return hex - latinSmallLetterA + 10 }
-    return null
-}
+/** @type {(state: ParseEscapeCharState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const parseEscapeCharStateOp = create(parseEscapeDefault)([
+    rangeSetFunc([one(quotationMark), one(reverseSolidus), one(solidus)])(state => input => [empty, { kind: 'string', value: appendChar(state.value)(input) }]),
+    rangeFunc(one(latinSmallLetterB))(state => () => [empty, { kind: 'string', value: appendChar(state.value)(backspace) }]),
+    rangeFunc(one(latinSmallLetterF))(state => () => [empty, { kind: 'string', value: appendChar(state.value)(ff) }]),
+    rangeFunc(one(latinSmallLetterN))(state => () => [empty, { kind: 'string', value: appendChar(state.value)(lf) }]),
+    rangeFunc(one(latinSmallLetterR))(state => () => [empty, { kind: 'string', value: appendChar(state.value)(cr) }]),
+    rangeFunc(one(latinSmallLetterT))(state => () => [empty, { kind: 'string', value: appendChar(state.value)(ht) }]),
+    rangeFunc(one(latinSmallLetterU))(state => () => [empty, { kind: 'unicodeChar', value: state.value, unicode: 0, hexIndex: 0 }]),
+])
 
 /** @type {(state: ParseUnicodeCharState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const parseUnicodeCharStateOp = state => input => {
-    const hexValue = hexDigitToNumber(input)
-    if (hexValue === null) {
-        const next = tokenizeOp({ kind: 'string', value: state.value })(input)
-        return [{ first: { kind: 'error', message: 'invalid hex value' }, tail: next[0] }, next[1]]
-    }
+const parseUnicodeCharDefault = state => input => {
+    const next = tokenizeOp({ kind: 'string', value: state.value })(input)
+    return [{ first: { kind: 'error', message: 'invalid hex value' }, tail: next[0] }, next[1]]
+}
+
+/** @type {(offser: number) => (state: ParseUnicodeCharState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const parseUnicodeCharHex = offset => state => input => {
+    const hexValue = input - offset
     const newUnicode = state.unicode | (hexValue << (3 - state.hexIndex) * 4)
     return [empty, state.hexIndex === 3 ?
         { kind: 'string', value: appendChar(state.value)(newUnicode) } :
         { kind: 'unicodeChar', value: state.value, unicode: newUnicode, hexIndex: state.hexIndex + 1 }]
 }
 
+/** @type {(state: ParseUnicodeCharState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const parseUnicodeCharStateOp = create(parseUnicodeCharDefault)([
+    rangeFunc(digitRange)(parseUnicodeCharHex(digit0)),
+    rangeFunc(rangeSmallAF)(parseUnicodeCharHex(latinSmallLetterA - 10)),
+    rangeFunc(rangeCapitalAF)(parseUnicodeCharHex(latinCapitalLetterA - 10))
+])
+
 /** @type {(s: string) => JsonToken} */
 const stringToKeywordToken = s => {
     switch (s) {
@@ -324,17 +397,19 @@ const stringToKeywordToken = s => {
 }
 
 /** @type {(state: ParseKeywordState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const parseKeyWordStateOp = state => input => {
-    if (containsSmallLetter(input)) {
-        return [empty, { kind: 'keyword', value: appendChar(state.value)(input) }]
-    }
+const parseKeyWordDefault = state => input => {
     const keyWordToken = stringToKeywordToken(state.value)
     const next = tokenizeOp({ kind: 'initial' })(input)
     return [{ first: keyWordToken, tail: next[0] }, next[1]]
 }
 
+/** @type {(state: ParseKeywordState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
+const parseKeyWordStateOp = create(parseKeyWordDefault)([
+    rangeFunc(latinSmallLetterRange)(state => input => [empty, { kind: 'keyword', value: appendChar(state.value)(input) }])
+])
+
 /** @type {(state: EofState) => (input: number) => readonly[list.List<JsonToken>, TokenizerState]} */
-const eofStateOp = state => () => [[{ kind: 'error', message: 'eof' }], state]
+const eofStateOp = create(state => () => [[{ kind: 'error', message: 'eof' }], state])([])
 
 /** @type {operator.StateScan<number, TokenizerState, list.List<JsonToken>>} */
 const tokenizeCharCodeOp = state => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.496",
+  "version": "0.0.498",
   "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.15",
+    "@types/node": "^18.11.18",
     "typescript": "^4.9.4"
   }
 }