bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-31 03:07:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add VariantData::addElement()

Browse Source
This commit is contained in:
Benoit Blanchon
2023-05-25 10:09:12 +02:00
parent c267b55dec
commit 2da1f2553d
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Document/JsonDocument.hpp
View File

@ -297,7 +297,7 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
// Returns a reference to the new element. // Returns a reference to the new element.
// https://arduinojson.org/v6/api/jsondocument/add/ // https://arduinojson.org/v6/api/jsondocument/add/
FORCE_INLINE JsonVariant add() { FORCE_INLINE JsonVariant add() {
return JsonVariant(&pool_, variantAddElement(&data_, &pool_)); return JsonVariant(&pool_, data_.addElement(&pool_));
} }
// Appends a value to the root array. // Appends a value to the root array.

6
src/ArduinoJson/Variant/VariantData.hpp
View File

@ -14,6 +14,7 @@
ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
VariantData* collectionAddElement(CollectionData* array, MemoryPool* pool);
template <typename T> template <typename T>
T parseNumber(const char* s); T parseNumber(const char* s);
void slotRelease(VariantSlot* slot, MemoryPool* pool); void slotRelease(VariantSlot* slot, MemoryPool* pool);
@ -63,6 +64,11 @@ class VariantData {
} }
} }
VariantData* addElement(MemoryPool* pool) {
auto array = isNull() ? &toArray() : asArray();
return collectionAddElement(array, pool);
}
bool asBoolean() const { bool asBoolean() const {
switch (type()) { switch (type()) {
case VALUE_IS_BOOLEAN: case VALUE_IS_BOOLEAN:

4
src/ArduinoJson/Variant/VariantFunctions.hpp
View File

@ -13,7 +13,6 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
bool collectionCopy(CollectionData* dst, const CollectionData* src, bool collectionCopy(CollectionData* dst, const CollectionData* src,
MemoryPool* pool); MemoryPool* pool);
VariantData* collectionAddElement(CollectionData* array, MemoryPool* pool);
void collectionRemoveElement(CollectionData* data, size_t index, void collectionRemoveElement(CollectionData* data, size_t index,
MemoryPool* pool); MemoryPool* pool);
template <typename TAdaptedString> template <typename TAdaptedString>
@ -129,8 +128,7 @@ inline VariantData* variantGetElement(const VariantData* var, size_t index) {
inline VariantData* variantAddElement(VariantData* var, MemoryPool* pool) { inline VariantData* variantAddElement(VariantData* var, MemoryPool* pool) {
if (!var) if (!var)
return nullptr; return nullptr;
auto array = var->isNull() ? &var->toArray() : var->asArray(); return var->addElement(pool);
return collectionAddElement(array, pool);
} }
inline NO_INLINE VariantData* variantGetOrAddElement(VariantData* var, inline NO_INLINE VariantData* variantGetOrAddElement(VariantData* var,