Fix #30

Author: treeform

src/jsony.nim

@@ -127,6 +127,7 @@ proc parseHook*(s: string, i: var int, v: var SomeFloat) =
   eatSpace(s, i)
   let chars = parseutils.parseFloat(s, f, i)
   if chars == 0:
+    echo s[i - 10 .. i + 10]
     error("Failed to parse a float.", i)
   i += chars
   v = f
@@ -516,16 +517,13 @@ proc parseHook*(s: string, i: var int, v: var JsonNode) =
     elif data == "false":
       v = newJBool(false)
     elif data.len > 0 and data[0] in {'0'..'9', '-', '+'}:
-      if "." in data:
+      try:
+        v = newJInt(parseInt(data))
+      except ValueError:
         try:
           v = newJFloat(parseFloat(data))
         except ValueError:
-          error("Invalid integer.", i)
-      else:
-        try:
-          v = newJInt(parseInt(data))
-        except ValueError:
-          error("Invalid float.", i)
+          error("Invalid number.", i)
     else:
       error("Unexpected.", i)
 

tests/test_json_in_json.nim

@@ -27,3 +27,9 @@ block:
 
   var foo = Entry()
   doAssert toJson(foo) == """{"name":"","data":null}"""
+
+block:
+  # https://github.com/treeform/jsony/issues/30
+  let s = r"""[9e-8]"""
+  echo fromJson(s)
+  doAssert $fromJson(s) == "[9e-008]"

tests/test_numbers.nim

@@ -43,6 +43,8 @@ block:
   doAssert " -1.34E3 ".fromJson(float64) == -1.34E3
   doAssert " -1.34E3 ".fromJson(float64) == -1.34E3
 
+  doAssert "9e-8".fromJson(float64) == 9e-8
+
 block:
   doAssert "[1, 2, 3]".fromJson(seq[int]) == @[1, 2, 3]
   doAssert """["hi", "bye", "maybe"]""".fromJson(seq[string]) ==