clarity-pattern-parser 11.0.19 → 11.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-pattern-parser",
-  "version": "11.0.19",
+  "version": "11.0.21",
   "description": "Parsing Library for Typescript and Javascript.",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",

package/src/grammar/Grammar.test.ts

@@ -10,6 +10,7 @@ import { Grammar } from "./Grammar";
 import { Optional } from "../patterns/Optional";
 import { Context } from "../patterns/Context";
 import { patterns } from "./patterns";
+import { Expression } from "../patterns/Expression";
 
 describe("Grammar", () => {
     test("Literal", () => {
@@ -517,7 +518,7 @@ debugger;
             ],
                 true
             ),
-            new Options("anonymous", [
+            new Expression("anonymous", [
                 new Reference("pattern"),
                 new Reference("pattern")
             ])

package/src/grammar/Grammar.ts

@@ -280,6 +280,10 @@ export class Grammar {
     }
 
     private _isRecursivePattern(name: string, pattern: Pattern) {
+        if (pattern.type === "reference") {
+            return true;
+        }
+
         if (pattern.children.length === 0) {
             return false;
         }
@@ -287,10 +291,9 @@ export class Grammar {
         const firstChild = pattern.children[0];
         const lastChild = pattern.children[pattern.children.length - 1];
         const isLongEnough = pattern.children.length >= 2;
-        return pattern.type === "reference" ||
-            (pattern.type === "sequence" && isLongEnough &&
-                (firstChild.type === "reference" && firstChild.name === name) ||
-                (lastChild.type === "reference" && lastChild.name === name));
+        return (pattern.type === "sequence" && isLongEnough &&
+            (firstChild.name === name) ||
+            (lastChild.name === name));
     }
 
     private _buildPattern(node: Node): Pattern {

package/src/patterns/Expression.ts

@@ -233,7 +233,9 @@ export class Expression implements Pattern {
         }
 
         if (pattern.type === "reference") {
+            pattern.parent = this;
             pattern = (pattern as Reference).getReferencePatternSafely();
+            pattern.parent = null;
         }
 
         return pattern;
@@ -247,7 +249,7 @@ export class Expression implements Pattern {
         if (pattern == null) {
             return false;
         }
-        return pattern.type === "reference" && pattern.name === this.name;
+        return pattern.name === this.name;
     }
 
     parse(cursor: Cursor): Node | null {