Merge remote-tracking branch 'davegraziosi/master'

Fix #6 "Unexpected 'MATH'" error
mistic100 · Aug 18, 2018 · cce2e5e · cce2e5e
2 parents 14671c0 + e317e02
commit cce2e5e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -15,13 +15,13 @@ class Lexer
                        @sortOrderToken() or
                        @seperatorToken() or
                        @operatorToken() or
+                       @numberToken() or
                        @mathToken() or
                        @dotToken() or
                        @conditionalToken() or
                        @betweenToken() or
                        @subSelectOpToken() or
                        @subSelectUnaryOpToken() or
-                       @numberToken() or
                        @stringToken() or
                        @parameterToken() or
                        @parensToken() or
@@ -170,7 +170,7 @@ class Lexer
   WHITESPACE          = /^[ \n\r]+/
   LITERAL             = /^`?([a-z_][a-z0-9_]{0,}(\:(number|float|string|date|boolean))?)`?/i
   PARAMETER           = /^\$([a-z0-9_]+(\:(number|float|string|date|boolean))?)/
-  NUMBER              = /^[0-9]+(\.[0-9]+)?/
+  NUMBER              = /^\s*[+-]?[0-9]+(\.[0-9]+)?/
   STRING              = /^'((?:[^\\']+?|\\.|'')*)'(?!')/
   DBLSTRING           = /^"([^\\"]*(?:\\.[^\\"]*)*)"/