Merge pull request #3933 from def-/jsonnil

Support json null in %*
This commit is contained in:
Andreas Rumpf 2016-03-05 00:28:44 +01:00
commit 1d443cec8d

View file

@ -678,6 +678,7 @@ proc getElems*(n: JsonNode, default: seq[JsonNode] = @[]): seq[JsonNode] =
proc `%`*(s: string): JsonNode = proc `%`*(s: string): JsonNode =
## Generic constructor for JSON data. Creates a new `JString JsonNode`. ## Generic constructor for JSON data. Creates a new `JString JsonNode`.
new(result) new(result)
if s.isNil: return
result.kind = JString result.kind = JString
result.str = s result.str = s
@ -1310,3 +1311,6 @@ when isMainModule:
} }
] ]
doAssert j3 == %[%{"name": %"John", "age": %30}, %{"name": %"Susan", "age": %31}] doAssert j3 == %[%{"name": %"John", "age": %30}, %{"name": %"Susan", "age": %31}]
var j4 = %*{"test": nil}
doAssert j4 == %{"test": newJNull()}