From 21232e3bef7cb524f3ed35636b1a1e32a84d225f Mon Sep 17 00:00:00 2001 From: jbeder Date: Mon, 7 Sep 2009 06:42:03 +0000 Subject: [PATCH] Fixed bug in trailing newlines of plain scalars --- src/scanscalar.cpp | 6 +++--- src/scantoken.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp index 76406ef..bd8fe42 100644 --- a/src/scanscalar.cpp +++ b/src/scanscalar.cpp @@ -141,11 +141,11 @@ namespace YAML scalar.erase(pos + 1); } - if(params.chomp <= 0) { + if(params.chomp == STRIP || params.chomp == CLIP) { std::size_t pos = scalar.find_last_not_of('\n'); - if(params.chomp == 0 && pos + 1 < scalar.size()) + if(params.chomp == CLIP && pos + 1 < scalar.size()) scalar.erase(pos + 2); - else if(params.chomp == -1 && pos < scalar.size()) + else if(params.chomp == STRIP && pos < scalar.size()) scalar.erase(pos + 1); } diff --git a/src/scantoken.cpp b/src/scantoken.cpp index 0692fd5..51bb8bf 100644 --- a/src/scantoken.cpp +++ b/src/scantoken.cpp @@ -290,7 +290,7 @@ namespace YAML params.fold = true; params.eatLeadingWhitespace = true; params.trimTrailingSpaces = true; - params.chomp = CLIP; + params.chomp = STRIP; params.onDocIndicator = BREAK; params.onTabInIndentation = THROW;