status-im
/
NimYAML
mirror of https://github.com/status-im/NimYAML.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly present empty collections in block-only. 

* Fixes #33
This commit is contained in:
Felix Krause 2017-01-10 11:45:55 +01:00
parent 737d326e7a
commit 936df70daa
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yaml/presenter.nim
View File

@ -554,7 +554,11 @@ proc doPresent(s: var YamlStream, target: PresenterTarget,
"Cannot have sequence as map key in JSON output!") "Cannot have sequence as map key in JSON output!")
nextState = dFlowSequenceStart nextState = dFlowSequenceStart
of psMinimal, psCanonical: nextState = dFlowSequenceStart of psMinimal, psCanonical: nextState = dFlowSequenceStart
of psBlockOnly: nextState = dBlockSequenceItem of psBlockOnly:
yAssert(not s.finished())
let next = s.peek()
if next.kind == yamlEndSeq: nextState = dFlowSequenceStart
else: nextState = dBlockSequenceItem
if levels.len == 0: if levels.len == 0:
case nextState case nextState
@ -605,7 +609,11 @@ proc doPresent(s: var YamlStream, target: PresenterTarget,
raise newException(YamlPresenterJsonError, raise newException(YamlPresenterJsonError,
"Cannot have map as map key in JSON output!") "Cannot have map as map key in JSON output!")
nextState = dFlowMapStart nextState = dFlowMapStart
of psBlockOnly: nextState = dBlockMapValue of psBlockOnly:
yAssert(not s.finished())
let next = s.peek()
if next.kind == yamlEndMap: nextState = dFlowMapStart
else: nextState = dBlockMapValue
if levels.len == 0: if levels.len == 0:
case nextState case nextState
of dBlockMapValue: of dBlockMapValue: