parseman 0.48.0 → 0.48.1

package/dist/table/lex-program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lex-program.d.ts","sourceRoot":"","sources":["../../src/table/lex-program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAEjE;;0EAE0E;AAC1E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,CAAA;IACnF,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAClC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAElC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAOjE;AAsQD;2EAC2E;AAC3E,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,SAAS,iBAAiB,EAAE,EACtC,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,QAAQ,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GACvC,gBAAgB,CAyHlB"}
+{"version":3,"file":"lex-program.d.ts","sourceRoot":"","sources":["../../src/table/lex-program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAEjE;;0EAE0E;AAC1E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,CAAA;IACnF,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAClC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAA;AACnC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAElC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAOjE;AA+QD;2EAC2E;AAC3E,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,SAAS,iBAAiB,EAAE,EACtC,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,QAAQ,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GACvC,gBAAgB,CAyHlB"}

package/dist/table/ops.d.ts

@@ -29,10 +29,10 @@ export declare const OP_SEQV = 4;
  * `CHOICE d n fx c1 … cn` — `d` indexes a dispatch table (or −1 for ordered
  * try); `fx` indexes the choice's OWN expected set.
  *
- * Both shipped engines report the UNION of the arms' expectations when a choice
- * fails. The driver reported whatever the last attempted arm left behind — or,
- * on a dispatch miss with no arm claiming the lead character, NOTHING, so a user
- * got an error naming nothing at all.
+ * Ordered failure keeps the expected sets at the deepest arm offset, merging
+ * exact ties in source order. Exclusive dispatch propagates its sole selected
+ * arm. A pure dispatch miss uses `fx`, the static union of every arm opener, so
+ * the result never names nothing merely because no arm claimed the lead.
  */
 export declare const OP_CHOICE = 5;
 /**

package/dist/version.d.ts

@@ -13,5 +13,5 @@
  * Kept in sync with `package.json` by `test/unit/version-sync.test.ts`, which fails
  * the build if this constant drifts from the published version.
  */
-export declare const PARSEMAN_VERSION = "0.48.0";
+export declare const PARSEMAN_VERSION = "0.48.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parseman",
-  "version": "0.48.0",
+  "version": "0.48.1",
   "packageManager": "pnpm@10.15.1",
   "engines": {
     "node": "^20.19.0 || >=22.13.0"

package/src/combinators/choice.ts

@@ -85,6 +85,7 @@ export function choice<T extends [Combinator<unknown> | GatedArm<unknown>, ...(C
     },
     parse(input: string, pos: number, ctx: ParseContext): ParseResult<UnionArms<T>> {
       const expected: string[] = []
+      let expectedAt = pos
 
       // ── Disjoint: O(1) first-char dispatch (arms may be gated) ────────────
       //
@@ -164,7 +165,9 @@ export function choice<T extends [Combinator<unknown> | GatedArm<unknown>, ...(C
         const result = parsers[i]!.parse(input, pos, ctx)
         if (!result.ok) {
           rollbackTrivia(ctx, mark)
-          expected.push(...result.expected)
+          const at = result.span.start
+          if (at > expectedAt) { expectedAt = at; expected.length = 0 }
+          if (at === expectedAt) expected.push(...result.expected)
           if (result.committed) return { ok: false, expected, span: result.span, committed: true }
           continue
         }
@@ -175,6 +178,12 @@ export function choice<T extends [Combinator<unknown> | GatedArm<unknown>, ...(C
         }
         return result as ParseResult<UnionArms<T>>
       }
+      // A nested gated choice can decline every arm after an enclosing arm has
+      // already advanced. Do not let that empty dynamic set erase both the
+      // shallower arms and the choice's own static opener contract.
+      if (expected.length === 0) {
+        for (const parser of parsers) expected.push(...deriveExpected(parser))
+      }
       return { ok: false, expected, span: { start: pos, end: pos } }
     },
   }

package/src/table/assemble.ts

@@ -224,13 +224,13 @@ type MaskedChoiceBlock = (
   input: string, pos: number, ctx: ParseContext, bits: number,
   need: boolean, mRaw: number, mTl: number, mLv: number, mFl: number,
   mEr: number, mLog: number, mRoot: number,
-  acc: string[] | undefined, prev: number,
+  acc: string[] | undefined, prev: number, best: number,
 ) => unknown
 type GeneralChoiceBlock = (
   input: string, pos: number, ctx: ParseContext, c: number,
   need: boolean, mRaw: number, mTl: number, mLv: number, mFl: number,
   mEr: number, mLog: number, mRoot: number,
-  acc: string[] | undefined, prev: number,
+  acc: string[] | undefined, prev: number, best: number,
 ) => unknown
 type ExclusiveChoiceBlock = (arm: number, input: string, pos: number, ctx: ParseContext) => unknown
 type DispatchMatcher = (key: string) => boolean
@@ -1008,19 +1008,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
     return c._fc === true
   }
 
-  /**
-   * Accumulate one failed choice arm's expected set, in arm order.
-   *
-   * `choice.ts:167` is `expected.push(...result.expected)` per failed arm, and the
-   * accumulation — not the static union of the arms' OPENERS — is what a failing
-   * ordered choice reports. A left-factored or shared-prefix choice whose arms all
-   * failed PAST their common opener reported that opener alone: `['/::?/']` where
-   * the interpreter says `['"before"', '"hover"']`.
-   *
-   * Returns the accumulator so the common one-failing-arm case borrows the arm's
-   * own array (`slice` once) instead of building one per choice execution the way
-   * the interpreter's eager `const expected: string[] = []` does.
-   */
+  /** Append an exact-depth failed arm set in source order. Callers own depth ranking. */
   function accSet(ax: readonly string[] | undefined, acc: string[] | undefined): string[] | undefined {
     if (ax === undefined || ax.length === 0) return acc
     if (acc === undefined) return ax.slice()
@@ -1062,13 +1050,16 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
     total: number,
     choiceFx: string[],
   ): MaskedChoiceBlock {
-    return (input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev) => {
+    return (input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best) => {
       if ((bits & (1 << start)) !== 0) {
         ctx._fc = false
         const v = a0(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start, prev, acc); prev = start + 1
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start, prev, acc)
+        prev = start + 1
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
@@ -1076,8 +1067,11 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         ctx._fc = false
         const v = a1(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start + 1, prev, acc); prev = start + 2
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start + 1, prev, acc)
+        prev = start + 2
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
@@ -1085,8 +1079,11 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         ctx._fc = false
         const v = a2(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start + 2, prev, acc); prev = start + 3
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start + 2, prev, acc)
+        prev = start + 3
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
@@ -1094,15 +1091,18 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         ctx._fc = false
         const v = a3(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start + 3, prev, acc); prev = start + 4
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start + 3, prev, acc)
+        prev = start + 4
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
       if (next !== undefined) {
-        return next(input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev)
+        return next(input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best)
       }
-      acc = through(total, prev, acc)
+      if (best === pos) acc = through(total, prev, acc)
       ctx._fe = pos; ctx._fx = acc ?? choiceFx
       return FAIL
     }
@@ -1119,13 +1119,16 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
     total: number,
     choiceFx: string[],
   ): GeneralChoiceBlock {
-    return (input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev) => {
+    return (input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best) => {
       if (g0 === null || classHas(g0, c)) {
         ctx._fc = false
         const v = a0(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start, prev, acc); prev = start + 1
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start, prev, acc)
+        prev = start + 1
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
@@ -1133,8 +1136,11 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         ctx._fc = false
         const v = a1(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start + 1, prev, acc); prev = start + 2
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start + 1, prev, acc)
+        prev = start + 2
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
@@ -1142,8 +1148,11 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         ctx._fc = false
         const v = a2(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start + 2, prev, acc); prev = start + 3
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start + 2, prev, acc)
+        prev = start + 3
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
@@ -1151,15 +1160,18 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         ctx._fc = false
         const v = a3(input, pos, ctx)
         if (v !== FAIL) return v
-        acc = through(start + 3, prev, acc); prev = start + 4
-        acc = accSet(ctx._fx, acc)
+        if (best === pos) acc = through(start + 3, prev, acc)
+        prev = start + 4
+        const at = ctx._fe ?? pos
+        if (at > best) { best = at; acc = undefined }
+        if (at === best) acc = accSet(ctx._fx, acc)
         if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
       }
       if (next !== undefined) {
-        return next(input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev)
+        return next(input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best)
       }
-      acc = through(total, prev, acc)
+      if (best === pos) acc = through(total, prev, acc)
       ctx._fe = pos; ctx._fx = acc ?? choiceFx
       return FAIL
     }
