parseman 0.58.3 → 0.59.0

package/src/table/assemble.ts

@@ -83,6 +83,7 @@ import {
   demoteCapturedToRaw, pushCstChild, pushCstLeaf,
   type CstCaptureBuf,
 } from '../cst/capture-buffer.ts'
+import { PlainBuf, PlainField, PlainLeaf, PlainNode, PlainSpan } from '../cst/plain.js'
 import {
   OP_CHOICE, OP_EMPTY, OP_GATE, OP_LEAF, OP_SOURCE_LEAF, OP_LIT, OP_NODE, OP_NOT, OP_OPT,
   OP_PEEK, OP_REP, OP_REPV, OP_RULE, OP_RX, OP_SEQ, OP_SEQV, OP_XFORM,
@@ -197,7 +198,6 @@ function linkMatcher(m: readonly [number, string, string, number]): (key: string
   }
 }
 
-type Leaf = { _tag: 'leaf'; value: string; span: { start: number; end: number } }
 
 /**
  * The `COV` slot's value when a parse installs no collector. ONE shared function
@@ -542,7 +542,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
   const CLEAN = REC ? (): boolean => false : failCleanAnalysis(code)
 
   function pushLeaf(ctx: ParseContext, value: string, s: number, e: number): void {
-    const lf: Leaf = { _tag: 'leaf', value, span: { start: s, end: e } }
+    const lf = new PlainLeaf(value, new PlainSpan(s, e))
     pushCstLeaf(ctx, lf)
   }
 
@@ -592,7 +592,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
       ctx.captureTrivia = sCap
       if (value === FAIL) return FAIL
       const end = EC.e
-      const span = { start: pos, end }
+      const span = new PlainSpan(pos, end)
       const node = build(kids, undefined, span, rawKids, EMPTY_TL, undefined)
       if (sBuf !== undefined || sCh !== undefined) {
         pushCstChild(ctx, node, rawEntry(node, input, pos, end))
@@ -646,7 +646,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
       ctx.captureTrivia = sCap
       if (value === FAIL) return FAIL
       const end = EC.e
-      const node = build(captured, undefined, { start: pos, end }, EMPTY_CH, EMPTY_TL, undefined)
+      const node = build(captured, undefined, new PlainSpan(pos, end), EMPTY_CH, EMPTY_TL, undefined)
       if (sBuf !== undefined || sCh !== undefined) {
         pushCstChild(ctx, node, sBuf !== undefined || sRaw !== undefined ? rawEntry(node, input, pos, end) : undefined)
       }
@@ -684,7 +684,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
       ctx.captureTrivia = sCap
       if (value === FAIL) return FAIL
       const end = EC.e
-      const node = build(captured, fieldMap, { start: pos, end }, EMPTY_CH, EMPTY_TL, undefined)
+      const node = build(captured, fieldMap, new PlainSpan(pos, end), EMPTY_CH, EMPTY_TL, undefined)
       if (sBuf !== undefined || sCh !== undefined) {
         pushCstChild(ctx, node, sBuf !== undefined || sRaw !== undefined ? rawEntry(node, input, pos, end) : undefined)
       }
@@ -722,7 +722,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
       ctx.captureTrivia = sCap
       if (value === FAIL) return FAIL
       const end = EC.e
-      const span = { start: pos, end }
+      const span = new PlainSpan(pos, end)
       const node = kids.length === 1
         ? kids[0]
         : build(kids, undefined, span, rawKids, EMPTY_TL, undefined)
@@ -764,7 +764,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
       const end = EC.e
       const node = captured.length === 1
         ? captured[0]
-        : build(captured, undefined, { start: pos, end }, EMPTY_CH, EMPTY_TL, undefined)
+        : build(captured, undefined, new PlainSpan(pos, end), EMPTY_CH, EMPTY_TL, undefined)
       if (sBuf !== undefined || sCh !== undefined) {
         pushCstChild(ctx, node, sBuf !== undefined || sRaw !== undefined ? rawEntry(node, input, pos, end) : undefined)
       }
@@ -1380,7 +1380,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
     return (input, pos, selEnd, key, ctx, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot) => {
       const savedRouted = ctx._routed
       if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot)
-      ctx._routed = { value: key, span: { start: pos, end: selEnd } }
+      ctx._routed = { value: key, span: new PlainSpan(pos, selEnd) }
       let v: unknown
       try {
         v = child(input, pos, ctx)
@@ -1912,7 +1912,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         // table engines. Do not use the incoming ctx bit: a grammar scope can
         // declare tracking even when the outer run context begins untracked.
         const expectSpan = (ctx: ParseContext, pos: number) =>
-          prog.lines === 1 ? spanLines(ctx, pos, pos) : { start: pos, end: pos }
+          prog.lines === 1 ? spanLines(ctx, pos, pos) : new PlainSpan(pos, pos)
         // TOLERANT `expect()` EMBEDS ITS ERROR IN THE TREE, not only in the flat
         // `_errors` side-channel (`combinators/expect.ts:150`, and codegen's
         // `_ctx._rec.capture` at codegen.ts:4470) — so a tree walk finds every
@@ -1959,7 +1959,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           return (input, pos, ctx) => {
             const v = child(input, pos, ctx)
             if (v === FAIL) return FAIL
-            ctx._fields?.push({ name, value: v, span: { start: pos, end: EC.e } })
+            ctx._fields?.push(new PlainField(name, v, new PlainSpan(pos, EC.e)))
             return v
           }
         }
@@ -1984,7 +1984,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         return (input, pos, ctx) => {
           const v = child(input, pos, ctx)
           if (v === FAIL) return FAIL
-          return fn(v, { start: pos, end: EC.e })
+          return fn(v, new PlainSpan(pos, EC.e))
         }
       }
 
@@ -2107,7 +2107,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             ctx._fe = pos; ctx._fx = ROUTED_FX
             return FAIL
           }
-          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: 'leaf', value: item.value, span: item.span })
+          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf(item.value, item.span))
           EC.e = item.span.end
           return item.value
         }
@@ -2295,7 +2295,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           if (v === FAIL) return FAIL
           const end = EC.e
           const value = input.slice(pos, end)
-          if (wasCapturing) pushCstLeaf(ctx, { _tag: 'leaf', value, span: { start: pos, end } })
+          if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf(value, new PlainSpan(pos, end)))
           EC.e = end
           return value
         }
@@ -2330,7 +2330,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             if (ctx._probe !== undefined) failAt(ctx, suffixExpected, end)
           }
           const value = input.slice(pos, end)
-          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: 'leaf', value, span: { start: pos, end } })
+          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf(value, new PlainSpan(pos, end)))
           EC.e = end
           return value
         }
@@ -2373,7 +2373,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             }
             if (end < 0) return FAIL
             const value = input.slice(pos, end)
-            if (wasCapturing) pushCstLeaf(ctx, { _tag: 'leaf', value, span: { start: pos, end } })
+            if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf(value, new PlainSpan(pos, end)))
             EC.e = end
             return value
           }
@@ -2382,7 +2382,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           const end = run(input, pos, ctx)
           if (end < 0) return FAIL
           const value = input.slice(pos, end)
-          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: 'leaf', value, span: { start: pos, end } })
+          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf(value, new PlainSpan(pos, end)))
           EC.e = end
           return value
         }
@@ -2418,12 +2418,8 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           }
           if (v === FAIL) return FAIL
           const end = EC.e
-          const out = fn(v, { start: pos, end })
-          if (wasCapturing) pushCstLeaf(ctx, {
-            _tag: 'leaf',
-            value: op === OP_SOURCE_LEAF && hostCst ? input.slice(pos, end) : out,
-            span: { start: pos, end },
-          })
+          const out = fn(v, new PlainSpan(pos, end))
+          if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf(op === OP_SOURCE_LEAF && hostCst ? input.slice(pos, end) : out, new PlainSpan(pos, end)))
           EC.e = end
           return out
         }
@@ -2605,7 +2601,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               const cur = runSyncTerms(input, pos, ctx, values)
               if (cur < 0) return FAIL
               EC.e = cur
-              return projection >= 0 ? values[projection] : fn!(values, { start: pos, end: cur })
+              return projection >= 0 ? values[projection] : fn!(values, new PlainSpan(pos, cur))
             }
           }
           if (wantValues) {
@@ -2700,7 +2696,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               const cur = runAdjTerms(input, pos, ctx, values)
               if (cur < 0) return FAIL
               EC.e = cur
-              return projection >= 0 ? values[projection] : fn!(values, { start: pos, end: cur })
+              return projection >= 0 ? values[projection] : fn!(values, new PlainSpan(pos, cur))
             }
           }
           if (wantValues) {
@@ -2743,7 +2739,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             return (input, pos, ctx) => {
               const v = k0(input, pos, ctx)
               if (v === FAIL) return FAIL
-              return projection === 0 ? v : fn!([v], { start: pos, end: EC.e })
+              return projection === 0 ? v : fn!([v], new PlainSpan(pos, EC.e))
             }
           }
           if (wantValues) {
@@ -2771,7 +2767,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               EC.e = cur
               return projection === 0 ? v0
                 : projection === 1 ? TERMV
-                : fn!([v0, TERMV], { start: pos, end: cur })
+                : fn!([v0, TERMV], new PlainSpan(pos, cur))
             }
           }
           if (wantValues) {
@@ -2809,7 +2805,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               return projection === 0 ? v0
                 : projection === 1 ? v1
                 : projection === 2 ? TERMV
-                : fn!([v0, v1, TERMV], { start: pos, end: cur })
+                : fn!([v0, v1, TERMV], new PlainSpan(pos, cur))
             }
           }
           if (wantValues) {
@@ -2914,7 +2910,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
             const cur = runDirectTerms(input, pos, ctx, values)
             if (cur < 0) return FAIL
             EC.e = cur
-            return projection >= 0 ? values[projection] : fn!(values, { start: pos, end: cur })
+            return projection >= 0 ? values[projection] : fn!(values, new PlainSpan(pos, cur))
           }
         }
         if (wantValues) {
@@ -3781,10 +3777,10 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
               return FAIL
             }
             const value = regexValue ? input.slice(pos, end) : spec as string
-            const leaf = { _tag: 'leaf', value, span: { start: pos, end } }
+            const leaf = new PlainLeaf(value, new PlainSpan(pos, end))
             const kids = [leaf]
             const rawKids = [leaf]
-            const span = { start: pos, end }
+            const span = new PlainSpan(pos, end)
             EC.e = end
             const nd = build(kids, undefined, span, rawKids, EMPTY_TL, undefined)
             if (ctx._cstBuf !== undefined || ctx._cstChildren !== undefined) {
@@ -3897,8 +3893,8 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           const sCap = ctx.captureTrivia
           const sBuf = ctx._cstBuf
           const buf: CstCaptureBuf = rawOnly
-            ? { rawOnly: true }
-            : omitsRaw ? { noRaw: true, rawLen: 0 } : {}
+            ? new PlainBuf(true, undefined, 0)
+            : omitsRaw ? new PlainBuf(undefined, true, 0) : new PlainBuf(undefined, undefined, 0)
           ctx._cstBuf = buf
           // `begin` sets this true and the caller immediately cleared it when the
           // node does not capture wide. Net: the flag IS `captureWide`, a const.
@@ -3929,7 +3925,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           ctx.captureTrivia = sCap
           if (v === FAIL) return FAIL
           const end = EC.e
-          const span = tracked ? spanLines(ctx, pos, end) : { start: pos, end }
+          const span = tracked ? spanLines(ctx, pos, end) : new PlainSpan(pos, end)
           const st = readsState ? ctx.state : undefined
 
           let nd: unknown
@@ -3962,7 +3958,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           } else if (host !== undefined) {
             nd = host(type, hostKids, fieldMap, span, rawKids, tlog, st, tags)
           } else {
-            nd = { _tag: 'node', type, span, state: st ?? null, children: kids }
+            nd = new PlainNode(type, span, st ?? null, kids === EMPTY_CH ? kids : [...kids])
           }
           // A ROOT NODE IS NOT A CHILD. `node()` pushes only when it was entered
           // from an enclosing collector — `saved.buf !== undefined || saved.ch !==
@@ -4003,7 +3999,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
           const at = fe === undefined || fe < 0 ? pos : fe
           return { ok: false, expected: (ctx._fx ?? EMPTY_FX) as string[], span: { start: at, end: at } }
         }
-        return { ok: true, value: v, span: { start: pos, end: EC.e } }
+        return { ok: true, value: v, span: new PlainSpan(pos, EC.e) }
       },
     }
   }
@@ -4119,6 +4115,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         scalarRecognizers, commitTriviaScan, scanTriviaCompact, t.lex, adjacencyHolds, t.lexPrograms,
         LEAD, triviaFieldCapture, skipDeferredTrivia,
         collapseEmpty,
+        PlainSpan, PlainLeaf, PlainNode, PlainField, PlainBuf,
       )
       emitReached = new Set(pre.reached)
       if (emitted.ext !== undefined) HYBRID = emitted
@@ -4203,6 +4200,7 @@ export function assemble(t: ResolvedTable, prog: TableProgram, cfg: RunCfg): Ass
         scalarRecognizers, commitTriviaScan, scanTriviaCompact, t.lex, adjacencyHolds, t.lexPrograms,
         LEAD, triviaFieldCapture, skipDeferredTrivia,
         collapseEmpty,
+        PlainSpan, PlainLeaf, PlainNode, PlainField, PlainBuf,
       )
       emitReached = em.reached
     } catch (e) {

package/src/table/emit-assembly.ts

@@ -142,6 +142,9 @@ export const EMITTED_PARAMS = [
   // Appended for the pass-through collapse (`run-support.ts`); old factories
   // ignore it.
   'collapseEmpty',
+  // Appended for constructor-built tree objects (`cst/plain.d.ts`): a `new` call has
+  // no allocation site, so V8 cannot pretenure them. Old factories ignore them.
+  '_SP', '_LF', '_ND', '_FC', '_BUF',
 ] as const
 
 /**
@@ -180,9 +183,9 @@ if(s!==null)return skipTriviaScanned(s,input,cur,ctx)
 if(needsDeferredTriviaCommit(ctx))return skipDeferredTrivia(input,cur,ctx)
 return advanceTrivia(input,cur,ctx)
 }
-function _pushLeaf(ctx,value,s,e){pushCstLeaf(ctx,{_tag:'leaf',value,span:{start:s,end:e}})}
+function _pushLeaf(ctx,value,s,e){pushCstLeaf(ctx,new _LF(value,new _SP(s,e)))}
 function _pushLeafBuf(ctx,value,s,e){
-const l={_tag:'leaf',value,span:{start:s,end:e}}
+const l=new _LF(value,new _SP(s,e))
 const b=ctx._cstBuf
 if(b.ch!==undefined)b.ch.push(l)
 else if(b.single!==undefined){b.ch=[b.single,l];b.single=undefined}
@@ -242,7 +245,7 @@ if(ctx._rootTriviaLog!==undefined&&ctx._rootTriviaLog.length!==rt)ctx._rootTrivi
 /** Printed only into assemblies that open a count-only raw buffer. */
 const NO_RAW_RUNTIME_PRELUDE = `
 function _pushLeafNoRawBuf(ctx,value,s,e){
-const l={_tag:'leaf',value,span:{start:s,end:e}}
+const l=new _LF(value,new _SP(s,e))
 const b=ctx._cstBuf
 if(b.ch!==undefined)b.ch.push(l)
 else if(b.single!==undefined){b.ch=[b.single,l];b.single=undefined}
@@ -1431,7 +1434,7 @@ try{return ${child}(input,pos,ctx)}finally{ctx.state=saved}
         return `${head}
 const v=${child}(input,pos,ctx)
 if(v===FAIL)return FAIL
