Huge refactoring in progress...

src/JsonValue.cpp

@@ -4,24 +4,98 @@
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 
+#include "ArduinoJson/JsonValue.hpp"
 #include "ArduinoJson/JsonArray.hpp"
 #include "ArduinoJson/JsonObject.hpp"
-#include "ArduinoJson/JsonValue.hpp"
+#include "ArduinoJson/Internals/JsonWriter.hpp"
 
 using namespace ArduinoJson;
+using namespace ArduinoJson::Internals;
 
-JsonValue::operator JsonArray() {
-  return JsonArray(_impl ? _impl->asArray() : NULL);
+JsonArray &JsonValue::asArray() {
+  return _type == JSON_ARRAY ? *_content.asArray : JsonArray::invalid();
 }
 
-JsonValue::operator JsonObject() {
-  return JsonObject(_impl ? _impl->asObject() : NULL);
+JsonObject &JsonValue::asObject() {
+  return _type == JSON_OBJECT ? *_content.asObject : JsonObject::invalid();
 }
 
-void JsonValue::set(JsonArray array) {
-  if (_impl) _impl->set(array._impl);
+bool JsonValue::asBool() const {
+  return _type == JSON_BOOLEAN ? _content.asBoolean : false;
 }
 
-void JsonValue::set(JsonObject object) {
-  if (_impl) _impl->set(object._impl);
+const char *JsonValue::asString() const {
+  return _type == JSON_STRING ? _content.asString : NULL;
+}
+
+double JsonValue::asDouble() const {
+  return _type >= JSON_DOUBLE_0_DECIMALS ? _content.asDouble : 0;
+}
+
+long JsonValue::asLong() const {
+  return _type == JSON_LONG ? _content.asInteger : 0;
+}
+
+void JsonValue::set(bool value) {
+  if (_type == JSON_INVALID) return;
+  _type = Internals::JSON_BOOLEAN;
+  _content.asBoolean = value;
+}
+
+void JsonValue::set(const char *value) {
+  if (_type == JSON_INVALID) return;
+  _type = JSON_STRING;
+  _content.asString = value;
+}
+
+void JsonValue::set(double value, int decimals) {
+  if (_type == JSON_INVALID) return;
+  _type = static_cast<JsonValueType>(JSON_DOUBLE_0_DECIMALS + decimals);
+  _content.asDouble = value;
+}
+
+void JsonValue::set(long value) {
+  if (_type == JSON_INVALID) return;
+  _type = JSON_LONG;
+  _content.asInteger = value;
+}
+
+void JsonValue::set(JsonArray &array) {
+  if (_type == JSON_INVALID) return;
+  _type = JSON_ARRAY;
+  _content.asArray = &array;
+}
+
+void JsonValue::set(JsonObject &object) {
+  if (_type == JSON_INVALID) return;
+  _type = JSON_OBJECT;
+  _content.asObject = &object;
+}
+
+void JsonValue::writeTo(JsonWriter &writer) const {
+  switch (_type) {
+    case JSON_ARRAY:
+      _content.asArray->writeTo(writer);
+      break;
+
+    case JSON_OBJECT:
+      _content.asObject->writeTo(writer);
+      break;
+
+    case JSON_STRING:
+      writer.writeString(_content.asString);
+      break;
+
+    case JSON_LONG:
+      writer.writeInteger(_content.asInteger);
+      break;
+
+    case JSON_BOOLEAN:
+      writer.writeBoolean(_content.asBoolean);
+      break;
+
+    default:  // >= JSON_DOUBLE_0_DECIMALS
+      writer.writeDouble(_content.asDouble, _type - JSON_DOUBLE_0_DECIMALS);
+      break;
+  }
 }