@@ -2690,10 +2702,8 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               // THE CUT — a committed failure fails the whole choice.
               if (committed(ctx)) return FAIL
               // THE DISPATCHED ARM'S OWN SET IS THE ANSWER, at the choice's own
-              // position — the rule both shipped engines apply (choice.ts:105,
-              // codegen.ts:1985). `_fx` already holds it; reporting the arm is
-              // declining to overwrite it. See `exec.ts` for why this is NOT
-              // furthest-failure merging and what the residual JSON gap is.
+              // position. `_fx` already holds it; reporting the sole selected arm
+              // is declining to overwrite it.
               const armFx = ctx._fx
               if (armFx !== undefined && armFx.length > 0) { ctx._fe = pos; return FAIL }
             }
@@ -2739,6 +2749,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             const mLog = need ? ctx._triviaLog?.length ?? 0 : 0
             const mRoot = need ? ctx._rootTriviaLog?.length ?? 0 : 0
             let acc: string[] | undefined
+            let best = pos
             if (c < 128) {
               const bits = mask[c < 0 ? 128 : c]!
               let prev = 0
@@ -2747,7 +2758,9 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
                 const v = a0(input, pos, ctx)
                 if (v !== FAIL) return v
                 prev = 1
-                acc = accSet(ctx._fx, acc)
+                const at = ctx._fe ?? pos
+                if (at > best) { best = at; acc = undefined }
+                if (at === best) acc = accSet(ctx._fx, acc)
                 if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
               }