-return ${fn}(v,{start:pos,end:EC.e})
+return ${fn}(v,new _SP(pos,EC.e))
 }`
       }
 
@@ -1461,7 +1464,7 @@ return v
 const v=${child}(input,pos,ctx)
 if(v===FAIL)return FAIL
 const f=ctx._fields
-if(f!==undefined)f.push({name:${name},value:v,span:{start:pos,end:EC.e}})
+if(f!==undefined)f.push(new _FC(${name},v,new _SP(pos,EC.e)))
 return v
 }`
         }
@@ -1497,7 +1500,7 @@ return v
         return `${head}
 const v=${child}(input,pos,ctx)
 if(v!==FAIL)return v
-const err={_tag:'parseError',span:${prog.lines === 1 ? 'spanLines(ctx,pos,pos)' : '{start:pos,end:pos}'},expected:${xf}}
+const err={_tag:'parseError',span:${prog.lines === 1 ? 'spanLines(ctx,pos,pos)' : 'new _SP(pos,pos)'},expected:${xf}}
 const es=ctx._errors
 if(es!==undefined)es.push(err)
 ${REC ? 'if(ctx._tolerant===true)captureError(ctx,err)\n' : ''}ctx._fc=false
@@ -1512,7 +1515,7 @@ return err
         // The SPAN is the routed item's own object, not a copy — `assemble.ts`
         // hands the same one to the leaf, and a fresh `{start,end}` here would
         // be a different tree for any consumer comparing by identity.
-        const push = `pushCstLeaf(ctx,{_tag:'leaf',value:it.value,span:it.span})`
+        const push = `pushCstLeaf(ctx,new _LF(it.value,it.span))`
         return `${head}
 const it=ctx._routed
 if(it===undefined||pos!==it.span.start){
@@ -1621,8 +1624,8 @@ ctx._triviaLog=sOtl
 }
 if(v===FAIL)return FAIL
 const e=EC.e
