github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added StaticJsonDocument and DynamicJsonDocument.

Browse Source 
Removed StaticJsonArray and DynamicJsonArray.
Removed StaticJsonObject and DynamicJsonObject.
Removed StaticJsonVariant and DynamicJsonVariant.
This commit is contained in:
Benoit Blanchon
2018-04-17 21:27:45 +02:00
parent a13b9e8bdc
commit 1feb92679d
100 changed files with 1696 additions and 1844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/ArduinoJson/deserializeJson.hpp
View File

@@ -4,43 +4,40 @@
#pragma once
#include "Json/Deserialization/JsonParser.hpp"
#include "Json/Deserialization/JsonDeserializer.hpp"
namespace ArduinoJson {
// JsonError deserializeJson(TDestination& destination, TString json);
// TDestination = JsonArray, JsonObject, JsonVariant
// JsonError deserializeJson(TDocument& doc, TString json);
// TDocument = DynamicJsonDocument, StaticJsonDocument
// TString = const std::string&, const String&
template <typename TDestination, typename TString>
template <typename TDocument, typename TString>
typename Internals::EnableIf<!Internals::IsArray<TString>::value,
JsonError>::type
deserializeJson(TDestination &destination, const TString &json,
deserializeJson(TDocument &doc, const TString &json,
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
destination.clear();
return Internals::makeParser(&destination.buffer(), json, nestingLimit)
.parse(destination);
return Internals::makeParser(&doc.buffer(), json, nestingLimit)
.parse(doc.template to<JsonVariant>());
}
//
// JsonError deserializeJson(TDestination& destination, TString json);
// TDestination = JsonArray, JsonObject, JsonVariant
// JsonError deserializeJson(TDocument& doc, TString json);
// TDocument = DynamicJsonDocument, StaticJsonDocument
// TString = const char*, const char[N], const FlashStringHelper*
template <typename TDestination, typename TString>
template <typename TDocument, typename TString>
JsonError deserializeJson(
TDestination &destination, TString *json,
TDocument &doc, TString *json,
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
destination.clear();
return Internals::makeParser(&destination.buffer(), json, nestingLimit)
.parse(destination);
return Internals::makeParser(&doc.buffer(), json, nestingLimit)
.parse(doc.template to<JsonVariant>());
}
//
// JsonError deserializeJson(TDestination& destination, TString json);
// TDestination = JsonArray, JsonObject, JsonVariant
// JsonError deserializeJson(TDocument& doc, TString json);
// TDocument = DynamicJsonDocument, StaticJsonDocument
// TString = std::istream&, Stream&
template <typename TDestination, typename TString>
template <typename TDocument, typename TString>
JsonError deserializeJson(
TDestination &destination, TString &json,
TDocument &doc, TString &json,
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
destination.clear();
return Internals::makeParser(&destination.buffer(), json, nestingLimit)
.parse(destination);
return Internals::makeParser(&doc.buffer(), json, nestingLimit)
.parse(doc.template to<JsonVariant>());
}
} // namespace ArduinoJson