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

Implemented block scalar, improved comments

This commit is contained in:
Felix Krause 2016-01-23 14:09:52 +01:00
parent 573d4788c7
commit 954aeafd15
1 changed files with 190 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
private/fastparse.nim
View File

@ -316,8 +316,6 @@ template handlePossibleMapStart() {.dirty.} =
if flowDepth == 0 and lexer.buf[p + 1] in spaceOrLineEnd: if flowDepth == 0 and lexer.buf[p + 1] in spaceOrLineEnd:
handleObjectStart(yamlStartMap, false) handleObjectStart(yamlStartMap, false)
break break
else:
echo "found : but ignoring (flowDepth=", flowDepth, ", next=", lexer.buf[p + 1]
of lineEnd: of lineEnd:
break break
of '[', '{': of '[', '{':
@ -777,6 +775,173 @@ template anchorName(lexer: FastLexer, content: var string) =
else: else:
content.add(c) content.add(c)
template blockScalar(lexer: FastLexer, content: var string,
stateAfter: var FastParseState) =
type ChompType = enum
ctKeep, ctClip, ctStrip
var
literal: bool
blockIndent = 0
chomp: ChompType = ctClip
detectedIndent = false
case lexer.buf[lexer.bufpos]
of '|':
literal = true
of '>':
literal = false
else:
assert(false)
while true:
lexer.bufpos.inc()
case lexer.buf[lexer.bufpos]
of '+':
if chomp != ctClip:
raiseError("Only one chomping indicator is allowed", lexer.bufpos)
chomp = ctKeep
of '-':
if chomp != ctClip:
raiseError("Only one chomping indicator is allowed", lexer.bufpos)
chomp = ctStrip
of '1'..'9':
if detectedIndent:
raiseError("Only one indentation indicator is allowed", lexer.bufpos)
blockIndent = int(lexer.buf[lexer.bufpos]) - int('\x30')
detectedIndent = true
of spaceOrLineEnd:
break
else:
raiseError("Illegal character in block scalar header", lexer.bufpos)
lexer.lineEnding()
case lexer.buf[lexer.bufpos]
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
of EndOfFile:
raiseError("Missing content of block scalar") # TODO: is this correct?
else:
assert(false)
var newlines = 0
let parentIndent = ancestry[ancestry.high].indentation
content = ""
block outer:
while true:
block inner:
for i in countup(1, parentIndent):
case lexer.buf[lexer.bufpos]
of ' ':
discard
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
newlines.inc()
break inner
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
newlines.inc()
break inner
else:
stateAfter = if i == 1: fpBlockLineStart else: fpBlockObjectStart
break outer
lexer.bufpos.inc()
if detectedIndent:
for i in countup(1, blockIndent):
case lexer.buf[lexer.bufpos]
of ' ':
discard
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
newlines.inc()
break inner
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
newlines.inc()
break inner
of EndOfFile:
stateAfter = fpBlockLineStart
break outer
of '#':
lexer.lineEnding()
case lexer.buf[lexer.bufpos]
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
else: discard
stateAfter = fpBlockLineStart
break outer
else:
raiseError("The text is less indented than expected")
lexer.bufpos.inc()
else:
while true:
case lexer.buf[lexer.bufpos]
of ' ':
discard
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
newlines.inc()
break inner
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
newlines.inc()
break inner
of EndOfFile:
stateAfter = fpBlockLineStart
break outer
else:
blockIndent = lexer.getColNumber(lexer.bufpos) - parentIndent
detectedIndent = true
break
lexer.bufpos.inc()
case lexer.buf[lexer.bufpos]
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
newlines.inc()
break inner
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
newlines.inc()
break inner
of EndOfFile:
stateAfter = fpBlockLineStart
break outer
else:
discard
if newlines > 0:
if literal:
content.add(repeat('\x0A', newlines))
elif newlines == 1:
content.add(' ')
else:
content.add(repeat('\x0A', newlines - 1))
newlines = 0
while true:
let c = lexer.buf[lexer.bufpos]
case c
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
newlines.inc()
break
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
newlines.inc()
break inner
of EndOfFile:
stateAfter = fpBlockLineStart
break outer
else:
content.add(c)
lexer.bufpos.inc()
case chomp
of ctClip:
content.add('\x0A')
of ctKeep:
content.add(repeat('\x0A', newlines))
of ctStrip:
discard
proc fastparse*(tagLib: TagLibrary, s: Stream): YamlStream = proc fastparse*(tagLib: TagLibrary, s: Stream): YamlStream =
result = iterator(): YamlStreamEvent = result = iterator(): YamlStreamEvent =
var var
@ -918,18 +1083,22 @@ proc fastparse*(tagLib: TagLibrary, s: Stream): YamlStream =
state = fpBlockAfterPlainScalar state = fpBlockAfterPlainScalar
of ' ': of ' ':
lexer.skipIndentation() lexer.skipIndentation()
indentation = lexer.getColNumber(lexer.bufpos) if lexer.buf[lexer.bufpos] in ['\t', '\x0A', '\c', '#']:
closeMoreIndentedLevels() lexer.lineEnding()
case level.kind handleLineEnd(true)
of fplScalar:
state = fpBlockContinueScalar
of fplUnknown:
handlePossibleMapStart()
state = fpBlockObjectStart
level.indentation = indentation
else: else:
ensureCorrectIndentation() indentation = lexer.getColNumber(lexer.bufpos)
state = fpBlockObjectStart closeMoreIndentedLevels()
case level.kind
of fplScalar:
state = fpBlockContinueScalar
of fplUnknown:
handlePossibleMapStart()
state = fpBlockObjectStart
level.indentation = indentation
else:
ensureCorrectIndentation()
state = fpBlockObjectStart
else: else:
indentation = 0 indentation = 0
closeMoreIndentedLevels() closeMoreIndentedLevels()
@ -1066,6 +1235,14 @@ proc fastparse*(tagLib: TagLibrary, s: Stream): YamlStream =
tag = yTagExclamationMark tag = yTagExclamationMark
yield scalarEvent(content, tag, anchor) yield scalarEvent(content, tag, anchor)
handleObjectEnd(fpBlockAfterObject) handleObjectEnd(fpBlockAfterObject)
of '|', '>':
handleBlockItemStart()
var stateAfter: FastParseState
lexer.blockScalar(content, stateAfter)
if tag == yTagQuestionmark:
tag = yTagExclamationmark
yield scalarEvent(content, tag, anchor)
handleObjectEnd(stateAfter)
of '-': of '-':
if lexer.isPlainSafe(lexer.bufpos + 1, cBlockOut): if lexer.isPlainSafe(lexer.bufpos + 1, cBlockOut):
handleBlockItemStart() handleBlockItemStart()