WIP

Author: bblanchon

src/ArduinoJson/Strings/Adapters/RamString.hpp

@@ -71,32 +71,16 @@ struct StringAdapter<TChar*, enable_if_t<IsChar<TChar>::value>> {
 };
 
 template <typename TChar, size_t N>
-struct StringAdapter<TChar[N], enable_if_t<IsChar<TChar>::value>> {
+struct StringAdapter<
+    TChar[N],
+    enable_if_t<IsChar<TChar>::value && !is_same<const char, TChar>::value>> {
   using AdaptedString = ZeroTerminatedRamString;
 
   static AdaptedString adapt(const TChar* p) {
     return AdaptedString(reinterpret_cast<const char*>(p));
   }
 };
 
-class StaticStringAdapter : public ZeroTerminatedRamString {
- public:
-  StaticStringAdapter(const char* str) : ZeroTerminatedRamString(str) {}
-
-  bool isLinked() const {
-    return true;
-  }
-};
-
-template <>
-struct StringAdapter<const char*, void> {
-  using AdaptedString = StaticStringAdapter;
-
-  static AdaptedString adapt(const char* p) {
-    return AdaptedString(p);
-  }
-};
-
 class SizedRamString {
  public:
   static const size_t typeSortKey = 2;

src/ArduinoJson/Strings/Adapters/StringLiteral.hpp

@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <stddef.h>  // size_t
+#include <string.h>  // strcmp
+
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/attributes.hpp>
+#include <ArduinoJson/Strings/StringAdapter.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+template <size_t N>
+class StringLiteral {
+ public:
+  static const size_t typeSortKey = 2;
+
+  StringLiteral(const char* str) : str_(str) {}
+
+  bool isNull() const {
+    return !str_;
+  }
+
+  size_t size() const {
+    return N - 1;
+  }
+
+  char operator[](size_t i) const {
+    ARDUINOJSON_ASSERT(str_ != 0);
+    ARDUINOJSON_ASSERT(i <= size());
+    return str_[i];
+  }
+
+  const char* data() const {
+    return str_;
+  }
+
+  bool isLinked() const {
+    return true;
+  }
+
+ protected:
+  const char* str_;
+};
+
+template <size_t N>
+struct StringAdapter<const char[N]> {
+  using AdaptedString = StringLiteral<N>;
+
+  static AdaptedString adapt(const char (&p)[N]) {
+    return AdaptedString(p);
+  }
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE

src/ArduinoJson/Strings/StringAdapters.hpp

@@ -7,8 +7,10 @@
 #include <ArduinoJson/Polyfills/type_traits.hpp>
 #include <ArduinoJson/Strings/Adapters/JsonString.hpp>
 #include <ArduinoJson/Strings/Adapters/RamString.hpp>
+#include <ArduinoJson/Strings/Adapters/StringLiteral.hpp>
 #include <ArduinoJson/Strings/Adapters/StringObject.hpp>
 
+
 #if ARDUINOJSON_ENABLE_PROGMEM
 #  include <ArduinoJson/Strings/Adapters/FlashString.hpp>
 #endif