From a9b565c35c167f06b8179842fd1474b0e0639318 Mon Sep 17 00:00:00 2001 From: Felix Krause Date: Sun, 20 Mar 2016 14:19:46 +0100 Subject: [PATCH] Eliminated dead code, fixed serialization * fpBlockContinueScalar wasn't used anymore and has been removed * Do not mark scalarContent in events as shallow because it breaks peeking in YamlStreams --- private/fastparse.nim | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/private/fastparse.nim b/private/fastparse.nim index 190811e..ba31b3d 100644 --- a/private/fastparse.nim +++ b/private/fastparse.nim @@ -6,9 +6,8 @@ type FastParseState = enum - fpInitial, fpBlockAfterObject, fpBlockAfterPlainScalar, - fpBlockObjectStart, fpBlockContinueScalar, fpExpectDocEnd, fpFlow, - fpFlowAfterObject, fpAfterDocument + fpInitial, fpBlockAfterObject, fpBlockAfterPlainScalar, fpBlockObjectStart, + fpExpectDocEnd, fpFlow, fpFlowAfterObject, fpAfterDocument FastParseLevelKind = enum fplUnknown, fplSequence, fplMapKey, fplMapValue, fplSinglePairKey, @@ -92,7 +91,6 @@ template yieldShallowScalar(content: string) {.dirty.} = var e = YamlStreamEvent(kind: yamlScalar, scalarTag: tag, scalarAnchor: anchor) shallowCopy(e.scalarContent, content) - shallow(e.scalarContent) yield e template yieldLevelEnd() {.dirty.} = @@ -1130,30 +1128,6 @@ proc parse*(p: YamlParser, s: Stream): YamlStream = else: yield startDocEvent() state = fpBlockObjectStart - of fpBlockContinueScalar: - debug("state: fpBlockContinueScalar") - p.lexer.skipWhitespace() - case p.lexer.buf[p.lexer.bufpos] - of '\l': - newlines.inc() - p.lexer.bufpos = p.lexer.handleLF(p.lexer.bufpos) - state = fpBlockObjectStart - of '\c': - newlines.inc() - p.lexer.bufpos = p.lexer.handleCR(p.lexer.bufpos) - of ':': - if p.lexer.isPlainSafe(p.lexer.bufpos + 1, cBlock): - continueMultilineScalar() - else: - startToken() - parserError("Unexpected token") - of '#': - yieldShallowScalar(content) - p.lexer.lineEnding() - handleLineEnd(true) - handleObjectEnd(fpBlockObjectStart) - else: - continueMultilineScalar() of fpBlockAfterPlainScalar: debug("state: blockAfterPlainScalar") p.lexer.skipWhitespace()