From 172160474feb3b213304aa2b006c57db6f80aa35 Mon Sep 17 00:00:00 2001 From: Geoffrey Picron Date: Wed, 26 Apr 2023 11:24:18 +0200 Subject: [PATCH 1/2] avoid ambiguous call to toJson() that conflict with other serialization frameworks --- src/jsony.nim | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/jsony.nim b/src/jsony.nim index 871dcb6..0a4e187 100644 --- a/src/jsony.nim +++ b/src/jsony.nim @@ -736,9 +736,11 @@ proc dumpHook*(s: var string, v: string) = s.dumpStrFast(v) template dumpKey(s: var string, v: string) = - const v2 = v.toJson() & ":" - s.add v2 - + var escaped = newStringOfCap(v.len + 5) + dumpHook(escaped, v) + escaped.add ":" + s.add escaped + proc dumpHook*(s: var string, v: char) = s.add '"' s.add v From 8053ad67a8b2377242d25b0929c4f20de5fb0896 Mon Sep 17 00:00:00 2001 From: Geoffrey Picron Date: Fri, 28 Apr 2023 17:31:51 +0200 Subject: [PATCH 2/2] fix to use const eval on advise of @SolitudeSF --- src/jsony.nim | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/jsony.nim b/src/jsony.nim index 0a4e187..6d77d46 100644 --- a/src/jsony.nim +++ b/src/jsony.nim @@ -736,11 +736,9 @@ proc dumpHook*(s: var string, v: string) = s.dumpStrFast(v) template dumpKey(s: var string, v: string) = - var escaped = newStringOfCap(v.len + 5) - dumpHook(escaped, v) - escaped.add ":" - s.add escaped - + const v2 = jsony.toJson(v) & ":" + s.add v2 + proc dumpHook*(s: var string, v: char) = s.add '"' s.add v