parseman 0.50.3 → 0.50.4

package/dist/plugin/index.js

@@ -43,10 +43,20 @@ function classifyFinalChoice(arms, resolve3) {
   }
   return { exclusive, firstSets, nullable: nullable2 };
 }
-function resolveNamedRef(p, resolve3) {
+function winnerForRef(p, resolve3) {
   if (resolve3 === void 0) return void 0;
   const name = p._ruleName;
-  return name === void 0 ? void 0 : resolve3(name);
+  const w = name === void 0 ? void 0 : resolve3(name);
+  if (w === void 0 || w === p) return void 0;
+  let cur = w;
+  for (const seen = /* @__PURE__ */ new Set(); !seen.has(cur); ) {
+    if (cur === p) return void 0;
+    seen.add(cur);
+    const cd = cur._def;
+    if (cd.tag !== "grammar" && cd.tag !== "trivia") return w;
+    cur = cd.parser;
+  }
+  return w;
 }
 function union(a, b) {
   if (a.kind === "any" || b.kind === "any") return { kind: "any" };
@@ -144,13 +154,15 @@ function matchesEmptyBody(p, seen, resolve3) {
     case "grammar":
     case "recover":
       return me(d.parser);
-    case "lazy":
+    case "lazy": {
+      const w = winnerForRef(p, resolve3);
+      if (w !== void 0) return me(w);
       try {
         return me(d.thunk());
       } catch {
-        const t = resolveNamedRef(p, resolve3);
-        return t ? me(t) : true;
+        return true;
       }
+    }
     default:
       return true;
   }
@@ -214,13 +226,15 @@ function firstSetBody(p, seen, resolve3) {
     // terminals: no refs, cached set is exact
     case "dispatch":
       return fs3(d.selector);
-    case "lazy":
+    case "lazy": {
+      const w = winnerForRef(p, resolve3);
+      if (w !== void 0) return fs3(w);
       try {
         return fs3(d.thunk());
       } catch {
-        const t = resolveNamedRef(p, resolve3);
-        return t ? fs3(t) : any();
+        return any();
       }
+    }
     case "choice": {
       let out = empty();
       for (const arm of d.parsers) out = union(out, fs3(arm));
@@ -7665,7 +7679,7 @@ var Encoder = class {
           d.tags === void 0 ? -1 : this.constant(d.tags)
         );
         if (matchesEmpty(d.parser)) return body;
-        const fs3 = d.parser._meta.firstSet;
+        const fs3 = d.parser._def.tag === "lazy" ? firstSetOf(d.parser, /* @__PURE__ */ new Set(), this.refResolver()) : d.parser._meta.firstSet;
         if (fs3.kind === "any") return body;
         const cls = this.charClass(fs3);
         if (cls < 0) return body;
@@ -7779,7 +7793,7 @@ var Encoder = class {
       case "attempt": {
         const inner = this.emit(OP_ATTEMPT, this.node(d.parser).ip);
         if (!this.failureNeedsRollback(d.parser, void 0)) this.failureRollbackCleanSites.add(inner);
-        const fs3 = d.parser._meta.firstSet;
+        const fs3 = d.parser._def.tag === "lazy" ? firstSetOf(d.parser, /* @__PURE__ */ new Set(), this.refResolver()) : d.parser._meta.firstSet;
         if (fs3.kind === "any" || matchesEmpty(d.parser)) return inner;
         const cls = this.charClass(fs3);
         if (cls < 0) return inner;
@@ -16926,7 +16940,7 @@ function compileRuleMap(ruleMap, opts = {}) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.50.3";
+var PARSEMAN_VERSION = "0.50.4";
 
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {