drop StreamWriterBuilderFactory, for now

cdunn2001 · cdunn2001 · commit fe3979cd8a94 · 2015-01-25T15:54:40.000-06:00
diff --git a/include/json/writer.h b/include/json/writer.h
@@ -30,26 +30,20 @@ class StreamWriterBuilder;
 
   using namespace Json;
   Value value;
-  StreamWriterBuilderFactory f;
-  StreamWriter::Builder builder(&f);
+  StreamWriter::Builder builder;
   builder.setCommentStyle(StreamWriter::CommentStyle::None);
   std::shared_ptr<StreamWriter> writer(
     builder.newStreamWriter(&std::cout));
   writer->write(value);
   std::cout.flush();
 */
-class JSON_API StreamWriterBuilderFactory {
-public:
-  virtual ~StreamWriterBuilderFactory();
-  virtual StreamWriterBuilder* newStreamWriterBuilder() const;
-};
-
 class JSON_API StreamWriter {
 protected:
   std::ostream& sout_;  // not owned; will not delete
 public:
   enum class CommentStyle {None, Some, All};
 
+  /// Keep a reference, but do not take ownership of `sout`.
   StreamWriter(std::ostream* sout);
   virtual ~StreamWriter();
   /// Write Value into document as configured in sub-class.
@@ -62,8 +56,10 @@ class JSON_API StreamWriter {
   /// \see http://stackoverflow.com/questions/14875052/pure-virtual-functions-and-binary-compatibility
   class Builder {
     StreamWriterBuilder* own_;
+    Builder(Builder const&);  // noncopyable
+    void operator=(Builder const&);  // noncopyable
   public:
-    Builder(StreamWriterBuilderFactory const*);
+    Builder();
     ~Builder();  // delete underlying StreamWriterBuilder
 
     void setCommentStyle(CommentStyle cs);  /// default: All
diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
@@ -184,8 +184,7 @@ static std::string useStyledStreamWriter(
 static std::string useBuiltStyledStreamWriter(
     Json::Value const& root)
 {
-  Json::StreamWriterBuilderFactory f;
-  Json::StreamWriter::Builder builder(&f);
+  Json::StreamWriter::Builder builder;
   builder.setCommentStyle(Json::StreamWriter::CommentStyle::All);
   return writeString(root, builder);
 }
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -967,6 +967,13 @@ StreamWriter* StreamWriterBuilder::newStreamWriter(std::ostream* stream) const
 {
   return new BuiltStyledStreamWriter(stream, indentation_, cs_);
 }
+
+// This might become public someday.
+class StreamWriterBuilderFactory {
+public:
+  virtual ~StreamWriterBuilderFactory();
+  virtual StreamWriterBuilder* newStreamWriterBuilder() const;
+};
 StreamWriterBuilderFactory::~StreamWriterBuilderFactory()
 {
 }
@@ -975,14 +982,19 @@ StreamWriterBuilder* StreamWriterBuilderFactory::newStreamWriterBuilder() const
   return new StreamWriterBuilder;
 }
 
-StreamWriter::Builder::Builder(StreamWriterBuilderFactory const* f)
-    : own_(f->newStreamWriterBuilder())
+StreamWriter::Builder::Builder()
+    : own_(StreamWriterBuilderFactory().newStreamWriterBuilder())
 {
 }
 StreamWriter::Builder::~Builder()
 {
   delete own_;
 }
+StreamWriter::Builder::Builder(Builder const&)
+  : own_(nullptr)
+{abort();}
+void StreamWriter::Builder::operator=(Builder const&)
+{abort();}
 void StreamWriter::Builder::setCommentStyle(CommentStyle v)
 {
   own_->setCommentStyle(v);
@@ -1006,8 +1018,7 @@ std::string writeString(Value const& root, StreamWriter::Builder const& builder)
 }
 
 std::ostream& operator<<(std::ostream& sout, Value const& root) {
-  StreamWriterBuilderFactory f;
-  StreamWriter::Builder builder(&f);
+  StreamWriter::Builder builder;
   builder.setCommentStyle(StreamWriter::CommentStyle::All);
   std::shared_ptr<StreamWriter> writer(builder.newStreamWriter(&sout));
   writer->write(root);

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,7 @@ static std::string useStyledStreamWriter(`
`184`	`184`	`static std::string useBuiltStyledStreamWriter(`
`185`	`185`	`Json::Value const& root)`
`186`	`186`	`{`
`187`		`- Json::StreamWriterBuilderFactory f;`
`188`		`- Json::StreamWriter::Builder builder(&f);`
	`187`	`+ Json::StreamWriter::Builder builder;`
`189`	`188`	`builder.setCommentStyle(Json::StreamWriter::CommentStyle::All);`
`190`	`189`	`return writeString(root, builder);`
`191`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -967,6 +967,13 @@ StreamWriter* StreamWriterBuilder::newStreamWriter(std::ostream* stream) const`
`967`	`967`	`{`
`968`	`968`	`return new BuiltStyledStreamWriter(stream, indentation_, cs_);`
`969`	`969`	`}`
	`970`	`+`
	`971`	`+// This might become public someday.`
	`972`	`+class StreamWriterBuilderFactory {`
	`973`	`+public:`
	`974`	`+ virtual ~StreamWriterBuilderFactory();`
	`975`	`+ virtual StreamWriterBuilder* newStreamWriterBuilder() const;`
	`976`	`+};`
`970`	`977`	`StreamWriterBuilderFactory::~StreamWriterBuilderFactory()`
`971`	`978`	`{`
`972`	`979`	`}`
`@@ -975,14 +982,19 @@ StreamWriterBuilder* StreamWriterBuilderFactory::newStreamWriterBuilder() const`
`975`	`982`	`return new StreamWriterBuilder;`
`976`	`983`	`}`
`977`	`984`
`978`		`-StreamWriter::Builder::Builder(StreamWriterBuilderFactory const* f)`
`979`		`- : own_(f->newStreamWriterBuilder())`
	`985`	`+StreamWriter::Builder::Builder()`
	`986`	`+ : own_(StreamWriterBuilderFactory().newStreamWriterBuilder())`
`980`	`987`	`{`
`981`	`988`	`}`
`982`	`989`	`StreamWriter::Builder::~Builder()`
`983`	`990`	`{`
`984`	`991`	`delete own_;`
`985`	`992`	`}`
	`993`	`+StreamWriter::Builder::Builder(Builder const&)`
	`994`	`+ : own_(nullptr)`
	`995`	`+{abort();}`
	`996`	`+void StreamWriter::Builder::operator=(Builder const&)`
	`997`	`+{abort();}`
`986`	`998`	`void StreamWriter::Builder::setCommentStyle(CommentStyle v)`
`987`	`999`	`{`
`988`	`1000`	`own_->setCommentStyle(v);`
`@@ -1006,8 +1018,7 @@ std::string writeString(Value const& root, StreamWriter::Builder const& builder)`
`1006`	`1018`	`}`
`1007`	`1019`
`1008`	`1020`	`std::ostream& operator<<(std::ostream& sout, Value const& root) {`
`1009`		`- StreamWriterBuilderFactory f;`
`1010`		`- StreamWriter::Builder builder(&f);`
	`1021`	`+ StreamWriter::Builder builder;`
`1011`	`1022`	`builder.setCommentStyle(StreamWriter::CommentStyle::All);`
`1012`	`1023`	`std::shared_ptr<StreamWriter> writer(builder.newStreamWriter(&sout));`
`1013`	`1024`	`writer->write(root);`