-const out=${isToken ? 'input.slice(pos,e)' : `${fn}(v,{start:pos,end:e})`}
-if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:${capturesSource ? 'input.slice(pos,e)' : 'out'},span:{start:pos,end:e}})
+const out=${isToken ? 'input.slice(pos,e)' : `${fn}(v,new _SP(pos,e))`}
+if(wasCap)pushCstLeaf(ctx,new _LF(${capturesSource ? 'input.slice(pos,e)' : 'out'},new _SP(pos,e)))
 EC.e=e
 return out
 }`
@@ -1647,7 +1650,7 @@ ${hasSuffix && (lineFlags & 2) !== 0 ? 'if(sm)_trackLines(ctx,input,e)' : ''}
 ${hasSuffix ? `if(!sm){ctx._fe=e;ctx._fx=${suffixExpected};if(ctx._probe!==undefined)failAt(ctx,${suffixExpected},e)}` : ''}
 const v=${pending ? 'tp?_pfTokValue:' : ''}input.slice(pos,e)
 ${pending ? 'if(tp){_pfTokBody=-1;_pfTokValue=undefined}' : ''}
-if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,{_tag:'leaf',value:v,span:{start:pos,end:e}})
+if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,new _LF(v,new _SP(pos,e)))
 EC.e=e
 return v
 }`
