Add support for +123 numbers.

Author: treeform

src/jsony.nim

@@ -101,6 +101,8 @@ proc parseHook*(s: string, i: var int, v: var SomeSignedInt) =
     v = type(v)(parseInt(parseSymbol(s, i)))
   else:
     eatSpace(s, i)
+    if i < s.len and s[i] == '+':
+      inc i
     if i < s.len and s[i] == '-':
       var v2: uint64
       inc i
@@ -420,7 +422,7 @@ proc parseHook*(s: string, i: var int, v: var JsonNode) =
       v = newJBool(true)
     elif data == "false":
       v = newJBool(false)
-    elif data.len > 0 and data[0] in {'0'..'9'}:
+    elif data.len > 0 and data[0] in {'0'..'9', '-', '+'}:
       if "." in data:
         try:
           v = newJFloat(parseFloat(data))

tests/test_json_in_json.nim

@@ -21,3 +21,6 @@ block:
 
   let s = """{"name":"json-in-json","data":{"random-data":"here","number":123,"number2":123.456,"array":[1,2,3],"active":true,"null":null}}"""
   doAssert $s.fromJson() == """{"name":"json-in-json","data":{"random-data":"here","number":123,"number2":123.456,"array":[1,2,3],"active":true,"null":null}}"""
+
+  let ns = """[123, +123, -123, 123.456, +123.456, -123.456, 123.456E9, +123.456E9, -123.456E9]"""
+  doAssert $ns.fromJson() == """[123,123,-123,123.456,123.456,-123.456,123456000000.0,123456000000.0,-123456000000.0]"""

tests/test_numbers.nim

@@ -24,8 +24,22 @@ block:
   doAssert " -99 ".fromJson(int32) == -99
   doAssert " -99 ".fromJson(int64) == -99
 
+  doAssert " +99 ".fromJson(int8) == 99
+  doAssert " +99 ".fromJson(int16) == 99
+  doAssert " +99 ".fromJson(int32) == 99
+  doAssert " +99 ".fromJson(int64) == 99
+
+  doAssert " 1.25 ".fromJson(float32) == 1.25
+  doAssert " 1.25 ".fromJson(float32) == 1.25
+  doAssert " +1.25 ".fromJson(float64) == 1.25
+  doAssert " +1.25 ".fromJson(float64) == 1.25
+  doAssert " -1.25 ".fromJson(float64) == -1.25
+  doAssert " -1.25 ".fromJson(float64) == -1.25
+
   doAssert " 1.34E3 ".fromJson(float32) == 1.34E3
   doAssert " 1.34E3 ".fromJson(float32) == 1.34E3
+  doAssert " +1.34E3 ".fromJson(float64) == 1.34E3
+  doAssert " +1.34E3 ".fromJson(float64) == 1.34E3
   doAssert " -1.34E3 ".fromJson(float64) == -1.34E3
   doAssert " -1.34E3 ".fromJson(float64) == -1.34E3