@@ -2755,9 +2768,11 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
                 ctx._fc = false
                 const v = a1(input, pos, ctx)
                 if (v !== FAIL) return v
-                if (prev < 1) acc = accSet(e0, acc)
+                if (best === pos && prev < 1) acc = accSet(e0, acc)
                 prev = 2
-                acc = accSet(ctx._fx, acc)
+                const at = ctx._fe ?? pos
+                if (at > best) { best = at; acc = undefined }
+                if (at === best) acc = accSet(ctx._fx, acc)
                 if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
               }
@@ -2765,16 +2780,18 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
                 ctx._fc = false
                 const v = a2!(input, pos, ctx)
                 if (v !== FAIL) return v
-                if (prev < 1) acc = accSet(e0, acc)
-                if (prev < 2) acc = accSet(e1, acc)
+                if (best === pos && prev < 1) acc = accSet(e0, acc)
+                if (best === pos && prev < 2) acc = accSet(e1, acc)
                 prev = 3
-                acc = accSet(ctx._fx, acc)
+                const at = ctx._fe ?? pos
+                if (at > best) { best = at; acc = undefined }
+                if (at === best) acc = accSet(ctx._fx, acc)
                 if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
               }
-              if (prev < 1) acc = accSet(e0, acc)
-              if (prev < 2) acc = accSet(e1, acc)
-              if (n === 3 && prev < 3) acc = accSet(e2, acc)
+              if (best === pos && prev < 1) acc = accSet(e0, acc)
+              if (best === pos && prev < 2) acc = accSet(e1, acc)
+              if (best === pos && n === 3 && prev < 3) acc = accSet(e2, acc)
               ctx._fe = pos; ctx._fx = acc ?? choiceFx
               return FAIL
             }
@@ -2783,27 +2800,33 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               ctx._fc = false
               const v = a0(input, pos, ctx)
               if (v !== FAIL) return v
-              acc = accSet(ctx._fx, acc)
+              const at = ctx._fe ?? pos
+              if (at > best) { best = at; acc = undefined }
+              if (at === best) acc = accSet(ctx._fx, acc)
               if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
               if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
-            } else acc = accSet(e0, acc)
+            } else if (best === pos) acc = accSet(e0, acc)
             if (g1 === null || classHas(g1, c)) {
               ctx._fc = false
               const v = a1(input, pos, ctx)
               if (v !== FAIL) return v
-              acc = accSet(ctx._fx, acc)
+              const at = ctx._fe ?? pos
+              if (at > best) { best = at; acc = undefined }
+              if (at === best) acc = accSet(ctx._fx, acc)
               if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
               if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
-            } else acc = accSet(e1, acc)
+            } else if (best === pos) acc = accSet(e1, acc)
             if (n === 3) {
               if (g2 === null || classHas(g2, c)) {
                 ctx._fc = false
                 const v = a2!(input, pos, ctx)
                 if (v !== FAIL) return v
-                acc = accSet(ctx._fx, acc)
+                const at = ctx._fe ?? pos
+                if (at > best) { best = at; acc = undefined }
+                if (at === best) acc = accSet(ctx._fx, acc)
                 if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
-              } else acc = accSet(e2, acc)
+              } else if (best === pos) acc = accSet(e2, acc)
             }
             ctx._fe = pos; ctx._fx = acc ?? choiceFx
             return FAIL
@@ -2869,11 +2892,11 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             if (c < 128) {
               return masked(
                 input, pos, ctx, mask[c < 0 ? 128 : c]!,
-                need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, undefined, 0,
+                need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, undefined, 0, pos,
               )
             }
             return general(
-              input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, undefined, 0,
+              input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, undefined, 0, pos,
             )
           }
         }
@@ -2889,7 +2912,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           const mLog = need ? ctx._triviaLog?.length ?? 0 : 0
           const mRoot = need ? ctx._rootTriviaLog?.length ?? 0 : 0
           return general(
-            input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, undefined, 0,
+            input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, undefined, 0, pos,
           )
         }
       }

package/src/table/emit-assembly.ts

@@ -1463,9 +1463,11 @@ return FAIL
 ctx._fc=false
 {const v=${arm}(input,pos,ctx)
 if(v!==FAIL)return v}
-acc=${catchName}(${i},prev,acc)
+if(best===pos)acc=${catchName}(${i},prev,acc)
 prev=${i + 1}
-acc=_accSet(ctx._fx,acc)
+{const at=ctx._fe??pos
+if(at>best){best=at;acc=undefined}
+if(at===best)acc=_accSet(ctx._fx,acc)}
 if(ctx._fc===true){if(acc!==undefined)ctx._fx=acc;return FAIL}
 ${emitRollback(p, L.buf, sinks)}
 }`
@@ -1474,20 +1476,23 @@ ${emitRollback(p, L.buf, sinks)}
 ctx._fc=false
 {const v=${arm}(input,pos,ctx)
 if(v!==FAIL)return v}
-acc=_accSet(ctx._fx,acc)
+{const at=ctx._fe??pos
+if(at>best){best=at;acc=undefined}
+if(at===best)acc=_accSet(ctx._fx,acc)}
 if(ctx._fc===true){if(acc!==undefined)ctx._fx=acc;return FAIL}
 ${emitRollback(p, L.buf, sinks)}
-}else acc=_accSet(${expected[i]},acc)`).join('\n')
+}else if(best===pos)acc=_accSet(${expected[i]},acc)`).join('\n')
 
           return `${head}
 const c=lead(input,pos)
 ${emitMark(p, L.buf, sinks)}
 let acc