@@ -1687,7 +1690,7 @@ ctx._rootTriviaLog=sRtl
 }
 if(e<0)return FAIL
 const v=input.slice(pos,e)
-if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:v,span:{start:pos,end:e}})
+if(wasCap)pushCstLeaf(ctx,new _LF(v,new _SP(pos,e)))
 EC.e=e
 return v
 }`
@@ -1695,7 +1698,7 @@ return v
 const e=${run}(input,pos,ctx)
 if(e<0)return FAIL
 const v=input.slice(pos,e)
-if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,{_tag:'leaf',value:v,span:{start:pos,end:e}})
+if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,new _LF(v,new _SP(pos,e)))
 EC.e=e
 return v
 }`
@@ -1837,7 +1840,7 @@ return v
         const close = (): string => REC ? `${parts.join('\n')}\n}finally{ctx._sync=${sy}}\n}` : `${parts.join('\n')}\n}`
         if (n === 1) {
           parts.push(fused
-            ? projection === 0 ? 'return v0' : `return ${fn}([v0],{start:pos,end:EC.e})`
+            ? projection === 0 ? 'return v0' : `return ${fn}([v0],new _SP(pos,EC.e))`
             : wantValues ? 'return [v0]' : 'return undefined')
           return close()
         }
@@ -1870,7 +1873,7 @@ return v
         }
         parts.push('EC.e=cur')
         parts.push(fused
-          ? projection >= 0 ? `return ${names[projection]}` : `return ${fn}([${names.join(',')}],{start:pos,end:cur})`
+          ? projection >= 0 ? `return ${names[projection]}` : `return ${fn}([${names.join(',')}],new _SP(pos,cur))`
           : wantValues ? `return [${names.join(',')}]` : 'return undefined')
         return close()
       }
