parseman 0.60.5 → 0.61.0

package/src/table/program.ts

@@ -6,6 +6,7 @@ import { leadRanges } from '../lead-ranges.ts'
 import { choice } from '../combinators/choice.ts'
 import { many } from '../combinators/repeat.ts'
 import type { EmittedFactory, PoolPlan } from './emit-assembly.ts'
+import { PARSEMAN_VERSION } from '../version.ts'
 import { buildLexBodyRecognizer, type LexBodyRecognizer } from './lex-body.ts'
 import { buildLexProgramRunner, type LexProgramRunner } from './lex-program.ts'
 
@@ -328,7 +329,9 @@ export type CompactProgram = {
   readonly c: readonly number[]
   readonly k: readonly unknown[]
   readonly x: readonly string[]
-  readonly e: readonly (readonly string[])[]
+  /** Expected sets, as indices into `es`. */
+  readonly e: readonly (readonly number[])[]
+  readonly es: readonly string[]
   readonly d: readonly (readonly number[])[]
   readonly r: Readonly<Record<string, number>>
   readonly f: readonly unknown[]
@@ -351,8 +354,11 @@ export type CompactProgram = {
 
 export function expandCompact(p: TableProgram | CompactProgram): TableProgram {
   if ('code' in p) return p
+  // A table from before the token pool has no `es`. Refuse it here, at load, instead of
+  // failing on the first expected set read below.
+  if (p.es === undefined) throw new Error(`parseman: this parser was printed by an earlier parseman; reprint it with parseman ${PARSEMAN_VERSION}`)
   return ownTableProgram({
-    code: p.c, k: p.k, cc: p.x, fx: p.e, disp: p.d, rules: p.r, fns: p.f,
+    code: p.c, k: p.k, cc: p.x, fx: p.e.map(set => set.map(i => p.es[i]!)), disp: p.d, rules: p.r, fns: p.f,
     lines: p.l ?? 0, dsp: p.p ?? [],
     ...(p.lx === undefined ? {} : { lex: p.lx }),
     ...(p.lp === undefined ? {} : { lexPrograms: p.lp }),

package/src/table/site-labels.ts

@@ -62,7 +62,7 @@
 import {
   OP_ATTEMPT, OP_CHOICE, OP_DISPATCH, OP_EXPECT, OP_FIELD, OP_GATE, OP_LABEL, OP_LEAF, OP_LIT, OP_SOURCE_LEAF,
   OP_NODE, OP_NODE_TRACK, OP_NOT, OP_OPT, OP_PEEK, OP_REP, OP_REPV, OP_ROUTED, OP_RULE,
-  OP_SCAN, OP_SCOPE, OP_SCOPE_CAP, OP_SCOPE_PLAIN, OP_SEQ, OP_SEQV, OP_SEQX, OP_TOKEN, OP_XFORM,
+  OP_SCAN, OP_SCOPE, OP_SCOPE_CAP, OP_SCOPE_PLAIN, SCOPE_INHERIT, OP_SEQ, OP_SEQV, OP_SEQX, OP_TOKEN, OP_XFORM,
 } from './ops.ts'
 import { childSlots } from './child-slots.ts'
 import { leadRanges } from '../lead-ranges.ts'
@@ -206,7 +206,7 @@ function transfer(code: Int32Array, ip: number, at: SiteLabel, hostCst: boolean)
   const op = code[ip]
   if (op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN) {
     const ki = code[ip + 1]!
-    const tri = ki < 0 ? TRI_NONE : ki
+    const tri = ki === SCOPE_INHERIT ? at.tri : ki < 0 ? TRI_NONE : ki
     // `OP_SCOPE_CAP` is an OR with the inherited context, never a switch-off
     // (`encode.ts:1153-1158`), so it can only ever raise `cap` to `CAP_ON`.
     const cap = op === OP_SCOPE_CAP ? CAP_ON : at.cap
@@ -358,7 +358,7 @@ export function scanHandoffNeeded(code: Int32Array, ip: number, labels: SiteLabe
     const op = code[at]
     // A scan runs interpreted combinators that reach pieces through `prog.scans`.
     if (op === OP_SCAN) return true
-    if (op === OP_TOKEN || op === OP_SCOPE_CAP) continue
+    if (op === OP_TOKEN || (op === OP_SCOPE_CAP && code[at + 1] !== SCOPE_INHERIT)) continue
     if ((op === OP_SCOPE_PLAIN || op === OP_SCOPE) && !(code[at + 1]! >= 0 && l.tri === code[at + 1]!
       && (op === OP_SCOPE_PLAIN || code[at + 3]! === 0))) continue
     kids.length = 0

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.60.5'
+export const PARSEMAN_VERSION = '0.61.0'