added a default constructor to json::value (which creates an "invalid" value, not a null one).

this allowed the code to made much simpler

Author: eteran

include/cpp-json/value.h

@@ -55,6 +55,7 @@ class value {
 	value(const std::nullptr_t &);
 
 public:
+	value();
 	~value();
 
 public:
@@ -95,9 +96,6 @@ class value {
 	const array &as_array() const;
 	array &as_array();
 
-private:
-	void destroy();
-
 private:
 	struct invalid_t {};
 

include/cpp-json/value.tcc

@@ -8,44 +8,45 @@ namespace json {
 // Name: ~value
 //------------------------------------------------------------------------------
 inline value::~value() {
-	destroy();
-}
-
-//------------------------------------------------------------------------------
-// Name: value
-//------------------------------------------------------------------------------
-inline value::value(const std::nullptr_t &): type_(type_null) {
-	new (&value_) std::string("null");
-}
-
-//------------------------------------------------------------------------------
-// Name: value
-//------------------------------------------------------------------------------
-inline value::value(value &&other) : type_(other.type_) {
+	using std::string;
 
-	// move from the other object
 	switch(type_) {
 	case value::type_string:
 	case value::type_number:
 	case value::type_null:
 	case value::type_boolean:
-		new (&value_) std::string(std::move(*reinterpret_cast<std::string *>(&other.value_)));
+		reinterpret_cast<std::string *>(&value_)->~string();
 		break;
 	case value::type_array:
-		new (&value_) array_pointer(std::move(*reinterpret_cast<array_pointer *>(&other.value_)));
+		reinterpret_cast<array_pointer *>(&value_)->~array_pointer();
 		break;
 	case value::type_object:
-		new (&value_) object_pointer(std::move(*reinterpret_cast<object_pointer *>(&other.value_)));
+		reinterpret_cast<object_pointer *>(&value_)->~object_pointer();
 		break;
 	case value::type_invalid:
 		break;
 	}
-	
-	// destroy the other guys values
-	other.destroy();
+}
+
+//------------------------------------------------------------------------------
+// Name: value
+//------------------------------------------------------------------------------
+inline value::value() : type_(type_invalid) {
 
-	// now set it to the invalid type
-	other.type_  = type_invalid;
+}
+
+//------------------------------------------------------------------------------
+// Name: value
+//------------------------------------------------------------------------------
+inline value::value(const std::nullptr_t &): type_(type_null) {
+	new (&value_) std::string("null");
+}
+
+//------------------------------------------------------------------------------
+// Name: value
+//------------------------------------------------------------------------------
+inline value::value(value &&other) : value() {
+	other.swap(*this);
 }
 
 //------------------------------------------------------------------------------
@@ -317,31 +318,6 @@ array &value::as_array() {
 	return **reinterpret_cast<array_pointer *>(&value_);
 }
 
-//------------------------------------------------------------------------------
-// Name: destroy
-//------------------------------------------------------------------------------
-void value::destroy() {
-
-	using std::string;
-
-	switch(type_) {
-	case value::type_string:
-	case value::type_number:
-	case value::type_null:
-	case value::type_boolean:
-		reinterpret_cast<std::string *>(&value_)->~string();
-		break;
-	case value::type_array:
-		reinterpret_cast<array_pointer *>(&value_)->~array_pointer();
-		break;
-	case value::type_object:
-		reinterpret_cast<object_pointer *>(&value_)->~object_pointer();
-		break;
-	case value::type_invalid:
-		break;
-	}
-}
-
 }
 
 #endif