generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-06 02:45:02 +02:00
Code Issues Projects Releases Wiki Activity

incorporate 'proper newlines for comments' into new StreamWriter

Browse Source
This commit is contained in:
Christopher Dunn 2015-01-25 15:46:33 -06:00
parent 648843d148
commit dea6f8d9a6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib_json/json_writer.cpp
View File

@ -713,9 +713,11 @@ BuiltStyledStreamWriter::BuiltStyledStreamWriter(
int BuiltStyledStreamWriter::write(Value const& root) int BuiltStyledStreamWriter::write(Value const& root)
{ {
addChildValues_ = false; addChildValues_ = false;
indented_ = false; indented_ = true;
indentString_ = ""; indentString_ = "";
writeCommentBeforeValue(root); writeCommentBeforeValue(root);
if (!indented_) writeIndent();
indented_ = true;
writeValue(root); writeValue(root);
writeCommentAfterValueOnSameLine(root); writeCommentAfterValueOnSameLine(root);
sout_ << "\n"; sout_ << "\n";
@ -878,20 +880,17 @@ void BuiltStyledStreamWriter::writeCommentBeforeValue(Value const& root) {
if (!root.hasComment(commentBefore)) if (!root.hasComment(commentBefore))
return; return;
sout_ << "\n"; if (!indented_) writeIndent();
writeIndent();
const std::string& comment = root.getComment(commentBefore); const std::string& comment = root.getComment(commentBefore);
std::string::const_iterator iter = comment.begin(); std::string::const_iterator iter = comment.begin();
while (iter != comment.end()) { while (iter != comment.end()) {
sout_ << *iter; sout_ << *iter;
if (*iter == '\n' && if (*iter == '\n' &&
(iter != comment.end() && *(iter + 1) == '/')) (iter != comment.end() && *(iter + 1) == '/'))
writeIndent(); // writeIndent(); // would write extra newline
sout_ << indentString_;
++iter; ++iter;
} }
// Comments are stripped of trailing newlines, so add one here
sout_ << "\n";
indented_ = false; indented_ = false;
} }
@ -900,9 +899,8 @@ void BuiltStyledStreamWriter::writeCommentAfterValueOnSameLine(Value const& root
sout_ << " " + root.getComment(commentAfterOnSameLine); sout_ << " " + root.getComment(commentAfterOnSameLine);
if (root.hasComment(commentAfter)) { if (root.hasComment(commentAfter)) {
sout_ << "\n"; writeIndent();
sout_ << root.getComment(commentAfter); sout_ << root.getComment(commentAfter);
sout_ << "\n";
} }
} }