clarity-pattern-parser 10.1.21 → 10.1.23

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.
 */
@@ -1049,7 +1064,7 @@ class Options {
     getTokens() {
         const tokens = [];
         for (const pattern of this._children) {
-            if (pattern.type === "reference" && pattern.name === this.name) {
+            if (isRecursivePattern(pattern)) {
                 continue;
             }
             tokens.push(...pattern.getTokens());
@@ -1071,7 +1086,7 @@ class Options {
     getPatterns() {
         const patterns = [];
         for (const pattern of this._children) {
-            if (pattern.type === "reference" && pattern.name === this.name) {
+            if (isRecursivePattern(pattern)) {
                 continue;
             }
             patterns.push(...pattern.getPatterns());
@@ -1802,7 +1817,7 @@ class Sequence {
     getTokens() {
         const tokens = [];
         for (const pattern of this._children) {
-            if (pattern.type === "reference" && pattern.name === this.name && pattern === this.children[0]) {
+            if (isRecursivePattern(pattern) && pattern === this._children[0]) {
                 return tokens;
             }
             tokens.push(...pattern.getTokens());
@@ -1827,7 +1842,7 @@ class Sequence {
     getPatterns() {
         const patterns = [];
         for (const pattern of this._children) {
-            if (pattern.type === "reference" && pattern.name === this.name && pattern === this.children[0]) {
+            if (isRecursivePattern(pattern) && pattern === this._children[0]) {
                 return patterns;
             }
             patterns.push(...pattern.getPatterns());
@@ -2612,6 +2627,9 @@ class Context {
         return this._pattern.getTokens();
     }
     getTokensAfter(childReference) {
+        if (this.parent == null) {
+            return [];
+        }
         return this._pattern.getTokensAfter(childReference);
     }
     getNextTokens() {
@@ -2621,7 +2639,10 @@ class Context {
         return this._pattern.getPatterns();
     }
     getPatternsAfter(childReference) {
-        return this._pattern.getPatternsAfter(childReference);
+        if (this.parent == null) {
+            return [];
+        }
+        return this.parent.getPatternsAfter(childReference);
     }
     getNextPatterns() {
         return this._pattern.getNextPatterns();