parseman 0.60.5 → 0.61.0

package/dist/analysis/diagnostics.js

@@ -40,6 +40,12 @@ function hasOwnTriviaBoundary(p, depth = MAX_DEPTH) {
     case "oneOrMore":
     case "sepBy":
       return true;
+    // A scope that names or clears trivia keeps an outer install out of its body.
+    // Any other inherits, so it falls through at no cost in depth: line tracking
+    // wraps every rule in one, and must not change what this walk sees.
+    case "grammar":
+      if (d.triviaParser || d.clearTrivia) return false;
+      depth++;
     // Transparent wrappers — they add no position, so ask what they wrap.
     case "node":
     case "transform":
@@ -2252,15 +2258,20 @@ function markUnusedValues(root) {
       case "many":
       case "oneOrMore":
         mark(def, consumed);
-        visit(def.parser, consumed);
-        return;
       case "optional":
+      // `optional` returns `inner | null` — no aggregate array/tuple to elide, so
+      // it carries no valueUnused flag. Still descend so an inner many/sequence
+      // under a node() is analyzed (it benefits even when its optional wrapper
+      // doesn't).
+      case "label":
+      case "trivia":
+      case "attempt":
+      case "withCtx":
+      case "expect":
         visit(def.parser, consumed);
         return;
       case "sequence":
         mark(def, consumed);
-        for (const p of def.parsers) visit(p, consumed);
-        return;
       case "choice":
         for (const p of def.parsers) visit(p, consumed);
         return;
@@ -2271,22 +2282,24 @@ function markUnusedValues(root) {
         if (def.otherwise) visit(def.otherwise, consumed);
         return;
       case "node":
+      // builds from captured children, NOT the inner parser value.
+      case "not":
+      case "peek":
+      // lookahead — value never observed
+      case "token":
         visit(def.parser, false);
         return;
       case "transform":
-        visit(def.parser, true);
-        return;
+      // the map fn reads the value → always consumed.
       case "field":
+      // the field capture records the parsed value → always consumed.
+      case "leaf":
         visit(def.parser, true);
         return;
       case "sepBy":
         visit(def.parser, true);
         visit(def.separator, false);
         return;
-      case "not":
-      case "peek":
-        visit(def.parser, false);
-        return;
       case "grammar":
         visit(def.parser, consumed);
         if (def.triviaParser) visit(def.triviaParser, false);
@@ -2295,19 +2308,6 @@ function markUnusedValues(root) {
         visit(def.parser, consumed);
         visit(def.sentinel, false);
         return;
-      case "token":
-        visit(def.parser, false);
-        return;
-      case "label":
-      case "trivia":
-      case "attempt":
-      case "withCtx":
-      case "expect":
-        visit(def.parser, consumed);
-        return;
-      case "leaf":
-        visit(def.parser, true);
-        return;
       case "lazy":
         return;
       default:
@@ -2469,7 +2469,7 @@ function parser(opts, root) {
         ctx.triviaKindLabels = void 0;
       } else if (scopeTrivia !== void 0) {
         ctx.trivia = scopeTrivia;
-        if (scopeLabels) ctx.triviaKindLabels = scopeLabels;
+        ctx.triviaKindLabels = scopeLabels;
       }
       if (forceCaptureTrivia || _ctx?.captureTrivia) ctx.captureTrivia = true;
       if (ownCaptureMask !== void 0) ctx._triviaCaptureMask = ownCaptureMask;
@@ -2670,6 +2670,7 @@ function derive(c, seen) {
     case "optional":
     case "many":
     case "oneOrMore":
+    case "sepBy":
     case "transform":
     case "not":
     case "peek":
@@ -2817,7 +2818,7 @@ function choice(...args) {
           const result = parsers[idx].parse(input, pos, ctx);
           if (result.ok) return result;
           expected.push(...result.expected);
-          if (result.committed) return { ok: false, expected, span: { start: pos, end: pos }, committed: true };
+          if (result.committed) return { ok: false, expected, span: result.span, committed: true };
           return { ok: false, expected, span: { start: pos, end: pos } };
         }
         if (ctx._probe !== void 0 || ctx._tolerant) for (const p of parsers) p.parse(input, pos, ctx);
@@ -4061,6 +4062,9 @@ function regex(pattern, flags = "") {
   };
 }
 
+// src/version.ts
+var PARSEMAN_VERSION = "0.61.0";
+
 // src/table/lex-body.ts
 function buildLexBodyRecognizer(spec, constants) {
   const raw = constants[spec[0]];
@@ -4676,11 +4680,12 @@ function assemblyExtraIps(prog) {
 }
 function expandCompact(p) {
   if ("code" in p) return p;
+  if (p.es === void 0) 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,
+    fx: p.e.map((set) => set.map((i) => p.es[i])),
     disp: p.d,
     rules: p.r,
     fns: p.f,
@@ -6615,6 +6620,7 @@ var OP_LIT_CI = 27;
 var OP_LIT_CI_TRACK = 28;
 var OP_TOKEN = 29;
 var OP_SCOPE_CAP = 30;
+var SCOPE_INHERIT = -2;
 var OP_WITHCTX = 31;
 var OP_GUARD = 32;
 var OP_ADJ = 33;
@@ -6686,6 +6692,12 @@ var OP_NAMES = {
   [OP_STRICT]: "STRICT"
 };
 
+// src/combinators/link-scope.ts
+var scope;
+function afterLink(settle) {
+  scope?.push(settle);
+}
+
 // src/combinators/node.ts
 import { PlainNode, PlainSpan as PlainSpan7 } from "../cst/plain.js";
 function unwrapChild(child) {
@@ -6749,8 +6761,14 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
   const def = unwrap || collapse || project !== void 0 || captureTrivia || trailingTrivia || buildArity !== void 0 || tags !== void 0 && tags.length > 0 ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...project !== void 0 ? { project } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {}, ...buildArity !== void 0 ? { buildArity } : {}, ...tags !== void 0 && tags.length > 0 ? { tags } : {} } : baseDef;
   const capturesTrivia = captureTrivia || (build ? buildReadsTrivia(def) : project === void 0);
   const readsState = build ? buildReadsState(def) : project === void 0;
-  const hasOwnFields = parserHasOwnFields(combinator);
-  const capturesFields = hasOwnFields && (build ? buildReadsFields(def) : project === void 0);
+  let hasOwnFields = parserHasOwnFields(combinator);
+  let capturesFields = hasOwnFields && (build ? buildReadsFields(def) : project === void 0);
+  if (!hasOwnFields) {
+    afterLink(() => {
+      hasOwnFields = parserHasOwnFields(combinator);
+      capturesFields = hasOwnFields && (build ? buildReadsFields(def) : project === void 0);
+    });
+  }
   const guardable = combinator._meta.firstSet.kind !== "any" && !matchesEmpty(combinator);
   let failExpected;
   return {
@@ -6856,7 +6874,7 @@ function selectOptionalSuffixLexBody(ir) {
 function reinstallsRuleTrivia(reference, target) {
   return (reference._meta.grammarTrivia ?? target._meta.grammarTrivia) !== void 0 && hasOwnTriviaBoundary(target);
 }
-function directTokenBodyParser(parser2, resolve, scope) {
+function directTokenBodyParser(parser2, resolve, scope2) {
   const outer = parser2._def;
   if (outer.tag !== "token") return void 0;
   let body = outer.parser;
@@ -6866,7 +6884,7 @@ function directTokenBodyParser(parser2, resolve, scope) {
     const wrapper = body._def;
     if (wrapper.tag === "grammar") {
       if (wrapper.clearTrivia !== true || wrapper.triviaParser !== void 0 || wrapper.captureTrivia === true || wrapper.rootCapture === "opaque" || wrapper.constructionTrackLines !== "inherit" || wrapper.constructionCaptureTriviaKinds !== void 0) return void 0;
-      if (scope !== void 0) scope.cleared = true;
+      if (scope2 !== void 0) scope2.cleared = true;
       body = wrapper.parser;
       continue;
     }
@@ -7123,10 +7141,10 @@ function directFixedLexNode(parser2, resolve, active, pureOnly = false, cleared
   }
 }
 function directFixedTokenBody(parser2, resolve) {
-  const scope = { cleared: false };
-  const body = directTokenBodyParser(parser2, resolve, scope);
+  const scope2 = { cleared: false };
+  const body = directTokenBodyParser(parser2, resolve, scope2);
   if (body === void 0) return void 0;
-  const root = directFixedLexNode(body, resolve, /* @__PURE__ */ new Set(), false, scope.cleared);
+  const root = directFixedLexNode(body, resolve, /* @__PURE__ */ new Set(), false, scope2.cleared);
   return root === void 0 ? void 0 : { kind: "fixed-tree", root };
 }
 function directBalancedTokenBody(parser2, resolve) {
@@ -8764,7 +8782,7 @@ var Encoder = class {
         this.triviaKnown = savedKnown;
         if (d.clearTrivia === true) return this.emit(op, -1, bodyIp, flags);
         if (d.triviaParser === void 0) {
-          return cap || flags !== 0 ? this.emit(op, -1, bodyIp, flags) : bodyIp;
+          return cap ? this.emit(op, SCOPE_INHERIT, bodyIp, flags) : bodyIp;
         }
         return this.emit(op, this.triviaSlot(d.triviaParser), bodyIp, flags);
       }
@@ -10156,7 +10174,7 @@ function transfer(code, ip, at, hostCst) {
   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;
     const cap = op === OP_SCOPE_CAP ? CAP_ON : at.cap;
     if (tri === at.tri && cap === at.cap) return at;
     return { tri, buf: at.buf, raw: at.raw, cap };
@@ -10230,7 +10248,7 @@ function scanHandoffNeeded(code, ip, labels) {
     if (l.tri === TRI_UNKNOWN) return true;
     const op = code[at];
     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;
     if (!childSlots(code, at, kids)) return true;
@@ -11525,6 +11543,15 @@ return r.value
         const cap = op === OP_SCOPE_CAP;
         const flags = op === OP_SCOPE_PLAIN ? 0 : code[ip + 3];
         const child = link(code[ip + 2]);
+        if (ki === SCOPE_INHERIT) {
+          return `${head}
+const sC=ctx.captureTrivia
+ctx.captureTrivia=true
+const v=${child}(input,pos,ctx)
+ctx.captureTrivia=sC
+return v
+}`;
+        }
         const scanFor = swapLegal && ki >= 0 && !triviaLabelled[ki] ? hoist("ts", `TRIVIASCAN[${ki}]`) : "null";
         const tri = ki < 0 ? "undefined" : hoist("tv", `TRIVIA[${ki}]`);
         const lab = ki < 0 ? "undefined" : hoist("tl", `TRIVIA[${ki}]._meta.triviaKindLabels`);
@@ -13269,9 +13296,6 @@ function clearOf(ranges, input, from, to) {
   return true;
 }
 
-// src/version.ts
-var PARSEMAN_VERSION = "0.60.5";
-
 // src/table/assemble.ts
 import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "../cst/plain.js";
 
@@ -14787,6 +14811,16 @@ function assemble(t2, prog, cfg) {
       case OP_SCOPE_CAP:
       case OP_SCOPE_PLAIN: {
         const ki = code[ip + 1];
+        if (ki === SCOPE_INHERIT) {
+          const body = link(code[ip + 2]);
+          return (input, pos, ctx) => {
+            const savedCap = ctx.captureTrivia;
+            ctx.captureTrivia = true;
+            const v = body(input, pos, ctx);
+            ctx.captureTrivia = savedCap;
+            return v;
+          };
+        }
         const scopeTrivia = ki < 0 ? void 0 : trivia2[ki];
         const scopeLabels = scopeTrivia?._meta.triviaKindLabels;
         const scanFor = swapLegal && ki >= 0 && !triviaLabelled[ki] ? triviaScan[ki] : null;
@@ -17245,12 +17279,15 @@ function assertPrintable(prog, who) {
   }
 }
 function programFields(prog, fns, opts = {}) {
+  const tokens = [...new Set(prog.fx.flat())];
+  const tokenAt = new Map(tokens.map((token2, i) => [token2, i]));
   return [
     ...emitAssemblies(prog, opts.assemblies ?? []),
     `c:[${prog.code.join(",")}],`,
     `k:[${prog.k.map(emitConst).join(",")}],`,
     `x:${emitClassPool(prog.cc)},`,
-    `e:[${prog.fx.map((f) => `[${f.map(jsString).join(",")}]`).join(",")}],`,
+    `e:[${prog.fx.map((f) => `[${f.map((token2) => tokenAt.get(token2)).join(",")}]`).join(",")}],`,
+    `es:[${tokens.map(jsString).join(",")}],`,
     `d:[${prog.disp.map((a) => `[${a.join(",")}]`).join(",")}],`,
     `r:${JSON.stringify(prog.rules)},`,
     ...prog.lines === 1 ? ["l:1,"] : [],