parseman 0.48.0 → 0.48.1

package/dist/cli/index.js

@@ -3815,6 +3815,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;
@@ -3872,7 +3873,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;
         }
@@ -3883,6 +3889,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 } };
     }
   };
@@ -5844,24 +5853,43 @@ function choiceNode(arms, classes, armExpected, choiceExpected) {
   };
   for (let i = arms.length - 1; i >= 0; i--) {
     const arm = arms[i], cls = classes[i], staticExpected = armExpected[i], next = tail;
-    tail = (input, pos, ctx, lead2, acc) => {
+    tail = (input, pos, ctx, lead2, acc, best) => {
       if (cls !== void 0 && !classHas(cls, lead2)) {
-        return next(input, pos, ctx, lead2, appendExpected(acc, staticExpected));
+        return next(
+          input,
+          pos,
+          ctx,
+          lead2,
+          best === pos ? appendExpected(acc, staticExpected) : acc,
+          best
+        );
       }
       ctx._fc = false;
       const end = arm.run(input, pos, ctx);
       if (end >= 0) return end;
-      const nextAcc = appendExpected(acc, ctx._fx);
+      const at = ctx._fe ?? pos;
+      if (at > best) {
+        best = at;
+        acc = void 0;
+      }
+      const nextAcc = at === best ? appendExpected(acc, ctx._fx) : acc;
       if (committed(ctx)) {
         if (nextAcc !== void 0) ctx._fx = nextAcc;
         return -1;
       }
-      return next(input, pos, ctx, lead2, nextAcc);
+      return next(input, pos, ctx, lead2, nextAcc, best);
     };
   }
   return {
     match: matchTail,
-    run: (input, pos, ctx) => tail(input, pos, ctx, pos < input.length ? input.codePointAt(pos) : -1, void 0)
+    run: (input, pos, ctx) => tail(
+      input,
+      pos,
+      ctx,
+      pos < input.length ? input.codePointAt(pos) : -1,
+      void 0,
+      pos
+    )
   };
 }
 function notNode(body, failure) {
@@ -9952,9 +9980,11 @@ ${catchCases}
 ctx._fc=false
 {const v=${arm}(input,pos,ctx)
 if(v!==FAIL)return v}
-acc=${catchName}(${i},prev,acc)
+if(best===pos)acc=${catchName}(${i},prev,acc)
 prev=${i + 1}
-acc=_accSet(ctx._fx,acc)
+{const at=ctx._fe??pos
+if(at>best){best=at;acc=undefined}
+if(at===best)acc=_accSet(ctx._fx,acc)}
 if(ctx._fc===true){if(acc!==undefined)ctx._fx=acc;return FAIL}
 ${emitRollback(p, L.buf, sinks)}
 }`;
@@ -9963,19 +9993,22 @@ ${emitRollback(p, L.buf, sinks)}
 ctx._fc=false
 {const v=${arm}(input,pos,ctx)
 if(v!==FAIL)return v}
-acc=_accSet(ctx._fx,acc)
+{const at=ctx._fe??pos
+if(at>best){best=at;acc=undefined}
+if(at===best)acc=_accSet(ctx._fx,acc)}
 if(ctx._fc===true){if(acc!==undefined)ctx._fx=acc;return FAIL}
 ${emitRollback(p, L.buf, sinks)}
-}else acc=_accSet(${expected[i]},acc)`).join("\n");
+}else if(best===pos)acc=_accSet(${expected[i]},acc)`).join("\n");
           return `${head}
 const c=lead(input,pos)
 ${emitMark(p, L.buf, sinks)}
 let acc
