jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

match json.toPretty style with NodeJS's stringify (#5406)

Browse source
This commit is contained in:
Emery Hemingway 2017-02-21 20:24:55 +01:00 • committed by Andreas Rumpf
commit 2ba374f9ab
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pure/json.nim
View file

@ -952,7 +952,7 @@ proc newIndent(curr, indent: int, ml: bool): int =
else: return indent else: return indent
proc nl(s: var string, ml: bool) = proc nl(s: var string, ml: bool) =
if ml: s.add("\n") s.add(if ml: "\n" else: " ")
proc escapeJson*(s: string; result: var string) = proc escapeJson*(s: string; result: var string) =
## Converts a string `s` to its JSON representation. ## Converts a string `s` to its JSON representation.
@ -986,15 +986,14 @@ proc toPretty(result: var string, node: JsonNode, indent = 2, ml = true,
lstArr = false, currIndent = 0) = lstArr = false, currIndent = 0) =
case node.kind case node.kind
of JObject: of JObject:
if currIndent != 0 and not lstArr: result.nl(ml) if lstArr: result.indent(currIndent) # Indentation
result.indent(currIndent) # Indentation
if node.fields.len > 0: if node.fields.len > 0:
result.add("{") result.add("{")
result.nl(ml) # New line result.nl(ml) # New line
var i = 0 var i = 0
for key, val in pairs(node.fields): for key, val in pairs(node.fields):
if i > 0: if i > 0:
result.add(", ") result.add(",")
result.nl(ml) # New Line result.nl(ml) # New Line
inc i inc i
# Need to indent more than { # Need to indent more than {
@ -1030,7 +1029,7 @@ proc toPretty(result: var string, node: JsonNode, indent = 2, ml = true,
result.nl(ml) result.nl(ml)
for i in 0..len(node.elems)-1: for i in 0..len(node.elems)-1:
if i > 0: if i > 0:
result.add(", ") result.add(",")
result.nl(ml) # New Line result.nl(ml) # New Line
toPretty(result, node.elems[i], indent, ml, toPretty(result, node.elems[i], indent, ml,
true, newIndent(currIndent, indent, ml)) true, newIndent(currIndent, indent, ml))