Simplified string adapters

Author: bblanchon

src/ArduinoJson/Memory/MemoryPool.hpp

@@ -7,6 +7,7 @@
 #include <ArduinoJson/Memory/Alignment.hpp>
 #include <ArduinoJson/Polyfills/assert.hpp>
 #include <ArduinoJson/Polyfills/mpl/max.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
 #include <ArduinoJson/Variant/VariantSlot.hpp>
 
 #include <string.h>  // memmove
@@ -64,7 +65,7 @@ class MemoryPool {
       return 0;
 
 #if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-    const char* existingCopy = findString(str.begin());
+    const char* existingCopy = findString(str);
     if (existingCopy)
       return existingCopy;
 #endif
@@ -86,7 +87,7 @@ class MemoryPool {
 
   const char* saveStringFromFreeZone(size_t len) {
 #if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-    const char* dup = findString(_left);
+    const char* dup = findString(adaptString(_left));
     if (dup)
       return dup;
 #endif
@@ -163,16 +164,11 @@ class MemoryPool {
   }
 
 #if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-  template <typename TIterator>
-  const char* findString(TIterator str) {
+  template <typename TAdaptedString>
+  const char* findString(const TAdaptedString& str) {
     for (char* next = _begin; next < _left; ++next) {
-      char* begin = next;
-
-      // try to match
-      for (TIterator it = str; *it == *next; ++it) {
-        if (*next++ == 0)
-          return begin;
-      }
+      if (str.equals(next))
+        return next;
 
       // jump to next terminator
       while (*next) ++next;

src/ArduinoJson/Strings/ArduinoStringAdapter.hpp

@@ -39,10 +39,6 @@ class ArduinoStringAdapter {
     return _str->length();
   }
 
-  const char* begin() const {
-    return _str->c_str();
-  }
-
   typedef storage_policies::store_by_copy storage_policy;
 
  private:

src/ArduinoJson/Strings/ConstRamStringAdapter.hpp

@@ -39,10 +39,6 @@ class ConstRamStringAdapter {
     return _str;
   }
 
-  const char* begin() const {
-    return _str;
-  }
-
   typedef storage_policies::store_by_address storage_policy;
 
  protected:

src/ArduinoJson/Strings/FlashStringAdapter.hpp

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <ArduinoJson/Polyfills/pgmspace.hpp>
-#include <ArduinoJson/Strings/FlashStringIterator.hpp>
 #include <ArduinoJson/Strings/IsString.hpp>
 #include <ArduinoJson/Strings/StoragePolicy.hpp>
 
@@ -43,10 +42,6 @@ class FlashStringAdapter {
     return strlen_P(reinterpret_cast<const char*>(_str));
   }
 
-  FlashStringIterator begin() const {
-    return FlashStringIterator(_str);
-  }
-
   typedef storage_policies::store_by_copy storage_policy;
 
  private:

src/ArduinoJson/Strings/FlashStringIterator.hpp

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <ArduinoJson/Namespace.hpp>
-#include <ArduinoJson/Strings/FlashStringIterator.hpp>
 #include <ArduinoJson/Strings/IsString.hpp>
 #include <ArduinoJson/Strings/StoragePolicy.hpp>
 
@@ -42,10 +41,6 @@ class SizedFlashStringAdapter {
     return _size;
   }
 
-  FlashStringIterator begin() const {
-    return FlashStringIterator(_str);
-  }
-
   typedef storage_policies::store_by_copy storage_policy;
 
  private:

src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp

@@ -36,10 +36,6 @@ class SizedRamStringAdapter {
     return _size;
   }
 
-  const char* begin() const {
-    return _str;
-  }
-
   typedef storage_policies::store_by_copy storage_policy;
 
  private:

src/ArduinoJson/Strings/SizedRamStringAdapter.hpp

@@ -41,10 +41,6 @@ class StdStringAdapter {
     return _str->size();
   }
 
-  const char* begin() const {
-    return _str->c_str();
-  }
-
   typedef storage_policies::store_by_copy storage_policy;
 
  private: