Optimization.

Moved all value members of JSONValue to an unnamed union so that extra
memory isn't wasted. Changing this made it so the JSONObject, JSONArray
and JSONString have to be pointers and freed as such. Converting them
into the heap causes no impact on performance because std::vector,
std::map and std::wstring already make allocations in the heap.

2 files changed, 49 insertions, 48 deletions

diff --git a/src/JSONValue.cpp b/src/JSONValue.cpp
index cbf8648..be00a0f 100644
--- a/src/JSONValue.cpp
+++ b/src/JSONValue.cpp
@@ -309,8 +309,6 @@ JSONValue *JSONValue::Parse(const wchar_t **data)
 JSONValue::JSONValue(/*NULL*/)
 {
 	type = JSONType_Null;
-	bool_value = false;
-	number_value = 0;
 }
 
 /**
@@ -323,9 +321,7 @@ JSONValue::JSONValue(/*NULL*/)
 JSONValue::JSONValue(const wchar_t *m_char_value)
 {
 	type = JSONType_String;
-	string_value = std::wstring(m_char_value);
-	bool_value = false;
-	number_value = 0;
+	string_value = new std::wstring(std::wstring(m_char_value));
 }
 
 /**
@@ -338,9 +334,7 @@ JSONValue::JSONValue(const wchar_t *m_char_value)
 JSONValue::JSONValue(const std::wstring &m_string_value)
 {
 	type = JSONType_String;
-	string_value = m_string_value;
-	bool_value = false;
-	number_value = 0;
+	string_value = new std::wstring(m_string_value);
 }
 
 /**
@@ -354,7 +348,6 @@ JSONValue::JSONValue(bool m_bool_value)
 {
 	type = JSONType_Bool;
 	bool_value = m_bool_value;
-	number_value = 0;
 }
 
 /**
@@ -368,7 +361,6 @@ JSONValue::JSONValue(double m_number_value)
 {
 	type = JSONType_Number;
 	number_value = m_number_value;
-	bool_value = false;
 }
 
 /**
@@ -381,9 +373,7 @@ JSONValue::JSONValue(double m_number_value)
 JSONValue::JSONValue(const JSONArray &m_array_value)
 {
 	type = JSONType_Array;
-	array_value = m_array_value;
-	bool_value = false;
-	number_value = 0;
+	array_value = new JSONArray(m_array_value);
 }
 
 /**
@@ -396,9 +386,7 @@ JSONValue::JSONValue(const JSONArray &m_array_value)
 JSONValue::JSONValue(const JSONObject &m_object_value)
 {
 	type = JSONType_Object;
-	object_value = m_object_value;
-	bool_value = false;
-	number_value = 0;
+	object_value = new JSONObject(m_object_value);
 }
 
 /**
@@ -415,7 +403,7 @@ JSONValue::JSONValue(const JSONValue &m_source)
 	switch (type)
 	{
 		case JSONType_String:
-			string_value = m_source.string_value;
+			string_value = new std::wstring(*m_source.string_value);
 			break;
 
 		case JSONType_Bool:
@@ -428,21 +416,23 @@ JSONValue::JSONValue(const JSONValue &m_source)
 
 		case JSONType_Array:
 		{
-			JSONArray source_array = m_source.array_value;
+			JSONArray source_array = *m_source.array_value;
 			JSONArray::iterator iter;
+			array_value = new JSONArray();
 			for (iter = source_array.begin(); iter != source_array.end(); iter++)
-				array_value.push_back(new JSONValue(**iter));
+				array_value->push_back(new JSONValue(**iter));
 			break;
 		}
 
 		case JSONType_Object:
 		{
-			JSONObject source_object = m_source.object_value;
+			JSONObject source_object = *m_source.object_value;
+			object_value = new JSONObject();
 			JSONObject::iterator iter;
 			for (iter = source_object.begin(); iter != source_object.end(); iter++)
 			{
 				std::wstring name = (*iter).first;
-				object_value[name] = new JSONValue(*((*iter).second));
+				(*object_value)[name] = new JSONValue(*((*iter).second));
 			}
 			break;
 		}
@@ -464,16 +454,22 @@ JSONValue::~JSONValue()
 	if (type == JSONType_Array)
 	{
 		JSONArray::iterator iter;
-		for (iter = array_value.begin(); iter != array_value.end(); iter++)
+		for (iter = array_value->begin(); iter != array_value->end(); iter++)
 			delete *iter;
+		delete array_value;
 	}
 	else if (type == JSONType_Object)
 	{
 		JSONObject::iterator iter;
-		for (iter = object_value.begin(); iter != object_value.end(); iter++)
+		for (iter = object_value->begin(); iter != object_value->end(); iter++)
 		{
 			delete (*iter).second;
 		}
+		delete object_value;
+	}
+	else if (type == JSONType_String)
+	{
+		delete string_value;
 	}
 }
 
@@ -559,7 +555,7 @@ bool JSONValue::IsObject() const
  */
 const std::wstring &JSONValue::AsString() const
 {
-	return string_value;
+	return (*string_value);
 }
 
 /**
@@ -598,7 +594,7 @@ double JSONValue::AsNumber() const
  */
 const JSONArray &JSONValue::AsArray() const
 {
-	return array_value;
+	return (*array_value);
 }
 
 /**
@@ -611,7 +607,7 @@ const JSONArray &JSONValue::AsArray() const
  */
 const JSONObject &JSONValue::AsObject() const
 {
-	return object_value;
+	return (*object_value);
 }
 
 /**
@@ -628,9 +624,9 @@ std::size_t JSONValue::CountChildren() const
 	switch (type)
 	{
 		case JSONType_Array:
-			return array_value.size();
+			return array_value->size();
 		case JSONType_Object:
-			return object_value.size();
+			return object_value->size();
 		default:
 			return 0;
 	}
@@ -648,7 +644,7 @@ bool JSONValue::HasChild(std::size_t index) const
 {
 	if (type == JSONType_Array)
 	{
-		return index < array_value.size();
+		return index < array_value->size();
 	}
 	else
 	{
@@ -667,9 +663,9 @@ bool JSONValue::HasChild(std::size_t index) const
  */
 JSONValue *JSONValue::Child(std::size_t index)
 {
-	if (index < array_value.size())
+	if (index < array_value->size())
 	{
-		return array_value[index];
+		return (*array_value)[index];
 	}
 	else
 	{
@@ -689,7 +685,7 @@ bool JSONValue::HasChild(const wchar_t* name) const
 {
 	if (type == JSONType_Object)
 	{
-		return object_value.find(name) != object_value.end();
+		return object_value->find(name) != object_value->end();
 	}
 	else
 	{
@@ -708,8 +704,8 @@ bool JSONValue::HasChild(const wchar_t* name) const
  */
 JSONValue* JSONValue::Child(const wchar_t* name)
 {
-	JSONObject::const_iterator it = object_value.find(name);
-	if (it != object_value.end())
+	JSONObject::const_iterator it = object_value->find(name);
+	if (it != object_value->end())
 	{
 		return it->second;
 	}
@@ -733,8 +729,8 @@ std::vector<std::wstring> JSONValue::ObjectKeys() const
 
 	if (type == JSONType_Object)
 	{
-		JSONObject::const_iterator iter = object_value.begin();
-		while (iter != object_value.end())
+		JSONObject::const_iterator iter = object_value->begin();
+		while (iter != object_value->end())
 		{
 			keys.push_back(iter->first);
 
@@ -784,7 +780,7 @@ std::wstring JSONValue::StringifyImpl(size_t const indentDepth) const
 			break;
 
 		case JSONType_String:
-			ret_string = StringifyString(string_value);
+			ret_string = StringifyString(*string_value);
 			break;
 
 		case JSONType_Bool:
@@ -808,13 +804,13 @@ std::wstring JSONValue::StringifyImpl(size_t const indentDepth) const
 		case JSONType_Array:
 		{
 			ret_string = indentDepth ? L"[\n" + indentStr1 : L"[";
-			JSONArray::const_iterator iter = array_value.begin();
-			while (iter != array_value.end())
+			JSONArray::const_iterator iter = array_value->begin();
+			while (iter != array_value->end())
 			{
 				ret_string += (*iter)->StringifyImpl(indentDepth1);
 
 				// Not at the end - add a separator
-				if (++iter != array_value.end())
+				if (++iter != array_value->end())
 					ret_string += L",";
 			}
 			ret_string += indentDepth ? L"\n" + indentStr + L"]" : L"]";
@@ -824,15 +820,15 @@ std::wstring JSONValue::StringifyImpl(size_t const indentDepth) const
 		case JSONType_Object:
 		{
 			ret_string = indentDepth ? L"{\n" + indentStr1 : L"{";
-			JSONObject::const_iterator iter = object_value.begin();
-			while (iter != object_value.end())
+			JSONObject::const_iterator iter = object_value->begin();
+			while (iter != object_value->end())
 			{
 				ret_string += StringifyString((*iter).first);
 				ret_string += L":";
 				ret_string += (*iter).second->StringifyImpl(indentDepth1);
 
 				// Not at the end - add a separator
-				if (++iter != object_value.end())
+				if (++iter != object_value->end())
 					ret_string += L",";
 			}
 			ret_string += indentDepth ? L"\n" + indentStr + L"}" : L"}";
diff --git a/src/JSONValue.h b/src/JSONValue.h
index 02d0fab..e7024f9 100644
--- a/src/JSONValue.h
+++ b/src/JSONValue.h
@@ -79,11 +79,16 @@ class JSONValue
 		static std::wstring Indent(size_t depth);
 
 		JSONType type;
-		std::wstring string_value;
-		bool bool_value;
-		double number_value;
-		JSONArray array_value;
-		JSONObject object_value;
+
+		union
+		{
+			bool bool_value;
+			double number_value;
+			std::wstring *string_value;
+			JSONArray *array_value;
+			JSONObject *object_value;
+		};
+
 };
 
 #endif