@@ -2210,7 +2213,7 @@ return FAIL
         const routedCall = (target: string): string => `{const savedRouted=ctx._routed
 ${emitRollback(m1, L.buf, L.raw, sinks)}
 ${emitMark(m2, L.buf, L.raw, sinks, false)}
-ctx._routed={value:key,span:{start:pos,end:selEnd}}
+ctx._routed={value:key,span:new _SP(pos,selEnd)}
 try{v=${target}(input,pos,ctx)}finally{ctx._routed=savedRouted}
 break}`
         const plainCall = (target: string): string => `v=${target}(input,selEnd,ctx);break`
@@ -2479,8 +2482,8 @@ return out
 const end=${recognize}(input,pos)
 if(end<0){ctx._fe=pos;ctx._fx=${xf};return FAIL}
 const value=${value}
-const leaf={_tag:'leaf',value,span:{start:pos,end}}
-const kids=[leaf],rawKids=[leaf],span={start:pos,end}
+const leaf=new _LF(value,new _SP(pos,end))
+const kids=[leaf],rawKids=[leaf],span=new _SP(pos,end)
 EC.e=end
 const nd=${build}(kids,undefined,span,rawKids,EMPTY_TL,undefined)
 ${L.buf && L.raw === RAW_OMIT
@@ -2608,8 +2611,8 @@ ctx.captureTrivia=sCap
 if(v===FAIL)return FAIL
 const end=EC.e
 ${collapseChildren
-    ? `const nd=captured.length===1?captured[0]:${build}(captured,undefined,{start:pos,end},EMPTY_CH,EMPTY_TL,undefined)`
-    : `const nd=${build}(captured,${fields ? 'fieldMap' : 'undefined'},{start:pos,end},EMPTY_CH,EMPTY_TL,undefined)`}
+    ? `const nd=captured.length===1?captured[0]:${build}(captured,undefined,new _SP(pos,end),EMPTY_CH,EMPTY_TL,undefined)`
+    : `const nd=${build}(captured,${fields ? 'fieldMap' : 'undefined'},new _SP(pos,end),EMPTY_CH,EMPTY_TL,undefined)`}
 ${publish}
 EC.e=end
 return nd
