status-im
/
nim-json-serialization
mirror of https://github.com/status-im/nim-json-serialization.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for not nil ref types

This commit is contained in:
Zahary Karadjov 2020-04-23 01:39:56 +03:00
parent 96a337d334
commit bed0e403a4
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
json_serialization/reader.nim
View File

@ -1,3 +1,5 @@
{.experimental: "notnil".}
import import
strutils, typetraits, macros, strformat, strutils, typetraits, macros, strformat,
faststreams/input_stream, serialization/[object_serialization, errors], faststreams/input_stream, serialization/[object_serialization, errors],
@ -164,6 +166,9 @@ func maxAbsValue(T: type[SomeInteger]): uint64 {.compileTime.} =
elif T is int64: 9223372036854775808'u64 elif T is int64: 9223372036854775808'u64
else: uint64(high(T)) else: uint64(high(T))
proc isNotNilCheck[T](x: ref T not nil) {.compileTime.} = discard
proc isNotNilCheck[T](x: ptr T not nil) {.compileTime.} = discard
proc readValue*(r: var JsonReader, value: var auto) = proc readValue*(r: var JsonReader, value: var auto) =
mixin readValue mixin readValue
@ -182,6 +187,10 @@ proc readValue*(r: var JsonReader, value: var auto) =
r.lexer.next() r.lexer.next()
elif value is ref|ptr: elif value is ref|ptr:
when compiles(isNotNilCheck(value)):
allocPtr value
value[] = readValue(r, type(value[]))
else:
if tok == tkNull: if tok == tkNull:
value = nil value = nil
r.lexer.next() r.lexer.next()