diff --git a/CHANGELOG.md b/CHANGELOG.md index 18bfa5a2..335b7040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ HEAD * Fix `9.22337e+18 is outside the range of representable values of type 'long'` * Fix comparison operators for `JsonArray`, `JsonArrayConst`, `JsonObject`, and `JsonObjectConst` * Remove undocumented `accept()` functions +* Rename `addElement()` to `add()` v6.19.4 (2022-04-05) ------- diff --git a/extras/tests/JsonDocument/ElementProxy.cpp b/extras/tests/JsonDocument/ElementProxy.cpp index 3596dadc..0f4292f0 100644 --- a/extras/tests/JsonDocument/ElementProxy.cpp +++ b/extras/tests/JsonDocument/ElementProxy.cpp @@ -9,7 +9,7 @@ using namespace ARDUINOJSON_NAMESPACE; TEST_CASE("ElementProxy::add()") { DynamicJsonDocument doc(4096); - doc.addElement(); + doc.add(); ElementProxy ep = doc[0]; SECTION("add(int)") { @@ -35,7 +35,7 @@ TEST_CASE("ElementProxy::add()") { TEST_CASE("ElementProxy::clear()") { DynamicJsonDocument doc(4096); - doc.addElement(); + doc.add(); ElementProxy ep = doc[0]; SECTION("size goes back to zero") { @@ -95,7 +95,7 @@ TEST_CASE("ElementProxy::operator==()") { TEST_CASE("ElementProxy::remove()") { DynamicJsonDocument doc(4096); - doc.addElement(); + doc.add(); ElementProxy ep = doc[0]; SECTION("remove(int)") { @@ -168,7 +168,7 @@ TEST_CASE("ElementProxy::set()") { TEST_CASE("ElementProxy::size()") { DynamicJsonDocument doc(4096); - doc.addElement(); + doc.add(); ElementProxy ep = doc[0]; SECTION("returns 0") { @@ -190,7 +190,7 @@ TEST_CASE("ElementProxy::size()") { TEST_CASE("ElementProxy::memoryUsage()") { DynamicJsonDocument doc(4096); - doc.addElement(); + doc.add(); ElementProxy ep = doc[0]; SECTION("returns 0 for null") { diff --git a/extras/tests/JsonVariant/compare.cpp b/extras/tests/JsonVariant/compare.cpp index 63adbc26..2cbdaa3d 100644 --- a/extras/tests/JsonVariant/compare.cpp +++ b/extras/tests/JsonVariant/compare.cpp @@ -10,7 +10,7 @@ TEST_CASE("Compare JsonVariant with value") { StaticJsonDocument<256> doc; - JsonVariant a = doc.addElement(); + JsonVariant a = doc.add(); SECTION("null vs (char*)0") { char* b = 0; @@ -38,8 +38,8 @@ TEST_CASE("Compare JsonVariant with value") { TEST_CASE("Compare JsonVariant with JsonVariant") { StaticJsonDocument<256> doc; - JsonVariant a = doc.addElement(); - JsonVariant b = doc.addElement(); + JsonVariant a = doc.add(); + JsonVariant b = doc.add(); SECTION("'abc' vs 'abc'") { a.set("abc"); diff --git a/src/ArduinoJson/Array/ArrayImpl.hpp b/src/ArduinoJson/Array/ArrayImpl.hpp index dcb4ff0b..7d3ad9b1 100644 --- a/src/ArduinoJson/Array/ArrayImpl.hpp +++ b/src/ArduinoJson/Array/ArrayImpl.hpp @@ -11,12 +11,12 @@ namespace ARDUINOJSON_NAMESPACE { template inline ArrayRef ArrayShortcuts::createNestedArray() const { - return impl()->addElement().template to(); + return impl()->add().template to(); } template inline ObjectRef ArrayShortcuts::createNestedObject() const { - return impl()->addElement().template to(); + return impl()->add().template to(); } template diff --git a/src/ArduinoJson/Array/ArrayRef.hpp b/src/ArduinoJson/Array/ArrayRef.hpp index 2a897406..f4d1318b 100644 --- a/src/ArduinoJson/Array/ArrayRef.hpp +++ b/src/ArduinoJson/Array/ArrayRef.hpp @@ -130,10 +130,12 @@ class ArrayRef : public ArrayRefBase, return ArrayConstRef(_data); } - VariantRef addElement() const { + VariantRef add() const { return VariantRef(_pool, arrayAdd(_data, _pool)); } + using ArrayShortcuts::add; + FORCE_INLINE iterator begin() const { if (!_data) return iterator(); diff --git a/src/ArduinoJson/Array/ArrayShortcuts.hpp b/src/ArduinoJson/Array/ArrayShortcuts.hpp index 1854a8c3..bc1898f4 100644 --- a/src/ArduinoJson/Array/ArrayShortcuts.hpp +++ b/src/ArduinoJson/Array/ArrayShortcuts.hpp @@ -31,14 +31,14 @@ class ArrayShortcuts { // std::string, String, ObjectRef template FORCE_INLINE bool add(const T &value) const { - return impl()->addElement().set(value); + return impl()->add().set(value); } // // bool add(TValue); // TValue = char*, const char*, const __FlashStringHelper* template FORCE_INLINE bool add(T *value) const { - return impl()->addElement().set(value); + return impl()->add().set(value); } private: diff --git a/src/ArduinoJson/Array/ElementProxy.hpp b/src/ArduinoJson/Array/ElementProxy.hpp index 4f3cbd0b..fa074c83 100644 --- a/src/ArduinoJson/Array/ElementProxy.hpp +++ b/src/ArduinoJson/Array/ElementProxy.hpp @@ -165,10 +165,12 @@ class ElementProxy : public VariantOperators >, return getOrAddUpstreamElement().getOrAddMember(key); } - VariantRef addElement() const { - return getOrAddUpstreamElement().addElement(); + VariantRef add() const { + return getOrAddUpstreamElement().add(); } + using ArrayShortcuts >::add; + VariantRef getElement(size_t index) const { return getOrAddUpstreamElement().getElement(index); } diff --git a/src/ArduinoJson/Array/Utilities.hpp b/src/ArduinoJson/Array/Utilities.hpp index b8e87f21..974535d7 100644 --- a/src/ArduinoJson/Array/Utilities.hpp +++ b/src/ArduinoJson/Array/Utilities.hpp @@ -31,7 +31,7 @@ inline typename enable_if::value, copyArray(const T* src, size_t len, const TDestination& dst) { bool ok = true; for (size_t i = 0; i < len; i++) { - ok &= copyArray(src[i], dst.addElement()); + ok &= copyArray(src[i], dst.add()); } return ok; } diff --git a/src/ArduinoJson/Document/JsonDocument.hpp b/src/ArduinoJson/Document/JsonDocument.hpp index bcd14716..51223192 100644 --- a/src/ArduinoJson/Document/JsonDocument.hpp +++ b/src/ArduinoJson/Document/JsonDocument.hpp @@ -92,7 +92,7 @@ class JsonDocument : public VariantOperators { } ArrayRef createNestedArray() { - return addElement().to(); + return add().to(); } // createNestedArray(char*) @@ -111,7 +111,7 @@ class JsonDocument : public VariantOperators { } ObjectRef createNestedObject() { - return addElement().to(); + return add().to(); } // createNestedObject(char*) @@ -254,13 +254,13 @@ class JsonDocument : public VariantOperators { getStringStoragePolicy(key))); } - FORCE_INLINE VariantRef addElement() { + FORCE_INLINE VariantRef add() { return VariantRef(&_pool, _data.addElement(&_pool)); } template FORCE_INLINE bool add(const TValue& value) { - return addElement().set(value); + return add().set(value); } // add(char*) const @@ -268,7 +268,7 @@ class JsonDocument : public VariantOperators { // add(const __FlashStringHelper*) const template FORCE_INLINE bool add(TChar* value) { - return addElement().set(value); + return add().set(value); } FORCE_INLINE void remove(size_t index) { diff --git a/src/ArduinoJson/Object/MemberProxy.hpp b/src/ArduinoJson/Object/MemberProxy.hpp index 2b246231..81f3f08d 100644 --- a/src/ArduinoJson/Object/MemberProxy.hpp +++ b/src/ArduinoJson/Object/MemberProxy.hpp @@ -154,10 +154,12 @@ class MemberProxy : public VariantOperators >, return getOrAddUpstreamMember().set(value); } - FORCE_INLINE VariantRef addElement() const { - return getOrAddUpstreamMember().addElement(); + FORCE_INLINE VariantRef add() const { + return getOrAddUpstreamMember().add(); } + using ArrayShortcuts >::add; + FORCE_INLINE VariantRef getElement(size_t index) const { return getUpstreamMember().getElement(index); } diff --git a/src/ArduinoJson/Variant/VariantRef.hpp b/src/ArduinoJson/Variant/VariantRef.hpp index 47684e39..bffd3114 100644 --- a/src/ArduinoJson/Variant/VariantRef.hpp +++ b/src/ArduinoJson/Variant/VariantRef.hpp @@ -269,13 +269,11 @@ class VariantRef : public VariantRefBase, typename enable_if::value, VariantRef>::type to() const; - VariantRef addElement() const { + VariantRef add() const { return VariantRef(_pool, variantAddElement(_data, _pool)); } - FORCE_INLINE VariantRef getElement(size_t index) const { - return VariantRef(_pool, _data != 0 ? _data->getElement(index) : 0); - } + using ArrayShortcuts::add; FORCE_INLINE VariantConstRef getElementConst(size_t index) const { return VariantConstRef(_data != 0 ? _data->getElement(index) : 0);