jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7205 from GULPF/json-to-fix

Browse source 
Fix `json.to` for types with generic parameters
This commit is contained in:
Dominik Picheta 2018-02-12 09:22:35 +00:00 • committed by GitHub
commit 23d272f652
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/json.nim
View file

@ -1896,7 +1896,7 @@ macro to*(node: JsonNode, T: typedesc): untyped =
## doAssert data.person.age == 21 ## doAssert data.person.age == 21
## doAssert data.list == @[1, 2, 3, 4] ## doAssert data.list == @[1, 2, 3, 4]
let typeNode = getType(T) let typeNode = getTypeInst(T)
expectKind(typeNode, nnkBracketExpr) expectKind(typeNode, nnkBracketExpr)
doAssert(($typeNode[0]).normalize == "typedesc") doAssert(($typeNode[0]).normalize == "typedesc")

7
tests/stdlib/tjsonmacro.nim
View file

@ -381,3 +381,10 @@ when isMainModule:
doAssert dataDeser.a == 1 doAssert dataDeser.a == 1
doAssert dataDeser.f == 6 doAssert dataDeser.f == 6
doAssert dataDeser.i == 9.9'f32 doAssert dataDeser.i == 9.9'f32
# deserialize directly into a table
block:
let s = """{"a": 1, "b": 2}"""
let t = parseJson(s).to(Table[string, int])
doAssert t["a"] == 1
doAssert t["b"] == 2