Added support for Stream (issue #300)

include/ArduinoJson/Configuration.hpp

@@ -27,6 +27,10 @@
 #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
 #endif
 
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
+#endif
+
 // On AVR archiecture, we can use PROGMEM
 #ifndef ARDUINOJSON_ENABLE_PROGMEM
 #ifdef PROGMEM
@@ -106,6 +110,11 @@
 #define ARDUINOJSON_ENABLE_STD_STREAM 1
 #endif
 
+// on a computer, there is no reason to beleive Arduino Stream is available
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 0
+#endif
+
 #ifndef ARDUINOJSON_ENABLE_ALIGNMENT
 // even if not required, most cpu's are faster with aligned pointers
 #define ARDUINOJSON_ENABLE_ALIGNMENT 1

include/ArduinoJson/Data/StringFuncs.hpp

@@ -1,148 +0,0 @@
-// Copyright Benoit Blanchon 2014-2016
-// MIT License
-//
-// Arduino JSON library
-// https://github.com/bblanchon/ArduinoJson
-// If you like this project, please add a star!
-
-#pragma once
-
-#include "../Configuration.hpp"
-
-#if ARDUINOJSON_ENABLE_ARDUINO_STRING
-#include <WString.h>
-#endif
-
-#if ARDUINOJSON_ENABLE_STD_STRING
-#include <string>
-#endif
-
-namespace ArduinoJson {
-namespace Internals {
-
-template <typename TString>
-struct StringFuncs {};
-
-template <typename TString>
-struct StringFuncs<const TString> : StringFuncs<TString> {};
-
-template <typename TString>
-struct StringFuncs<TString&> : StringFuncs<TString> {};
-
-struct CharPtrFuncs {
-  class Iterator {
-    const char* _ptr;
-
-   public:
-    Iterator(const char* ptr) : _ptr(ptr ? ptr : "") {}
-
-    char next() {
-      return *_ptr++;
-    }
-  };
-
-  static bool equals(const char* str, const char* expected) {
-    return strcmp(str, expected) == 0;
-  }
-
-  template <typename Buffer>
-  static char* duplicate(const char* str, Buffer* buffer) {
-    if (!str) return NULL;
-    size_t size = strlen(str) + 1;
-    void* dup = buffer->alloc(size);
-    if (dup != NULL) memcpy(dup, str, size);
-    return static_cast<char*>(dup);
-  }
-
-  static const bool has_append = false;
-  static const bool has_equals = true;
-  static const bool should_duplicate = false;
-};
-
-template <>
-struct StringFuncs<const char*> : CharPtrFuncs {};
-
-template <>
-struct StringFuncs<char*> : CharPtrFuncs {};
-
-template <size_t N>
-struct StringFuncs<char[N]> : CharPtrFuncs {};
-
-template <size_t N>
-struct StringFuncs<const char[N]> : CharPtrFuncs {};
-
-template <typename TString>
-struct StdStringFuncs {
-  template <typename Buffer>
-  static char* duplicate(const TString& str, Buffer* buffer) {
-    if (!str.c_str()) return NULL;  // <- Arduino string can return NULL
-    size_t size = str.length() + 1;
-    void* dup = buffer->alloc(size);
-    if (dup != NULL) memcpy(dup, str.c_str(), size);
-    return static_cast<char*>(dup);
-  }
-
-  struct Iterator : CharPtrFuncs::Iterator {
-    Iterator(const TString& str) : CharPtrFuncs::Iterator(str.c_str()) {}
-  };
-
-  static bool equals(const TString& str, const char* expected) {
-    return str == expected;
-  }
-
-  static void append(TString& str, char c) {
-    str += c;
-  }
-
-  static const bool has_append = true;
-  static const bool has_equals = true;
-  static const bool should_duplicate = true;
-};
-
-#if ARDUINOJSON_ENABLE_ARDUINO_STRING
-template <>
-struct StringFuncs<String> : StdStringFuncs<String> {};
-template <>
-struct StringFuncs<StringSumHelper> : StdStringFuncs<StringSumHelper> {};
-#endif
-
-#if ARDUINOJSON_ENABLE_STD_STRING
-template <>
-struct StringFuncs<std::string> : StdStringFuncs<std::string> {};
-#endif
-
-#if ARDUINOJSON_ENABLE_PROGMEM
-template <>
-struct StringFuncs<const __FlashStringHelper*> {
-  class Iterator {
-    const char* _ptr;
-
-   public:
-    Iterator(const __FlashStringHelper* ptr)
-        : _ptr(reinterpret_cast<const char*>(ptr)) {}
-
-    char next() {
-      return pgm_read_byte_near(_ptr++);
-    }
-  };
-
-  static bool equals(const __FlashStringHelper* str, const char* expected) {
-    return strcmp_P(expected, (PGM_P)str) == 0;
-  }
-
-  template <typename Buffer>
-  static char* duplicate(const __FlashStringHelper* str, Buffer* buffer) {
-    if (!str) return NULL;
-    size_t size = strlen_P((PGM_P)str) + 1;
-    void* dup = buffer->alloc(size);
-    if (dup != NULL) memcpy_P(dup, (PGM_P)str, size);
-    return static_cast<char*>(dup);
-  }
-
-  static const bool has_append = false;
-  static const bool has_equals = true;
-  static const bool should_duplicate = true;
-};
-#endif
-}
-}

include/ArduinoJson/Data/ValueSetter.hpp

@@ -9,8 +9,8 @@
 
 #include "../JsonBuffer.hpp"
 #include "../JsonVariant.hpp"
+#include "../StringTraits/StringTraits.hpp"
 #include "../TypeTraits/EnableIf.hpp"
-#include "StringFuncs.hpp"
 
 namespace ArduinoJson {
 namespace Internals {

include/ArduinoJson/Deserialization/JsonParser.hpp

@@ -77,7 +77,7 @@ struct JsonParserBuilder {
   typedef typename Internals::StringFuncs<TString>::Iterator InputIterator;
   typedef JsonParser<StringReader<InputIterator>, TJsonBuffer &> TParser;
 
-  static TParser makeParser(TJsonBuffer *buffer, const TString &json,
+  static TParser makeParser(TJsonBuffer *buffer, TString &json,
                             uint8_t nestingLimit) {
     return TParser(buffer, InputIterator(json), *buffer, nestingLimit);
   }
@@ -94,9 +94,9 @@ struct JsonParserBuilder<TJsonBuffer, char *> {
   }
 };
 
-template <typename TJsonBuffer, typename TChar, size_t N>
-struct JsonParserBuilder<TJsonBuffer, TChar[N]>
-    : JsonParserBuilder<TJsonBuffer, TChar *> {};
+template <typename TJsonBuffer, size_t N>
+struct JsonParserBuilder<TJsonBuffer, char[N]>
+    : JsonParserBuilder<TJsonBuffer, char *> {};
 
 template <typename TJsonBuffer, typename TString>
 inline typename JsonParserBuilder<TJsonBuffer, TString>::TParser makeParser(

include/ArduinoJson/JsonArray.hpp

@@ -10,10 +10,10 @@
 #include "Data/JsonBufferAllocated.hpp"
 #include "Data/List.hpp"
 #include "Data/ReferenceType.hpp"
-#include "Data/StringFuncs.hpp"
 #include "Data/ValueSetter.hpp"
 #include "JsonVariant.hpp"
 #include "Serialization/JsonPrintable.hpp"
+#include "StringTraits/StringTraits.hpp"
 #include "TypeTraits/ConstRefOrConstPtr.hpp"
 #include "TypeTraits/EnableIf.hpp"
 #include "TypeTraits/IsFloatingPoint.hpp"

include/ArduinoJson/JsonObject.hpp

@@ -10,10 +10,10 @@
 #include "Data/JsonBufferAllocated.hpp"
 #include "Data/List.hpp"
 #include "Data/ReferenceType.hpp"
-#include "Data/StringFuncs.hpp"
 #include "Data/ValueSetter.hpp"
 #include "JsonPair.hpp"
 #include "Serialization/JsonPrintable.hpp"
+#include "StringTraits/StringTraits.hpp"
 #include "TypeTraits/ConstRefOrConstPtr.hpp"
 #include "TypeTraits/EnableIf.hpp"
 #include "TypeTraits/IsFloatingPoint.hpp"

include/ArduinoJson/JsonVariantComparisons.hpp

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Data/StringFuncs.hpp"
 #include "JsonVariantBase.hpp"
+#include "StringTraits/StringTraits.hpp"
 #include "TypeTraits/EnableIf.hpp"
 
 namespace ArduinoJson {

include/ArduinoJson/Serialization/DynamicStringBuilder.hpp

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "../Data/StringFuncs.hpp"
 #include "../Print.hpp"
+#include "../StringTraits/StringTraits.hpp"
 
 namespace ArduinoJson {
 namespace Internals {

include/ArduinoJson/StringTraits/ArduinoStream.hpp

@@ -0,0 +1,39 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+#include "../TypeTraits/EnableIf.hpp"
+#include "../TypeTraits/IsBaseOf.hpp"
+#include "../TypeTraits/RemoveReference.hpp"
+
+namespace ArduinoJson {
+namespace Internals {
+
+struct StdStreamFuncs {
+  class Iterator {
+    Stream& _stream;
+
+   public:
+    Iterator(Stream& stream) : _stream(stream) {}
+
+    char next() {
+      int n = _stream.read();
+      return n >= 0 ? static_cast<char>(n) : '\0';
+    }
+  };
+};
+
+template <typename TStream>
+struct StringFuncs<TStream,
+                   // match any type that is derived from std::istream:
+                   typename TypeTraits::EnableIf<TypeTraits::IsBaseOf<
+                       Stream, typename TypeTraits::RemoveReference<
+                                   TStream>::type>::value>::type>
+    : StdStreamFuncs {};
+}
+}

include/ArduinoJson/StringTraits/CharPointer.hpp

@@ -0,0 +1,57 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+namespace ArduinoJson {
+namespace Internals {
+
+struct CharPtrFuncs {
+  class Iterator {
+    const char* _ptr;
+
+   public:
+    Iterator(const char* ptr) : _ptr(ptr ? ptr : "") {}
+
+    char next() {
+      char c = *_ptr;
+      if (c) ++_ptr;
+      return c;
+    }
+  };
+
+  static bool equals(const char* str, const char* expected) {
+    return strcmp(str, expected) == 0;
+  }
+
+  template <typename Buffer>
+  static char* duplicate(const char* str, Buffer* buffer) {
+    if (!str) return NULL;
+    size_t size = strlen(str) + 1;
+    void* dup = buffer->alloc(size);
+    if (dup != NULL) memcpy(dup, str, size);
+    return static_cast<char*>(dup);
+  }
+
+  static const bool has_append = false;
+  static const bool has_equals = true;
+  static const bool should_duplicate = false;
+};
+
+template <>
+struct StringFuncs<const char*, void> : CharPtrFuncs {};
+
+template <>
+struct StringFuncs<char*, void> : CharPtrFuncs {};
+
+template <size_t N>
+struct StringFuncs<char[N], void> : CharPtrFuncs {};
+
+template <size_t N>
+struct StringFuncs<const char[N], void> : CharPtrFuncs {};
+}
+}

include/ArduinoJson/StringTraits/FlashString.hpp

@@ -0,0 +1,44 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+namespace ArduinoJson {
+namespace Internals {
+template <>
+struct StringFuncs<const __FlashStringHelper*, void> {
+  class Iterator {
+    const char* _ptr;
+
+   public:
+    Iterator(const __FlashStringHelper* ptr)
+        : _ptr(reinterpret_cast<const char*>(ptr)) {}
+
+    char next() {
+      return pgm_read_byte_near(_ptr++);
+    }
+  };
+
+  static bool equals(const __FlashStringHelper* str, const char* expected) {
+    return strcmp_P(expected, (PGM_P)str) == 0;
+  }
+
+  template <typename Buffer>
+  static char* duplicate(const __FlashStringHelper* str, Buffer* buffer) {
+    if (!str) return NULL;
+    size_t size = strlen_P((PGM_P)str) + 1;
+    void* dup = buffer->alloc(size);
+    if (dup != NULL) memcpy_P(dup, (PGM_P)str, size);
+    return static_cast<char*>(dup);
+  }
+
+  static const bool has_append = false;
+  static const bool has_equals = true;
+  static const bool should_duplicate = true;
+};
+}
+}

include/ArduinoJson/StringTraits/StdStream.hpp

@@ -0,0 +1,42 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+#include <istream>
+#include "../TypeTraits/EnableIf.hpp"
+#include "../TypeTraits/IsBaseOf.hpp"
+#include "../TypeTraits/RemoveReference.hpp"
+
+namespace ArduinoJson {
+namespace Internals {
+
+struct StdStreamFuncs {
+  class Iterator {
+    std::istream& _stream;
+
+   public:
+    Iterator(std::istream& stream) : _stream(stream) {}
+
+    char next() {
+      return _stream.eof() ? '\0' : static_cast<char>(_stream.get());
+    }
+
+   private:
+    Iterator& operator=(const Iterator&);  // Visual Studio C4512
+  };
+};
+
+template <typename TStream>
+struct StringFuncs<TStream,
+                   // match any type that is derived from std::istream:
+                   typename TypeTraits::EnableIf<TypeTraits::IsBaseOf<
+                       std::istream, typename TypeTraits::RemoveReference<
+                                         TStream>::type>::value>::type>
+    : StdStreamFuncs {};
+}
+}

include/ArduinoJson/StringTraits/StdString.hpp

@@ -0,0 +1,61 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+#include <WString.h>
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+#include <string>
+#endif
+
+namespace ArduinoJson {
+namespace Internals {
+
+template <typename TString>
+struct StdStringFuncs {
+  template <typename Buffer>
+  static char* duplicate(const TString& str, Buffer* buffer) {
+    if (!str.c_str()) return NULL;  // <- Arduino string can return NULL
+    size_t size = str.length() + 1;
+    void* dup = buffer->alloc(size);
+    if (dup != NULL) memcpy(dup, str.c_str(), size);
+    return static_cast<char*>(dup);
+  }
+
+  struct Iterator : CharPtrFuncs::Iterator {
+    Iterator(const TString& str) : CharPtrFuncs::Iterator(str.c_str()) {}
+  };
+
+  static bool equals(const TString& str, const char* expected) {
+    return str == expected;
+  }
+
+  static void append(TString& str, char c) {
+    str += c;
+  }
+
+  static const bool has_append = true;
+  static const bool has_equals = true;
+  static const bool should_duplicate = true;
+};
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+template <>
+struct StringFuncs<String, void> : StdStringFuncs<String> {};
+template <>
+struct StringFuncs<StringSumHelper, void> : StdStringFuncs<StringSumHelper> {};
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+template <>
+struct StringFuncs<std::string, void> : StdStringFuncs<std::string> {};
+#endif
+}
+}

include/ArduinoJson/StringTraits/StringTraits.hpp

@@ -0,0 +1,42 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+#include "../Configuration.hpp"
+
+namespace ArduinoJson {
+namespace Internals {
+
+template <typename TString, typename Enable = void>
+struct StringFuncs {};
+
+template <typename TString>
+struct StringFuncs<const TString, void> : StringFuncs<TString> {};
+
+template <typename TString>
+struct StringFuncs<TString&, void> : StringFuncs<TString> {};
+}
+}
+
+#include "CharPointer.hpp"
+
+#if ARDUINOJSON_ENABLE_STD_STRING || ARDUINOJSON_ENABLE_ARDUINO_STRING
+#include "StdString.hpp"
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STREAM
+#include "StdStream.hpp"
+#endif
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#include "ArduinoStream.hpp"
+#endif
+
+#if ARDUINOJSON_ENABLE_PROGMEM
+#include "FlashString.hpp"
+#endif

include/ArduinoJson/TypeTraits/IsBaseOf.hpp

@@ -0,0 +1,30 @@
+// Copyright Benoit Blanchon 2014-2016
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+// If you like this project, please add a star!
+
+#pragma once
+
+namespace ArduinoJson {
+namespace TypeTraits {
+
+// A meta-function that returns true if Derived inherits from TBase is an
+// integral type.
+template <typename TBase, typename TDerived>
+class IsBaseOf {
+ protected:  // <- to avoid GCC's "all member functions in class are private"
+  typedef char Yes[1];
+  typedef char No[2];
+
+  static Yes &probe(const TBase *);
+  static No &probe(const void *);
+
+ public:
+  enum {
+    value = sizeof(probe(reinterpret_cast<TDerived *>(0))) == sizeof(Yes)
+  };
+};
+}
+}