Merge pull request open-source-parsers#199 from open-source-parsers/set-builders

cdunn2001 · cdunn2001 · commit 2aa4557e7979 · 2015-03-05T09:18:06.000-06:00
Setting builders
diff --git a/doc/jsoncpp.dox b/doc/jsoncpp.dox
@@ -96,13 +96,13 @@ features without losing binary-compatibility.
 \code
 // For convenience, use `writeString()` with a specialized builder.
 Json::StreamWriterBuilder wbuilder;
-wbuilder.settings_["indentation"] = "\t";  // simple Json::Value
+wbuilder["indentation"] = "\t";
 std::string document = Json::writeString(wbuilder, root);
 
 // Here, using a specialized Builder, we discard comments and
 // record errors as we parse.
 Json::CharReaderBuilder rbuilder;
-rbuilder.settings_["collectComments"] = false;  // simple Json::Value
+rbuilder["collectComments"] = false;
 std::string errs;
 bool ok = Json::parseFromStream(rbuilder, std::cin, &root, &errs);
 \endcode
diff --git a/include/json/reader.h b/include/json/reader.h
@@ -285,7 +285,7 @@ class JSON_API CharReader {
 \code
   using namespace Json;
   CharReaderBuilder builder;
-  builder.settings_["collectComments"] = false;
+  builder["collectComments"] = false;
   Value value;
   std::string errs;
   bool ok = parseFromStream(builder, std::cin, &value, &errs);
@@ -337,6 +337,11 @@ class JSON_API CharReaderBuilder : public CharReader::Factory {
    *   otherwise, indicate bad settings via 'invalid'.
    */
   bool validate(Json::Value* invalid) const;
+
+  /** A simple way to update a specific setting.
+   */
+  Value& operator[](std::string key);
+
   /** Called by ctor, but you can use this to reset settings_.
    * \pre 'settings' != NULL (but Json::null is fine)
    * \remark Defaults:
diff --git a/include/json/writer.h b/include/json/writer.h
@@ -76,8 +76,8 @@ std::string writeString(StreamWriter::Factory const& factory, Value const& root)
   using namespace Json;
   Value value = ...;
   StreamWriterBuilder builder;
-  builder.settings_["commentStyle"] = "None";
-  builder.settings_["indentation"] = "   ";  // or whatever you like
+  builder["commentStyle"] = "None";
+  builder["indentation"] = "   ";  // or whatever you like
   std::unique_ptr<Json::StreamWriter> writer(
       builder.newStreamWriter());
   writer->write(value, &std::cout);
@@ -119,6 +119,10 @@ class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
    *   otherwise, indicate bad settings via 'invalid'.
    */
   bool validate(Json::Value* invalid) const;
+  /** A simple way to update a specific setting.
+   */
+  Value& operator[](std::string key);
+
   /** Called by ctor, but you can use this to reset settings_.
    * \pre 'settings' != NULL (but Json::null is fine)
    * \remark Defaults:
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -1927,6 +1927,10 @@ bool CharReaderBuilder::validate(Json::Value* invalid) const
   }
   return 0u == inv.size();
 }
+Value& CharReaderBuilder::operator[](std::string key)
+{
+  return settings_[key];
+}
 // static
 void CharReaderBuilder::strictMode(Json::Value* settings)
 {
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -1122,6 +1122,10 @@ bool StreamWriterBuilder::validate(Json::Value* invalid) const
   }
   return 0u == inv.size();
 }
+Value& StreamWriterBuilder::operator[](std::string key)
+{
+  return settings_[key];
+}
 // static
 void StreamWriterBuilder::setDefaults(Json::Value* settings)
 {
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
@@ -2182,7 +2182,7 @@ JSONTEST_FIXTURE(BuilderTest, settings) {
     Json::CharReaderBuilder rb;
     JSONTEST_ASSERT_EQUAL(false, rb.settings_.isMember("foo"));
     JSONTEST_ASSERT_EQUAL(true, rb.validate(&errs));
-    rb.settings_["foo"] = "bar";
+    rb["foo"] = "bar";
     JSONTEST_ASSERT_EQUAL(true, rb.settings_.isMember("foo"));
     JSONTEST_ASSERT_EQUAL(false, rb.validate(&errs));
   }
@@ -2191,7 +2191,7 @@ JSONTEST_FIXTURE(BuilderTest, settings) {
     Json::StreamWriterBuilder wb;
     JSONTEST_ASSERT_EQUAL(false, wb.settings_.isMember("foo"));
     JSONTEST_ASSERT_EQUAL(true, wb.validate(&errs));
-    wb.settings_["foo"] = "bar";
+    wb["foo"] = "bar";
     JSONTEST_ASSERT_EQUAL(true, wb.settings_.isMember("foo"));
     JSONTEST_ASSERT_EQUAL(false, wb.validate(&errs));
   }

Original file line number	Diff line number	Diff line change
`@@ -1927,6 +1927,10 @@ bool CharReaderBuilder::validate(Json::Value* invalid) const`
`1927`	`1927`	`}`
`1928`	`1928`	`return 0u == inv.size();`
`1929`	`1929`	`}`
	`1930`	`+Value& CharReaderBuilder::operator[](std::string key)`
	`1931`	`+{`
	`1932`	`+ return settings_[key];`
	`1933`	`+}`
`1930`	`1934`	`// static`
`1931`	`1935`	`void CharReaderBuilder::strictMode(Json::Value* settings)`
`1932`	`1936`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1122,6 +1122,10 @@ bool StreamWriterBuilder::validate(Json::Value* invalid) const`
`1122`	`1122`	`}`
`1123`	`1123`	`return 0u == inv.size();`
`1124`	`1124`	`}`
	`1125`	`+Value& StreamWriterBuilder::operator[](std::string key)`
	`1126`	`+{`
	`1127`	`+ return settings_[key];`
	`1128`	`+}`
`1125`	`1129`	`// static`
`1126`	`1130`	`void StreamWriterBuilder::setDefaults(Json::Value* settings)`
`1127`	`1131`	`{`