From 353cea949e8490c358f03d981949a8e074020e1a Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Mon, 20 Apr 2020 22:59:00 +0200 Subject: [PATCH] Make the skip count correct (even if not used currently) --- src/sfizz/parser/Parser.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/sfizz/parser/Parser.cpp b/src/sfizz/parser/Parser.cpp index ffa660aa..455c0aec 100644 --- a/src/sfizz/parser/Parser.cpp +++ b/src/sfizz/parser/Parser.cpp @@ -389,20 +389,21 @@ size_t Parser::skipComment() switch (commentType) { case CommentType::Line: - { - int c; - while ((c = reader.getChar()) != Reader::kEof && c != '\r' && c != '\n') - ++count; - terminated = true; + while (!terminated) { + int c = reader.getChar(); + count += (c != Reader::kEof); + terminated = c == Reader::kEof || c == '\r' || c == '\n'; } break; case CommentType::Block: { int c1 = 0; int c2 = reader.getChar(); + count += (c2 != Reader::kEof); while (!terminated && c2 != Reader::kEof) { c1 = c2; c2 = reader.getChar(); + count += (c2 != Reader::kEof); terminated = c1 == '*' && c2 == '/'; } }