clarity-pattern-parser 11.3.3 → 11.3.5

package/dist/index.browser.js

@@ -912,7 +912,7 @@
             for (let pattern of this._recursiveAncestors) {
                 if (pattern.startedOnIndex === this.startedOnIndex) {
                     depth++;
-                    if (depth > 0) {
+                    if (depth > 1) {
                         return true;
                     }
                 }
@@ -2831,6 +2831,7 @@
             this._hasOrganized = false;
             this._patterns = [];
             this._precedenceTree = new PrecedenceTree({}, {});
+            this._atomsIdToAncestorsMap = {};
         }
         _organizePatterns(patterns) {
             const finalPatterns = [];
@@ -2877,6 +2878,19 @@
             this._precedenceTree = new PrecedenceTree(this._precedenceMap, this._associationMap);
             return finalPatterns;
         }
+        _cacheAncestors() {
+            for (let atom of this._atomPatterns) {
+                const id = atom.id;
+                const ancestors = this._atomsIdToAncestorsMap[id] = [];
+                let pattern = this.parent;
+                while (pattern != null) {
+                    if (pattern.id === id) {
+                        ancestors.push(pattern);
+                    }
+                    pattern = pattern.parent;
+                }
+            }
+        }
         _extractName(pattern) {
             if (pattern.type === "right-associated") {
                 return pattern.children[0].name;
@@ -2953,6 +2967,7 @@
             if (!this._hasOrganized) {
                 this._hasOrganized = true;
                 this._organizePatterns(this._originalPatterns);
+                this._cacheAncestors();
             }
         }
         parse(cursor) {
@@ -3033,6 +3048,9 @@
             for (let i = 0; i < this._atomPatterns.length; i++) {
                 cursor.moveTo(onIndex);
                 const pattern = this._atomPatterns[i];
+                if (this._isBeyondRecursiveAllowance(pattern, onIndex)) {
+                    continue;
+                }
                 const node = pattern.parse(cursor);
                 if (node != null) {
                     this._precedenceTree.addAtom(node);
@@ -3050,6 +3068,10 @@
                 }
             }
         }
+        _isBeyondRecursiveAllowance(atom, onIndex) {
+            const ancestors = this._atomsIdToAncestorsMap[atom.id];
+            return ancestors.some(a => a.startedOnIndex === onIndex);
+        }
         _tryToMatchPostfix(cursor) {
             let onIndex = cursor.index;
             for (let i = 0; i < this._postfixPatterns.length; i++) {