fix: Fix number parsing

florajs · May 8, 2024 · a3d54e3 · a3d54e3
1 parent 022e5c5
commit a3d54e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/sql.pegjs b/sql.pegjs
@@ -846,6 +846,8 @@ number
   / int_:int frac:frac __         { return parseFloat(int_ + frac); }
   / int_:int exp:exp __           { return parseFloat(int_ + exp); }
   / int_:int __                   { return parseFloat(int_); }
+  / frac:frac __                  { return parseFloat(frac); }
+  / op:("-" / "+" ) frac:frac __  { return parseFloat(op + frac); }
 
 int
   = digits

diff --git a/test/sql2ast/literal.spec.js b/test/sql2ast/literal.spec.js
@@ -9,10 +9,18 @@ describe('literals', () => {
 
     describe('numbers', () => {
         [
-            ['should parse positive number', '+1', 1],
+            ['should parse positive number', '1', 1],
+            ['should parse (explicit) positive number', '+1', 1],
             ['should parse negative number', '-1', -1],
-            ['should parse positive numbers', '+10', 10],
-            ['should parse negative numbers', '-10', -10]
+            ['should parse positive numbers', '10', 10],
+            ['should parse (explicit) positive numbers', '+10', 10],
+            ['should parse negative numbers', '-10', -10],
+            ['should parse positive decimal numbers', '0.5', 0.5],
+            ['should parse (explicit) positive decimal numbers', '+0.5', 0.5],
+            ['should parse positive decimal numbers w/o integral part', '.5', 0.5],
+            ['should parse (explicit) positive decimal numbers w/o integral part', '+.5', 0.5],
+            ['should parse negative decimal numbers', '-0.5', -0.5],
+            ['should parse negative decimal numbers w/o integral part', '-.5', -0.5]
         ].forEach(([label, expr, expectedValue]) => {
             it(label, () => {
                 const ast = parser.parse(`SELECT ${expr}`);