parseman 0.48.0 → 0.49.0

package/dist/spec/index.js

@@ -3348,6 +3348,7 @@ function choice(...args) {
     },
     parse(input, pos, ctx) {
       const expected = [];
+      let expectedAt = pos;
       if (disjoint) {
         const code = pos < input.length ? input.codePointAt(pos) : -1;
         let idx = code >= 0 && code < 128 ? asciiDispatch[code] : -1;
@@ -3405,7 +3406,12 @@ function choice(...args) {
         const result = parsers[i].parse(input, pos, ctx);
         if (!result.ok) {
           rollbackTrivia(ctx, mark);
-          expected.push(...result.expected);
+          const at = result.span.start;
+          if (at > expectedAt) {
+            expectedAt = at;
+            expected.length = 0;
+          }
+          if (at === expectedAt) expected.push(...result.expected);
           if (result.committed) return { ok: false, expected, span: result.span, committed: true };
           continue;
         }
@@ -3416,6 +3422,9 @@ function choice(...args) {
         }
         return result;
       }
+      if (expected.length === 0) {
+        for (const parser2 of parsers) expected.push(...deriveExpected(parser2));
+      }
       return { ok: false, expected, span: { start: pos, end: pos } };
     }
   };
@@ -4941,7 +4950,7 @@ function evalRuleMapIR(ir) {
     l._def.fnSrc = src;
     return l;
   };
-  const _nd = (type, child, src, opts, staticError, sigSrc) => {
+  const _nd = (type, child, src, opts, staticError, sigSrc, buildImports) => {
     if (staticError !== void 0 && staticError.length > 0) {
       throw new Error(`IR direct node builder for ${type} must be macro-static and self-contained; unsupported binding(s): ${staticError.join(", ")}`);
     }
@@ -4951,6 +4960,7 @@ function evalRuleMapIR(ir) {
     n._def.buildSrc = src;
     if (staticError !== void 0) n._def.buildStaticError = staticError;
     if (sigSrc !== void 0) n._def.buildSigSrc = sigSrc;
+    if (buildImports !== void 0) n._def.buildImports = buildImports;
     return n;
   };
   const _gch = (items) => {