From 6632fa8da1316c002cf8bcc3fde804ebd0be5bd4 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 27 Jul 2021 13:52:13 +0200 Subject: [PATCH] Removed `StringAdapter::equals()` --- extras/tests/Cpp17/string_view.cpp | 4 --- extras/tests/Misc/StringAdapters.cpp | 27 ------------------- src/ArduinoJson/Collection/CollectionImpl.hpp | 2 +- src/ArduinoJson/Memory/MemoryPool.hpp | 2 +- .../Strings/Adapters/ArduinoStringAdapter.hpp | 4 --- .../Adapters/ConstRamStringAdapter.hpp | 4 --- .../Strings/Adapters/FlashStringAdapter.hpp | 4 --- .../Adapters/SizedFlashStringAdapter.hpp | 4 --- .../Adapters/SizedRamStringAdapter.hpp | 4 --- .../Strings/Adapters/StdStringAdapter.hpp | 6 ----- .../Strings/Adapters/StringViewAdapter.hpp | 6 ----- 11 files changed, 2 insertions(+), 65 deletions(-) diff --git a/extras/tests/Cpp17/string_view.cpp b/extras/tests/Cpp17/string_view.cpp index 7c00a4fa..3965a50a 100644 --- a/extras/tests/Cpp17/string_view.cpp +++ b/extras/tests/Cpp17/string_view.cpp @@ -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); } diff --git a/extras/tests/Misc/StringAdapters.cpp b/extras/tests/Misc/StringAdapters.cpp index 2f523c97..4250f903 100644 --- a/extras/tests/Misc/StringAdapters.cpp +++ b/extras/tests/Misc/StringAdapters.cpp @@ -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); } diff --git a/src/ArduinoJson/Collection/CollectionImpl.hpp b/src/ArduinoJson/Collection/CollectionImpl.hpp index 18995bc1..f814bcdf 100644 --- a/src/ArduinoJson/Collection/CollectionImpl.hpp +++ b/src/ArduinoJson/Collection/CollectionImpl.hpp @@ -107,7 +107,7 @@ template 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(); } diff --git a/src/ArduinoJson/Memory/MemoryPool.hpp b/src/ArduinoJson/Memory/MemoryPool.hpp index 7d3cd0c6..04e5b2d2 100644 --- a/src/ArduinoJson/Memory/MemoryPool.hpp +++ b/src/ArduinoJson/Memory/MemoryPool.hpp @@ -167,7 +167,7 @@ class MemoryPool { template 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 diff --git a/src/ArduinoJson/Strings/Adapters/ArduinoStringAdapter.hpp b/src/ArduinoJson/Strings/Adapters/ArduinoStringAdapter.hpp index c79958a3..5e4b6240 100644 --- a/src/ArduinoJson/Strings/Adapters/ArduinoStringAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/ArduinoStringAdapter.hpp @@ -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(); } diff --git a/src/ArduinoJson/Strings/Adapters/ConstRamStringAdapter.hpp b/src/ArduinoJson/Strings/Adapters/ConstRamStringAdapter.hpp index 70008ece..1ca7c02c 100644 --- a/src/ArduinoJson/Strings/Adapters/ConstRamStringAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/ConstRamStringAdapter.hpp @@ -22,10 +22,6 @@ class StringAdapter { return safe_strcmp(_str, other); } - bool equals(const char* expected) const { - return compare(expected) == 0; - } - bool isNull() const { return !_str; } diff --git a/src/ArduinoJson/Strings/Adapters/FlashStringAdapter.hpp b/src/ArduinoJson/Strings/Adapters/FlashStringAdapter.hpp index 3abcdf09..3a958181 100644 --- a/src/ArduinoJson/Strings/Adapters/FlashStringAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/FlashStringAdapter.hpp @@ -25,10 +25,6 @@ class StringAdapter { return -strcmp_P(other, reinterpret_cast(_str)); } - bool equals(const char* expected) const { - return compare(expected) == 0; - } - bool isNull() const { return !_str; } diff --git a/src/ArduinoJson/Strings/Adapters/SizedFlashStringAdapter.hpp b/src/ArduinoJson/Strings/Adapters/SizedFlashStringAdapter.hpp index 098a7831..b2d012fc 100644 --- a/src/ArduinoJson/Strings/Adapters/SizedFlashStringAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/SizedFlashStringAdapter.hpp @@ -26,10 +26,6 @@ class StringAdapter { return -strncmp_P(other, reinterpret_cast(_str), _size); } - bool equals(const char* expected) const { - return compare(expected) == 0; - } - bool isNull() const { return !_str; } diff --git a/src/ArduinoJson/Strings/Adapters/SizedRamStringAdapter.hpp b/src/ArduinoJson/Strings/Adapters/SizedRamStringAdapter.hpp index 315e1f7f..a18d5ab9 100644 --- a/src/ArduinoJson/Strings/Adapters/SizedRamStringAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/SizedRamStringAdapter.hpp @@ -21,10 +21,6 @@ class StringAdapter { return safe_strncmp(_str, other, _size); } - bool equals(const char* expected) const { - return compare(expected) == 0; - } - bool isNull() const { return !_str; } diff --git a/src/ArduinoJson/Strings/Adapters/StdStringAdapter.hpp b/src/ArduinoJson/Strings/Adapters/StdStringAdapter.hpp index 382db893..4d2d32c5 100644 --- a/src/ArduinoJson/Strings/Adapters/StdStringAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/StdStringAdapter.hpp @@ -33,12 +33,6 @@ class StringAdapter > { return _str->compare(other); } - bool equals(const char* expected) const { - if (!expected) - return false; - return *_str == expected; - } - size_t size() const { return _str->size(); } diff --git a/src/ArduinoJson/Strings/Adapters/StringViewAdapter.hpp b/src/ArduinoJson/Strings/Adapters/StringViewAdapter.hpp index 4ddfce65..787f7c21 100644 --- a/src/ArduinoJson/Strings/Adapters/StringViewAdapter.hpp +++ b/src/ArduinoJson/Strings/Adapters/StringViewAdapter.hpp @@ -31,12 +31,6 @@ class StringAdapter { return _str.compare(other); } - bool equals(const char* expected) const { - if (!expected) - return false; - return _str == expected; - } - size_t size() const { return _str.size(); }