summary refs log tree commit diff stats
path: root/lib
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@gmail.com>2017-04-17 19:47:43 +0200
committerDominik Picheta <dominikpicheta@gmail.com>2017-04-17 19:47:43 +0200
commit5a4c06dbdce20a8966742d75ea6e5e227c6d1f14 (patch)
tree10567b3d124456903de6ff03a6ef9f5c9dca9e1f /lib
parent793d6efffbee54f2ba00836545f0800b3ab77fd2 (diff)
downloadNim-5a4c06dbdce20a8966742d75ea6e5e227c6d1f14.tar.gz
Support JInt fields for 'float' in JSON umarshal macro.
Diffstat (limited to 'lib')
-rw-r--r--lib/pure/json.nim4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/json.nim b/lib/pure/json.nim
index d59b6c735..2430ba38f 100644
--- a/lib/pure/json.nim
+++ b/lib/pure/json.nim
@@ -1550,8 +1550,8 @@ proc processType(typeName: NimNode, obj: NimNode,
     of "float":
       result = quote do:
         (
-          verifyJsonKind(`jsonNode`, {JFloat}, astToStr(`jsonNode`));
-          `jsonNode`.fnum
+          verifyJsonKind(`jsonNode`, {JFloat, JInt}, astToStr(`jsonNode`));
+          if `jsonNode`.kind == JFloat: `jsonNode`.fnum else: `jsonNode`.num.float
         )
     of "string":
       result = quote do: