mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-16 08:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10823 from narimiran/json-tuples

Browse Source 
simplify json.% for tuples and objects
This commit is contained in:
Dominik Picheta
2019-03-11 21:38:42 +00:00
committed by GitHub
parent 35aab357e2 863848ad56
commit 3e04afda9f
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/pure/json.nim
View File

@@ -390,25 +390,19 @@ proc `[]=`*(obj: JsonNode, key: string, val: JsonNode) {.inline.} =
assert(obj.kind == JObject)
obj.fields[key] = val
#[
Note: could use simply:
proc `%`*(o: object|tuple): JsonNode
but blocked by https://github.com/nim-lang/Nim/issues/10019
]#
proc `%`*(o: tuple): JsonNode =
## Generic constructor for JSON data. Creates a new `JObject JsonNode`
when isNamedTuple(type(o)):
proc `%`*[T: tuple|object](o: T): JsonNode =
## Construct JsonNode from tuples and objects.
##
## If passed an anonymous tuple, creates `JArray JsonNode`,
## otherwise (named tuples and objects) `JObject JsonNode`.
const isNamed = T is object or isNamedTuple(T)
when isNamed:
result = newJObject()
for k, v in o.fieldPairs: result[k] = %v
else:
result = newJArray()
for a in o.fields: result.add(%a)
proc `%`*(o: object): JsonNode =
## Generic constructor for JSON data. Creates a new `JObject JsonNode`
result = newJObject()
for k, v in o.fieldPairs: result[k] = %v
proc `%`*(o: ref object): JsonNode =
## Generic constructor for JSON data. Creates a new `JObject JsonNode`
if o.isNil: