From ca38246d21b32a294c97e99657d97f5ef493aefb Mon Sep 17 00:00:00 2001 From: Flaviu Tamas Date: Wed, 18 Mar 2015 20:57:28 -0400 Subject: [PATCH] Fix segfault in jsondoc No idea how this got in, I'm not sure if it's ever worked. --- compiler/docgen.nim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 5439922aff..4af69745be 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -521,13 +521,13 @@ proc generateJson(d: PDoc, n: PNode, jArray: JsonNode = nil): JsonNode = result = genJSONItem(d, n.sons[i], n.sons[i].sons[0], succ(skType, ord(n.kind)-ord(nkTypeSection))) of nkStmtList: - var elem = jArray - if elem == nil: elem = newJArray() + result = if jArray != nil: jArray else: newJArray() + for i in countup(0, sonsLen(n) - 1): - var r = generateJson(d, n.sons[i], elem) + var r = generateJson(d, n.sons[i], result) if r != nil: - elem.add(r) - if result == nil: result = elem + result.add(r) + of nkWhenStmt: # generate documentation for the first branch only: if not checkForFalse(n.sons[0].sons[0]) and jArray != nil: