Merge pull request open-source-parsers#165 from cdunn2001/master

Remove some experimental classes that are not needed for 1.4.0. This also helps 0.8.0 binary compatibility with 0.6.0-rc2.

Author: cdunn2001

include/json/value.h

@@ -133,7 +133,8 @@ class JSON_API Value {
   typedef Json::LargestUInt LargestUInt;
   typedef Json::ArrayIndex ArrayIndex;
 
-  static const Value& null;
+  static const Value& null;  ///! We regret this reference to a global instance; prefer the simpler Value().
+  static const Value& nullRef;  ///! just a kludge for binary-compatibility; same as null
   /// Minimum signed integer value that can be stored in a Json::Value.
   static const LargestInt minLargestInt;
   /// Maximum signed integer value that can be stored in a Json::Value.

include/json/writer.h

@@ -90,8 +90,15 @@ 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"
+    - "commentStyle": "None" or "All"
     - "indentation":  "<anything>"
+    - "enableYAMLCompatibility": False or True
+      - slightly change the whitespace around colons
+    - "dropNullPlaceholders": False or True
+      - Drop the "null" string from the writer's output for nullValues.
+        Strictly speaking, this is not valid JSON. But when the output is being
+        fed to a browser's Javascript, it makes for smaller output and the
+        browser can handle the output just fine.
 
     You can examine 'settings_` yourself
     to see the defaults. You can also write and read them just like any
@@ -120,54 +127,6 @@ class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
   static void setDefaults(Json::Value* settings);
 };
 
-/** \brief Build a StreamWriter implementation.
- * Comments are not written, and most whitespace is omitted.
- * In addition, there are some special settings to allow compatibility
- * with the old FastWriter.
- * Usage:
- * \code
- *   OldCompressingStreamWriterBuilder b;
- *   b.dropNullPlaceHolders_ = true; // etc.
- *   StreamWriter* w = b.newStreamWriter();
- *   w->write(value, &std::cout);
- *   delete w;
- * \endcode
- *
- * \deprecated Use StreamWriterBuilder
- */
-class JSON_API OldCompressingStreamWriterBuilder : public StreamWriter::Factory
-{
-public:
-  // Note: We cannot add data-members to this class without a major version bump.
-  // So these might as well be completely exposed.
-
-  /** \brief Drop the "null" string from the writer's output for nullValues.
-  * Strictly speaking, this is not valid JSON. But when the output is being
-  * fed to a browser's Javascript, it makes for smaller output and the
-  * browser can handle the output just fine.
-  */
-  bool dropNullPlaceholders_;
-  /** \brief Do not add \n at end of document.
-    * Normally, we add an extra newline, just because.
-    */
-  bool omitEndingLineFeed_;
-  /** \brief Add a space after ':'.
-    * If indentation is non-empty, we surround colon with whitespace,
-    * e.g. " : "
-    * This will add back the trailing space when there is no indentation.
-    * This seems dubious when the entire document is on a single line,
-    * but we leave this here to repduce the behavior of the old `FastWriter`.
-    */
-  bool enableYAMLCompatibility_;
-
-  OldCompressingStreamWriterBuilder()
-    : dropNullPlaceholders_(false)
-    , omitEndingLineFeed_(false)
-    , enableYAMLCompatibility_(false)
-  {}
-  virtual StreamWriter* newStreamWriter() const;
-};
-
 /** \brief Abstract class for writers.
  * \deprecated Use StreamWriter.
  */
@@ -185,7 +144,7 @@ class JSON_API Writer {
  *consumption,
  * but may be usefull to support feature such as RPC where bandwith is limited.
  * \sa Reader, Value
- * \deprecated Use OldCompressingStreamWriterBuilder.
+ * \deprecated Use StreamWriterBuilder.
  */
 class JSON_API FastWriter : public Writer {
 public: