Set version to 5.11.2

.github/ISSUE_TEMPLATE.md

@@ -1,11 +1,14 @@
 <!--
-Thanks for using ArduinoJson :-)
-
-Before opening an issue, please make sure you've read these:
+Before opening an issue, please read the FAQ:
 https://bblanchon.github.io/ArduinoJson/faq/
-https://bblanchon.github.io/ArduinoJson/doc/pitfalls/
 
-Next, make sure you provide all the relevant information: platform, code snippet, and error messages.
+Please provide all the relevant information:
+* good title
+* short description of the problem
+* target platform
+* compiler model and version
+* MVCE (https://stackoverflow.com/help/mcve)
+* compiler output
 
-Please be concise!
+Good questions get fast answers!
 -->

.travis.yml

@@ -8,12 +8,6 @@ matrix:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.4']
       env: SCRIPT=cmake GCC=4.4
-    - compiler: gcc
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.5']
-      env: SCRIPT=cmake GCC=4.5
     - compiler: gcc
       addons:
         apt:
@@ -44,6 +38,18 @@ matrix:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-5']
       env: SCRIPT=cmake GCC=5 SANITIZE=undefined
+    - compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-6']
+      env: SCRIPT=cmake GCC=6
+    - compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-7']
+      env: SCRIPT=cmake GCC=7
     - compiler: clang
       env: SCRIPT=cmake
     - compiler: clang
@@ -76,28 +82,14 @@ matrix:
       osx_image: xcode6.4
       compiler: clang
       env: SCRIPT=cmake
-    - os: osx
-      osx_image: xcode7
-      compiler: clang
-      env: SCRIPT=cmake
-    - os: osx
-      osx_image: xcode7.1
-      compiler: clang
-      env: SCRIPT=cmake
-    - os: osx
-      osx_image: xcode7.2
-      compiler: clang
-      env: SCRIPT=cmake
     - os: osx
       osx_image: xcode7.3
       compiler: clang
       env: SCRIPT=cmake SANITIZE=address
     - env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
-    - env: SCRIPT=arduino VERSION=1.6.12 BOARD=arduino:avr:uno
+    - env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:avr:uno
     - env: SCRIPT=platformio BOARD=uno
-    - env: SCRIPT=platformio BOARD=due
     - env: SCRIPT=platformio BOARD=esp01
-    - env: SCRIPT=platformio BOARD=teensy31
 cache:
   directories:
     - "~/.platformio"

ArduinoJson.h

@@ -5,4 +5,4 @@
 // https://bblanchon.github.io/ArduinoJson/
 // If you like this project, please add a star!
 
-#include "include/ArduinoJson.h"
+#include "src/ArduinoJson.h"

CHANGELOG.md

@@ -1,6 +1,81 @@
 ArduinoJson: change log
 =======================
 
+v5.11.2
+-------
+
+* Fixed `DynamicJsonBuffer::clear()` not resetting allocation size (issue #561)
+* Fixed incorrect rounding for float values (issue #588)
+
+v5.11.1
+-------
+
+* Removed dependency on `PGM_P` as Particle 0.6.2 doesn't define it (issue #546)
+* Fixed warning "dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]"
+* Fixed warning "floating constant exceeds range of 'float' [-Woverflow]" (issue #544)
+* Fixed warning "this statement may fall through" [-Wimplicit-fallthrough=] (issue #539)
+* Removed `ARDUINOJSON_DOUBLE_IS_64BITS` as it became useless.
+* Fixed too many decimals places in float serialization (issue #543)
+
+v5.11.0
+-------
+
+* Made `JsonBuffer` non-copyable (PR #524 by @luisrayas3)
+* Added `StaticJsonBuffer::clear()`
+* Added `DynamicJsonBuffer::clear()`
+
+v5.10.1
+-------
+
+* Fixed IntelliSense errors in Visual Micro (issue #483)
+* Fixed compilation in IAR Embedded Workbench (issue #515)
+* Fixed reading "true" as a float (issue #516)
+* Added `ARDUINOJSON_DOUBLE_IS_64BITS`
+* Added `ARDUINOJSON_EMBEDDED_MODE`
+
+v5.10.0
+-------
+
+* Removed configurable number of decimal places (issues #288, #427 and #506)
+* Changed exponentiation thresholds to `1e7` and `1e-5` (issues #288, #427 and #506)
+* `JsonVariant::is<double>()` now returns `true` for integers
+* Fixed error `IsBaseOf is not a member of ArduinoJson::TypeTraits` (issue #495)
+* Fixed error `forming reference to reference` (issue #495)
+
+### BREAKING CHANGES :warning:
+
+| Old syntax                      | New syntax          |
+|---------------------------------|---------------------|
+| `double_with_n_digits(3.14, 2)` | `3.14`              |
+| `float_with_n_digits(3.14, 2)`  | `3.14f`             |
+| `obj.set("key", 3.14, 2)`       | `obj["key"] = 3.14` |
+| `arr.add(3.14, 2)`              | `arr.add(3.14)`     |
+
+| Input     | Old output | New output |
+|-----------|------------|------------|
+| `3.14159` | `3.14`     | `3.14159`  |
+| `42.0`    | `42.00`    | `42`       |
+| `0.0`     | `0.00`     | `0`        |
+
+| Expression                     | Old result | New result |
+|--------------------------------|------------|------------|
+| `JsonVariant(42).is<int>()`    | `true`     | `true`     |
+| `JsonVariant(42).is<float>()`  | `false`    | `true`     |
+| `JsonVariant(42).is<double>()` | `false`    | `true`     |
+
+
+v5.9.0
+------
+
+* Added `JsonArray::remove(iterator)` (issue #479)
+* Added `JsonObject::remove(iterator)`
+* Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`
+* Renamed folder `include/` to `src/`
+* Fixed warnings `floating constant exceeds range of float`and `floating constant truncated to zero` (issue #483)
+* Removed `Print` class and converted `printTo()` to a template method (issue #276)
+* Removed example `IndentedPrintExample.ino`
+* Now compatible with Particle 0.6.1, thanks to Jacob Nite (issue #294 and PR #461 by @foodbag)
+
 v5.8.4
 ------
 
@@ -41,7 +116,7 @@ v5.8.0
 * Added support for `Stream` (issue #300)
 * Reduced memory consumption by not duplicating spaces and comments
 
-**BREAKING CHANGES**:
+### BREAKING CHANGES :warning:
 
 `JsonBuffer::parseObject()` and  `JsonBuffer::parseArray()` have been pulled down to the derived classes `DynamicJsonBuffer` and `StaticJsonBufferBase`.
 
@@ -59,6 +134,7 @@ void myFunction(StaticJsonBufferBase& jsonBuffer);
 template<typename TJsonBuffer> void myFunction(TJsonBuffer& jsonBuffer);
 ```
 
+
 v5.7.3
 ------
 
@@ -90,7 +166,7 @@ v5.7.0
 * Added example `StringExample.ino` to show where `String` can be used
 * Increased default nesting limit to 50 when compiled for a computer (issue #349)
 
-**BREAKING CHANGES**:
+### BREAKING CHANGES :warning:
 
 The non-template functions `JsonObject::get()` and `JsonArray.get()` have been removed. This means that you need to explicitely tell the type you expect in return.
 
@@ -217,7 +293,8 @@ v5.0.7
 * Made library easier to use from a CMake project: simply `add_subdirectory(ArduinoJson/src)`
 * Changed `String` to be a `typedef` of `std::string` (issues #142 and #161)
 
-**BREAKING CHANGES**:
+### BREAKING CHANGES :warning:
+
 - `JsonVariant(true).as<String>()` now returns `"true"` instead of `"1"`
 - `JsonVariant(false).as<String>()` now returns `"false"` instead of `"0"`
 
@@ -273,7 +350,8 @@ v5.0.0
 * Redesigned `JsonVariant` to leverage converting constructors instead of assignment operators (issue #66)
 * Switched to new the library layout (requires Arduino 1.0.6 or above)
 
-**BREAKING CHANGES**:
+### BREAKING CHANGES :warning:
+
 - `JsonObject::add()` was renamed to `set()`
 - `JsonArray::at()` and `JsonObject::at()` were renamed to `get()`
 - Number of digits of floating point value are now set with `double_with_n_digits()`

CMakeLists.txt

@@ -10,12 +10,10 @@ project(ArduinoJson)
 
 enable_testing()
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
 if(${COVERAGE})
 	set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
 endif()
 
+include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
+add_subdirectory(third-party/catch)
 add_subdirectory(test)

CONTRIBUTING.md

@@ -0,0 +1,11 @@
+# Contribution to ArduinoJson
+
+First, thank you for taking the time to contribute to this project.
+
+You can submit changes via GitHub Pull Requests.
+
+Please:
+
+1. Unit test every change in behavior
+2. Use clang-format in "file" mode to format the code
+3. Consider using the Continuous Integration (Travis and AppVeyor)

README.md

@@ -1,8 +1,10 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/master?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/master) [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=master)](https://travis-ci.org/bblanchon/ArduinoJson) [![Coverage Status](https://img.shields.io/coveralls/bblanchon/ArduinoJson.svg)](https://coveralls.io/r/bblanchon/ArduinoJson?branch=master) [![Star this project](http://githubbadges.com/star.svg?user=bblanchon&repo=ArduinoJson&style=flat&color=fff&background=007ec6)](https://github.com/bblanchon/ArduinoJson)
+
+![ArduinoJson's logo](banner.svg)
+
 ArduinoJson - C++ JSON library for IoT
 ====================
 
-[![Build status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/master?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/master) [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=master)](https://travis-ci.org/bblanchon/ArduinoJson) [![Coverage Status](https://img.shields.io/coveralls/bblanchon/ArduinoJson.svg)](https://coveralls.io/r/bblanchon/ArduinoJson?branch=master) [![Star this project](http://githubbadges.com/star.svg?user=bblanchon&repo=ArduinoJson&style=flat&color=fff&background=007ec6)](https://github.com/bblanchon/ArduinoJson)
-
 *An elegant and efficient JSON library for embedded systems.*
 
 It's designed to have the most intuitive API, the smallest footprint and is able to work without any allocation on the heap (no malloc).
@@ -27,14 +29,16 @@ Features
 Works on
 --------
 
-* All Arduino boards (Uno, Due, Mini, Micro, Yun...)
-* ESP8266
+* Arduino boards: Uno, Due, Mini, Micro, Yun...
+* ESP8266, ESP32
 * Teensy
-* Intel Edison and Galileo
-* PlatformIO
-* Energia
 * RedBearLab boards (BLE Nano...)
-* Computers (Windows, Linux, OSX...)
+* Intel Edison and Galileo
+* WeMos boards: D1...
+* Computers: Windows, Linux, OSX...
+* PlatformIO
+* Particle
+* Energia
 
 Quick start
 -----------
@@ -56,6 +60,8 @@ double longitude   = root["data"][1];
 
 [See JsonParserExample.ino](examples/JsonParserExample/JsonParserExample.ino)
 
+Use [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) to compute the buffer size.
+
 #### Encoding / Generating
 
 ```c++
@@ -66,8 +72,8 @@ root["sensor"] = "gps";
 root["time"] = 1351824120;
 
 JsonArray& data = root.createNestedArray("data");
-data.add(48.756080, 6);  // 6 is the number of decimals to print
-data.add(2.302038, 6);   // if not specified, 2 digits are printed
+data.add(48.756080);
+data.add(2.302038);
 
 root.printTo(Serial);
 // This prints:
@@ -76,6 +82,8 @@ root.printTo(Serial);
 
 [See JsonGeneratorExample.ino](examples/JsonGeneratorExample/JsonGeneratorExample.ino)
 
+Use [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) to compute the buffer size.
+
 
 Documentation
 -------------
@@ -85,33 +93,6 @@ The documentation is available online in the [ArduinoJson Website](https://bblan
 The [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) helps you get started with the library.
 
 
-Testimonials
-------------
-
-From Arduino's Forum user `jflaplante`:
-> I tried aJson json-arduino before trying your library. I always ran into memory problem after a while.
-> I have no such problem so far with your library. It is working perfectly with my web services.
-
-From StackOverflow user `thegreendroid`:
-> It has a really elegant, simple API and it works like a charm on embedded and Windows/Linux platforms. We recently started using this on an embedded project and I can vouch for its quality.
-
-From GitHub user `zacsketches`:
-> Thanks for a great library!!!
-> I've been watching you consistently develop this library over the past six months, and I used it today for a publish and subscribe architecture designed to help hobbyists move into more advanced robotics. Your library allowed me to implement remote subscription in order to facilitate multi-processor robots.
-> ArduinoJson saved me a week's worth of time!!
-
-[From Reddit user `erm_what_`](https://www.reddit.com/r/arduino/comments/3jj6ep/announcing_arduinojson_50/cusjk8c):
-> This is a great library and I wouldn't be able to do the project I'm doing without it. I completely recommend it.
-
-[From Reddit user `makerhacks`](https://www.reddit.com/r/arduino/comments/3jj6ep/announcing_arduinojson_50/cusqg7b):
-> I am just starting an ESP8266 clock project and now I can output JSON from my server script and interpret it painlessly.
-
-[From Twitter user `@hemalchevli`](https://twitter.com/hemalchevli/status/715788439397011456):
-> ArduinoJson library should be used as a benchmark/reference for making libraries. Truly elegant.
-
-[From GitHub user `sticilface`](https://github.com/bblanchon/ArduinoJson/issues/381#issuecomment-260203594):
-> its a great lib:) and i use it in everything!
-
 Donators
 --------
 
@@ -137,6 +118,12 @@ Special thanks to the following persons and companies who made generous donation
 * Christoph Schmidt <img alt='Germany' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1e9-1f1ea.svg' width='18' height='18'>
 * OpenEVSE LLC <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
 * Prokhoryatov Alexey <img alt='Russia' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f7-1f1fa.svg' width='18' height='18'>
+* Google Inc. <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
+* Charles Haynes <img alt='Australia' src='https://d1j8pt39hxlh3d.cloudfront.net/development/emojione/2.2/989/2546.svg' width='18' height='18'>
+* Charles Walker <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
+* Günther Jehle <img alt='Liechtenstein' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f1-1f1ee.svg' width='18' height='18'>
+* Patrick Elliott
+
 
 ---
 

SUPPORT.md

@@ -0,0 +1,27 @@
+# ArduinoJson Support
+
+First off, thank you very much for using ArduinoJson.
+
+We'll be very happy to help you, but first please read the following.
+
+## Before asking for help
+
+1. Read the [FAQ](https://bblanchon.github.io/ArduinoJson/faq/)
+2. Search in the [API Reference](https://bblanchon.github.io/ArduinoJson/api/)
+
+If you did not find the answer, please create a [new issue on GitHub](https://github.com/bblanchon/ArduinoJson/issues/new).
+
+It is OK to add a comment to a currently opened issue, but please avoid adding comments to a closed issue.
+
+## Before hitting the Submit button
+
+Please provide all the relevant information:
+
+* Good title
+* Short description of the problem
+* Target platform
+* Compiler model and version
+* [MVCE](https://stackoverflow.com/help/mcve)
+* Compiler output
+
+Good questions get fast answers!

appveyor.yml

@@ -1,13 +1,15 @@
-version: 5.8.4.{build}
+version: 5.11.2.{build}
 environment:
   matrix:
-  - CMAKE_GENERATOR: Visual Studio 14 2015
-  - CMAKE_GENERATOR: Visual Studio 12 2013
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: Visual Studio 15 2017
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    CMAKE_GENERATOR: Visual Studio 14 2015
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    CMAKE_GENERATOR: Visual Studio 12 2013
   - CMAKE_GENERATOR: Visual Studio 11 2012
   - CMAKE_GENERATOR: Visual Studio 10 2010
-#  - CMAKE_GENERATOR: MinGW Makefiles
-# Note: Disabled because of unexplicated error -1073741511
-# This used to work fine with GCC 4.8.2 then failed after they upgraded to GCC 4.9.3
+  - CMAKE_GENERATOR: MinGW Makefiles
 configuration: Debug
 before_build:
 - set PATH=C:\MinGW\bin;%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW
@@ -15,4 +17,4 @@ before_build:
 build_script:
 - cmake --build . --config %CONFIGURATION%
 test_script:
-- ctest -V .
+- ctest --output-on-failure .

examples/IndentedPrintExample/IndentedPrintExample.ino

@@ -1,35 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#include <ArduinoJson.h>
-
-using namespace ArduinoJson::Internals;
-
-void setup() {
-  Serial.begin(9600);
-  while (!Serial) {
-    // wait serial port initialization
-  }
-
-  IndentedPrint serial(Serial);
-  serial.setTabSize(4);
-
-  serial.println("This is at indentation 0");
-  serial.indent();
-  serial.println("This is at indentation 1");
-  serial.println("This is also at indentation 1");
-  serial.indent();
-  serial.println("This is at indentation 2");
-
-  serial.unindent();
-  serial.unindent();
-  serial.println("This is back at indentation 0");
-}
-
-void loop() {
-  // not used in this example
-}

examples/JsonGeneratorExample/JsonGeneratorExample.ino

@@ -17,13 +17,13 @@ void setup() {
   //
   // Inside the brackets, 200 is the size of the pool in bytes.
   // If the JSON object is more complex, you need to increase that value.
+  // See https://bblanchon.github.io/ArduinoJson/assistant/
   StaticJsonBuffer<200> jsonBuffer;
 
   // StaticJsonBuffer allocates memory on the stack, it can be
   // replaced by DynamicJsonBuffer which allocates in the heap.
-  // It's simpler but less efficient.
   //
-  // DynamicJsonBuffer  jsonBuffer;
+  // DynamicJsonBuffer  jsonBuffer(200);
 
   // Create the root of the object tree.
   //
@@ -44,8 +44,8 @@ void setup() {
   // It's also possible to create the array separately and add it to the
   // JsonObject but it's less efficient.
   JsonArray& data = root.createNestedArray("data");
-  data.add(double_with_n_digits(48.756080, 6));
-  data.add(double_with_n_digits(2.302038, 6));
+  data.add(48.756080);
+  data.add(2.302038);
 
   root.printTo(Serial);
   // This prints:

examples/JsonHttpClient/JsonHttpClient.ino

@@ -135,7 +135,7 @@ bool skipResponseHeaders() {
 // }
 bool readReponseContent(struct UserData* userData) {
   // Compute optimal size of the JSON buffer according to what we need to parse.
-  // This is only required if you use StaticJsonBuffer.
+  // See https://bblanchon.github.io/ArduinoJson/assistant/
   const size_t BUFFER_SIZE =
       JSON_OBJECT_SIZE(8)    // the root object has 8 elements
       + JSON_OBJECT_SIZE(5)  // the "address" object has 5 elements

examples/JsonParserExample/JsonParserExample.ino

@@ -17,13 +17,13 @@ void setup() {
   //
   // Inside the brackets, 200 is the size of the pool in bytes,
   // If the JSON object is more complex, you need to increase that value.
+  // See https://bblanchon.github.io/ArduinoJson/assistant/
   StaticJsonBuffer<200> jsonBuffer;
 
   // StaticJsonBuffer allocates memory on the stack, it can be
   // replaced by DynamicJsonBuffer which allocates in the heap.
-  // It's simpler but less efficient.
   //
-  // DynamicJsonBuffer  jsonBuffer;
+  // DynamicJsonBuffer  jsonBuffer(200);
 
   // JSON input string.
   //

examples/JsonServer/JsonServer.ino

@@ -2,9 +2,9 @@
 // Created by Benoit Blanchon.
 // Heavily inspired by "Web Server" from David A. Mellis and Tom Igoe
 
-#include <SPI.h>
-#include <Ethernet.h>
 #include <ArduinoJson.h>
+#include <Ethernet.h>
+#include <SPI.h>
 
 byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
 IPAddress ip(192, 168, 0, 177);
@@ -64,6 +64,8 @@ void loop() {
   if (client) {
     bool success = readRequest(client);
     if (success) {
+      // Use https://bblanchon.github.io/ArduinoJson/assistant/ to
+      // compute the right size for the buffer
       StaticJsonBuffer<500> jsonBuffer;
       JsonObject& json = prepareResponse(jsonBuffer);
       writeResponse(client, json);

examples/JsonUdpBeacon/JsonUdpBeacon.ino

@@ -49,6 +49,8 @@ void setup() {
 void loop() {
   delay(1000);
 
+  // Use https://bblanchon.github.io/ArduinoJson/assistant/ to
+  // compute the right size for the buffer
   StaticJsonBuffer<300> jsonBuffer;
   JsonObject& json = buildJson(jsonBuffer);
   sendJson(json);

fuzzing/Makefile

@@ -1,13 +1,13 @@
 # CAUTION: this file is invoked by https://github.com/google/oss-fuzz
 
-CXXFLAGS += -I../include
+CXXFLAGS += -I../src
 
 all: \
 	$(OUT)/json_fuzzer \
 	$(OUT)/json_fuzzer_seed_corpus.zip \
 	$(OUT)/json_fuzzer.options
 
-$(OUT)/json_fuzzer: fuzzer.cpp $(shell find ../include -type f)
+$(OUT)/json_fuzzer: fuzzer.cpp $(shell find ../src -type f)
 	$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
 
 $(OUT)/json_fuzzer_seed_corpus.zip: seed_corpus/*

include/ArduinoJson/Data/JsonVariantComparer.hpp

@@ -1,69 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-#include "../JsonVariantBase.hpp"
-#include "../StringTraits/StringTraits.hpp"
-#include "../TypeTraits/EnableIf.hpp"
-
-namespace ArduinoJson {
-namespace Internals {
-template <typename TComparand, typename Enable = void>
-struct JsonVariantComparer {};
-
-template <typename TString>
-struct JsonVariantComparer<
-    TString,
-    typename TypeTraits::EnableIf<TypeTraits::IsString<TString>::value>::type> {
-  template <typename TVariant>
-  static bool equals(const JsonVariantBase<TVariant> &variant,
-                     const TString &comparand) {
-    const char *value = variant.template as<const char *>();
-    return Internals::StringTraits<TString>::equals(comparand, value);
-  }
-};
-
-template <typename TComparand>
-struct JsonVariantComparer<
-    TComparand, typename TypeTraits::EnableIf<
-                    !TypeTraits::IsVariant<TComparand>::value &&
-                    !TypeTraits::IsString<TComparand>::value>::type> {
-  template <typename TVariant>
-  static bool equals(const JsonVariantBase<TVariant> &variant,
-                     const TComparand &comparand) {
-    return variant.template as<TComparand>() == comparand;
-  }
-};
-
-template <typename TVariant2>
-struct JsonVariantComparer<TVariant2,
-                           typename TypeTraits::EnableIf<
-                               TypeTraits::IsVariant<TVariant2>::value>::type> {
-  template <typename TVariant1>
-  static bool equals(const JsonVariantBase<TVariant1> &left,
-                     const TVariant2 &right) {
-    if (left.template is<bool>() && right.template is<bool>())
-      return left.template as<bool>() == right.template as<bool>();
-    if (left.template is<JsonInteger>() && right.template is<JsonInteger>())
-      return left.template as<JsonInteger>() ==
-             right.template as<JsonInteger>();
-    if (left.template is<JsonFloat>() && right.template is<JsonFloat>())
-      return left.template as<JsonFloat>() == right.template as<JsonFloat>();
-    if (left.template is<JsonArray>() && right.template is<JsonArray>())
-      return left.template as<JsonArray>() == right.template as<JsonArray>();
-    if (left.template is<JsonObject>() && right.template is<JsonObject>())
-      return left.template as<JsonObject>() == right.template as<JsonObject>();
-    if (left.template is<char *>() && right.template is<char *>())
-      return strcmp(left.template as<char *>(), right.template as<char *>()) ==
-             0;
-
-    return false;
-  }
-};
-}
-}

include/ArduinoJson/JsonVariantComparisons.hpp

@@ -1,88 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-#include "Data/JsonVariantComparer.hpp"
-
-namespace ArduinoJson {
-template <typename TVariant, typename TComparand>
-inline bool operator==(const JsonVariantBase<TVariant> &variant,
-                       TComparand comparand) {
-  return Internals::JsonVariantComparer<TComparand>::equals(variant, comparand);
-}
-
-template <typename TVariant, typename TComparand>
-inline typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value,
-                                     bool>::type
-operator==(TComparand comparand, const JsonVariantBase<TVariant> &variant) {
-  return Internals::JsonVariantComparer<TComparand>::equals(variant, comparand);
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator!=(const JsonVariantBase<TVariant> &variant,
-                       TComparand comparand) {
-  return !Internals::JsonVariantComparer<TComparand>::equals(variant,
-                                                             comparand);
-}
-
-template <typename TVariant, typename TComparand>
-inline typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value,
-                                     bool>::type
-operator!=(TComparand comparand, const JsonVariantBase<TVariant> &variant) {
-  return !Internals::JsonVariantComparer<TComparand>::equals(variant,
-                                                             comparand);
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator<=(const JsonVariantBase<TVariant> &left,
-                       TComparand right) {
-  return left.template as<TComparand>() <= right;
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator<=(TComparand comparand,
-                       const JsonVariantBase<TVariant> &variant) {
-  return comparand <= variant.template as<TComparand>();
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator>=(const JsonVariantBase<TVariant> &variant,
-                       TComparand comparand) {
-  return variant.template as<TComparand>() >= comparand;
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator>=(TComparand comparand,
-                       const JsonVariantBase<TVariant> &variant) {
-  return comparand >= variant.template as<TComparand>();
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator<(const JsonVariantBase<TVariant> &varian,
-                      TComparand comparand) {
-  return varian.template as<TComparand>() < comparand;
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator<(TComparand comparand,
-                      const JsonVariantBase<TVariant> &variant) {
-  return comparand < variant.template as<TComparand>();
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator>(const JsonVariantBase<TVariant> &variant,
-                      TComparand comparand) {
-  return variant.template as<TComparand>() > comparand;
-}
-
-template <typename TVariant, typename TComparand>
-inline bool operator>(TComparand comparand,
-                      const JsonVariantBase<TVariant> &variant) {
-  return comparand > variant.template as<TComparand>();
-}
-}

include/ArduinoJson/Polyfills/math.hpp

@@ -1,132 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-// If Visual Studo
-#if defined(_MSC_VER)
-
-#include <float.h>
-#include <limits>
-
-namespace ArduinoJson {
-namespace Polyfills {
-template <typename T>
-bool isNaN(T x) {
-  return _isnan(x) != 0;
-}
-
-template <typename T>
-bool isInfinity(T x) {
-  return !_finite(x);
-}
-
-template <typename T>
-T nan() {
-  return std::numeric_limits<T>::quiet_NaN();
-}
-
-template <typename T>
-T inf() {
-  return std::numeric_limits<T>::infinity();
-}
-}
-}
-
-#else
-
-#include <math.h>
-
-// GCC warning: "conversion to 'float' from 'double' may alter its value"
-#ifdef __GNUC__
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic push
-#endif
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
-#pragma GCC diagnostic ignored "-Wfloat-conversion"
-#else
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-#endif
-
-// Workaround for libs that #undef isnan or isinf
-// https://bblanchon.github.io/ArduinoJson//issues/284
-#if !defined(isnan) || !defined(isinf)
-namespace std {}
-#endif
-
-namespace ArduinoJson {
-namespace Polyfills {
-
-template <typename T>
-bool isNaN(T x) {
-// Workaround for libs that #undef isnan
-// https://bblanchon.github.io/ArduinoJson//issues/284
-#ifndef isnan
-  using namespace std;
-#endif
-
-  return isnan(x);
-}
-
-#if defined(_GLIBCXX_HAVE_ISNANL) && _GLIBCXX_HAVE_ISNANL
-template <>
-inline bool isNaN<double>(double x) {
-  return isnanl(x);
-}
-#endif
-
-#if defined(_GLIBCXX_HAVE_ISNANF) && _GLIBCXX_HAVE_ISNANF
-template <>
-inline bool isNaN<float>(float x) {
-  return isnanf(x);
-}
-#endif
-
-template <typename T>
-bool isInfinity(T x) {
-// Workaround for libs that #undef isinf
-// https://bblanchon.github.io/ArduinoJson//issues/284
-#ifndef isinf
-  using namespace std;
-#endif
-
-  return isinf(x);
-}
-
-#if defined(_GLIBCXX_HAVE_ISINFL) && _GLIBCXX_HAVE_ISINFL
-template <>
-inline bool isInfinity<double>(double x) {
-  return isinfl(x);
-}
-#endif
-
-#if defined(_GLIBCXX_HAVE_ISINFF) && _GLIBCXX_HAVE_ISINFF
-template <>
-inline bool isInfinity<float>(float x) {
-  return isinff(x);
-}
-#endif
-
-template <typename T>
-T nan() {
-  return static_cast<T>(NAN);
-}
-
-template <typename T>
-T inf() {
-  return static_cast<T>(INFINITY);
-}
-
-#if defined(__GNUC__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic pop
-#endif
-#endif
-}
-}
-#endif

include/ArduinoJson/Polyfills/normalize.hpp

@@ -1,47 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-namespace ArduinoJson {
-namespace Polyfills {
-
-#ifdef ARDUINO
-
-// on embedded platform, favor code size over speed
-
-template <typename T>
-short normalize(T& value) {
-  short powersOf10 = 0;
-  while (value && value < 1) {
-    powersOf10--;
-    value *= 10;
-  }
-  while (value > 10) {
-    powersOf10++;
-    value /= 10;
-  }
-  return powersOf10;
-}
-
-#else
-
-// on non-embedded platform, favor speed over code size
-
-template <typename T>
-short normalize(T& value) {
-  if (value == 0.0) return 0;
-
-  short powersOf10 = static_cast<short>(floor(log10(value)));
-  value /= pow(T(10), powersOf10);
-
-  return powersOf10;
-}
-
-#endif
-}
-}

include/ArduinoJson/Print.hpp

@@ -1,44 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-#ifndef ARDUINO
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace ArduinoJson {
-// This class reproduces Arduino's Print class
-class Print {
- public:
-  virtual ~Print() {}
-
-  virtual size_t write(uint8_t) = 0;
-
-  size_t print(const char* s) {
-    size_t n = 0;
-    while (*s) {
-      n += write(static_cast<uint8_t>(*s++));
-    }
-    return n;
-  }
-
-  size_t println() {
-    size_t n = 0;
-    n += write('\r');
-    n += write('\n');
-    return n;
-  }
-};
-}
-
-#else
-
-#include <Print.h>
-
-#endif

include/ArduinoJson/Serialization/StaticStringBuilder.hpp

@@ -1,37 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-#include "../Print.hpp"
-
-namespace ArduinoJson {
-namespace Internals {
-
-// A Print implementation that allows to write in a char[]
-class StaticStringBuilder : public Print {
- public:
-  StaticStringBuilder(char *buf, size_t size)
-      : buffer(buf), capacity(size - 1), length(0) {
-    buffer[0] = '\0';
-  }
-
-  virtual size_t write(uint8_t c) {
-    if (length >= capacity) return 0;
-
-    buffer[length++] = c;
-    buffer[length] = '\0';
-    return 1;
-  }
-
- private:
-  char *buffer;
-  size_t capacity;
-  size_t length;
-};
-}
-}

include/ArduinoJson/TypeTraits/FloatTraits.hpp

@@ -1,83 +0,0 @@
-// Copyright Benoit Blanchon 2014-2017
-// MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
-
-#pragma once
-
-#include <stdint.h>
-#include "../Polyfills/math.hpp"
-
-namespace ArduinoJson {
-namespace TypeTraits {
-
-template <typename T, size_t = sizeof(T)>
-struct FloatTraits {};
-
-#ifndef ARDUINO_ARCH_AVR  // double is 32 bits, so 1e64 gives a warning
-template <typename T>
-struct FloatTraits<T, 8 /*64bits*/> {
-  typedef int64_t mantissa_type;
-  static const short mantissa_bits = 52;
-  static const mantissa_type mantissa_max =
-      (static_cast<mantissa_type>(1) << mantissa_bits) - 1;
-
-  typedef int16_t exponent_type;
-  static const exponent_type exponent_max = 308;
-
-  template <typename TExponent>
-  static T make_float(T m, TExponent e) {
-    if (e >= 0)
-      return m * (e & 1 ? 1e1 : 1) * (e & 2 ? 1e2 : 1) * (e & 4 ? 1e4 : 1) *
-             (e & 8 ? 1e8 : 1) * (e & 16 ? 1e16 : 1) * (e & 32 ? 1e32 : 1) *
-             (e & 64 ? 1e64 : 1) * (e & 128 ? 1e128 : 1) *
-             (e & 256 ? 1e256 : 1);
-    e = -e;
-    return m * (e & 1 ? 1e-1 : 1) * (e & 2 ? 1e-2 : 1) * (e & 4 ? 1e-4 : 1) *
-           (e & 8 ? 1e-8 : 1) * (e & 16 ? 1e-16 : 1) * (e & 32 ? 1e-32 : 1) *
-           (e & 64 ? 1e-64 : 1) * (e & 128 ? 1e-128 : 1) *
-           (e & 256 ? 1e-256 : 1);
-  }
-
-  static T nan() {
-    return Polyfills::nan<T>();
-  }
-
-  static T inf() {
-    return Polyfills::inf<T>();
-  }
-};
-#endif
-
-template <typename T>
-struct FloatTraits<T, 4 /*32bits*/> {
-  typedef int32_t mantissa_type;
-  static const short mantissa_bits = 23;
-  static const mantissa_type mantissa_max =
-      (static_cast<mantissa_type>(1) << mantissa_bits) - 1;
-
-  typedef int8_t exponent_type;
-  static const exponent_type exponent_max = 38;
-
-  template <typename TExponent>
-  static T make_float(T m, TExponent e) {
-    if (e > 0)
-      return m * (e & 1 ? 1e1f : 1) * (e & 2 ? 1e2f : 1) * (e & 4 ? 1e4f : 1) *
-             (e & 8 ? 1e8f : 1) * (e & 16 ? 1e16f : 1) * (e & 32 ? 1e32f : 1);
-    e = -e;
-    return m * (e & 1 ? 1e-1f : 1) * (e & 2 ? 1e-2f : 1) * (e & 4 ? 1e-4f : 1) *
-           (e & 8 ? 1e-8f : 1) * (e & 16 ? 1e-16f : 1) * (e & 32 ? 1e-32f : 1);
-  }
-
-  static T nan() {
-    return Polyfills::nan<T>();
-  }
-
-  static T inf() {
-    return Polyfills::inf<T>();
-  }
-};
-}
-}

library.json

@@ -6,14 +6,14 @@
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "5.8.4",
+  "version": "5.11.2",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"
   },
   "exclude": [
+    "fuzzing",
     "scripts",
-    "src/ArduinoJson.h",
     "test",
     "third-party"
   ],

library.properties

@@ -1,5 +1,5 @@
 name=ArduinoJson
-version=5.8.4
+version=5.11.2
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=An efficient and elegant JSON library for Arduino.

scripts/build-arduino-package.sh

@@ -12,7 +12,7 @@ rm -f $OUTPUT
 7z a $OUTPUT \
 	ArduinoJson/CHANGELOG.md \
 	ArduinoJson/examples \
-	ArduinoJson/include \
+	ArduinoJson/src \
 	ArduinoJson/keywords.txt \
 	ArduinoJson/library.properties \
 	ArduinoJson/LICENSE.md \

scripts/build-single-header.sh

@@ -39,6 +39,15 @@ process()
 
 cd $(dirname $0)/../
 INCLUDED=()
-process include/ArduinoJson.h true > ../ArduinoJson-$TAG.h
+process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
+g++ -x c++ -c -o ../smoketest.o - <<END
+#include "../ArduinoJson-$TAG.h"
+int main() {}
+END
+
 INCLUDED=()
-process include/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
+process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
+g++ -x c++ -c -o ../smoketest.o - <<END
+#include "../ArduinoJson-$TAG.hpp"
+int main() {}
+END

scripts/cpplint.sh

@@ -1,5 +0,0 @@
-CPPLINT="python third-party/cpplint/cpplint.py"
-FLAGS="--filter=-runtime/printf,-runtime/int,-readability/todo,-build/namespace,-runtime/references,-readability/streams"
-
-cd ..
-$CPPLINT $FLAGS $(find include src test -regex ".*\.[hc]pp$")

scripts/format-code.sh

@@ -1,7 +0,0 @@
-cd ..
-FILES=$(find include src test -regex ".*\.[ch]pp$")
-
-clang-format -style=Google -i  $FILES
-
-# insert newline at end of file
-sed -i -e '$a\' $FILES

scripts/run-tests.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-FILE=../bin/ArduinoJsonTests.exe
-MD5=""
-
-file_changed() {
-	[[ ! -f  "$FILE" ]] && return 1
-	NEW_MD5=$(md5sum $FILE)
-	[[ "$MD5" == "$NEW_MD5" ]] && return 1
-	MD5=$NEW_MD5
-	return 0
-}
-
-test_succeed() {
-	echo -en "\007"{,}
-}
-
-test_failed() {
-	echo -en "\007"{,,,,,,,,,,,}
-}
-
-run_tests() {
-	$FILE
-	case $? in
-	0)
-		test_succeed
-		;;
-	1)	
-		test_failed
-		;;
-	esac
-}
-
-while true
-do
-	if file_changed
-	then	
-		run_tests
-	else
-		sleep 2
-	fi
-done
-
-

scripts/travis/cmake.sh

@@ -27,4 +27,4 @@ fi
 
 $CMAKE .
 $CMAKE --build .
-$CTEST -VV .
+$CTEST --output-on-failure .

src/ArduinoJson.hpp

@@ -10,7 +10,6 @@
 #include "ArduinoJson/DynamicJsonBuffer.hpp"
 #include "ArduinoJson/JsonArray.hpp"
 #include "ArduinoJson/JsonObject.hpp"
-#include "ArduinoJson/JsonVariantComparisons.hpp"
 #include "ArduinoJson/StaticJsonBuffer.hpp"
 
 #include "ArduinoJson/Deserialization/JsonParserImpl.hpp"

src/ArduinoJson/Configuration.hpp

@@ -7,19 +7,23 @@
 
 #pragma once
 
-// enable deprecated functions by default
-#ifndef ARDUINOJSON_ENABLE_DEPRECATED
-#define ARDUINOJSON_ENABLE_DEPRECATED 1
+// Small or big machine?
+#ifndef ARDUINOJSON_EMBEDDED_MODE
+#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__)
+#define ARDUINOJSON_EMBEDDED_MODE 1
+#else
+#define ARDUINOJSON_EMBEDDED_MODE 0
+#endif
 #endif
 
-#ifdef ARDUINO  // assume this is an embedded platform
+#if ARDUINOJSON_EMBEDDED_MODE
 
-// store using float instead of double to reduce the memory usage (issue #134)
+// Store floats by default to reduce the memory usage (issue #134)
 #ifndef ARDUINOJSON_USE_DOUBLE
 #define ARDUINOJSON_USE_DOUBLE 0
 #endif
 
-// store using a long because it usually match the size of a float.
+// Store longs by default, because they usually match the size of a float.
 #ifndef ARDUINOJSON_USE_LONG_LONG
 #define ARDUINOJSON_USE_LONG_LONG 0
 #endif
@@ -27,57 +31,29 @@
 #define ARDUINOJSON_USE_INT64 0
 #endif
 
-// Arduino has its own implementation of String to replace std::string
-#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
-#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
-#define ARDUINOJSON_ENABLE_PROGMEM 1
-#else
-#define ARDUINOJSON_ENABLE_PROGMEM 0
-#endif
-#endif
-
-// Arduino doesn't have std::string
+// Embedded systems usually don't have std::string
 #ifndef ARDUINOJSON_ENABLE_STD_STRING
 #define ARDUINOJSON_ENABLE_STD_STRING 0
 #endif
 
-// Arduino doesn't support STL stream
+// Embedded systems usually don't have std::stream
 #ifndef ARDUINOJSON_ENABLE_STD_STREAM
 #define ARDUINOJSON_ENABLE_STD_STREAM 0
 #endif
 
-#ifndef ARDUINOJSON_ENABLE_ALIGNMENT
-#ifdef ARDUINO_ARCH_AVR
-// alignment isn't needed for 8-bit AVR
-#define ARDUINOJSON_ENABLE_ALIGNMENT 0
-#else
-// but must processor needs pointer to be align on word size
-#define ARDUINOJSON_ENABLE_ALIGNMENT 1
-#endif
-#endif
-
-// low value to prevent stack overflow
+// Limit nesting as the stack is likely to be small
 #ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
 #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10
 #endif
 
-#else  // assume this is a computer
+#else  // ARDUINOJSON_EMBEDDED_MODE
 
-// on a computer we have plenty of memory so we can use doubles
+// On a computer we have plenty of memory so we can use doubles
 #ifndef ARDUINOJSON_USE_DOUBLE
 #define ARDUINOJSON_USE_DOUBLE 1
 #endif
 
-// use long long when available
+// Use long long when available
 #ifndef ARDUINOJSON_USE_LONG_LONG
 #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800)
 #define ARDUINOJSON_USE_LONG_LONG 1
@@ -86,7 +62,7 @@
 #endif
 #endif
 
-// use _int64 on old versions of Visual Studio
+// Use _int64 on old versions of Visual Studio
 #ifndef ARDUINOJSON_USE_INT64
 #if defined(_MSC_VER) && _MSC_VER <= 1700
 #define ARDUINOJSON_USE_INT64 1
@@ -95,41 +71,81 @@
 #endif
 #endif
 
-// on a computer, we can use std::string
+// On a computer, we can use std::string
 #ifndef ARDUINOJSON_ENABLE_STD_STRING
 #define ARDUINOJSON_ENABLE_STD_STRING 1
 #endif
 
-// on a computer, there is no reason to beleive Arduino String is available
-#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
-#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
-#endif
-
-// PROGMEM is only available on AVR architecture
-#ifndef ARDUINOJSON_ENABLE_PROGMEM
-#define ARDUINOJSON_ENABLE_PROGMEM 0
-#endif
-
-// on a computer, we can assume that the STL is there
+// On a computer, we can assume std::stream
 #ifndef ARDUINOJSON_ENABLE_STD_STREAM
 #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
-#endif
-
-// on a computer, we should have a lot of space on the stack
+// On a computer, the stack is large so we can increase nesting limit
 #ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
 #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 50
 #endif
 
+#endif  // ARDUINOJSON_EMBEDDED_MODE
+
+#ifdef ARDUINO
+
+// Enable support for Arduino String
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
+#endif
+
+// Enable support for Arduino Stream
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
+#endif
+
+#else  // ARDUINO
+
+// Disable support for Arduino String
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
+#endif
+
+// Disable support for Arduino Stream
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 0
+#endif
+
+#endif  // ARDUINO
+
+#ifndef ARDUINOJSON_ENABLE_PROGMEM
+#ifdef PROGMEM
+#define ARDUINOJSON_ENABLE_PROGMEM 1
+#else
+#define ARDUINOJSON_ENABLE_PROGMEM 0
+#endif
+#endif
+
+#ifndef ARDUINOJSON_ENABLE_ALIGNMENT
+#ifdef ARDUINO_ARCH_AVR
+// alignment isn't needed for 8-bit AVR
+#define ARDUINOJSON_ENABLE_ALIGNMENT 0
+#else
+// but most processors need pointers to be align on word size
+#define ARDUINOJSON_ENABLE_ALIGNMENT 1
+#endif
+#endif
+
+// Enable deprecated functions by default
+#ifndef ARDUINOJSON_ENABLE_DEPRECATED
+#define ARDUINOJSON_ENABLE_DEPRECATED 1
+#endif
+
+// Control the exponentiation threshold for big numbers
+// CAUTION: cannot be more that 1e9 !!!!
+#ifndef ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD
+#define ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD 1e7
+#endif
+
+// Control the exponentiation threshold for small numbers
+#ifndef ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD
+#define ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD 1e-5
 #endif
 
 #if ARDUINOJSON_USE_LONG_LONG && ARDUINOJSON_USE_INT64

src/ArduinoJson/Data/Encoding.hpp

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

src/ArduinoJson/Data/JsonBufferAllocated.hpp

@@ -19,7 +19,7 @@ class JsonBufferAllocated {
     return jsonBuffer->alloc(n);
   }
 
-  void operator delete(void *, JsonBuffer *)throw() {}
+  void operator delete(void *, JsonBuffer *)throw();
 };
 }
 }

src/ArduinoJson/Data/JsonVariantType.hpp

@@ -20,20 +20,11 @@ enum JsonVariantType {
   JSON_UNPARSED,          // JsonVariant contains an unparsed string
   JSON_STRING,            // JsonVariant stores a const char*
   JSON_BOOLEAN,           // JsonVariant stores a bool
-  JSON_POSITIVE_INTEGER,  // JsonVariant stores an unsigned long
-  JSON_NEGATIVE_INTEGER,  // JsonVariant stores an unsigned long that must be
-                          // negated
+  JSON_POSITIVE_INTEGER,  // JsonVariant stores an JsonUInt
+  JSON_NEGATIVE_INTEGER,  // JsonVariant stores an JsonUInt that must be negated
   JSON_ARRAY,             // JsonVariant stores a pointer to a JsonArray
   JSON_OBJECT,            // JsonVariant stores a pointer to a JsonObject
-
-  // The following values are reserved for float values
-  // Multiple values are used for double, depending on the number of decimal
-  // digits that must be printed in the JSON output.
-  // This little trick allow to save one extra member in JsonVariant
-  JSON_FLOAT_0_DECIMALS
-  // JSON_FLOAT_1_DECIMAL
-  // JSON_FLOAT_2_DECIMALS
-  // ...
+  JSON_FLOAT              // JsonVariant stores a JsonFloat
 };
 }
 }

src/ArduinoJson/Data/List.hpp

@@ -48,6 +48,20 @@ class List {
     return nodeCount;
   }
 
+  iterator add() {
+    node_type *newNode = new (_buffer) node_type();
+
+    if (_firstNode) {
+      node_type *lastNode = _firstNode;
+      while (lastNode->next) lastNode = lastNode->next;
+      lastNode->next = newNode;
+    } else {
+      _firstNode = newNode;
+    }
+
+    return iterator(newNode);
+  }
+
   iterator begin() {
     return iterator(_firstNode);
   }
@@ -62,22 +76,8 @@ class List {
     return const_iterator(NULL);
   }
 
- protected:
-  node_type *addNewNode() {
-    node_type *newNode = new (_buffer) node_type();
-
-    if (_firstNode) {
-      node_type *lastNode = _firstNode;
-      while (lastNode->next) lastNode = lastNode->next;
-      lastNode->next = newNode;
-    } else {
-      _firstNode = newNode;
-    }
-
-    return newNode;
-  }
-
-  void removeNode(node_type *nodeToRemove) {
+  void remove(iterator it) {
+    node_type *nodeToRemove = it._node;
     if (!nodeToRemove) return;
     if (nodeToRemove == _firstNode) {
       _firstNode = nodeToRemove->next;
@@ -87,7 +87,10 @@ class List {
     }
   }
 
+ protected:
   JsonBuffer *_buffer;
+
+ private:
   node_type *_firstNode;
 };
 }

src/ArduinoJson/Data/ListConstIterator.hpp

@@ -38,6 +38,14 @@ class ListConstIterator {
     return *this;
   }
 
+  ListConstIterator<T> &operator+=(size_t distance) {
+    while (_node && distance) {
+      _node = _node->next;
+      --distance;
+    }
+    return *this;
+  }
+
  private:
   const ListNode<T> *_node;
 };

src/ArduinoJson/Data/ListIterator.hpp

@@ -13,9 +13,14 @@
 namespace ArduinoJson {
 namespace Internals {
 
+template <typename T>
+class List;
+
 // A read-write forward iterator for List<T>
 template <typename T>
 class ListIterator {
+  friend class List<T>;
+
  public:
   explicit ListIterator(ListNode<T> *node = NULL) : _node(node) {}
 
@@ -39,6 +44,14 @@ class ListIterator {
     return *this;
   }
 
+  ListIterator<T> &operator+=(size_t distance) {
+    while (_node && distance) {
+      _node = _node->next;
+      --distance;
+    }
+    return *this;
+  }
+
   operator ListConstIterator<T>() const {
     return ListConstIterator<T>(_node);
   }

src/ArduinoJson/Data/ListNode.hpp

@@ -18,7 +18,7 @@ namespace Internals {
 // Used by List<T> and its iterators.
 template <typename T>
 struct ListNode : public Internals::JsonBufferAllocated {
-  ListNode() : next(NULL) {}
+  ListNode() throw() : next(NULL) {}
 
   ListNode<T> *next;
   T content;

src/ArduinoJson/Data/NonCopyable.hpp

@@ -0,0 +1,26 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+namespace ArduinoJson {
+namespace Internals {
+
+// A type that cannot be copied
+class NonCopyable {
+ protected:
+  NonCopyable() {}
+
+ private:
+  // copy constructor is private
+  NonCopyable(const NonCopyable&);
+
+  // copy operator is private
+  NonCopyable& operator=(const NonCopyable&);
+};
+}
+}

src/ArduinoJson/Data/ReferenceType.hpp

@@ -22,16 +22,6 @@ class ReferenceType {
   bool operator!=(const ReferenceType& other) const {
     return this != &other;
   }
-
- protected:
-  ReferenceType() {}
-
- private:
-  // copy constructor is private
-  ReferenceType(const ReferenceType&);
-
-  // copy operator is private
-  ReferenceType& operator=(const ReferenceType&);
 };
 }
 }

src/ArduinoJson/Data/ValueSetter.hpp

@@ -15,22 +15,21 @@
 namespace ArduinoJson {
 namespace Internals {
 
-template <typename TSource, typename Enable = void>
+template <typename TSourceRef, typename Enable = void>
 struct ValueSetter {
   template <typename TDestination>
-  static bool set(JsonBuffer*, TDestination& destination,
-                  const TSource& source) {
+  static bool set(JsonBuffer*, TDestination& destination, TSourceRef source) {
     destination = source;
     return true;
   }
 };
 
-template <typename TSource>
-struct ValueSetter<TSource, typename TypeTraits::EnableIf<StringTraits<
-                                TSource>::should_duplicate>::type> {
+template <typename TSourceRef>
+struct ValueSetter<TSourceRef, typename TypeTraits::EnableIf<StringTraits<
+                                   TSourceRef>::should_duplicate>::type> {
   template <typename TDestination>
   static bool set(JsonBuffer* buffer, TDestination& destination,
-                  const TSource& source) {
+                  TSourceRef source) {
     const char* copy = buffer->strdup(source);
     if (!copy) return false;
     destination = copy;
@@ -38,12 +37,11 @@ struct ValueSetter<TSource, typename TypeTraits::EnableIf<StringTraits<
   }
 };
 
-template <typename TSource>
-struct ValueSetter<TSource, typename TypeTraits::EnableIf<!StringTraits<
-                                TSource>::should_duplicate>::type> {
+template <typename TSourceRef>
+struct ValueSetter<TSourceRef, typename TypeTraits::EnableIf<!StringTraits<
+                                   TSourceRef>::should_duplicate>::type> {
   template <typename TDestination>
-  static bool set(JsonBuffer*, TDestination& destination,
-                  const TSource& source) {
+  static bool set(JsonBuffer*, TDestination& destination, TSourceRef source) {
     // unsigned char* -> char*
     destination = reinterpret_cast<const char*>(source);
     return true;

src/ArduinoJson/Deserialization/JsonParserImpl.hpp

@@ -20,9 +20,8 @@ inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::eat(
 }
 
 template <typename TReader, typename TWriter>
-inline bool
-ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingTo(
-    JsonVariant *destination) {
+inline bool ArduinoJson::Internals::JsonParser<
+    TReader, TWriter>::parseAnythingTo(JsonVariant *destination) {
   if (_nestingLimit == 0) return false;
   _nestingLimit--;
   bool success = parseAnythingToUnsafe(destination);
@@ -31,9 +30,8 @@ ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingTo(
 }
 
 template <typename TReader, typename TWriter>
-inline bool
-ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingToUnsafe(
-    JsonVariant *destination) {
+inline bool ArduinoJson::Internals::JsonParser<
+    TReader, TWriter>::parseAnythingToUnsafe(JsonVariant *destination) {
   skipSpacesAndComments(_reader);
 
   switch (_reader.current()) {

src/ArduinoJson/Deserialization/StringWriter.hpp

@@ -17,8 +17,8 @@ class StringWriter {
    public:
     String(TChar** ptr) : _writePtr(ptr), _startPtr(*ptr) {}
 
-    void append(TChar c) {
-      *(*_writePtr)++ = c;
+    void append(char c) {
+      *(*_writePtr)++ = TChar(c);
     }
 
     const char* c_str() const {

src/ArduinoJson/DynamicJsonBuffer.hpp

@@ -46,30 +46,41 @@ class DynamicJsonBufferBase
   };
 
  public:
+  enum { EmptyBlockSize = sizeof(EmptyBlock) };
+
   DynamicJsonBufferBase(size_t initialSize = 256)
       : _head(NULL), _nextBlockCapacity(initialSize) {}
 
   ~DynamicJsonBufferBase() {
-    Block* currentBlock = _head;
-
-    while (currentBlock != NULL) {
-      Block* nextBlock = currentBlock->next;
-      _allocator.deallocate(currentBlock);
-      currentBlock = nextBlock;
-    }
+    clear();
   }
 
+  // Gets the number of bytes occupied in the buffer
   size_t size() const {
     size_t total = 0;
     for (const Block* b = _head; b; b = b->next) total += b->size;
     return total;
   }
 
+  // Allocates the specified amount of bytes in the buffer
   virtual void* alloc(size_t bytes) {
     alignNextAlloc();
     return canAllocInHead(bytes) ? allocInHead(bytes) : allocInNewBlock(bytes);
   }
 
+  // Resets the buffer.
+  // USE WITH CAUTION: this invalidates all previously allocated data
+  void clear() {
+    Block* currentBlock = _head;
+    while (currentBlock != NULL) {
+      _nextBlockCapacity = currentBlock->capacity;
+      Block* nextBlock = currentBlock->next;
+      _allocator.deallocate(currentBlock);
+      currentBlock = nextBlock;
+    }
+    _head = 0;
+  }
+
   class String {
    public:
     String(DynamicJsonBufferBase* parent)
@@ -98,7 +109,7 @@ class DynamicJsonBufferBase
    private:
     DynamicJsonBufferBase* _parent;
     char* _start;
-    int _length;
+    size_t _length;
   };
 
   String startString() {
@@ -129,7 +140,7 @@ class DynamicJsonBufferBase
   }
 
   bool addNewBlock(size_t capacity) {
-    size_t bytes = sizeof(EmptyBlock) + capacity;
+    size_t bytes = EmptyBlockSize + capacity;
     Block* block = static_cast<Block*>(_allocator.allocate(bytes));
     if (block == NULL) return false;
     block->capacity = capacity;

src/ArduinoJson/JsonArray.hpp

@@ -39,13 +39,14 @@ class JsonArraySubscript;
 // It can also be deserialized from a JSON string via JsonBuffer::parseArray().
 class JsonArray : public Internals::JsonPrintable<JsonArray>,
                   public Internals::ReferenceType,
+                  public Internals::NonCopyable,
                   public Internals::List<JsonVariant>,
                   public Internals::JsonBufferAllocated {
  public:
   // Create an empty JsonArray attached to the specified JsonBuffer.
   // You should not call this constructor directly.
   // Instead, use JsonBuffer::createArray() or JsonBuffer::parseArray().
-  explicit JsonArray(JsonBuffer *buffer)
+  explicit JsonArray(JsonBuffer *buffer) throw()
       : Internals::List<JsonVariant>(buffer) {}
 
   // Gets the value at the specified index
@@ -76,8 +77,9 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
   // bool add(TValue value, uint8_t decimals);
   // TValue = float, double
   template <typename T>
-  bool add(T value, uint8_t decimals) {
-    return add_impl<const JsonVariant &>(JsonVariant(value, decimals));
+  DEPRECATED("Second argument is not supported anymore")
+  bool add(T value, uint8_t) {
+    return add_impl<const JsonVariant &>(JsonVariant(value));
   }
 
   // Sets the value at specified index.
@@ -111,16 +113,15 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
   // Gets the value at the specified index.
   template <typename T>
   typename Internals::JsonVariantAs<T>::type get(size_t index) const {
-    node_type *node = findNode(index);
-    return node ? node->content.as<T>()
-                : Internals::JsonVariantDefault<T>::get();
+    const_iterator it = begin() += index;
+    return it != end() ? it->as<T>() : Internals::JsonVariantDefault<T>::get();
   }
 
   // Check the type of the value at specified index.
   template <typename T>
   bool is(size_t index) const {
-    node_type *node = findNode(index);
-    return node ? node->content.is<T>() : false;
+    const_iterator it = begin() += index;
+    return it != end() ? it->is<T>() : false;
   }
 
   // Creates a JsonArray and adds a reference at the end of the array.
@@ -132,9 +133,10 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
   JsonObject &createNestedObject();
 
   // Removes element at specified index.
-  void removeAt(size_t index) {
-    removeNode(findNode(index));
+  void remove(size_t index) {
+    remove(begin() += index);
   }
+  using Internals::List<JsonVariant>::remove;
 
   // Returns a reference an invalid JsonArray.
   // This object is meant to replace a NULL pointer.
@@ -197,29 +199,26 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
     }
   }
 
- private:
-  node_type *findNode(size_t index) const {
-    node_type *node = _firstNode;
-    while (node && index--) node = node->next;
-    return node;
+#if ARDUINOJSON_ENABLE_DEPRECATED
+  DEPRECATED("use remove() instead")
+  FORCE_INLINE void removeAt(size_t index) {
+    return remove(index);
   }
+#endif
 
+ private:
   template <typename TValueRef>
   bool set_impl(size_t index, TValueRef value) {
-    node_type *node = findNode(index);
-    if (!node) return false;
-
-    return Internals::ValueSetter<TValueRef>::set(_buffer, node->content,
-                                                  value);
+    iterator it = begin() += index;
+    if (it == end()) return false;
+    return Internals::ValueSetter<TValueRef>::set(_buffer, *it, value);
   }
 
   template <typename TValueRef>
   bool add_impl(TValueRef value) {
-    node_type *node = addNewNode();
-    if (!node) return false;
-
-    return Internals::ValueSetter<TValueRef>::set(_buffer, node->content,
-                                                  value);
+    iterator it = Internals::List<JsonVariant>::add();
+    if (it == end()) return false;
+    return Internals::ValueSetter<TValueRef>::set(_buffer, *it, value);
   }
 };
 

src/ArduinoJson/JsonArraySubscript.hpp

@@ -81,8 +81,9 @@ class JsonArraySubscript : public JsonVariantBase<JsonArraySubscript> {
   // bool set(TValue, uint8_t decimals);
   // TValue = float, double
   template <typename TValue>
-  FORCE_INLINE bool set(const TValue& value, uint8_t decimals) {
-    return _array.set(_index, value, decimals);
+  DEPRECATED("Second argument is not supported anymore")
+  FORCE_INLINE bool set(const TValue& value, uint8_t) {
+    return _array.set(_index, value);
   }
 
  private:
@@ -105,15 +106,16 @@ inline const JsonArraySubscript JsonArray::operator[](size_t index) const {
   return JsonArraySubscript(*const_cast<JsonArray*>(this), index);
 }
 
-template <typename TImplem>
-inline JsonArraySubscript JsonVariantBase<TImplem>::operator[](int index) {
-  return as<JsonArray>()[index];
+template <typename TImpl>
+inline JsonArraySubscript JsonVariantSubscripts<TImpl>::operator[](
+    size_t index) {
+  return impl()->template as<JsonArray>()[index];
 }
 
-template <typename TImplem>
-inline const JsonArraySubscript JsonVariantBase<TImplem>::operator[](
-    int index) const {
-  return as<JsonArray>()[index];
+template <typename TImpl>
+inline const JsonArraySubscript JsonVariantSubscripts<TImpl>::operator[](
+    size_t index) const {
+  return impl()->template as<JsonArray>()[index];
 }
 
 }  // namespace ArduinoJson

src/ArduinoJson/JsonBuffer.hpp

@@ -11,20 +11,11 @@
 #include <stdint.h>  // for uint8_t
 #include <string.h>
 
+#include "Data/NonCopyable.hpp"
 #include "JsonVariant.hpp"
 #include "TypeTraits/EnableIf.hpp"
 #include "TypeTraits/IsArray.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif defined(__GNUC__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
 namespace ArduinoJson {
 class JsonArray;
 class JsonObject;
@@ -34,13 +25,8 @@ class JsonObject;
 // Handle the memory management (done in derived classes) and calls the parser.
 // This abstract class is implemented by StaticJsonBuffer which implements a
 // fixed memory allocation.
-class JsonBuffer {
+class JsonBuffer : Internals::NonCopyable {
  public:
-  // CAUTION: NO VIRTUAL DESTRUCTOR!
-  // If we add a virtual constructor the Arduino compiler will add malloc() and
-  // free() to the binary, adding 706 useless bytes.
-  // virtual ~JsonBuffer() {}
-
   // Allocates an empty JsonArray.
   //
   // Returns a reference to the new JsonArray or JsonArray::invalid() if the
@@ -76,6 +62,11 @@ class JsonBuffer {
   virtual void *alloc(size_t size) = 0;
 
  protected:
+  // CAUTION: NO VIRTUAL DESTRUCTOR!
+  // If we add a virtual constructor the Arduino compiler will add malloc()
+  // and free() to the binary, adding 706 useless bytes.
+  ~JsonBuffer() {}
+
   // Preserve aligment if necessary
   static FORCE_INLINE size_t round_size_up(size_t bytes) {
 #if ARDUINOJSON_ENABLE_ALIGNMENT
@@ -87,11 +78,3 @@ class JsonBuffer {
   }
 };
 }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic pop
-#endif
-#endif

src/ArduinoJson/JsonBufferBase.hpp

@@ -9,16 +9,6 @@
 
 #include "Deserialization/JsonParser.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif defined(__GNUC__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
 namespace ArduinoJson {
 template <typename TDerived>
 class JsonBufferBase : public JsonBuffer {
@@ -127,17 +117,12 @@ class JsonBufferBase : public JsonBuffer {
     return Internals::makeParser(that(), json, nestingLimit).parseVariant();
   }
 
+ protected:
+  ~JsonBufferBase() {}
+
  private:
   TDerived *that() {
     return static_cast<TDerived *>(this);
   }
 };
 }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic pop
-#endif
-#endif

src/ArduinoJson/JsonObject.hpp

@@ -38,13 +38,15 @@ class JsonBuffer;
 // It can also be deserialized from a JSON string via JsonBuffer::parseObject().
 class JsonObject : public Internals::JsonPrintable<JsonObject>,
                    public Internals::ReferenceType,
+                   public Internals::NonCopyable,
                    public Internals::List<JsonPair>,
                    public Internals::JsonBufferAllocated {
  public:
   // Create an empty JsonArray attached to the specified JsonBuffer.
   // You should not use this constructor directly.
   // Instead, use JsonBuffer::createObject() or JsonBuffer.parseObject().
-  explicit JsonObject(JsonBuffer* buffer) : Internals::List<JsonPair>(buffer) {}
+  explicit JsonObject(JsonBuffer* buffer) throw() 
+    : Internals::List<JsonPair>(buffer) {}
 
   // Gets or sets the value associated with the specified key.
   //
@@ -134,23 +136,25 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
   // TKey = const std::string&, const String&
   // TValue = float, double
   template <typename TValue, typename TString>
+  DEPRECATED("Second argument is not supported anymore")
   typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<TValue>::value &&
                                     !TypeTraits::IsArray<TString>::value,
                                 bool>::type
-  set(const TString& key, TValue value, uint8_t decimals) {
-    return set_impl<const TString&, const JsonVariant&>(
-        key, JsonVariant(value, decimals));
+      set(const TString& key, TValue value, uint8_t) {
+    return set_impl<const TString&, const JsonVariant&>(key,
+                                                        JsonVariant(value));
   }
   //
   // bool set(TKey, TValue, uint8_t decimals);
   // TKey = const char*, const char[N], const FlashStringHelper*
   // TValue = float, double
   template <typename TValue, typename TString>
+  DEPRECATED("Second argument is not supported anymore")
   typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<TValue>::value,
                                 bool>::type
-  set(const TString* key, TValue value, uint8_t decimals) {
-    return set_impl<const TString*, const JsonVariant&>(
-        key, JsonVariant(value, decimals));
+      set(const TString* key, TValue value, uint8_t) {
+    return set_impl<const TString*, const JsonVariant&>(key,
+                                                        JsonVariant(value));
   }
 
   // Gets the value associated with the specified key.
@@ -247,14 +251,14 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
   typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
                                 bool>::type
   containsKey(const TString& key) const {
-    return findNode<const TString&>(key) != NULL;
+    return findKey<const TString&>(key) != end();
   }
   //
   // bool containsKey(TKey);
   // TKey = const char*, const char[N], const FlashStringHelper*
   template <typename TString>
   bool containsKey(const TString* key) const {
-    return findNode<const TString*>(key) != NULL;
+    return findKey<const TString*>(key) != end();
   }
 
   // Removes the specified key and the associated value.
@@ -265,15 +269,18 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
   typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
                                 void>::type
   remove(const TString& key) {
-    removeNode(findNode<const TString&>(key));
+    remove(findKey<const TString&>(key));
   }
   //
   // void remove(TKey);
   // TKey = const char*, const char[N], const FlashStringHelper*
   template <typename TString>
   void remove(const TString* key) {
-    removeNode(findNode<const TString*>(key));
+    remove(findKey<const TString*>(key));
   }
+  //
+  // void remove(iterator)
+  using Internals::List<JsonPair>::remove;
 
   // Returns a reference an invalid JsonObject.
   // This object is meant to replace a NULL pointer.
@@ -286,41 +293,44 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
  private:
   // Returns the list node that matches the specified key.
   template <typename TStringRef>
-  node_type* findNode(TStringRef key) const {
-    for (node_type* node = _firstNode; node; node = node->next) {
-      if (Internals::StringTraits<TStringRef>::equals(key, node->content.key))
-        return node;
+  iterator findKey(TStringRef key) {
+    iterator it;
+    for (it = begin(); it != end(); ++it) {
+      if (Internals::StringTraits<TStringRef>::equals(key, it->key)) break;
     }
-    return NULL;
+    return it;
+  }
+  template <typename TStringRef>
+  const_iterator findKey(TStringRef key) const {
+    return const_cast<JsonObject*>(this)->findKey<TStringRef>(key);
   }
 
   template <typename TStringRef, typename TValue>
   typename Internals::JsonVariantAs<TValue>::type get_impl(
       TStringRef key) const {
-    node_type* node = findNode<TStringRef>(key);
-    return node ? node->content.value.as<TValue>()
-                : Internals::JsonVariantDefault<TValue>::get();
+    const_iterator it = findKey<TStringRef>(key);
+    return it != end() ? it->value.as<TValue>()
+                       : Internals::JsonVariantDefault<TValue>::get();
   }
 
   template <typename TStringRef, typename TValueRef>
   bool set_impl(TStringRef key, TValueRef value) {
-    node_type* node = findNode<TStringRef>(key);
-    if (!node) {
-      node = addNewNode();
-      if (!node) return false;
+    iterator it = findKey<TStringRef>(key);
+    if (it == end()) {
+      it = Internals::List<JsonPair>::add();
+      if (it == end()) return false;
 
-      bool key_ok = Internals::ValueSetter<TStringRef>::set(
-          _buffer, node->content.key, key);
+      bool key_ok =
+          Internals::ValueSetter<TStringRef>::set(_buffer, it->key, key);
       if (!key_ok) return false;
     }
-    return Internals::ValueSetter<TValueRef>::set(_buffer, node->content.value,
-                                                  value);
+    return Internals::ValueSetter<TValueRef>::set(_buffer, it->value, value);
   }
 
   template <typename TStringRef, typename TValue>
   bool is_impl(TStringRef key) const {
-    node_type* node = findNode<TStringRef>(key);
-    return node ? node->content.value.is<TValue>() : false;
+    const_iterator it = findKey<TStringRef>(key);
+    return it != end() ? it->value.is<TValue>() : false;
   }
 
   template <typename TStringRef>

src/ArduinoJson/JsonObjectSubscript.hpp

@@ -93,8 +93,9 @@ class JsonObjectSubscript
   // bool set(TValue, uint8_t decimals);
   // TValue = float, double
   template <typename TValue>
-  FORCE_INLINE bool set(const TValue& value, uint8_t decimals) {
-    return _object.set(_key, value, decimals);
+  DEPRECATED("Second argument is not supported anymore")
+  FORCE_INLINE bool set(const TValue& value, uint8_t) {
+    return _object.set(_key, value);
   }
 
  private:

src/ArduinoJson/JsonVariant.hpp

@@ -40,8 +40,8 @@ class JsonObject;
 // - a string (const char*)
 // - a reference to a JsonArray or JsonObject
 class JsonVariant : public JsonVariantBase<JsonVariant> {
-  friend void Internals::JsonSerializer::serialize(const JsonVariant &,
-                                                   JsonWriter &);
+  template <typename Print>
+  friend class Internals::JsonSerializer;
 
  public:
   // Creates an uninitialized JsonVariant
@@ -52,20 +52,26 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
   JsonVariant(bool value) {
     using namespace Internals;
     _type = JSON_BOOLEAN;
-    _content.asInteger = static_cast<JsonInteger>(value);
+    _content.asInteger = static_cast<JsonUInt>(value);
   }
 
   // Create a JsonVariant containing a floating point value.
-  // The second argument specifies the number of decimal digits to write in
-  // the JSON string.
-  // JsonVariant(double value, uint8_t decimals);
-  // JsonVariant(float value, uint8_t decimals);
+  // JsonVariant(double value);
+  // JsonVariant(float value);
   template <typename T>
-  JsonVariant(T value, uint8_t decimals = 2,
+  JsonVariant(T value, typename TypeTraits::EnableIf<
+                           TypeTraits::IsFloatingPoint<T>::value>::type * = 0) {
+    using namespace Internals;
+    _type = JSON_FLOAT;
+    _content.asFloat = static_cast<JsonFloat>(value);
+  }
+  template <typename T>
+  DEPRECATED("Second argument is not supported anymore")
+  JsonVariant(T value, uint8_t,
               typename TypeTraits::EnableIf<
                   TypeTraits::IsFloatingPoint<T>::value>::type * = 0) {
     using namespace Internals;
-    _type = static_cast<JsonVariantType>(JSON_FLOAT_0_DECIMALS + decimals);
+    _type = JSON_FLOAT;
     _content.asFloat = static_cast<JsonFloat>(value);
   }
 
@@ -342,11 +348,13 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
   Internals::JsonVariantContent _content;
 };
 
-inline JsonVariant float_with_n_digits(float value, uint8_t digits) {
-  return JsonVariant(value, digits);
+DEPRECATED("Decimal places are ignored, use the float value instead")
+inline JsonVariant float_with_n_digits(float value, uint8_t) {
+  return JsonVariant(value);
 }
 
-inline JsonVariant double_with_n_digits(double value, uint8_t digits) {
-  return JsonVariant(value, digits);
+DEPRECATED("Decimal places are ignored, use the double value instead")
+inline JsonVariant double_with_n_digits(double value, uint8_t) {
+  return JsonVariant(value);
 }
 }

src/ArduinoJson/JsonVariantBase.hpp

@@ -0,0 +1,23 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+#include "JsonVariantCasts.hpp"
+#include "JsonVariantComparisons.hpp"
+#include "JsonVariantSubscripts.hpp"
+#include "Serialization/JsonPrintable.hpp"
+
+namespace ArduinoJson {
+
+template <typename TImpl>
+class JsonVariantBase : public Internals::JsonPrintable<TImpl>,
+                        public JsonVariantCasts<TImpl>,
+                        public JsonVariantComparisons<TImpl>,
+                        public JsonVariantSubscripts<TImpl>,
+                        public TypeTraits::JsonVariantTag {};
+}

src/ArduinoJson/JsonVariantCasts.hpp

@@ -0,0 +1,60 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+#include "Data/JsonVariantAs.hpp"
+#include "Polyfills/attributes.hpp"
+
+namespace ArduinoJson {
+
+template <typename TImpl>
+class JsonVariantCasts {
+ public:
+#if ARDUINOJSON_ENABLE_DEPRECATED
+  DEPRECATED("use as<JsonArray>() instead")
+  FORCE_INLINE JsonArray &asArray() const {
+    return impl()->template as<JsonArray>();
+  }
+
+  DEPRECATED("use as<JsonObject>() instead")
+  FORCE_INLINE JsonObject &asObject() const {
+    return impl()->template as<JsonObject>();
+  }
+
+  DEPRECATED("use as<char*>() instead")
+  FORCE_INLINE const char *asString() const {
+    return impl()->template as<const char *>();
+  }
+#endif
+
+  // Gets the variant as an array.
+  // Returns a reference to the JsonArray or JsonArray::invalid() if the
+  // variant
+  // is not an array.
+  FORCE_INLINE operator JsonArray &() const {
+    return impl()->template as<JsonArray &>();
+  }
+
+  // Gets the variant as an object.
+  // Returns a reference to the JsonObject or JsonObject::invalid() if the
+  // variant is not an object.
+  FORCE_INLINE operator JsonObject &() const {
+    return impl()->template as<JsonObject &>();
+  }
+
+  template <typename T>
+  FORCE_INLINE operator T() const {
+    return impl()->template as<T>();
+  }
+
+ private:
+  const TImpl *impl() const {
+    return static_cast<const TImpl *>(this);
+  }
+};
+}

src/ArduinoJson/JsonVariantComparisons.hpp

@@ -0,0 +1,144 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+#include "StringTraits/StringTraits.hpp"
+#include "TypeTraits/EnableIf.hpp"
+#include "TypeTraits/IsVariant.hpp"
+
+namespace ArduinoJson {
+
+template <typename TImpl>
+class JsonVariantComparisons {
+ public:
+  template <typename TComparand>
+  friend bool operator==(const JsonVariantComparisons &variant,
+                         TComparand comparand) {
+    return variant.equals(comparand);
+  }
+
+  template <typename TComparand>
+  friend
+      typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value,
+                                    bool>::type
+      operator==(TComparand comparand, const JsonVariantComparisons &variant) {
+    return variant.equals(comparand);
+  }
+
+  template <typename TComparand>
+  friend bool operator!=(const JsonVariantComparisons &variant,
+                         TComparand comparand) {
+    return !variant.equals(comparand);
+  }
+
+  template <typename TComparand>
+  friend
+      typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value,
+                                    bool>::type
+      operator!=(TComparand comparand, const JsonVariantComparisons &variant) {
+    return !variant.equals(comparand);
+  }
+
+  template <typename TComparand>
+  friend bool operator<=(const JsonVariantComparisons &left, TComparand right) {
+    return left.as<TComparand>() <= right;
+  }
+
+  template <typename TComparand>
+  friend bool operator<=(TComparand comparand,
+                         const JsonVariantComparisons &variant) {
+    return comparand <= variant.as<TComparand>();
+  }
+
+  template <typename TComparand>
+  friend bool operator>=(const JsonVariantComparisons &variant,
+                         TComparand comparand) {
+    return variant.as<TComparand>() >= comparand;
+  }
+
+  template <typename TComparand>
+  friend bool operator>=(TComparand comparand,
+                         const JsonVariantComparisons &variant) {
+    return comparand >= variant.as<TComparand>();
+  }
+
+  template <typename TComparand>
+  friend bool operator<(const JsonVariantComparisons &varian,
+                        TComparand comparand) {
+    return varian.as<TComparand>() < comparand;
+  }
+
+  template <typename TComparand>
+  friend bool operator<(TComparand comparand,
+                        const JsonVariantComparisons &variant) {
+    return comparand < variant.as<TComparand>();
+  }
+
+  template <typename TComparand>
+  friend bool operator>(const JsonVariantComparisons &variant,
+                        TComparand comparand) {
+    return variant.as<TComparand>() > comparand;
+  }
+
+  template <typename TComparand>
+  friend bool operator>(TComparand comparand,
+                        const JsonVariantComparisons &variant) {
+    return comparand > variant.as<TComparand>();
+  }
+
+ private:
+  const TImpl *impl() const {
+    return static_cast<const TImpl *>(this);
+  }
+
+  template <typename T>
+  const typename Internals::JsonVariantAs<T>::type as() const {
+    return impl()->template as<T>();
+  }
+
+  template <typename T>
+  bool is() const {
+    return impl()->template is<T>();
+  }
+
+  template <typename TString>
+  typename TypeTraits::EnableIf<TypeTraits::IsString<TString>::value,
+                                bool>::type
+  equals(const TString &comparand) const {
+    const char *value = as<const char *>();
+    return Internals::StringTraits<TString>::equals(comparand, value);
+  }
+
+  template <typename TComparand>
+  typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value &&
+                                    !TypeTraits::IsString<TComparand>::value,
+                                bool>::type
+  equals(const TComparand &comparand) const {
+    return as<TComparand>() == comparand;
+  }
+
+  template <typename TVariant2>
+  bool equals(const JsonVariantComparisons<TVariant2> &right) const {
+    using namespace Internals;
+    if (is<bool>() && right.template is<bool>())
+      return as<bool>() == right.template as<bool>();
+    if (is<JsonInteger>() && right.template is<JsonInteger>())
+      return as<JsonInteger>() == right.template as<JsonInteger>();
+    if (is<JsonFloat>() && right.template is<JsonFloat>())
+      return as<JsonFloat>() == right.template as<JsonFloat>();
+    if (is<JsonArray>() && right.template is<JsonArray>())
+      return as<JsonArray>() == right.template as<JsonArray>();
+    if (is<JsonObject>() && right.template is<JsonObject>())
+      return as<JsonObject>() == right.template as<JsonObject>();
+    if (is<char *>() && right.template is<char *>())
+      return strcmp(as<char *>(), right.template as<char *>()) == 0;
+
+    return false;
+  }
+};
+}

src/ArduinoJson/JsonVariantImpl.hpp

@@ -56,16 +56,14 @@ inline T JsonVariant::variantAsInteger() const {
       return 0;
     case JSON_POSITIVE_INTEGER:
     case JSON_BOOLEAN:
-      return static_cast<T>(_content.asInteger);
+      return T(_content.asInteger);
     case JSON_NEGATIVE_INTEGER:
-      return static_cast<T>(_content.asInteger * -1);
+      return T(~_content.asInteger + 1);
     case JSON_STRING:
     case JSON_UNPARSED:
-      if (!_content.asString) return 0;
-      if (!strcmp("true", _content.asString)) return 1;
       return Polyfills::parseInteger<T>(_content.asString);
     default:
-      return static_cast<T>(_content.asFloat);
+      return T(_content.asFloat);
   }
 }
 
@@ -117,7 +115,8 @@ inline bool JsonVariant::variantIsInteger() const {
 inline bool JsonVariant::variantIsFloat() const {
   using namespace Internals;
 
-  return _type >= JSON_FLOAT_0_DECIMALS ||
+  return _type == JSON_FLOAT || _type == JSON_POSITIVE_INTEGER ||
+         _type == JSON_NEGATIVE_INTEGER ||
          (_type == JSON_UNPARSED && Polyfills::isFloat(_content.asString));
 }
 

src/ArduinoJson/JsonVariantSubscripts.hpp

@@ -9,7 +9,8 @@
 
 #include "Data/JsonVariantAs.hpp"
 #include "Polyfills/attributes.hpp"
-#include "Serialization/JsonPrintable.hpp"
+#include "StringTraits/StringTraits.hpp"
+#include "TypeTraits/EnableIf.hpp"
 
 namespace ArduinoJson {
 
@@ -19,67 +20,21 @@ template <typename TKey>
 class JsonObjectSubscript;
 
 template <typename TImpl>
-class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
+class JsonVariantSubscripts {
  public:
-#if ARDUINOJSON_ENABLE_DEPRECATED
-  DEPRECATED("use as<JsonArray>() instead")
-  FORCE_INLINE JsonArray &asArray() const {
-    return as<JsonArray>();
-  }
-
-  DEPRECATED("use as<JsonObject>() instead")
-  FORCE_INLINE JsonObject &asObject() const {
-    return as<JsonObject>();
-  }
-
-  DEPRECATED("use as<char*>() instead")
-  FORCE_INLINE const char *asString() const {
-    return as<const char *>();
-  }
-#endif
-
-  // Gets the variant as an array.
-  // Returns a reference to the JsonArray or JsonArray::invalid() if the
-  // variant
-  // is not an array.
-  FORCE_INLINE operator JsonArray &() const {
-    return as<JsonArray &>();
-  }
-
-  // Gets the variant as an object.
-  // Returns a reference to the JsonObject or JsonObject::invalid() if the
-  // variant is not an object.
-  FORCE_INLINE operator JsonObject &() const {
-    return as<JsonObject &>();
-  }
-
-  template <typename T>
-  FORCE_INLINE operator T() const {
-    return as<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE const typename Internals::JsonVariantAs<T>::type as() const {
-    return impl()->template as<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE bool is() const {
-    return impl()->template is<T>();
-  }
-
   // Mimics an array or an object.
   // Returns the size of the array or object if the variant has that type.
   // Returns 0 if the variant is neither an array nor an object
   size_t size() const {
-    return as<JsonArray>().size() + as<JsonObject>().size();
+    return impl()->template as<JsonArray>().size() +
+           impl()->template as<JsonObject>().size();
   }
 
   // Mimics an array.
   // Returns the element at specified index if the variant is an array.
   // Returns JsonVariant::invalid() if the variant is not an array.
-  FORCE_INLINE const JsonArraySubscript operator[](int index) const;
-  FORCE_INLINE JsonArraySubscript operator[](int index);
+  FORCE_INLINE const JsonArraySubscript operator[](size_t index) const;
+  FORCE_INLINE JsonArraySubscript operator[](size_t index);
 
   // Mimics an object.
   // Returns the value associated with the specified key if the variant is
@@ -93,7 +48,7 @@ class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
       Internals::StringTraits<TString>::has_equals,
       const JsonObjectSubscript<const TString &> >::type
   operator[](const TString &key) const {
-    return as<JsonObject>()[key];
+    return impl()->template as<JsonObject>()[key];
   }
   //
   // const JsonObjectSubscript operator[](TKey) const;
@@ -103,7 +58,7 @@ class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
       Internals::StringTraits<TString>::has_equals,
       JsonObjectSubscript<const TString &> >::type
   operator[](const TString &key) {
-    return as<JsonObject>()[key];
+    return impl()->template as<JsonObject>()[key];
   }
   //
   // JsonObjectSubscript operator[](TKey);
@@ -113,7 +68,7 @@ class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
       Internals::StringTraits<const TString *>::has_equals,
       JsonObjectSubscript<const TString *> >::type
   operator[](const TString *key) {
-    return as<JsonObject>()[key];
+    return impl()->template as<JsonObject>()[key];
   }
   //
   // JsonObjectSubscript operator[](TKey);
@@ -123,7 +78,7 @@ class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
       Internals::StringTraits<TString *>::has_equals,
       const JsonObjectSubscript<const TString *> >::type
   operator[](const TString *key) const {
-    return as<JsonObject>()[key];
+    return impl()->template as<JsonObject>()[key];
   }
 
  private:
@@ -131,9 +86,4 @@ class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
     return static_cast<const TImpl *>(this);
   }
 };
-
-namespace TypeTraits {
-template <typename T>
-struct IsVariant : IsBaseOf<JsonVariantBase<T>, T> {};
-}
 }

src/ArduinoJson/Polyfills/attributes.hpp

@@ -7,11 +7,14 @@
 
 #pragma once
 
-#ifdef _MSC_VER
+#ifdef _MSC_VER  // Visual Studio
+
 #define FORCE_INLINE __forceinline
 #define NO_INLINE __declspec(noinline)
 #define DEPRECATED(msg) __declspec(deprecated(msg))
-#else
+
+#elif defined(__GNUC__)  // GCC or Clang
+
 #define FORCE_INLINE __attribute__((always_inline))
 #define NO_INLINE __attribute__((noinline))
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
@@ -19,4 +22,11 @@
 #else
 #define DEPRECATED(msg) __attribute__((deprecated))
 #endif
+
+#else  // Other compilers
+
+#define FORCE_INLINE
+#define NO_INLINE
+#define DEPRECATED(msg)
+
 #endif

src/ArduinoJson/Polyfills/isFloat.hpp

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <string.h>  // for strcmp
 #include "./ctype.hpp"
 
 namespace ArduinoJson {
@@ -18,24 +19,23 @@ inline bool isFloat(const char* s) {
   if (!strcmp(s, "NaN")) return true;
   if (issign(*s)) s++;
   if (!strcmp(s, "Infinity")) return true;
+  if (*s == '\0') return false;
 
   while (isdigit(*s)) s++;
 
-  bool has_dot = *s == '.';
-  if (has_dot) {
+  if (*s == '.') {
     s++;
     while (isdigit(*s)) s++;
   }
 
-  bool has_exponent = *s == 'e' || *s == 'E';
-  if (has_exponent) {
+  if (*s == 'e' || *s == 'E') {
     s++;
     if (issign(*s)) s++;
     if (!isdigit(*s)) return false;
     while (isdigit(*s)) s++;
   }
 
-  return (has_dot || has_exponent) && *s == '\0';
+  return *s == '\0';
 }
 }
 }

src/ArduinoJson/Polyfills/math.hpp

@@ -0,0 +1,22 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+namespace ArduinoJson {
+namespace Polyfills {
+template <typename T>
+bool isNaN(T x) {
+  return x != x;
+}
+
+template <typename T>
+bool isInfinity(T x) {
+  return x != 0.0 && x * 2 == x;
+}
+}
+}

src/ArduinoJson/Polyfills/parseFloat.hpp

@@ -20,16 +20,20 @@ inline T parseFloat(const char* s) {
   typedef typename traits::mantissa_type mantissa_t;
   typedef typename traits::exponent_type exponent_t;
 
-  if (!s) return 0;
+  if (!s) return 0;  // NULL
 
   bool negative_result = false;
   switch (*s) {
     case '-':
       negative_result = true;
+      s++;
+      break;
     case '+':
       s++;
+      break;
   }
 
+  if (*s == 't') return 1;  // true
   if (*s == 'n' || *s == 'N') return traits::nan();
   if (*s == 'i' || *s == 'I')
     return negative_result ? -traits::inf() : traits::inf();

src/ArduinoJson/Polyfills/parseInteger.hpp

@@ -16,7 +16,9 @@ namespace ArduinoJson {
 namespace Polyfills {
 template <typename T>
 T parseInteger(const char *s) {
-  if (!s) return 0;
+  if (!s) return 0;  // NULL
+
+  if (*s == 't') return 1;  // "true"
 
   T result = 0;
   bool negative_result = false;
@@ -24,17 +26,19 @@ T parseInteger(const char *s) {
   switch (*s) {
     case '-':
       negative_result = true;
+      s++;
+      break;
     case '+':
       s++;
       break;
   }
 
   while (isdigit(*s)) {
-    result = static_cast<T>(result * 10 + (*s - '0'));
+    result = T(result * 10 + T(*s - '0'));
     s++;
   }
 
-  return negative_result ? static_cast<T>(result * -1) : result;
+  return negative_result ? T(~result + 1) : result;
 }
 }
 }

src/ArduinoJson/Serialization/DummyPrint.hpp

@@ -7,17 +7,19 @@
 
 #pragma once
 
-#include "../Print.hpp"
-
 namespace ArduinoJson {
 namespace Internals {
 
 // A dummy Print implementation used in JsonPrintable::measureLength()
-class DummyPrint : public Print {
+class DummyPrint {
  public:
-  virtual size_t write(uint8_t) {
+  size_t print(char) {
     return 1;
   }
+
+  size_t print(const char* s) {
+    return strlen(s);
+  }
 };
 }
 }

src/ArduinoJson/Serialization/DynamicStringBuilder.hpp

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "../Print.hpp"
 #include "../StringTraits/StringTraits.hpp"
 
 namespace ArduinoJson {
@@ -15,15 +14,21 @@ namespace Internals {
 
 // A Print implementation that allows to write in a String
 template <typename TString>
-class DynamicStringBuilder : public Print {
+class DynamicStringBuilder {
  public:
   DynamicStringBuilder(TString &str) : _str(str) {}
 
-  virtual size_t write(uint8_t c) {
-    StringTraits<TString>::append(_str, static_cast<char>(c));
+  size_t print(char c) {
+    StringTraits<TString>::append(_str, c);
     return 1;
   }
 
+  size_t print(const char *s) {
+    size_t initialLen = _str.length();
+    StringTraits<TString>::append(_str, s);
+    return _str.length() - initialLen;
+  }
+
  private:
   DynamicStringBuilder &operator=(const DynamicStringBuilder &);
 

src/ArduinoJson/Serialization/FloatParts.hpp

@@ -0,0 +1,92 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+#include "../Configuration.hpp"
+#include "../Polyfills/math.hpp"
+#include "../TypeTraits/FloatTraits.hpp"
+
+namespace ArduinoJson {
+namespace Internals {
+
+template <typename TFloat>
+struct FloatParts {
+  uint32_t integral;
+  uint32_t decimal;
+  int16_t exponent;
+  int8_t decimalPlaces;
+
+  FloatParts(TFloat value) {
+    uint32_t maxDecimalPart = sizeof(TFloat) >= 8 ? 1000000000 : 1000000;
+    decimalPlaces = sizeof(TFloat) >= 8 ? 9 : 6;
+
+    exponent = normalize(value);
+
+    integral = uint32_t(value);
+    // reduce number of decimal places by the number of integral places
+    for (uint32_t tmp = integral; tmp >= 10; tmp /= 10) {
+      maxDecimalPart /= 10;
+      decimalPlaces--;
+    }
+
+    TFloat remainder = (value - TFloat(integral)) * TFloat(maxDecimalPart);
+
+    decimal = uint32_t(remainder);
+    remainder = remainder - TFloat(decimal);
+
+    // rounding:
+    // increment by 1 if remainder >= 0.5
+    decimal += uint32_t(remainder * 2);
+    if (decimal >= maxDecimalPart) {
+      decimal = 0;
+      integral++;
+      if (exponent && integral >= 10) {
+        exponent++;
+        integral = 1;
+      }
+    }
+
+    // remove trailing zeros
+    while (decimal % 10 == 0 && decimalPlaces > 0) {
+      decimal /= 10;
+      decimalPlaces--;
+    }
+  }
+
+  static int16_t normalize(TFloat& value) {
+    typedef TypeTraits::FloatTraits<TFloat> traits;
+    int16_t powersOf10 = 0;
+
+    int8_t index = sizeof(TFloat) == 8 ? 8 : 5;
+    int bit = 1 << index;
+
+    if (value >= ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD) {
+      for (; index >= 0; index--) {
+        if (value >= traits::positiveBinaryPowerOfTen(index)) {
+          value *= traits::negativeBinaryPowerOfTen(index);
+          powersOf10 = int16_t(powersOf10 + bit);
+        }
+        bit >>= 1;
+      }
+    }
+
+    if (value > 0 && value <= ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD) {
+      for (; index >= 0; index--) {
+        if (value < traits::negativeBinaryPowerOfTenPlusOne(index)) {
+          value *= traits::positiveBinaryPowerOfTen(index);
+          powersOf10 = int16_t(powersOf10 - bit);
+        }
+        bit >>= 1;
+      }
+    }
+
+    return powersOf10;
+  }
+};
+}
+}

src/ArduinoJson/Serialization/IndentedPrint.hpp

@@ -7,15 +7,14 @@
 
 #pragma once
 
-#include "../Print.hpp"
-
 namespace ArduinoJson {
 namespace Internals {
 
 // Decorator on top of Print to allow indented output.
 // This class is used by JsonPrintable::prettyPrintTo() but can also be used
 // for your own purpose, like logging.
-class IndentedPrint : public Print {
+template <typename Print>
+class IndentedPrint {
  public:
   explicit IndentedPrint(Print &p) : sink(&p) {
     level = 0;
@@ -23,14 +22,21 @@ class IndentedPrint : public Print {
     isNewLine = true;
   }
 
-  virtual size_t write(uint8_t c) {
+  size_t print(char c) {
     size_t n = 0;
     if (isNewLine) n += writeTabs();
-    n += sink->write(c);
+    n += sink->print(c);
     isNewLine = c == '\n';
     return n;
   }
 
+  size_t print(const char *s) {
+    // TODO: optimize
+    size_t n = 0;
+    while (*s) n += print(*s++);
+    return n;
+  }
+
   // Adds one level of indentation
   void indent() {
     if (level < MAX_LEVEL) level++;
@@ -54,7 +60,7 @@ class IndentedPrint : public Print {
 
   size_t writeTabs() {
     size_t n = 0;
-    for (int i = 0; i < level * tabSize; i++) n += sink->write(' ');
+    for (int i = 0; i < level * tabSize; i++) n += sink->print(' ');
     return n;
   }
 

src/ArduinoJson/Serialization/JsonPrintable.hpp

@@ -31,9 +31,12 @@ namespace Internals {
 template <typename T>
 class JsonPrintable {
  public:
-  size_t printTo(Print &print) const {
-    JsonWriter writer(print);
-    JsonSerializer::serialize(downcast(), writer);
+  template <typename Print>
+  typename TypeTraits::EnableIf<!TypeTraits::IsString<Print>::value,
+                                size_t>::type
+  printTo(Print &print) const {
+    JsonWriter<Print> writer(print);
+    JsonSerializer<JsonWriter<Print> >::serialize(downcast(), writer);
     return writer.bytesWritten();
   }
 
@@ -62,8 +65,9 @@ class JsonPrintable {
     return printTo(sb);
   }
 
-  size_t prettyPrintTo(IndentedPrint &print) const {
-    Prettyfier p(print);
+  template <typename Print>
+  size_t prettyPrintTo(IndentedPrint<Print> &print) const {
+    Prettyfier<Print> p(print);
     return printTo(p);
   }
 
@@ -77,8 +81,11 @@ class JsonPrintable {
     return prettyPrintTo(buffer, N);
   }
 
-  size_t prettyPrintTo(Print &print) const {
-    IndentedPrint indentedPrint = IndentedPrint(print);
+  template <typename Print>
+  typename TypeTraits::EnableIf<!TypeTraits::IsString<Print>::value,
+                                size_t>::type
+  prettyPrintTo(Print &print) const {
+    IndentedPrint<Print> indentedPrint(print);
     return prettyPrintTo(indentedPrint);
   }
 

src/ArduinoJson/Serialization/JsonSerializer.hpp

@@ -20,14 +20,15 @@ class JsonVariant;
 
 namespace Internals {
 
+template <typename Writer>
 class JsonSerializer {
  public:
-  static void serialize(const JsonArray &, JsonWriter &);
-  static void serialize(const JsonArraySubscript &, JsonWriter &);
-  static void serialize(const JsonObject &, JsonWriter &);
+  static void serialize(const JsonArray &, Writer &);
+  static void serialize(const JsonArraySubscript &, Writer &);
+  static void serialize(const JsonObject &, Writer &);
   template <typename TKey>
-  static void serialize(const JsonObjectSubscript<TKey> &, JsonWriter &);
-  static void serialize(const JsonVariant &, JsonWriter &);
+  static void serialize(const JsonObjectSubscript<TKey> &, Writer &);
+  static void serialize(const JsonVariant &, Writer &);
 };
 }
 }

src/ArduinoJson/Serialization/JsonSerializerImpl.hpp

@@ -14,8 +14,9 @@
 #include "../JsonVariant.hpp"
 #include "JsonSerializer.hpp"
 
-inline void ArduinoJson::Internals::JsonSerializer::serialize(
-    const JsonArray& array, JsonWriter& writer) {
+template <typename Writer>
+inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
+    const JsonArray& array, Writer& writer) {
   writer.beginArray();
 
   JsonArray::const_iterator it = array.begin();
@@ -31,13 +32,15 @@ inline void ArduinoJson::Internals::JsonSerializer::serialize(
   writer.endArray();
 }
 
-inline void ArduinoJson::Internals::JsonSerializer::serialize(
-    const JsonArraySubscript& arraySubscript, JsonWriter& writer) {
+template <typename Writer>
+inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
+    const JsonArraySubscript& arraySubscript, Writer& writer) {
   serialize(arraySubscript.as<JsonVariant>(), writer);
 }
 
-inline void ArduinoJson::Internals::JsonSerializer::serialize(
-    const JsonObject& object, JsonWriter& writer) {
+template <typename Writer>
+inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
+    const JsonObject& object, Writer& writer) {
   writer.beginObject();
 
   JsonObject::const_iterator it = object.begin();
@@ -55,16 +58,19 @@ inline void ArduinoJson::Internals::JsonSerializer::serialize(
   writer.endObject();
 }
 
+template <typename Writer>
 template <typename TKey>
-inline void ArduinoJson::Internals::JsonSerializer::serialize(
-    const JsonObjectSubscript<TKey>& objectSubscript, JsonWriter& writer) {
+inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
+    const JsonObjectSubscript<TKey>& objectSubscript, Writer& writer) {
   serialize(objectSubscript.template as<JsonVariant>(), writer);
 }
 
-inline void ArduinoJson::Internals::JsonSerializer::serialize(
-    const JsonVariant& variant, JsonWriter& writer) {
+template <typename Writer>
+inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
+    const JsonVariant& variant, Writer& writer) {
   switch (variant._type) {
-    case JSON_UNDEFINED:
+    case JSON_FLOAT:
+      writer.writeFloat(variant._content.asFloat);
       return;
 
     case JSON_ARRAY:
@@ -84,7 +90,8 @@ inline void ArduinoJson::Internals::JsonSerializer::serialize(
       return;
 
     case JSON_NEGATIVE_INTEGER:
-      writer.writeRaw('-');
+      writer.writeRaw('-');  // Falls through.
+
     case JSON_POSITIVE_INTEGER:
       writer.writeInteger(variant._content.asInteger);
       return;
@@ -93,9 +100,7 @@ inline void ArduinoJson::Internals::JsonSerializer::serialize(
       writer.writeBoolean(variant._content.asInteger != 0);
       return;
 
-    default:
-      uint8_t decimals =
-          static_cast<uint8_t>(variant._type - JSON_FLOAT_0_DECIMALS);
-      writer.writeFloat(variant._content.asFloat, decimals);
+    default:  // JSON_UNDEFINED
+      return;
   }
 }

src/ArduinoJson/Serialization/JsonWriter.hpp

@@ -7,13 +7,11 @@
 
 #pragma once
 
+#include <stdint.h>
 #include "../Data/Encoding.hpp"
-#include "../Data/JsonFloat.hpp"
 #include "../Data/JsonInteger.hpp"
 #include "../Polyfills/attributes.hpp"
-#include "../Polyfills/math.hpp"
-#include "../Polyfills/normalize.hpp"
-#include "../Print.hpp"
+#include "../Serialization/FloatParts.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
@@ -25,6 +23,7 @@ namespace Internals {
 // - JsonVariant::writeTo()
 // Its derived by PrettyJsonWriter that overrides some members to add
 // indentation.
+template <typename Print>
 class JsonWriter {
  public:
   explicit JsonWriter(Print &sink) : _sink(sink), _length(0) {}
@@ -81,7 +80,8 @@ class JsonWriter {
     }
   }
 
-  void writeFloat(JsonFloat value, uint8_t digits = 2) {
+  template <typename TFloat>
+  void writeFloat(TFloat value) {
     if (Polyfills::isNaN(value)) return writeRaw("NaN");
 
     if (value < 0.0) {
@@ -91,66 +91,60 @@ class JsonWriter {
 
     if (Polyfills::isInfinity(value)) return writeRaw("Infinity");
 
-    short powersOf10;
-    if (value > 1000 || value < 0.001) {
-      powersOf10 = Polyfills::normalize(value);
-    } else {
-      powersOf10 = 0;
-    }
+    FloatParts<TFloat> parts(value);
 
-    // Round up last digit (so that print(1.999, 2) prints as "2.00")
-    value += getRoundingBias(digits);
+    writeInteger(parts.integral);
+    if (parts.decimalPlaces) writeDecimals(parts.decimal, parts.decimalPlaces);
 
-    // Extract the integer part of the value and print it
-    JsonUInt int_part = static_cast<JsonUInt>(value);
-    JsonFloat remainder = value - static_cast<JsonFloat>(int_part);
-    writeInteger(int_part);
-
-    // Print the decimal point, but only if there are digits beyond
-    if (digits > 0) {
-      writeRaw('.');
-    }
-
-    // Extract digits from the remainder one at a time
-    while (digits-- > 0) {
-      // Extract digit
-      remainder *= 10.0;
-      char currentDigit = char(remainder);
-      remainder -= static_cast<JsonFloat>(currentDigit);
-
-      // Print
-      writeRaw(char('0' + currentDigit));
-    }
-
-    if (powersOf10 < 0) {
+    if (parts.exponent < 0) {
       writeRaw("e-");
-      writeInteger(-powersOf10);
+      writeInteger(-parts.exponent);
     }
 
-    if (powersOf10 > 0) {
+    if (parts.exponent > 0) {
       writeRaw('e');
-      writeInteger(powersOf10);
+      writeInteger(parts.exponent);
     }
   }
 
-  void writeInteger(JsonUInt value) {
+  template <typename UInt>
+  void writeInteger(UInt value) {
     char buffer[22];
-    char *ptr = buffer + sizeof(buffer) - 1;
+    char *end = buffer + sizeof(buffer) - 1;
+    char *ptr = end;
 
     *ptr = 0;
     do {
-      *--ptr = static_cast<char>(value % 10 + '0');
-      value /= 10;
+      *--ptr = char(value % 10 + '0');
+      value = UInt(value / 10);
     } while (value);
 
     writeRaw(ptr);
   }
 
+  void writeDecimals(uint32_t value, int8_t width) {
+    // buffer should be big enough for all digits, the dot and the null
+    // terminator
+    char buffer[16];
+    char *ptr = buffer + sizeof(buffer) - 1;
+
+    // write the string in reverse order
+    *ptr = 0;
+    while (width--) {
+      *--ptr = char(value % 10 + '0');
+      value /= 10;
+    }
+    *--ptr = '.';
+
+    // and dump it in the right order
+    writeRaw(ptr);
+  }
+
   void writeRaw(const char *s) {
     _length += _sink.print(s);
   }
   void writeRaw(char c) {
-    _length += _sink.write(c);
+    _length += _sink.print(c);
   }
 
  protected:
@@ -159,26 +153,6 @@ class JsonWriter {
 
  private:
   JsonWriter &operator=(const JsonWriter &);  // cannot be assigned
-
-  static JsonFloat getLastDigit(uint8_t digits) {
-    // Designed as a compromise between code size and speed
-    switch (digits) {
-      case 0:
-        return 1e-0;
-      case 1:
-        return 1e-1;
-      case 2:
-        return 1e-2;
-      case 3:
-        return 1e-3;
-      default:
-        return getLastDigit(uint8_t(digits - 4)) * 1e-4;
-    }
-  }
-
-  FORCE_INLINE static JsonFloat getRoundingBias(uint8_t digits) {
-    return 0.5 * getLastDigit(digits);
-  }
 };
 }
 }

src/ArduinoJson/Serialization/Prettyfier.hpp

@@ -13,19 +13,27 @@ namespace ArduinoJson {
 namespace Internals {
 
 // Converts a compact JSON string into an indented one.
-class Prettyfier : public Print {
+template <typename Print>
+class Prettyfier {
  public:
-  explicit Prettyfier(IndentedPrint& p) : _sink(p) {
+  explicit Prettyfier(IndentedPrint<Print>& p) : _sink(p) {
     _previousChar = 0;
     _inString = false;
   }
 
-  virtual size_t write(uint8_t c) {
+  size_t print(char c) {
     size_t n = _inString ? handleStringChar(c) : handleMarkupChar(c);
     _previousChar = c;
     return n;
   }
 
+  size_t print(const char* s) {
+    // TODO: optimize
+    size_t n = 0;
+    while (*s) n += print(*s++);
+    return n;
+  }
+
  private:
   Prettyfier& operator=(const Prettyfier&);  // cannot be assigned
 
@@ -33,15 +41,15 @@ class Prettyfier : public Print {
     return _previousChar == '{' || _previousChar == '[';
   }
 
-  size_t handleStringChar(uint8_t c) {
+  size_t handleStringChar(char c) {
     bool isQuote = c == '"' && _previousChar != '\\';
 
     if (isQuote) _inString = false;
 
-    return _sink.write(c);
+    return _sink.print(c);
   }
 
-  size_t handleMarkupChar(uint8_t c) {
+  size_t handleMarkupChar(char c) {
     switch (c) {
       case '{':
       case '[':
@@ -65,31 +73,29 @@ class Prettyfier : public Print {
     }
   }
 
-  size_t writeBlockClose(uint8_t c) {
+  size_t writeBlockClose(char c) {
     size_t n = 0;
     n += unindentIfNeeded();
-    n += _sink.write(c);
+    n += _sink.print(c);
     return n;
   }
 
-  size_t writeBlockOpen(uint8_t c) {
+  size_t writeBlockOpen(char c) {
     size_t n = 0;
     n += indentIfNeeded();
-    n += _sink.write(c);
+    n += _sink.print(c);
     return n;
   }
 
   size_t writeColon() {
     size_t n = 0;
-    n += _sink.write(':');
-    n += _sink.write(' ');
+    n += _sink.print(": ");
     return n;
   }
 
   size_t writeComma() {
     size_t n = 0;
-    n += _sink.write(',');
-    n += _sink.println();
+    n += _sink.print(",\r\n");
     return n;
   }
 
@@ -97,14 +103,14 @@ class Prettyfier : public Print {
     _inString = true;
     size_t n = 0;
     n += indentIfNeeded();
-    n += _sink.write('"');
+    n += _sink.print('"');
     return n;
   }
 
-  size_t writeNormalChar(uint8_t c) {
+  size_t writeNormalChar(char c) {
     size_t n = 0;
     n += indentIfNeeded();
-    n += _sink.write(c);
+    n += _sink.print(c);
     return n;
   }
 
@@ -112,18 +118,18 @@ class Prettyfier : public Print {
     if (!inEmptyBlock()) return 0;
 
     _sink.indent();
-    return _sink.println();
+    return _sink.print("\r\n");
   }
 
   size_t unindentIfNeeded() {
     if (inEmptyBlock()) return 0;
 
     _sink.unindent();
-    return _sink.println();
+    return _sink.print("\r\n");
   }
 
-  uint8_t _previousChar;
-  IndentedPrint& _sink;
+  char _previousChar;
+  IndentedPrint<Print>& _sink;
   bool _inString;
 };
 }

src/ArduinoJson/Serialization/StaticStringBuilder.hpp

@@ -0,0 +1,39 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+namespace ArduinoJson {
+namespace Internals {
+
+// A Print implementation that allows to write in a char[]
+class StaticStringBuilder {
+ public:
+  StaticStringBuilder(char *buf, size_t size) : end(buf + size - 1), p(buf) {
+    *p = '\0';
+  }
+
+  size_t print(char c) {
+    if (p >= end) return 0;
+    *p++ = c;
+    *p = '\0';
+    return 1;
+  }
+
+  size_t print(const char *s) {
+    char *begin = p;
+    while (p < end && *s) *p++ = *s++;
+    *p = '\0';
+    return size_t(p - begin);
+  }
+
+ private:
+  char *end;
+  char *p;
+};
+}
+}

src/ArduinoJson/Serialization/StreamPrintAdapter.hpp

@@ -11,22 +11,25 @@
 
 #if ARDUINOJSON_ENABLE_STD_STREAM
 
-#include "../Print.hpp"
-
 #include <ostream>
 
 namespace ArduinoJson {
 namespace Internals {
 
-class StreamPrintAdapter : public Print {
+class StreamPrintAdapter {
  public:
   explicit StreamPrintAdapter(std::ostream& os) : _os(os) {}
 
-  virtual size_t write(uint8_t c) {
-    _os << static_cast<char>(c);
+  size_t print(char c) {
+    _os << c;
     return 1;
   }
 
+  size_t print(const char* s) {
+    _os << s;
+    return strlen(s);
+  }
+
  private:
   // cannot be assigned
   StreamPrintAdapter& operator=(const StreamPrintAdapter&);

src/ArduinoJson/StaticJsonBuffer.hpp

@@ -9,16 +9,6 @@
 
 #include "JsonBufferBase.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif defined(__GNUC__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
 namespace ArduinoJson {
 
 class StaticJsonBufferBase : public JsonBufferBase<StaticJsonBufferBase> {
@@ -54,23 +44,36 @@ class StaticJsonBufferBase : public JsonBufferBase<StaticJsonBufferBase> {
   StaticJsonBufferBase(char* buffer, size_t capa)
       : _buffer(buffer), _capacity(capa), _size(0) {}
 
+  // Gets the capacity of the buffer in bytes
   size_t capacity() const {
     return _capacity;
   }
+
+  // Gets the current usage of the buffer in bytes
   size_t size() const {
     return _size;
   }
 
+  // Allocates the specified amount of bytes in the buffer
   virtual void* alloc(size_t bytes) {
     alignNextAlloc();
     if (!canAlloc(bytes)) return NULL;
     return doAlloc(bytes);
   }
 
+  // Resets the buffer.
+  // USE WITH CAUTION: this invalidates all previously allocated data
+  void clear() {
+    _size = 0;
+  }
+
   String startString() {
     return String(this);
   }
 
+ protected:
+  ~StaticJsonBufferBase() {}
+
  private:
   void alignNextAlloc() {
     _size = round_size_up(_size);
@@ -91,6 +94,16 @@ class StaticJsonBufferBase : public JsonBufferBase<StaticJsonBufferBase> {
   size_t _size;
 };
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#elif defined(__GNUC__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#pragma GCC diagnostic push
+#endif
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
 // Implements a JsonBuffer with fixed memory allocation.
 // The template paramenter CAPACITY specifies the capacity of the buffer in
 // bytes.

src/ArduinoJson/StringTraits/ArduinoStream.hpp

@@ -11,10 +11,6 @@
 
 #include <Stream.h>
 
-#include "../TypeTraits/EnableIf.hpp"
-#include "../TypeTraits/IsBaseOf.hpp"
-#include "../TypeTraits/RemoveReference.hpp"
-
 namespace ArduinoJson {
 namespace Internals {
 

src/ArduinoJson/StringTraits/CharPointer.hpp

@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "../TypeTraits/EnableIf.hpp"
-#include "../TypeTraits/IsChar.hpp"
-
 namespace ArduinoJson {
 namespace Internals {
 
@@ -26,12 +23,12 @@ struct CharPointerTraits {
       ++_ptr;
     }
 
-    TChar current() const {
-      return _ptr[0];
+    char current() const {
+      return char(_ptr[0]);
     }
 
-    TChar next() const {
-      return _ptr[1];
+    char next() const {
+      return char(_ptr[1]);
     }
   };
 

src/ArduinoJson/StringTraits/FlashString.hpp

@@ -34,15 +34,15 @@ struct StringTraits<const __FlashStringHelper*, void> {
   };
 
   static bool equals(const __FlashStringHelper* str, const char* expected) {
-    return strcmp_P(expected, (PGM_P)str) == 0;
+    return strcmp_P(expected, (const char*)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;
+    size_t size = strlen_P((const char*)str) + 1;
     void* dup = buffer->alloc(size);
-    if (dup != NULL) memcpy_P(dup, (PGM_P)str, size);
+    if (dup != NULL) memcpy_P(dup, (const char*)str, size);
     return static_cast<char*>(dup);
   }
 

src/ArduinoJson/StringTraits/StdStream.hpp

@@ -10,9 +10,6 @@
 #if ARDUINOJSON_ENABLE_STD_STREAM
 
 #include <istream>
-#include "../TypeTraits/EnableIf.hpp"
-#include "../TypeTraits/IsBaseOf.hpp"
-#include "../TypeTraits/RemoveReference.hpp"
 
 namespace ArduinoJson {
 namespace Internals {

src/ArduinoJson/StringTraits/StdString.hpp

@@ -43,6 +43,10 @@ struct StdStringTraits {
     str += c;
   }
 
+  static void append(TString& str, const char* s) {
+    str += s;
+  }
+
   static const bool has_append = true;
   static const bool has_equals = true;
   static const bool should_duplicate = true;

src/ArduinoJson/StringTraits/StringTraits.hpp

@@ -7,7 +7,12 @@
 
 #pragma once
 
+#include <string.h>
 #include "../Configuration.hpp"
+#include "../TypeTraits/EnableIf.hpp"
+#include "../TypeTraits/IsBaseOf.hpp"
+#include "../TypeTraits/IsChar.hpp"
+#include "../TypeTraits/RemoveReference.hpp"
 
 namespace ArduinoJson {
 namespace Internals {

src/ArduinoJson/TypeTraits/FloatTraits.hpp

@@ -0,0 +1,153 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>  // for size_t
+#include "../Configuration.hpp"
+#include "../Polyfills/math.hpp"
+
+namespace ArduinoJson {
+namespace TypeTraits {
+
+template <typename T, size_t = sizeof(T)>
+struct FloatTraits {};
+
+template <typename T>
+struct FloatTraits<T, 8 /*64bits*/> {
+  typedef int64_t mantissa_type;
+  static const short mantissa_bits = 52;
+  static const mantissa_type mantissa_max =
+      (static_cast<mantissa_type>(1) << mantissa_bits) - 1;
+
+  typedef int16_t exponent_type;
+  static const exponent_type exponent_max = 308;
+
+  template <typename TExponent>
+  static T make_float(T m, TExponent e) {
+    if (e > 0) {
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1) m *= positiveBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    } else {
+      e = TExponent(-e);
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1) m *= negativeBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    }
+    return m;
+  }
+
+  static T positiveBinaryPowerOfTen(int index) {
+    static T factors[] = {
+        1e1, 1e2, 1e4, 1e8, 1e16, 1e32,
+        // workaround to support platforms with single precision literals
+        forge(0x4D384F03, 0xE93FF9F5), forge(0x5A827748, 0xF9301D32),
+        forge(0x75154FDD, 0x7F73BF3C)};
+    return factors[index];
+  }
+
+  static T negativeBinaryPowerOfTen(int index) {
+    static T factors[] = {
+        1e-1, 1e-2, 1e-4, 1e-8, 1e-16, 1e-32,
+        // workaround to support platforms with single precision literals
+        forge(0x32A50FFD, 0x44F4A73D), forge(0x255BBA08, 0xCF8C979D),
+        forge(0x0AC80628, 0x64AC6F43)};
+    return factors[index];
+  }
+
+  static T negativeBinaryPowerOfTenPlusOne(int index) {
+    static T factors[] = {
+        1e0, 1e-1, 1e-3, 1e-7, 1e-15, 1e-31,
+        // workaround to support platforms with single precision literals
+        forge(0x32DA53FC, 0x9631D10D), forge(0x25915445, 0x81B7DEC2),
+        forge(0x0AFE07B2, 0x7DD78B14)};
+    return factors[index];
+  }
+
+  static T nan() {
+    return forge(0x7ff80000, 0x00000000);
+  }
+
+  static T inf() {
+    return forge(0x7ff00000, 0x00000000);
+  }
+
+  static T forge(uint32_t msb, uint32_t lsb) {
+    union {
+      uint64_t integerBits;
+      T floatBits;
+    };
+    integerBits = (uint64_t(msb) << 32) | lsb;
+    return floatBits;
+  }
+};
+
+template <typename T>
+struct FloatTraits<T, 4 /*32bits*/> {
+  typedef int32_t mantissa_type;
+  static const short mantissa_bits = 23;
+  static const mantissa_type mantissa_max =
+      (static_cast<mantissa_type>(1) << mantissa_bits) - 1;
+
+  typedef int8_t exponent_type;
+  static const exponent_type exponent_max = 38;
+
+  template <typename TExponent>
+  static T make_float(T m, TExponent e) {
+    if (e > 0) {
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1) m *= positiveBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    } else {
+      e = -e;
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1) m *= negativeBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    }
+    return m;
+  }
+
+  static T positiveBinaryPowerOfTen(int index) {
+    static T factors[] = {1e1f, 1e2f, 1e4f, 1e8f, 1e16f, 1e32f};
+    return factors[index];
+  }
+
+  static T negativeBinaryPowerOfTen(int index) {
+    static T factors[] = {1e-1f, 1e-2f, 1e-4f, 1e-8f, 1e-16f, 1e-32f};
+    return factors[index];
+  }
+
+  static T negativeBinaryPowerOfTenPlusOne(int index) {
+    static T factors[] = {1e0f, 1e-1f, 1e-3f, 1e-7f, 1e-15f, 1e-31f};
+    return factors[index];
+  }
+
+  static T forge(uint32_t bits) {
+    union {
+      uint32_t integerBits;
+      T floatBits;
+    };
+    integerBits = bits;
+    return floatBits;
+  }
+
+  static T nan() {
+    return forge(0x7fc00000);
+  }
+
+  static T inf() {
+    return forge(0x7f800000);
+  }
+};
+}
+}