clarity-pattern-parser 10.1.20 → 10.1.22

package/dist/index.js

@@ -817,9 +817,9 @@ class Reference {
         };
     }
     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) {
@@ -879,7 +879,7 @@ class Reference {
         return node;
     }
     getTokens() {
-        return this._getPatternSafely().getTokens();
+        return this.getReferencePatternSafely().getTokens();
     }
     getTokensAfter(_lastMatched) {
         if (this._parent == null) {
@@ -894,7 +894,7 @@ class Reference {
         return this.parent.getTokensAfter(this);
     }
     getPatterns() {
-        return this._getPatternSafely().getPatterns();
+        return this.getReferencePatternSafely().getPatterns();
     }
     getPatternsAfter(_childReference) {
         if (this._parent == null) {
@@ -952,6 +952,21 @@ class DepthCache {
     }
 }
 
+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.
 */
@@ -1048,8 +1063,11 @@ class Options {
     }
     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;
     }
@@ -1068,6 +1086,9 @@ class Options {
     getPatterns() {
         const patterns = [];
         for (const pattern of this._children) {
+            if (isRecursivePattern(pattern)) {
+                continue;
+            }
             patterns.push(...pattern.getPatterns());
         }
         return patterns;
@@ -1795,9 +1816,12 @@ class Sequence {
     }
     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;
             }
         }
@@ -1817,9 +1841,12 @@ class Sequence {
     }
     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;
             }
         }