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

Fixed and improved canonical presentation

This commit is contained in:
Felix Krause 2016-06-08 20:01:46 +02:00
parent 9945375904
commit 5f6ed61e30
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
private/presenter.nim
View File

@ -432,14 +432,16 @@ proc present*(s: var YamlStream, target: Stream, tagLib: TagLibrary,
of psBlockOnly: nextState = dBlockSequenceItem
if levels.len == 0:
if nextState == dBlockSequenceItem:
if options.style != psJson:
writeTagAndAnchor(target, item.seqTag, tagLib, item.seqAnchor)
else:
case nextState
of dBlockSequenceItem:
if options.style != psJson:
writeTagAndAnchor(target, item.seqTag, tagLib, item.seqAnchor)
of dFlowSequenceStart:
safeWrite(newline)
if options.style != psJson:
writeTagAndAnchor(target, item.seqTag, tagLib, item.seqAnchor)
indentation += options.indentationStep
else: assert false
else:
startItem(target, options.style, indentation,
levels[levels.high], true, newline)
@ -480,7 +482,8 @@ proc present*(s: var YamlStream, target: Stream, tagLib: TagLibrary,
nextState = dFlowMapStart
of psBlockOnly: nextState = dBlockMapValue
if levels.len == 0:
if nextState == dBlockMapValue:
case nextState
of dBlockMapValue:
if options.style != psJson:
writeTagAndAnchor(target, item.mapTag, tagLib, item.mapAnchor)
else:
@ -488,8 +491,13 @@ proc present*(s: var YamlStream, target: Stream, tagLib: TagLibrary,
safeWrite(newline)
writeTagAndAnchor(target, item.mapTag, tagLib, item.mapAnchor)
indentation += options.indentationStep
elif options.style in [psJson, psCanonical]:
of dFlowMapStart:
safeWrite(newline)
if options.style != psJson:
writeTagAndAnchor(target, item.mapTag, tagLib, item.mapAnchor)
indentation += options.indentationStep
of dBlockInlineMap: discard
else: assert false
else:
if nextState in [dBlockMapValue, dBlockImplicitMapKey]:
startItem(target, options.style, indentation,