add all features

cdunn2001 · cdunn2001 · commit f757c18ca052 · 2015-02-09T18:24:56.000-06:00
diff --git a/include/json/reader.h b/include/json/reader.h
@@ -298,12 +298,16 @@ class JSON_API CharReaderBuilder : public CharReader::Factory {
   /** Configuration of this builder.
     These are case-sensitive.
     Available settings (case-sensitive):
-    - "collectComments": false or true (default=true)
-    - TODO: other features ...
+    - "collectComments": false or true
+    - "allowComments"
+    - "strictRoot"
+    - "allowDroppedNullPlaceholders"
+    - "allowNumericKeys"
+
     You can examine 'settings_` yourself
     to see the defaults. You can also write and read them just like any
     JSON Value.
-    \sa setDefaults(Json::Value*)
+    \sa setDefaults()
     */
   Json::Value settings_;
 
@@ -312,7 +316,7 @@ class JSON_API CharReaderBuilder : public CharReader::Factory {
 
   virtual CharReader* newCharReader() const;
 
-  /** \return true if 'settings' are illegal and consistent;
+  /** \return true if 'settings' are legal and consistent;
    *   otherwise, indicate bad settings via 'invalid'.
    */
   bool validate(Json::Value* invalid) const;
diff --git a/include/json/writer.h b/include/json/writer.h
@@ -99,11 +99,13 @@ class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
   // without a major version bump.
   /** Configuration of this builder.
     Available settings (case-sensitive):
-    - "commentStyle": "None", "Some", or "All" (default="All")
-    - "indentation":  (default="\t")
-    But don't trust these docs. You can examine 'settings_` yourself
+    - "commentStyle": "None", "Some", or "All"
+    - "indentation":  "<anything>"
+
+    You can examine 'settings_` yourself
     to see the defaults. You can also write and read them just like any
     JSON Value.
+    \sa setDefaults()
     */
   Json::Value settings_;
 
@@ -115,7 +117,7 @@ class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
    */
   virtual StreamWriter* newStreamWriter(std::ostream* sout) const;
 
-  /** \return true if 'settings' are illegal and consistent;
+  /** \return true if 'settings' are legal and consistent;
    *   otherwise, indicate bad settings via 'invalid'.
    */
   bool validate(Json::Value* invalid) const;
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -925,13 +925,20 @@ CharReader* CharReaderBuilder::newCharReader() const
 
   bool collectComments = settings_["collectComments"].asBool();
   Features features = Features::all();
-  // TODO: Fill in features.
+  features.allowComments_ = settings_["allowComments"].asBool();
+  features.strictRoot_ = settings_["strictRoot"].asBool();
+  features.allowDroppedNullPlaceholders_ = settings_["allowDroppedNullPlaceholders"].asBool();
+  features.allowNumericKeys_ = settings_["allowNumericKeys"].asBool();
   return new OldReader(collectComments, features);
 }
 static void getValidReaderKeys(std::set<std::string>* valid_keys)
 {
   valid_keys->clear();
   valid_keys->insert("collectComments");
+  valid_keys->insert("allowComments");
+  valid_keys->insert("strictRoot");
+  valid_keys->insert("allowDroppedNullPlaceholders");
+  valid_keys->insert("allowNumericKeys");
 }
 bool CharReaderBuilder::validate(Json::Value* invalid) const
 {

Original file line number	Diff line number	Diff line change
`@@ -925,13 +925,20 @@ CharReader* CharReaderBuilder::newCharReader() const`
`925`	`925`
`926`	`926`	`bool collectComments = settings_["collectComments"].asBool();`
`927`	`927`	`Features features = Features::all();`
`928`		`- // TODO: Fill in features.`
	`928`	`+ features.allowComments_ = settings_["allowComments"].asBool();`
	`929`	`+ features.strictRoot_ = settings_["strictRoot"].asBool();`
	`930`	`+ features.allowDroppedNullPlaceholders_ = settings_["allowDroppedNullPlaceholders"].asBool();`
	`931`	`+ features.allowNumericKeys_ = settings_["allowNumericKeys"].asBool();`
`929`	`932`	`return new OldReader(collectComments, features);`
`930`	`933`	`}`
`931`	`934`	`static void getValidReaderKeys(std::set<std::string>* valid_keys)`
`932`	`935`	`{`
`933`	`936`	`valid_keys->clear();`
`934`	`937`	`valid_keys->insert("collectComments");`
	`938`	`+ valid_keys->insert("allowComments");`
	`939`	`+ valid_keys->insert("strictRoot");`
	`940`	`+ valid_keys->insert("allowDroppedNullPlaceholders");`
	`941`	`+ valid_keys->insert("allowNumericKeys");`
`935`	`942`	`}`
`936`	`943`	`bool CharReaderBuilder::validate(Json::Value* invalid) const`
`937`	`944`	`{`