parseman 0.55.1 → 0.55.3

package/dist/plugin/index.js

@@ -3585,14 +3585,8 @@ function choice(...args) {
           if (result.committed) return { ok: false, expected, span: { start: pos, end: pos }, committed: true };
           return { ok: false, expected, span: { start: pos, end: pos } };
         }
-        return {
-          ok: false,
-          expected: parsers.flatMap((p) => {
-            const r = p.parse(input, pos, ctx);
-            return r.ok ? [] : r.expected;
-          }),
-          span: { start: pos, end: pos }
-        };
+        if (ctx._probe !== void 0 || ctx._tolerant) for (const p of parsers) p.parse(input, pos, ctx);
+        return { ok: false, expected: [...scalarExpected], span: { start: pos, end: pos } };
       }
       if (strategy?.tag === "greedyClassify") {
         const superResult = parsers[strategy.superIndex].parse(input, pos, ctx);
@@ -5624,19 +5618,22 @@ function hasDirectBuildDef(p, seen = /* @__PURE__ */ new Set()) {
       return false;
   }
 }
-function mayCommitFailure(p, seen = /* @__PURE__ */ new Set(), resolve3) {
-  if (seen.has(p)) return false;
-  seen.add(p);
+function mayCommitFailure(p, resolve3, memo = /* @__PURE__ */ new Map()) {
+  return reachesMarked(p, (node2) => commitFailureSuccessors(node2, resolve3), memo);
+}
+var NO_EDGES = [];
+function commitFailureSuccessors(p, resolve3) {
   const d = p._def;
   switch (d.tag) {
     case "dispatch":
+    case "unknown":
       return true;
     case "choice":
     case "sequence":
-      return d.parsers.some((x) => mayCommitFailure(x, seen, resolve3));
+      return d.parsers;
     // A contained transaction reports every failure uncommitted.
     case "attempt":
-      return d.contain !== true && mayCommitFailure(d.parser, seen, resolve3);
+      return d.contain === true ? NO_EDGES : [d.parser];
     case "many":
     case "oneOrMore":
     case "optional":
@@ -5645,31 +5642,77 @@ function mayCommitFailure(p, seen = /* @__PURE__ */ new Set(), resolve3) {
     case "field":
     case "grammar":
     case "node":
-      return mayCommitFailure(d.parser, seen, resolve3);
-    case "sepBy":
-      return mayCommitFailure(d.parser, seen, resolve3) || mayCommitFailure(d.separator, seen, resolve3);
     case "token":
     case "leaf":
-      return mayCommitFailure(d.parser, seen, resolve3);
     case "withCtx":
-      return mayCommitFailure(d.parser, seen, resolve3);
+      return [d.parser];
+    case "sepBy":
+      return [d.parser, d.separator];
     case "scanTo":
-      return mayCommitFailure(d.sentinel, seen, resolve3) || d.skip.some((x) => mayCommitFailure(x, seen, resolve3)) || d.recoverAt !== void 0 && mayCommitFailure(d.recoverAt, seen, resolve3) || d.stopAt !== void 0 && mayCommitFailure(d.stopAt, seen, resolve3);
+      return [
+        d.sentinel,
+        ...d.skip,
+        ...d.recoverAt === void 0 ? NO_EDGES : [d.recoverAt],
+        ...d.stopAt === void 0 ? NO_EDGES : [d.stopAt]
+      ];
     case "lazy": {
       try {
-        return mayCommitFailure(d.thunk(), seen, resolve3);
+        return [d.thunk()];
       } catch {
         const name = p._ruleName;
         const target = name === void 0 ? void 0 : resolve3?.(name);
-        return target === void 0 ? true : mayCommitFailure(target, seen, resolve3);
+        return target === void 0 ? true : [target];
       }
     }
-    case "unknown":
-      return true;
     default:
-      return false;
+      return NO_EDGES;
   }
 }
+function reachesMarked(root, successors, memo) {
+  const known = memo.get(root);
+  if (known !== void 0) return known;
+  const order = /* @__PURE__ */ new Map();
+  const low = [];
+  const found = [];
+  const stack = [];
+  const visit = (node2) => {
+    const at = low.length;
+    order.set(node2, at);
+    low.push(at);
+    found.push(false);
+    stack.push(node2);
+    const next = successors(node2);
+    if (next === true) found[at] = true;
+    else {
+      for (const child of next) {
+        if (found[at]) break;
+        const hit = memo.get(child);
+        if (hit !== void 0) {
+          if (hit) found[at] = true;
+          continue;
+        }
+        const seen = order.get(child);
+        if (seen !== void 0) {
+          if (seen < low[at]) low[at] = seen;
+          continue;
+        }
+        const k = visit(child);
+        if (low[k] < low[at]) low[at] = low[k];
+        if (found[k]) found[at] = true;
+      }
+    }
+    if (low[at] === at) {
+      const answer = found[at];
+      let member;
+      do {
+        member = stack.pop();
+        memo.set(member, answer);
+      } while (member !== node2);
+    }
+    return at;
+  };
+  return found[visit(root)];
+}
 function hasSemanticReduction(roots, externalRefs) {
   const seen = /* @__PURE__ */ new Set();
   const visit = (parser2) => {
@@ -6865,6 +6908,13 @@ var Encoder = class {
    * attempt sites reach it.
    */
   sideWriterMemo = /* @__PURE__ */ new Map();
+  /**
+   * `mayCommitFailure`'s answers, shared by every choice site for the lifetime
+   * of this `Encoder` — exact for the graph and the `winners` resolver it is
+   * encoding, so the rule graph is walked once per encode rather than once per
+   * choice site.
+   */
+  commitFailureMemo = /* @__PURE__ */ new Map();
   labels = void 0;
   /** Trivia table in scope at the row being encoded — codegen's `ctx.activeTrivia`. */
   activeTrivia = void 0;
@@ -7305,62 +7355,11 @@ var Encoder = class {
   }
   /**
    * Whether a field, recovered error, interpreted scanner or unresolvable shape
-   * is reachable from `root` — the writer census of `failureNeedsRollback`.
-   *
-   * Reachability over a cyclic graph, decided with Tarjan's strongly connected
-   * components so that every node the walk enters leaves with its exact answer
-   * memoized: the members of one component reach each other, so they share one
-   * answer, settled when the walk returns to the component's first node. A DFS
-   * that instead cuts a cycle at its own ancestor path learns nothing it can
-   * keep about a node whose walk hit the cut, and re-walks that node along
-   * every path that reaches it — exponential over recursive value rules (linking
-   * jess's SCSS grammar cost ~290G instructions). This walk enters each node
-   * once per `Encoder`.
+   * is reachable from `root` — the writer census of `failureNeedsRollback`,
+   * entering each combinator once per `Encoder` (see `reachesMarked`).
    */
   reachesSideWriter(root) {
-    const memo = this.sideWriterMemo;
-    const known = memo.get(root);
-    if (known !== void 0) return known;
-    const order = /* @__PURE__ */ new Map();
-    const low = [];
-    const found = [];
-    const stack = [];
-    const visit = (node2) => {
-      const at = low.length;
-      order.set(node2, at);
-      low.push(at);
-      found.push(false);
-      stack.push(node2);
-      const next = this.sideWriterSuccessors(node2);
-      if (next === true) found[at] = true;
-      else {
-        for (const child of next) {
-          const hit = memo.get(child);
-          if (hit !== void 0) {
-            if (hit) found[at] = true;
-            continue;
-          }
-          const seen = order.get(child);
-          if (seen !== void 0) {
-            if (seen < low[at]) low[at] = seen;
-            continue;
-          }
-          const k = visit(child);
-          if (low[k] < low[at]) low[at] = low[k];
-          if (found[k]) found[at] = true;
-        }
-      }
-      if (low[at] === at) {
-        const answer = found[at];
-        let member;
-        do {
-          member = stack.pop();
-          memo.set(member, answer);
-        } while (member !== node2);
-      }
-      return at;
-    };
-    return found[visit(root)];
+    return reachesMarked(root, (node2) => this.sideWriterSuccessors(node2), this.sideWriterMemo);
   }
   /** The census's edges out of `node`, or `true` when `node` is itself a writer. */
   sideWriterSuccessors(node2) {
@@ -7715,7 +7714,7 @@ var Encoder = class {
           this.code[head + 4 + kids.length + i] = this.expected(deriveExpected(arms[i]));
         }
         this.choiceRollbackMasks.set(head, rollbackMask);
-        if (arms.every((arm) => !mayCommitFailure(arm, /* @__PURE__ */ new Set(), rr))) {
+        if (arms.every((arm) => !mayCommitFailure(arm, rr, this.commitFailureMemo))) {
           this.nonCommittingChoiceSites.add(head);
         }
         return head;
@@ -17352,7 +17351,7 @@ function fieldOptionsSrc(def) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.55.1";
+var PARSEMAN_VERSION = "0.55.3";
 
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {