peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed folding bug (detecting indentation, example 8.2), and clipping/stripping empty strings (example 8.6)

Browse Source
This commit is contained in:
jbeder
2011-03-04 02:26:59 +00:00
parent cee0974abd
commit 1132c8df21
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/scanscalar.cpp
View File

@@ -143,7 +143,7 @@ namespace YAML
if(!nextEmptyLine && foldedNewlineCount > 0) { if(!nextEmptyLine && foldedNewlineCount > 0) {
scalar += std::string(foldedNewlineCount - 1, '\n'); scalar += std::string(foldedNewlineCount - 1, '\n');
if(foldedNewlineStartedMoreIndented || nextMoreIndented) if(foldedNewlineStartedMoreIndented || nextMoreIndented | !foundNonEmptyLine)
scalar += "\n"; scalar += "\n";
foldedNewlineCount = 0; foldedNewlineCount = 0;
} }
@@ -175,12 +175,23 @@ namespace YAML
scalar.erase(pos + 1); scalar.erase(pos + 1);
} }
if(params.chomp == STRIP || params.chomp == CLIP) { switch(params.chomp) {
std::size_t pos = scalar.find_last_not_of('\n'); case CLIP: {
if(params.chomp == CLIP && pos + 1 < scalar.size()) const std::size_t pos = scalar.find_last_not_of('\n');
scalar.erase(pos + 2); if(pos == std::string::npos)
else if(params.chomp == STRIP && pos < scalar.size()) scalar.erase();
scalar.erase(pos + 1); else if(pos + 1 < scalar.size())
scalar.erase(pos + 2);
} break;
case STRIP: {
const std::size_t pos = scalar.find_last_not_of('\n');
if(pos == std::string::npos)
scalar.erase();
else if(pos < scalar.size())
scalar.erase(pos + 1);
} break;
default:
break;
} }
return scalar; return scalar;