+let best=pos
 ${maskable ? `if(c<128){
 const bits=${maskName}[c<0?128:c]
 let prev=0
 ${maskArms}
-acc=${catchName}(${n},prev,acc)
+if(best===pos)acc=${catchName}(${n},prev,acc)
 ctx._fe=pos;ctx._fx=acc??${choiceFx}
 return FAIL
 }

package/src/table/encode.ts

@@ -1078,20 +1078,16 @@ class Encoder {
           ? -1 : this.charClass(finalChoice.firstSets[i]!))
         const dispIdx = this.disp.length
         this.disp.push(classes)
-        // PER-ARM EXPECTED SETS RIDE ALONG, after the arm offsets. The ordered
-        // path reports the CONCATENATION of the arms' sets (`choice.ts:167`), and
-        // it must include the arms the driver's char gate declined to enter — the
-        // interpreter has no such gate, runs them, and gets exactly their static
-        // opener set back. Without these words a partially-gated site reported
-        // only the arms that happened to run.
+        // PER-ARM EXPECTED SETS RIDE ALONG, after the arm offsets. While the best
+        // failure remains at the choice position, an arm declined by the driver's
+        // char gate contributes the static opener set the interpreter would get by
+        // entering it. A deeper dynamic arm failure discards those shallower sets.
         const head = this.emitHead(OP_CHOICE, 3 + 2 * kids.length)
         this.code[head + 1] = dispIdx
         this.code[head + 2] = kids.length
         // THE CHOICE'S OWN SET IS THE ARMS' FLATMAP, NOT `deriveExpected(p)`.
-        // `deriveExpected` DEDUPES, and neither engine does: `choice.ts:110-118`
-        // is `parsers.flatMap(p => p.parse(...).expected)`, so a shared-prefix
-        // choice whose two arms both open with `/::?/` reports it TWICE. The
-        // deduped union silently collapsed that to one.
+        // It is the pure-dispatch-miss and empty-dynamic fallback, where source
+        // order and duplicates remain observable. `deriveExpected` would dedupe.
         this.code[head + 3] = this.expected(arms.flatMap(a => deriveExpected(a)))
         for (let i = 0; i < kids.length; i++) {
           this.code[head + 4 + i] = kids[i]!

package/src/table/exec.ts

@@ -952,9 +952,8 @@ function makeDriver(
         const d = code[ip + 1]!
         const base = ip + 4
         const choiceFx = fx[code[ip + 3]!] as string[]
-        // Report the union, at the choice's own position, on every exit that
-        // fails — matching both engines and, more importantly, never handing a
-        // user an empty expected set.
+        // A pure dispatch miss has no attempted arm to rank. Report the static
+        // opener union at the choice's own position so the result is meaningful.
         const failChoice = (): typeof FAIL => {
           ctx._fe = pos
           ctx._fx = choiceFx
@@ -1003,12 +1002,9 @@ function makeDriver(
           // union IS that flatMap's answer, without running seven parsers to
           // rediscover it.
           //
-          // NOT furthest-failure merging, which no engine on the `expected` path
-          // performs. `failAt` (combinators/probe.ts:13-24) and its compiled mirror
-          // `probeUpdate` (codegen.ts:692) are the only positional merges in the
-          // library, they are gated on `_ctx._probe` and they surface as
-          // `RunResult.furthestFail` under `{recover:true}` — a different field.
-          // Every `_fe`/`_fx` site in all three drivers is last-write-wins.
+          // There is only one selected arm on this path, so ordered-arm depth
+          // ranking does not apply. `furthestFail` under `{recover:true}` remains
+          // a separate probe result.
           //
           // A residual JSON divergence survives this and is NOT a failure-reporting
           // bug: on `{"a":]` this driver reports `["}"]` (the Obj arm's own
@@ -1034,18 +1030,15 @@ function makeDriver(
         const mEr = need ? ctx._errors?.length ?? 0 : 0
         const mLog = need ? ctx._triviaLog?.length ?? 0 : 0
         const mRoot = need ? ctx._rootTriviaLog?.length ?? 0 : 0
-        // THE ORDERED PATH REPORTS THE ARMS THAT ACTUALLY RAN, accumulated in
-        // order — `choice.ts:167`'s `expected.push(...result.expected)` per failed
-        // arm, reported at the choice's own position. The static `choiceFx` union
-        // is a set of OPENERS, so a left-factored or shared-prefix choice whose
-        // arms all failed PAST their common opener reported that opener instead of
-        // the tokens the arms were actually waiting for: `['/::?/']` where the
-        // interpreter says `['"before"', '"hover"']`.
+        // The ordered path keeps only arms at the deepest failure offset. Exact
+        // ties merge in source order. The final failure is still anchored at the
+        // choice's own position; the deeper offset ranks diagnostics only.
         //
         // `choiceFx` is still the answer when nothing ran or every arm reported
         // nothing — the char gate can skip arms the interpreter would have entered,
         // and the union is what those arms' start-failures would have contributed.
         let acc: string[] | undefined
+        let best = pos
         const push = (ax: readonly string[] | undefined): void => {
           if (ax === undefined || ax.length === 0) return
           if (acc === undefined) acc = ax.slice()
@@ -1060,7 +1053,7 @@ function makeDriver(
             // enters the arm, the arm's opener fails, and its static set is what
             // lands in the accumulation. Declining to enter must not also decline
             // to say what the arm wanted.
-            push(fx[code[armFx + i]!] as string[])
+            if (best === pos) push(fx[code[armFx + i]!] as string[])
             continue
           }
           ctx._fc = false
@@ -1069,7 +1062,9 @@ function makeDriver(
           const v = exec(code[base + i]!, input, pos, ctx)
           if (v !== FAIL) return v
           if (COUNT) { tableCounters.ungatedFails++; tableCounters.ungatedFailRows += tableCounters.rows - rows0 }
-          push(ctx._fx)
+          const at = ctx._fe ?? pos
+          if (at > best) { best = at; acc = undefined }
+          if (at === best) push(ctx._fx)
           // A committed arm cuts, and the interpreter reports the accumulation at
           // the arm's OWN span (`choice.ts:170`), not at the choice's position.
           if (committed(ctx)) { if (acc !== undefined) ctx._fx = acc; return FAIL }

package/src/table/lex-program.ts

@@ -150,7 +150,8 @@ function sequence5(
 }
 
 type ChoiceTail = (
-  input: string, pos: number, ctx: ParseContext, lead: number, acc: string[] | undefined,
+  input: string, pos: number, ctx: ParseContext, lead: number,
+  acc: string[] | undefined, best: number,
 ) => number
 
 function appendExpected(acc: string[] | undefined, values: readonly string[] | undefined): string[] | undefined {
@@ -181,24 +182,32 @@ function choiceNode(
   }
   for (let i = arms.length - 1; i >= 0; i--) {
     const arm = arms[i]!, cls = classes[i], staticExpected = armExpected[i]!, next = tail
-    tail = (input, pos, ctx, lead, acc) => {
+    tail = (input, pos, ctx, lead, acc, best) => {
       if (cls !== undefined && !classHas(cls, lead)) {
-        return next(input, pos, ctx, lead, appendExpected(acc, staticExpected))
+        return next(
+          input, pos, ctx, lead,
+          best === pos ? appendExpected(acc, staticExpected) : acc,
+          best,
+        )
       }
       ctx._fc = false
       const end = arm.run(input, pos, ctx)
       if (end >= 0) return end
-      const nextAcc = appendExpected(acc, ctx._fx)
+      const at = ctx._fe ?? pos
+      if (at > best) { best = at; acc = undefined }
+      const nextAcc = at === best ? appendExpected(acc, ctx._fx) : acc
       if (committed(ctx)) {
         if (nextAcc !== undefined) ctx._fx = nextAcc
         return -1
       }
-      return next(input, pos, ctx, lead, nextAcc)
+      return next(input, pos, ctx, lead, nextAcc, best)
     }
   }
   return {
     match: matchTail,
-    run: (input, pos, ctx) => tail(input, pos, ctx, pos < input.length ? input.codePointAt(pos)! : -1, undefined),
+    run: (input, pos, ctx) => tail(
+      input, pos, ctx, pos < input.length ? input.codePointAt(pos)! : -1, undefined, pos,
+    ),
   }
 }
 

package/src/table/ops.ts

@@ -30,10 +30,10 @@ export const OP_SEQV = 4
  * `CHOICE d n fx c1 … cn` — `d` indexes a dispatch table (or −1 for ordered
  * try); `fx` indexes the choice's OWN expected set.
  *
- * Both shipped engines report the UNION of the arms' expectations when a choice
- * fails. The driver reported whatever the last attempted arm left behind — or,
- * on a dispatch miss with no arm claiming the lead character, NOTHING, so a user
- * got an error naming nothing at all.
+ * Ordered failure keeps the expected sets at the deepest arm offset, merging
+ * exact ties in source order. Exclusive dispatch propagates its sole selected
+ * arm. A pure dispatch miss uses `fx`, the static union of every arm opener, so
+ * the result never names nothing merely because no arm claimed the lead.
  */
 export const OP_CHOICE = 5
 /**

package/src/version.ts

@@ -13,4 +13,4 @@
  * Kept in sync with `package.json` by `test/unit/version-sync.test.ts`, which fails
  * the build if this constant drifts from the published version.
  */
-export const PARSEMAN_VERSION = '0.48.0'
+export const PARSEMAN_VERSION = '0.48.1'