clarity-pattern-parser 10.1.20 → 10.1.22

package/dist/index.browser.js

@@ -819,9 +819,9 @@
             };
         }
         parse(cursor) {
-            return this._getPatternSafely().parse(cursor);
+            return this.getReferencePatternSafely().parse(cursor);
         }
-        _getPatternSafely() {
+        getReferencePatternSafely() {
             if (this._pattern === null) {
                 let pattern = null;
                 if (this._cachedPattern == null) {
@@ -881,7 +881,7 @@
             return node;
         }
         getTokens() {
-            return this._getPatternSafely().getTokens();
+            return this.getReferencePatternSafely().getTokens();
         }
         getTokensAfter(_lastMatched) {
             if (this._parent == null) {
@@ -896,7 +896,7 @@
             return this.parent.getTokensAfter(this);
         }
         getPatterns() {
-            return this._getPatternSafely().getPatterns();
+            return this.getReferencePatternSafely().getPatterns();
         }
         getPatternsAfter(_childReference) {
             if (this._parent == null) {
@@ -954,6 +954,21 @@
         }
     }
 
+    function isRecursivePattern(pattern) {
+        let onPattern = pattern.parent;
+        let depth = 0;
+        while (onPattern != null) {
+            if (onPattern.id === pattern.id) {
+                depth++;
+            }
+            onPattern = onPattern.parent;
+            if (depth > 1) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /*
       The following is created to reduce the overhead of recursion check.
     */
@@ -1050,8 +1065,11 @@
         }
         getTokens() {
             const tokens = [];
-            for (const child of this._children) {
-                tokens.push(...child.getTokens());
+            for (const pattern of this._children) {
+                if (isRecursivePattern(pattern)) {
+                    continue;
+                }
+                tokens.push(...pattern.getTokens());
             }
             return tokens;
         }
@@ -1070,6 +1088,9 @@
         getPatterns() {
             const patterns = [];
             for (const pattern of this._children) {
+                if (isRecursivePattern(pattern)) {
+                    continue;
+                }
                 patterns.push(...pattern.getPatterns());
             }
             return patterns;
@@ -1797,9 +1818,12 @@
         }
         getTokens() {
             const tokens = [];
-            for (const child of this._children) {
-                tokens.push(...child.getTokens());
-                if (child.type !== "optional" && child.type !== "not") {
+            for (const pattern of this._children) {
+                if (isRecursivePattern(pattern) && pattern === this._children[0]) {
+                    return tokens;
+                }
+                tokens.push(...pattern.getTokens());
+                if (pattern.type !== "optional" && pattern.type !== "not") {
                     break;
                 }
             }
@@ -1819,9 +1843,12 @@
         }
         getPatterns() {
             const patterns = [];
-            for (const child of this._children) {
-                patterns.push(...child.getPatterns());
-                if (child.type !== "optional" && child.type !== "not") {
+            for (const pattern of this._children) {
+                if (isRecursivePattern(pattern) && pattern === this._children[0]) {
+                    return patterns;
+                }
+                patterns.push(...pattern.getPatterns());
+                if (pattern.type !== "optional" && pattern.type !== "not") {
                     break;
                 }
             }