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

Rename some definitions to avoid clashes with stew/bitops2

Browse Source
This commit is contained in:
Zahary Karadjov 2022-07-14 16:05:55 +03:00
parent aca66fbd8e
commit 97cf184119
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
json_serialization/reader.nim
View File

@ -405,7 +405,7 @@ func totalExpectedFields*(T: type): int {.compileTime.} =
if isFieldExpected(FieldType): if isFieldExpected(FieldType):
inc result inc result
func setBit*(x: var uint, bit: int) {.inline.} = func setBitInWord(x: var uint, bit: int) {.inline.} =
let mask = uint(1) shl bit let mask = uint(1) shl bit
x = x or mask x = x or mask
@ -425,16 +425,16 @@ func expectedFieldsBitmask*(TT: type): auto {.compileTime.} =
var i = 0 var i = 0
enumAllSerializedFields(T): enumAllSerializedFields(T):
if isFieldExpected(FieldType): if isFieldExpected(FieldType):
res[i div bitsPerWord].setBit(i mod bitsPerWord) res[i div bitsPerWord].setBitInWord(i mod bitsPerWord)
inc i inc i
return res return res
template setBit[N](data: var array[N, uint], bitIdx: int) = template setBitInArray[N](data: var array[N, uint], bitIdx: int) =
when N > 1: when data.len > 1:
data[bitIdx div bitsPerWord].setBit(bitIdx mod bitsPerWord) setBitInWord(data[bitIdx div bitsPerWord], bitIdx mod bitsPerWord)
else: else:
data[0].setBit(bitIdx) setBitInWord(data[0], bitIdx)
func isBitwiseSubsetOf[N](lhs, rhs: array[N, uint]): bool = func isBitwiseSubsetOf[N](lhs, rhs: array[N, uint]): bool =
for i in low(lhs) .. high(lhs): for i in low(lhs) .. high(lhs):
@ -643,7 +643,7 @@ proc readValue*[T](r: var JsonReader, value: var T)
r.lexer.next() r.lexer.next()
r.skipToken tkColon r.skipToken tkColon
reader(value, r) reader(value, r)
encounteredFields.setBit(fieldIdx) encounteredFields.setBitInArray(fieldIdx)
elif r.allowUnknownFields: elif r.allowUnknownFields:
r.lexer.next() r.lexer.next()
r.skipToken tkColon r.skipToken tkColon