@@ -2639,26 +2642,26 @@ return nd
           const direct = `${build}(kids,fieldMap,span,rawKids,${captureWide ? 'tlog' : 'EMPTY_TL'},st)`
           value = hostCst ? `nd=_pfHost!==undefined?${hostCall}:${direct}` : `nd=${direct}`
         } else {
-          value = `nd=_pfHost!==undefined?_pfHost(${ty},hostKids,fieldMap,span,rawKids,tlog,st,${tags}):{_tag:'node',type:${ty},span,state:st??null,children:kids}`
+          value = `nd=_pfHost!==undefined?_pfHost(${ty},hostKids,fieldMap,span,rawKids,tlog,st,${tags}):new _ND(${ty},span,st??null,kids===EMPTY_CH?kids:[...kids])`
         }
         // HOST COLLAPSE applies wherever the node's VALUE comes from the host —
         // any node under a CST host, not only the builder-less ones.
         const collapsible = keepChildren && (hostCst || (build === undefined && proj < 0))
         const openCapture = omitsRaw
-          ? `const buf={noRaw:true,rawLen:0}
+          ? `const buf=new _BUF(undefined,true,0)
 ctx._cstBuf=buf
 ctx._cstChildren=undefined
 ctx._cstLeaves=undefined
 ctx._cstRawChildren=undefined
 ctx._cstTriviaLog=undefined`
           : keepChildren
-          ? `const buf={}
+          ? `const buf=new _BUF(undefined,undefined,0)
 ctx._cstBuf=buf
 ctx._cstChildren=undefined
 ctx._cstLeaves=undefined
 ctx._cstRawChildren=undefined
 ctx._cstTriviaLog=undefined`
-          : `const buf={rawOnly:true}
+          : `const buf=new _BUF(true,undefined,0)
 ctx._cstBuf=buf
 ctx._cstChildren=undefined
 ctx._cstLeaves=undefined
@@ -2701,7 +2704,7 @@ ctx._cstTriviaLog=sTl
 ctx.captureTrivia=sCap
 if(v===FAIL)return FAIL
 const end=EC.e
