logos-storage/nim-json-rpc
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-json-rpc.git synced 2026-05-16 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed proc order pending forward decl issue

Browse Source
This commit is contained in:
coffeepots 2018-05-23 18:05:38 +01:00
parent 201f31554f
commit b8bbc25e6a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eth-rpc/jsonmarshal.nim
View File

@ -17,14 +17,6 @@ proc fromJson(n: JsonNode, argName: string, result: var ref int64)
proc fromJson(n: JsonNode, argName: string, result: var ref int) proc fromJson(n: JsonNode, argName: string, result: var ref int)
proc fromJson(n: JsonNode, argName: string, result: var ref UInt256) proc fromJson(n: JsonNode, argName: string, result: var ref UInt256)
proc fromJson(n: JsonNode, argName: string, result: var bool) =
n.kind.expect(JBool, argName)
result = n.getBool()
proc fromJson(n: JsonNode, argName: string, result: var int) =
n.kind.expect(JInt, argName)
result = n.getInt()
# This can't be forward declared: https://github.com/nim-lang/Nim/issues/7868 # This can't be forward declared: https://github.com/nim-lang/Nim/issues/7868
proc fromJson[T: enum](n: JsonNode, argName: string, result: var T) = proc fromJson[T: enum](n: JsonNode, argName: string, result: var T) =
n.kind.expect(JInt, argName) n.kind.expect(JInt, argName)
@ -36,6 +28,14 @@ proc fromJson[T: object](n: JsonNode, argName: string, result: var T) =
for k, v in fieldpairs(result): for k, v in fieldpairs(result):
fromJson(n[k], k, v) fromJson(n[k], k, v)
proc fromJson(n: JsonNode, argName: string, result: var bool) =
n.kind.expect(JBool, argName)
result = n.getBool()
proc fromJson(n: JsonNode, argName: string, result: var int) =
n.kind.expect(JInt, argName)
result = n.getInt()
proc fromJson[T: ref object](n: JsonNode, argName: string, result: var T) = proc fromJson[T: ref object](n: JsonNode, argName: string, result: var T) =
n.kind.expect(JObject, argName) n.kind.expect(JObject, argName)
result = new T result = new T