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

Handle line folding in double quoted strings

This commit is contained in:
Felix Krause 2016-01-23 15:29:45 +01:00
parent 954aeafd15
commit 7f8afef3d4
1 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
private/fastparse.nim
View File

@ -564,15 +564,53 @@ proc unicodeSequence(lexer: var FastLexer, length: int):
raiseError("Invalid character in unicode escape sequence", lexer.bufpos) raiseError("Invalid character in unicode escape sequence", lexer.bufpos)
return toUTF8(unicodeChar) return toUTF8(unicodeChar)
template doublyQuotedScalar(lexer: FastLexer, content: var string) = template processDoubleQuotedWhitespace(newlines: var int) {.dirty.} =
debug("lex: doublyQuotedScalar") var
after = ""
block outer:
while true:
case lexer.buf[lexer.bufpos]
of ' ', '\t':
after.add(lexer.buf[lexer.bufpos])
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
break
of '\c':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
break
else:
content.add(after)
break outer
lexer.bufpos.inc()
while true:
case lexer.buf[lexer.bufpos]
of ' ', '\t':
discard
of '\x0A':
lexer.bufpos = lexer.handleLF(lexer.bufpos)
newlines.inc()
of '\c':
lexer.bufpos = lexer.handleCR(lexer.bufpos)
newlines.inc()
else:
if newlines == 0:
discard
elif newlines == 1:
content.add(' ')
else:
content.add(repeat('\x0A', newlines - 1))
break
lexer.bufpos.inc()
template doubleQuotedScalar(lexer: FastLexer, content: var string) =
debug("lex: doubleQuotedScalar")
lexer.tokenstart = lexer.getColNumber(lexer.bufpos) lexer.tokenstart = lexer.getColNumber(lexer.bufpos)
lexer.bufpos.inc()
while true: while true:
lexer.bufpos.inc() var c = lexer.buf[lexer.bufpos]
let c = lexer.buf[lexer.bufpos]
case c case c
of EndOfFile: of EndOfFile:
raiseError("Unfinished doubly quoted string") raiseError("Unfinished double quoted string")
of '\\': of '\\':
lexer.bufpos.inc() lexer.bufpos.inc()
case lexer.buf[lexer.bufpos] case lexer.buf[lexer.bufpos]
@ -598,13 +636,22 @@ template doublyQuotedScalar(lexer: FastLexer, content: var string) =
of 'x': content.add(lexer.unicodeSequence(2)) of 'x': content.add(lexer.unicodeSequence(2))
of 'u': content.add(lexer.unicodeSequence(4)) of 'u': content.add(lexer.unicodeSequence(4))
of 'U': content.add(lexer.unicodeSequence(8)) of 'U': content.add(lexer.unicodeSequence(8))
of '\x0A', '\c':
var newlines = 0
processDoubleQuotedWhitespace(newlines)
continue
else: else:
raiseError("Illegal character in escape sequence") raiseError("Illegal character in escape sequence")
of '"': of '"':
lexer.bufpos.inc() lexer.bufpos.inc()
break break
of '\x0A', '\c', '\t', ' ':
var newlines = 1
processdoubleQuotedWhitespace(newlines)
continue
else: else:
content.add(c) content.add(c)
lexer.bufpos.inc()
proc isPlainSafe(lexer: FastLexer, index: int, context: YamlContext): bool = proc isPlainSafe(lexer: FastLexer, index: int, context: YamlContext): bool =
case lexer.buf[lexer.bufpos + 1] case lexer.buf[lexer.bufpos + 1]
@ -1230,7 +1277,7 @@ proc fastparse*(tagLib: TagLibrary, s: Stream): YamlStream =
of '"': of '"':
handleBlockItemStart() handleBlockItemStart()
content = "" content = ""
lexer.doublyQuotedScalar(content) lexer.doubleQuotedScalar(content)
if tag == yTagQuestionMark: if tag == yTagQuestionMark:
tag = yTagExclamationMark tag = yTagExclamationMark
yield scalarEvent(content, tag, anchor) yield scalarEvent(content, tag, anchor)
@ -1427,7 +1474,7 @@ proc fastparse*(tagLib: TagLibrary, s: Stream): YamlStream =
handleObjectEnd(fpFlowAfterObject) handleObjectEnd(fpFlowAfterObject)
of '"': of '"':
content = "" content = ""
lexer.doublyQuotedScalar(content) lexer.doubleQuotedScalar(content)
if tag == yTagQuestionmark: if tag == yTagQuestionmark:
tag = yTagExclamationmark tag = yTagExclamationmark
yield scalarEvent(content, tag, anchor) yield scalarEvent(content, tag, anchor)