clarity-pattern-parser 11.0.16 → 11.0.19

package/dist/index.browser.js

@@ -885,7 +885,7 @@
             for (let pattern of this._recursiveAncestors) {
                 if (pattern._firstIndex === this._firstIndex) {
                     depth++;
-                    if (depth > 1) {
+                    if (depth > 0) {
                         return true;
                     }
                 }
@@ -2924,12 +2924,10 @@
             this._associationMap = {};
             this._precedenceMap = {};
             this._originalPatterns = patterns;
-            this._patterns = this._organizePatterns(patterns);
             this._shouldStopParsing = false;
-            this._precedenceTree = new PrecedenceTree(this._precedenceMap, this._associationMap);
-            if (this._atomPatterns.length === 0) {
-                throw new Error("Need at least one terminating pattern with an 'expression' pattern.");
-            }
+            this._hasOrganized = false;
+            this._patterns = [];
+            this._precedenceTree = new PrecedenceTree({}, {});
         }
         _organizePatterns(patterns) {
             const finalPatterns = [];
@@ -2972,6 +2970,8 @@
                     finalPatterns.push(binary);
                 }
             });
+            this._patterns = finalPatterns;
+            this._precedenceTree = new PrecedenceTree(this._precedenceMap, this._associationMap);
             return finalPatterns;
         }
         _extractName(pattern) {
@@ -3028,7 +3028,10 @@
         }
         _unwrapAssociationIfNecessary(pattern) {
             if (pattern.type === "right-associated") {
-                return pattern.children[0];
+                pattern = pattern.children[0];
+            }
+            if (pattern.type === "reference") {
+                pattern = pattern.getReferencePatternSafely();
             }
             return pattern;
         }
@@ -3043,6 +3046,16 @@
         }
         parse(cursor) {
             this._firstIndex = cursor.index;
+            if (!this._hasOrganized) {
+                this._hasOrganized = true;
+                this._organizePatterns(this._originalPatterns);
+            }
+            // If there are not any atom nodes then nothing can be found.
+            if (this._atomPatterns.length < 1) {
+                cursor.moveTo(this._firstIndex);
+                cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
+                return null;
+            }
             const node = this._tryToParse(cursor);
             if (node != null) {
                 node.normalize(this._firstIndex);
@@ -3550,8 +3563,8 @@
             return options;
         }
         _isRecursive(name, pattern) {
-            if (pattern.type === "right-associated" && this._isRecursivePattern(name, pattern.children[0])) {
-                return true;
+            if (pattern.type === "right-associated") {
+                pattern = pattern.children[0];
             }
             return this._isRecursivePattern(name, pattern);
         }
@@ -3562,9 +3575,10 @@
             const firstChild = pattern.children[0];
             const lastChild = pattern.children[pattern.children.length - 1];
             const isLongEnough = pattern.children.length >= 2;
-            return pattern.type === "sequence" && isLongEnough &&
-                (firstChild.type === "reference" && firstChild.name === name) ||
-                (lastChild.type === "reference" && lastChild.name === name);
+            return pattern.type === "reference" ||
+                (pattern.type === "sequence" && isLongEnough &&
+                    (firstChild.type === "reference" && firstChild.name === name) ||
+                    (lastChild.type === "reference" && lastChild.name === name));
         }
         _buildPattern(node) {
             const type = node.name;