status-im/nim-json-serialization
2
0
Fork 0
mirror of https://github.com/status-im/nim-json-serialization.git synced 2025-02-19 13:34:19 +00:00
Code Issues Projects Releases Wiki Activity

Stricter error handling

Browse Source
This commit is contained in:
Zahary Karadjov 2020-06-16 01:03:00 +03:00
parent c478b7bbba
commit 6e92113a06
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
json_serialization/reader.nim
View File

@ -50,23 +50,27 @@ func valueStr(err: ref IntOverflowError): string =
result.add '-' result.add '-'
result.add($err.absIntVal) result.add($err.absIntVal)
template tryFmt(expr: untyped): string =
try: expr
except CatchableError: ""
method formatMsg*(err: ref JsonReaderError, filename: string): string = method formatMsg*(err: ref JsonReaderError, filename: string): string =
fmt"{filename}({err.line}, {err.col}) Error while reading json file" tryFmt: fmt"{filename}({err.line}, {err.col}) Error while reading json file"
method formatMsg*(err: ref UnexpectedField, filename: string): string = method formatMsg*(err: ref UnexpectedField, filename: string): string =
fmt"{filename}({err.line}, {err.col}) Unexpected field '{err.encounteredField}' while deserializing {err.deserializedType}" tryFmt: fmt"{filename}({err.line}, {err.col}) Unexpected field '{err.encounteredField}' while deserializing {err.deserializedType}"
method formatMsg*(err: ref UnexpectedTokenError, filename: string): string = method formatMsg*(err: ref UnexpectedTokenError, filename: string): string =
fmt"{filename}({err.line}, {err.col}) Unexpected token '{err.encountedToken}' in place of '{err.expectedToken}'" tryFmt: fmt"{filename}({err.line}, {err.col}) Unexpected token '{err.encountedToken}' in place of '{err.expectedToken}'"
method formatMsg*(err: ref GenericJsonReaderError, filename: string): string = method formatMsg*(err: ref GenericJsonReaderError, filename: string): string =
fmt"{filename}({err.line}, {err.col}) Exception encountered while deserializing '{err.deserializedField}': [{err.innerException.name}] {err.innerException.msg}" tryFmt: fmt"{filename}({err.line}, {err.col}) Exception encountered while deserializing '{err.deserializedField}': [{err.innerException.name}] {err.innerException.msg}"
method formatMsg*(err: ref IntOverflowError, filename: string): string = method formatMsg*(err: ref IntOverflowError, filename: string): string =
fmt"{filename}({err.line}, {err.col}) The value '{err.valueStr}' is outside of the allowed range" tryFmt: fmt"{filename}({err.line}, {err.col}) The value '{err.valueStr}' is outside of the allowed range"
method formatMsg*(err: ref UnexpectedValueError, filename: string): string = method formatMsg*(err: ref UnexpectedValueError, filename: string): string =
fmt"{filename}({err.line}, {err.col}) {err.msg}" tryFmt: fmt"{filename}({err.line}, {err.col}) {err.msg}"
proc assignLineNumber*(ex: ref JsonReaderError, r: JsonReader) = proc assignLineNumber*(ex: ref JsonReaderError, r: JsonReader) =
ex.line = r.lexer.line ex.line = r.lexer.line
@ -187,7 +191,8 @@ proc isNotNilCheck[T](x: ptr T not nil) {.compileTime.} = discard
template isCharArray[N](v: array[N, char]): bool = true template isCharArray[N](v: array[N, char]): bool = true
template isCharArray(v: auto): bool = false template isCharArray(v: auto): bool = false
proc readValue*(r: var JsonReader, value: var auto) = proc readValue*(r: var JsonReader, value: var auto)
{.raises: [SerializationError, IOError, Defect].} =
mixin readValue mixin readValue
let tok {.used.} = r.lexer.tok let tok {.used.} = r.lexer.tok