void setIndentation(std::string indentation);
/// Do not take ownership of sout, but maintain a reference.
- StreamWriter* newStreamWriter(std::ostream* sout);
+ StreamWriter* newStreamWriter(std::ostream* sout) const;
};
};
/// \brief Write into stringstream, then return string, for convenience.
-std::string writeString(Value const& root, StreamWriterBuilder const& builder);
+std::string writeString(Value const& root, StreamWriter::Builder const& builder);
/** \brief Abstract class for writers.
reader.getFormattedErrorMessages().c_str());
return 1;
}
-
if (!parseOnly) {
FILE* factual = fopen(actual.c_str(), "wt");
if (!factual) {
writer.write(sout, root);
return sout.str();
}
+static std::string useBuiltStyledStreamWriter(
+ Json::Value const& root)
+{
+ Json::StreamWriterBuilderFactory f;
+ Json::StreamWriter::Builder builder(&f);
+ builder.setCommentStyle(Json::StreamWriter::CommentStyle::All);
+ return writeString(root, builder);
+}
static int rewriteValueTree(
const std::string& rewritePath,
const Json::Value& root,
opts->write = &useStyledWriter;
} else if (writerName == "StyledStreamWriter") {
opts->write = &useStyledStreamWriter;
+ } else if (writerName == "BuiltStyledStreamWriter") {
+ opts->write = &useBuiltStyledStreamWriter;
} else {
printf("Unknown '--json-writer %s'\n", writerName.c_str());
return 4;
if (size == 0)
pushValue("[]");
else {
- bool isArrayMultiLine = isMultineArray(value);
- if (isArrayMultiLine) {
+ bool isMultiLine = (cs_ == CommentStyle::All) || isMultineArray(value);
+ if (isMultiLine) {
writeWithIndent("[");
indent();
bool hasChildValue = !childValues_.empty();
{
own_->setIndentation(v);
}
-StreamWriter* StreamWriter::Builder::newStreamWriter(std::ostream* sout)
+StreamWriter* StreamWriter::Builder::newStreamWriter(std::ostream* sout) const
{
return own_->newStreamWriter(sout);
}
/// Do not take ownership of sout, but maintain a reference.
StreamWriter* newStreamWriter(std::ostream* sout);
-std::string writeString(Value const& root, StreamWriterBuilder const& builder) {
+std::string writeString(Value const& root, StreamWriter::Builder const& builder) {
std::ostringstream sout;
std::unique_ptr<StreamWriter> const sw(builder.newStreamWriter(&sout));
sw->write(root);
std::ostream& operator<<(std::ostream& sout, Value const& root) {
StreamWriterBuilderFactory f;
StreamWriter::Builder builder(&f);
- builder.setCommentStyle(StreamWriter::CommentStyle::Some);
+ builder.setCommentStyle(StreamWriter::CommentStyle::All);
std::shared_ptr<StreamWriter> writer(builder.newStreamWriter(&sout));
writer->write(root);
return sout;