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

Add VariantData::getOrAddElement()

Browse Source
This commit is contained in:
Benoit Blanchon
2023-05-25 18:10:22 +02:00
parent 585795d002
commit ab4e8547cb
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,6 +185,27 @@ class VariantData {
return slotData(object->get(key));
}
VariantData* getOrAddElement(size_t index, MemoryPool* pool) {
auto array = isNull() ? &toArray() : asArray();
if (!array)
return nullptr;
VariantSlot* slot = array->head();
while (slot && index > 0) {
slot = slot->next();
index--;
}
if (!slot)
index++;
while (index > 0) {
slot = new (pool) VariantSlot();
if (!slot)
return nullptr;
array->add(slot);
index--;
}
return slot->data();
}
template <typename TAdaptedString>
VariantData* getOrAddMember(TAdaptedString key, MemoryPool* pool) {
if (key.isNull())

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

@ -131,24 +131,7 @@ inline NO_INLINE VariantData* variantGetOrAddElement(VariantData* var,
MemoryPool* pool) {
if (!var)
return nullptr;
auto array = var->isNull() ? &var->toArray() : var->asArray();
if (!array)
return nullptr;
VariantSlot* slot = array->head();
while (slot && index > 0) {
slot = slot->next();
index--;
}
if (!slot)
index++;
while (index > 0) {
slot = new (pool) VariantSlot();
if (!slot)
return nullptr;
array->add(slot);
index--;
}
return slot->data();
return var->getOrAddElement(index, pool);
}
inline void variantRemoveElement(VariantData* var, size_t index,