feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests 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

42
src/ArduinoJson/deserializeMsgPack.hpp
View File

@ -7,43 +7,37 @@
#include "MsgPack/MsgPackDeserializer.hpp"
namespace ArduinoJson {
// MsgPackError deserializeMsgPack(TDestination& destination, TString json);
// TDestination = JsonArray, JsonObject, JsonVariant
// MsgPackError deserializeMsgPack(TDocument& doc, TString json);
// TDocument = DynamicJsonArray | StaticJsonArray
// TString = const std::string&, const String&
template <typename TDestination, typename TString>
template <typename TDocument, typename TString>
typename Internals::EnableIf<!Internals::IsArray<TString>::value,
MsgPackError>::type
deserializeMsgPack(TDestination &destination, const TString &json,
deserializeMsgPack(TDocument &doc, const TString &json,
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
destination.clear();
return Internals::makeMsgPackDeserializer(&destination.buffer(), json,
nestingLimit)
.parse(destination);
return Internals::makeMsgPackDeserializer(&doc.buffer(), json, nestingLimit)
.parse(doc.template to<JsonVariant>());
}
//
// MsgPackError deserializeMsgPack(TDestination& destination, TString json);
// TDestination = JsonArray, JsonObject, JsonVariant
// MsgPackError deserializeMsgPack(TDocument& doc, TString json);
// TDocument = DynamicJsonArray | StaticJsonArray
// TString = const char*, const char[N], const FlashStringHelper*
template <typename TDestination, typename TString>
template <typename TDocument, typename TString>
MsgPackError deserializeMsgPack(
TDestination &destination, TString *json,
TDocument &doc, TString *json,
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
destination.clear();
return Internals::makeMsgPackDeserializer(&destination.buffer(), json,
nestingLimit)
.parse(destination);
return Internals::makeMsgPackDeserializer(&doc.buffer(), json, nestingLimit)
.parse(doc.template to<JsonVariant>());
}
//
// MsgPackError deserializeMsgPack(TDestination& destination, TString json);
// TDestination = JsonArray, JsonObject, JsonVariant
// MsgPackError deserializeMsgPack(TDocument& doc, TString json);
// TDocument = DynamicJsonArray | StaticJsonArray
// TString = std::istream&, Stream&
template <typename TDestination, typename TString>
template <typename TDocument, typename TString>
MsgPackError deserializeMsgPack(
TDestination &destination, TString &json,
TDocument &doc, TString &json,
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
destination.clear();
return Internals::makeMsgPackDeserializer(&destination.buffer(), json,
nestingLimit)
.parse(destination);
return Internals::makeMsgPackDeserializer(&doc.buffer(), json, nestingLimit)
.parse(doc.template to<JsonVariant>());
}
} // namespace ArduinoJson