parseman 0.48.0 → 0.49.0

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/types.ts

@@ -89,7 +89,7 @@ export type ParserDef =
   // it requires, so it carries `parser`'s first-set and a leading `peek()` gates
   // its choice arm (see `isPositiveLookahead` / `sequenceFirstSet`).
   | { tag: 'peek';    parser: Combinator<unknown> }
-  | { tag: 'node';     type?: string; parser: Combinator<unknown>; build?: ((children: ReadonlyArray<unknown>, fields: FieldMap | undefined, span: { start: number; end: number }, rawChildren: ReadonlyArray<unknown>, triviaLog: readonly number[], state: unknown) => unknown) | undefined; buildSrc?: string; /** The IDENTIFIER the type argument was written as at the `node()` call site, when it was a plain identifier rather than a literal — ANALYSIS ONLY, never emitted. Lets the inline-`mk` matcher recognise `node(t, …, (…) => mk(t, …))` from a factory, where the two `t`s are provably one binding. */ typeSrc?: string; /** Resolved source of a NAMED `buildSrc` — ANALYSIS ONLY, never emitted. See `buildAnalysisSrc`. */ buildSigSrc?: string; /** Declared positional arity of `build`: author-declared via `node(..., { buildArity })`, or resolved from the reducer's declaration. Wins over source inspection. */ buildArity?: number; /** Why arity could not be resolved, for the diagnostic. */ buildArityUnresolved?: string; buildStaticError?: readonly string[]; unwrap?: boolean; collapse?: boolean; project?: number; captureTrivia?: boolean; trailingTrivia?: boolean; tags?: readonly string[] }
+  | { tag: 'node';     type?: string; parser: Combinator<unknown>; build?: ((children: ReadonlyArray<unknown>, fields: FieldMap | undefined, span: { start: number; end: number }, rawChildren: ReadonlyArray<unknown>, triviaLog: readonly number[], state: unknown) => unknown) | undefined; buildSrc?: string; /** The IDENTIFIER the type argument was written as at the `node()` call site, when it was a plain identifier rather than a literal — ANALYSIS ONLY, never emitted. Lets the inline-`mk` matcher recognise `node(t, …, (…) => mk(t, …))` from a factory, where the two `t`s are provably one binding. */ typeSrc?: string; /** Resolved source of a NAMED `buildSrc` — ANALYSIS ONLY, never emitted. See `buildAnalysisSrc`. */ buildSigSrc?: string; /** Declared positional arity of `build`: author-declared via `node(..., { buildArity })`, or resolved from the reducer's declaration. Wins over source inspection. */ buildArity?: number; /** Why arity could not be resolved, for the diagnostic. */ buildArityUnresolved?: string; buildStaticError?: readonly string[]; /** Import provenance for a direct builder's free names — each `{ local, source, imported }` lets a downstream compose() re-emit `import { imported as local } from source` so the inlined builder source can bind. Carried through the IR round-trip. */ buildImports?: ReadonlyArray<{ local: string; source: string; imported: string }>; unwrap?: boolean; collapse?: boolean; project?: number; captureTrivia?: boolean; trailingTrivia?: boolean; tags?: readonly string[] }
   // `predSrc`/`extraSrc` (set by the macro evaluator): SOURCE TEXT of the guard
   // predicate / the withCtx `extra` value, so codegen inlines them into `_mf`
   // rather than pushing a `null` source. Absent under runtime compile() (the real

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.49.0'