Allow pop: 1

no-context · Jul 26, 2017 · 7641fd1 · 7641fd1
1 parent 4cd9a6f
commit 7641fd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/moo.js b/moo.js
@@ -219,9 +219,8 @@
         if (state && !map[state]) {
           throw new Error("Missing state '" + state + "' (in token '" + g.tokenType + "' of state '" + keys[i] + "')")
         }
-        var pop = g && g.pop
-        if (pop && typeof pop !== 'boolean') {
-          throw new Error("pop must be true (in token '" + g.tokenType + "' of state '" + keys[i] + "')")
+        if (g && g.pop && +g.pop !== 1) {
+          throw new Error("pop must be 1 (in token '" + g.tokenType + "' of state '" + keys[i] + "')")
         }
       }
     }

diff --git a/test/test.js b/test/test.js
@@ -477,9 +477,12 @@ describe('stateful lexer', () => {
   })
 
   test('warns for non-boolean pop', () => {
-    expect(() => moo.states({start: {bar: {match: 'bar', pop: 'cow'}}})).toThrow("pop must be true (in token 'bar' of state 'start')")
-    expect(() => moo.states({start: {bar: {match: 'bar', pop: 2}}})).toThrow("pop must be true (in token 'bar' of state 'start')")
+    expect(() => moo.states({start: {bar: {match: 'bar', pop: 'cow'}}})).toThrow("pop must be 1 (in token 'bar' of state 'start')")
+    expect(() => moo.states({start: {bar: {match: 'bar', pop: 2}}})).toThrow("pop must be 1 (in token 'bar' of state 'start')")
     expect(() => moo.states({start: {bar: {match: 'bar', pop: true}}})).not.toThrow()
+    expect(() => moo.states({start: {bar: {match: 'bar', pop: 1}}})).not.toThrow()
+    expect(() => moo.states({start: {bar: {match: 'bar', pop: false}}})).not.toThrow()
+    expect(() => moo.states({start: {bar: {match: 'bar', pop: 0}}})).not.toThrow()
   })
 
 })