logos-storage/nim-json-rpc
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-json-rpc.git synced 2026-02-24 07:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added allowNull to expectType

Browse Source
This commit is contained in:
coffeepots 2018-08-28 21:18:52 +01:00 committed by zah
parent e7f66a0b4d
commit 40e2c83023
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
json_rpc/jsonmarshal.nim
View File

@ -3,7 +3,7 @@ import macros, json, options, typetraits
template expect*(actual, expected: JsonNodeKind, argName: string) =
if actual != expected: raise newException(ValueError, "Parameter [" & argName & "] expected " & $expected & " but got " & $actual)
template expectType*(actual: JsonNodeKind, expected: typedesc, argName: string) =
template expectType*(actual: JsonNodeKind, expected: typedesc, argName: string, allowNull = false) =
var expType: JsonNodeKind
when expected is array:
expType = JArray
@ -21,7 +21,8 @@ template expectType*(actual: JsonNodeKind, expected: typedesc, argName: string)
const eStr = "Unable to convert " & expected.name & " to JSON for expectType"
{.fatal: eStr}
if actual != expType:
raise newException(ValueError, "Parameter [" & argName & "] expected " & expected.name & " but got " & $actual)
if allowNull == false or (allowNull and actual != JNull):
raise newException(ValueError, "Parameter [" & argName & "] expected " & expected.name & " but got " & $actual)
proc `%`*(n: byte{not lit}): JsonNode =
result = newJInt(int(n))
@ -55,7 +56,7 @@ proc fromJson(n: JsonNode, argName: string, result: var ref int64)
proc fromJson(n: JsonNode, argName: string, result: var ref int)
proc fromJson[T](n: JsonNode, argName: string, result: var Option[T]) =
n.kind.expectType(T, argName)
n.kind.expectType(T, argName, true) # Allow JNull
if n.kind != JNull:
var val: T
fromJson(n, argName, val)