clarity-pattern-parser 10.0.4 → 10.0.6

package/dist/index.browser.js

@@ -285,7 +285,6 @@
             this._patterns = [];
             this._nodes = [];
             this._errors = [];
-            this._trace = [];
         }
         get isRecording() {
             return this._isRecording;
@@ -314,9 +313,6 @@
         get patterns() {
             return this._patterns;
         }
-        get trace() {
-            return this._trace;
-        }
         recordMatch(pattern, node) {
             if (this._isRecording) {
                 this._patterns.push(pattern);
@@ -371,20 +367,8 @@
         resolveError() {
             this._currentError = null;
         }
-        pushStackTrace(trace) {
-            if (this._isRecording) {
-                this._trace.push(trace);
-            }
-        }
     }
 
-    class CyclicalParseError extends Error {
-        constructor(patternId, patternName) {
-            super("Cyclical Parse Error");
-            this.patternId = patternId;
-            this.patternName = patternName;
-        }
-    }
     class Cursor {
         get text() {
             return this._text;
@@ -439,7 +423,6 @@
             this._index = 0;
             this._length = [...text].length;
             this._history = new CursorHistory();
-            this._stackTrace = [];
         }
         hasNext() {
             return this._index + 1 < this._length;
@@ -489,35 +472,6 @@
         stopRecording() {
             this._history.stopRecording();
         }
-        startParseWith(pattern) {
-            const trace = {
-                pattern,
-                cursorIndex: this.index
-            };
-            const hasCycle = this._stackTrace.filter(t => t.pattern.id === pattern.id && this.index === t.cursorIndex).length > 1;
-            if (hasCycle) {
-                throw new CyclicalParseError(pattern.id, pattern.name);
-            }
-            this._history.pushStackTrace(trace);
-            this._stackTrace.push(trace);
-        }
-        endParse() {
-            this._stackTrace.pop();
-        }
-        audit() {
-            return this._history.trace.map(t => {
-                const onChar = this.getChars(t.cursorIndex, t.cursorIndex);
-                const restChars = this.getChars(t.cursorIndex + 1, t.cursorIndex + 5);
-                const context = `{${t.cursorIndex}}[${onChar}]${restChars}`;
-                return `${this._buildPatternContext(t.pattern)}-->${context}`;
-            });
-        }
-        _buildPatternContext(pattern) {
-            if (pattern.parent != null) {
-                return `${pattern.parent.name}.${pattern.name}`;
-            }
-            return pattern.name;
-        }
     }
 
     let idIndex$9 = 0;
@@ -573,18 +527,15 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             const passed = this._tryToParse(cursor);
             if (passed) {
                 cursor.resolveError();
                 const node = this._createNode();
                 cursor.recordMatch(this, node);
-                cursor.endParse();
                 return node;
             }
             cursor.recordErrorAt(this._firstIndex, this._endIndex, this);
-            cursor.endParse();
             return null;
         }
         _tryToParse(cursor) {
@@ -713,11 +664,9 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             this.resetState(cursor);
             this.tryToParse(cursor);
-            cursor.endParse();
             return this._node;
         }
         resetState(cursor) {
@@ -987,36 +936,26 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             const node = this._tryToParse(cursor);
             if (node != null) {
                 cursor.moveTo(node.lastIndex);
                 cursor.resolveError();
-                cursor.endParse();
                 return node;
             }
             cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
-            cursor.endParse();
             return null;
         }
         _tryToParse(cursor) {
+            if (this._isBeyondRecursiveLimit()) {
+                cursor.recordErrorAt(cursor.index, cursor.index, this);
+                return null;
+            }
             const results = [];
             for (const pattern of this._children) {
                 cursor.moveTo(this._firstIndex);
                 let result = null;
-                try {
-                    result = pattern.parse(cursor);
-                }
-                catch (error) {
-                    if (error.patternId === this._id) {
-                        continue;
-                    }
-                    else {
-                        cursor.endParse();
-                        throw error;
-                    }
-                }
+                result = pattern.parse(cursor);
                 if (this._isGreedy) {
                     results.push(result);
                 }
@@ -1029,6 +968,25 @@
             nonNullResults.sort((a, b) => b.endIndex - a.endIndex);
             return nonNullResults[0] || null;
         }
+        _isBeyondRecursiveLimit() {
+            let pattern = this;
+            const matches = [];
+            while (pattern.parent != null) {
+                if (pattern.type !== "options") {
+                    pattern = pattern.parent;
+                    continue;
+                }
+                const optionsPattern = pattern;
+                if (pattern.id === this.id && optionsPattern._firstIndex === this._firstIndex) {
+                    matches.push(pattern);
+                    if (matches.length > 2) {
+                        return true;
+                    }
+                }
+                pattern = pattern.parent;
+            }
+            return false;
+        }
         getTokens() {
             const tokens = [];
             for (const child of this._children) {
@@ -1128,7 +1086,6 @@
             }
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             const startIndex = cursor.index;
             const nodes = [];
             const modulo = this._hasDivider ? 2 : 1;
@@ -1167,19 +1124,16 @@
                 const lastIndex = cursor.index;
                 cursor.moveTo(startIndex);
                 cursor.recordErrorAt(startIndex, lastIndex, this);
-                cursor.endParse();
                 return null;
             }
             if (nodes.length === 0 && !cursor.hasError) {
                 cursor.moveTo(startIndex);
-                cursor.endParse();
                 return null;
             }
             const firstIndex = nodes[0].firstIndex;
             const lastIndex = nodes[nodes.length - 1].lastIndex;
             cursor.resolveError();
             cursor.moveTo(lastIndex);
-            cursor.endParse();
             return new Node(this._type, this.name, firstIndex, lastIndex, nodes);
         }
         test(text) {
@@ -1325,7 +1279,6 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             this._nodes = [];
             const passed = this._tryToParse(cursor);
@@ -1336,15 +1289,12 @@
                     cursor.moveTo(node.lastIndex);
                     cursor.recordMatch(this, node);
                 }
-                cursor.endParse();
                 return node;
             }
             if (this._min > 0) {
-                cursor.endParse();
                 return null;
             }
             cursor.resolveError();
-            cursor.endParse();
             return null;
         }
         _meetsMin() {
@@ -1683,19 +1633,20 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             this._nodes = [];
+            if (this._isBeyondRecursiveLimit()) {
+                cursor.recordErrorAt(cursor.index, cursor.index, this);
+                return null;
+            }
             const passed = this.tryToParse(cursor);
             if (passed) {
                 const node = this.createNode(cursor);
                 if (node !== null) {
                     cursor.recordMatch(this, node);
                 }
-                cursor.endParse();
                 return node;
             }
-            cursor.endParse();
             return null;
         }
         tryToParse(cursor) {
@@ -1755,6 +1706,25 @@
             }
             return passed;
         }
+        _isBeyondRecursiveLimit() {
+            let pattern = this;
+            const matches = [];
+            while (pattern.parent != null) {
+                if (pattern.type !== "sequence") {
+                    pattern = pattern.parent;
+                    continue;
+                }
+                const sequencePattern = pattern;
+                if (pattern.id === this.id && sequencePattern._firstIndex === this._firstIndex) {
+                    matches.push(pattern);
+                    if (matches.length > 1) {
+                        return true;
+                    }
+                }
+                pattern = pattern.parent;
+            }
+            return false;
+        }
         getLastValidNode() {
             const nodes = filterOutNull(this._nodes);
             if (nodes.length === 0) {
@@ -1937,17 +1907,14 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             const firstIndex = cursor.index;
             const node = this._children[0].parse(cursor);
             if (cursor.hasError) {
                 cursor.resolveError();
                 cursor.moveTo(firstIndex);
-                cursor.endParse();
                 return null;
             }
             else {
-                cursor.endParse();
                 return node;
             }
         }
@@ -2252,7 +2219,6 @@
             };
         }
         parse(cursor) {
-            cursor.startParseWith(this);
             const firstIndex = cursor.index;
             this._children[0].parse(cursor);
             if (cursor.hasError) {
@@ -2264,7 +2230,6 @@
                 cursor.resolveError();
                 cursor.recordErrorAt(firstIndex, firstIndex, this);
             }
-            cursor.endParse();
             return null;
         }
         clone(name = this._name) {