diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d570088 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ + diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..327c712 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,22 @@ +{ + "name": "kuebiko", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "kuebiko", + "version": "1.0.0", + "license": "ISC", + "devDependencies": { + "folktest": "git+https://git.kitsu.cafe/rowan/folktest.git" + } + }, + "node_modules/folktest": { + "version": "1.0.0", + "resolved": "git+https://git.kitsu.cafe/rowan/folktest.git#708d44f1215be33fcceba426029f44b4f963dbe5", + "dev": true, + "license": "GPL-3.0-or-later" + } + } +} diff --git a/package.json b/package.json index 66457cd..6a17f30 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,12 @@ "main": "index.js", "author": "Rowan (https://kitsu.cafe)", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "./tests/index.js" }, "keywords": [], "license": "ISC", - "description": "" + "description": "", + "devDependencies": { + "folktest": "git+https://git.kitsu.cafe/rowan/folktest.git" + } } diff --git a/src/char.js b/src/char.js index 504ce29..ef1dc34 100644 --- a/src/char.js +++ b/src/char.js @@ -12,14 +12,17 @@ export const char = curry( * @param {string} ch * @param {ParserState} state */ - (ch, state) => ( - next(state) === ch ? succeed(ch, state) : fail(`could not parse ${ch} `, state) - )) + //(ch, state) => ( + // next(state) === ch ? succeed(ch, state) : fail(`could not parse ${ch} `, state) + //)) + (ch, state) => { + return next(state) === ch ? succeed(ch, state) : fail(`could not parse ${ch} `, state) + }) export const str = curry( /** * @param {string} str - * @param {State} state + * @param {ParserState} state */ (str, state) => ( map( diff --git a/src/cond.js b/src/cond.js index 9d7b76b..8f3c629 100644 --- a/src/cond.js +++ b/src/cond.js @@ -1,7 +1,8 @@ import { ParseError } from './state.js' -import { fork, succeed } from './fn.js' -import { curry } from '../vendor/izuna/src/index.js' +import { fail, fork, succeed } from './fn.js' import { anyChar } from './char.js' +import { ok } from '../vendor/kojima/src/index.js' +import { curry } from '../vendor/izuna/src/index.js' /** @import { Result } from '../vendor/kojima/src/index.js' */ /** @import { ParserState } from './state.js' */ @@ -19,6 +20,7 @@ export const maybe = curry( export const not = parser => state => { const result = parser(state) + if (result.isOk()) { return fail('"not" parser failed', state) } else { @@ -27,19 +29,19 @@ export const not = parser => state => { } export const until = parser => state => { - let acc = ok(state) + let result = ok(state) while (result.isOk()) { const [original, clone] = fork(state) - const result = acc.chain(x => parser(clone)) + result = result.chain(x => parser(clone)) if (result.isOk()) { break } else { - acc = anyChar(original) + result = anyChar(original) } } - return acc + return result } export const many = curry((parser, state) => { diff --git a/src/fn.js b/src/fn.js index 9603067..417c986 100644 --- a/src/fn.js +++ b/src/fn.js @@ -97,3 +97,4 @@ export const mapStr = curry( (fn, str) => Array.from(str).map(v => fn(v)) ) + diff --git a/src/index.js b/src/index.js index 0c0c84a..a797e01 100644 --- a/src/index.js +++ b/src/index.js @@ -4,7 +4,3 @@ export * from './cond.js' export * from './seq.js' export * from './state.js' -console.log( - parse(until(not(char('!'))), '!!!!!!!a!!!!') -) - diff --git a/src/iter.js b/src/iter.js index 25e5e05..ce6aa7e 100644 --- a/src/iter.js +++ b/src/iter.js @@ -19,8 +19,7 @@ export class Iter { * @returns {value is Iterable} */ static _isIterable(value) { - return Object.hasOwn(value, Symbol.iterator) - && typeof value[Symbol.iterator] === 'function' + return typeof value[Symbol.iterator] === 'function' } /** @@ -49,7 +48,8 @@ export class Iter { * @param {any} [value] */ next(value) { - return this._iterator.next(value) + const n = this._iterator.next(value) + return n } /** diff --git a/src/seq.js b/src/seq.js index de71fbe..16245ce 100644 --- a/src/seq.js +++ b/src/seq.js @@ -40,10 +40,9 @@ export const seq = (...parsers) => /** @param {ParserState} state */ state => { let acc = ok(state) - for (const parser of parsers) { if (acc.isOk()) { - acc = acc.bind(parser) + acc = acc.chain(parser) } else { break } @@ -59,16 +58,12 @@ export const map = curry( * @param {ParserState} state */ (fn, parser, state) => { - return parser(state).map(result => { + return parser(state).chain(result => { try { /** @type {Result} */ - const parsed = result.chain(otherState => - fn(diff(state[0], otherState[0])) - ) + const parsed = fn(diff(state[0], result[0])) + const backtrack = Tuple(state[0], result[1]) - const backtrack = result.chain(otherState => - Tuple(state[0], otherState[1]) - ) return succeed(parsed, backtrack) } catch (e) { diff --git a/tests/index.js b/tests/index.js new file mode 100755 index 0000000..d9b03db --- /dev/null +++ b/tests/index.js @@ -0,0 +1,7 @@ +#!/usr/bin/env node + +import { TerminalRunner } from 'folktest' +import * as Tests from './units/index.js' + +console.log(TerminalRunner(Tests).toString()) + diff --git a/tests/units/index.js b/tests/units/index.js new file mode 100644 index 0000000..bf8ff42 --- /dev/null +++ b/tests/units/index.js @@ -0,0 +1,11 @@ +import { it, assert } from 'folktest' +import { map, not, until, char, parse, State, seq, str } from '../../src/index.js' +import { mapStr, join } from '../../src/fn.js' + +export const Tests = [ + it('whatever', () => { + const a = 'abcdef!!!!'.split('') + parse(str('abc'), 'abc').map(console.log) + }) +] +