@ohm-js/wasm 0.7.1 → 0.7.2

package/dist/build/ohmRuntime.wasm_sections.d.ts

@@ -1,5 +1,5 @@
 export declare const destImportCount = 5;
-export declare const startFuncidx = 85;
+export declare const startFuncidx = 76;
 export declare const funcidxByName: {
     resetHeap: number;
     match: number;
@@ -16,11 +16,14 @@ export declare const funcidxByName: {
     bindingsAt: number;
     doMatchUnicodeChar: number;
     recordFailure: number;
-    makeFluffy: number;
+    makeFluffyFrom: number;
     isFluffy: number;
     getRecordedFailuresLength: number;
     setRecordedFailuresLength: number;
     recordedFailuresAt: number;
+    pushFluffySavePoint: number;
+    markFluffyFromSavePoint: number;
+    dropFluffySavePoint: number;
 };
 export declare const typesec: {
     entryCount: number;

package/dist/build/ohmRuntime.wasm_sections.js

@@ -7,47 +7,26 @@ function decodeBase64(str) {
     return result;
 }
 export const destImportCount = 5;
-export const startFuncidx = 85;
-export const funcidxByName = {
-    resetHeap: 30,
-    match: 67,
-    recordFailures: 69,
-    evalApplyGeneralized: 70,
-    evalApplyNoMemo0: 71,
-    evalApply0: 50,
-    handleLeftRecursion: 49,
-    newTerminalNode: 72,
-    newNonterminalNode: 47,
-    newIterationNode: 73,
-    getBindingsLength: 74,
-    setBindingsLength: 75,
-    bindingsAt: 76,
-    doMatchUnicodeChar: 77,
-    recordFailure: 65,
-    makeFluffy: 79,
-    isFluffy: 81,
-    getRecordedFailuresLength: 82,
-    setRecordedFailuresLength: 83,
-    recordedFailuresAt: 84,
-};
+export const startFuncidx = 76;
+export const funcidxByName = { "resetHeap": 27, "match": 54, "recordFailures": 55, "evalApplyGeneralized": 56, "evalApplyNoMemo0": 57, "evalApply0": 47, "handleLeftRecursion": 46, "newTerminalNode": 58, "newNonterminalNode": 44, "newIterationNode": 59, "getBindingsLength": 60, "setBindingsLength": 61, "bindingsAt": 62, "doMatchUnicodeChar": 63, "recordFailure": 52, "makeFluffyFrom": 66, "isFluffy": 68, "getRecordedFailuresLength": 69, "setRecordedFailuresLength": 70, "recordedFailuresAt": 71, "pushFluffySavePoint": 72, "markFluffyFromSavePoint": 74, "dropFluffySavePoint": 75 };
 export const typesec = {
-    entryCount: 13,
-    contents: decodeBase64('YAF/AX9gAn9/AGACf38Bf2AAAGABfwBgAAF/YAR/f39/AGADf39/AGAFf39/f38Bf2ABbwF/YAR/f39/AX9gA39/fwF/YAJvfwF/'),
+    entryCount: 12,
+    contents: decodeBase64("YAF/AX9gAn9/AGACf38Bf2AAAGABfwBgAAF/YAN/f38AYAR/f39/AGAFf39/f38Bf2ABbwF/YAR/f39/AX9gAm9/AX8=")
 };
 export const importsec = {
     entryCount: 4,
-    contents: decodeBase64('A2VudgVhYm9ydAAGDndhc206anMtc3RyaW5nBmxlbmd0aAAJCm9obVJ1bnRpbWUPaXNSdWxlU3ludGFjdGljAAAKb2htUnVudGltZRBtYXRjaFVuaWNvZGVDaGFyAAA='),
+    contents: decodeBase64("A2VudgVhYm9ydAAHDndhc206anMtc3RyaW5nBmxlbmd0aAAJCm9obVJ1bnRpbWUPaXNSdWxlU3ludGFjdGljAAAKb2htUnVudGltZRBtYXRjaFVuaWNvZGVDaGFyAAA=")
 };
 export const funcsec = {
-    entryCount: 81,
-    contents: decodeBase64('BAEAAQEBAQIHAQEBAQICAQEBAQEBAAMDAwMDAAAAAAAAAgIGAAICAAIBCAcKAAAAAAAACwEAAAAAAQECBAAMBAQCAAIIBQQAAAIDAgAFBAAD'),
+    entryCount: 72,
+    contents: decodeBase64("BAEAAQEBAQIGAQEBAQIBAQEBAgMDAwMDAAAAAAAAAgIHAAICAAIBCAYKAAEAAAIEAAsEAgACCAUEAAAABgQCAAUEAAMAAwMD")
 };
 export const globalsec = {
-    entryCount: 17,
-    contents: decodeBase64('fwFBAAt/AUEAC28B0G8LfwFBAAt/AUEAC38BQX8LfwFBAAt/AEEAC38AQQELfwBBAgt/AUEAC38BQQALfwBBAAt/AUEAC38BQQALfwFBAAt/AEGsgwQL'),
+    entryCount: 18,
+    contents: decodeBase64("fwFBAAt/AUEAC28B0G8LfwFBAAt/AUEAC38BQX8LfwFBAAt/AEEAC38AQQELfwBBAgt/AUEAC38BQQALfwBBAAt/AUEAC38BQQALfwFBAAt/AUEAC38AQZyDBAs=")
 };
 export const codesec = {
-    entryCount: 81,
-    contents: decodeBase64('YAEGfz8AIQEgAUEQdEEPakEPQX9zcSECIAAgAksEQCAAIAJrQf//A2pB//8DQX9zcUEQdiEDIAEiBCADIgUgBCAFShshBiAGQABBAEgEQCADQABBAEgEQAALCwsgACQLCwkAIAAgATYCAAtWAQR/IABB/P///wNLBEBBgIEEQcCBBEEhQR0QAAALIwshASMLQQRqIQICfyAAIQMgA0EEakEPakEPQX9zcUEEawwACyEEIAIgBGoQBSABIAQQBiACDwsJACAAIAE2AgQLCQAgACABNgIICwkAIAAgATYCDAsJACAAIAE2AhALTgECfyAAQez///8DSwRAQYCBBEHAgQRB1gBBHhAAAAtBECAAahAHIQIgAkEEayEDIANBABAIIANBABAJIAMgARAKIAMgABALIAJBEGoPCwMAAQsRACAAIAE2AgAgACABQQAQDQsJACAAIAE2AgQLCQAgACABNgIICwkAIAAgATYCDAuNAQEEfyAARQRAQRBBBBAMIQALIABBABAOIABBABAPIABBABAQIABBABARIAFB/P///wNBAnZLBEBBoIAEQdCABEHGAEE8EAAACyABIgJBCCIDIAIgA0sbQQJ0IQQgBEEBEAwhBUEAIwlHGiAFQQAgBPwLACAAIAUQDiAAIAUQDyAAIAQQECAAIAEQESAACzkBAX8gAUH8////A0sEQEGggARBgIIEQTRBKxAAAAsgAUEBEAwhAkEAIwlHGiACQQAgAfwLACACDwsRACAAIAE2AgAgACABQQAQDQsJACAAIAE2AgQLEQAgACABNgIIIAAgAUEAEA0LCQAgACABNgIMCwkAIAAgATYCEAsJACAAIAE2AhQLTAAgAEUEQEEYQQUQDCEACyAAQQBBBEEEbBATEBQgAEEEQQFrEBUgAEEAQQQCf0EIDAALbBATEBYgAEEEEBcgAEEAEBggAEEAEBkgAAsvACMQQQRqQQ9qQQ9Bf3NxQQRrJAojCiQLQQBBABASJA1BAEEAEBIkDkEAEBokDwsGACMKJAsLBwBBARoQHAsEABAdCxgAQQAkAEF/JARBgIAEJAZBAEEAEBIkDQsHACAAEAcPCyEBAn8gAEEBakGACGwhASABECAhAiACQQAgAfwLACACDwsHACAAKAIMCwcAIAAoAggLBwAgACgCAAsHACAAKAIAC80BAQh/IABBAEcEfyAA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'),
+    entryCount: 72,
+    contents: decodeBase64("YAEGfz8AIQEgAUEQdEEPakEPQX9zcSECIAAgAksEQCAAIAJrQf//A2pB//8DQX9zcUEQdiEDIAEiBCADIgUgBCAFShshBiAGQABBAEgEQCADQABBAEgEQAALCwsgACQLCwkAIAAgATYCAAtWAQR/IABB/P///wNLBEBBgIEEQcCBBEEhQR0QAAALIwshASMLQQRqIQICfyAAIQMgA0EEakEPakEPQX9zcUEEawwACyEEIAIgBGoQBSABIAQQBiACDwsJACAAIAE2AgQLCQAgACABNgIICwkAIAAgATYCDAsJACAAIAE2AhALTgECfyAAQez///8DSwRAQYCBBEHAgQRB1gBBHhAAAAtBECAAahAHIQIgAkEEayEDIANBABAIIANBABAJIAMgARAKIAMgABALIAJBEGoPCwMAAQsRACAAIAE2AgAgACABQQAQDQsJACAAIAE2AgQLCQAgACABNgIICwkAIAAgATYCDAuNAQEEfyAARQRAQRBBBBAMIQALIABBABAOIABBABAPIABBABAQIABBABARIAFB/P///wNBAnZLBEBBoIAEQdCABEHGAEE8EAAACyABIgJBCCIDIAIgA0sbQQJ0IQQgBEEBEAwhBUEAIwlHGiAFQQAgBPwLACAAIAUQDiAAIAUQDyAAIAQQECAAIAEQESAACxEAIAAgATYCACAAIAFBABANCwkAIAAgATYCBAsJACAAIAE2AggLCQAgACABNgIMC40BAQR/IABFBEBBEEEFEAwhAAsgAEEAEBMgAEEAEBQgAEEAEBUgAEEAEBYgAUH8////A0EAdksEQEGggARB0IAEQcYAQTwQAAALIAEiAkEIIgMgAiADSxtBAHQhBCAEQQEQDCEFQQAjCUcaIAVBACAE/AsAIAAgBRATIAAgBRAUIAAgBBAVIAAgARAWIAALOQAjEUEEakEPakEPQX9zcUEEayQKIwokC0EAQQAQEiQNQQBBABASJA5BAEEAEBckD0EAQQAQEiQQCwYAIwokCwsHAEEBGhAZCwQAEBoLGABBACQAQX8kBEGAgAQkBkEAQQAQEiQNCwcAIAAQBw8LIQECfyAAQQFqQYAIbCEBIAEQHSECIAJBACAB/AsAIAIPCwcAIAAoAgwLBwAgACgCCAsHACAAKAIACwcAIAAoAgALzQEBCH8gAEEARwR/IABBD3FFBUEAC0UE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")
 };
 //# sourceMappingURL=ohmRuntime.wasm_sections.js.map

package/dist/src/Compiler.d.ts

@@ -7,7 +7,7 @@ export class Compiler {
         paramTypes: any[];
         resultTypes: any[];
     }[];
-    ruleIdByName: any;
+    ruleIdByName: StringTable;
     _failureDescriptions: StringTable;
     _endOfInputFailureId: any;
     _deferredRuleIds: Set<any>;
@@ -185,7 +185,8 @@ declare class Assembler {
     newTerminalNode(): void;
     i32Max(aThunk: any, bThunk: any): void;
     depthOf(label: any): number;
-    maybeMarkFailuresAsFluffy(): void;
+    pushFluffySavePoint(): void;
+    maybeMarkFluffyFromSavePoint(): void;
     ruleEvalReturn(): void;
 }
 declare namespace Assembler {

package/dist/src/Compiler.js

@@ -629,13 +629,20 @@ class Assembler {
         assert(i !== -1, `Unknown label: ${label}`);
         return this._blockStack.length - i - 1;
     }
-    maybeMarkFailuresAsFluffy() {
-        // Only mark if we're in error recording mode (errorMessagePos >= 0)
+    // Emit scoped fluffy marking: save the failure count, and after success
+    // at the recording position, mark only the new failures as fluffy.
+    // This mirrors ohm-js's MatchState.eval_ scoped failure recording.
+    pushFluffySavePoint() {
+        this.callPrebuiltFunc('pushFluffySavePoint');
+    }
+    maybeMarkFluffyFromSavePoint() {
         this.globalGet('errorMessagePos');
-        this.i32Const(0);
-        this.emit(instr.i32.ge_s);
+        this.globalGet('pos');
+        this.i32Eq();
         this.if(w.blocktype.empty, () => {
-            this.callPrebuiltFunc('makeFluffy');
+            this.callPrebuiltFunc('markFluffyFromSavePoint');
+        }, () => {
+            this.callPrebuiltFunc('dropFluffySavePoint');
         });
     }
     ruleEvalReturn() {
@@ -828,7 +835,8 @@ export class Compiler {
         asm.addGlobal('__ASC_RUNTIME', w.valtype.i32, w.mut.const, () => asm.i32Const(0));
         asm.addGlobal('bindings', w.valtype.i32, w.mut.var, () => asm.i32Const(0));
         asm.addGlobal('recordedFailures', w.valtype.i32, w.mut.var, () => asm.i32Const(0));
-        asm.addGlobal('fluffyFailureIds', w.valtype.i32, w.mut.var, () => asm.i32Const(0));
+        asm.addGlobal('fluffyFlags', w.valtype.i32, w.mut.var, () => asm.i32Const(0));
+        asm.addGlobal('fluffySaveStack', w.valtype.i32, w.mut.var, () => asm.i32Const(0));
         asm.addGlobal('__heap_base', w.valtype.i32, w.mut.var, () => asm.i32Const(65948));
         // Reserve a fixed number of imports for debug labels.
         if (DEBUG) {
@@ -1004,6 +1012,9 @@ export class Compiler {
             asm.addLocal('failurePos', w.valtype.i32);
             asm.globalGet('rightmostFailurePos');
             asm.localSet('failurePos');
+            // Save the failure count so we can scope fluffy marking to failures
+            // recorded during this rule's evaluation only.
+            asm.pushFluffySavePoint();
             if (hasDescription) {
                 asm.pushDescriptionFrame();
             }
@@ -1015,6 +1026,15 @@ export class Compiler {
             }
             asm.emit(`BEGIN eval:${name}`);
             this.emitPExpr(ruleInfo.body);
+            // When a rule body succeeds and pos matches errorMessagePos, mark
+            // failures recorded DURING this rule eval as fluffy. This mirrors
+            // ohm-js's MatchState.eval_, which uses scoped failure recording.
+            asm.localGet('ret');
+            asm.if(w.blocktype.empty, () => {
+                asm.maybeMarkFluffyFromSavePoint();
+            }, () => {
+                asm.callPrebuiltFunc('dropFluffySavePoint');
+            });
             // Handle rules with descriptions - must come BEFORE restoreFailurePos
             if (hasDescription)
                 asm.handleDescriptionFailure(descriptionId);
@@ -1494,19 +1514,23 @@ export class Compiler {
     emitLookahead({ child }) {
         const { asm } = this;
         // TODO: Should positive lookahead record a CST?
+        asm.pushFluffySavePoint();
         this.emitPExpr(child);
         asm.restoreBindingsLength();
         asm.restorePos();
-        // When lookahead succeeds, mark failures as fluffy
+        // When lookahead succeeds, mark inner failures as fluffy (scoped).
         asm.localGet('ret');
         asm.if(w.blocktype.empty, () => {
-            asm.maybeMarkFailuresAsFluffy();
+            asm.maybeMarkFluffyFromSavePoint();
+        }, () => {
+            asm.callPrebuiltFunc('dropFluffySavePoint');
         });
     }
     emitNot({ child }) {
         const { asm } = this;
         const failureId = this.toFailure(child);
         // Push an inner stack frame with the failure positions.
+        asm.pushFluffySavePoint();
         asm.pushStackFrame(() => {
             asm.saveFailurePos();
             asm.saveGlobalFailurePos();
@@ -1524,9 +1548,10 @@ export class Compiler {
         asm.restorePos();
         asm.localGet('ret');
         asm.ifElse(w.blocktype.empty, () => {
-            // When not succeeds (child failed), mark failures as fluffy
-            asm.maybeMarkFailuresAsFluffy();
+            // When not succeeds (child failed), mark inner failures as fluffy (scoped).
+            asm.maybeMarkFluffyFromSavePoint();
         }, () => {
+            asm.callPrebuiltFunc('dropFluffySavePoint');
             // When not fails (child succeeded), update failurePos to origPos.
             // This is equivalent to Ohm.js's processFailure(origPos, this).
             // Note: pos has already been restored by restorePos() above.
@@ -1539,6 +1564,7 @@ export class Compiler {
     }
     emitOpt({ child }) {
         const { asm } = this;
+        asm.pushFluffySavePoint();
         this.emitPExpr(child);
         asm.localGet('ret');
         asm.ifFalse(w.blocktype.empty, () => {
@@ -1546,7 +1572,8 @@ export class Compiler {
             asm.restoreBindingsLength();
         });
         asm.newIterNodeWithSavedPosAndBindings(ir.outArity(child), true);
-        asm.maybeMarkFailuresAsFluffy(); // Opt always succeeds, so mark failures as fluffy
+        // Opt always succeeds, so mark inner failures as fluffy (scoped).
+        asm.maybeMarkFluffyFromSavePoint();
         asm.localSet('ret');
     }
     emitPlus(plusExp) {
@@ -1603,6 +1630,7 @@ export class Compiler {
     }
     emitStar({ child }, { reuseStackFrame } = {}) {
         const { asm } = this;
+        asm.pushFluffySavePoint();
         // We push another stack frame because we need to save and restore
         // the position just before the last (failed) expression.
         asm.pushStackFrame();
@@ -1621,7 +1649,8 @@ export class Compiler {
         asm.restoreBindingsLength();
         asm.popStackFrame();
         asm.newIterNodeWithSavedPosAndBindings(ir.outArity(child));
-        asm.maybeMarkFailuresAsFluffy(); // Star always succeeds, so mark failures as fluffy
+        // Star always succeeds, so mark inner failures as fluffy (scoped).
+        asm.maybeMarkFluffyFromSavePoint();
         asm.localSet('ret');
     }
     wrapTerminalLike(thunk, failureId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohm-js/wasm",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Compile Ohm.js grammars to WebAsssembly",
   "main": "dist/index.js",
   "exports": {

package/dist/src/util.d.ts

@@ -1,16 +0,0 @@
-export function awaitBuiltInRules(cb: any): void;
-export function announceBuiltInRules(grammar: any): void;
-export function getLineAndColumn(str: any, offset: any): {
-    offset: any;
-    lineNum: number;
-    colNum: number;
-    line: any;
-    prevLine: any;
-    nextLine: any;
-    toString: typeof lineAndColumnToMessage;
-};
-export function getLineAndColumnMessage(str: any, offset: any, ...ranges: any[]): any;
-export function uniqueId(prefix: any): string;
-declare function lineAndColumnToMessage(...ranges: any[]): any;
-export {};
-//# sourceMappingURL=util.d.ts.map

package/dist/src/util.js

@@ -1,150 +0,0 @@
-import * as common from './common.js';
-// --------------------------------------------------------------------
-// Private stuff
-// --------------------------------------------------------------------
-// Given an array of numbers `arr`, return an array of the numbers as strings,
-// right-justified and padded to the same length.
-function padNumbersToEqualLength(arr) {
-    let maxLen = 0;
-    const strings = arr.map(n => {
-        const str = n.toString();
-        maxLen = Math.max(maxLen, str.length);
-        return str;
-    });
-    return strings.map(s => common.padLeft(s, maxLen));
-}
-// Produce a new string that would be the result of copying the contents
-// of the string `src` onto `dest` at offset `offest`.
-function strcpy(dest, src, offset) {
-    const origDestLen = dest.length;
-    const start = dest.slice(0, offset);
-    const end = dest.slice(offset + src.length);
-    return (start + src + end).substr(0, origDestLen);
-}
-// Casts the underlying lineAndCol object to a formatted message string,
-// highlighting `ranges`.
-function lineAndColumnToMessage(...ranges) {
-    const lineAndCol = this;
-    const { offset } = lineAndCol;
-    const { repeatStr } = common;
-    const sb = new common.StringBuffer();
-    sb.append('Line ' + lineAndCol.lineNum + ', col ' + lineAndCol.colNum + ':\n');
-    // An array of the previous, current, and next line numbers as strings of equal length.
-    const lineNumbers = padNumbersToEqualLength([
-        lineAndCol.prevLine == null ? 0 : lineAndCol.lineNum - 1,
-        lineAndCol.lineNum,
-        lineAndCol.nextLine == null ? 0 : lineAndCol.lineNum + 1,
-    ]);
-    // Helper for appending formatting input lines to the buffer.
-    const appendLine = (num, content, prefix) => {
-        sb.append(prefix + lineNumbers[num] + ' | ' + content + '\n');
-    };
-    // Include the previous line for context if possible.
-    if (lineAndCol.prevLine != null) {
-        appendLine(0, lineAndCol.prevLine, '  ');
-    }
-    // Line that the error occurred on.
-    appendLine(1, lineAndCol.line, '> ');
-    // Build up the line that points to the offset and possible indicates one or more ranges.
-    // Start with a blank line, and indicate each range by overlaying a string of `~` chars.
-    const lineLen = lineAndCol.line.length;
-    let indicationLine = repeatStr(' ', lineLen + 1);
-    for (let i = 0; i < ranges.length; ++i) {
-        let startIdx = ranges[i][0];
-        let endIdx = ranges[i][1];
-        common.assert(startIdx >= 0 && startIdx <= endIdx, 'range start must be >= 0 and <= end');
-        const lineStartOffset = offset - lineAndCol.colNum + 1;
-        startIdx = Math.max(0, startIdx - lineStartOffset);
-        endIdx = Math.min(endIdx - lineStartOffset, lineLen);
-        indicationLine = strcpy(indicationLine, repeatStr('~', endIdx - startIdx), startIdx);
-    }
-    const gutterWidth = 2 + lineNumbers[1].length + 3;
-    sb.append(repeatStr(' ', gutterWidth));
-    indicationLine = strcpy(indicationLine, '^', lineAndCol.colNum - 1);
-    sb.append(indicationLine.replace(/ +$/, '') + '\n');
-    // Include the next line for context if possible.
-    if (lineAndCol.nextLine != null) {
-        appendLine(2, lineAndCol.nextLine, '  ');
-    }
-    return sb.contents();
-}
-// --------------------------------------------------------------------
-// Exports
-// --------------------------------------------------------------------
-let builtInRulesCallbacks = [];
-// Since Grammar.BuiltInRules is bootstrapped, most of Ohm can't directly depend it.
-// This function allows modules that do depend on the built-in rules to register a callback
-// that will be called later in the initialization process.
-export function awaitBuiltInRules(cb) {
-    builtInRulesCallbacks.push(cb);
-}
-export function announceBuiltInRules(grammar) {
-    builtInRulesCallbacks.forEach(cb => {
-        cb(grammar);
-    });
-    builtInRulesCallbacks = null;
-}
-// Return an object with the line and column information for the given
-// offset in `str`.
-export function getLineAndColumn(str, offset) {
-    let lineNum = 1;
-    let colNum = 1;
-    let currOffset = 0;
-    let lineStartOffset = 0;
-    let nextLine = null;
-    let prevLine = null;
-    let prevLineStartOffset = -1;
-    while (currOffset < offset) {
-        const c = str.charAt(currOffset++);
-        if (c === '\n') {
-            lineNum++;
-            colNum = 1;
-            prevLineStartOffset = lineStartOffset;
-            lineStartOffset = currOffset;
-        }
-        else if (c !== '\r') {
-            colNum++;
-        }
-    }
-    // Find the end of the target line.
-    let lineEndOffset = str.indexOf('\n', lineStartOffset);
-    if (lineEndOffset === -1) {
-        lineEndOffset = str.length;
-    }
-    else {
-        // Get the next line.
-        const nextLineEndOffset = str.indexOf('\n', lineEndOffset + 1);
-        nextLine =
-            nextLineEndOffset === -1
-                ? str.slice(lineEndOffset)
-                : str.slice(lineEndOffset, nextLineEndOffset);
-        // Strip leading and trailing EOL char(s).
-        nextLine = nextLine.replace(/^\r?\n/, '').replace(/\r$/, '');
-    }
-    // Get the previous line.
-    if (prevLineStartOffset >= 0) {
-        // Strip trailing EOL char(s).
-        prevLine = str.slice(prevLineStartOffset, lineStartOffset).replace(/\r?\n$/, '');
-    }
-    // Get the target line, stripping a trailing carriage return if necessary.
-    const line = str.slice(lineStartOffset, lineEndOffset).replace(/\r$/, '');
-    return {
-        offset,
-        lineNum,
-        colNum,
-        line,
-        prevLine,
-        nextLine,
-        toString: lineAndColumnToMessage,
-    };
-}
-// Return a nicely-formatted string describing the line and column for the
-// given offset in `str` highlighting `ranges`.
-export function getLineAndColumnMessage(str, offset, ...ranges) {
-    return getLineAndColumn(str, offset).toString(...ranges);
-}
-export const uniqueId = (() => {
-    let idCounter = 0;
-    return prefix => '' + prefix + idCounter++;
-})();
-//# sourceMappingURL=util.js.map