mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-26 01:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #17325 linux 32bit CI; fix #17085 flaky test (#17469)

Browse Source
This commit is contained in:
Timothee Cour
2021-03-24 02:36:15 -07:00
committed by GitHub
parent 86af2f7b50
commit e94aec20da
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pure/json.nim
View File

@@ -1075,12 +1075,13 @@ when defined(nimFixedForwardGeneric):
dst = jsonNode.copy
proc initFromJson[T: SomeInteger](dst: var T; jsonNode: JsonNode, jsonPath: var string) =
when T is uint|uint64:
when T is uint|uint64 or (not defined(js) and int.sizeof == 4):
verifyJsonKind(jsonNode, {JInt, JString}, jsonPath)
case jsonNode.kind
of JString:
dst = T(parseBiggestUInt(jsonNode.str))
let x = parseBiggestUInt(jsonNode.str)
dst = cast[T](x)
else:
verifyJsonKind(jsonNode, {JInt}, jsonPath)
dst = T(jsonNode.num)
else:
verifyJsonKind(jsonNode, {JInt}, jsonPath)