From b8bbc25e6add2dbdddacf85d97a42281fef451f7 Mon Sep 17 00:00:00 2001 From: coffeepots Date: Wed, 23 May 2018 18:05:38 +0100 Subject: [PATCH] Changed proc order pending forward decl issue --- eth-rpc/jsonmarshal.nim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eth-rpc/jsonmarshal.nim b/eth-rpc/jsonmarshal.nim index f219aed..8464379 100644 --- a/eth-rpc/jsonmarshal.nim +++ b/eth-rpc/jsonmarshal.nim @@ -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 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 proc fromJson[T: enum](n: JsonNode, argName: string, result: var T) = 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): 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) = n.kind.expect(JObject, argName) result = new T