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

Stricter error handling

This commit is contained in:
Zahary Karadjov 2020-06-16 00:59:35 +03:00
parent d8ca3daf3a
commit 5498b62dbd
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
serialization/errors.nim
View File

@ -3,6 +3,7 @@ type
UnexpectedEofError* = object of SerializationError UnexpectedEofError* = object of SerializationError
CustomSerializationError* = object of SerializationError CustomSerializationError* = object of SerializationError
method formatMsg*(err: ref SerializationError, filename: string): string {.gcsafe, base.} = method formatMsg*(err: ref SerializationError, filename: string): string
{.gcsafe, base, raises: [Defect].} =
"Serialisation error while processing " & filename "Serialisation error while processing " & filename

15
serialization/object_serialization.nim
View File

@ -1,5 +1,6 @@
import import
stew/shims/macros, stew/objects stew/shims/macros, stew/objects,
errors
type type
FieldTag*[RecordType; fieldName: static string; FieldType] = distinct void FieldTag*[RecordType; fieldName: static string; FieldType] = distinct void
@ -161,7 +162,8 @@ type
FieldReader*[RecordType, Reader] = tuple[ FieldReader*[RecordType, Reader] = tuple[
fieldName: string, fieldName: string,
reader: proc (rec: var RecordType, reader: var Reader) {.gcsafe, nimcall.} reader: proc (rec: var RecordType, reader: var Reader)
{.gcsafe, nimcall, raises: [SerializationError, Defect].}
] ]
FieldReadersTable*[RecordType, Reader] = openarray[FieldReader[RecordType, Reader]] FieldReadersTable*[RecordType, Reader] = openarray[FieldReader[RecordType, Reader]]
@ -190,10 +192,11 @@ template writeFieldIMPL*[Writer](writer: var Writer,
proc makeFieldReadersTable(RecordType, Reader: distinct type): proc makeFieldReadersTable(RecordType, Reader: distinct type):
seq[FieldReader[RecordType, Reader]] = seq[FieldReader[RecordType, Reader]] =
mixin enumAllSerializedFields, readFieldIMPL mixin enumAllSerializedFields, readFieldIMPL, handleReadException
enumAllSerializedFields(RecordType): enumAllSerializedFields(RecordType):
proc readField(obj: var RecordType, reader: var Reader) {.gcsafe, nimcall.} = proc readField(obj: var RecordType, reader: var Reader)
{.gcsafe, nimcall, raises: [SerializationError, Defect].} =
when RecordType is tuple: when RecordType is tuple:
const i = fieldName.parseInt const i = fieldName.parseInt
try: try:
@ -207,8 +210,8 @@ proc makeFieldReadersTable(RecordType, Reader: distinct type):
# leads to an incorrect return type being reported from # leads to an incorrect return type being reported from
# the `readFieldIMPL` function. # the `readFieldIMPL` function.
field(obj, realFieldName) = FieldType readFieldIMPL(F, reader) field(obj, realFieldName) = FieldType readFieldIMPL(F, reader)
except SerializationError: except SerializationError as err:
raise raise err
except CatchableError as err: except CatchableError as err:
reader.handleReadException( reader.handleReadException(
`RecordType`, `RecordType`,