clarity-pattern-parser 11.5.2 → 11.5.4

package/dist/index.js

@@ -2883,8 +2883,12 @@ class Expression {
     get postfixPatterns() {
         return this._postfixPatterns;
     }
+    get infixPatterns() {
+        return this._infixPatterns;
+    }
+    // @deprecated use infixPatterns instead
     get binaryPatterns() {
-        return this._binaryPatterns;
+        return this._infixPatterns;
     }
     get originalPatterns() {
         return this._originalPatterns;
@@ -2908,8 +2912,8 @@ class Expression {
         this._prefixNames = [];
         this._postfixPatterns = [];
         this._postfixNames = [];
-        this._binaryPatterns = [];
-        this._binaryNames = [];
+        this._infixPatterns = [];
+        this._infixNames = [];
         this._associationMap = {};
         this._precedenceMap = {};
         this._originalPatterns = patterns;
@@ -2948,18 +2952,18 @@ class Expression {
             }
             else if (this._isBinary(pattern)) {
                 const name = this._extractName(pattern);
-                const binary = this._extractBinary(pattern);
-                binary.parent = this;
+                const infix = this._extractInfix(pattern);
+                infix.parent = this;
                 this._precedenceMap[name] = index;
-                this._binaryPatterns.push(binary);
-                this._binaryNames.push(name);
+                this._infixPatterns.push(infix);
+                this._infixNames.push(name);
                 if (pattern.type === "right-associated") {
                     this._associationMap[name] = Association.right;
                 }
                 else {
                     this._associationMap[name] = Association.left;
                 }
-                finalPatterns.push(binary);
+                finalPatterns.push(infix);
             }
         });
         this._patterns = finalPatterns;
@@ -3025,11 +3029,11 @@ class Expression {
         const lastChildIsReference = this._isRecursiveReference(lastChild);
         return firstChildIsReference && lastChildIsReference && pattern.children.length > 2;
     }
-    _extractBinary(pattern) {
+    _extractInfix(pattern) {
         pattern = this._unwrapAssociationIfNecessary(pattern);
         const children = pattern.children.slice(1, -1);
-        const binarySequence = new Sequence(`${pattern.name}-delimiter`, children);
-        return binarySequence;
+        const infixSequence = new Sequence(`${pattern.name}-delimiter`, children);
+        return infixSequence;
     }
     _unwrapAssociationIfNecessary(pattern) {
         if (pattern.type === "right-associated") {
@@ -3189,13 +3193,13 @@ class Expression {
     _tryToMatchBinary(cursor) {
         let onIndex = cursor.index;
         let foundMatch = false;
-        if (this.binaryPatterns.length === 0) {
+        if (this.infixPatterns.length === 0) {
             this._shouldStopParsing = true;
         }
-        for (let i = 0; i < this._binaryPatterns.length; i++) {
+        for (let i = 0; i < this._infixPatterns.length; i++) {
             cursor.moveTo(onIndex);
-            const pattern = this._binaryPatterns[i];
-            const name = this._binaryNames[i];
+            const pattern = this._infixPatterns[i];
+            const name = this._infixNames[i];
             const node = pattern.parse(cursor);
             if (node != null) {
                 foundMatch = true;
@@ -3231,22 +3235,30 @@ class Expression {
     }
     getTokensAfter(childReference) {
         this.build();
-        if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
+        if (this._prefixPatterns.includes(childReference) || this._infixPatterns.includes(childReference)) {
             const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
             const prefixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
             return [...prefixTokens, ...atomTokens];
         }
         if (this._atomPatterns.includes(childReference)) {
             const postfixTokens = this.postfixPatterns.map(p => p.getTokens()).flat();
-            if (postfixTokens.length === 0) {
-                return this._binaryPatterns.map(p => p.getTokens()).flat();
+            const infixTokens = this._infixPatterns.map(p => p.getTokens()).flat();
+            if (this._parent != null) {
+                return [...postfixTokens, ...infixTokens, ...this._parent.getNextTokens()];
             }
-            return postfixTokens;
+            return [...postfixTokens, ...infixTokens];
+        }
+        if (this._infixPatterns.includes(childReference)) {
+            const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
+            return atomTokens;
         }
         if (this._postfixPatterns.includes(childReference)) {
             const postfixTokens = this.postfixPatterns.map(p => p.getTokens()).flat();
-            const binaryTokens = this._binaryPatterns.map(p => p.getTokens()).flat();
-            return [...postfixTokens, ...binaryTokens];
+            const infixTokens = this._infixPatterns.map(p => p.getTokens()).flat();
+            if (this._parent != null) {
+                return [...postfixTokens, ...infixTokens, ...this._parent.getNextTokens()];
+            }
+            return [...postfixTokens, ...infixTokens];
         }
         return [];
     }
@@ -3264,22 +3276,30 @@ class Expression {
     }
     getPatternsAfter(childReference) {
         this.build();
-        if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
+        if (this._prefixPatterns.includes(childReference) || this._infixPatterns.includes(childReference)) {
             const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
             const prefixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();
             return [...prefixPatterns, ...atomPatterns];
         }
         if (this._atomPatterns.includes(childReference)) {
             const postfixPatterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
-            if (postfixPatterns.length === 0) {
-                return this._binaryPatterns.map(p => p.getPatterns()).flat();
+            const infixPatterns = this._infixPatterns.map(p => p.getPatterns()).flat();
+            if (this._parent != null) {
+                return [...postfixPatterns, ...infixPatterns, ...this._parent.getNextPatterns()];
             }
-            return postfixPatterns;
+            return [...postfixPatterns, ...infixPatterns];
+        }
+        if (this._infixPatterns.includes(childReference)) {
+            const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
+            return atomPatterns;
         }
         if (this._postfixPatterns.includes(childReference)) {
             const postfixPatterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
-            const binaryPatterns = this._binaryPatterns.map(p => p.getPatterns()).flat();
-            return [...postfixPatterns, ...binaryPatterns];
+            const infixPatterns = this._infixPatterns.map(p => p.getPatterns()).flat();
+            if (this._parent != null) {
+                return [...postfixPatterns, ...infixPatterns, ...this._parent.getNextPatterns()];
+            }
+            return [...postfixPatterns, ...infixPatterns];
         }
         return [];
     }