@thomasfosterau/effect-parse 0.2.0 → 0.4.0

package/dist/Parser.js

@@ -1,9 +1,11 @@
 import * as Predicate from "effect/Predicate";
 import * as Result from "effect/Result";
-import { Fail, Failure, State, mergeExpected, mergeFailures } from "./Input.js";
+import { Fail, Failure, State, mergeExpected, mergeFailures, mergeTiedFailures } from "./Input.js";
+import { Key } from "./internal/key.js";
 import * as Resume from "./internal/resume.js";
 import * as Registry from "./internal/compiler/registry.js";
 import * as Option from "effect/Option";
+import { TiedFailures } from "./internal/ties.js";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import { dual } from "effect/Function";
@@ -14,7 +16,7 @@ import * as Entries from "./internal/entries.js";
 import * as Run from "./internal/run.js";
 import * as Stack from "./internal/stack.js";
 import { NodeId, bounds } from "./internal/node.js";
-//#region src/Parser.ts
+// src/Parser.ts
 /**
 * The `Parser` data type and its general-purpose combinators.
 *
@@ -134,6 +136,8 @@ const isTwoParserArgs = (args) => isParser(args[0]) && isParser(args[1]);
 * The step function must either return the parsed value, having advanced
 * `state.pos` past the consumed input, or return the result of one of
 * `state.backtrack`, `state.cut`, `state.incomplete`, ... to signal failure.
+* A step that moves the cursor backwards (to retry, or after a lookahead)
+* calls `state.rewind(offset)` rather than assigning `state.pos`.
 *
 * @example
 * ```ts
@@ -460,7 +464,7 @@ const tryMap = /*#__PURE__*/ dual(2, (self, f) => {
 		if (a === Fail) return Fail;
 		const r = f(a);
 		if (Result.isSuccess(r)) return r.success;
-		state.pos = start;
+		state.rewind(start);
 		return state.failCause("Backtrack", "Verify", r.failure);
 	}, self.name, {
 		_tag: "TryMap",
@@ -499,7 +503,7 @@ const filterMap = /*#__PURE__*/ dual(2, (self, f) => {
 		if (a === Fail) return Fail;
 		const o = f(a);
 		if (Option.isSome(o)) return o.value;
-		state.pos = start;
+		state.rewind(start);
 		return state.backtrack("Verify");
 	}, self.name, {
 		_tag: "FilterMap",
@@ -521,7 +525,7 @@ const filter = /*#__PURE__*/ dual(2, (self, predicate) => {
 		const a = step(state);
 		if (a === Fail) return Fail;
 		if (predicate(a)) return a;
-		state.pos = start;
+		state.rewind(start);
 		return state.backtrack("Verify");
 	}, self.name, {
 		_tag: "Filter",
@@ -543,7 +547,7 @@ const filterOrFail = /*#__PURE__*/ dual(3, (self, predicate, orFailWith) => {
 		const a = step(state);
 		if (a === Fail) return Fail;
 		if (predicate(a)) return a;
-		state.pos = start;
+		state.rewind(start);
 		return state.failCause("Backtrack", "Verify", orFailWith(a));
 	}, self.name, {
 		_tag: "Filter",
@@ -698,7 +702,7 @@ const complete = (self) => {
 		const start = state.pos;
 		const a = step(state);
 		if (a === Fail && state.mode === "Incomplete") {
-			state.pos = start;
+			state.rewind(start);
 			return state.backtrack("Complete");
 		}
 		return a;
@@ -835,7 +839,7 @@ const orElseSucceed = /*#__PURE__*/ dual(2, (self, value) => {
 });
 /** Rewinds after a recoverable failure, remembering it as a hint. */
 const recover = (state, start) => {
-	state.pos = start;
+	state.rewind(start);
 	const f = state.failure;
 	if (f.offset === start) {
 		state.hintOffset = start;
@@ -893,7 +897,7 @@ const peek = (self) => {
 		const deepest = state.deepest;
 		const a = step(state);
 		if (a !== Fail) {
-			state.pos = start;
+			state.rewind(start);
 			state.hintOffset = hintOffset;
 			state.hintExpected = hintExpected;
 			state.deepest = deepest;
@@ -919,12 +923,12 @@ const not = (self) => {
 		const hintExpected = state.hintExpected;
 		const deepest = state.deepest;
 		if (step(state) !== Fail) {
-			state.pos = start;
+			state.rewind(start);
 			state.deepest = deepest;
 			return state.backtrack("Not");
 		}
 		if (state.mode !== "Backtrack") return Fail;
-		state.pos = start;
+		state.rewind(start);
 		state.hintOffset = hintOffset;
 		state.hintExpected = hintExpected;
 		state.deepest = deepest;
@@ -1230,17 +1234,39 @@ const alt = (...parsers) => {
 	return described((state) => {
 		const start = state.pos;
 		let failure;
+		let tie1;
+		let tie2;
 		for (let i = 0; i < n; i++) {
 			const a = steps[i](state);
 			if (a !== Fail) {
-				if (failure !== void 0 && failure.offset === state.pos) state.setHint(failure.offset, failure.expected);
+				if (failure !== void 0 && failure.offset === state.pos) {
+					let expected = failure.expected;
+					if (tie1 !== void 0) expected = mergeExpected(expected, tie1.expected);
+					if (tie2 !== void 0) expected = mergeExpected(expected, tie2.expected);
+					state.setHint(failure.offset, expected);
+				}
 				return a;
 			}
 			if (state.mode !== "Backtrack") return Fail;
-			failure = failure === void 0 ? state.failure : mergeFailures(failure, state.failure);
-			state.pos = start;
+			state.rewind(start);
+			const head = state.failureHead;
+			if (failure === void 0 || head.offset > failure.offset) {
+				failure = head;
+				tie1 = state.failureTie1;
+				tie2 = state.failureTie2;
+			} else if (head.offset === failure.offset) {
+				const f = state.failure;
+				if (tie1 === void 0) tie1 = f;
+				else if (tie2 === void 0) tie2 = f;
+				else {
+					failure = mergeTiedFailures(failure, tie1, mergeExpected(failure.expected, tie1.expected));
+					tie1 = tie2;
+					tie2 = f;
+				}
+			}
 		}
-		return state.failWith("Backtrack", failure ?? state.failure);
+		if (failure === void 0) return state.failWith("Backtrack", state.failure);
+		return tie1 === void 0 ? state.failWith("Backtrack", failure) : state.failTies(failure, tie1, tie2);
 	}, "alt", {
 		_tag: "Alt",
 		parsers
@@ -1289,7 +1315,7 @@ const dispatch = (selector, cases, otherwise) => {
 		if (key === Fail) return Fail;
 		const parser = choose(key);
 		if (parser === void 0) {
-			state.pos = start;
+			state.rewind(start);
 			return state.backtrack("Dispatch");
 		}
 		return parser.step(state);
@@ -1313,11 +1339,12 @@ const permutation = (...parsers) => {
 	const steps = parsers.map((p) => p.step);
 	const n = steps.length;
 	return make((state) => {
-		const out = new Array(n);
+		const ties = new TiedFailures();
 		const done = new Array(n).fill(false);
+		const out = new Array(n);
 		let remaining = n;
 		while (remaining > 0) {
-			let failure;
+			ties.clear();
 			let matched = false;
 			for (let i = 0; i < n; i++) {
 				if (done[i]) continue;
@@ -1331,10 +1358,10 @@ const permutation = (...parsers) => {
 					break;
 				}
 				if (state.mode !== "Backtrack") return Fail;
-				failure = failure === void 0 ? state.failure : mergeFailures(failure, state.failure);
-				state.pos = start;
+				state.rewind(start);
+				ties.add(state);
 			}
-			if (!matched) return state.failWith("Backtrack", failure ?? state.failure);
+			if (!matched) return ties.fail(state);
 		}
 		return out;
 	}, "permutation");
@@ -1357,7 +1384,7 @@ const foldImpl = (self, range, init, f, name, node, cond) => {
 	const [min, max] = normalizeRange(range);
 	const step = self.step;
 	const checkLoop = max === Infinity;
-	const key = {};
+	const key = new Key();
 	return described((state) => {
 		const entry = state.pos;
 		let acc;
@@ -1480,7 +1507,7 @@ const repeatTill = /*#__PURE__*/ dual(isTwoParserArgs, (self, end, range) => {
 				if (b !== Fail) return [acc, b];
 				if (state.mode !== "Backtrack") return Fail;
 				endFailure = state.failure;
-				state.pos = start;
+				state.rewind(start);
 				if (acc.length >= max) return Fail;
 			}
 			const a = step(state);
@@ -1519,7 +1546,7 @@ const separated = /*#__PURE__*/ dual(isTwoParserArgs, (self, separator, range) =
 	const step = self.step;
 	const sepStep = separator.step;
 	const checkLoop = max === Infinity;
-	const key = {};
+	const key = new Key();
 	return described((state) => {
 		const entry = state.pos;
 		let acc;
@@ -1562,7 +1589,7 @@ const separated = /*#__PURE__*/ dual(isTwoParserArgs, (self, separator, range) =
 					pos: start
 				});
 				if (state.mode !== "Backtrack" || acc.length < min) return Fail;
-				state.pos = start;
+				state.rewind(start);
 				return Resume.done(state, key, entry, resumed !== void 0, acc);
 			}
 			acc.push(a);
@@ -1599,7 +1626,7 @@ const separated = /*#__PURE__*/ dual(isTwoParserArgs, (self, separator, range) =
 const separatedFoldl1 = (self, separator, op) => {
 	const step = self.step;
 	const sepStep = separator.step;
-	const key = {};
+	const key = new Key();
 	return described((state) => {
 		const entry = state.pos;
 		const resumed = state.resume === void 0 ? void 0 : Resume.take(state, key, entry);
@@ -1629,7 +1656,7 @@ const separatedFoldl1 = (self, separator, op) => {
 			if (a === Fail) {
 				if (state.mode === "Incomplete" && state.resume !== void 0) saveFold(state, key, entry, acc, start);
 				if (state.mode !== "Backtrack") return Fail;
-				state.pos = start;
+				state.rewind(start);
 				return Resume.done(state, key, entry, resumed !== void 0, acc);
 			}
 			acc = op(acc, s, a);
@@ -1671,7 +1698,7 @@ const separatedFoldr1 = (self, separator, op) => {
 			const a = step(state);
 			if (a === Fail) {
 				if (state.mode !== "Backtrack") return Fail;
-				state.pos = start;
+				state.rewind(start);
 				break;
 			}
 			seps.push(s);
@@ -1783,7 +1810,7 @@ const resumeAfter = /*#__PURE__*/ dual(2, (self, recover) => {
 		if (state.recovered === void 0 || state.mode === "Incomplete") return Fail;
 		const failure = state.failure;
 		const mode = state.mode;
-		state.pos = start;
+		state.rewind(start);
 		if (recoverStep(state) === Fail) return state.failWith(mode, failure);
 		state.recovered.push(failure);
 		state.syntax?.skipped(start, failure, mode);
@@ -1815,7 +1842,7 @@ const retryAfter = /*#__PURE__*/ dual(2, (self, recover) => {
 			if (state.recovered === void 0 || state.mode === "Incomplete") return Fail;
 			const failure = state.failure;
 			const mode = state.mode;
-			state.pos = start;
+			state.rewind(start);
 			if (recoverStep(state) === Fail || state.pos === start) return state.failWith(mode, failure);
 			state.recovered.push(failure);
 			state.syntax?.skipped(start, failure, mode);
@@ -1886,7 +1913,7 @@ const preview = (state, offset) => {
 */
 const consoleTracer = (event) => {
 	const indent = "  ".repeat(event.depth);
-	if (event._tag === "Enter") console.log(`${indent}> ${event.name} @${event.offset} | ${preview(event.state, event.offset)}`);
+	if (Predicate.isTagged(event, "Enter")) console.log(`${indent}> ${event.name} @${event.offset} | ${preview(event.state, event.offset)}`);
 	else {
 		const consumed = (event.endOffset ?? event.offset) - event.offset;
 		console.log(`${indent}< ${event.name} | ${event.result === "Ok" ? `+${consumed}` : event.result}`);
@@ -2138,7 +2165,6 @@ const parseRecoverable = (self, input, options) => {
 		errors
 	};
 };
-//#endregion
 export { Do, TypeId, allConsuming, alt, as, asSome, asVoid, backtrack, bind, bindTo, complete, cond, consoleTracer, context, cut, delimited, described, dispatch, empty, eof, expected, fail, failMessage, filter, filterMap, filterOrFail, flatMap, fold, fromEntries, gen, isParser, let_ as let, location, make, map, mapError, mapParser, named, not, opt, optional, orElse, orElseSucceed, orFail, parse, parseEffect, parsePartial, parsePeek, parseRecoverable, parseSync, peek, permutation, preceded, provide, provideService, reject, repeat, repeatTill, resumeAfter, retryAfter, run, separated, separatedFoldl1, separatedFoldr1, separatedPair, seq, service, span, struct, succeed, suspend, sync, taken, tap, terminated, todo, trace, tryMap, tryMapUnknown, void_ as void, void_, withSpan, withTaken, zip, zipLeft, zipRight, zipWith };
 
 //# sourceMappingURL=Parser.js.map