parseman 0.47.0 → 0.47.1

package/dist/spec/index.js

@@ -44,6 +44,13 @@ function empty() {
 function matchesEmpty(p, seen = /* @__PURE__ */ new Set(), resolve) {
   if (seen.has(p)) return true;
   seen.add(p);
+  try {
+    return matchesEmptyBody(p, seen, resolve);
+  } finally {
+    seen.delete(p);
+  }
+}
+function matchesEmptyBody(p, seen, resolve) {
   const me = (c) => matchesEmpty(c, seen, resolve);
   const d = p._def;
   switch (d.tag) {
@@ -145,6 +152,13 @@ function sequenceFirstSet(parsers) {
 function firstSetOf(p, seen = /* @__PURE__ */ new Set(), resolve) {
   if (seen.has(p)) return any();
   seen.add(p);
+  try {
+    return firstSetBody(p, seen, resolve);
+  } finally {
+    seen.delete(p);
+  }
+}
+function firstSetBody(p, seen, resolve) {
   const fs = (c) => firstSetOf(c, seen, resolve);
   const empties = (c) => matchesEmpty(c, /* @__PURE__ */ new Set(), resolve);
   const d = p._def;
@@ -2084,6 +2098,23 @@ function rollbackTrivia(ctx, mark) {
   if (ctx._triviaLog && ctx._triviaLog.length !== mark.log) ctx._triviaLog.length = mark.log;
   if (ctx._rootTriviaLog && ctx._rootTriviaLog.length !== mark.rootLog) ctx._rootTriviaLog.length = mark.rootLog;
 }
+function removeNumberRange(values, start, end) {
+  if (values === void 0 || end <= start) return;
+  if (values.length > end) values.copyWithin(start, end);
+  values.length -= end - start;
+}
+function rollbackScannedTriviaAt(ctx, tlogStart, tlogEnd, logStart, logEnd, rootLogStart, rootLogEnd) {
+  const b = ctx._cstBuf;
+  if (b !== void 0) {
+    const tlog = b.tl;
+    removeNumberRange(tlog, tlogStart, tlogEnd);
+    if (tlog !== void 0 && tlog.length === 0) b.tl = void 0;
+  } else {
+    removeNumberRange(ctx._cstTriviaLog, tlogStart, tlogEnd);
+  }
+  removeNumberRange(ctx._triviaLog, logStart, logEnd);
+  removeNumberRange(ctx._rootTriviaLog, rootLogStart, rootLogEnd);
+}
 function parseTriviaNoCapture(triviaP, input, cur, ctx) {
   const probeCtx = createDetachedParseContext(ctx.trackLines, ctx.state);
   probeCtx._lineIndex = ctx._lineIndex;
@@ -2777,7 +2808,9 @@ function sequence(...parsers) {
           continue;
         }
         if (ctx.trivia && i > 0) {
-          const mark = saveTriviaMark(ctx);
+          const mTlog = cstTlLen(ctx);
+          const mLog = ctx._triviaLog?.length ?? 0;
+          const mRootLog = ctx._rootTriviaLog?.length ?? 0;
           let scanEnd;
           if (needsDeferredTriviaCommit(ctx)) {
             const scan = scanTrivia(input, cur, ctx);
@@ -2786,10 +2819,13 @@ function sequence(...parsers) {
           } else {
             scanEnd = advanceTrivia(input, cur, ctx);
           }
+          const scanTlog = cstTlLen(ctx);
+          const scanLog = ctx._triviaLog?.length ?? 0;
+          const scanRootLog = ctx._rootTriviaLog?.length ?? 0;
           const result2 = parsers[i].parse(input, scanEnd, ctx);
           if (!result2.ok) return result2;
           if (result2.span.end > scanEnd) cur = result2.span.end;
-          else rollbackTrivia(ctx, mark);
+          else rollbackScannedTriviaAt(ctx, mTlog, scanTlog, mLog, scanLog, mRootLog, scanRootLog);
           if (values !== void 0) values.push(result2.value);
           continue;
         }
@@ -2820,7 +2856,9 @@ function sequence(...parsers) {
       }
       if (ctx.trivia && i > 0) {
         let scanEnd;
-        const mark = saveTriviaMark(ctx);
+        const mTlog = cstTlLen(ctx);
+        const mLog = ctx._triviaLog?.length ?? 0;
+        const mRootLog = ctx._rootTriviaLog?.length ?? 0;
         if (needsDeferredTriviaCommit(ctx)) {
           const scan = scanTrivia(input, cur, ctx);
           scan.commit();
@@ -2828,10 +2866,13 @@ function sequence(...parsers) {
         } else {
           scanEnd = advanceTrivia(input, cur, ctx);
         }
+        const scanTlog = cstTlLen(ctx);
+        const scanLog = ctx._triviaLog?.length ?? 0;
+        const scanRootLog = ctx._rootTriviaLog?.length ?? 0;
         const result2 = parsers[i].parse(input, scanEnd, ctx);
         if (!result2.ok) return result2;
         if (result2.span.end > scanEnd) cur = result2.span.end;
-        else rollbackTrivia(ctx, mark);
+        else rollbackScannedTriviaAt(ctx, mTlog, scanTlog, mLog, scanLog, mRootLog, scanRootLog);
         if (values !== void 0) values.push(result2.value);
         continue;
       }
@@ -2859,7 +2900,9 @@ function sequence(...parsers) {
       for (let i = 0; i < parsers.length; i++) {
         if (ctx.trivia && i > 0) {
           let scanEnd;
-          let mark = saveTriviaMark(ctx);
+          const mTlog = cstTlLen(ctx);
+          const mLog = ctx._triviaLog?.length ?? 0;
+          const mRootLog = ctx._rootTriviaLog?.length ?? 0;
           if (needsDeferredTriviaCommit(ctx)) {
             const scan = scanTrivia(input, cur, ctx);
             scan.commit();
@@ -2867,12 +2910,15 @@ function sequence(...parsers) {
           } else {
             scanEnd = advanceTrivia(input, cur, ctx);
           }
+          const scanTlog = cstTlLen(ctx);
+          const scanLog = ctx._triviaLog?.length ?? 0;
+          const scanRootLog = ctx._rootTriviaLog?.length ?? 0;
           const result2 = parsers[i].parse(input, scanEnd, ctx);
           if (!result2.ok) return result2;
           if (result2.span.end > scanEnd) {
             cur = result2.span.end;
           } else {
-            rollbackTrivia(ctx, mark);
+            rollbackScannedTriviaAt(ctx, mTlog, scanTlog, mLog, scanLog, mRootLog, scanRootLog);
           }
           if (values !== void 0) values.push(result2.value);
           continue;
@@ -4810,6 +4856,7 @@ var OP_LIVE = 37;
 var OP_ATTEMPT = 38;
 var OP_LABEL = 39;
 var OP_COV = 40;
+var OP_SCOPE_PLAIN = 41;
 var OP_DISPATCH = 25;
 var OP_ROUTED = 26;
 var OP_NAMES = {
@@ -4852,7 +4899,8 @@ var OP_NAMES = {
   [OP_LIVE]: "LIVE",
   [OP_ATTEMPT]: "ATTEMPT",
   [OP_LABEL]: "LABEL",
-  [OP_COV]: "COV"
+  [OP_COV]: "COV",
+  [OP_SCOPE_PLAIN]: "SCOPE_PLAIN"
 };
 
 // src/table/scan-shapes.ts