Fix include bug with fast matching

no-context · Jan 3, 2019 · 13e1157 · 13e1157
1 parent 4c3a977
commit 13e1157
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/moo.js b/moo.js
@@ -184,7 +184,7 @@
         errorRule = options
       }
 
-      var match = options.match
+      var match = options.match.slice()
       if (fastAllowed) {
         while (match.length && typeof match[0] === 'string' && match[0].length === 1) {
           var word = match.shift()

diff --git a/test/test.js b/test/test.js
@@ -1047,6 +1047,43 @@ describe('example: tosh', () => {
 
 describe('include', () => {
 
+  test('handles fast matching', () => {
+    const l = moo.states({
+      main: {
+        "{": "{",
+        include: 'shared',
+      },
+      shared: {
+        '*': '*',
+        word: /[a-z]+/,
+      }
+    })
+
+    l.reset("{foo*")
+    Array.from(l)
+  })
+
+  test('handles multiple states with same fast match', () => {
+    const l = moo.states({
+      main: {
+        include: 'shared',
+        "{": {match: "{", push: "inner"},
+      },
+      inner: {
+        "}": {match: "}", pop: 1},
+        include: 'shared',
+      },
+      shared: {
+        '*': '*',
+        word: /[a-z]+/,
+      },
+      x: 1,
+    })
+
+    l.reset("foo{bar*}")
+    Array.from(l)
+  })
+
   test('handles cycles', () => {
     const lexer = moo.states({
       $all: {