fix #157 parsing error with null/true/false, jison 0.4.17

noolsjs · Oct 6, 2016 · 7639d0c · 7639d0c
1 parent c8f65c0
commit 7639d0c
Show file tree

Hide file tree

Showing 5 changed files with 168 additions and 93 deletions.
diff --git a/lib/parser/constraint/grammar.js b/lib/parser/constraint/grammar.js
@@ -18,8 +18,8 @@ var grammar = {
             ["\\s+(notLike|NOT_LIKE)\\b", "return '!=~';"],
             ["\\s+(and|AND)\\b", "return '&&';"],
             ["\\s+(or|OR)\\b", "return '||';"],
-            ["\\s+null\\b", "return 'NULL';"],
-            ["\\s+(true|false)\\b", "return 'BOOLEAN';"],
+            ["\\s*(null)\\b", "return 'NULL';"],
+            ["\\s*(true|false)\\b", "return 'BOOLEAN';"],
             ["\\s+", "/* skip whitespace */"],
             ["-?[0-9]+(?:\\.[0-9]+)?\\b", "return 'NUMBER';"],
             ["\'[^\']*\'", "return 'STRING';"],