logos-storage/nim-serde
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-serde.git synced 2026-01-04 22:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: convert parseAssert to template and fix line wrapping in CBOR deserializer

Browse Source
This commit is contained in:
munna0908 2025-05-31 19:00:18 +05:30
parent a4cd9a064d
commit 50000bc0c9
No known key found for this signature in database
GPG Key ID: 2FFCD637E937D3E6
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
serde/cbor/deserializer.nim
View File

@ -160,8 +160,7 @@ func textLen*(c: CborParser): int {.raises: [CborParseError].} =
parseAssert(c.kind == CborEventKind.cborText, "Expected text, got " & $c.kind)
c.intVal.int
proc nextText*(c: var CborParser, buf: var string) {.raises: [
CborParseError].} =
proc nextText*(c: var CborParser, buf: var string) {.raises: [CborParseError].} =
## Read the text that the parser is positioned on into a string and advance.
try:
parseAssert(c.kind == CborEventKind.cborText, "Expected text, got " & $c.kind)
@ -200,8 +199,7 @@ proc skipNode*(c: var CborParser) {.raises: [CborParseError].} =
case c.kind
of CborEventKind.cborEof:
raise newCborError("end of CBOR stream")
of CborEventKind.cborPositive, CborEventKind.cborNegative,
CborEventKind.cborSimple:
of CborEventKind.cborPositive, CborEventKind.cborNegative, CborEventKind.cborSimple:
c.next()
of CborEventKind.cborBytes, CborEventKind.cborText:
if c.isIndefinite:
@ -312,8 +310,7 @@ proc nextNode*(c: var CborParser): CborNode {.raises: [CborParseError].} =
of CborEventKind.cborMap:
let mapLen = c.intVal.int
result = CborNode(
kind: cborMap, map: initOrderedTable[CborNode, CborNode](
mapLen.nextPowerOfTwo)
kind: cborMap, map: initOrderedTable[CborNode, CborNode](mapLen.nextPowerOfTwo)
)
if c.isIndefinite:
c.next()
@ -486,7 +483,7 @@ func isTagged*(n: CborNode): bool =
func hasTag*(n: CborNode, tag: Natural): bool =
## Check if a CBOR item has a tag.
n.tag.isSome and n.tag.get == (uint64)tag
n.tag.isSome and n.tag.get == (uint64) tag
proc `tag=`*(result: var CborNode, tag: Natural) =
## Tag a CBOR item.

2
serde/cbor/errors.nim
View File

@ -37,6 +37,6 @@ proc newUnexpectedKindError*(
proc newCborError*(msg: string): ref CborParseError =
newException(CborParseError, msg)
proc parseAssert*(check: bool, msg = "") {.inline.} =
template parseAssert*(check: bool, msg = "") =
if not check:
raise newException(CborParseError, msg)