github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed StringAdapter::equals()

Browse Source
This commit is contained in:
Benoit Blanchon
2021-07-27 13:52:13 +02:00
parent 5790f3c8f7
commit 6632fa8da1
11 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/tests/Cpp17/string_view.cpp
View File

@@ -71,9 +71,5 @@ TEST_CASE("StringViewAdapter") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK_FALSE(adapter.equals(NULL));
CHECK(adapter.size() == 5);
}

27
extras/tests/Misc/StringAdapters.cpp
View File

@@ -22,9 +22,6 @@ TEST_CASE("const char*") {
CHECK(adapter.compare("bravo") < 0);
CHECK(adapter.compare(NULL) == 0);
CHECK(adapter.equals(NULL));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 0);
}
@@ -36,9 +33,6 @@ TEST_CASE("const char*") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 5);
}
}
@@ -50,9 +44,6 @@ TEST_CASE("const char* + size") {
CHECK(adapter.compare("bravo") < 0);
CHECK(adapter.compare(NULL) == 0);
CHECK(adapter.equals(NULL));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 10);
}
@@ -64,9 +55,6 @@ TEST_CASE("const char* + size") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 5);
}
}
@@ -78,9 +66,6 @@ TEST_CASE("const __FlashStringHelper*") {
CHECK(adapter.compare("bravo") < 0);
CHECK(adapter.compare(NULL) == 0);
CHECK(adapter.equals(NULL));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 0);
}
@@ -92,9 +77,6 @@ TEST_CASE("const __FlashStringHelper*") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 5);
}
}
@@ -108,9 +90,6 @@ TEST_CASE("std::string") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 5);
}
@@ -123,9 +102,6 @@ TEST_CASE("Arduino String") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 5);
}
@@ -138,9 +114,6 @@ TEST_CASE("custom_string") {
CHECK(adapter.compare("bravo") == 0);
CHECK(adapter.compare("charlie") < 0);
CHECK(adapter.equals("bravo"));
CHECK_FALSE(adapter.equals("charlie"));
CHECK(adapter.size() == 5);
}

2
src/ArduinoJson/Collection/CollectionImpl.hpp
View File

@@ -107,7 +107,7 @@ template <typename TAdaptedString>
inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const {
VariantSlot* slot = _head;
while (slot) {
if (key.equals(slot->key()))
if (key.compare(slot->key()) == 0)
break;
slot = slot->next();
}

2
src/ArduinoJson/Memory/MemoryPool.hpp
View File

@@ -167,7 +167,7 @@ class MemoryPool {
template <typename TAdaptedString>
const char* findString(const TAdaptedString& str) {
for (char* next = _begin; next < _left; ++next) {
if (str.equals(next))
if (str.compare(next) == 0)
return next;
// jump to next terminator

4
src/ArduinoJson/Strings/Adapters/ArduinoStringAdapter.hpp
View File

@@ -32,10 +32,6 @@ class StringAdapter< ::String> {
return safe_strcmp(me, other);
}
bool equals(const char* expected) const {
return compare(expected) == 0;
}
size_t size() const {
return _str->length();
}

4
src/ArduinoJson/Strings/Adapters/ConstRamStringAdapter.hpp
View File

@@ -22,10 +22,6 @@ class StringAdapter<const char*> {
return safe_strcmp(_str, other);
}
bool equals(const char* expected) const {
return compare(expected) == 0;
}
bool isNull() const {
return !_str;
}

4
src/ArduinoJson/Strings/Adapters/FlashStringAdapter.hpp
View File

@@ -25,10 +25,6 @@ class StringAdapter<const __FlashStringHelper*> {
return -strcmp_P(other, reinterpret_cast<const char*>(_str));
}
bool equals(const char* expected) const {
return compare(expected) == 0;
}
bool isNull() const {
return !_str;
}

4
src/ArduinoJson/Strings/Adapters/SizedFlashStringAdapter.hpp
View File

@@ -26,10 +26,6 @@ class StringAdapter<const __FlashStringHelper*, true> {
return -strncmp_P(other, reinterpret_cast<const char*>(_str), _size);
}
bool equals(const char* expected) const {
return compare(expected) == 0;
}
bool isNull() const {
return !_str;
}

4
src/ArduinoJson/Strings/Adapters/SizedRamStringAdapter.hpp
View File

@@ -21,10 +21,6 @@ class StringAdapter<TChar*, true> {
return safe_strncmp(_str, other, _size);
}
bool equals(const char* expected) const {
return compare(expected) == 0;
}
bool isNull() const {
return !_str;
}

6
src/ArduinoJson/Strings/Adapters/StdStringAdapter.hpp
View File

@@ -33,12 +33,6 @@ class StringAdapter<std::basic_string<char, TCharTraits, TAllocator> > {
return _str->compare(other);
}
bool equals(const char* expected) const {
if (!expected)
return false;
return *_str == expected;
}
size_t size() const {
return _str->size();
}

6
src/ArduinoJson/Strings/Adapters/StringViewAdapter.hpp
View File

@@ -31,12 +31,6 @@ class StringAdapter<std::string_view> {
return _str.compare(other);
}
bool equals(const char* expected) const {
if (!expected)
return false;
return _str == expected;
}
size_t size() const {
return _str.size();
}