+let best=pos
 ${maskable ? `if(c<128){
 const bits=${maskName}[c<0?128:c]
 let prev=0
 ${maskArms}
-acc=${catchName}(${n},prev,acc)
+if(best===pos)acc=${catchName}(${n},prev,acc)
 ctx._fe=pos;ctx._fx=acc??${choiceFx}
 return FAIL
 }
@@ -10956,14 +10989,19 @@ function assemble(t2, prog, cfg) {
     };
   }
   function maskedChoiceBlock(start, a0, a1, a2, a3, through, next, total, choiceFx) {
-    return (input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev) => {
+    return (input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best) => {
       if ((bits & 1 << start) !== 0) {
         ctx._fc = false;
         const v = a0(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start, prev, acc);
+        if (best === pos) acc = through(start, prev, acc);
         prev = start + 1;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10974,9 +11012,14 @@ function assemble(t2, prog, cfg) {
         ctx._fc = false;
         const v = a1(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 1, prev, acc);
+        if (best === pos) acc = through(start + 1, prev, acc);
         prev = start + 2;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10987,9 +11030,14 @@ function assemble(t2, prog, cfg) {
         ctx._fc = false;
         const v = a2(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 2, prev, acc);
+        if (best === pos) acc = through(start + 2, prev, acc);
         prev = start + 3;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -11000,9 +11048,14 @@ function assemble(t2, prog, cfg) {
         ctx._fc = false;
         const v = a3(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 3, prev, acc);
+        if (best === pos) acc = through(start + 3, prev, acc);
         prev = start + 4;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -11010,23 +11063,28 @@ function assemble(t2, prog, cfg) {
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
       }
       if (next !== void 0) {
-        return next(input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev);
+        return next(input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best);
       }
-      acc = through(total, prev, acc);
+      if (best === pos) acc = through(total, prev, acc);
       ctx._fe = pos;
       ctx._fx = acc ?? choiceFx;
       return FAIL;
     };
   }
   function generalChoiceBlock(start, a0, a1, a2, a3, g0, g1, g2, g3, through, next, total, choiceFx) {
-    return (input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev) => {
+    return (input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best) => {
       if (g0 === null || classHas2(g0, c)) {
         ctx._fc = false;
         const v = a0(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start, prev, acc);
+        if (best === pos) acc = through(start, prev, acc);
         prev = start + 1;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -11037,9 +11095,14 @@ function assemble(t2, prog, cfg) {
         ctx._fc = false;
         const v = a1(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 1, prev, acc);
+        if (best === pos) acc = through(start + 1, prev, acc);
         prev = start + 2;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -11050,9 +11113,14 @@ function assemble(t2, prog, cfg) {
         ctx._fc = false;
         const v = a2(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 2, prev, acc);
+        if (best === pos) acc = through(start + 2, prev, acc);
         prev = start + 3;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -11063,9 +11131,14 @@ function assemble(t2, prog, cfg) {
         ctx._fc = false;
         const v = a3(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 3, prev, acc);
+        if (best === pos) acc = through(start + 3, prev, acc);
         prev = start + 4;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -11073,9 +11146,9 @@ function assemble(t2, prog, cfg) {
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
       }
       if (next !== void 0) {
-        return next(input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev);
+        return next(input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best);
       }
-      acc = through(total, prev, acc);
+      if (best === pos) acc = through(total, prev, acc);
       ctx._fe = pos;
       ctx._fx = acc ?? choiceFx;
       return FAIL;
@@ -12431,6 +12504,7 @@ function assemble(t2, prog, cfg) {
             const mLog = need ? ctx._triviaLog?.length ?? 0 : 0;
             const mRoot = need ? ctx._rootTriviaLog?.length ?? 0 : 0;
             let acc;
+            let best = pos;
             if (c < 128) {
               const bits = mask[c < 0 ? 128 : c];
               let prev = 0;
@@ -12439,7 +12513,12 @@ function assemble(t2, prog, cfg) {
                 const v = a0(input, pos, ctx);
                 if (v !== FAIL) return v;
                 prev = 1;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
@@ -12450,9 +12529,14 @@ function assemble(t2, prog, cfg) {
                 ctx._fc = false;
                 const v = a1(input, pos, ctx);
                 if (v !== FAIL) return v;
-                if (prev < 1) acc = accSet(e0, acc);
+                if (best === pos && prev < 1) acc = accSet(e0, acc);
                 prev = 2;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
@@ -12463,19 +12547,24 @@ function assemble(t2, prog, cfg) {
                 ctx._fc = false;
                 const v = a2(input, pos, ctx);
                 if (v !== FAIL) return v;
-                if (prev < 1) acc = accSet(e0, acc);
-                if (prev < 2) acc = accSet(e1, acc);
+                if (best === pos && prev < 1) acc = accSet(e0, acc);
+                if (best === pos && prev < 2) acc = accSet(e1, acc);
                 prev = 3;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
                 }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
               }
-              if (prev < 1) acc = accSet(e0, acc);
-              if (prev < 2) acc = accSet(e1, acc);
-              if (n === 3 && prev < 3) acc = accSet(e2, acc);
+              if (best === pos && prev < 1) acc = accSet(e0, acc);
+              if (best === pos && prev < 2) acc = accSet(e1, acc);
+              if (best === pos && n === 3 && prev < 3) acc = accSet(e2, acc);
               ctx._fe = pos;
               ctx._fx = acc ?? choiceFx;
               return FAIL;
@@ -12484,36 +12573,51 @@ function assemble(t2, prog, cfg) {
               ctx._fc = false;
               const v = a0(input, pos, ctx);
               if (v !== FAIL) return v;
-              acc = accSet(ctx._fx, acc);
+              const at = ctx._fe ?? pos;
+              if (at > best) {
+                best = at;
+                acc = void 0;
+              }
+              if (at === best) acc = accSet(ctx._fx, acc);
               if (committed3(ctx)) {
                 if (acc !== void 0) ctx._fx = acc;
                 return FAIL;
               }
               if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-            } else acc = accSet(e0, acc);
+            } else if (best === pos) acc = accSet(e0, acc);
             if (g1 === null || classHas2(g1, c)) {
               ctx._fc = false;
               const v = a1(input, pos, ctx);
               if (v !== FAIL) return v;
-              acc = accSet(ctx._fx, acc);
+              const at = ctx._fe ?? pos;
+              if (at > best) {
+                best = at;
+                acc = void 0;
+              }
+              if (at === best) acc = accSet(ctx._fx, acc);
               if (committed3(ctx)) {
                 if (acc !== void 0) ctx._fx = acc;
                 return FAIL;
               }
               if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-            } else acc = accSet(e1, acc);
+            } else if (best === pos) acc = accSet(e1, acc);
             if (n === 3) {
               if (g2 === null || classHas2(g2, c)) {
                 ctx._fc = false;
                 const v = a2(input, pos, ctx);
                 if (v !== FAIL) return v;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
                 }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-              } else acc = accSet(e2, acc);
+              } else if (best === pos) acc = accSet(e2, acc);
             }
             ctx._fe = pos;
             ctx._fx = acc ?? choiceFx;
@@ -12611,7 +12715,8 @@ function assemble(t2, prog, cfg) {
                 mLog,
                 mRoot,
                 void 0,
-                0
+                0,
+                pos
               );
             }
             return general(
@@ -12628,7 +12733,8 @@ function assemble(t2, prog, cfg) {
               mLog,
               mRoot,
               void 0,
-              0
+              0,
+              pos
             );
           };
         }
@@ -12656,7 +12762,8 @@ function assemble(t2, prog, cfg) {
             mLog,
             mRoot,
             void 0,
-            0
+            0,
+            pos
           );
         };
       }