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

Properly handle comments in flow mode

This commit is contained in:
Felix Krause 2016-03-16 19:30:51 +01:00
parent 1c61486739
commit d1c8c171a1
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
private/fastparse.nim
View File

@ -376,18 +376,19 @@ template skipWhitespace(lexer: BaseLexer) =
debug("lex: skipWhitespace")
while lexer.buf[lexer.bufpos] in space: lexer.bufpos.inc()
template skipWhitespaceAndNewlines(lexer: BaseLexer) =
debug("lex: skipWhitespaceAndNewLines")
template skipWhitespaceCommentsAndNewlines(lexer: BaseLexer) =
debug("lex: skipWhitespaceCommentsAndNewlines")
if lexer.buf[lexer.bufpos] != '#':
while true:
case lexer.buf[lexer.bufpos]
of space:
of space: lexer.bufpos.inc()
of '\l': lexer.bufpos = lexer.handleLF(lexer.bufpos)
of '\c': lexer.bufpos = lexer.handleCR(lexer.bufpos)
of '#': # also skip comments
lexer.bufpos.inc()
of '\l':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
else:
break
while lexer.buf[lexer.bufpos] notin {'\l', '\c', EndOfFile}:
lexer.bufpos.inc()
else: break
template skipIndentation(lexer: BaseLexer) =
debug("lex: skipIndentation")
@ -1439,7 +1440,7 @@ proc parse*(p: YamlParser, s: Stream): YamlStream =
parserError("Unexpected content (expected document end)")
of fpFlow:
debug("state: flow")
p.lexer.skipWhitespaceAndNewlines()
p.lexer.skipWhitespaceCommentsAndNewlines()
case p.lexer.buf[p.lexer.bufpos]
of '{':
handleObjectStart(yamlStartMap)
@ -1570,7 +1571,7 @@ proc parse*(p: YamlParser, s: Stream): YamlStream =
handleFlowPlainScalar()
of fpFlowAfterObject:
debug("state: flowAfterObject")
p.lexer.skipWhitespaceAndNewlines()
p.lexer.skipWhitespaceCommentsAndNewlines()
case p.lexer.buf[p.lexer.bufpos]
of ']':
case level.kind