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

Reduce warnings in Nim 1.0.2; Fix #16

This commit is contained in:
Zahary Karadjov 2019-11-04 18:45:29 +00:00
parent 448a03ed4b
commit ae60eef4e8
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
serialization/object_serialization.nim
View File

@ -76,7 +76,6 @@ macro enumAllSerializedFieldsImpl(T: type, body: untyped): untyped =
var typeImpl: NimNode
let isSymbol = not typeAst.isTuple
if not isSymbol:
typeImpl = typeAst
else:
@ -100,10 +99,10 @@ macro enumAllSerializedFieldsImpl(T: type, body: untyped): untyped =
let fieldNameVarTemplate =
if isSymbol:
quote:
template `fieldNameVar`: auto = `fieldName`
template `fieldNameVar`: auto {.used.} = `fieldName`
else:
quote:
template `fieldNameVar`: auto = $`fieldIndex`
template `fieldNameVar`: auto {.used.} = $`fieldIndex`
# we can't access .Fieldn, so our helper knows
# to parseInt this
@ -116,12 +115,12 @@ macro enumAllSerializedFieldsImpl(T: type, body: untyped): untyped =
result.add quote do:
block:
`fieldNameVarTemplate`
template fieldCaseDiscriminator: auto = `discriminator`
template fieldCaseBranches: auto = `branches`
template fieldCaseDiscriminator: auto {.used.} = `discriminator`
template fieldCaseBranches: auto {.used.} = `branches`
# type `fieldTypeVar` = `fieldType`
# TODO: This is a work-around for a classic Nim issue:
type `FieldTypeSym` = type(`field`)
type `FieldTypeSym` {.used.} = type(`field`)
`body`
i += 1
@ -270,11 +269,11 @@ macro setSerializedFields*(T: typedesc, fields: varargs[untyped]): untyped =
fieldTypeVar, typ, field,
body) =
block:
const fieldNameVar = fieldName
type fieldTypeVar = type(default(typ).field)
const fieldNameVar {.used.} = fieldName
type fieldTypeVar {.used.} = type(default(typ).field)
template fieldCaseDiscriminator: auto = ""
template fieldCaseBranches: auto = nil
template fieldCaseDiscriminator: auto {.used.} = ""
template fieldCaseBranches: auto {.used.} = nil
body

23
serialization/testing/generic_suite.nim
View File

@ -127,6 +127,10 @@ template roundtripChecks*(Format: type, value: auto, expectedResult: auto) =
except SerializationError as err:
checkpoint "(serialization error): " & err.formatMsg("(encoded value)")
fail()
except:
when compiles($value):
checkpoint "unexpected failure in roundtrip test for " & $value
raise
template roundtripTest*(Format: type, value: auto, expectedResult: auto) =
mixin `==`
@ -141,12 +145,6 @@ template roundtripChecks*(Format: type, value: auto) =
roundtripChecks(Format, value, NoExpectedResult(0))
proc executeRoundtripTests*(Format: type) =
mixin init, ReaderType, WriterType
type
Reader = ReaderType Format
Writer = WriterType Format
template roundtrip(val: untyped) =
mixin supports
# TODO:
@ -160,10 +158,12 @@ proc executeRoundtripTests*(Format: type) =
template intTests(T: untyped) =
roundtrip low(T)
roundtrip high(T)
for i in 0..1000:
roundtrip rand(low(T)..high(T))
when false:
# TODO:
# rand(low..high) produces an overflow error in Nim 1.0.2
for i in 0..1000:
roundtrip rand(low(T)..(high(T) div 2))
intTests int8
intTests int16
intTests int32
@ -257,8 +257,8 @@ proc executeRoundtripTests*(Format: type) =
roundtrip t3
test "sets":
var s1 = toSet([1, 2, 3, 1, 4, 2])
var s2 = HoldsSet(a: 100, s: toSet(["a", "b", "c"]))
var s1 = toHashSet([1, 2, 3, 1, 4, 2])
var s2 = HoldsSet(a: 100, s: toHashSet(["a", "b", "c"]))
roundtrip s1
roundtrip s2
@ -274,7 +274,6 @@ proc executeReaderWriterTests*(Format: type) =
type
Reader = ReaderType Format
Writer = WriterType Format
suite(typetraits.name(Format) & " read/write tests"):
test "Low-level field reader test":