Skip to content

Commit 1ee1464

Browse files
committed
Fix jsony for nim 1.6.0
1 parent ebee42e commit 1ee1464

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/jsony.nim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ proc fromJson*(s: string): JsonNode =
550550
proc dumpHook*(s: var string, v: bool)
551551
proc dumpHook*(s: var string, v: uint|uint8|uint16|uint32|uint64)
552552
proc dumpHook*(s: var string, v: int|int8|int16|int32|int64)
553+
proc dumpHook*(s: var string, v: SomeFloat)
553554
proc dumpHook*(s: var string, v: string)
554555
proc dumpHook*(s: var string, v: char)
555556
proc dumpHook*(s: var string, v: tuple)

tests/test_options.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ var
77
doAssert a.toJson() == """123"""
88
doAssert b.toJson() == """null"""
99

10-
doAssert $("""1""".fromJson(Option[int])) == "Some(1)"
11-
doAssert $("""null""".fromJson(Option[int])) == "None[int]"
10+
doAssert $("""1""".fromJson(Option[int])) == "some(1)"
11+
doAssert $("""null""".fromJson(Option[int])) == "none(int)"
1212

1313
proc check[T](v: T) =
1414
var v2 = some(v)

tests/test_strings.nim

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
1-
import jsony
1+
import jsony, json
22

33
block:
44
var s = """ "hello" """
55
var v = s.fromJson(string)
66
doAssert v == "hello"
7+
doAssert v.toJson().fromJson(string) == v
8+
doAssert v.toJson().fromJson(string) == v
79

810
block:
911
var s = """ "new\nline" """
1012
var v = s.fromJson(string)
1113
doAssert v == "new\nline"
14+
doAssert v.toJson().fromJson(string) == v
15+
echo v.toJson().fromJson().toJson().fromJson()
1216

1317
block:
1418
var s = """ "quote\"inside" """
1519
var v = s.fromJson(string)
1620
doAssert v == "quote\"inside"
21+
doAssert v.toJson().fromJson(string) == v
1722

1823
block:
1924
var s = """ "special: \"\\\/\b\f\n\r\t chars" """
2025
var v = s.fromJson(string)
2126
doAssert v == "special: \"\\/\b\f\n\r\t chars"
27+
doAssert v.toJson().fromJson(string) == v
2228

2329
block:
2430
var s = """ "unicode: \u0020 \u0F88 \u1F21" """
2531
var v = s.fromJson(string)
2632
doAssert v == "unicode: \u0020 \u0F88 \u1F21"
33+
doAssert v.toJson().fromJson(string) == v

0 commit comments

Comments
 (0)