diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/json.nim | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/pure/json.nim b/lib/pure/json.nim index 1ef08f547..23b23b4a4 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -1369,11 +1369,20 @@ proc createConstructor(typeSym, jsonNode: NimNode): NimNode = for `forLoopI` in 0 ..< `jsonNode`.len: list[`forLoopI`] =`constructorNode`; list ) - + of "tuple": + let typeNode = getTypeImpl(typeSym) + result = createConstructor(typeNode, jsonNode) else: - # Generic type. + # Generic type or some `seq[T]` alias let obj = getType(typeSym) - result = processType(typeSym, obj, jsonNode, false) + case obj.kind + of nnkBracketExpr: + # probably a `seq[T]` alias + let typeNode = getTypeImpl(typeSym) + result = createConstructor(typeNode, jsonNode) + else: + # generic type + result = processType(typeSym, obj, jsonNode, false) of nnkSym: # Handle JsonNode. if ($typeSym).cmpIgnoreStyle("jsonnode") == 0: @@ -1385,7 +1394,7 @@ proc createConstructor(typeSym, jsonNode: NimNode): NimNode = if typeNode.typeKind == ntyDistinct: result = createConstructor(typeNode, jsonNode) elif obj.kind == nnkBracketExpr: - # When `Sym "Foo"` turns out to be a `ref object`. + # When `Sym "Foo"` turns out to be a `ref object` or `tuple` result = createConstructor(obj, jsonNode) else: result = processType(typeSym, obj, jsonNode, false) |