parseman 0.50.7 → 0.51.1

package/src/table/assemble.ts

@@ -487,6 +487,8 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
   for (const s of prog.scans ?? []) {
     for (const r of s.skip) labelExtraIps.push(r[0])
     if (s.sentinel !== undefined) labelExtraIps.push(s.sentinel[0])
+    if (s.recoverAt !== undefined) labelExtraIps.push(s.recoverAt[0])
+    if (s.stopAt !== undefined) labelExtraIps.push(s.stopAt[0])
   }
   for (const set of prog.scanSkip ?? []) for (const r of set) labelExtraIps.push(r[0])
   const closureLabels = computeSiteLabels(
@@ -3659,6 +3661,8 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
     for (const s of prog.scans ?? []) {
       for (const r of s.skip) extraIps.push(r[0])
       if (s.sentinel !== undefined) extraIps.push(s.sentinel[0])
+      if (s.recoverAt !== undefined) extraIps.push(s.recoverAt[0])
+      if (s.stopAt !== undefined) extraIps.push(s.stopAt[0])
     }
     for (const set of prog.scanSkip ?? []) for (const r of set) extraIps.push(r[0])
     const roots = [...Object.values(prog.rules), ...extraIps]
@@ -3855,7 +3859,13 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
     const sentDef: ParserDef | undefined = typeof s.sent === 'string'
       ? { tag: 'literal', value: s.sent, caseInsensitive: false } as unknown as ParserDef
       : undefined
-    scansArr.push(scanTo(subtreeComb(s.sentinel!, sentDef), { skip, raw, orEOF: (s.flags & 2) !== 0 }) as Combinator<unknown>)
+    scansArr.push(scanTo(subtreeComb(s.sentinel!, sentDef), {
+      skip,
+      raw,
+      orEOF: (s.flags & 2) !== 0,
+      ...(s.recoverAt === undefined ? {} : { recoverAt: subtreeComb(s.recoverAt) }),
+      ...(s.stopAt === undefined ? {} : { stopAt: subtreeComb(s.stopAt) }),
+    }) as Combinator<unknown>)
   }
   const scans: readonly Combinator<unknown>[] = scansArr
 

package/src/table/emit.ts

@@ -104,6 +104,8 @@ function emitRef(r: import('./program.ts').SubtreeRef): string {
 function emitScanSpec(s: import('./program.ts').ScanSpec): string {
   const parts = [`kind:${s.kind}`, `flags:${s.flags}`, `skip:[${s.skip.map(emitRef).join(',')}]`]
   if (s.sentinel !== undefined) parts.push(`sentinel:${emitRef(s.sentinel)}`)
+  if (s.recoverAt !== undefined) parts.push(`recoverAt:${emitRef(s.recoverAt)}`)
+  if (s.stopAt !== undefined) parts.push(`stopAt:${emitRef(s.stopAt)}`)
   if (s.sent !== undefined) parts.push(`sent:${s.sent === null ? 'null' : jsString(s.sent)}`)
   if (s.open !== undefined) parts.push(`open:${jsString(s.open)}`)
   if (s.close !== undefined) parts.push(`close:${jsString(s.close)}`)
@@ -197,6 +199,8 @@ function emitAssemblies(prog: TableProgram, cfgs: readonly RunCfg[]): string[] {
   for (const s of prog.scans ?? []) {
     for (const r of s.skip) extraIps.push(r[0])
     if (s.sentinel !== undefined) extraIps.push(s.sentinel[0])
+    if (s.recoverAt !== undefined) extraIps.push(s.recoverAt[0])
+    if (s.stopAt !== undefined) extraIps.push(s.stopAt[0])
   }
   for (const set of prog.scanSkip ?? []) for (const r of set) extraIps.push(r[0])
 

package/src/table/encode.ts

@@ -1005,6 +1005,8 @@ class Encoder {
         flags: (d.raw ? 1 : 0) | (d.orEOF ? 2 : 0),
         skip: d.skip.map(c => this.subtree(c)),
         sentinel: this.subtree(d.sentinel),
+        ...(d.recoverAt === undefined ? {} : { recoverAt: this.subtree(d.recoverAt) }),
+        ...(d.stopAt === undefined ? {} : { stopAt: this.subtree(d.stopAt) }),
         sent: sentDef.tag === 'literal' ? sentDef.value : null,
       }))
     }
@@ -1764,6 +1766,8 @@ class Encoder {
     const refs: SubtreeRef[] = []
     for (const s of this.scans) {
       if (s.sentinel !== undefined) refs.push(s.sentinel)
+      if (s.recoverAt !== undefined) refs.push(s.recoverAt)
+      if (s.stopAt !== undefined) refs.push(s.stopAt)
       refs.push(...s.skip)
     }
     for (const set of this.scanSkipSets) refs.push(...set)
@@ -1784,6 +1788,8 @@ class Encoder {
       ...s,
       skip: s.skip.map(res),
       ...(s.sentinel === undefined ? {} : { sentinel: res(s.sentinel) }),
+      ...(s.recoverAt === undefined ? {} : { recoverAt: res(s.recoverAt) }),
+      ...(s.stopAt === undefined ? {} : { stopAt: res(s.stopAt) }),
     }))
     this.scanSkipSets = this.scanSkipSets.map(set => set.map(res))
   }

package/src/table/exec.ts

@@ -1666,7 +1666,13 @@ function makeDriver(
     const sentDef: ParserDef | undefined = typeof s.sent === 'string'
       ? { tag: 'literal', value: s.sent, caseInsensitive: false } as unknown as ParserDef
       : undefined
-    return scanTo(subtreeComb(s.sentinel!, sentDef), { skip, raw, orEOF: (s.flags & 2) !== 0 }) as Combinator<unknown>
+    return scanTo(subtreeComb(s.sentinel!, sentDef), {
+      skip,
+      raw,
+      orEOF: (s.flags & 2) !== 0,
+      ...(s.recoverAt === undefined ? {} : { recoverAt: subtreeComb(s.recoverAt) }),
+      ...(s.stopAt === undefined ? {} : { stopAt: subtreeComb(s.stopAt) }),
+    }) as Combinator<unknown>
   })
 
   const scanSkip: readonly (readonly Combinator<unknown>[])[] =

package/src/table/program.ts

@@ -251,6 +251,8 @@ export type ScanSpec = {
   readonly flags: number
   readonly skip: readonly SubtreeRef[]
   readonly sentinel?: SubtreeRef
+  readonly recoverAt?: SubtreeRef
+  readonly stopAt?: SubtreeRef
   readonly sent?: string | null
   readonly open?: string
   readonly close?: string

package/src/types.ts

@@ -107,7 +107,7 @@ export type ParserDef =
   // `scanSkip` are PREPENDED at parse/compile time (explicit skip EXTENDS the
   // ambient default). `raw`: hard opt-out — skip nothing ambiently, restoring the
   // pre-ambient raw byte-walk.
-  | { tag: 'scanTo';   sentinel: Combinator<unknown>; skip: Combinator<unknown>[]; raw: boolean; orEOF: boolean }
+  | { tag: 'scanTo';   sentinel: Combinator<unknown>; skip: Combinator<unknown>[]; raw: boolean; orEOF: boolean; recoverAt?: Combinator<unknown>; stopAt?: Combinator<unknown> }
   | { tag: 'keywords'; words: readonly string[]; caseInsensitive: boolean; boundary: string | undefined }
   | { tag: 'unknown' }
 

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.50.7'
+export const PARSEMAN_VERSION = '0.51.1'