Fixes #66 by adding Writer::Reset() and multiple root check

Note it redefines RAPIDJSON_ASSERT() to throw exception in unittest and
check for assertion with gtest.

2 files changed, 57 insertions, 43 deletions

diff --git a/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h
index f01e53ed..02b9420b 100644
--- a/include/rapidjson/prettywriter.h
+++ b/include/rapidjson/prettywriter.h
@@ -78,13 +78,13 @@ public:
 		bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;

 

 		if (!empty) {

-			Base::os_.Put('\n');

+			Base::os_->Put('\n');

 			WriteIndent();

 		}

 		if (!Base::WriteEndObject())

 			return false;

 		if (Base::level_stack_.Empty())	// end of json text

-			Base::os_.Flush();

+			Base::os_->Flush();

 		return true;

 	}

 

@@ -101,13 +101,13 @@ public:
 		bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;

 

 		if (!empty) {

-			Base::os_.Put('\n');

+			Base::os_->Put('\n');

 			WriteIndent();

 		}

 		if (!Base::WriteEndArray())

 			return false;

 		if (Base::level_stack_.Empty())	// end of json text

-			Base::os_.Flush();

+			Base::os_->Flush();

 		return true;

 	}

 

@@ -137,26 +137,26 @@ protected:
 

 			if (level->inArray) {

 				if (level->valueCount > 0) {

-					Base::os_.Put(','); // add comma if it is not the first element in array

-					Base::os_.Put('\n');

+					Base::os_->Put(','); // add comma if it is not the first element in array

+					Base::os_->Put('\n');

 				}

 				else

-					Base::os_.Put('\n');

+					Base::os_->Put('\n');

 				WriteIndent();

 			}

 			else {	// in object

 				if (level->valueCount > 0) {

 					if (level->valueCount % 2 == 0) {

-						Base::os_.Put(',');

-						Base::os_.Put('\n');

+						Base::os_->Put(',');

+						Base::os_->Put('\n');

 					}

 					else {

-						Base::os_.Put(':');

-						Base::os_.Put(' ');

+						Base::os_->Put(':');

+						Base::os_->Put(' ');

 					}

 				}

 				else

-					Base::os_.Put('\n');

+					Base::os_->Put('\n');

 

 				if (level->valueCount % 2 == 0)

 					WriteIndent();

@@ -165,13 +165,16 @@ protected:
 				RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name

 			level->valueCount++;

 		}

-		else

+		else {

 			RAPIDJSON_ASSERT(type == kObjectType || type == kArrayType);

+			RAPIDJSON_ASSERT(!Base::hasRoot_);	// Should only has one and only one root.

+			Base::hasRoot_ = true;

+		}

 	}

 

 	void WriteIndent()  {

 		size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;

-		PutN(Base::os_, indentChar_, count);

+		PutN(*Base::os_, indentChar_, count);

 	}

 

 	Ch indentChar_;

diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
index f3b7567c..c312b740 100644
--- a/include/rapidjson/writer.h
+++ b/include/rapidjson/writer.h
@@ -41,8 +41,15 @@ public:
 		\param levelDepth Initial capacity of stack.

 	*/

 	Writer(OutputStream& os, Allocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) : 

-		os_(os), level_stack_(allocator, levelDepth * sizeof(Level)),

-		doublePrecision_(kDefaultDoublePrecision) {}

+		os_(&os), level_stack_(allocator, levelDepth * sizeof(Level)),

+		doublePrecision_(kDefaultDoublePrecision), hasRoot_(false) {}

+

+	void Reset(OutputStream& os) {

+		os_ = &os;

+		doublePrecision_ = kDefaultDoublePrecision;

+		hasRoot_ = false;

+		level_stack_.Clear();

+	}

 

 	//! Set the number of significant digits for \c double values

 	/*! When writing a \c double value to the \c OutputStream, the number

@@ -103,7 +110,7 @@ public:
 		level_stack_.template Pop<Level>(1);

 		bool ret = WriteEndObject();

 		if (level_stack_.Empty())	// end of json text

-			os_.Flush();

+			os_->Flush();

 		return ret;

 	}

 

@@ -120,7 +127,7 @@ public:
 		level_stack_.template Pop<Level>(1);

 		bool ret = WriteEndArray();

 		if (level_stack_.Empty())	// end of json text

-			os_.Flush();

+			os_->Flush();

 		return ret;

 	}

 	//@}

@@ -161,22 +168,22 @@ protected:
 	static const size_t kDefaultLevelDepth = 32;

 

 	bool WriteNull()  {

-		os_.Put('n'); os_.Put('u'); os_.Put('l'); os_.Put('l'); return true;

+		os_->Put('n'); os_->Put('u'); os_->Put('l'); os_->Put('l'); return true;

 	}

 

 	bool WriteBool(bool b)  {

 		if (b) {

-			os_.Put('t'); os_.Put('r'); os_.Put('u'); os_.Put('e');

+			os_->Put('t'); os_->Put('r'); os_->Put('u'); os_->Put('e');

 		}

 		else {

-			os_.Put('f'); os_.Put('a'); os_.Put('l'); os_.Put('s'); os_.Put('e');

+			os_->Put('f'); os_->Put('a'); os_->Put('l'); os_->Put('s'); os_->Put('e');

 		}

 		return true;

 	}

 

 	bool WriteInt(int i) {

 		if (i < 0) {

-			os_.Put('-');

+			os_->Put('-');

 			i = -i;

 		}

 		return WriteUint((unsigned)i);

@@ -192,14 +199,14 @@ protected:
 

 		do {

 			--p;

-			os_.Put(*p);

+			os_->Put(*p);

 		} while (p != buffer);

 		return true;

 	}

 

 	bool WriteInt64(int64_t i64) {

 		if (i64 < 0) {

-			os_.Put('-');

+			os_->Put('-');

 			i64 = -i64;

 		}

 		WriteUint64((uint64_t)i64);

@@ -216,7 +223,7 @@ protected:
 

 		do {

 			--p;

-			os_.Put(*p);

+			os_->Put(*p);

 		} while (p != buffer);

 		return true;

 	}

@@ -233,7 +240,7 @@ protected:
 		int ret = RAPIDJSON_SNPRINTF(buffer, sizeof(buffer), "%.*g", doublePrecision_, d);

 		RAPIDJSON_ASSERT(ret >= 1);

 		for (int i = 0; i < ret; i++)

-			os_.Put(buffer[i]);

+			os_->Put(buffer[i]);

 		return true;

 	}

 #undef RAPIDJSON_SNPRINTF

@@ -252,32 +259,32 @@ protected:
 #undef Z16

 		};

 

-		os_.Put('\"');

+		os_->Put('\"');

 		GenericStringStream<SourceEncoding> is(str);

 		while (is.Tell() < length) {

 			const Ch c = is.Peek();

 			if ((sizeof(Ch) == 1 || (unsigned)c < 256) && escape[(unsigned char)c])  {

 				is.Take();

-				os_.Put('\\');

-				os_.Put(escape[(unsigned char)c]);

+				os_->Put('\\');

+				os_->Put(escape[(unsigned char)c]);

 				if (escape[(unsigned char)c] == 'u') {

-					os_.Put('0');

-					os_.Put('0');

-					os_.Put(hexDigits[(unsigned char)c >> 4]);

-					os_.Put(hexDigits[(unsigned char)c & 0xF]);

+					os_->Put('0');

+					os_->Put('0');

+					os_->Put(hexDigits[(unsigned char)c >> 4]);

+					os_->Put(hexDigits[(unsigned char)c & 0xF]);

 				}

 			}

 			else

-				Transcoder<SourceEncoding, TargetEncoding>::Transcode(is, os_);

+				Transcoder<SourceEncoding, TargetEncoding>::Transcode(is, *os_);

 		}

-		os_.Put('\"');

+		os_->Put('\"');

 		return true;

 	}

 

-	bool WriteStartObject()	{ os_.Put('{'); return true; }

-	bool WriteEndObject()	{ os_.Put('}'); return true; }

-	bool WriteStartArray()	{ os_.Put('['); return true; }

-	bool WriteEndArray()	{ os_.Put(']'); return true; }

+	bool WriteStartObject()	{ os_->Put('{'); return true; }

+	bool WriteEndObject()	{ os_->Put('}'); return true; }

+	bool WriteStartArray()	{ os_->Put('['); return true; }

+	bool WriteEndArray()	{ os_->Put(']'); return true; }

 

 	void Prefix(Type type) {

 		(void)type;

@@ -285,21 +292,25 @@ protected:
 			Level* level = level_stack_.template Top<Level>();

 			if (level->valueCount > 0) {

 				if (level->inArray) 

-					os_.Put(','); // add comma if it is not the first element in array

+					os_->Put(','); // add comma if it is not the first element in array

 				else  // in object

-					os_.Put((level->valueCount % 2 == 0) ? ',' : ':');

+					os_->Put((level->valueCount % 2 == 0) ? ',' : ':');

 			}

 			if (!level->inArray && level->valueCount % 2 == 0)

 				RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name

 			level->valueCount++;

 		}

-		else

+		else {

 			RAPIDJSON_ASSERT(type == kObjectType || type == kArrayType);

+			RAPIDJSON_ASSERT(!hasRoot_);	// Should only has one and only one root.

+			hasRoot_ = true;

+		}

 	}

 

-	OutputStream& os_;

+	OutputStream* os_;

 	internal::Stack<Allocator> level_stack_;

 	int doublePrecision_;

+	bool hasRoot_;

 

 	static const int kDefaultDoublePrecision = 6;