Modify renderRstToJson to use the json library

This commit is contained in:
flaviut
2014-04-05 23:53:19 -04:00
parent 335de0c49a
commit 99ebcaec3a

View File

@@ -9,7 +9,7 @@
## This module implements an AST for the `reStructuredText`:idx: parser.
import strutils
import strutils, json
type
TRstNodeKind* = enum ## the possible node kinds of an PRstNode
@@ -286,28 +286,27 @@ proc renderRstToRst*(n: PRstNode, result: var string) =
var d: TRenderContext
renderRstToRst(d, n, result)
proc renderRstToJsonNode(node: PRstNode): PJsonNode =
result =
%[
(key: "kind", val: %($node.kind)),
(key: "level", val: %BiggestInt(node.level))
]
if node.text != nil:
result.add("text", %node.text)
if node.sons != nil and len(node.sons) > 0:
var accm = newSeq[PJsonNode](len(node.sons))
for i, son in node.sons:
accm[i] = renderRstToJsonNode(son)
result.add("sons", %accm)
proc renderRstToJson*(node: PRstNode): string =
## Writes the given RST node as JSON that is in the form
## :: code-block
## ::
## {
## "kind":string node.kind,
## "text":optional string node.text,
## "level":optional int node.level,
## "sons":optional node array
## }
result = ""
result.add("{\"kind\":\"" & $ node.kind & "\",")
if node.text != Nil:
# XXX Json spec requires control charecters be escaped as \uXXXX,
# strutils.escape writes them as \uXX
result.add("\"text\":" & node.text.escape & ",")
result.add("\"level\":" & $ node.level)
if node.sons == nil or len(node.sons) == 0:
result.add("}")
else:
result.add(",\"sons\":[")
for i, son in node.sons:
result.add(renderRstToJson(son))
if i < len(node.sons) - 1:
result.add(",")
result.add("]}")
renderRstToJsonNode(node).pretty