parseman 0.26.2 → 0.26.3

package/dist/plugin/index.cjs

@@ -5565,7 +5565,7 @@ function emitDispatch(p, ctx, pos) {
         ctx.indent = 1;
         ctx.failLabel = "_pfail";
         ctx.recordFail = true;
-        const innerR = emit(innerParser, ctx, "_pos");
+        const innerR = emitDispatch(innerParser, ctx, "_pos");
         ctx.indent = savedIndent;
         ctx.failLabel = savedFailLabel;
         ctx.recordFail = savedRecord;
@@ -6282,6 +6282,23 @@ function escapeClassChar(ch) {
   return ch.replace(/[\\\]^-]/g, "\\$&");
 }
 
+// src/combinators/withCtx.ts
+function withCtx(extra, combinator) {
+  const meta = {
+    firstSet: combinator._meta.firstSet,
+    canMatchNewline: combinator._meta.canMatchNewline,
+    isTrivia: false
+  };
+  return {
+    _tag: "withCtx",
+    _meta: meta,
+    _def: { tag: "withCtx", extra, parser: combinator },
+    parse(input, pos, ctx) {
+      return combinator.parse(input, pos, { ...ctx, state: extra });
+    }
+  };
+}
+
 // src/compiler/ir-serialize.ts
 function childrenOf2(def) {
   switch (def.tag) {
@@ -6298,6 +6315,7 @@ function childrenOf2(def) {
     case "field":
     case "not":
     case "node":
+    case "withCtx":
     case "expect":
       return [def.parser];
     case "grammar":
@@ -6313,7 +6331,6 @@ function childrenOf2(def) {
     case "regex":
     case "keywords":
     case "guard":
-    case "withCtx":
     case "recover":
     case "unknown":
       return [];
@@ -6388,6 +6405,17 @@ function evalRuleMapIR(ir) {
     c._def.gateSrcs = gateSrcs;
     return c;
   };
+  const _wc = (src, inner) => {
+    let extra;
+    try {
+      extra = (0, eval)(`(${src})`);
+    } catch {
+      extra = void 0;
+    }
+    const w = withCtx(extra, inner);
+    w._def.extraSrc = src;
+    return w;
+  };
   const fn = new Function(
     "rules",
     "ref",
@@ -6414,6 +6442,7 @@ function evalRuleMapIR(ir) {
     "_tf",
     "_nd",
     "_gch",
+    "_wc",
     `return (${ir})`
   );
   const map = fn(
@@ -6441,7 +6470,8 @@ function evalRuleMapIR(ir) {
     expect,
     _tf,
     _nd,
-    _gch
+    _gch,
+    _wc
   );
   return Object.entries(map);
 }
@@ -6497,7 +6527,7 @@ ${body}
       this.analyze(target, active);
       return;
     }
-    if (def.tag === "guard" || def.tag === "withCtx" || def.tag === "recover" || def.tag === "unknown") {
+    if (def.tag === "guard" || def.tag === "recover" || def.tag === "unknown") {
       throw new Unserializable(`unsupported tag ${def.tag}`);
     }
     this.counts.set(c, (this.counts.get(c) ?? 0) + 1);
@@ -6606,8 +6636,11 @@ ${body}
         const trivia2 = def.clearTrivia ? "null" : def.triviaParser ? kid(def.triviaParser) : "undefined";
         return `parser({ trivia: ${trivia2}${def.trackLines ? ", trackLines: true" : ""} }, ${kid(def.parser)})`;
       }
+      case "withCtx": {
+        if (def.extraSrc === void 0) throw new Unserializable("withCtx without extraSrc");
+        return `_wc(${JSON.stringify(def.extraSrc)}, ${kid(def.parser)})`;
+      }
       case "guard":
-      case "withCtx":
       case "recover":
       case "unknown":
         throw new Unserializable(`unsupported tag ${def.tag}`);
@@ -6719,23 +6752,6 @@ function guard(predicate) {
   };
 }
 
-// src/combinators/withCtx.ts
-function withCtx(extra, combinator) {
-  const meta = {
-    firstSet: combinator._meta.firstSet,
-    canMatchNewline: combinator._meta.canMatchNewline,
-    isTrivia: false
-  };
-  return {
-    _tag: "withCtx",
-    _meta: meta,
-    _def: { tag: "withCtx", extra, parser: combinator },
-    parse(input, pos, ctx) {
-      return combinator.parse(input, pos, { ...ctx, state: extra });
-    }
-  };
-}
-
 // src/cst/offset-model.ts
 var { isFinite } = Number;