Reduced usages of EscapedString

JsonGenerator/EscapedString.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include "Print.h"
-#include <string.h> // for strcmp
 
 namespace ArduinoJson
 {
@@ -16,18 +15,13 @@ namespace ArduinoJson
         {
         public:
 
-            void set(const char* s)
+            EscapedString(const char* s)
-            {
+                : rawString(s)
-                rawString = s;
+            {                
             }
 
             size_t printTo(Print&) const;
             
-            bool equals(char const* s)
-            {
-                return strcmp(s, rawString) == 0;
-            }
-
         private:
             const char* rawString;
         };

JsonGenerator/JsonObjectBase.cpp

@@ -4,6 +4,7 @@
 */
 
 #include "JsonObjectBase.h"
+#include <string.h> // for strcmp
 
 using namespace ArduinoJson::Generator;
 using namespace ArduinoJson::Internals;
@@ -19,7 +20,7 @@ size_t JsonObjectBase::printTo(Print& p) const
     const KeyValuePair* current = items;
     for (int i = count; i > 0; i--)
     {       
-        n += current->key.printTo(p);
+        n += EscapedString(current->key).printTo(p);
         n += p.write(':');
         n += current->value.printTo(p);
 
@@ -40,7 +41,7 @@ JsonValue& JsonObjectBase::operator[](char const* key)
 {
     for (int i = 0; i < count; ++i)
     {
-        if (items[i].key.equals(key))
+        if (!strcmp(items[i].key, key))
         {
             return items[i].value;
         }
@@ -49,6 +50,6 @@ JsonValue& JsonObjectBase::operator[](char const* key)
     if (count >= capacity)        
         return JsonValue::null();
     
-    items[count].key.set(key);
+    items[count].key = key;
     return items[count++].value;
 }

JsonGenerator/JsonObjectBase.h

@@ -38,8 +38,8 @@ namespace ArduinoJson
 
             struct KeyValuePair
             {
-                Internals::EscapedString  key;
+                const char* key;
-                JsonValue      value;
+                JsonValue   value;
             };
 
             JsonObjectBase(KeyValuePair* items, int capacity)

JsonGenerator/JsonValue.cpp

@@ -7,6 +7,7 @@
 #include "JsonValue.h"
 
 using namespace ArduinoJson::Generator;
+using namespace ArduinoJson::Internals;
 
 JsonValue JsonValue::nullInstance;
 
@@ -30,5 +31,5 @@ size_t JsonValue::printPrintableTo(const Content& c, Print& p)
 
 size_t JsonValue::printStringTo(const Content& c, Print& p)
 {
-    return c.asString.printTo(p);
+    return EscapedString(c.asString).printTo(p);
 }

JsonGenerator/JsonValue.h

@@ -44,7 +44,7 @@ namespace ArduinoJson
             void operator=(const char* value)
             {
                 printToImpl = &printStringTo;
-                content.asString.set(value);
+                content.asString = value;
             }
 
             void operator=(double value)
@@ -108,11 +108,11 @@ namespace ArduinoJson
         private:
             union Content
             {
-                bool asBool;
+                bool        asBool;
-                long asLong;
+                double      asDouble;
-                Printable* asPrintable;
+                long        asLong;
-                Internals::EscapedString asString;
+                Printable*  asPrintable;
-                double asDouble;
+                const char* asString;
             };
 
             Content content;

JsonGeneratorTests/EscapedStringTests.cpp

@@ -16,8 +16,7 @@ namespace JsonGeneratorTests
     {
         char buffer[1024];
         size_t returnValue;
-        EscapedString escapedString;
+        
-
     public:
 
         TEST_METHOD(Null)
@@ -83,8 +82,8 @@ namespace JsonGeneratorTests
     private:
         void whenInputIs(const char* input)
         {
-            StringBuilder sb(buffer, sizeof(buffer));            
+            StringBuilder sb(buffer, sizeof(buffer));  
-            escapedString.set(input);
+            EscapedString escapedString = input;
             returnValue = escapedString.printTo(sb);
         }