fix: leading zeros are accepted on a big decimal

carocad · Nov 3, 2020 · 347e897 · 347e897
1 parent 718de49
commit 347e897
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Clojure.g4 b/src/Clojure.g4
@@ -160,9 +160,12 @@ LONG: SIGN? DECIMAL BIG_INT?;
 
 fragment BIG_INT: 'N';
 
-DOUBLE: SIGN? DECIMAL ('.' DIGIT*)? ([eE]SIGN?DIGIT+)? 'M'?;
+// forbids numbers like: 0002341349 (invalid octal) from matching double
+DOUBLE: SIGN? DECIMAL+ ('M' | (FRACTION | EXPONENT | (FRACTION EXPONENT)) 'M'?);
 
-fragment DECIMAL: (ZERO | ([1-9] DIGIT*));
+fragment FRACTION: ('.' DIGIT*);
+fragment EXPONENT: [eE] SIGN? DIGIT+;
+fragment DECIMAL: ZERO | ([1-9] DIGIT*);
 
 fragment ZERO: '0';
 

diff --git a/test/parcera/test_cases.cljc b/test/parcera/test_cases.cljc
@@ -282,12 +282,18 @@
     (doseq [input inputs]
       (valid? input)
       (roundtrip input)))
-  (let [inputs ["08" "0x1G"]]
+  (let [inputs ["08"                                        ;; invalid octal
+                "0x1G"                                      ;; invalid hexadecimal
+                "0002341349" #_(invalid octal)]]
     (doseq [input inputs]
       (is (parcera/failure? (parcera/ast input)))))
   (let [input "0007000321110000334004002007N"]
     (is (= (parcera/ast input) [:code [:number input]])))
   (let [input "0x07000321110000334004002007N"]
+    (is (= (parcera/ast input) [:code [:number input]])))
+  (let [input "0002341349M"]                                ;; valid big decimal
+    (is (= (parcera/ast input) [:code [:number input]])))
+  (let [input "0002341349.2432"]                            ;; valid double
     (is (= (parcera/ast input) [:code [:number input]]))))