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

Parser: Use sets instead of arrays where feasible

This commit is contained in:
Felix Krause 2016-03-09 20:29:18 +01:00
parent a6ce61d3c4
commit 99ece33b8b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
private/fastparse.nim
View File

@ -407,7 +407,7 @@ template directiveName(lexer: BaseLexer, directive: var LexedDirective) =
lexer.bufpos.inc() lexer.bufpos.inc()
if lexer.buf[lexer.bufpos] == 'G': if lexer.buf[lexer.bufpos] == 'G':
lexer.bufpos.inc() lexer.bufpos.inc()
if lexer.buf[lexer.bufpos] in [' ', '\t', '\l', '\c', EndOfFile]: if lexer.buf[lexer.bufpos] in {' ', '\t', '\l', '\c', EndOfFile}:
directive = ldTag directive = ldTag
while lexer.buf[lexer.bufpos] notin spaceOrLineEnd: while lexer.buf[lexer.bufpos] notin spaceOrLineEnd:
lexer.bufpos.inc() lexer.bufpos.inc()
@ -734,7 +734,7 @@ template handleFlowPlainScalar() {.dirty.} =
content = "" content = ""
startToken() startToken()
p.lexer.plainScalar(content, cFlow) p.lexer.plainScalar(content, cFlow)
if p.lexer.buf[p.lexer.bufpos] in ['{', '}', '[', ']', ',', ':', '#']: if p.lexer.buf[p.lexer.bufpos] in {'{', '}', '[', ']', ',', ':', '#'}:
discard discard
else: else:
var newlines = 0 var newlines = 0
@ -1160,7 +1160,7 @@ proc parse*(p: YamlParser, s: Stream): YamlStream =
of ' ': of ' ':
p.lexer.skipIndentation() p.lexer.skipIndentation()
if p.lexer.buf[p.lexer.bufpos] in if p.lexer.buf[p.lexer.bufpos] in
['\t', '\l', '\c', '#', EndOfFile]: {'\t', '\l', '\c', '#', EndOfFile}:
p.lexer.lineEnding() p.lexer.lineEnding()
handleLineEnd(true) handleLineEnd(true)
else: else:
@ -1224,7 +1224,7 @@ proc parse*(p: YamlParser, s: Stream): YamlStream =
p.lexer.skipWhitespace() p.lexer.skipWhitespace()
case p.lexer.buf[p.lexer.bufpos] case p.lexer.buf[p.lexer.bufpos]
of '\l': of '\l':
if level.kind notin [fplUnknown, fplScalar]: if level.kind notin {fplUnknown, fplScalar}:
startToken() startToken()
parserError("Unexpected scalar") parserError("Unexpected scalar")
newlines = 1 newlines = 1
@ -1232,7 +1232,7 @@ proc parse*(p: YamlParser, s: Stream): YamlStream =
p.lexer.bufpos = p.lexer.handleLF(p.lexer.bufpos) p.lexer.bufpos = p.lexer.handleLF(p.lexer.bufpos)
state = fpBlockLineStart state = fpBlockLineStart
of '\c': of '\c':
if level.kind notin [fplUnknown, fplScalar]: if level.kind notin {fplUnknown, fplScalar}:
startToken() startToken()
parserError("Unexpected scalar") parserError("Unexpected scalar")
newlines = 1 newlines = 1
@ -1568,7 +1568,7 @@ proc parse*(p: YamlParser, s: Stream): YamlStream =
leaveFlowLevel() leaveFlowLevel()
of '}': of '}':
case level.kind case level.kind
of [fplMapKey, fplMapValue]: of fplMapKey, fplMapValue:
discard discard
of fplSequence: of fplSequence:
startToken() startToken()