-const span=${tracked ? 'spanLines(ctx,pos,end)' : '{start:pos,end}'}
+const span=${tracked ? 'spanLines(ctx,pos,end)' : 'new _SP(pos,end)'}
 const st=${readsState ? 'ctx.state' : 'undefined'}
 let nd
 ${unwrap ? 'if(kids.length===1)nd=unwrapChild(kids[0])\nelse ' : ''}${collapse ? 'if(kids.length===1)nd=kids[0]\nelse ' : ''}${collapsible ? `if(_pfHost!==undefined&&_pfHost._parsemanCstCollapse!==undefined&&kids.length===1&&rawKids.length===1&&_pfHost._parsemanCstCollapse(${ty},kids[0],kids,rawKids))nd=kids[0]

package/src/table/emit.ts

@@ -3,6 +3,14 @@ import type { FoldedProgram, TableProgram } from './program.ts'
 import { resolveTable } from './program.ts'
 import { EMITTED_PARAMS, Unemittable, emitAssemblySource } from './emit-assembly.ts'
 import { cfgKey, type RunCfg } from './assemble.ts'
+import { PARSEMAN_VERSION } from '../version.ts'
+
+/**
+ * Opens every printed assembly factory. A runtime older than the printer passes fewer
+ * helpers; refuse it when the assembly is built, instead of failing partway through the
+ * first parse on whichever helper is reached first. Runs once per assembly.
+ */
+export const FACTORY_ARITY_GUARD = `if(arguments.length<${EMITTED_PARAMS.length})throw new Error(${JSON.stringify(`parseman: this parser was printed by parseman ${PARSEMAN_VERSION}; upgrade the parseman runtime to at least that version`)});`
 
 /**
  * Print a program as the module a build emits.
@@ -221,7 +229,7 @@ function emitAssemblies(prog: TableProgram, cfgs: readonly AssemblyCfg[]): strin
     const plan = em.plan
     out.push('{'
       + `key:${key},`
-      + `factory:function(${EMITTED_PARAMS.join(',')}){${em.source}\n},`
+      + `factory:function(${EMITTED_PARAMS.join(',')}){${FACTORY_ARITY_GUARD}${em.source}\n},`
       + 'plan:{'
       + `classes:[${plan.classes.map(r => `[${r.join(',')}]`).join(',')}],`
       + `armExpected:[${plan.armExpected.map(r => `[${r.join(',')}]`).join(',')}],`

package/src/table/run-support.ts

@@ -14,6 +14,7 @@
  */
 import type { ParseContext } from '../types.ts'
 import { popCstChild, pushCstChild } from '../cst/capture-buffer.ts'
+import { PlainLeaf, PlainLineSpan, PlainSpan } from '../cst/plain.js'
 
 export type Span = { start: number; end: number }
 export type LineSpan = Span & {
@@ -37,7 +38,7 @@ export function lineCol(ctx: ParseContext, offset: number): [number, number] {
 
 export function spanLines(ctx: ParseContext, start: number, end: number): LineSpan {
   const s = lineCol(ctx, start), e = lineCol(ctx, end)
-  return { start, end, startLine: s[0], startColumn: s[1], endLine: e[0], endColumn: e[1] }
+  return new PlainLineSpan(start, end, s[0], s[1], e[0], e[1])
 }
 
 /**
@@ -51,11 +52,7 @@ export function rawEntry(v: unknown, input: string, s: number, e: number): unkno
     const tg = (v as { _tag?: string })._tag
     if (tg === 'node' || tg === 'leaf' || tg === 'parseError') return v
   }
-  return {
-    _tag: 'leaf',
-    value: typeof v === 'string' ? v : (typeof v === 'object' && v !== null ? input.slice(s, e) : ''),
-    span: { start: s, end: e },
-  }
+  return new PlainLeaf(typeof v === 'string' ? v : (typeof v === 'object' && v !== null ? input.slice(s, e) : ''), new PlainSpan(s, e))
 }
 
 /** `input`'s code point at `pos`, or −1 at EOF. Surrogate-pair aware. */
@@ -95,7 +92,7 @@ export function collapseEmpty(
   // A frame keeps the raw entry of the child it does not count, for a reducer
   // that reads `rawChildren`.
   const raw = readsRaw ? [rawEntry(undefined, input, pos, end)] : EMPTY_KIDS
-  const nd = build(EMPTY_KIDS, undefined, { start: pos, end }, raw, EMPTY_TRIVIA, undefined)
+  const nd = build(EMPTY_KIDS, undefined, new PlainSpan(pos, end), raw, EMPTY_TRIVIA, undefined)
   if (collected) pushCstChild(ctx, nd, ctx._cstBuf?.noRaw === true ? undefined : rawEntry(nd, input, pos, end))
   return nd
 }

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.58.3'
+export const PARSEMAN_VERSION = '0.59.0'