Separation Generator to a dedicated repo

Change-Id: Id94831651c3266861435272a6e36c7884bef2c45
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

468 files changed, 3 insertions, 15886 deletions

diff --git a/CAN-binder/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 26b1fc5f..26b1fc5f 100644
--- a/CAN-binder/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
diff --git a/CAN-binder/README.md b/CAN-binder/README.md
deleted file mode 100644
index e5146589..00000000
--- a/CAN-binder/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Short instructions to build CAN-binder project
-=================================
-
-Prerequisites
-----------------
-
-Here are the prerequisite to build the project:
-
-- CMake >= 3.3
-- g++ >= 4.9
-- AGL Application framework binder
-- NodeJS >= 6, to build html5 demo UI.
-
-Build instructions
-----------------------
-
-You can use the helper script `build.mk` to build the project :
-
-```bash
-# Cleaning existing build dir
-./build.mk mrproper
-# Only build the binding
-./build.mk build
-# Package the binding and the demo UI. Will need NodeJS >= v6
-./build.mk package
-```
-
-Or using the CMake way:
-
-```bash
-# Get some help to build stuff
-git submodule init
-git submodule update
-# And go to build it
-mkdir build
-cd build
-cmake ..
-# Only build
-make
-# Build and package tree filled
-make populate
-# Build and generate a Widget file
-make widget
-```
-
-The project is built in `build` directory, `package` directory will holds the _wgt_ file generated, this is used by Yocto buildsystem to include an AGL application cleanly in an AGL image. `conf.d/packaging` will contains widget configuration file.
\ No newline at end of file
diff --git a/CAN-config-generator/.gitignore b/CAN-config-generator/.gitignore
deleted file mode 100755
index 1d264557..00000000
--- a/CAN-config-generator/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.vs/

-.vscode/

-.kdev4/

-build*/

-*.kdev4

-bin/

-*.vcxproj.user

-obj/

diff --git a/CAN-config-generator/3rdparty/json/json.hpp b/CAN-config-generator/3rdparty/json/json.hpp
deleted file mode 100755
index 6dfc1831..00000000
--- a/CAN-config-generator/3rdparty/json/json.hpp
+++ /dev/null
@@ -1,13003 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 2.1.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#ifndef NLOHMANN_JSON_HPP
-#define NLOHMANN_JSON_HPP
-
-#include <algorithm> // all_of, copy, fill, find, for_each, none_of, remove, reverse, transform
-#include <array> // array
-#include <cassert> // assert
-#include <cctype> // isdigit
-#include <ciso646> // and, not, or
-#include <cmath> // isfinite, labs, ldexp, signbit
-#include <cstddef> // nullptr_t, ptrdiff_t, size_t
-#include <cstdint> // int64_t, uint64_t
-#include <cstdlib> // abort, strtod, strtof, strtold, strtoul, strtoll, strtoull
-#include <cstring> // strlen
-#include <forward_list> // forward_list
-#include <functional> // function, hash, less
-#include <initializer_list> // initializer_list
-#include <iomanip> // setw
-#include <iostream> // istream, ostream
-#include <iterator> // advance, begin, back_inserter, bidirectional_iterator_tag, distance, end, inserter, iterator, iterator_traits, next, random_access_iterator_tag, reverse_iterator
-#include <limits> // numeric_limits
-#include <locale> // locale
-#include <map> // map
-#include <memory> // addressof, allocator, allocator_traits, unique_ptr
-#include <numeric> // accumulate
-#include <sstream> // stringstream
-#include <stdexcept> // domain_error, invalid_argument, out_of_range
-#include <string> // getline, stoi, string, to_string
-#include <type_traits> // add_pointer, conditional, decay, enable_if, false_type, integral_constant, is_arithmetic, is_base_of, is_const, is_constructible, is_convertible, is_default_constructible, is_enum, is_floating_point, is_integral, is_nothrow_move_assignable, is_nothrow_move_constructible, is_pointer, is_reference, is_same, is_scalar, is_signed, remove_const, remove_cv, remove_pointer, remove_reference, true_type, underlying_type
-#include <utility> // declval, forward, make_pair, move, pair, swap
-#include <vector> // vector
-
-// exclude unsupported compilers
-#if defined(__clang__)
-    #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-        #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-    #endif
-#elif defined(__GNUC__)
-    #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
-        #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-    #endif
-#endif
-
-// disable float-equal warnings on GCC/clang
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-
-// disable documentation warnings on clang
-#if defined(__clang__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wdocumentation"
-#endif
-
-// allow for portable deprecation warnings
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #define JSON_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-    #define JSON_DEPRECATED __declspec(deprecated)
-#else
-    #define JSON_DEPRECATED
-#endif
-
-// allow to disable exceptions
-#if not defined(JSON_NOEXCEPTION) || defined(__EXCEPTIONS)
-    #define JSON_THROW(exception) throw exception
-    #define JSON_TRY try
-    #define JSON_CATCH(exception) catch(exception)
-#else
-    #define JSON_THROW(exception) std::abort()
-    #define JSON_TRY if(true)
-    #define JSON_CATCH(exception) if(false)
-#endif
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-
-/*!
-@brief unnamed namespace with internal helper functions
-
-This namespace collects some functions that could not be defined inside the
-@ref basic_json class.
-
-@since version 2.1.0
-*/
-namespace detail
-{
-///////////////////////////
-// JSON type enumeration //
-///////////////////////////
-
-/*!
-@brief the JSON type enumeration
-
-This enumeration collects the different JSON types. It is internally used to
-distinguish the stored values, and the functions @ref basic_json::is_null(),
-@ref basic_json::is_object(), @ref basic_json::is_array(),
-@ref basic_json::is_string(), @ref basic_json::is_boolean(),
-@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
-@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
-@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
-@ref basic_json::is_structured() rely on it.
-
-@note There are three enumeration entries (number_integer, number_unsigned, and
-number_float), because the library distinguishes these three types for numbers:
-@ref basic_json::number_unsigned_t is used for unsigned integers,
-@ref basic_json::number_integer_t is used for signed integers, and
-@ref basic_json::number_float_t is used for floating-point numbers or to
-approximate integers which do not fit in the limits of their respective type.
-
-@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
-value with the default value for a given type
-
-@since version 1.0.0
-*/
-enum class value_t : uint8_t
-{
-    null,            ///< null value
-    object,          ///< object (unordered set of name/value pairs)
-    array,           ///< array (ordered collection of values)
-    string,          ///< string value
-    boolean,         ///< boolean value
-    number_integer,  ///< number value (signed integer)
-    number_unsigned, ///< number value (unsigned integer)
-    number_float,    ///< number value (floating-point)
-    discarded        ///< discarded by the the parser callback function
-};
-
-/*!
-@brief comparison operator for JSON types
-
-Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string
-- furthermore, each type is not smaller than itself
-
-@since version 1.0.0
-*/
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
-{
-    static constexpr std::array<uint8_t, 8> order = {{
-            0, // null
-            3, // object
-            4, // array
-            5, // string
-            1, // boolean
-            2, // integer
-            2, // unsigned
-            2, // float
-        }
-    };
-
-    // discarded values are not comparable
-    if (lhs == value_t::discarded or rhs == value_t::discarded)
-    {
-        return false;
-    }
-
-    return order[static_cast<std::size_t>(lhs)] <
-           order[static_cast<std::size_t>(rhs)];
-}
-
-
-/////////////
-// helpers //
-/////////////
-
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-// taken from http://stackoverflow.com/a/26936864/266378
-template<typename T>
-using is_unscoped_enum =
-    std::integral_constant<bool, std::is_convertible<T, int>::value and
-    std::is_enum<T>::value>;
-
-/*
-Implementation of two C++17 constructs: conjunction, negation. This is needed
-to avoid evaluating all the traits in a condition
-
-For example: not std::is_same<void, T>::value and has_value_type<T>::value
-will not compile when T = void (on MSVC at least). Whereas
-conjunction<negation<std::is_same<void, T>>, has_value_type<T>>::value will
-stop evaluating if negation<...>::value == false
-
-Please note that those constructs must be used with caution, since symbols can
-become very long quickly (which can slow down compilation and cause MSVC
-internal compiler errors). Only use it when you have to (see example ahead).
-*/
-template<class...> struct conjunction : std::true_type {};
-template<class B1> struct conjunction<B1> : B1 {};
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
-
-template<class B> struct negation : std::integral_constant < bool, !B::value > {};
-
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
-
-
-//////////////////
-// constructors //
-//////////////////
-
-template<value_t> struct external_constructor;
-
-template<>
-struct external_constructor<value_t::boolean>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
-    {
-        j.m_type = value_t::boolean;
-        j.m_value = b;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::string>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
-    {
-        j.m_type = value_t::string;
-        j.m_value = s;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_float>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
-    {
-        // replace infinity and NAN by null
-        if (not std::isfinite(val))
-        {
-            j = BasicJsonType{};
-        }
-        else
-        {
-            j.m_type = value_t::number_float;
-            j.m_value = val;
-        }
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_unsigned>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
-    {
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_integer>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
-    {
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::array>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
-    {
-        j.m_type = value_t::array;
-        j.m_value = arr;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename CompatibleArrayType,
-             enable_if_t<not std::is_same<CompatibleArrayType,
-                                          typename BasicJsonType::array_t>::value,
-                         int> = 0>
-    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
-    {
-        using std::begin;
-        using std::end;
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::object>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
-    {
-        j.m_type = value_t::object;
-        j.m_value = obj;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename CompatibleObjectType,
-             enable_if_t<not std::is_same<CompatibleObjectType,
-                                          typename BasicJsonType::object_t>::value,
-                         int> = 0>
-    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
-        j.assert_invariant();
-    }
-};
-
-
-////////////////////////
-// has_/is_ functions //
-////////////////////////
-
-/*!
-@brief Helper to determine whether there's a key_type for T.
-
-This helper is used to tell associative containers apart from other containers
-such as sequence containers. For instance, `std::map` passes the test as it
-contains a `mapped_type`, whereas `std::vector` fails the test.
-
-@sa http://stackoverflow.com/a/7728728/266378
-@since version 1.0.0, overworked in version 2.0.6
-*/
-#define NLOHMANN_JSON_HAS_HELPER(type)                                        \
-    template<typename T> struct has_##type {                                  \
-    private:                                                                  \
-        template<typename U, typename = typename U::type>                     \
-        static int detect(U &&);                                              \
-        static void detect(...);                                              \
-    public:                                                                   \
-        static constexpr bool value =                                         \
-                std::is_integral<decltype(detect(std::declval<T>()))>::value; \
-    }
-
-NLOHMANN_JSON_HAS_HELPER(mapped_type);
-NLOHMANN_JSON_HAS_HELPER(key_type);
-NLOHMANN_JSON_HAS_HELPER(value_type);
-NLOHMANN_JSON_HAS_HELPER(iterator);
-
-#undef NLOHMANN_JSON_HAS_HELPER
-
-
-template<bool B, class RealType, class CompatibleObjectType>
-struct is_compatible_object_type_impl : std::false_type {};
-
-template<class RealType, class CompatibleObjectType>
-struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
-{
-    static constexpr auto value =
-        std::is_constructible<typename RealType::key_type,
-        typename CompatibleObjectType::key_type>::value and
-        std::is_constructible<typename RealType::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
-};
-
-template<class BasicJsonType, class CompatibleObjectType>
-struct is_compatible_object_type
-{
-    static auto constexpr value = is_compatible_object_type_impl <
-                                  conjunction<negation<std::is_same<void, CompatibleObjectType>>,
-                                  has_mapped_type<CompatibleObjectType>,
-                                  has_key_type<CompatibleObjectType>>::value,
-                                  typename BasicJsonType::object_t, CompatibleObjectType >::value;
-};
-
-template<typename BasicJsonType, typename T>
-struct is_basic_json_nested_type
-{
-    static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::const_iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::reverse_iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::const_reverse_iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::json_pointer>::value;
-};
-
-template<class BasicJsonType, class CompatibleArrayType>
-struct is_compatible_array_type
-{
-    static auto constexpr value =
-        conjunction<negation<std::is_same<void, CompatibleArrayType>>,
-        negation<is_compatible_object_type<
-        BasicJsonType, CompatibleArrayType>>,
-        negation<std::is_constructible<typename BasicJsonType::string_t,
-        CompatibleArrayType>>,
-        negation<is_basic_json_nested_type<BasicJsonType, CompatibleArrayType>>,
-        has_value_type<CompatibleArrayType>,
-        has_iterator<CompatibleArrayType>>::value;
-};
-
-template<bool, typename, typename>
-struct is_compatible_integer_type_impl : std::false_type {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl<true, RealIntegerType, CompatibleNumberIntegerType>
-{
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
-
-    static constexpr auto value =
-        std::is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value and
-        CompatibleLimits::is_integer and
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-{
-    static constexpr auto value =
-        is_compatible_integer_type_impl <
-        std::is_integral<CompatibleNumberIntegerType>::value and
-        not std::is_same<bool, CompatibleNumberIntegerType>::value,
-        RealIntegerType, CompatibleNumberIntegerType > ::value;
-};
-
-
-// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template<typename BasicJsonType, typename T>
-struct has_from_json
-{
-  private:
-    // also check the return type of from_json
-    template<typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
-                 std::declval<BasicJsonType>(), std::declval<T&>()))>::value>>
-    static int detect(U&&);
-    static void detect(...);
-
-  public:
-    static constexpr bool value = std::is_integral<decltype(
-                                      detect(std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
-};
-
-// This trait checks if JSONSerializer<T>::from_json(json const&) exists
-// this overload is used for non-default-constructible user-defined-types
-template<typename BasicJsonType, typename T>
-struct has_non_default_from_json
-{
-  private:
-    template <
-        typename U,
-        typename = enable_if_t<std::is_same<
-                                   T, decltype(uncvref_t<U>::from_json(std::declval<BasicJsonType>()))>::value >>
-    static int detect(U&&);
-    static void detect(...);
-
-  public:
-    static constexpr bool value = std::is_integral<decltype(detect(
-                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
-};
-
-// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-template<typename BasicJsonType, typename T>
-struct has_to_json
-{
-  private:
-    template<typename U, typename = decltype(uncvref_t<U>::to_json(
-                 std::declval<BasicJsonType&>(), std::declval<T>()))>
-    static int detect(U&&);
-    static void detect(...);
-
-  public:
-    static constexpr bool value = std::is_integral<decltype(detect(
-                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
-};
-
-
-/////////////
-// to_json //
-/////////////
-
-template<typename BasicJsonType, typename T, enable_if_t<
-             std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
-{
-    external_constructor<value_t::boolean>::construct(j, b);
-}
-
-template<typename BasicJsonType, typename CompatibleString,
-         enable_if_t<std::is_constructible<typename BasicJsonType::string_t,
-                     CompatibleString>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleString& s)
-{
-    external_constructor<value_t::string>::construct(j, s);
-}
-
-template<typename BasicJsonType, typename FloatType,
-         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-void to_json(BasicJsonType& j, FloatType val) noexcept
-{
-    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
-}
-
-template <
-    typename BasicJsonType, typename CompatibleNumberUnsignedType,
-    enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t,
-                CompatibleNumberUnsignedType>::value, int> = 0 >
-void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
-{
-    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
-}
-
-template <
-    typename BasicJsonType, typename CompatibleNumberIntegerType,
-    enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t,
-                CompatibleNumberIntegerType>::value, int> = 0 >
-void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
-{
-    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
-}
-
-template<typename BasicJsonType, typename UnscopedEnumType,
-         enable_if_t<is_unscoped_enum<UnscopedEnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, UnscopedEnumType e) noexcept
-{
-    external_constructor<value_t::number_integer>::construct(j, e);
-}
-
-template <
-    typename BasicJsonType, typename CompatibleArrayType,
-    enable_if_t <
-        is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or
-        std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value,
-        int > = 0 >
-void to_json(BasicJsonType& j, const  CompatibleArrayType& arr)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template <
-    typename BasicJsonType, typename CompatibleObjectType,
-    enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value,
-                int> = 0 >
-void to_json(BasicJsonType& j, const  CompatibleObjectType& arr)
-{
-    external_constructor<value_t::object>::construct(j, arr);
-}
-
-
-///////////////
-// from_json //
-///////////////
-
-// overloads for basic_json template parameters
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
-                     not std::is_same<ArithmeticType,
-                                      typename BasicJsonType::boolean_t>::value,
-                     int> = 0>
-void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(
-                      *j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(
-                      *j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(
-                      *j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        default:
-        {
-            JSON_THROW(
-                std::domain_error("type must be number, but is " + j.type_name()));
-        }
-    }
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
-{
-    if (not j.is_boolean())
-    {
-        JSON_THROW(std::domain_error("type must be boolean, but is " + j.type_name()));
-    }
-    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
-{
-    if (not j.is_string())
-    {
-        JSON_THROW(std::domain_error("type must be string, but is " + j.type_name()));
-    }
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType, typename UnscopedEnumType,
-         enable_if_t<is_unscoped_enum<UnscopedEnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, UnscopedEnumType& e)
-{
-    typename std::underlying_type<UnscopedEnumType>::type val;
-    get_arithmetic_value(j, val);
-    e = static_cast<UnscopedEnumType>(val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::array_t& arr)
-{
-    if (not j.is_array())
-    {
-        JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-    }
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
-
-// forward_list doesn't have an insert method
-template<typename BasicJsonType, typename T, typename Allocator>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
-{
-    // do not perform the check when user wants to retrieve jsons
-    // (except when it's null.. ?)
-    if (j.is_null())
-    {
-        JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-    }
-    if (not std::is_same<T, BasicJsonType>::value)
-    {
-        if (not j.is_array())
-        {
-            JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-        }
-    }
-    for (auto it = j.rbegin(), end = j.rend(); it != end; ++it)
-    {
-        l.push_front(it->template get<T>());
-    }
-}
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<0>)
-{
-    using std::begin;
-    using std::end;
-
-    std::transform(j.begin(), j.end(),
-                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename CompatibleArrayType::value_type>();
-    });
-}
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1>)
--> decltype(
-    arr.reserve(std::declval<typename CompatibleArrayType::size_type>()),
-    void())
-{
-    using std::begin;
-    using std::end;
-
-    arr.reserve(j.size());
-    std::transform(
-        j.begin(), j.end(), std::inserter(arr, end(arr)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename CompatibleArrayType::value_type>();
-    });
-}
-
-template<typename BasicJsonType, typename CompatibleArrayType,
-         enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value and
-                     not std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value, int> = 0>
-void from_json(const BasicJsonType& j, CompatibleArrayType& arr)
-{
-    if (j.is_null())
-    {
-        JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-    }
-
-    // when T == BasicJsonType, do not check if value_t is correct
-    if (not std::is_same<typename CompatibleArrayType::value_type, BasicJsonType>::value)
-    {
-        if (not j.is_array())
-        {
-            JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-        }
-    }
-    from_json_array_impl(j, arr, priority_tag<1> {});
-}
-
-template<typename BasicJsonType, typename CompatibleObjectType,
-         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, CompatibleObjectType& obj)
-{
-    if (not j.is_object())
-    {
-        JSON_THROW(std::domain_error("type must be object, but is " + j.type_name()));
-    }
-
-    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
-    using std::begin;
-    using std::end;
-    // we could avoid the assignment, but this might require a for loop, which
-    // might be less efficient than the container constructor for some
-    // containers (would it?)
-    obj = CompatibleObjectType(begin(*inner_object), end(*inner_object));
-}
-
-// overload for arithmetic types, not chosen for basic_json template arguments
-// (BooleanType, etc..); note: Is it really necessary to provide explicit
-// overloads for boolean_t etc. in case of a custom BooleanType which is not
-// an arithmetic type?
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t <
-             std::is_arithmetic<ArithmeticType>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-             int> = 0>
-void from_json(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        case value_t::boolean:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
-            break;
-        }
-        default:
-        {
-            JSON_THROW(std::domain_error("type must be number, but is " + j.type_name()));
-        }
-    }
-}
-
-struct to_json_fn
-{
-  private:
-    template<typename BasicJsonType, typename T>
-    auto call(BasicJsonType& j, T&& val, priority_tag<1>) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
-    -> decltype(to_json(j, std::forward<T>(val)), void())
-    {
-        return to_json(j, std::forward<T>(val));
-    }
-
-    template<typename BasicJsonType, typename T>
-    void call(BasicJsonType&, T&&, priority_tag<0>) const noexcept
-    {
-        static_assert(sizeof(BasicJsonType) == 0,
-                      "could not find to_json() method in T's namespace");
-    }
-
-  public:
-    template<typename BasicJsonType, typename T>
-    void operator()(BasicJsonType& j, T&& val) const
-    noexcept(noexcept(std::declval<to_json_fn>().call(j, std::forward<T>(val), priority_tag<1> {})))
-    {
-        return call(j, std::forward<T>(val), priority_tag<1> {});
-    }
-};
-
-struct from_json_fn
-{
-  private:
-    template<typename BasicJsonType, typename T>
-    auto call(const BasicJsonType& j, T& val, priority_tag<1>) const
-    noexcept(noexcept(from_json(j, val)))
-    -> decltype(from_json(j, val), void())
-    {
-        return from_json(j, val);
-    }
-
-    template<typename BasicJsonType, typename T>
-    void call(const BasicJsonType&, T&, priority_tag<0>) const noexcept
-    {
-        static_assert(sizeof(BasicJsonType) == 0,
-                      "could not find from_json() method in T's namespace");
-    }
-
-  public:
-    template<typename BasicJsonType, typename T>
-    void operator()(const BasicJsonType& j, T& val) const
-    noexcept(noexcept(std::declval<from_json_fn>().call(j, val, priority_tag<1> {})))
-    {
-        return call(j, val, priority_tag<1> {});
-    }
-};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static constexpr T value{};
-};
-
-template<typename T>
-constexpr T static_const<T>::value;
-} // namespace detail
-
-
-/// namespace to hold default `to_json` / `from_json` functions
-namespace
-{
-constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
-}
-
-
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename = void, typename = void>
-struct adl_serializer
-{
-    /*!
-    @brief convert a JSON value to any value type
-
-    This function is usually called by the `get()` function of the
-    @ref basic_json class (either explicit or via conversion operators).
-
-    @param[in] j         JSON value to read from
-    @param[in,out] val  value to write to
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static void from_json(BasicJsonType&& j, ValueType& val) noexcept(
-        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
-    {
-        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
-    }
-
-    /*!
-    @brief convert any value type to a JSON value
-
-    This function is usually called by the constructors of the @ref basic_json
-    class.
-
-    @param[in,out] j  JSON value to write to
-    @param[in] val     value to read from
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
-    {
-        ::nlohmann::to_json(j, std::forward<ValueType>(val));
-    }
-};
-
-
-/*!
-@brief a class to store JSON values
-
-@tparam ObjectType type for JSON objects (`std::map` by default; will be used
-in @ref object_t)
-@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
-in @ref array_t)
-@tparam StringType type for JSON strings and object keys (`std::string` by
-default; will be used in @ref string_t)
-@tparam BooleanType type for JSON booleans (`bool` by default; will be used
-in @ref boolean_t)
-@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
-default; will be used in @ref number_integer_t)
-@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
-`uint64_t` by default; will be used in @ref number_unsigned_t)
-@tparam NumberFloatType type for JSON floating-point numbers (`double` by
-default; will be used in @ref number_float_t)
-@tparam AllocatorType type of the allocator to use (`std::allocator` by
-default)
-@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
-and `from_json()` (@ref adl_serializer by default)
-
-@requirement The class satisfies the following concept requirements:
-- Basic
- - [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible):
-   JSON values can be default constructed. The result will be a JSON null
-   value.
- - [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible):
-   A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible):
-   A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](http://en.cppreference.com/w/cpp/concept/MoveAssignable):
-   A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](http://en.cppreference.com/w/cpp/concept/CopyAssignable):
-   A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](http://en.cppreference.com/w/cpp/concept/Destructible):
-   JSON values can be destructed.
-- Layout
- - [StandardLayoutType](http://en.cppreference.com/w/cpp/concept/StandardLayoutType):
-   JSON values have
-   [standard layout](http://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
-   All non-static data members are private and standard layout types, the
-   class has no virtual functions or (virtual) base classes.
-- Library-wide
- - [EqualityComparable](http://en.cppreference.com/w/cpp/concept/EqualityComparable):
-   JSON values can be compared with `==`, see @ref
-   operator==(const_reference,const_reference).
- - [LessThanComparable](http://en.cppreference.com/w/cpp/concept/LessThanComparable):
-   JSON values can be compared with `<`, see @ref
-   operator<(const_reference,const_reference).
- - [Swappable](http://en.cppreference.com/w/cpp/concept/Swappable):
-   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
-   other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](http://en.cppreference.com/w/cpp/concept/NullablePointer):
-   JSON values can be compared against `std::nullptr_t` objects which are used
-   to model the `null` value.
-- Container
- - [Container](http://en.cppreference.com/w/cpp/concept/Container):
-   JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer);
-   JSON values can be used like STL containers and provide reverse iterator
-   access.
-
-@invariant The member variables @a m_value and @a m_type have the following
-relationship:
-- If `m_type == value_t::object`, then `m_value.object != nullptr`.
-- If `m_type == value_t::array`, then `m_value.array != nullptr`.
-- If `m_type == value_t::string`, then `m_value.string != nullptr`.
-The invariants are checked by member function assert_invariant().
-
-@internal
-@note ObjectType trick from http://stackoverflow.com/a/9860911
-@endinternal
-
-@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
-Format](http://rfc7159.net/rfc7159)
-
-@since version 1.0.0
-
-@nosubgrouping
-*/
-template <
-    template<typename U, typename V, typename... Args> class ObjectType = std::map,
-    template<typename U, typename... Args> class ArrayType = std::vector,
-    class StringType = std::string,
-    class BooleanType = bool,
-    class NumberIntegerType = std::int64_t,
-    class NumberUnsignedType = std::uint64_t,
-    class NumberFloatType = double,
-    template<typename U> class AllocatorType = std::allocator,
-    template<typename T, typename SFINAE = void> class JSONSerializer = adl_serializer
-    >
-class basic_json
-{
-  private:
-    template<detail::value_t> friend struct detail::external_constructor;
-    /// workaround type for MSVC
-    using basic_json_t = basic_json<ObjectType, ArrayType, StringType,
-          BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType,
-          AllocatorType, JSONSerializer>;
-
-  public:
-    using value_t = detail::value_t;
-    // forward declarations
-    template<typename U> class iter_impl;
-    template<typename Base> class json_reverse_iterator;
-    class json_pointer;
-    template<typename T, typename SFINAE>
-    using json_serializer = JSONSerializer<T, SFINAE>;
-
-    /////////////////////
-    // container types //
-    /////////////////////
-
-    /// @name container types
-    /// The canonic container types to use @ref basic_json like any other STL
-    /// container.
-    /// @{
-
-    /// the type of elements in a basic_json container
-    using value_type = basic_json;
-
-    /// the type of an element reference
-    using reference = value_type&;
-    /// the type of an element const reference
-    using const_reference = const value_type&;
-
-    /// a type to represent differences between iterators
-    using difference_type = std::ptrdiff_t;
-    /// a type to represent container sizes
-    using size_type = std::size_t;
-
-    /// the allocator type
-    using allocator_type = AllocatorType<basic_json>;
-
-    /// the type of an element pointer
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    /// the type of an element const pointer
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-
-    /// an iterator for a basic_json container
-    using iterator = iter_impl<basic_json>;
-    /// a const iterator for a basic_json container
-    using const_iterator = iter_impl<const basic_json>;
-    /// a reverse iterator for a basic_json container
-    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
-    /// a const reverse iterator for a basic_json container
-    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
-
-    /// @}
-
-
-    /*!
-    @brief returns the allocator associated with the container
-    */
-    static allocator_type get_allocator()
-    {
-        return allocator_type();
-    }
-
-    /*!
-    @brief returns version information on the library
-
-    This function returns a JSON object with information about the library,
-    including the version number and information on the platform and compiler.
-
-    @return JSON object holding version information
-    key         | description
-    ----------- | ---------------
-    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
-    `copyright` | The copyright line for the library as string.
-    `name`      | The name of the library as string.
-    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
-    `url`       | The URL of the project as string.
-    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
-
-    @liveexample{The following code shows an example output of the `meta()`
-    function.,meta}
-
-    @complexity Constant.
-
-    @since 2.1.0
-    */
-    static basic_json meta()
-    {
-        basic_json result;
-
-        result["copyright"] = "(C) 2013-2017 Niels Lohmann";
-        result["name"] = "JSON for Modern C++";
-        result["url"] = "https://github.com/nlohmann/json";
-        result["version"] =
-        {
-            {"string", "2.1.1"},
-            {"major", 2},
-            {"minor", 1},
-            {"patch", 1}
-        };
-
-#ifdef _WIN32
-        result["platform"] = "win32";
-#elif defined __linux__
-        result["platform"] = "linux";
-#elif defined __APPLE__
-        result["platform"] = "apple";
-#elif defined __unix__
-        result["platform"] = "unix";
-#else
-        result["platform"] = "unknown";
-#endif
-
-#if defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
-#elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
-#elif defined(__HP_cc) || defined(__HP_aCC)
-        result["compiler"] = "hp"
-#elif defined(__IBMCPP__)
-        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
-#elif defined(_MSC_VER)
-        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
-#elif defined(__PGI)
-        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
-#elif defined(__SUNPRO_CC)
-        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
-#else
-        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
-#endif
-
-#ifdef __cplusplus
-        result["compiler"]["c++"] = std::to_string(__cplusplus);
-#else
-        result["compiler"]["c++"] = "unknown";
-#endif
-        return result;
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// @name JSON value data types
-    /// The data types to store a JSON value. These types are derived from
-    /// the template arguments passed to class @ref basic_json.
-    /// @{
-
-    /*!
-    @brief a type for an object
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
-    > An object is an unordered collection of zero or more name/value pairs,
-    > where a name is a string and a value is a string, number, boolean, null,
-    > object, or array.
-
-    To store objects in C++, a type is defined by the template parameters
-    described below.
-
-    @tparam ObjectType  the container to store objects (e.g., `std::map` or
-    `std::unordered_map`)
-    @tparam StringType the type of the keys or names (e.g., `std::string`).
-    The comparison function `std::less<StringType>` is used to order elements
-    inside the container.
-    @tparam AllocatorType the allocator to use for objects (e.g.,
-    `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ObjectType (`std::map`), @a StringType
-    (`std::string`), and @a AllocatorType (`std::allocator`), the default
-    value for @a object_t is:
-
-    @code {.cpp}
-    std::map<
-      std::string, // key_type
-      basic_json, // value_type
-      std::less<std::string>, // key_compare
-      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
-    >
-    @endcode
-
-    #### Behavior
-
-    The choice of @a object_t influences the behavior of the JSON class. With
-    the default type, objects have the following behavior:
-
-    - When all names are unique, objects will be interoperable in the sense
-      that all software implementations receiving that object will agree on
-      the name-value mappings.
-    - When the names within an object are not unique, later stored name/value
-      pairs overwrite previously stored name/value pairs, leaving the used
-      names unique. For instance, `{"key": 1}` and `{"key": 2, "key": 1}` will
-      be treated as equal and both stored as `{"key": 1}`.
-    - Internally, name/value pairs are stored in lexicographical order of the
-      names. Objects will also be serialized (see @ref dump) in this order.
-      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
-      and serialized as `{"a": 2, "b": 1}`.
-    - When comparing objects, the order of the name/value pairs is irrelevant.
-      This makes objects interoperable in the sense that they will not be
-      affected by these differences. For instance, `{"b": 1, "a": 2}` and
-      `{"a": 2, "b": 1}` will be treated as equal.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the object's limit of nesting is not constraint explicitly.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON object.
-
-    #### Storage
-
-    Objects are stored as pointers in a @ref basic_json type. That is, for any
-    access to object values, a pointer of type `object_t*` must be
-    dereferenced.
-
-    @sa @ref array_t -- type for an array value
-
-    @since version 1.0.0
-
-    @note The order name/value pairs are added to the object is *not*
-    preserved by the library. Therefore, iterating an object may return
-    name/value pairs in a different order than they were originally stored. In
-    fact, keys will be traversed in alphabetical order as `std::map` with
-    `std::less` is used by default. Please note this behavior conforms to [RFC
-    7159](http://rfc7159.net/rfc7159), because any order implements the
-    specified "unordered" nature of JSON objects.
-    */
-    using object_t = ObjectType<StringType,
-          basic_json,
-          std::less<StringType>,
-          AllocatorType<std::pair<const StringType,
-          basic_json>>>;
-
-    /*!
-    @brief a type for an array
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
-    > An array is an ordered sequence of zero or more values.
-
-    To store objects in C++, a type is defined by the template parameters
-    explained below.
-
-    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
-    `std::list`)
-    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ArrayType (`std::vector`) and @a
-    AllocatorType (`std::allocator`), the default value for @a array_t is:
-
-    @code {.cpp}
-    std::vector<
-      basic_json, // value_type
-      std::allocator<basic_json> // allocator_type
-    >
-    @endcode
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the array's limit of nesting is not constraint explicitly.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON array.
-
-    #### Storage
-
-    Arrays are stored as pointers in a @ref basic_json type. That is, for any
-    access to array values, a pointer of type `array_t*` must be dereferenced.
-
-    @sa @ref object_t -- type for an object value
-
-    @since version 1.0.0
-    */
-    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-    /*!
-    @brief a type for a string
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
-    > A string is a sequence of zero or more Unicode characters.
-
-    To store objects in C++, a type is defined by the template parameter
-    described below. Unicode values are split by the JSON class into
-    byte-sized characters during deserialization.
-
-    @tparam StringType  the container to store strings (e.g., `std::string`).
-    Note this container is used for keys/names in objects, see @ref object_t.
-
-    #### Default type
-
-    With the default values for @a StringType (`std::string`), the default
-    value for @a string_t is:
-
-    @code {.cpp}
-    std::string
-    @endcode
-
-    #### Encoding
-
-    Strings are stored in UTF-8 encoding. Therefore, functions like
-    `std::string::size()` or `std::string::length()` return the number of
-    bytes in the string rather than the number of characters or glyphs.
-
-    #### String comparison
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > Software implementations are typically required to test names of object
-    > members for equality. Implementations that transform the textual
-    > representation into sequences of Unicode code units and then perform the
-    > comparison numerically, code unit by code unit, are interoperable in the
-    > sense that implementations will agree in all cases on equality or
-    > inequality of two strings. For example, implementations that compare
-    > strings with escaped characters unconverted may incorrectly find that
-    > `"a\\b"` and `"a\u005Cb"` are not equal.
-
-    This implementation is interoperable as it does compare strings code unit
-    by code unit.
-
-    #### Storage
-
-    String values are stored as pointers in a @ref basic_json type. That is,
-    for any access to string values, a pointer of type `string_t*` must be
-    dereferenced.
-
-    @since version 1.0.0
-    */
-    using string_t = StringType;
-
-    /*!
-    @brief a type for a boolean
-
-    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
-    type which differentiates the two literals `true` and `false`.
-
-    To store objects in C++, a type is defined by the template parameter @a
-    BooleanType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a BooleanType (`bool`), the default value for
-    @a boolean_t is:
-
-    @code {.cpp}
-    bool
-    @endcode
-
-    #### Storage
-
-    Boolean values are stored directly inside a @ref basic_json type.
-
-    @since version 1.0.0
-    */
-    using boolean_t = BooleanType;
-
-    /*!
-    @brief a type for a number (integer)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store integer numbers in C++, a type is defined by the template
-    parameter @a NumberIntegerType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberIntegerType (`int64_t`), the default
-    value for @a number_integer_t is:
-
-    @code {.cpp}
-    int64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
-    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
-    that are out of range will yield over/underflow when used in a
-    constructor. During deserialization, too large or small integer numbers
-    will be automatically be stored as @ref number_unsigned_t or @ref
-    number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange of the exactly supported range [INT64_MIN,
-    INT64_MAX], this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_integer_t = NumberIntegerType;
-
-    /*!
-    @brief a type for a number (unsigned)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store unsigned integer numbers in C++, a type is defined by the
-    template parameter @a NumberUnsignedType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberUnsignedType (`uint64_t`), the
-    default value for @a number_unsigned_t is:
-
-    @code {.cpp}
-    uint64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
-    number that can be stored is `0`. Integer numbers that are out of range
-    will yield over/underflow when used in a constructor. During
-    deserialization, too large or small integer numbers will be automatically
-    be stored as @ref number_integer_t or @ref number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange (when considered in conjunction with the
-    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
-    this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @since version 2.0.0
-    */
-    using number_unsigned_t = NumberUnsignedType;
-
-    /*!
-    @brief a type for a number (floating-point)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store floating-point numbers in C++, a type is defined by the template
-    parameter @a NumberFloatType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberFloatType (`double`), the default
-    value for @a number_float_t is:
-
-    @code {.cpp}
-    double
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in floating-point literals will be ignored. Internally,
-      the value will be stored as decimal number. For instance, the C++
-      floating-point literal `01.2` will be serialized to `1.2`. During
-      deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > This specification allows implementations to set limits on the range and
-    > precision of numbers accepted. Since software that implements IEEE
-    > 754-2008 binary64 (double precision) numbers is generally available and
-    > widely used, good interoperability can be achieved by implementations
-    > that expect no more precision or range than these provide, in the sense
-    > that implementations will approximate JSON numbers within the expected
-    > precision.
-
-    This implementation does exactly follow this approach, as it uses double
-    precision floating-point numbers. Note values smaller than
-    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
-    will be stored as NaN internally and be serialized to `null`.
-
-    #### Storage
-
-    Floating-point number values are stored directly inside a @ref basic_json
-    type.
-
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_float_t = NumberFloatType;
-
-    /// @}
-
-  private:
-
-    /// helper for exception-safe object creation
-    template<typename T, typename... Args>
-    static T* create(Args&& ... args)
-    {
-        AllocatorType<T> alloc;
-        auto deleter = [&](T * object)
-        {
-            alloc.deallocate(object, 1);
-        };
-        std::unique_ptr<T, decltype(deleter)> object(alloc.allocate(1), deleter);
-        alloc.construct(object.get(), std::forward<Args>(args)...);
-        assert(object != nullptr);
-        return object.release();
-    }
-
-    ////////////////////////
-    // JSON value storage //
-    ////////////////////////
-
-    /*!
-    @brief a JSON value
-
-    The actual storage for a JSON value of the @ref basic_json class. This
-    union combines the different storage types for the JSON value types
-    defined in @ref value_t.
-
-    JSON type | value_t type    | used type
-    --------- | --------------- | ------------------------
-    object    | object          | pointer to @ref object_t
-    array     | array           | pointer to @ref array_t
-    string    | string          | pointer to @ref string_t
-    boolean   | boolean         | @ref boolean_t
-    number    | number_integer  | @ref number_integer_t
-    number    | number_unsigned | @ref number_unsigned_t
-    number    | number_float    | @ref number_float_t
-    null      | null            | *no value is stored*
-
-    @note Variable-length types (objects, arrays, and strings) are stored as
-    pointers. The size of the union should not exceed 64 bits if the default
-    value types are used.
-
-    @since version 1.0.0
-    */
-    union json_value
-    {
-        /// object (stored with pointer to save storage)
-        object_t* object;
-        /// array (stored with pointer to save storage)
-        array_t* array;
-        /// string (stored with pointer to save storage)
-        string_t* string;
-        /// boolean
-        boolean_t boolean;
-        /// number (integer)
-        number_integer_t number_integer;
-        /// number (unsigned integer)
-        number_unsigned_t number_unsigned;
-        /// number (floating-point)
-        number_float_t number_float;
-
-        /// default constructor (for null values)
-        json_value() = default;
-        /// constructor for booleans
-        json_value(boolean_t v) noexcept : boolean(v) {}
-        /// constructor for numbers (integer)
-        json_value(number_integer_t v) noexcept : number_integer(v) {}
-        /// constructor for numbers (unsigned)
-        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
-        /// constructor for numbers (floating-point)
-        json_value(number_float_t v) noexcept : number_float(v) {}
-        /// constructor for empty values of a given type
-        json_value(value_t t)
-        {
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    object = create<object_t>();
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    array = create<array_t>();
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    string = create<string_t>("");
-                    break;
-                }
-
-                case value_t::boolean:
-                {
-                    boolean = boolean_t(false);
-                    break;
-                }
-
-                case value_t::number_integer:
-                {
-                    number_integer = number_integer_t(0);
-                    break;
-                }
-
-                case value_t::number_unsigned:
-                {
-                    number_unsigned = number_unsigned_t(0);
-                    break;
-                }
-
-                case value_t::number_float:
-                {
-                    number_float = number_float_t(0.0);
-                    break;
-                }
-
-                case value_t::null:
-                {
-                    break;
-                }
-
-                default:
-                {
-                    if (t == value_t::null)
-                    {
-                        JSON_THROW(std::domain_error("961c151d2e87f2686a955a9be24d316f1362bf21 2.1.1")); // LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-            }
-        }
-
-        /// constructor for strings
-        json_value(const string_t& value)
-        {
-            string = create<string_t>(value);
-        }
-
-        /// constructor for objects
-        json_value(const object_t& value)
-        {
-            object = create<object_t>(value);
-        }
-
-        /// constructor for arrays
-        json_value(const array_t& value)
-        {
-            array = create<array_t>(value);
-        }
-    };
-
-    /*!
-    @brief checks the class invariants
-
-    This function asserts the class invariants. It needs to be called at the
-    end of every constructor to make sure that created objects respect the
-    invariant. Furthermore, it has to be called each time the type of a JSON
-    value is changed, because the invariant expresses a relationship between
-    @a m_type and @a m_value.
-    */
-    void assert_invariant() const
-    {
-        assert(m_type != value_t::object or m_value.object != nullptr);
-        assert(m_type != value_t::array or m_value.array != nullptr);
-        assert(m_type != value_t::string or m_value.string != nullptr);
-    }
-
-  public:
-    //////////////////////////
-    // JSON parser callback //
-    //////////////////////////
-
-    /*!
-    @brief JSON callback events
-
-    This enumeration lists the parser events that can trigger calling a
-    callback function of type @ref parser_callback_t during parsing.
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    @since version 1.0.0
-    */
-    enum class parse_event_t : uint8_t
-    {
-        /// the parser read `{` and started to process a JSON object
-        object_start,
-        /// the parser read `}` and finished processing a JSON object
-        object_end,
-        /// the parser read `[` and started to process a JSON array
-        array_start,
-        /// the parser read `]` and finished processing a JSON array
-        array_end,
-        /// the parser read a key of a value in an object
-        key,
-        /// the parser finished reading a JSON value
-        value
-    };
-
-    /*!
-    @brief per-element parser callback type
-
-    With a parser callback function, the result of parsing a JSON text can be
-    influenced. When passed to @ref parse(std::istream&, const
-    parser_callback_t) or @ref parse(const CharT, const parser_callback_t),
-    it is called on certain events (passed as @ref parse_event_t via parameter
-    @a event) with a set recursion depth @a depth and context JSON value
-    @a parsed. The return value of the callback function is a boolean
-    indicating whether the element that emitted the callback shall be kept or
-    not.
-
-    We distinguish six scenarios (determined by the event type) in which the
-    callback function can be called. The following table describes the values
-    of the parameters @a depth, @a event, and @a parsed.
-
-    parameter @a event | description | parameter @a depth | parameter @a parsed
-    ------------------ | ----------- | ------------------ | -------------------
-    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    Discarding a value (i.e., returning `false`) has different effects
-    depending on the context in which function was called:
-
-    - Discarded values in structured types are skipped. That is, the parser
-      will behave as if the discarded value was never read.
-    - In case a value outside a structured type is skipped, it is replaced
-      with `null`. This case happens if the top-level element is skipped.
-
-    @param[in] depth  the depth of the recursion during parsing
-
-    @param[in] event  an event of type parse_event_t indicating the context in
-    the callback function has been called
-
-    @param[in,out] parsed  the current intermediate parse result; note that
-    writing to this value has no effect for parse_event_t::key events
-
-    @return Whether the JSON value which called the function during parsing
-    should be kept (`true`) or not (`false`). In the latter case, it is either
-    skipped completely or replaced by an empty discarded object.
-
-    @sa @ref parse(std::istream&, parser_callback_t) or
-    @ref parse(const CharT, const parser_callback_t) for examples
-
-    @since version 1.0.0
-    */
-    using parser_callback_t = std::function<bool(int depth,
-                              parse_event_t event,
-                              basic_json& parsed)>;
-
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /// @name constructors and destructors
-    /// Constructors of class @ref basic_json, copy/move constructor, copy
-    /// assignment, static functions creating objects, and the destructor.
-    /// @{
-
-    /*!
-    @brief create an empty value with a given type
-
-    Create an empty JSON value with a given type. The value will be default
-    initialized with an empty value which depends on the type:
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-
-    @param[in] value_type  the type of the value to create
-
-    @complexity Constant.
-
-    @throw std::bad_alloc if allocation for object, array, or string value
-    fails
-
-    @liveexample{The following code shows the constructor for different @ref
-    value_t values,basic_json__value_t}
-
-    @since version 1.0.0
-    */
-    basic_json(const value_t value_type)
-        : m_type(value_type), m_value(value_type)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a null object
-
-    Create a `null` JSON value. It either takes a null pointer as parameter
-    (explicitly creating `null`) or no parameter (implicitly creating `null`).
-    The passed null pointer itself is not read -- it is only used to choose
-    the right constructor.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @liveexample{The following code shows the constructor with and without a
-    null pointer parameter.,basic_json__nullptr_t}
-
-    @since version 1.0.0
-    */
-    basic_json(std::nullptr_t = nullptr) noexcept
-        : basic_json(value_t::null)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a JSON value
-
-    This is a "catch all" constructor for all compatible JSON types; that is,
-    types for which a `to_json()` method exsits. The constructor forwards the
-    parameter @a val to that method (to `json_serializer<U>::to_json` method
-    with `U = uncvref_t<CompatibleType>`, to be exact).
-
-    Template type @a CompatibleType includes, but is not limited to, the
-    following types:
-    - **arrays**: @ref array_t and all kinds of compatible containers such as
-      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
-      `std::array`, `std::set`, `std::unordered_set`, `std::multiset`, and
-      `unordered_multiset` with a `value_type` from which a @ref basic_json
-      value can be constructed.
-    - **objects**: @ref object_t and all kinds of compatible associative
-      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
-      and `std::unordered_multimap` with a `key_type` compatible to
-      @ref string_t and a `value_type` from which a @ref basic_json value can
-      be constructed.
-    - **strings**: @ref string_t, string literals, and all compatible string
-      containers can be used.
-    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
-      @ref number_float_t, and all convertible number types such as `int`,
-      `size_t`, `int64_t`, `float` or `double` can be used.
-    - **boolean**: @ref boolean_t / `bool` can be used.
-
-    See the examples below.
-
-    @tparam CompatibleType a type such that:
-    - @a CompatibleType is not derived from `std::istream`,
-    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
-         constructors),
-    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
-         @ref json_pointer, @ref iterator, etc ...)
-    - @ref @ref json_serializer<U> has a
-         `to_json(basic_json_t&, CompatibleType&&)` method
-
-    @tparam U = `uncvref_t<CompatibleType>`
-
-    @param[in] val the value to be forwarded
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @throw what `json_serializer<U>::to_json()` throws
-
-    @liveexample{The following code shows the constructor with several
-    compatible types.,basic_json__CompatibleType}
-
-    @since version 2.1.0
-    */
-    template<typename CompatibleType, typename U = detail::uncvref_t<CompatibleType>,
-             detail::enable_if_t<not std::is_base_of<std::istream, U>::value and
-                                 not std::is_same<U, basic_json_t>::value and
-                                 not detail::is_basic_json_nested_type<
-                                     basic_json_t, U>::value and
-                                 detail::has_to_json<basic_json, U>::value,
-                                 int> = 0>
-    basic_json(CompatibleType && val) noexcept(noexcept(JSONSerializer<U>::to_json(
-                std::declval<basic_json_t&>(), std::forward<CompatibleType>(val))))
-    {
-        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a container (array or object) from an initializer list
-
-    Creates a JSON value of type array or object from the passed initializer
-    list @a init. In case @a type_deduction is `true` (default), the type of
-    the JSON value to be created is deducted from the initializer list @a init
-    according to the following rules:
-
-    1. If the list is empty, an empty JSON object value `{}` is created.
-    2. If the list consists of pairs whose first element is a string, a JSON
-       object value is created where the first elements of the pairs are
-       treated as keys and the second elements are as values.
-    3. In all other cases, an array is created.
-
-    The rules aim to create the best fit between a C++ initializer list and
-    JSON values. The rationale is as follows:
-
-    1. The empty initializer list is written as `{}` which is exactly an empty
-       JSON object.
-    2. C++ has now way of describing mapped types other than to list a list of
-       pairs. As JSON requires that keys must be of type string, rule 2 is the
-       weakest constraint one can pose on initializer lists to interpret them
-       as an object.
-    3. In all other cases, the initializer list could not be interpreted as
-       JSON object type, so interpreting it as JSON array type is safe.
-
-    With the rules described above, the following JSON values cannot be
-    expressed by an initializer list:
-
-    - the empty array (`[]`): use @ref array(std::initializer_list<basic_json>)
-      with an empty initializer list in this case
-    - arrays whose elements satisfy rule 2: use @ref
-      array(std::initializer_list<basic_json>) with the same initializer list
-      in this case
-
-    @note When used without parentheses around an empty initializer list, @ref
-    basic_json() is called instead of this function, yielding the JSON null
-    value.
-
-    @param[in] init  initializer list with JSON values
-
-    @param[in] type_deduction internal parameter; when set to `true`, the type
-    of the JSON value is deducted from the initializer list @a init; when set
-    to `false`, the type provided via @a manual_type is forced. This mode is
-    used by the functions @ref array(std::initializer_list<basic_json>) and
-    @ref object(std::initializer_list<basic_json>).
-
-    @param[in] manual_type internal parameter; when @a type_deduction is set
-    to `false`, the created JSON value will use the provided type (only @ref
-    value_t::array and @ref value_t::object are valid); when @a type_deduction
-    is set to `true`, this parameter has no effect
-
-    @throw std::domain_error if @a type_deduction is `false`, @a manual_type
-    is `value_t::object`, but @a init contains an element which is not a pair
-    whose first element is a string; example: `"cannot create object from
-    initializer list"`
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @liveexample{The example below shows how JSON values are created from
-    initializer lists.,basic_json__list_init_t}
-
-    @sa @ref array(std::initializer_list<basic_json>) -- create a JSON array
-    value from an initializer list
-    @sa @ref object(std::initializer_list<basic_json>) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    basic_json(std::initializer_list<basic_json> init,
-               bool type_deduction = true,
-               value_t manual_type = value_t::array)
-    {
-        // check if each element is an array with two elements whose first
-        // element is a string
-        bool is_an_object = std::all_of(init.begin(), init.end(),
-                                        [](const basic_json & element)
-        {
-            return element.is_array() and element.size() == 2 and element[0].is_string();
-        });
-
-        // adjust type if type deduction is not wanted
-        if (not type_deduction)
-        {
-            // if array is wanted, do not create an object though possible
-            if (manual_type == value_t::array)
-            {
-                is_an_object = false;
-            }
-
-            // if object is wanted but impossible, throw an exception
-            if (manual_type == value_t::object and not is_an_object)
-            {
-                JSON_THROW(std::domain_error("cannot create object from initializer list"));
-            }
-        }
-
-        if (is_an_object)
-        {
-            // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
-
-            std::for_each(init.begin(), init.end(), [this](const basic_json & element)
-            {
-                m_value.object->emplace(*(element[0].m_value.string), element[1]);
-            });
-        }
-        else
-        {
-            // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init);
-        }
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief explicitly create an array from an initializer list
-
-    Creates a JSON array value from a given initializer list. That is, given a
-    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
-    initializer list is empty, the empty array `[]` is created.
-
-    @note This function is only needed to express two edge cases that cannot
-    be realized with the initializer list constructor (@ref
-    basic_json(std::initializer_list<basic_json>, bool, value_t)). These cases
-    are:
-    1. creating an array whose elements are all pairs whose first element is a
-    string -- in this case, the initializer list constructor would create an
-    object, taking the first elements as keys
-    2. creating an empty array -- passing the empty initializer list to the
-    initializer list constructor yields an empty object
-
-    @param[in] init  initializer list with JSON values to create an array from
-    (optional)
-
-    @return JSON array value
-
-    @complexity Linear in the size of @a init.
-
-    @liveexample{The following code shows an example for the `array`
-    function.,array}
-
-    @sa @ref basic_json(std::initializer_list<basic_json>, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref object(std::initializer_list<basic_json>) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    static basic_json array(std::initializer_list<basic_json> init =
-                                std::initializer_list<basic_json>())
-    {
-        return basic_json(init, false, value_t::array);
-    }
-
-    /*!
-    @brief explicitly create an object from an initializer list
-
-    Creates a JSON object value from a given initializer list. The initializer
-    lists elements must be pairs, and their first elements must be strings. If
-    the initializer list is empty, the empty object `{}` is created.
-
-    @note This function is only added for symmetry reasons. In contrast to the
-    related function @ref array(std::initializer_list<basic_json>), there are
-    no cases which can only be expressed by this function. That is, any
-    initializer list @a init can also be passed to the initializer list
-    constructor @ref basic_json(std::initializer_list<basic_json>, bool,
-    value_t).
-
-    @param[in] init  initializer list to create an object from (optional)
-
-    @return JSON object value
-
-    @throw std::domain_error if @a init is not a pair whose first elements are
-    strings; thrown by
-    @ref basic_json(std::initializer_list<basic_json>, bool, value_t)
-
-    @complexity Linear in the size of @a init.
-
-    @liveexample{The following code shows an example for the `object`
-    function.,object}
-
-    @sa @ref basic_json(std::initializer_list<basic_json>, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref array(std::initializer_list<basic_json>) -- create a JSON array
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    static basic_json object(std::initializer_list<basic_json> init =
-                                 std::initializer_list<basic_json>())
-    {
-        return basic_json(init, false, value_t::object);
-    }
-
-    /*!
-    @brief construct an array with count copies of given value
-
-    Constructs a JSON array value by creating @a cnt copies of a passed value.
-    In case @a cnt is `0`, an empty array is created. As postcondition,
-    `std::distance(begin(),end()) == cnt` holds.
-
-    @param[in] cnt  the number of JSON copies of @a val to create
-    @param[in] val  the JSON value to copy
-
-    @complexity Linear in @a cnt.
-
-    @liveexample{The following code shows examples for the @ref
-    basic_json(size_type\, const basic_json&)
-    constructor.,basic_json__size_type_basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
-    {
-        m_value.array = create<array_t>(cnt, val);
-        assert_invariant();
-    }
-
-    /*!
-    @brief construct a JSON container given an iterator range
-
-    Constructs the JSON value with the contents of the range `[first, last)`.
-    The semantics depends on the different types a JSON value can have:
-    - In case of primitive types (number, boolean, or string), @a first must
-      be `begin()` and @a last must be `end()`. In this case, the value is
-      copied. Otherwise, std::out_of_range is thrown.
-    - In case of structured types (array, object), the constructor behaves as
-      similar versions for `std::vector`.
-    - In case of a null type, std::domain_error is thrown.
-
-    @tparam InputIT an input iterator type (@ref iterator or @ref
-    const_iterator)
-
-    @param[in] first begin of the range to copy from (included)
-    @param[in] last end of the range to copy from (excluded)
-
-    @pre Iterators @a first and @a last must be initialized. **This
-         precondition is enforced with an assertion.**
-
-    @throw std::domain_error if iterators are not compatible; that is, do not
-    belong to the same JSON value; example: `"iterators are not compatible"`
-    @throw std::out_of_range if iterators are for a primitive type (number,
-    boolean, or string) where an out of range error can be detected easily;
-    example: `"iterators out of range"`
-    @throw std::bad_alloc if allocation for object, array, or string fails
-    @throw std::domain_error if called with a null value; example: `"cannot
-    use construct with iterators from null"`
-
-    @complexity Linear in distance between @a first and @a last.
-
-    @liveexample{The example below shows several ways to create JSON values by
-    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
-
-    @since version 1.0.0
-    */
-    template<class InputIT, typename std::enable_if<
-                 std::is_same<InputIT, typename basic_json_t::iterator>::value or
-                 std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
-    basic_json(InputIT first, InputIT last)
-    {
-        assert(first.m_object != nullptr);
-        assert(last.m_object != nullptr);
-
-        // make sure iterator fits the current value
-        if (first.m_object != last.m_object)
-        {
-            JSON_THROW(std::domain_error("iterators are not compatible"));
-        }
-
-        // copy type from first iterator
-        m_type = first.m_object->m_type;
-
-        // check if iterator range is complete for primitive values
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
-                {
-                    JSON_THROW(std::out_of_range("iterators out of range"));
-                }
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = first.m_object->m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = first.m_object->m_value.number_float;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = first.m_object->m_value.boolean;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *first.m_object->m_value.string;
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
-                break;
-            }
-
-            default:
-            {
-                JSON_THROW(std::domain_error("cannot use construct with iterators from " + first.m_object->type_name()));
-            }
-        }
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief construct a JSON value given an input stream
-
-    @param[in,out] i  stream to read a serialized JSON value from
-    @param[in] cb a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @deprecated This constructor is deprecated and will be removed in version
-      3.0.0 to unify the interface of the library. Deserialization will be
-      done by stream operators or by calling one of the `parse` functions,
-      e.g. @ref parse(std::istream&, const parser_callback_t). That is, calls
-      like `json j(i);` for an input stream @a i need to be replaced by
-      `json j = json::parse(i);`. See the example below.
-
-    @liveexample{The example below demonstrates constructing a JSON value from
-    a `std::stringstream` with and without callback
-    function.,basic_json__istream}
-
-    @since version 2.0.0, deprecated in version 2.0.3, to be removed in
-           version 3.0.0
-    */
-    JSON_DEPRECATED
-    explicit basic_json(std::istream& i, const parser_callback_t cb = nullptr)
-    {
-        *this = parser(i, cb).parse();
-        assert_invariant();
-    }
-
-    ///////////////////////////////////////
-    // other constructors and destructor //
-    ///////////////////////////////////////
-
-    /*!
-    @brief copy constructor
-
-    Creates a copy of a given JSON value.
-
-    @param[in] other  the JSON value to copy
-
-    @complexity Linear in the size of @a other.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is linear.
-    - As postcondition, it holds: `other == basic_json(other)`.
-
-    @throw std::bad_alloc if allocation for object, array, or string fails.
-
-    @liveexample{The following code shows an example for the copy
-    constructor.,basic_json__basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(const basic_json& other)
-        : m_type(other.m_type)
-    {
-        // check of passed value is valid
-        other.assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                m_value = *other.m_value.object;
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value = *other.m_value.array;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *other.m_value.string;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value = other.m_value.boolean;
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                m_value = other.m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value = other.m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value = other.m_value.number_float;
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief move constructor
-
-    Move constructor. Constructs a JSON value with the contents of the given
-    value @a other using move semantics. It "steals" the resources from @a
-    other and leaves it as JSON null value.
-
-    @param[in,out] other  value to move to this object
-
-    @post @a other is a JSON null value
-
-    @complexity Constant.
-
-    @liveexample{The code below shows the move constructor explicitly called
-    via std::move.,basic_json__moveconstructor}
-
-    @since version 1.0.0
-    */
-    basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief copy assignment
-
-    Copy assignment operator. Copies a JSON value via the "copy and swap"
-    strategy: It is expressed in terms of the copy constructor, destructor,
-    and the swap() member function.
-
-    @param[in] other  value to copy from
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is linear.
-
-    @liveexample{The code below shows and example for the copy assignment. It
-    creates a copy of value `a` which is then swapped with `b`. Finally\, the
-    copy of `a` (which is the null value after the swap) is
-    destroyed.,basic_json__copyassignment}
-
-    @since version 1.0.0
-    */
-    reference& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
-
-        assert_invariant();
-        return *this;
-    }
-
-    /*!
-    @brief destructor
-
-    Destroys the JSON value and frees all allocated memory.
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is linear.
-    - All stored elements are destroyed and all memory is freed.
-
-    @since version 1.0.0
-    */
-    ~basic_json()
-    {
-        assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                AllocatorType<object_t> alloc;
-                alloc.destroy(m_value.object);
-                alloc.deallocate(m_value.object, 1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                AllocatorType<array_t> alloc;
-                alloc.destroy(m_value.array);
-                alloc.deallocate(m_value.array, 1);
-                break;
-            }
-
-            case value_t::string:
-            {
-                AllocatorType<string_t> alloc;
-                alloc.destroy(m_value.string);
-                alloc.deallocate(m_value.string, 1);
-                break;
-            }
-
-            default:
-            {
-                // all other types need no specific destructor
-                break;
-            }
-        }
-    }
-
-    /// @}
-
-  public:
-    ///////////////////////
-    // object inspection //
-    ///////////////////////
-
-    /// @name object inspection
-    /// Functions to inspect the type of a JSON value.
-    /// @{
-
-    /*!
-    @brief serialization
-
-    Serialization function for JSON values. The function tries to mimic
-    Python's `json.dumps()` function, and currently supports its @a indent
-    parameter.
-
-    @param[in] indent If indent is nonnegative, then array elements and object
-    members will be pretty-printed with that indent level. An indent level of
-    `0` will only insert newlines. `-1` (the default) selects the most compact
-    representation.
-
-    @return string containing the serialization of the JSON value
-
-    @complexity Linear.
-
-    @liveexample{The following example shows the effect of different @a indent
-    parameters to the result of the serialization.,dump}
-
-    @see https://docs.python.org/2/library/json.html#json.dump
-
-    @since version 1.0.0
-    */
-    string_t dump(const int indent = -1) const
-    {
-        std::stringstream ss;
-
-        if (indent >= 0)
-        {
-            dump(ss, true, static_cast<unsigned int>(indent));
-        }
-        else
-        {
-            dump(ss, false, 0);
-        }
-
-        return ss.str();
-    }
-
-    /*!
-    @brief return the type of the JSON value (explicit)
-
-    Return the type of the JSON value as a value from the @ref value_t
-    enumeration.
-
-    @return the type of the JSON value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `type()` for all JSON
-    types.,type}
-
-    @since version 1.0.0
-    */
-    constexpr value_t type() const noexcept
-    {
-        return m_type;
-    }
-
-    /*!
-    @brief return whether type is primitive
-
-    This function returns true iff the JSON type is primitive (string, number,
-    boolean, or null).
-
-    @return `true` if type is primitive (string, number, boolean, or null),
-    `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_primitive()` for all JSON
-    types.,is_primitive}
-
-    @sa @ref is_structured() -- returns whether JSON value is structured
-    @sa @ref is_null() -- returns whether JSON value is `null`
-    @sa @ref is_string() -- returns whether JSON value is a string
-    @sa @ref is_boolean() -- returns whether JSON value is a boolean
-    @sa @ref is_number() -- returns whether JSON value is a number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_primitive() const noexcept
-    {
-        return is_null() or is_string() or is_boolean() or is_number();
-    }
-
-    /*!
-    @brief return whether type is structured
-
-    This function returns true iff the JSON type is structured (array or
-    object).
-
-    @return `true` if type is structured (array or object), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_structured()` for all JSON
-    types.,is_structured}
-
-    @sa @ref is_primitive() -- returns whether value is primitive
-    @sa @ref is_array() -- returns whether value is an array
-    @sa @ref is_object() -- returns whether value is an object
-
-    @since version 1.0.0
-    */
-    constexpr bool is_structured() const noexcept
-    {
-        return is_array() or is_object();
-    }
-
-    /*!
-    @brief return whether value is null
-
-    This function returns true iff the JSON value is null.
-
-    @return `true` if type is null, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_null()` for all JSON
-    types.,is_null}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_null() const noexcept
-    {
-        return m_type == value_t::null;
-    }
-
-    /*!
-    @brief return whether value is a boolean
-
-    This function returns true iff the JSON value is a boolean.
-
-    @return `true` if type is boolean, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_boolean()` for all JSON
-    types.,is_boolean}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_boolean() const noexcept
-    {
-        return m_type == value_t::boolean;
-    }
-
-    /*!
-    @brief return whether value is a number
-
-    This function returns true iff the JSON value is a number. This includes
-    both integer and floating-point values.
-
-    @return `true` if type is number (regardless whether integer, unsigned
-    integer or floating-type), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number()` for all JSON
-    types.,is_number}
-
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number() const noexcept
-    {
-        return is_number_integer() or is_number_float();
-    }
-
-    /*!
-    @brief return whether value is an integer number
-
-    This function returns true iff the JSON value is an integer or unsigned
-    integer number. This excludes floating-point values.
-
-    @return `true` if type is an integer or unsigned integer number, `false`
-    otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_integer()` for all
-    JSON types.,is_number_integer}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number_integer() const noexcept
-    {
-        return m_type == value_t::number_integer or m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is an unsigned integer number
-
-    This function returns true iff the JSON value is an unsigned integer
-    number. This excludes floating-point and (signed) integer values.
-
-    @return `true` if type is an unsigned integer number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_unsigned()` for all
-    JSON types.,is_number_unsigned}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 2.0.0
-    */
-    constexpr bool is_number_unsigned() const noexcept
-    {
-        return m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is a floating-point number
-
-    This function returns true iff the JSON value is a floating-point number.
-    This excludes integer and unsigned integer values.
-
-    @return `true` if type is a floating-point number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_float()` for all
-    JSON types.,is_number_float}
-
-    @sa @ref is_number() -- check if value is number
-    @sa @ref is_number_integer() -- check if value is an integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number_float() const noexcept
-    {
-        return m_type == value_t::number_float;
-    }
-
-    /*!
-    @brief return whether value is an object
-
-    This function returns true iff the JSON value is an object.
-
-    @return `true` if type is object, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_object()` for all JSON
-    types.,is_object}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_object() const noexcept
-    {
-        return m_type == value_t::object;
-    }
-
-    /*!
-    @brief return whether value is an array
-
-    This function returns true iff the JSON value is an array.
-
-    @return `true` if type is array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_array()` for all JSON
-    types.,is_array}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_array() const noexcept
-    {
-        return m_type == value_t::array;
-    }
-
-    /*!
-    @brief return whether value is a string
-
-    This function returns true iff the JSON value is a string.
-
-    @return `true` if type is string, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_string()` for all JSON
-    types.,is_string}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_string() const noexcept
-    {
-        return m_type == value_t::string;
-    }
-
-    /*!
-    @brief return whether value is discarded
-
-    This function returns true iff the JSON value was discarded during parsing
-    with a callback function (see @ref parser_callback_t).
-
-    @note This function will always be `false` for JSON values after parsing.
-    That is, discarded values can only occur during parsing, but will be
-    removed when inside a structured value or replaced by null in other cases.
-
-    @return `true` if type is discarded, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_discarded()` for all JSON
-    types.,is_discarded}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_discarded() const noexcept
-    {
-        return m_type == value_t::discarded;
-    }
-
-    /*!
-    @brief return the type of the JSON value (implicit)
-
-    Implicitly return the type of the JSON value as a value from the @ref
-    value_t enumeration.
-
-    @return the type of the JSON value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies the @ref value_t operator for
-    all JSON types.,operator__value_t}
-
-    @since version 1.0.0
-    */
-    constexpr operator value_t() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @}
-
-  private:
-    //////////////////
-    // value access //
-    //////////////////
-
-    /// get a boolean (explicit)
-    boolean_t get_impl(boolean_t* /*unused*/) const
-    {
-        if (is_boolean())
-        {
-            return m_value.boolean;
-        }
-
-        JSON_THROW(std::domain_error("type must be boolean, but is " + type_name()));
-    }
-
-    /// get a pointer to the value (object)
-    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (object)
-    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /*!
-    @brief helper function to implement get_ref()
-
-    This funcion helps to implement get_ref() without code duplication for
-    const and non-const overloads
-
-    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
-
-    @throw std::domain_error if ReferenceType does not match underlying value
-    type of the current JSON
-    */
-    template<typename ReferenceType, typename ThisType>
-    static ReferenceType get_ref_impl(ThisType& obj)
-    {
-        // helper type
-        using PointerType = typename std::add_pointer<ReferenceType>::type;
-
-        // delegate the call to get_ptr<>()
-        auto ptr = obj.template get_ptr<PointerType>();
-
-        if (ptr != nullptr)
-        {
-            return *ptr;
-        }
-
-        JSON_THROW(std::domain_error("incompatible ReferenceType for get_ref, actual type is " +
-                                     obj.type_name()));
-    }
-
-  public:
-    /// @name value access
-    /// Direct access to the stored value of a JSON value.
-    /// @{
-
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template <
-        typename BasicJsonType,
-        detail::enable_if_t<std::is_same<typename std::remove_const<BasicJsonType>::type,
-                                         basic_json_t>::value,
-                            int> = 0 >
-    basic_json get() const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
-    and [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType ret;
-    JSONSerializer<ValueType>::from_json(*this, ret);
-    return ret;
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const @ref basic_json&, ValueType&)`, and
-    - @ref json_serializer<ValueType> does not have a `from_json()` method of
-      the form `ValueType from_json(const @ref basic_json&)`
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get__ValueType_const}
-
-    @since version 2.1.0
-    */
-    template <
-        typename ValueTypeCV,
-        typename ValueType = detail::uncvref_t<ValueTypeCV>,
-        detail::enable_if_t <
-            not std::is_same<basic_json_t, ValueType>::value and
-            detail::has_from_json<basic_json_t, ValueType>::value and
-            not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-            int > = 0 >
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
-    {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(not std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        static_assert(std::is_default_constructible<ValueType>::value,
-                      "types must be DefaultConstructible when used with get()");
-
-        ValueType ret;
-        JSONSerializer<ValueType>::from_json(*this, ret);
-        return ret;
-    }
-
-    /*!
-    @brief get a value (explicit); special case
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
-    and **not** [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    return JSONSerializer<ValueTypeCV>::from_json(*this);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json and
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `ValueType from_json(const @ref basic_json&)`
-
-    @note If @ref json_serializer<ValueType> has both overloads of
-    `from_json()`, this one is chosen.
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @since version 2.1.0
-    */
-    template <
-        typename ValueTypeCV,
-        typename ValueType = detail::uncvref_t<ValueTypeCV>,
-        detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
-                            detail::has_non_default_from_json<basic_json_t,
-                                    ValueType>::value, int> = 0 >
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueTypeCV>::from_json(std::declval<const basic_json_t&>())))
-    {
-        static_assert(not std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        return JSONSerializer<ValueTypeCV>::from_json(*this);
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-
-    Explicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning The pointer becomes invalid if the underlying JSON object
-    changes.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get__PointerType}
-
-    @sa @ref get_ptr() for explicit pointer-member access
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    PointerType get() noexcept
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    constexpr const PointerType get() const noexcept
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /*!
-    @brief get a pointer value (implicit)
-
-    Implicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    PointerType get_ptr() noexcept
-    {
-        // get the type of the PointerType (remove pointer and const)
-        using pointee_t = typename std::remove_const<typename
-                          std::remove_pointer<typename
-                          std::remove_const<PointerType>::type>::type>::type;
-        // make sure the type matches the allowed types
-        static_assert(
-            std::is_same<object_t, pointee_t>::value
-            or std::is_same<array_t, pointee_t>::value
-            or std::is_same<string_t, pointee_t>::value
-            or std::is_same<boolean_t, pointee_t>::value
-            or std::is_same<number_integer_t, pointee_t>::value
-            or std::is_same<number_unsigned_t, pointee_t>::value
-            or std::is_same<number_float_t, pointee_t>::value
-            , "incompatible pointer type");
-
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value and
-                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
-    constexpr const PointerType get_ptr() const noexcept
-    {
-        // get the type of the PointerType (remove pointer and const)
-        using pointee_t = typename std::remove_const<typename
-                          std::remove_pointer<typename
-                          std::remove_const<PointerType>::type>::type>::type;
-        // make sure the type matches the allowed types
-        static_assert(
-            std::is_same<object_t, pointee_t>::value
-            or std::is_same<array_t, pointee_t>::value
-            or std::is_same<string_t, pointee_t>::value
-            or std::is_same<boolean_t, pointee_t>::value
-            or std::is_same<number_integer_t, pointee_t>::value
-            or std::is_same<number_unsigned_t, pointee_t>::value
-            or std::is_same<number_float_t, pointee_t>::value
-            , "incompatible pointer type");
-
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<const PointerType>(nullptr));
-    }
-
-    /*!
-    @brief get a reference value (implicit)
-
-    Implicit reference access to the internally stored JSON value. No copies
-    are made.
-
-    @warning Writing data to the referee of the result yields an undefined
-    state.
-
-    @tparam ReferenceType reference type; must be a reference to @ref array_t,
-    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
-    @ref number_float_t. Enforced by static assertion.
-
-    @return reference to the internally stored JSON value if the requested
-    reference type @a ReferenceType fits to the JSON value; throws
-    std::domain_error otherwise
-
-    @throw std::domain_error in case passed type @a ReferenceType is
-    incompatible with the stored JSON value
-
-    @complexity Constant.
-
-    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
-
-    @since version 1.1.0
-    */
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value, int>::type = 0>
-    ReferenceType get_ref()
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a reference value (implicit)
-    @copydoc get_ref()
-    */
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value and
-                 std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
-    ReferenceType get_ref() const
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a value (implicit)
-
-    Implicit type conversion between the JSON value and a compatible value.
-    The call is realized by calling @ref get() const.
-
-    @tparam ValueType non-pointer type compatible to the JSON value, for
-    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
-    `std::vector` types for JSON arrays. The character type of @ref string_t
-    as well as an initializer list of this type is excluded to avoid
-    ambiguities as these types implicitly convert to `std::string`.
-
-    @return copy of the JSON value, converted to type @a ValueType
-
-    @throw std::domain_error in case passed type @a ValueType is incompatible
-    to JSON, thrown by @ref get() const
-
-    @complexity Linear in the size of the JSON value.
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,operator__ValueType}
-
-    @since version 1.0.0
-    */
-    template < typename ValueType, typename std::enable_if <
-                   not std::is_pointer<ValueType>::value and
-                   not std::is_same<ValueType, typename string_t::value_type>::value
-#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
-                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
-#endif
-                   , int >::type = 0 >
-    operator ValueType() const
-    {
-        // delegate the call to get<>() const
-        return get<ValueType>();
-    }
-
-    /// @}
-
-
-    ////////////////////
-    // element access //
-    ////////////////////
-
-    /// @name element access
-    /// Access to the JSON value.
-    /// @{
-
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a reference to the element at specified location @a idx, with
-    bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw std::domain_error if the JSON value is not an array; example:
-    `"cannot use at() with string"`
-    @throw std::out_of_range if the index @a idx is out of range of the array;
-    that is, `idx >= size()`; example: `"array index 7 is out of range"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `at()`.,at__size_type}
-
-    @since version 1.0.0
-    */
-    reference at(size_type idx)
-    {
-        // at only works for arrays
-        if (is_array())
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
-            }
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a const reference to the element at specified location @a idx,
-    with bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw std::domain_error if the JSON value is not an array; example:
-    `"cannot use at() with string"`
-    @throw std::out_of_range if the index @a idx is out of range of the array;
-    that is, `idx >= size()`; example: `"array index 7 is out of range"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read using
-    `at()`.,at__size_type_const}
-
-    @since version 1.0.0
-    */
-    const_reference at(size_type idx) const
-    {
-        // at only works for arrays
-        if (is_array())
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
-            }
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a reference to the element at with specified key @a key, with
-    bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw std::domain_error if the JSON value is not an object; example:
-    `"cannot use at() with boolean"`
-    @throw std::out_of_range if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`; example: `"key "the fast" not found"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using `at()`.,at__object_t_key_type}
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    reference at(const typename object_t::key_type& key)
-    {
-        // at only works for objects
-        if (is_object())
-        {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(std::out_of_range("key '" + key + "' not found"));
-            }
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a const reference to the element at with specified key @a key,
-    with bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw std::domain_error if the JSON value is not an object; example:
-    `"cannot use at() with boolean"`
-    @throw std::out_of_range if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`; example: `"key "the fast" not found"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    `at()`.,at__object_t_key_type_const}
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    const_reference at(const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (is_object())
-        {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(std::out_of_range("key '" + key + "' not found"));
-            }
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief access specified array element
-
-    Returns a reference to the element at specified location @a idx.
-
-    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
-    then the array is silently filled up with `null` values to make `idx` a
-    valid reference to the last stored element.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw std::domain_error if JSON is not an array or null; example:
-    `"cannot use operator[] with string"`
-
-    @complexity Constant if @a idx is in the range of the array. Otherwise
-    linear in `idx - size()`.
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `[]` operator. Note the addition of `null`
-    values.,operatorarray__size_type}
-
-    @since version 1.0.0
-    */
-    reference operator[](size_type idx)
-    {
-        // implicitly convert null value to an empty array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for arrays
-        if (is_array())
-        {
-            // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
-            {
-                m_value.array->insert(m_value.array->end(),
-                                      idx - m_value.array->size() + 1,
-                                      basic_json());
-            }
-
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
-    }
-
-    /*!
-    @brief access specified array element
-
-    Returns a const reference to the element at specified location @a idx.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw std::domain_error if JSON is not an array; example: `"cannot use
-    operator[] with null"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read using
-    the `[]` operator.,operatorarray__size_type_const}
-
-    @since version 1.0.0
-    */
-    const_reference operator[](size_type idx) const
-    {
-        // const operator[] only works for arrays
-        if (is_array())
-        {
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw std::domain_error if JSON is not an object or null; example:
-    `"cannot use operator[] with string"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    reference operator[](const typename object_t::key_type& key)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for objects
-        if (is_object())
-        {
-            return m_value.object->operator[](key);
-        }
-
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    operator[] with null"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    const_reference operator[](const typename object_t::key_type& key) const
-    {
-        // const operator[] only works for objects
-        if (is_object())
-        {
-            assert(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw std::domain_error if JSON is not an object or null; example:
-    `"cannot use operator[] with string"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    template<typename T, std::size_t n>
-    reference operator[](T * (&key)[n])
-    {
-        return operator[](static_cast<const T>(key));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @note This function is required for compatibility reasons with Clang.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    operator[] with null"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    template<typename T, std::size_t n>
-    const_reference operator[](T * (&key)[n]) const
-    {
-        return operator[](static_cast<const T>(key));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw std::domain_error if JSON is not an object or null; example:
-    `"cannot use operator[] with string"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    reference operator[](T* key)
-    {
-        // implicitly convert null to object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // at only works for objects
-        if (is_object())
-        {
-            return m_value.object->operator[](key);
-        }
-
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    operator[] with null"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    const_reference operator[](T* key) const
-    {
-        // at only works for objects
-        if (is_object())
-        {
-            assert(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
-    }
-
-    /*!
-    @brief access specified object element with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(key);
-    } catch(std::out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const typename object_t::key_type&), this function
-    does not throw if the given key @a key was not found.
-
-    @note Unlike @ref operator[](const typename object_t::key_type& key), this
-    function does not implicitly add an element to the position defined by @a
-    key. This function is furthermore also applicable to const objects.
-
-    @param[in] key  key of the element to access
-    @param[in] default_value  the value to return if @a key is not found
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    value() with null"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-
-    @since version 1.0.0
-    */
-    template<class ValueType, typename std::enable_if<
-                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const typename object_t::key_type& key, ValueType default_value) const
-    {
-        // at only works for objects
-        if (is_object())
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(key);
-            if (it != end())
-            {
-                return *it;
-            }
-
-            return default_value;
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use value() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const typename object_t::key_type&, ValueType) const
-    */
-    string_t value(const typename object_t::key_type& key, const char* default_value) const
-    {
-        return value(key, string_t(default_value));
-    }
-
-    /*!
-    @brief access specified object element via JSON Pointer with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(ptr);
-    } catch(std::out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const json_pointer&), this function does not throw
-    if the given key @a key was not found.
-
-    @param[in] ptr  a JSON pointer to the element to access
-    @param[in] default_value  the value to return if @a ptr found no value
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    value() with null"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value_ptr}
-
-    @sa @ref operator[](const json_pointer&) for unchecked access by reference
-
-    @since version 2.0.2
-    */
-    template<class ValueType, typename std::enable_if<
-                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const json_pointer& ptr, ValueType default_value) const
-    {
-        // at only works for objects
-        if (is_object())
-        {
-            // if pointer resolves a value, return it or use default value
-            JSON_TRY
-            {
-                return ptr.get_checked(this);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                return default_value;
-            }
-        }
-
-        JSON_THROW(std::domain_error("cannot use value() with " + type_name()));
-    }
-
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const json_pointer&, ValueType) const
-    */
-    string_t value(const json_pointer& ptr, const char* default_value) const
-    {
-        return value(ptr, string_t(default_value));
-    }
-
-    /*!
-    @brief access the first element
-
-    Returns a reference to the first element in the container. For a JSON
-    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
-
-    @return In case of a structured type (array or object), a reference to the
-    first element is returned. In case of number, string, or boolean values, a
-    reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw std::out_of_range when called on `null` value
-
-    @liveexample{The following code shows an example for `front()`.,front}
-
-    @sa @ref back() -- access the last element
-
-    @since version 1.0.0
-    */
-    reference front()
-    {
-        return *begin();
-    }
-
-    /*!
-    @copydoc basic_json::front()
-    */
-    const_reference front() const
-    {
-        return *cbegin();
-    }
-
-    /*!
-    @brief access the last element
-
-    Returns a reference to the last element in the container. For a JSON
-    container `c`, the expression `c.back()` is equivalent to
-    @code {.cpp}
-    auto tmp = c.end();
-    --tmp;
-    return *tmp;
-    @endcode
-
-    @return In case of a structured type (array or object), a reference to the
-    last element is returned. In case of number, string, or boolean values, a
-    reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw std::out_of_range when called on `null` value.
-
-    @liveexample{The following code shows an example for `back()`.,back}
-
-    @sa @ref front() -- access the first element
-
-    @since version 1.0.0
-    */
-    reference back()
-    {
-        auto tmp = end();
-        --tmp;
-        return *tmp;
-    }
-
-    /*!
-    @copydoc basic_json::back()
-    */
-    const_reference back() const
-    {
-        auto tmp = cend();
-        --tmp;
-        return *tmp;
-    }
-
-    /*!
-    @brief remove element given an iterator
-
-    Removes the element specified by iterator @a pos. The iterator @a pos must
-    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
-    but is not dereferenceable) cannot be used as a value for @a pos.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] pos iterator to the element to remove
-    @return Iterator following the last removed element. If the iterator @a
-    pos refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw std::domain_error if called on a `null` value; example: `"cannot
-    use erase() with null"`
-    @throw std::domain_error if called on an iterator which does not belong to
-    the current JSON value; example: `"iterator does not fit current value"`
-    @throw std::out_of_range if called on a primitive type with invalid
-    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
-    out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: amortized constant
-    - arrays: linear in distance between @a pos and the end of the container
-    - strings: linear in the length of the string
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType}
-
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
-                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
-             = 0>
-    IteratorType erase(IteratorType pos)
-    {
-        // make sure iterator fits the current value
-        if (this != pos.m_object)
-        {
-            JSON_THROW(std::domain_error("iterator does not fit current value"));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (not pos.m_it.primitive_iterator.is_begin())
-                {
-                    JSON_THROW(std::out_of_range("iterator out of range"));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    alloc.destroy(m_value.string);
-                    alloc.deallocate(m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
-                break;
-            }
-
-            default:
-            {
-                JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief remove elements given an iterator range
-
-    Removes the element specified by the range `[first; last)`. The iterator
-    @a first does not need to be dereferenceable if `first == last`: erasing
-    an empty range is a no-op.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] first iterator to the beginning of the range to remove
-    @param[in] last iterator past the end of the range to remove
-    @return Iterator following the last removed element. If the iterator @a
-    second refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw std::domain_error if called on a `null` value; example: `"cannot
-    use erase() with null"`
-    @throw std::domain_error if called on iterators which does not belong to
-    the current JSON value; example: `"iterators do not fit current value"`
-    @throw std::out_of_range if called on a primitive type with invalid
-    iterators (i.e., if `first != begin()` and `last != end()`); example:
-    `"iterators out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: `log(size()) + std::distance(first, last)`
-    - arrays: linear in the distance between @a first and @a last, plus linear
-      in the distance between @a last and end of the container
-    - strings: linear in the length of the string
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType_IteratorType}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
-                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
-             = 0>
-    IteratorType erase(IteratorType first, IteratorType last)
-    {
-        // make sure iterator fits the current value
-        if (this != first.m_object or this != last.m_object)
-        {
-            JSON_THROW(std::domain_error("iterators do not fit current value"));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
-                {
-                    JSON_THROW(std::out_of_range("iterators out of range"));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    alloc.destroy(m_value.string);
-                    alloc.deallocate(m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
-                                              last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
-                                             last.m_it.array_iterator);
-                break;
-            }
-
-            default:
-            {
-                JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief remove element from a JSON object given a key
-
-    Removes elements from a JSON object with the key value @a key.
-
-    @param[in] key value of the elements to remove
-
-    @return Number of elements removed. If @a ObjectType is the default
-    `std::map` type, the return value will always be `0` (@a key was not
-    found) or `1` (@a key was found).
-
-    @post References and iterators to the erased elements are invalidated.
-    Other references and iterators are not affected.
-
-    @throw std::domain_error when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-
-    @complexity `log(size()) + count(key)`
-
-    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    size_type erase(const typename object_t::key_type& key)
-    {
-        // this erase only works for objects
-        if (is_object())
-        {
-            return m_value.object->erase(key);
-        }
-
-        JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
-    }
-
-    /*!
-    @brief remove element from a JSON array given an index
-
-    Removes element from a JSON array at the index @a idx.
-
-    @param[in] idx index of the element to remove
-
-    @throw std::domain_error when called on a type other than JSON array;
-    example: `"cannot use erase() with null"`
-    @throw std::out_of_range when `idx >= size()`; example: `"array index 17
-    is out of range"`
-
-    @complexity Linear in distance between @a idx and the end of the container.
-
-    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-
-    @since version 1.0.0
-    */
-    void erase(const size_type idx)
-    {
-        // this erase only works for arrays
-        if (is_array())
-        {
-            if (idx >= size())
-            {
-                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
-            }
-
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
-        }
-    }
-
-    /// @}
-
-
-    ////////////
-    // lookup //
-    ////////////
-
-    /// @name lookup
-    /// @{
-
-    /*!
-    @brief find an element in a JSON object
-
-    Finds an element in a JSON object with key equivalent to @a key. If the
-    element is not found or the JSON value is not an object, end() is
-    returned.
-
-    @note This method always returns @ref end() when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value of the element to search for
-
-    @return Iterator to an element with key equivalent to @a key. If no such
-    element is found or the JSON value is not an object, past-the-end (see
-    @ref end()) iterator is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `find()` is used.,find__key_type}
-
-    @since version 1.0.0
-    */
-    iterator find(typename object_t::key_type key)
-    {
-        auto result = end();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(key);
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief find an element in a JSON object
-    @copydoc find(typename object_t::key_type)
-    */
-    const_iterator find(typename object_t::key_type key) const
-    {
-        auto result = cend();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(key);
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief returns the number of occurrences of a key in a JSON object
-
-    Returns the number of elements with key @a key. If ObjectType is the
-    default `std::map` type, the return value will always be `0` (@a key was
-    not found) or `1` (@a key was found).
-
-    @note This method always returns `0` when executed on a JSON type that is
-          not an object.
-
-    @param[in] key key value of the element to count
-
-    @return Number of elements with key @a key. If the JSON value is not an
-    object, the return value will be `0`.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `count()` is used.,count}
-
-    @since version 1.0.0
-    */
-    size_type count(typename object_t::key_type key) const
-    {
-        // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(key) : 0;
-    }
-
-    /// @}
-
-
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /// @name iterators
-    /// @{
-
-    /*!
-    @brief returns an iterator to the first element
-
-    Returns an iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `begin()`.,begin}
-
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
-    iterator begin() noexcept
-    {
-        iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @copydoc basic_json::cbegin()
-    */
-    const_iterator begin() const noexcept
-    {
-        return cbegin();
-    }
-
-    /*!
-    @brief returns a const iterator to the first element
-
-    Returns a const iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
-
-    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
-
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
-    const_iterator cbegin() const noexcept
-    {
-        const_iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to one past the last element
-
-    Returns an iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `end()`.,end}
-
-    @sa @ref cend() -- returns a const iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
-    iterator end() noexcept
-    {
-        iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @copydoc basic_json::cend()
-    */
-    const_iterator end() const noexcept
-    {
-        return cend();
-    }
-
-    /*!
-    @brief returns a const iterator to one past the last element
-
-    Returns a const iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
-
-    @liveexample{The following code shows an example for `cend()`.,cend}
-
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_iterator cend() const noexcept
-    {
-        const_iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to the reverse-beginning
-
-    Returns an iterator to the reverse-beginning; that is, the last element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(end())`.
-
-    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
-
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    reverse_iterator rbegin() noexcept
-    {
-        return reverse_iterator(end());
-    }
-
-    /*!
-    @copydoc basic_json::crbegin()
-    */
-    const_reverse_iterator rbegin() const noexcept
-    {
-        return crbegin();
-    }
-
-    /*!
-    @brief returns an iterator to the reverse-end
-
-    Returns an iterator to the reverse-end; that is, one before the first
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(begin())`.
-
-    @liveexample{The following code shows an example for `rend()`.,rend}
-
-    @sa @ref crend() -- returns a const reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /*!
-    @copydoc basic_json::crend()
-    */
-    const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /*!
-    @brief returns a const reverse iterator to the last element
-
-    Returns a const iterator to the reverse-beginning; that is, the last
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
-
-    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
-
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to one before the first
-
-    Returns a const reverse iterator to the reverse-end; that is, one before
-    the first element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
-
-    @liveexample{The following code shows an example for `crend()`.,crend}
-
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-  private:
-    // forward declaration
-    template<typename IteratorType> class iteration_proxy;
-
-  public:
-    /*!
-    @brief wrapper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    @note The name of this function is not yet final and may change in the
-    future.
-    */
-    static iteration_proxy<iterator> iterator_wrapper(reference cont)
-    {
-        return iteration_proxy<iterator>(cont);
-    }
-
-    /*!
-    @copydoc iterator_wrapper(reference)
-    */
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference cont)
-    {
-        return iteration_proxy<const_iterator>(cont);
-    }
-
-    /// @}
-
-
-    //////////////
-    // capacity //
-    //////////////
-
-    /// @name capacity
-    /// @{
-
-    /*!
-    @brief checks whether the container is empty
-
-    Checks if a JSON value has no elements.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `true`
-            boolean     | `false`
-            string      | `false`
-            number      | `false`
-            object      | result of function `object_t::empty()`
-            array       | result of function `array_t::empty()`
-
-    @note This function does not return whether a string stored as JSON value
-    is empty - it returns whether the JSON container itself is empty which is
-    false in the case of a string.
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `empty()` functions have constant
-    complexity.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `begin() == end()`.
-
-    @liveexample{The following code uses `empty()` to check if a JSON
-    object contains any elements.,empty}
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
-    bool empty() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return true;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::empty()
-                return m_value.array->empty();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::empty()
-                return m_value.object->empty();
-            }
-
-            default:
-            {
-                // all other types are nonempty
-                return false;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the number of elements
-
-    Returns the number of elements in a JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0`
-            boolean     | `1`
-            string      | `1`
-            number      | `1`
-            object      | result of function object_t::size()
-            array       | result of function array_t::size()
-
-    @note This function does not return the length of a string stored as JSON
-    value - it returns the number of elements in the JSON value which is 1 in
-    the case of a string.
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their size() functions have constant
-    complexity.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `std::distance(begin(), end())`.
-
-    @liveexample{The following code calls `size()` on the different value
-    types.,size}
-
-    @sa @ref empty() -- checks whether the container is empty
-    @sa @ref max_size() -- returns the maximal number of elements
-
-    @since version 1.0.0
-    */
-    size_type size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return 0;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::size()
-                return m_value.array->size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::size()
-                return m_value.object->size();
-            }
-
-            default:
-            {
-                // all other types have size 1
-                return 1;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the maximum possible number of elements
-
-    Returns the maximum number of elements a JSON value is able to hold due to
-    system or library implementation limitations, i.e. `std::distance(begin(),
-    end())` for the JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0` (same as `size()`)
-            boolean     | `1` (same as `size()`)
-            string      | `1` (same as `size()`)
-            number      | `1` (same as `size()`)
-            object      | result of function `object_t::max_size()`
-            array       | result of function `array_t::max_size()`
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `max_size()` functions have constant
-    complexity.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of returning `b.size()` where `b` is the largest
-      possible JSON value.
-
-    @liveexample{The following code calls `max_size()` on the different value
-    types. Note the output is implementation specific.,max_size}
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
-    size_type max_size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                // delegate call to array_t::max_size()
-                return m_value.array->max_size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::max_size()
-                return m_value.object->max_size();
-            }
-
-            default:
-            {
-                // all other types have max_size() == size()
-                return size();
-            }
-        }
-    }
-
-    /// @}
-
-
-    ///////////////
-    // modifiers //
-    ///////////////
-
-    /// @name modifiers
-    /// @{
-
-    /*!
-    @brief clears the contents
-
-    Clears the content of a JSON value and resets it to the default value as
-    if @ref basic_json(value_t) would have been called:
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-
-    @complexity Linear in the size of the JSON value.
-
-    @liveexample{The example below shows the effect of `clear()` to different
-    JSON types.,clear}
-
-    @since version 1.0.0
-    */
-    void clear() noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = 0;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = 0;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = 0.0;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = false;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value.string->clear();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array->clear();
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object->clear();
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief add an object to an array
-
-    Appends the given element @a val to the end of the JSON value. If the
-    function is called on a JSON null value, an empty array is created before
-    appending @a val.
-
-    @param[in] val the value to add to the JSON array
-
-    @throw std::domain_error when called on a type other than JSON array or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON array. Note how the `null` value was silently
-    converted to a JSON array.,push_back}
-
-    @since version 1.0.0
-    */
-    void push_back(basic_json&& val)
-    {
-        // push_back only works for null objects or arrays
-        if (not(is_null() or is_array()))
-        {
-            JSON_THROW(std::domain_error("cannot use push_back() with " + type_name()));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (move semantics)
-        m_value.array->push_back(std::move(val));
-        // invalidate object
-        val.m_type = value_t::null;
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    reference operator+=(basic_json&& val)
-    {
-        push_back(std::move(val));
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    void push_back(const basic_json& val)
-    {
-        // push_back only works for null objects or arrays
-        if (not(is_null() or is_array()))
-        {
-            JSON_THROW(std::domain_error("cannot use push_back() with " + type_name()));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array
-        m_value.array->push_back(val);
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    reference operator+=(const basic_json& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an object
-
-    Inserts the given element @a val to the JSON object. If the function is
-    called on a JSON null value, an empty object is created before inserting
-    @a val.
-
-    @param[in] val the value to add to the JSON object
-
-    @throw std::domain_error when called on a type other than JSON object or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON object. Note how the `null` value was silently
-    converted to a JSON object.,push_back__object_t__value}
-
-    @since version 1.0.0
-    */
-    void push_back(const typename object_t::value_type& val)
-    {
-        // push_back only works for null objects or objects
-        if (not(is_null() or is_object()))
-        {
-            JSON_THROW(std::domain_error("cannot use push_back() with " + type_name()));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array
-        m_value.object->insert(val);
-    }
-
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(const typename object_t::value_type&)
-    */
-    reference operator+=(const typename object_t::value_type& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an object
-
-    This function allows to use `push_back` with an initializer list. In case
-
-    1. the current value is an object,
-    2. the initializer list @a init contains only two elements, and
-    3. the first element of @a init is a string,
-
-    @a init is converted into an object element and added using
-    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
-    is converted to a JSON value and added using @ref push_back(basic_json&&).
-
-    @param init  an initializer list
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @note This function is required to resolve an ambiguous overload error,
-          because pairs like `{"key", "value"}` can be both interpreted as
-          `object_t::value_type` or `std::initializer_list<basic_json>`, see
-          https://github.com/nlohmann/json/issues/235 for more information.
-
-    @liveexample{The example shows how initializer lists are treated as
-    objects when possible.,push_back__initializer_list}
-    */
-    void push_back(std::initializer_list<basic_json> init)
-    {
-        if (is_object() and init.size() == 2 and init.begin()->is_string())
-        {
-            const string_t key = *init.begin();
-            push_back(typename object_t::value_type(key, *(init.begin() + 1)));
-        }
-        else
-        {
-            push_back(basic_json(init));
-        }
-    }
-
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(std::initializer_list<basic_json>)
-    */
-    reference operator+=(std::initializer_list<basic_json> init)
-    {
-        push_back(init);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an array
-
-    Creates a JSON value from the passed parameters @a args to the end of the
-    JSON value. If the function is called on a JSON null value, an empty array
-    is created before appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @throw std::domain_error when called on a type other than JSON array or
-    null; example: `"cannot use emplace_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` can be used to add
-    elements to a JSON array. Note how the `null` value was silently converted
-    to a JSON array.,emplace_back}
-
-    @since version 2.0.8
-    */
-    template<class... Args>
-    void emplace_back(Args&& ... args)
-    {
-        // emplace_back only works for null objects or arrays
-        if (not(is_null() or is_array()))
-        {
-            JSON_THROW(std::domain_error("cannot use emplace_back() with " + type_name()));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-    }
-
-    /*!
-    @brief add an object to an object if key does not exist
-
-    Inserts a new element into a JSON object constructed in-place with the
-    given @a args if there is no element with the key in the container. If the
-    function is called on a JSON null value, an empty object is created before
-    appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return a pair consisting of an iterator to the inserted element, or the
-            already-existing element if no insertion happened, and a bool
-            denoting whether the insertion took place.
-
-    @throw std::domain_error when called on a type other than JSON object or
-    null; example: `"cannot use emplace() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `emplace()` can be used to add elements
-    to a JSON object. Note how the `null` value was silently converted to a
-    JSON object. Further note how no value is added if there was already one
-    value stored with the same key.,emplace}
-
-    @since version 2.0.8
-    */
-    template<class... Args>
-    std::pair<iterator, bool> emplace(Args&& ... args)
-    {
-        // emplace only works for null objects or arrays
-        if (not(is_null() or is_object()))
-        {
-            JSON_THROW(std::domain_error("cannot use emplace() with " + type_name()));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
-        // create result iterator and set iterator to the result of emplace
-        auto it = begin();
-        it.m_it.object_iterator = res.first;
-
-        // return pair of iterator and boolean
-        return {it, res.second};
-    }
-
-    /*!
-    @brief inserts element
-
-    Inserts element @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] val element to insert
-    @return iterator pointing to the inserted @a val.
-
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
-
-    @complexity Constant plus linear in the distance between @a pos and end of
-    the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (is_array())
-        {
-            // check if iterator pos fits to this JSON value
-            if (pos.m_object != this)
-            {
-                JSON_THROW(std::domain_error("iterator does not fit current value"));
-            }
-
-            // insert to array and return iterator
-            iterator result(this);
-            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
-            return result;
-        }
-
-        JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
-    }
-
-    /*!
-    @brief inserts element
-    @copydoc insert(const_iterator, const basic_json&)
-    */
-    iterator insert(const_iterator pos, basic_json&& val)
-    {
-        return insert(pos, val);
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts @a cnt copies of @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] cnt number of copies of @a val to insert
-    @param[in] val element to insert
-    @return iterator pointing to the first element inserted, or @a pos if
-    `cnt==0`
-
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
-
-    @complexity Linear in @a cnt plus linear in the distance between @a pos
-    and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__count}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (is_array())
-        {
-            // check if iterator pos fits to this JSON value
-            if (pos.m_object != this)
-            {
-                JSON_THROW(std::domain_error("iterator does not fit current value"));
-            }
-
-            // insert to array and return iterator
-            iterator result(this);
-            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-            return result;
-        }
-
-        JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)` before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
-    @throw std::domain_error if @a first and @a last do not belong to the same
-    JSON value; example: `"iterators do not fit"`
-    @throw std::domain_error if @a first or @a last are iterators into
-    container for which insert is called; example: `"passed iterators may not
-    belong to container"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `first==last`
-
-    @complexity Linear in `std::distance(first, last)` plus linear in the
-    distance between @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
-    {
-        // insert only works for arrays
-        if (not is_array())
-        {
-            JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (pos.m_object != this)
-        {
-            JSON_THROW(std::domain_error("iterator does not fit current value"));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (first.m_object != last.m_object)
-        {
-            JSON_THROW(std::domain_error("iterators do not fit"));
-        }
-
-        if (first.m_object == this or last.m_object == this)
-        {
-            JSON_THROW(std::domain_error("passed iterators may not belong to container"));
-        }
-
-        // insert to array and return iterator
-        iterator result(this);
-        result.m_it.array_iterator = m_value.array->insert(
-                                         pos.m_it.array_iterator,
-                                         first.m_it.array_iterator,
-                                         last.m_it.array_iterator);
-        return result;
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from initializer list @a ilist before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] ilist initializer list to insert the values from
-
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `ilist` is empty
-
-    @complexity Linear in `ilist.size()` plus linear in the distance between
-    @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__ilist}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, std::initializer_list<basic_json> ilist)
-    {
-        // insert only works for arrays
-        if (not is_array())
-        {
-            JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (pos.m_object != this)
-        {
-            JSON_THROW(std::domain_error("iterator does not fit current value"));
-        }
-
-        // insert to array and return iterator
-        iterator result(this);
-        result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist);
-        return result;
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
-    void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-        assert_invariant();
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON array with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other array to exchange the contents with
-
-    @throw std::domain_error when JSON value is not an array; example:
-    `"cannot use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how arrays can be swapped with
-    `swap()`.,swap__array_t}
-
-    @since version 1.0.0
-    */
-    void swap(array_t& other)
-    {
-        // swap only works for arrays
-        if (is_array())
-        {
-            std::swap(*(m_value.array), other);
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use swap() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON object with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other object to exchange the contents with
-
-    @throw std::domain_error when JSON value is not an object; example:
-    `"cannot use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how objects can be swapped with
-    `swap()`.,swap__object_t}
-
-    @since version 1.0.0
-    */
-    void swap(object_t& other)
-    {
-        // swap only works for objects
-        if (is_object())
-        {
-            std::swap(*(m_value.object), other);
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use swap() with " + type_name()));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other string to exchange the contents with
-
-    @throw std::domain_error when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__string_t}
-
-    @since version 1.0.0
-    */
-    void swap(string_t& other)
-    {
-        // swap only works for strings
-        if (is_string())
-        {
-            std::swap(*(m_value.string), other);
-        }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use swap() with " + type_name()));
-        }
-    }
-
-    /// @}
-
-  public:
-    //////////////////////////////////////////
-    // lexicographical comparison operators //
-    //////////////////////////////////////////
-
-    /// @name lexicographical comparison operators
-    /// @{
-
-    /*!
-    @brief comparison: equal
-
-    Compares two JSON values for equality according to the following rules:
-    - Two JSON values are equal if (1) they are from the same type and (2)
-      their stored values are the same.
-    - Integer and floating-point numbers are automatically converted before
-      comparison. Floating-point numbers are compared indirectly: two
-      floating-point numbers `f1` and `f2` are considered equal if neither
-      `f1 > f2` nor `f2 > f1` holds.
-    - Two JSON null values are equal.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are equal
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__equal}
-
-    @since version 1.0.0
-    */
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
-    {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                {
-                    return *lhs.m_value.array == *rhs.m_value.array;
-                }
-                case value_t::object:
-                {
-                    return *lhs.m_value.object == *rhs.m_value.object;
-                }
-                case value_t::null:
-                {
-                    return true;
-                }
-                case value_t::string:
-                {
-                    return *lhs.m_value.string == *rhs.m_value.string;
-                }
-                case value_t::boolean:
-                {
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-                }
-                case value_t::number_integer:
-                {
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
-                }
-                case value_t::number_unsigned:
-                {
-                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
-                }
-                case value_t::number_float:
-                {
-                    return lhs.m_value.number_float == rhs.m_value.number_float;
-                }
-                default:
-                {
-                    return false;
-                }
-            }
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-
-        return false;
-    }
-
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return (lhs == basic_json(rhs));
-    }
-
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return (basic_json(lhs) == rhs);
-    }
-
-    /*!
-    @brief comparison: not equal
-
-    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are not equal
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__notequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs == rhs);
-    }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return (lhs != basic_json(rhs));
-    }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return (basic_json(lhs) != rhs);
-    }
-
-    /*!
-    @brief comparison: less than
-
-    Compares whether one JSON value @a lhs is less than another JSON value @a
-    rhs according to the following rules:
-    - If @a lhs and @a rhs have the same type, the values are compared using
-      the default `<` operator.
-    - Integer and floating-point numbers are automatically converted before
-      comparison
-    - In case @a lhs and @a rhs have different types, the values are ignored
-      and the order of the types is considered, see
-      @ref operator<(const value_t, const value_t).
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than @a rhs
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__less}
-
-    @since version 1.0.0
-    */
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
-    {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                {
-                    return *lhs.m_value.array < *rhs.m_value.array;
-                }
-                case value_t::object:
-                {
-                    return *lhs.m_value.object < *rhs.m_value.object;
-                }
-                case value_t::null:
-                {
-                    return false;
-                }
-                case value_t::string:
-                {
-                    return *lhs.m_value.string < *rhs.m_value.string;
-                }
-                case value_t::boolean:
-                {
-                    return lhs.m_value.boolean < rhs.m_value.boolean;
-                }
-                case value_t::number_integer:
-                {
-                    return lhs.m_value.number_integer < rhs.m_value.number_integer;
-                }
-                case value_t::number_unsigned:
-                {
-                    return lhs.m_value.number_unsigned < rhs.m_value.number_unsigned;
-                }
-                case value_t::number_float:
-                {
-                    return lhs.m_value.number_float < rhs.m_value.number_float;
-                }
-                default:
-                {
-                    return false;
-                }
-            }
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
-        }
-
-        // We only reach this line if we cannot compare values. In that case,
-        // we compare types. Note we have to call the operator explicitly,
-        // because MSVC has problems otherwise.
-        return operator<(lhs_type, rhs_type);
-    }
-
-    /*!
-    @brief comparison: less than or equal
-
-    Compares whether one JSON value @a lhs is less than or equal to another
-    JSON value by calculating `not (rhs < lhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than or equal to @a rhs
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greater}
-
-    @since version 1.0.0
-    */
-    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (rhs < lhs);
-    }
-
-    /*!
-    @brief comparison: greater than
-
-    Compares whether one JSON value @a lhs is greater than another
-    JSON value by calculating `not (lhs <= rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than to @a rhs
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__lessequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs <= rhs);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-
-    Compares whether one JSON value @a lhs is greater than or equal to another
-    JSON value by calculating `not (lhs < rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than or equal to @a rhs
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greaterequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs < rhs);
-    }
-
-    /// @}
-
-
-    ///////////////////
-    // serialization //
-    ///////////////////
-
-    /// @name serialization
-    /// @{
-
-    /*!
-    @brief serialize to stream
-
-    Serialize the given JSON value @a j to the output stream @a o. The JSON
-    value will be serialized using the @ref dump member function. The
-    indentation of the output can be controlled with the member variable
-    `width` of the output stream @a o. For instance, using the manipulator
-    `std::setw(4)` on @a o sets the indentation level to `4` and the
-    serialization result is the same as calling `dump(4)`.
-
-    @param[in,out] o  stream to serialize to
-    @param[in] j  JSON value to serialize
-
-    @return the stream @a o
-
-    @complexity Linear.
-
-    @liveexample{The example below shows the serialization with different
-    parameters to `width` to adjust the indentation level.,operator_serialize}
-
-    @since version 1.0.0
-    */
-    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const bool pretty_print = (o.width() > 0);
-        const auto indentation = (pretty_print ? o.width() : 0);
-
-        // reset width to 0 for subsequent calls to this stream
-        o.width(0);
-
-        // do the actual serialization
-        j.dump(o, pretty_print, static_cast<unsigned int>(indentation));
-
-        return o;
-    }
-
-    /*!
-    @brief serialize to stream
-    @copydoc operator<<(std::ostream&, const basic_json&)
-    */
-    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
-    {
-        return o << j;
-    }
-
-    /// @}
-
-
-    /////////////////////
-    // deserialization //
-    /////////////////////
-
-    /// @name deserialization
-    /// @{
-
-    /*!
-    @brief deserialize from an array
-
-    This function reads from an array of 1-byte values.
-
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @param[in] array  array to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an array.,parse__array__parser_callback_t}
-
-    @since version 2.0.3
-    */
-    template<class T, std::size_t N>
-    static basic_json parse(T (&array)[N],
-                            const parser_callback_t cb = nullptr)
-    {
-        // delegate the call to the iterator-range parse overload
-        return parse(std::begin(array), std::end(array), cb);
-    }
-
-    /*!
-    @brief deserialize from string literal
-
-    @tparam CharT character/literal type with size of 1 byte
-    @param[in] s  string literal to read a serialized JSON value from
-    @param[in] cb a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-    @note String containers like `std::string` or @ref string_t can be parsed
-          with @ref parse(const ContiguousContainer&, const parser_callback_t)
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__string__parser_callback_t}
-
-    @sa @ref parse(std::istream&, const parser_callback_t) for a version that
-    reads from an input stream
-
-    @since version 1.0.0 (originally for @ref string_t)
-    */
-    template<typename CharT, typename std::enable_if<
-                 std::is_pointer<CharT>::value and
-                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
-                 sizeof(typename std::remove_pointer<CharT>::type) == 1, int>::type = 0>
-    static basic_json parse(const CharT s,
-                            const parser_callback_t cb = nullptr)
-    {
-        return parser(reinterpret_cast<const char*>(s), cb).parse();
-    }
-
-    /*!
-    @brief deserialize from stream
-
-    @param[in,out] i  stream to read a serialized JSON value from
-    @param[in] cb a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__istream__parser_callback_t}
-
-    @sa @ref parse(const CharT, const parser_callback_t) for a version
-    that reads from a string
-
-    @since version 1.0.0
-    */
-    static basic_json parse(std::istream& i,
-                            const parser_callback_t cb = nullptr)
-    {
-        return parser(i, cb).parse();
-    }
-
-    /*!
-    @copydoc parse(std::istream&, const parser_callback_t)
-    */
-    static basic_json parse(std::istream&& i,
-                            const parser_callback_t cb = nullptr)
-    {
-        return parser(i, cb).parse();
-    }
-
-    /*!
-    @brief deserialize from an iterator range with contiguous storage
-
-    This function reads from an iterator range of a container with contiguous
-    storage of 1-byte values. Compatible container types include
-    `std::vector`, `std::string`, `std::array`, `std::valarray`, and
-    `std::initializer_list`. Furthermore, C-style arrays can be used with
-    `std::begin()`/`std::end()`. User-defined containers can be used as long
-    as they implement random-access iterators and a contiguous storage.
-
-    @pre The iterator range is contiguous. Violating this precondition yields
-    undefined behavior. **This precondition is enforced with an assertion.**
-    @pre Each element in the range has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with noncompliant iterators and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @tparam IteratorType iterator of container with contiguous storage
-    @param[in] first  begin of the range to parse (included)
-    @param[in] last  end of the range to parse (excluded)
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an iterator range.,parse__iteratortype__parser_callback_t}
-
-    @since version 2.0.3
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static basic_json parse(IteratorType first, IteratorType last,
-                            const parser_callback_t cb = nullptr)
-    {
-        // assertion to check that the iterator range is indeed contiguous,
-        // see http://stackoverflow.com/a/35008842/266378 for more discussion
-        assert(std::accumulate(first, last, std::pair<bool, int>(true, 0),
-                               [&first](std::pair<bool, int> res, decltype(*first) val)
-        {
-            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
-            return res;
-        }).first);
-
-        // assertion to check that each element is 1 byte long
-        static_assert(sizeof(typename std::iterator_traits<IteratorType>::value_type) == 1,
-                      "each element in the iterator range must have the size of 1 byte");
-
-        // if iterator range is empty, create a parser with an empty string
-        // to generate "unexpected EOF" error message
-        if (std::distance(first, last) <= 0)
-        {
-            return parser("").parse();
-        }
-
-        return parser(first, last, cb).parse();
-    }
-
-    /*!
-    @brief deserialize from a container with contiguous storage
-
-    This function reads from a container with contiguous storage of 1-byte
-    values. Compatible container types include `std::vector`, `std::string`,
-    `std::array`, and `std::initializer_list`. User-defined containers can be
-    used as long as they implement random-access iterators and a contiguous
-    storage.
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @tparam ContiguousContainer container type with contiguous storage
-    @param[in] c  container to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
-
-    @since version 2.0.3
-    */
-    template<class ContiguousContainer, typename std::enable_if<
-                 not std::is_pointer<ContiguousContainer>::value and
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value
-                 , int>::type = 0>
-    static basic_json parse(const ContiguousContainer& c,
-                            const parser_callback_t cb = nullptr)
-    {
-        // delegate the call to the iterator-range parse overload
-        return parse(std::begin(c), std::end(c), cb);
-    }
-
-    /*!
-    @brief deserialize from stream
-
-    Deserializes an input stream to a JSON value.
-
-    @param[in,out] i  input stream to read a serialized JSON value from
-    @param[in,out] j  JSON value to write the deserialized input to
-
-    @throw std::invalid_argument in case of parse errors
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below shows how a JSON value is constructed by
-    reading a serialization from a stream.,operator_deserialize}
-
-    @sa parse(std::istream&, const parser_callback_t) for a variant with a
-    parser callback function to filter values while parsing
-
-    @since version 1.0.0
-    */
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        j = parser(i).parse();
-        return i;
-    }
-
-    /*!
-    @brief deserialize from stream
-    @copydoc operator<<(basic_json&, std::istream&)
-    */
-    friend std::istream& operator>>(std::istream& i, basic_json& j)
-    {
-        j = parser(i).parse();
-        return i;
-    }
-
-    /// @}
-
-    //////////////////////////////////////////
-    // binary serialization/deserialization //
-    //////////////////////////////////////////
-
-    /// @name binary serialization/deserialization support
-    /// @{
-
-  private:
-    /*!
-    @note Some code in the switch cases has been copied, because otherwise
-          copilers would complain about implicit fallthrough and there is no
-          portable attribute to mute such warnings.
-    */
-    template<typename T>
-    static void add_to_vector(std::vector<uint8_t>& vec, size_t bytes, const T number)
-    {
-        assert(bytes == 1 or bytes == 2 or bytes == 4 or bytes == 8);
-
-        switch (bytes)
-        {
-            case 8:
-            {
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 070) & 0xff));
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 060) & 0xff));
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 050) & 0xff));
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 040) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 030) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 020) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 010) & 0xff));
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-
-            case 4:
-            {
-                vec.push_back(static_cast<uint8_t>((number >> 030) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 020) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 010) & 0xff));
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-
-            case 2:
-            {
-                vec.push_back(static_cast<uint8_t>((number >> 010) & 0xff));
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-
-            case 1:
-            {
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief take sufficient bytes from a vector to fill an integer variable
-
-    In the context of binary serialization formats, we need to read several
-    bytes from a byte vector and combine them to multi-byte integral data
-    types.
-
-    @param[in] vec  byte vector to read from
-    @param[in] current_index  the position in the vector after which to read
-
-    @return the next sizeof(T) bytes from @a vec, in reverse order as T
-
-    @tparam T the integral return type
-
-    @throw std::out_of_range if there are less than sizeof(T)+1 bytes in the
-           vector @a vec to read
-
-    In the for loop, the bytes from the vector are copied in reverse order into
-    the return value. In the figures below, let sizeof(T)=4 and `i` be the loop
-    variable.
-
-    Precondition:
-
-    vec:   |   |   | a | b | c | d |      T: |   |   |   |   |
-                 ^               ^             ^                ^
-           current_index         i            ptr        sizeof(T)
-
-    Postcondition:
-
-    vec:   |   |   | a | b | c | d |      T: | d | c | b | a |
-                 ^   ^                                     ^
-                 |   i                                    ptr
-           current_index
-
-    @sa Code adapted from <http://stackoverflow.com/a/41031865/266378>.
-    */
-    template<typename T>
-    static T get_from_vector(const std::vector<uint8_t>& vec, const size_t current_index)
-    {
-        if (current_index + sizeof(T) + 1 > vec.size())
-        {
-            JSON_THROW(std::out_of_range("cannot read " + std::to_string(sizeof(T)) + " bytes from vector"));
-        }
-
-        T result;
-        auto* ptr = reinterpret_cast<uint8_t*>(&result);
-        for (size_t i = 0; i < sizeof(T); ++i)
-        {
-            *ptr++ = vec[current_index + sizeof(T) - i];
-        }
-        return result;
-    }
-
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    This is a straightforward implementation of the MessagePack specification.
-
-    @param[in] j  JSON value to serialize
-    @param[in,out] v  byte vector to write the serialization to
-
-    @sa https://github.com/msgpack/msgpack/blob/master/spec.md
-    */
-    static void to_msgpack_internal(const basic_json& j, std::vector<uint8_t>& v)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                // nil
-                v.push_back(0xc0);
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                // true and false
-                v.push_back(j.m_value.boolean ? 0xc3 : 0xc2);
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // MessagePack does not differentiate between positive
-                    // signed integers and unsigned integers. Therefore, we
-                    // used the code from the value_t::number_unsigned case
-                    // here.
-                    if (j.m_value.number_unsigned < 128)
-                    {
-                        // positive fixnum
-                        add_to_vector(v, 1, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint8_t>::max())
-                    {
-                        // uint 8
-                        v.push_back(0xcc);
-                        add_to_vector(v, 1, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint16_t>::max())
-                    {
-                        // uint 16
-                        v.push_back(0xcd);
-                        add_to_vector(v, 2, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint32_t>::max())
-                    {
-                        // uint 32
-                        v.push_back(0xce);
-                        add_to_vector(v, 4, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint64_t>::max())
-                    {
-                        // uint 64
-                        v.push_back(0xcf);
-                        add_to_vector(v, 8, j.m_value.number_unsigned);
-                    }
-                }
-                else
-                {
-                    if (j.m_value.number_integer >= -32)
-                    {
-                        // negative fixnum
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int8_t>::min() and j.m_value.number_integer <= std::numeric_limits<int8_t>::max())
-                    {
-                        // int 8
-                        v.push_back(0xd0);
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int16_t>::min() and j.m_value.number_integer <= std::numeric_limits<int16_t>::max())
-                    {
-                        // int 16
-                        v.push_back(0xd1);
-                        add_to_vector(v, 2, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int32_t>::min() and j.m_value.number_integer <= std::numeric_limits<int32_t>::max())
-                    {
-                        // int 32
-                        v.push_back(0xd2);
-                        add_to_vector(v, 4, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int64_t>::min() and j.m_value.number_integer <= std::numeric_limits<int64_t>::max())
-                    {
-                        // int 64
-                        v.push_back(0xd3);
-                        add_to_vector(v, 8, j.m_value.number_integer);
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned < 128)
-                {
-                    // positive fixnum
-                    add_to_vector(v, 1, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint8_t>::max())
-                {
-                    // uint 8
-                    v.push_back(0xcc);
-                    add_to_vector(v, 1, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint16_t>::max())
-                {
-                    // uint 16
-                    v.push_back(0xcd);
-                    add_to_vector(v, 2, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint32_t>::max())
-                {
-                    // uint 32
-                    v.push_back(0xce);
-                    add_to_vector(v, 4, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint64_t>::max())
-                {
-                    // uint 64
-                    v.push_back(0xcf);
-                    add_to_vector(v, 8, j.m_value.number_unsigned);
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                // float 64
-                v.push_back(0xcb);
-                const auto* helper = reinterpret_cast<const uint8_t*>(&(j.m_value.number_float));
-                for (size_t i = 0; i < 8; ++i)
-                {
-                    v.push_back(helper[7 - i]);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                const auto N = j.m_value.string->size();
-                if (N <= 31)
-                {
-                    // fixstr
-                    v.push_back(static_cast<uint8_t>(0xa0 | N));
-                }
-                else if (N <= 255)
-                {
-                    // str 8
-                    v.push_back(0xd9);
-                    add_to_vector(v, 1, N);
-                }
-                else if (N <= 65535)
-                {
-                    // str 16
-                    v.push_back(0xda);
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 4294967295)
-                {
-                    // str 32
-                    v.push_back(0xdb);
-                    add_to_vector(v, 4, N);
-                }
-
-                // append string
-                std::copy(j.m_value.string->begin(), j.m_value.string->end(),
-                          std::back_inserter(v));
-                break;
-            }
-
-            case value_t::array:
-            {
-                const auto N = j.m_value.array->size();
-                if (N <= 15)
-                {
-                    // fixarray
-                    v.push_back(static_cast<uint8_t>(0x90 | N));
-                }
-                else if (N <= 0xffff)
-                {
-                    // array 16
-                    v.push_back(0xdc);
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 0xffffffff)
-                {
-                    // array 32
-                    v.push_back(0xdd);
-                    add_to_vector(v, 4, N);
-                }
-
-                // append each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    to_msgpack_internal(el, v);
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                const auto N = j.m_value.object->size();
-                if (N <= 15)
-                {
-                    // fixmap
-                    v.push_back(static_cast<uint8_t>(0x80 | (N & 0xf)));
-                }
-                else if (N <= 65535)
-                {
-                    // map 16
-                    v.push_back(0xde);
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 4294967295)
-                {
-                    // map 32
-                    v.push_back(0xdf);
-                    add_to_vector(v, 4, N);
-                }
-
-                // append each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    to_msgpack_internal(el.first, v);
-                    to_msgpack_internal(el.second, v);
-                }
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief create a CBOR serialization of a given JSON value
-
-    This is a straightforward implementation of the CBOR specification.
-
-    @param[in] j  JSON value to serialize
-    @param[in,out] v  byte vector to write the serialization to
-
-    @sa https://tools.ietf.org/html/rfc7049
-    */
-    static void to_cbor_internal(const basic_json& j, std::vector<uint8_t>& v)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                v.push_back(0xf6);
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                v.push_back(j.m_value.boolean ? 0xf5 : 0xf4);
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // CBOR does not differentiate between positive signed
-                    // integers and unsigned integers. Therefore, we used the
-                    // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
-                    {
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer <= std::numeric_limits<uint8_t>::max())
-                    {
-                        v.push_back(0x18);
-                        // one-byte uint8_t
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer <= std::numeric_limits<uint16_t>::max())
-                    {
-                        v.push_back(0x19);
-                        // two-byte uint16_t
-                        add_to_vector(v, 2, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer <= std::numeric_limits<uint32_t>::max())
-                    {
-                        v.push_back(0x1a);
-                        // four-byte uint32_t
-                        add_to_vector(v, 4, j.m_value.number_integer);
-                    }
-                    else
-                    {
-                        v.push_back(0x1b);
-                        // eight-byte uint64_t
-                        add_to_vector(v, 8, j.m_value.number_integer);
-                    }
-                }
-                else
-                {
-                    // The conversions below encode the sign in the first
-                    // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
-                    {
-                        v.push_back(static_cast<uint8_t>(0x20 + positive_number));
-                    }
-                    else if (positive_number <= std::numeric_limits<uint8_t>::max())
-                    {
-                        // int 8
-                        v.push_back(0x38);
-                        add_to_vector(v, 1, positive_number);
-                    }
-                    else if (positive_number <= std::numeric_limits<uint16_t>::max())
-                    {
-                        // int 16
-                        v.push_back(0x39);
-                        add_to_vector(v, 2, positive_number);
-                    }
-                    else if (positive_number <= std::numeric_limits<uint32_t>::max())
-                    {
-                        // int 32
-                        v.push_back(0x3a);
-                        add_to_vector(v, 4, positive_number);
-                    }
-                    else
-                    {
-                        // int 64
-                        v.push_back(0x3b);
-                        add_to_vector(v, 8, positive_number);
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= 0x17)
-                {
-                    v.push_back(static_cast<uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= 0xff)
-                {
-                    v.push_back(0x18);
-                    // one-byte uint8_t
-                    add_to_vector(v, 1, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= 0xffff)
-                {
-                    v.push_back(0x19);
-                    // two-byte uint16_t
-                    add_to_vector(v, 2, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= 0xffffffff)
-                {
-                    v.push_back(0x1a);
-                    // four-byte uint32_t
-                    add_to_vector(v, 4, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= 0xffffffffffffffff)
-                {
-                    v.push_back(0x1b);
-                    // eight-byte uint64_t
-                    add_to_vector(v, 8, j.m_value.number_unsigned);
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                // Double-Precision Float
-                v.push_back(0xfb);
-                const auto* helper = reinterpret_cast<const uint8_t*>(&(j.m_value.number_float));
-                for (size_t i = 0; i < 8; ++i)
-                {
-                    v.push_back(helper[7 - i]);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                const auto N = j.m_value.string->size();
-                if (N <= 0x17)
-                {
-                    v.push_back(0x60 + static_cast<uint8_t>(N));  // 1 byte for string + size
-                }
-                else if (N <= 0xff)
-                {
-                    v.push_back(0x78);  // one-byte uint8_t for N
-                    add_to_vector(v, 1, N);
-                }
-                else if (N <= 0xffff)
-                {
-                    v.push_back(0x79);  // two-byte uint16_t for N
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 0xffffffff)
-                {
-                    v.push_back(0x7a); // four-byte uint32_t for N
-                    add_to_vector(v, 4, N);
-                }
-                // LCOV_EXCL_START
-                else if (N <= 0xffffffffffffffff)
-                {
-                    v.push_back(0x7b);  // eight-byte uint64_t for N
-                    add_to_vector(v, 8, N);
-                }
-                // LCOV_EXCL_STOP
-
-                // append string
-                std::copy(j.m_value.string->begin(), j.m_value.string->end(),
-                          std::back_inserter(v));
-                break;
-            }
-
-            case value_t::array:
-            {
-                const auto N = j.m_value.array->size();
-                if (N <= 0x17)
-                {
-                    v.push_back(0x80 + static_cast<uint8_t>(N));  // 1 byte for array + size
-                }
-                else if (N <= 0xff)
-                {
-                    v.push_back(0x98);  // one-byte uint8_t for N
-                    add_to_vector(v, 1, N);
-                }
-                else if (N <= 0xffff)
-                {
-                    v.push_back(0x99);  // two-byte uint16_t for N
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 0xffffffff)
-                {
-                    v.push_back(0x9a);  // four-byte uint32_t for N
-                    add_to_vector(v, 4, N);
-                }
-                // LCOV_EXCL_START
-                else if (N <= 0xffffffffffffffff)
-                {
-                    v.push_back(0x9b);  // eight-byte uint64_t for N
-                    add_to_vector(v, 8, N);
-                }
-                // LCOV_EXCL_STOP
-
-                // append each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    to_cbor_internal(el, v);
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                const auto N = j.m_value.object->size();
-                if (N <= 0x17)
-                {
-                    v.push_back(0xa0 + static_cast<uint8_t>(N));  // 1 byte for object + size
-                }
-                else if (N <= 0xff)
-                {
-                    v.push_back(0xb8);
-                    add_to_vector(v, 1, N);  // one-byte uint8_t for N
-                }
-                else if (N <= 0xffff)
-                {
-                    v.push_back(0xb9);
-                    add_to_vector(v, 2, N);  // two-byte uint16_t for N
-                }
-                else if (N <= 0xffffffff)
-                {
-                    v.push_back(0xba);
-                    add_to_vector(v, 4, N);  // four-byte uint32_t for N
-                }
-                // LCOV_EXCL_START
-                else if (N <= 0xffffffffffffffff)
-                {
-                    v.push_back(0xbb);
-                    add_to_vector(v, 8, N);  // eight-byte uint64_t for N
-                }
-                // LCOV_EXCL_STOP
-
-                // append each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    to_cbor_internal(el.first, v);
-                    to_cbor_internal(el.second, v);
-                }
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-    }
-
-
-    /*
-    @brief checks if given lengths do not exceed the size of a given vector
-
-    To secure the access to the byte vector during CBOR/MessagePack
-    deserialization, bytes are copied from the vector into buffers. This
-    function checks if the number of bytes to copy (@a len) does not exceed
-    the size @s size of the vector. Additionally, an @a offset is given from
-    where to start reading the bytes.
-
-    This function checks whether reading the bytes is safe; that is, offset is
-    a valid index in the vector, offset+len
-
-    @param[in] size    size of the byte vector
-    @param[in] len     number of bytes to read
-    @param[in] offset  offset where to start reading
-
-    vec:  x x x x x X X X X X
-          ^         ^         ^
-          0         offset    len
-
-    @throws out_of_range if `len > v.size()`
-    */
-    static void check_length(const size_t size, const size_t len, const size_t offset)
-    {
-        // simple case: requested length is greater than the vector's length
-        if (len > size or offset > size)
-        {
-            JSON_THROW(std::out_of_range("len out of range"));
-        }
-
-        // second case: adding offset would result in overflow
-        if ((size > (std::numeric_limits<size_t>::max() - offset)))
-        {
-            JSON_THROW(std::out_of_range("len+offset out of range"));
-        }
-
-        // last case: reading past the end of the vector
-        if (len + offset > size)
-        {
-            JSON_THROW(std::out_of_range("len+offset out of range"));
-        }
-    }
-
-    /*!
-    @brief create a JSON value from a given MessagePack vector
-
-    @param[in] v  MessagePack serialization
-    @param[in] idx  byte index to start reading from @a v
-
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from MessagePack were
-    used in the given vector @a v or if the input is not valid MessagePack
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @sa https://github.com/msgpack/msgpack/blob/master/spec.md
-    */
-    static basic_json from_msgpack_internal(const std::vector<uint8_t>& v, size_t& idx)
-    {
-        // make sure reading 1 byte is safe
-        check_length(v.size(), 1, idx);
-
-        // store and increment index
-        const size_t current_idx = idx++;
-
-        if (v[current_idx] <= 0xbf)
-        {
-            if (v[current_idx] <= 0x7f) // positive fixint
-            {
-                return v[current_idx];
-            }
-            if (v[current_idx] <= 0x8f) // fixmap
-            {
-                basic_json result = value_t::object;
-                const size_t len = v[current_idx] & 0x0f;
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_msgpack_internal(v, idx);
-                    result[key] = from_msgpack_internal(v, idx);
-                }
-                return result;
-            }
-            else if (v[current_idx] <= 0x9f) // fixarray
-            {
-                basic_json result = value_t::array;
-                const size_t len = v[current_idx] & 0x0f;
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_msgpack_internal(v, idx));
-                }
-                return result;
-            }
-            else // fixstr
-            {
-                const size_t len = v[current_idx] & 0x1f;
-                const size_t offset = current_idx + 1;
-                idx += len; // skip content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-        }
-        else if (v[current_idx] >= 0xe0) // negative fixint
-        {
-            return static_cast<int8_t>(v[current_idx]);
-        }
-        else
-        {
-            switch (v[current_idx])
-            {
-                case 0xc0: // nil
-                {
-                    return value_t::null;
-                }
-
-                case 0xc2: // false
-                {
-                    return false;
-                }
-
-                case 0xc3: // true
-                {
-                    return true;
-                }
-
-                case 0xca: // float 32
-                {
-                    // copy bytes in reverse order into the double variable
-                    float res;
-                    for (size_t byte = 0; byte < sizeof(float); ++byte)
-                    {
-                        reinterpret_cast<uint8_t*>(&res)[sizeof(float) - byte - 1] = v.at(current_idx + 1 + byte);
-                    }
-                    idx += sizeof(float); // skip content bytes
-                    return res;
-                }
-
-                case 0xcb: // float 64
-                {
-                    // copy bytes in reverse order into the double variable
-                    double res;
-                    for (size_t byte = 0; byte < sizeof(double); ++byte)
-                    {
-                        reinterpret_cast<uint8_t*>(&res)[sizeof(double) - byte - 1] = v.at(current_idx + 1 + byte);
-                    }
-                    idx += sizeof(double); // skip content bytes
-                    return res;
-                }
-
-                case 0xcc: // uint 8
-                {
-                    idx += 1; // skip content byte
-                    return get_from_vector<uint8_t>(v, current_idx);
-                }
-
-                case 0xcd: // uint 16
-                {
-                    idx += 2; // skip 2 content bytes
-                    return get_from_vector<uint16_t>(v, current_idx);
-                }
-
-                case 0xce: // uint 32
-                {
-                    idx += 4; // skip 4 content bytes
-                    return get_from_vector<uint32_t>(v, current_idx);
-                }
-
-                case 0xcf: // uint 64
-                {
-                    idx += 8; // skip 8 content bytes
-                    return get_from_vector<uint64_t>(v, current_idx);
-                }
-
-                case 0xd0: // int 8
-                {
-                    idx += 1; // skip content byte
-                    return get_from_vector<int8_t>(v, current_idx);
-                }
-
-                case 0xd1: // int 16
-                {
-                    idx += 2; // skip 2 content bytes
-                    return get_from_vector<int16_t>(v, current_idx);
-                }
-
-                case 0xd2: // int 32
-                {
-                    idx += 4; // skip 4 content bytes
-                    return get_from_vector<int32_t>(v, current_idx);
-                }
-
-                case 0xd3: // int 64
-                {
-                    idx += 8; // skip 8 content bytes
-                    return get_from_vector<int64_t>(v, current_idx);
-                }
-
-                case 0xd9: // str 8
-                {
-                    const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                    const size_t offset = current_idx + 2;
-                    idx += len + 1; // skip size byte + content bytes
-                    check_length(v.size(), len, offset);
-                    return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-                }
-
-                case 0xda: // str 16
-                {
-                    const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                    const size_t offset = current_idx + 3;
-                    idx += len + 2; // skip 2 size bytes + content bytes
-                    check_length(v.size(), len, offset);
-                    return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-                }
-
-                case 0xdb: // str 32
-                {
-                    const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                    const size_t offset = current_idx + 5;
-                    idx += len + 4; // skip 4 size bytes + content bytes
-                    check_length(v.size(), len, offset);
-                    return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-                }
-
-                case 0xdc: // array 16
-                {
-                    basic_json result = value_t::array;
-                    const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                    idx += 2; // skip 2 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        result.push_back(from_msgpack_internal(v, idx));
-                    }
-                    return result;
-                }
-
-                case 0xdd: // array 32
-                {
-                    basic_json result = value_t::array;
-                    const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                    idx += 4; // skip 4 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        result.push_back(from_msgpack_internal(v, idx));
-                    }
-                    return result;
-                }
-
-                case 0xde: // map 16
-                {
-                    basic_json result = value_t::object;
-                    const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                    idx += 2; // skip 2 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        std::string key = from_msgpack_internal(v, idx);
-                        result[key] = from_msgpack_internal(v, idx);
-                    }
-                    return result;
-                }
-
-                case 0xdf: // map 32
-                {
-                    basic_json result = value_t::object;
-                    const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                    idx += 4; // skip 4 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        std::string key = from_msgpack_internal(v, idx);
-                        result[key] = from_msgpack_internal(v, idx);
-                    }
-                    return result;
-                }
-
-                default:
-                {
-                    JSON_THROW(std::invalid_argument("error parsing a msgpack @ " + std::to_string(current_idx) + ": " + std::to_string(static_cast<int>(v[current_idx]))));
-                }
-            }
-        }
-    }
-
-    /*!
-    @brief create a JSON value from a given CBOR vector
-
-    @param[in] v  CBOR serialization
-    @param[in] idx  byte index to start reading from @a v
-
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from CBOR were used in
-    the given vector @a v or if the input is not valid CBOR
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @sa https://tools.ietf.org/html/rfc7049
-    */
-    static basic_json from_cbor_internal(const std::vector<uint8_t>& v, size_t& idx)
-    {
-        // store and increment index
-        const size_t current_idx = idx++;
-
-        switch (v.at(current_idx))
-        {
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0a:
-            case 0x0b:
-            case 0x0c:
-            case 0x0d:
-            case 0x0e:
-            case 0x0f:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            {
-                return v[current_idx];
-            }
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                idx += 1; // skip content byte
-                return get_from_vector<uint8_t>(v, current_idx);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                idx += 2; // skip 2 content bytes
-                return get_from_vector<uint16_t>(v, current_idx);
-            }
-
-            case 0x1a: // Unsigned integer (four-byte uint32_t follows)
-            {
-                idx += 4; // skip 4 content bytes
-                return get_from_vector<uint32_t>(v, current_idx);
-            }
-
-            case 0x1b: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                idx += 8; // skip 8 content bytes
-                return get_from_vector<uint64_t>(v, current_idx);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2a:
-            case 0x2b:
-            case 0x2c:
-            case 0x2d:
-            case 0x2e:
-            case 0x2f:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            {
-                return static_cast<int8_t>(0x20 - 1 - v[current_idx]);
-            }
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                idx += 1; // skip content byte
-                // must be uint8_t !
-                return static_cast<number_integer_t>(-1) - get_from_vector<uint8_t>(v, current_idx);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                idx += 2; // skip 2 content bytes
-                return static_cast<number_integer_t>(-1) - get_from_vector<uint16_t>(v, current_idx);
-            }
-
-            case 0x3a: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                idx += 4; // skip 4 content bytes
-                return static_cast<number_integer_t>(-1) - get_from_vector<uint32_t>(v, current_idx);
-            }
-
-            case 0x3b: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                idx += 8; // skip 8 content bytes
-                return static_cast<number_integer_t>(-1) - static_cast<number_integer_t>(get_from_vector<uint64_t>(v, current_idx));
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6a:
-            case 0x6b:
-            case 0x6c:
-            case 0x6d:
-            case 0x6e:
-            case 0x6f:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                const auto len = static_cast<size_t>(v[current_idx] - 0x60);
-                const size_t offset = current_idx + 1;
-                idx += len; // skip content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                const size_t offset = current_idx + 2;
-                idx += len + 1; // skip size byte + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                const size_t offset = current_idx + 3;
-                idx += len + 2; // skip 2 size bytes + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x7a: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                const size_t offset = current_idx + 5;
-                idx += len + 4; // skip 4 size bytes + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x7b: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint64_t>(v, current_idx));
-                const size_t offset = current_idx + 9;
-                idx += len + 8; // skip 8 size bytes + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x7f: // UTF-8 string (indefinite length)
-            {
-                std::string result;
-                while (v.at(idx) != 0xff)
-                {
-                    string_t s = from_cbor_internal(v, idx);
-                    result += s;
-                }
-                // skip break byte (0xFF)
-                idx += 1;
-                return result;
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8a:
-            case 0x8b:
-            case 0x8c:
-            case 0x8d:
-            case 0x8e:
-            case 0x8f:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(v[current_idx] - 0x80);
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                idx += 1; // skip 1 size byte
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                idx += 2; // skip 4 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x9a: // array (four-byte uint32_t for n follow)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                idx += 4; // skip 4 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x9b: // array (eight-byte uint64_t for n follow)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint64_t>(v, current_idx));
-                idx += 8; // skip 8 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x9f: // array (indefinite length)
-            {
-                basic_json result = value_t::array;
-                while (v.at(idx) != 0xff)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                // skip break byte (0xFF)
-                idx += 1;
-                return result;
-            }
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xa0:
-            case 0xa1:
-            case 0xa2:
-            case 0xa3:
-            case 0xa4:
-            case 0xa5:
-            case 0xa6:
-            case 0xa7:
-            case 0xa8:
-            case 0xa9:
-            case 0xaa:
-            case 0xab:
-            case 0xac:
-            case 0xad:
-            case 0xae:
-            case 0xaf:
-            case 0xb0:
-            case 0xb1:
-            case 0xb2:
-            case 0xb3:
-            case 0xb4:
-            case 0xb5:
-            case 0xb6:
-            case 0xb7:
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(v[current_idx] - 0xa0);
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xb8: // map (one-byte uint8_t for n follows)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                idx += 1; // skip 1 size byte
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xb9: // map (two-byte uint16_t for n follow)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                idx += 2; // skip 2 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xba: // map (four-byte uint32_t for n follow)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                idx += 4; // skip 4 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xbb: // map (eight-byte uint64_t for n follow)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint64_t>(v, current_idx));
-                idx += 8; // skip 8 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xbf: // map (indefinite length)
-            {
-                basic_json result = value_t::object;
-                while (v.at(idx) != 0xff)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                // skip break byte (0xFF)
-                idx += 1;
-                return result;
-            }
-
-            case 0xf4: // false
-            {
-                return false;
-            }
-
-            case 0xf5: // true
-            {
-                return true;
-            }
-
-            case 0xf6: // null
-            {
-                return value_t::null;
-            }
-
-            case 0xf9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                idx += 2; // skip two content bytes
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added to
-                // IEEE 754 in 2008, today's programming platforms often still
-                // only have limited support for them. It is very easy to
-                // include at least decoding support for them even without such
-                // support. An example of a small decoder for half-precision
-                // floating-point numbers in the C language is shown in Fig. 3.
-                const int half = (v.at(current_idx + 1) << 8) + v.at(current_idx + 2);
-                const int exp = (half >> 10) & 0x1f;
-                const int mant = half & 0x3ff;
-                double val;
-                if (exp == 0)
-                {
-                    val = std::ldexp(mant, -24);
-                }
-                else if (exp != 31)
-                {
-                    val = std::ldexp(mant + 1024, exp - 25);
-                }
-                else
-                {
-                    val = mant == 0
-                          ? std::numeric_limits<double>::infinity()
-                          : std::numeric_limits<double>::quiet_NaN();
-                }
-                return (half & 0x8000) != 0 ? -val : val;
-            }
-
-            case 0xfa: // Single-Precision Float (four-byte IEEE 754)
-            {
-                // copy bytes in reverse order into the float variable
-                float res;
-                for (size_t byte = 0; byte < sizeof(float); ++byte)
-                {
-                    reinterpret_cast<uint8_t*>(&res)[sizeof(float) - byte - 1] = v.at(current_idx + 1 + byte);
-                }
-                idx += sizeof(float); // skip content bytes
-                return res;
-            }
-
-            case 0xfb: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                // copy bytes in reverse order into the double variable
-                double res;
-                for (size_t byte = 0; byte < sizeof(double); ++byte)
-                {
-                    reinterpret_cast<uint8_t*>(&res)[sizeof(double) - byte - 1] = v.at(current_idx + 1 + byte);
-                }
-                idx += sizeof(double); // skip content bytes
-                return res;
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                JSON_THROW(std::invalid_argument("error parsing a CBOR @ " + std::to_string(current_idx) + ": " + std::to_string(static_cast<int>(v[current_idx]))));
-            }
-        }
-    }
-
-  public:
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the MessagePack
-    serialization format. MessagePack is a binary serialization format which
-    aims to be more compact than JSON itself, yet more efficient to parse.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in MessagePack format.,to_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref from_msgpack(const std::vector<uint8_t>&, const size_t) for the
-        analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_msgpack(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_msgpack_internal(j, result);
-        return result;
-    }
-
-    /*!
-    @brief create a JSON value from a byte vector in MessagePack format
-
-    Deserializes a given byte vector @a v to a JSON value using the MessagePack
-    serialization format.
-
-    @param[in] v  a byte vector in MessagePack format
-    @param[in] start_index the index to start reading from @a v (0 by default)
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from MessagePack were
-    used in the given vector @a v or if the input is not valid MessagePack
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @complexity Linear in the size of the byte vector @a v.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    MessagePack format to a JSON value.,from_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(const std::vector<uint8_t>&, const size_t) for the
-        related CBOR format
-
-    @since version 2.0.9, parameter @a start_index since 2.1.1
-    */
-    static basic_json from_msgpack(const std::vector<uint8_t>& v,
-                                   const size_t start_index = 0)
-    {
-        size_t i = start_index;
-        return from_msgpack_internal(v, i);
-    }
-
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
-    Binary Object Representation) serialization format. CBOR is a binary
-    serialization format which aims to be more compact than JSON itself, yet
-    more efficient to parse.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in CBOR format.,to_cbor}
-
-    @sa http://cbor.io
-    @sa @ref from_cbor(const std::vector<uint8_t>&, const size_t) for the
-        analogous deserialization
-    @sa @ref to_msgpack(const basic_json& for the related MessagePack format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_cbor(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_cbor_internal(j, result);
-        return result;
-    }
-
-    /*!
-    @brief create a JSON value from a byte vector in CBOR format
-
-    Deserializes a given byte vector @a v to a JSON value using the CBOR
-    (Concise Binary Object Representation) serialization format.
-
-    @param[in] v  a byte vector in CBOR format
-    @param[in] start_index the index to start reading from @a v (0 by default)
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from CBOR were used in
-    the given vector @a v or if the input is not valid MessagePack
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @complexity Linear in the size of the byte vector @a v.
-
-    @liveexample{The example shows the deserialization of a byte vector in CBOR
-    format to a JSON value.,from_cbor}
-
-    @sa http://cbor.io
-    @sa @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa @ref from_msgpack(const std::vector<uint8_t>&, const size_t) for the
-        related MessagePack format
-
-    @since version 2.0.9, parameter @a start_index since 2.1.1
-    */
-    static basic_json from_cbor(const std::vector<uint8_t>& v,
-                                const size_t start_index = 0)
-    {
-        size_t i = start_index;
-        return from_cbor_internal(v, i);
-    }
-
-    /// @}
-
-    ///////////////////////////
-    // convenience functions //
-    ///////////////////////////
-
-    /*!
-    @brief return the type as string
-
-    Returns the type name as string to be used in error messages - usually to
-    indicate that a function was called on a wrong JSON type.
-
-    @return basically a string representation of a the @a m_type member
-
-    @complexity Constant.
-
-    @liveexample{The following code exemplifies `type_name()` for all JSON
-    types.,type_name}
-
-    @since version 1.0.0, public since 2.1.0
-    */
-    std::string type_name() const
-    {
-        {
-            switch (m_type)
-            {
-                case value_t::null:
-                    return "null";
-                case value_t::object:
-                    return "object";
-                case value_t::array:
-                    return "array";
-                case value_t::string:
-                    return "string";
-                case value_t::boolean:
-                    return "boolean";
-                case value_t::discarded:
-                    return "discarded";
-                default:
-                    return "number";
-            }
-        }
-    }
-
-  private:
-    /*!
-    @brief calculates the extra space to escape a JSON string
-
-    @param[in] s  the string to escape
-    @return the number of characters required to escape string @a s
-
-    @complexity Linear in the length of string @a s.
-    */
-    static std::size_t extra_space(const string_t& s) noexcept
-    {
-        return std::accumulate(s.begin(), s.end(), size_t{},
-                               [](size_t res, typename string_t::value_type c)
-        {
-            switch (c)
-            {
-                case '"':
-                case '\\':
-                case '\b':
-                case '\f':
-                case '\n':
-                case '\r':
-                case '\t':
-                {
-                    // from c (1 byte) to \x (2 bytes)
-                    return res + 1;
-                }
-
-                default:
-                {
-                    if (c >= 0x00 and c <= 0x1f)
-                    {
-                        // from c (1 byte) to \uxxxx (6 bytes)
-                        return res + 5;
-                    }
-
-                    return res;
-                }
-            }
-        });
-    }
-
-    /*!
-    @brief escape a string
-
-    Escape a string by replacing certain special characters by a sequence of
-    an escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation.
-
-    @param[in] s  the string to escape
-    @return  the escaped string
-
-    @complexity Linear in the length of string @a s.
-    */
-    static string_t escape_string(const string_t& s)
-    {
-        const auto space = extra_space(s);
-        if (space == 0)
-        {
-            return s;
-        }
-
-        // create a result string of necessary size
-        string_t result(s.size() + space, '\\');
-        std::size_t pos = 0;
-
-        for (const auto& c : s)
-        {
-            switch (c)
-            {
-                // quotation mark (0x22)
-                case '"':
-                {
-                    result[pos + 1] = '"';
-                    pos += 2;
-                    break;
-                }
-
-                // reverse solidus (0x5c)
-                case '\\':
-                {
-                    // nothing to change
-                    pos += 2;
-                    break;
-                }
-
-                // backspace (0x08)
-                case '\b':
-                {
-                    result[pos + 1] = 'b';
-                    pos += 2;
-                    break;
-                }
-
-                // formfeed (0x0c)
-                case '\f':
-                {
-                    result[pos + 1] = 'f';
-                    pos += 2;
-                    break;
-                }
-
-                // newline (0x0a)
-                case '\n':
-                {
-                    result[pos + 1] = 'n';
-                    pos += 2;
-                    break;
-                }
-
-                // carriage return (0x0d)
-                case '\r':
-                {
-                    result[pos + 1] = 'r';
-                    pos += 2;
-                    break;
-                }
-
-                // horizontal tab (0x09)
-                case '\t':
-                {
-                    result[pos + 1] = 't';
-                    pos += 2;
-                    break;
-                }
-
-                default:
-                {
-                    if (c >= 0x00 and c <= 0x1f)
-                    {
-                        // convert a number 0..15 to its hex representation
-                        // (0..f)
-                        static const char hexify[16] =
-                        {
-                            '0', '1', '2', '3', '4', '5', '6', '7',
-                            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-                        };
-
-                        // print character c as \uxxxx
-                        for (const char m :
-                    { 'u', '0', '0', hexify[c >> 4], hexify[c & 0x0f]
-                        })
-                        {
-                            result[++pos] = m;
-                        }
-
-                        ++pos;
-                    }
-                    else
-                    {
-                        // all other characters are added as-is
-                        result[pos++] = c;
-                    }
-                    break;
-                }
-            }
-        }
-
-        return result;
-    }
-
-
-    /*!
-    @brief locale-independent serialization for built-in arithmetic types
-    */
-    struct numtostr
-    {
-      public:
-        template<typename NumberType>
-        numtostr(NumberType value)
-        {
-            x_write(value, std::is_integral<NumberType>());
-        }
-
-        const char* c_str() const
-        {
-            return m_buf.data();
-        }
-
-      private:
-        /// a (hopefully) large enough character buffer
-        std::array < char, 64 > m_buf{{}};
-
-        template<typename NumberType>
-        void x_write(NumberType x, /*is_integral=*/std::true_type)
-        {
-            // special case for "0"
-            if (x == 0)
-            {
-                m_buf[0] = '0';
-                return;
-            }
-
-            const bool is_negative = x < 0;
-            size_t i = 0;
-
-            // spare 1 byte for '\0'
-            while (x != 0 and i < m_buf.size() - 1)
-            {
-                const auto digit = std::labs(static_cast<long>(x % 10));
-                m_buf[i++] = static_cast<char>('0' + digit);
-                x /= 10;
-            }
-
-            // make sure the number has been processed completely
-            assert(x == 0);
-
-            if (is_negative)
-            {
-                // make sure there is capacity for the '-'
-                assert(i < m_buf.size() - 2);
-                m_buf[i++] = '-';
-            }
-
-            std::reverse(m_buf.begin(), m_buf.begin() + i);
-        }
-
-        template<typename NumberType>
-        void x_write(NumberType x, /*is_integral=*/std::false_type)
-        {
-            // special case for 0.0 and -0.0
-            if (x == 0)
-            {
-                size_t i = 0;
-                if (std::signbit(x))
-                {
-                    m_buf[i++] = '-';
-                }
-                m_buf[i++] = '0';
-                m_buf[i++] = '.';
-                m_buf[i] = '0';
-                return;
-            }
-
-            // get number of digits for a text -> float -> text round-trip
-            static constexpr auto d = std::numeric_limits<NumberType>::digits10;
-
-            // the actual conversion
-            const auto written_bytes = snprintf(m_buf.data(), m_buf.size(), "%.*g", d, x);
-
-            // negative value indicates an error
-            assert(written_bytes > 0);
-            // check if buffer was large enough
-            assert(static_cast<size_t>(written_bytes) < m_buf.size());
-
-            // read information from locale
-            const auto loc = localeconv();
-            assert(loc != nullptr);
-            const char thousands_sep = !loc->thousands_sep ? '\0'
-                                       : loc->thousands_sep[0];
-
-            const char decimal_point = !loc->decimal_point ? '\0'
-                                       : loc->decimal_point[0];
-
-            // erase thousands separator
-            if (thousands_sep != '\0')
-            {
-                const auto end = std::remove(m_buf.begin(), m_buf.begin() + written_bytes, thousands_sep);
-                std::fill(end, m_buf.end(), '\0');
-            }
-
-            // convert decimal point to '.'
-            if (decimal_point != '\0' and decimal_point != '.')
-            {
-                for (auto& c : m_buf)
-                {
-                    if (c == decimal_point)
-                    {
-                        c = '.';
-                        break;
-                    }
-                }
-            }
-
-            // determine if need to append ".0"
-            size_t i = 0;
-            bool value_is_int_like = true;
-            for (i = 0; i < m_buf.size(); ++i)
-            {
-                // break when end of number is reached
-                if (m_buf[i] == '\0')
-                {
-                    break;
-                }
-
-                // check if we find non-int character
-                value_is_int_like = value_is_int_like and m_buf[i] != '.' and
-                                    m_buf[i] != 'e' and m_buf[i] != 'E';
-            }
-
-            if (value_is_int_like)
-            {
-                // there must be 2 bytes left for ".0"
-                assert((i + 2) < m_buf.size());
-                // we write to the end of the number
-                assert(m_buf[i] == '\0');
-                assert(m_buf[i - 1] != '\0');
-
-                // add ".0"
-                m_buf[i] = '.';
-                m_buf[i + 1] = '0';
-
-                // the resulting string is properly terminated
-                assert(m_buf[i + 2] == '\0');
-            }
-        }
-    };
-
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serialization internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is
-    called recursively. Note that
-
-    - strings and object keys are escaped using `escape_string()`
-    - integer numbers are converted implicitly via `operator<<`
-    - floating-point numbers are converted to a string using `"%g"` format
-
-    @param[out] o              stream to write to
-    @param[in] pretty_print    whether the output shall be pretty-printed
-    @param[in] indent_step     the indent level
-    @param[in] current_indent  the current indent level (only used internally)
-    */
-    void dump(std::ostream& o,
-              const bool pretty_print,
-              const unsigned int indent_step,
-              const unsigned int current_indent = 0) const
-    {
-        // variable to hold indentation for recursive calls
-        unsigned int new_indent = current_indent;
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                if (m_value.object->empty())
-                {
-                    o << "{}";
-                    return;
-                }
-
-                o << "{";
-
-                // increase indentation
-                if (pretty_print)
-                {
-                    new_indent += indent_step;
-                    o << "\n";
-                }
-
-                for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i)
-                {
-                    if (i != m_value.object->cbegin())
-                    {
-                        o << (pretty_print ? ",\n" : ",");
-                    }
-                    o << string_t(new_indent, ' ') << "\""
-                      << escape_string(i->first) << "\":"
-                      << (pretty_print ? " " : "");
-                    i->second.dump(o, pretty_print, indent_step, new_indent);
-                }
-
-                // decrease indentation
-                if (pretty_print)
-                {
-                    new_indent -= indent_step;
-                    o << "\n";
-                }
-
-                o << string_t(new_indent, ' ') + "}";
-                return;
-            }
-
-            case value_t::array:
-            {
-                if (m_value.array->empty())
-                {
-                    o << "[]";
-                    return;
-                }
-
-                o << "[";
-
-                // increase indentation
-                if (pretty_print)
-                {
-                    new_indent += indent_step;
-                    o << "\n";
-                }
-
-                for (auto i = m_value.array->cbegin(); i != m_value.array->cend(); ++i)
-                {
-                    if (i != m_value.array->cbegin())
-                    {
-                        o << (pretty_print ? ",\n" : ",");
-                    }
-                    o << string_t(new_indent, ' ');
-                    i->dump(o, pretty_print, indent_step, new_indent);
-                }
-
-                // decrease indentation
-                if (pretty_print)
-                {
-                    new_indent -= indent_step;
-                    o << "\n";
-                }
-
-                o << string_t(new_indent, ' ') << "]";
-                return;
-            }
-
-            case value_t::string:
-            {
-                o << string_t("\"") << escape_string(*m_value.string) << "\"";
-                return;
-            }
-
-            case value_t::boolean:
-            {
-                o << (m_value.boolean ? "true" : "false");
-                return;
-            }
-
-            case value_t::number_integer:
-            {
-                o << numtostr(m_value.number_integer).c_str();
-                return;
-            }
-
-            case value_t::number_unsigned:
-            {
-                o << numtostr(m_value.number_unsigned).c_str();
-                return;
-            }
-
-            case value_t::number_float:
-            {
-                o << numtostr(m_value.number_float).c_str();
-                return;
-            }
-
-            case value_t::discarded:
-            {
-                o << "<discarded>";
-                return;
-            }
-
-            case value_t::null:
-            {
-                o << "null";
-                return;
-            }
-        }
-    }
-
-  private:
-    //////////////////////
-    // member variables //
-    //////////////////////
-
-    /// the type of the current element
-    value_t m_type = value_t::null;
-
-    /// the value of the current element
-    json_value m_value = {};
-
-
-  private:
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /*!
-    @brief an iterator for primitive JSON types
-
-    This class models an iterator for primitive JSON types (boolean, number,
-    string). It's only purpose is to allow the iterator/const_iterator classes
-    to "iterate" over primitive values. Internally, the iterator is modeled by
-    a `difference_type` variable. Value begin_value (`0`) models the begin,
-    end_value (`1`) models past the end.
-    */
-    class primitive_iterator_t
-    {
-      public:
-
-        difference_type get_value() const noexcept
-        {
-            return m_it;
-        }
-        /// set iterator to a defined beginning
-        void set_begin() noexcept
-        {
-            m_it = begin_value;
-        }
-
-        /// set iterator to a defined past the end
-        void set_end() noexcept
-        {
-            m_it = end_value;
-        }
-
-        /// return whether the iterator can be dereferenced
-        constexpr bool is_begin() const noexcept
-        {
-            return (m_it == begin_value);
-        }
-
-        /// return whether the iterator is at end
-        constexpr bool is_end() const noexcept
-        {
-            return (m_it == end_value);
-        }
-
-        friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it == rhs.m_it;
-        }
-
-        friend constexpr bool operator!=(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return !(lhs == rhs);
-        }
-
-        friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it < rhs.m_it;
-        }
-
-        friend constexpr bool operator<=(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it <= rhs.m_it;
-        }
-
-        friend constexpr bool operator>(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it > rhs.m_it;
-        }
-
-        friend constexpr bool operator>=(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it >= rhs.m_it;
-        }
-
-        primitive_iterator_t operator+(difference_type i)
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it - rhs.m_it;
-        }
-
-        friend std::ostream& operator<<(std::ostream& os, primitive_iterator_t it)
-        {
-            return os << it.m_it;
-        }
-
-        primitive_iterator_t& operator++()
-        {
-            ++m_it;
-            return *this;
-        }
-
-        primitive_iterator_t operator++(int)
-        {
-            auto result = *this;
-            m_it++;
-            return result;
-        }
-
-        primitive_iterator_t& operator--()
-        {
-            --m_it;
-            return *this;
-        }
-
-        primitive_iterator_t operator--(int)
-        {
-            auto result = *this;
-            m_it--;
-            return result;
-        }
-
-        primitive_iterator_t& operator+=(difference_type n)
-        {
-            m_it += n;
-            return *this;
-        }
-
-        primitive_iterator_t& operator-=(difference_type n)
-        {
-            m_it -= n;
-            return *this;
-        }
-
-      private:
-        static constexpr difference_type begin_value = 0;
-        static constexpr difference_type end_value = begin_value + 1;
-
-        /// iterator as signed integer type
-        difference_type m_it = std::numeric_limits<std::ptrdiff_t>::denorm_min();
-    };
-
-    /*!
-    @brief an iterator value
-
-    @note This structure could easily be a union, but MSVC currently does not
-    allow unions members with complex constructors, see
-    https://github.com/nlohmann/json/pull/105.
-    */
-    struct internal_iterator
-    {
-        /// iterator for JSON objects
-        typename object_t::iterator object_iterator;
-        /// iterator for JSON arrays
-        typename array_t::iterator array_iterator;
-        /// generic iterator for all other types
-        primitive_iterator_t primitive_iterator;
-
-        /// create an uninitialized internal_iterator
-        internal_iterator() noexcept
-            : object_iterator(), array_iterator(), primitive_iterator()
-        {}
-    };
-
-    /// proxy class for the iterator_wrapper functions
-    template<typename IteratorType>
-    class iteration_proxy
-    {
-      private:
-        /// helper class for iteration
-        class iteration_proxy_internal
-        {
-          private:
-            /// the iterator
-            IteratorType anchor;
-            /// an index for arrays (used to create key names)
-            size_t array_index = 0;
-
-          public:
-            explicit iteration_proxy_internal(IteratorType it) noexcept
-                : anchor(it)
-            {}
-
-            /// dereference operator (needed for range-based for)
-            iteration_proxy_internal& operator*()
-            {
-                return *this;
-            }
-
-            /// increment operator (needed for range-based for)
-            iteration_proxy_internal& operator++()
-            {
-                ++anchor;
-                ++array_index;
-
-                return *this;
-            }
-
-            /// inequality operator (needed for range-based for)
-            bool operator!= (const iteration_proxy_internal& o) const
-            {
-                return anchor != o.anchor;
-            }
-
-            /// return key of the iterator
-            typename basic_json::string_t key() const
-            {
-                assert(anchor.m_object != nullptr);
-
-                switch (anchor.m_object->type())
-                {
-                    // use integer array index as key
-                    case value_t::array:
-                    {
-                        return std::to_string(array_index);
-                    }
-
-                    // use key from the object
-                    case value_t::object:
-                    {
-                        return anchor.key();
-                    }
-
-                    // use an empty key for all primitive types
-                    default:
-                    {
-                        return "";
-                    }
-                }
-            }
-
-            /// return value of the iterator
-            typename IteratorType::reference value() const
-            {
-                return anchor.value();
-            }
-        };
-
-        /// the container to iterate
-        typename IteratorType::reference container;
-
-      public:
-        /// construct iteration proxy from a container
-        explicit iteration_proxy(typename IteratorType::reference cont)
-            : container(cont)
-        {}
-
-        /// return iterator begin (needed for range-based for)
-        iteration_proxy_internal begin() noexcept
-        {
-            return iteration_proxy_internal(container.begin());
-        }
-
-        /// return iterator end (needed for range-based for)
-        iteration_proxy_internal end() noexcept
-        {
-            return iteration_proxy_internal(container.end());
-        }
-    };
-
-  public:
-    /*!
-    @brief a template for a random access iterator for the @ref basic_json class
-
-    This class implements a both iterators (iterator and const_iterator) for the
-    @ref basic_json class.
-
-    @note An iterator is called *initialized* when a pointer to a JSON value
-          has been set (e.g., by a constructor or a copy assignment). If the
-          iterator is default-constructed, it is *uninitialized* and most
-          methods are undefined. **The library uses assertions to detect calls
-          on uninitialized iterators.**
-
-    @requirement The class satisfies the following concept requirements:
-    - [RandomAccessIterator](http://en.cppreference.com/w/cpp/concept/RandomAccessIterator):
-      The iterator that can be moved to point (forward and backward) to any
-      element in constant time.
-
-    @since version 1.0.0, simplified in version 2.0.9
-    */
-    template<typename U>
-    class iter_impl : public std::iterator<std::random_access_iterator_tag, U>
-    {
-        /// allow basic_json to access private members
-        friend class basic_json;
-
-        // make sure U is basic_json or const basic_json
-        static_assert(std::is_same<U, basic_json>::value
-                      or std::is_same<U, const basic_json>::value,
-                      "iter_impl only accepts (const) basic_json");
-
-      public:
-        /// the type of the values when the iterator is dereferenced
-        using value_type = typename basic_json::value_type;
-        /// a type to represent differences between iterators
-        using difference_type = typename basic_json::difference_type;
-        /// defines a pointer to the type iterated over (value_type)
-        using pointer = typename std::conditional<std::is_const<U>::value,
-              typename basic_json::const_pointer,
-              typename basic_json::pointer>::type;
-        /// defines a reference to the type iterated over (value_type)
-        using reference = typename std::conditional<std::is_const<U>::value,
-              typename basic_json::const_reference,
-              typename basic_json::reference>::type;
-        /// the category of the iterator
-        using iterator_category = std::bidirectional_iterator_tag;
-
-        /// default constructor
-        iter_impl() = default;
-
-        /*!
-        @brief constructor for a given JSON instance
-        @param[in] object  pointer to a JSON object for this iterator
-        @pre object != nullptr
-        @post The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        explicit iter_impl(pointer object) noexcept
-            : m_object(object)
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    m_it.object_iterator = typename object_t::iterator();
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    m_it.array_iterator = typename array_t::iterator();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator = primitive_iterator_t();
-                    break;
-                }
-            }
-        }
-
-        /*
-        Use operator `const_iterator` instead of `const_iterator(const iterator&
-        other) noexcept` to avoid two class definitions for @ref iterator and
-        @ref const_iterator.
-
-        This function is only called if this class is an @ref iterator. If this
-        class is a @ref const_iterator this function is not called.
-        */
-        operator const_iterator() const
-        {
-            const_iterator ret;
-
-            if (m_object)
-            {
-                ret.m_object = m_object;
-                ret.m_it = m_it;
-            }
-
-            return ret;
-        }
-
-        /*!
-        @brief copy constructor
-        @param[in] other  iterator to copy from
-        @note It is not checked whether @a other is initialized.
-        */
-        iter_impl(const iter_impl& other) noexcept
-            : m_object(other.m_object), m_it(other.m_it)
-        {}
-
-        /*!
-        @brief copy assignment
-        @param[in,out] other  iterator to copy from
-        @note It is not checked whether @a other is initialized.
-        */
-        iter_impl& operator=(iter_impl other) noexcept(
-            std::is_nothrow_move_constructible<pointer>::value and
-            std::is_nothrow_move_assignable<pointer>::value and
-            std::is_nothrow_move_constructible<internal_iterator>::value and
-            std::is_nothrow_move_assignable<internal_iterator>::value
-        )
-        {
-            std::swap(m_object, other.m_object);
-            std::swap(m_it, other.m_it);
-            return *this;
-        }
-
-      private:
-        /*!
-        @brief set the iterator to the first value
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        void set_begin() noexcept
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    m_it.object_iterator = m_object->m_value.object->begin();
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    m_it.array_iterator = m_object->m_value.array->begin();
-                    break;
-                }
-
-                case basic_json::value_t::null:
-                {
-                    // set to end so begin()==end() is true: null is empty
-                    m_it.primitive_iterator.set_end();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator.set_begin();
-                    break;
-                }
-            }
-        }
-
-        /*!
-        @brief set the iterator past the last value
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        void set_end() noexcept
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    m_it.object_iterator = m_object->m_value.object->end();
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    m_it.array_iterator = m_object->m_value.array->end();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator.set_end();
-                    break;
-                }
-            }
-        }
-
-      public:
-        /*!
-        @brief return a reference to the value pointed to by the iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        reference operator*() const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    assert(m_it.object_iterator != m_object->m_value.object->end());
-                    return m_it.object_iterator->second;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    assert(m_it.array_iterator != m_object->m_value.array->end());
-                    return *m_it.array_iterator;
-                }
-
-                case basic_json::value_t::null:
-                {
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-
-                default:
-                {
-                    if (m_it.primitive_iterator.is_begin())
-                    {
-                        return *m_object;
-                    }
-
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-            }
-        }
-
-        /*!
-        @brief dereference the iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        pointer operator->() const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    assert(m_it.object_iterator != m_object->m_value.object->end());
-                    return &(m_it.object_iterator->second);
-                }
-
-                case basic_json::value_t::array:
-                {
-                    assert(m_it.array_iterator != m_object->m_value.array->end());
-                    return &*m_it.array_iterator;
-                }
-
-                default:
-                {
-                    if (m_it.primitive_iterator.is_begin())
-                    {
-                        return m_object;
-                    }
-
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-            }
-        }
-
-        /*!
-        @brief post-increment (it++)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator++(int)
-        {
-            auto result = *this;
-            ++(*this);
-            return result;
-        }
-
-        /*!
-        @brief pre-increment (++it)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator++()
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    std::advance(m_it.object_iterator, 1);
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    std::advance(m_it.array_iterator, 1);
-                    break;
-                }
-
-                default:
-                {
-                    ++m_it.primitive_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /*!
-        @brief post-decrement (it--)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator--(int)
-        {
-            auto result = *this;
-            --(*this);
-            return result;
-        }
-
-        /*!
-        @brief pre-decrement (--it)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator--()
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    std::advance(m_it.object_iterator, -1);
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    std::advance(m_it.array_iterator, -1);
-                    break;
-                }
-
-                default:
-                {
-                    --m_it.primitive_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /*!
-        @brief  comparison: equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator==(const iter_impl& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                JSON_THROW(std::domain_error("cannot compare iterators of different containers"));
-            }
-
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    return (m_it.object_iterator == other.m_it.object_iterator);
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return (m_it.array_iterator == other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.primitive_iterator == other.m_it.primitive_iterator);
-                }
-            }
-        }
-
-        /*!
-        @brief  comparison: not equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator!=(const iter_impl& other) const
-        {
-            return not operator==(other);
-        }
-
-        /*!
-        @brief  comparison: smaller
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator<(const iter_impl& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                JSON_THROW(std::domain_error("cannot compare iterators of different containers"));
-            }
-
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot compare order of object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return (m_it.array_iterator < other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.primitive_iterator < other.m_it.primitive_iterator);
-                }
-            }
-        }
-
-        /*!
-        @brief  comparison: less than or equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator<=(const iter_impl& other) const
-        {
-            return not other.operator < (*this);
-        }
-
-        /*!
-        @brief  comparison: greater than
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator>(const iter_impl& other) const
-        {
-            return not operator<=(other);
-        }
-
-        /*!
-        @brief  comparison: greater than or equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator>=(const iter_impl& other) const
-        {
-            return not operator<(other);
-        }
-
-        /*!
-        @brief  add to iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator+=(difference_type i)
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot use offsets with object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    std::advance(m_it.array_iterator, i);
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator += i;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /*!
-        @brief  subtract from iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator-=(difference_type i)
-        {
-            return operator+=(-i);
-        }
-
-        /*!
-        @brief  add to iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator+(difference_type i)
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        /*!
-        @brief  subtract from iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator-(difference_type i)
-        {
-            auto result = *this;
-            result -= i;
-            return result;
-        }
-
-        /*!
-        @brief  return difference
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        difference_type operator-(const iter_impl& other) const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot use offsets with object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return m_it.array_iterator - other.m_it.array_iterator;
-                }
-
-                default:
-                {
-                    return m_it.primitive_iterator - other.m_it.primitive_iterator;
-                }
-            }
-        }
-
-        /*!
-        @brief  access to successor
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        reference operator[](difference_type n) const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot use operator[] for object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return *std::next(m_it.array_iterator, n);
-                }
-
-                case basic_json::value_t::null:
-                {
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-
-                default:
-                {
-                    if (m_it.primitive_iterator.get_value() == -n)
-                    {
-                        return *m_object;
-                    }
-
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-            }
-        }
-
-        /*!
-        @brief  return the key of an object iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        typename object_t::key_type key() const
-        {
-            assert(m_object != nullptr);
-
-            if (m_object->is_object())
-            {
-                return m_it.object_iterator->first;
-            }
-
-            JSON_THROW(std::domain_error("cannot use key() for non-object iterators"));
-        }
-
-        /*!
-        @brief  return the value of an iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        reference value() const
-        {
-            return operator*();
-        }
-
-      private:
-        /// associated JSON instance
-        pointer m_object = nullptr;
-        /// the actual iterator of the associated instance
-        internal_iterator m_it = internal_iterator();
-    };
-
-    /*!
-    @brief a template for a reverse iterator class
-
-    @tparam Base the base iterator type to reverse. Valid types are @ref
-    iterator (to create @ref reverse_iterator) and @ref const_iterator (to
-    create @ref const_reverse_iterator).
-
-    @requirement The class satisfies the following concept requirements:
-    - [RandomAccessIterator](http://en.cppreference.com/w/cpp/concept/RandomAccessIterator):
-      The iterator that can be moved to point (forward and backward) to any
-      element in constant time.
-    - [OutputIterator](http://en.cppreference.com/w/cpp/concept/OutputIterator):
-      It is possible to write to the pointed-to element (only if @a Base is
-      @ref iterator).
-
-    @since version 1.0.0
-    */
-    template<typename Base>
-    class json_reverse_iterator : public std::reverse_iterator<Base>
-    {
-      public:
-        /// shortcut to the reverse iterator adaptor
-        using base_iterator = std::reverse_iterator<Base>;
-        /// the reference type for the pointed-to element
-        using reference = typename Base::reference;
-
-        /// create reverse iterator from iterator
-        json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
-            : base_iterator(it)
-        {}
-
-        /// create reverse iterator from base class
-        json_reverse_iterator(const base_iterator& it) noexcept
-            : base_iterator(it)
-        {}
-
-        /// post-increment (it++)
-        json_reverse_iterator operator++(int)
-        {
-            return base_iterator::operator++(1);
-        }
-
-        /// pre-increment (++it)
-        json_reverse_iterator& operator++()
-        {
-            base_iterator::operator++();
-            return *this;
-        }
-
-        /// post-decrement (it--)
-        json_reverse_iterator operator--(int)
-        {
-            return base_iterator::operator--(1);
-        }
-
-        /// pre-decrement (--it)
-        json_reverse_iterator& operator--()
-        {
-            base_iterator::operator--();
-            return *this;
-        }
-
-        /// add to iterator
-        json_reverse_iterator& operator+=(difference_type i)
-        {
-            base_iterator::operator+=(i);
-            return *this;
-        }
-
-        /// add to iterator
-        json_reverse_iterator operator+(difference_type i) const
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        /// subtract from iterator
-        json_reverse_iterator operator-(difference_type i) const
-        {
-            auto result = *this;
-            result -= i;
-            return result;
-        }
-
-        /// return difference
-        difference_type operator-(const json_reverse_iterator& other) const
-        {
-            return this->base() - other.base();
-        }
-
-        /// access to successor
-        reference operator[](difference_type n) const
-        {
-            return *(this->operator+(n));
-        }
-
-        /// return the key of an object iterator
-        typename object_t::key_type key() const
-        {
-            auto it = --this->base();
-            return it.key();
-        }
-
-        /// return the value of an iterator
-        reference value() const
-        {
-            auto it = --this->base();
-            return it.operator * ();
-        }
-    };
-
-
-  private:
-    //////////////////////
-    // lexer and parser //
-    //////////////////////
-
-    /*!
-    @brief lexical analysis
-
-    This class organizes the lexical analysis during JSON deserialization. The
-    core of it is a scanner generated by [re2c](http://re2c.org) that
-    processes a buffer and recognizes tokens according to RFC 7159.
-    */
-    class lexer
-    {
-      public:
-        /// token types for the parser
-        enum class token_type
-        {
-            uninitialized,   ///< indicating the scanner is uninitialized
-            literal_true,    ///< the `true` literal
-            literal_false,   ///< the `false` literal
-            literal_null,    ///< the `null` literal
-            value_string,    ///< a string -- use get_string() for actual value
-            value_unsigned,  ///< an unsigned integer -- use get_number() for actual value
-            value_integer,   ///< a signed integer -- use get_number() for actual value
-            value_float,     ///< an floating point number -- use get_number() for actual value
-            begin_array,     ///< the character for array begin `[`
-            begin_object,    ///< the character for object begin `{`
-            end_array,       ///< the character for array end `]`
-            end_object,      ///< the character for object end `}`
-            name_separator,  ///< the name separator `:`
-            value_separator, ///< the value separator `,`
-            parse_error,     ///< indicating a parse error
-            end_of_input     ///< indicating the end of the input buffer
-        };
-
-        /// the char type to use in the lexer
-        using lexer_char_t = unsigned char;
-
-        /// a lexer from a buffer with given length
-        lexer(const lexer_char_t* buff, const size_t len) noexcept
-            : m_content(buff)
-        {
-            assert(m_content != nullptr);
-            m_start = m_cursor = m_content;
-            m_limit = m_content + len;
-        }
-
-        /// a lexer from an input stream
-        explicit lexer(std::istream& s)
-            : m_stream(&s), m_line_buffer()
-        {
-            // immediately abort if stream is erroneous
-            if (s.fail())
-            {
-                JSON_THROW(std::invalid_argument("stream error"));
-            }
-
-            // fill buffer
-            fill_line_buffer();
-
-            // skip UTF-8 byte-order mark
-            if (m_line_buffer.size() >= 3 and m_line_buffer.substr(0, 3) == "\xEF\xBB\xBF")
-            {
-                m_line_buffer[0] = ' ';
-                m_line_buffer[1] = ' ';
-                m_line_buffer[2] = ' ';
-            }
-        }
-
-        // switch off unwanted functions (due to pointer members)
-        lexer() = delete;
-        lexer(const lexer&) = delete;
-        lexer operator=(const lexer&) = delete;
-
-        /*!
-        @brief create a string from one or two Unicode code points
-
-        There are two cases: (1) @a codepoint1 is in the Basic Multilingual
-        Plane (U+0000 through U+FFFF) and @a codepoint2 is 0, or (2)
-        @a codepoint1 and @a codepoint2 are a UTF-16 surrogate pair to
-        represent a code point above U+FFFF.
-
-        @param[in] codepoint1  the code point (can be high surrogate)
-        @param[in] codepoint2  the code point (can be low surrogate or 0)
-
-        @return string representation of the code point; the length of the
-        result string is between 1 and 4 characters.
-
-        @throw std::out_of_range if code point is > 0x10ffff; example: `"code
-        points above 0x10FFFF are invalid"`
-        @throw std::invalid_argument if the low surrogate is invalid; example:
-        `""missing or wrong low surrogate""`
-
-        @complexity Constant.
-
-        @see <http://en.wikipedia.org/wiki/UTF-8#Sample_code>
-        */
-        static string_t to_unicode(const std::size_t codepoint1,
-                                   const std::size_t codepoint2 = 0)
-        {
-            // calculate the code point from the given code points
-            std::size_t codepoint = codepoint1;
-
-            // check if codepoint1 is a high surrogate
-            if (codepoint1 >= 0xD800 and codepoint1 <= 0xDBFF)
-            {
-                // check if codepoint2 is a low surrogate
-                if (codepoint2 >= 0xDC00 and codepoint2 <= 0xDFFF)
-                {
-                    codepoint =
-                        // high surrogate occupies the most significant 22 bits
-                        (codepoint1 << 10)
-                        // low surrogate occupies the least significant 15 bits
-                        + codepoint2
-                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                        // in the result so we have to subtract with:
-                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                        - 0x35FDC00;
-                }
-                else
-                {
-                    JSON_THROW(std::invalid_argument("missing or wrong low surrogate"));
-                }
-            }
-
-            string_t result;
-
-            if (codepoint < 0x80)
-            {
-                // 1-byte characters: 0xxxxxxx (ASCII)
-                result.append(1, static_cast<typename string_t::value_type>(codepoint));
-            }
-            else if (codepoint <= 0x7ff)
-            {
-                // 2-byte characters: 110xxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xC0 | ((codepoint >> 6) & 0x1F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else if (codepoint <= 0xffff)
-            {
-                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xE0 | ((codepoint >> 12) & 0x0F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 6) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else if (codepoint <= 0x10ffff)
-            {
-                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xF0 | ((codepoint >> 18) & 0x07)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 12) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 6) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else
-            {
-                JSON_THROW(std::out_of_range("code points above 0x10FFFF are invalid"));
-            }
-
-            return result;
-        }
-
-        /// return name of values of type token_type (only used for errors)
-        static std::string token_type_name(const token_type t)
-        {
-            switch (t)
-            {
-                case token_type::uninitialized:
-                    return "<uninitialized>";
-                case token_type::literal_true:
-                    return "true literal";
-                case token_type::literal_false:
-                    return "false literal";
-                case token_type::literal_null:
-                    return "null literal";
-                case token_type::value_string:
-                    return "string literal";
-                case lexer::token_type::value_unsigned:
-                case lexer::token_type::value_integer:
-                case lexer::token_type::value_float:
-                    return "number literal";
-                case token_type::begin_array:
-                    return "'['";
-                case token_type::begin_object:
-                    return "'{'";
-                case token_type::end_array:
-                    return "']'";
-                case token_type::end_object:
-                    return "'}'";
-                case token_type::name_separator:
-                    return "':'";
-                case token_type::value_separator:
-                    return "','";
-                case token_type::parse_error:
-                    return "<parse error>";
-                case token_type::end_of_input:
-                    return "end of input";
-                default:
-                {
-                    // catch non-enum values
-                    return "unknown token"; // LCOV_EXCL_LINE
-                }
-            }
-        }
-
-        /*!
-        This function implements a scanner for JSON. It is specified using
-        regular expressions that try to follow RFC 7159 as close as possible.
-        These regular expressions are then translated into a minimized
-        deterministic finite automaton (DFA) by the tool
-        [re2c](http://re2c.org). As a result, the translated code for this
-        function consists of a large block of code with `goto` jumps.
-
-        @return the class of the next token read from the buffer
-
-        @complexity Linear in the length of the input.\n
-
-        Proposition: The loop below will always terminate for finite input.\n
-
-        Proof (by contradiction): Assume a finite input. To loop forever, the
-        loop must never hit code with a `break` statement. The only code
-        snippets without a `break` statement are the continue statements for
-        whitespace and byte-order-marks. To loop forever, the input must be an
-        infinite sequence of whitespace or byte-order-marks. This contradicts
-        the assumption of finite input, q.e.d.
-        */
-        token_type scan()
-        {
-            while (true)
-            {
-                // pointer for backtracking information
-                m_marker = nullptr;
-
-                // remember the begin of the token
-                m_start = m_cursor;
-                assert(m_start != nullptr);
-
-
-                {
-                    lexer_char_t yych;
-                    unsigned int yyaccept = 0;
-                    static const unsigned char yybm[] =
-                    {
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,  32,  32,   0,   0,  32,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        160, 128,   0, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        192, 192, 192, 192, 192, 192, 192, 192,
-                        192, 192, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128,   0, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                    };
-                    if ((m_limit - m_cursor) < 5)
-                    {
-                        fill_line_buffer(5);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yybm[0 + yych] & 32)
-                    {
-                        goto basic_json_parser_6;
-                    }
-                    if (yych <= '[')
-                    {
-                        if (yych <= '-')
-                        {
-                            if (yych <= '"')
-                            {
-                                if (yych <= 0x00)
-                                {
-                                    goto basic_json_parser_2;
-                                }
-                                if (yych <= '!')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                goto basic_json_parser_9;
-                            }
-                            else
-                            {
-                                if (yych <= '+')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                if (yych <= ',')
-                                {
-                                    goto basic_json_parser_10;
-                                }
-                                goto basic_json_parser_12;
-                            }
-                        }
-                        else
-                        {
-                            if (yych <= '9')
-                            {
-                                if (yych <= '/')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                if (yych <= '0')
-                                {
-                                    goto basic_json_parser_13;
-                                }
-                                goto basic_json_parser_15;
-                            }
-                            else
-                            {
-                                if (yych <= ':')
-                                {
-                                    goto basic_json_parser_17;
-                                }
-                                if (yych <= 'Z')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                goto basic_json_parser_19;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'n')
-                        {
-                            if (yych <= 'e')
-                            {
-                                if (yych == ']')
-                                {
-                                    goto basic_json_parser_21;
-                                }
-                                goto basic_json_parser_4;
-                            }
-                            else
-                            {
-                                if (yych <= 'f')
-                                {
-                                    goto basic_json_parser_23;
-                                }
-                                if (yych <= 'm')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                goto basic_json_parser_24;
-                            }
-                        }
-                        else
-                        {
-                            if (yych <= 'z')
-                            {
-                                if (yych == 't')
-                                {
-                                    goto basic_json_parser_25;
-                                }
-                                goto basic_json_parser_4;
-                            }
-                            else
-                            {
-                                if (yych <= '{')
-                                {
-                                    goto basic_json_parser_26;
-                                }
-                                if (yych == '}')
-                                {
-                                    goto basic_json_parser_28;
-                                }
-                                goto basic_json_parser_4;
-                            }
-                        }
-                    }
-basic_json_parser_2:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::end_of_input;
-                        break;
-                    }
-basic_json_parser_4:
-                    ++m_cursor;
-basic_json_parser_5:
-                    {
-                        last_token_type = token_type::parse_error;
-                        break;
-                    }
-basic_json_parser_6:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yybm[0 + yych] & 32)
-                    {
-                        goto basic_json_parser_6;
-                    }
-                    {
-                        continue;
-                    }
-basic_json_parser_9:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych <= 0x1F)
-                    {
-                        goto basic_json_parser_5;
-                    }
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_31;
-                    }
-                    if (yych <= 0xC1)
-                    {
-                        goto basic_json_parser_5;
-                    }
-                    if (yych <= 0xF4)
-                    {
-                        goto basic_json_parser_31;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_10:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::value_separator;
-                        break;
-                    }
-basic_json_parser_12:
-                    yych = *++m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_5;
-                    }
-                    if (yych <= '0')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_45;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_13:
-                    yyaccept = 1;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych <= '9')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        if (yych >= '0')
-                        {
-                            goto basic_json_parser_48;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            if (yych >= 'E')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                        else
-                        {
-                            if (yych == 'e')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                    }
-basic_json_parser_14:
-                    {
-                        last_token_type = token_type::value_unsigned;
-                        break;
-                    }
-basic_json_parser_15:
-                    yyaccept = 1;
-                    m_marker = ++m_cursor;
-                    if ((m_limit - m_cursor) < 3)
-                    {
-                        fill_line_buffer(3);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yybm[0 + yych] & 64)
-                    {
-                        goto basic_json_parser_15;
-                    }
-                    if (yych <= 'D')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        goto basic_json_parser_14;
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                        if (yych == 'e')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                        goto basic_json_parser_14;
-                    }
-basic_json_parser_17:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::name_separator;
-                        break;
-                    }
-basic_json_parser_19:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::begin_array;
-                        break;
-                    }
-basic_json_parser_21:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::end_array;
-                        break;
-                    }
-basic_json_parser_23:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych == 'a')
-                    {
-                        goto basic_json_parser_52;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_24:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych == 'u')
-                    {
-                        goto basic_json_parser_53;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_25:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych == 'r')
-                    {
-                        goto basic_json_parser_54;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_26:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::begin_object;
-                        break;
-                    }
-basic_json_parser_28:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::end_object;
-                        break;
-                    }
-basic_json_parser_30:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-basic_json_parser_31:
-                    if (yybm[0 + yych] & 128)
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    if (yych <= 0xE0)
-                    {
-                        if (yych <= '\\')
-                        {
-                            if (yych <= 0x1F)
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            if (yych <= '"')
-                            {
-                                goto basic_json_parser_33;
-                            }
-                            goto basic_json_parser_35;
-                        }
-                        else
-                        {
-                            if (yych <= 0xC1)
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            if (yych <= 0xDF)
-                            {
-                                goto basic_json_parser_36;
-                            }
-                            goto basic_json_parser_37;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 0xEF)
-                        {
-                            if (yych == 0xED)
-                            {
-                                goto basic_json_parser_39;
-                            }
-                            goto basic_json_parser_38;
-                        }
-                        else
-                        {
-                            if (yych <= 0xF0)
-                            {
-                                goto basic_json_parser_40;
-                            }
-                            if (yych <= 0xF3)
-                            {
-                                goto basic_json_parser_41;
-                            }
-                            if (yych <= 0xF4)
-                            {
-                                goto basic_json_parser_42;
-                            }
-                        }
-                    }
-basic_json_parser_32:
-                    m_cursor = m_marker;
-                    if (yyaccept <= 1)
-                    {
-                        if (yyaccept == 0)
-                        {
-                            goto basic_json_parser_5;
-                        }
-                        else
-                        {
-                            goto basic_json_parser_14;
-                        }
-                    }
-                    else
-                    {
-                        if (yyaccept == 2)
-                        {
-                            goto basic_json_parser_44;
-                        }
-                        else
-                        {
-                            goto basic_json_parser_58;
-                        }
-                    }
-basic_json_parser_33:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::value_string;
-                        break;
-                    }
-basic_json_parser_35:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 'e')
-                    {
-                        if (yych <= '/')
-                        {
-                            if (yych == '"')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            if (yych <= '.')
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            goto basic_json_parser_30;
-                        }
-                        else
-                        {
-                            if (yych <= '\\')
-                            {
-                                if (yych <= '[')
-                                {
-                                    goto basic_json_parser_32;
-                                }
-                                goto basic_json_parser_30;
-                            }
-                            else
-                            {
-                                if (yych == 'b')
-                                {
-                                    goto basic_json_parser_30;
-                                }
-                                goto basic_json_parser_32;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'q')
-                        {
-                            if (yych <= 'f')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            if (yych == 'n')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            goto basic_json_parser_32;
-                        }
-                        else
-                        {
-                            if (yych <= 's')
-                            {
-                                if (yych <= 'r')
-                                {
-                                    goto basic_json_parser_30;
-                                }
-                                goto basic_json_parser_32;
-                            }
-                            else
-                            {
-                                if (yych <= 't')
-                                {
-                                    goto basic_json_parser_30;
-                                }
-                                if (yych <= 'u')
-                                {
-                                    goto basic_json_parser_55;
-                                }
-                                goto basic_json_parser_32;
-                            }
-                        }
-                    }
-basic_json_parser_36:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_37:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x9F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_36;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_38:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_36;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_39:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0x9F)
-                    {
-                        goto basic_json_parser_36;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_40:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x8F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_41:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_42:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0x8F)
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_43:
-                    yyaccept = 2;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych <= '9')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        if (yych >= '0')
-                        {
-                            goto basic_json_parser_48;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            if (yych >= 'E')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                        else
-                        {
-                            if (yych == 'e')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                    }
-basic_json_parser_44:
-                    {
-                        last_token_type = token_type::value_integer;
-                        break;
-                    }
-basic_json_parser_45:
-                    yyaccept = 2;
-                    m_marker = ++m_cursor;
-                    if ((m_limit - m_cursor) < 3)
-                    {
-                        fill_line_buffer(3);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '9')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_44;
-                        }
-                        goto basic_json_parser_45;
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            if (yych <= 'D')
-                            {
-                                goto basic_json_parser_44;
-                            }
-                            goto basic_json_parser_51;
-                        }
-                        else
-                        {
-                            if (yych == 'e')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                            goto basic_json_parser_44;
-                        }
-                    }
-basic_json_parser_47:
-                    yych = *++m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_56;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_48:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_50;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_48;
-                    }
-basic_json_parser_50:
-                    {
-                        last_token_type = token_type::parse_error;
-                        break;
-                    }
-basic_json_parser_51:
-                    yych = *++m_cursor;
-                    if (yych <= ',')
-                    {
-                        if (yych == '+')
-                        {
-                            goto basic_json_parser_59;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= '-')
-                        {
-                            goto basic_json_parser_59;
-                        }
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_60;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_52:
-                    yych = *++m_cursor;
-                    if (yych == 'l')
-                    {
-                        goto basic_json_parser_62;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_53:
-                    yych = *++m_cursor;
-                    if (yych == 'l')
-                    {
-                        goto basic_json_parser_63;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_54:
-                    yych = *++m_cursor;
-                    if (yych == 'u')
-                    {
-                        goto basic_json_parser_64;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_55:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_65;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_65;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_65;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_56:
-                    yyaccept = 3;
-                    m_marker = ++m_cursor;
-                    if ((m_limit - m_cursor) < 3)
-                    {
-                        fill_line_buffer(3);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 'D')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_58;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_56;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                        if (yych == 'e')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                    }
-basic_json_parser_58:
-                    {
-                        last_token_type = token_type::value_float;
-                        break;
-                    }
-basic_json_parser_59:
-                    yych = *++m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= ':')
-                    {
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_60:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_58;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_60;
-                    }
-                    goto basic_json_parser_58;
-basic_json_parser_62:
-                    yych = *++m_cursor;
-                    if (yych == 's')
-                    {
-                        goto basic_json_parser_66;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_63:
-                    yych = *++m_cursor;
-                    if (yych == 'l')
-                    {
-                        goto basic_json_parser_67;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_64:
-                    yych = *++m_cursor;
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_69;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_65:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_71;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_71;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_71;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_66:
-                    yych = *++m_cursor;
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_72;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_67:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::literal_null;
-                        break;
-                    }
-basic_json_parser_69:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::literal_true;
-                        break;
-                    }
-basic_json_parser_71:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_74;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_74;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_74;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_72:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::literal_false;
-                        break;
-                    }
-basic_json_parser_74:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                }
-
-            }
-
-            return last_token_type;
-        }
-
-        /*!
-        @brief append data from the stream to the line buffer
-
-        This function is called by the scan() function when the end of the
-        buffer (`m_limit`) is reached and the `m_cursor` pointer cannot be
-        incremented without leaving the limits of the line buffer. Note re2c
-        decides when to call this function.
-
-        If the lexer reads from contiguous storage, there is no trailing null
-        byte. Therefore, this function must make sure to add these padding
-        null bytes.
-
-        If the lexer reads from an input stream, this function reads the next
-        line of the input.
-
-        @pre
-            p p p p p p u u u u u x . . . . . .
-            ^           ^       ^   ^
-            m_content   m_start |   m_limit
-                                m_cursor
-
-        @post
-            u u u u u x x x x x x x . . . . . .
-            ^       ^               ^
-            |       m_cursor        m_limit
-            m_start
-            m_content
-        */
-        void fill_line_buffer(size_t n = 0)
-        {
-            // if line buffer is used, m_content points to its data
-            assert(m_line_buffer.empty()
-                   or m_content == reinterpret_cast<const lexer_char_t*>(m_line_buffer.data()));
-
-            // if line buffer is used, m_limit is set past the end of its data
-            assert(m_line_buffer.empty()
-                   or m_limit == m_content + m_line_buffer.size());
-
-            // pointer relationships
-            assert(m_content <= m_start);
-            assert(m_start <= m_cursor);
-            assert(m_cursor <= m_limit);
-            assert(m_marker == nullptr or m_marker  <= m_limit);
-
-            // number of processed characters (p)
-            const auto num_processed_chars = static_cast<size_t>(m_start - m_content);
-            // offset for m_marker wrt. to m_start
-            const auto offset_marker = (m_marker == nullptr) ? 0 : m_marker - m_start;
-            // number of unprocessed characters (u)
-            const auto offset_cursor = m_cursor - m_start;
-
-            // no stream is used or end of file is reached
-            if (m_stream == nullptr or m_stream->eof())
-            {
-                // m_start may or may not be pointing into m_line_buffer at
-                // this point. We trust the standard library to do the right
-                // thing. See http://stackoverflow.com/q/28142011/266378
-                m_line_buffer.assign(m_start, m_limit);
-
-                // append n characters to make sure that there is sufficient
-                // space between m_cursor and m_limit
-                m_line_buffer.append(1, '\x00');
-                if (n > 0)
-                {
-                    m_line_buffer.append(n - 1, '\x01');
-                }
-            }
-            else
-            {
-                // delete processed characters from line buffer
-                m_line_buffer.erase(0, num_processed_chars);
-                // read next line from input stream
-                m_line_buffer_tmp.clear();
-                std::getline(*m_stream, m_line_buffer_tmp, '\n');
-
-                // add line with newline symbol to the line buffer
-                m_line_buffer += m_line_buffer_tmp;
-                m_line_buffer.push_back('\n');
-            }
-
-            // set pointers
-            m_content = reinterpret_cast<const lexer_char_t*>(m_line_buffer.data());
-            assert(m_content != nullptr);
-            m_start  = m_content;
-            m_marker = m_start + offset_marker;
-            m_cursor = m_start + offset_cursor;
-            m_limit  = m_start + m_line_buffer.size();
-        }
-
-        /// return string representation of last read token
-        string_t get_token_string() const
-        {
-            assert(m_start != nullptr);
-            return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start),
-                            static_cast<size_t>(m_cursor - m_start));
-        }
-
-        /*!
-        @brief return string value for string tokens
-
-        The function iterates the characters between the opening and closing
-        quotes of the string value. The complete string is the range
-        [m_start,m_cursor). Consequently, we iterate from m_start+1 to
-        m_cursor-1.
-
-        We differentiate two cases:
-
-        1. Escaped characters. In this case, a new character is constructed
-           according to the nature of the escape. Some escapes create new
-           characters (e.g., `"\\n"` is replaced by `"\n"`), some are copied
-           as is (e.g., `"\\\\"`). Furthermore, Unicode escapes of the shape
-           `"\\uxxxx"` need special care. In this case, to_unicode takes care
-           of the construction of the values.
-        2. Unescaped characters are copied as is.
-
-        @pre `m_cursor - m_start >= 2`, meaning the length of the last token
-        is at least 2 bytes which is trivially true for any string (which
-        consists of at least two quotes).
-
-            " c1 c2 c3 ... "
-            ^                ^
-            m_start          m_cursor
-
-        @complexity Linear in the length of the string.\n
-
-        Lemma: The loop body will always terminate.\n
-
-        Proof (by contradiction): Assume the loop body does not terminate. As
-        the loop body does not contain another loop, one of the called
-        functions must never return. The called functions are `std::strtoul`
-        and to_unicode. Neither function can loop forever, so the loop body
-        will never loop forever which contradicts the assumption that the loop
-        body does not terminate, q.e.d.\n
-
-        Lemma: The loop condition for the for loop is eventually false.\n
-
-        Proof (by contradiction): Assume the loop does not terminate. Due to
-        the above lemma, this can only be due to a tautological loop
-        condition; that is, the loop condition i < m_cursor - 1 must always be
-        true. Let x be the change of i for any loop iteration. Then
-        m_start + 1 + x < m_cursor - 1 must hold to loop indefinitely. This
-        can be rephrased to m_cursor - m_start - 2 > x. With the
-        precondition, we x <= 0, meaning that the loop condition holds
-        indefinitely if i is always decreased. However, observe that the value
-        of i is strictly increasing with each iteration, as it is incremented
-        by 1 in the iteration expression and never decremented inside the loop
-        body. Hence, the loop condition will eventually be false which
-        contradicts the assumption that the loop condition is a tautology,
-        q.e.d.
-
-        @return string value of current token without opening and closing
-        quotes
-        @throw std::out_of_range if to_unicode fails
-        */
-        string_t get_string() const
-        {
-            assert(m_cursor - m_start >= 2);
-
-            string_t result;
-            result.reserve(static_cast<size_t>(m_cursor - m_start - 2));
-
-            // iterate the result between the quotes
-            for (const lexer_char_t* i = m_start + 1; i < m_cursor - 1; ++i)
-            {
-                // find next escape character
-                auto e = std::find(i, m_cursor - 1, '\\');
-                if (e != i)
-                {
-                    // see https://github.com/nlohmann/json/issues/365#issuecomment-262874705
-                    for (auto k = i; k < e; k++)
-                    {
-                        result.push_back(static_cast<typename string_t::value_type>(*k));
-                    }
-                    i = e - 1; // -1 because of ++i
-                }
-                else
-                {
-                    // processing escaped character
-                    // read next character
-                    ++i;
-
-                    switch (*i)
-                    {
-                        // the default escapes
-                        case 't':
-                        {
-                            result += "\t";
-                            break;
-                        }
-                        case 'b':
-                        {
-                            result += "\b";
-                            break;
-                        }
-                        case 'f':
-                        {
-                            result += "\f";
-                            break;
-                        }
-                        case 'n':
-                        {
-                            result += "\n";
-                            break;
-                        }
-                        case 'r':
-                        {
-                            result += "\r";
-                            break;
-                        }
-                        case '\\':
-                        {
-                            result += "\\";
-                            break;
-                        }
-                        case '/':
-                        {
-                            result += "/";
-                            break;
-                        }
-                        case '"':
-                        {
-                            result += "\"";
-                            break;
-                        }
-
-                        // unicode
-                        case 'u':
-                        {
-                            // get code xxxx from uxxxx
-                            auto codepoint = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>(i + 1),
-                                                          4).c_str(), nullptr, 16);
-
-                            // check if codepoint is a high surrogate
-                            if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
-                            {
-                                // make sure there is a subsequent unicode
-                                if ((i + 6 >= m_limit) or * (i + 5) != '\\' or * (i + 6) != 'u')
-                                {
-                                    JSON_THROW(std::invalid_argument("missing low surrogate"));
-                                }
-
-                                // get code yyyy from uxxxx\uyyyy
-                                auto codepoint2 = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>
-                                                               (i + 7), 4).c_str(), nullptr, 16);
-                                result += to_unicode(codepoint, codepoint2);
-                                // skip the next 10 characters (xxxx\uyyyy)
-                                i += 10;
-                            }
-                            else if (codepoint >= 0xDC00 and codepoint <= 0xDFFF)
-                            {
-                                // we found a lone low surrogate
-                                JSON_THROW(std::invalid_argument("missing high surrogate"));
-                            }
-                            else
-                            {
-                                // add unicode character(s)
-                                result += to_unicode(codepoint);
-                                // skip the next four characters (xxxx)
-                                i += 4;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-
-
-        /*!
-        @brief parse string into a built-in arithmetic type as if the current
-               locale is POSIX.
-
-        @note in floating-point case strtod may parse past the token's end -
-              this is not an error
-
-        @note any leading blanks are not handled
-        */
-        struct strtonum
-        {
-          public:
-            strtonum(const char* start, const char* end)
-                : m_start(start), m_end(end)
-            {}
-
-            /*!
-            @return true iff parsed successfully as number of type T
-
-            @param[in,out] val shall contain parsed value, or undefined value
-            if could not parse
-            */
-            template<typename T, typename = typename std::enable_if<std::is_arithmetic<T>::value>::type>
-            bool to(T& val) const
-            {
-                return parse(val, std::is_integral<T>());
-            }
-
-          private:
-            const char* const m_start = nullptr;
-            const char* const m_end = nullptr;
-
-            // floating-point conversion
-
-            // overloaded wrappers for strtod/strtof/strtold
-            // that will be called from parse<floating_point_t>
-            static void strtof(float& f, const char* str, char** endptr)
-            {
-                f = std::strtof(str, endptr);
-            }
-
-            static void strtof(double& f, const char* str, char** endptr)
-            {
-                f = std::strtod(str, endptr);
-            }
-
-            static void strtof(long double& f, const char* str, char** endptr)
-            {
-                f = std::strtold(str, endptr);
-            }
-
-            template<typename T>
-            bool parse(T& value, /*is_integral=*/std::false_type) const
-            {
-                // replace decimal separator with locale-specific version,
-                // when necessary; data will point to either the original
-                // string, or buf, or tempstr containing the fixed string.
-                std::string tempstr;
-                std::array<char, 64> buf;
-                const size_t len = static_cast<size_t>(m_end - m_start);
-
-                // lexer will reject empty numbers
-                assert(len > 0);
-
-                // since dealing with strtod family of functions, we're
-                // getting the decimal point char from the C locale facilities
-                // instead of C++'s numpunct facet of the current std::locale
-                const auto loc = localeconv();
-                assert(loc != nullptr);
-                const char decimal_point_char = (loc->decimal_point == nullptr) ? '.' : loc->decimal_point[0];
-
-                const char* data = m_start;
-
-                if (decimal_point_char != '.')
-                {
-                    const size_t ds_pos = static_cast<size_t>(std::find(m_start, m_end, '.') - m_start);
-
-                    if (ds_pos != len)
-                    {
-                        // copy the data into the local buffer or tempstr, if
-                        // buffer is too small; replace decimal separator, and
-                        // update data to point to the modified bytes
-                        if ((len + 1) < buf.size())
-                        {
-                            std::copy(m_start, m_end, buf.begin());
-                            buf[len] = 0;
-                            buf[ds_pos] = decimal_point_char;
-                            data = buf.data();
-                        }
-                        else
-                        {
-                            tempstr.assign(m_start, m_end);
-                            tempstr[ds_pos] = decimal_point_char;
-                            data = tempstr.c_str();
-                        }
-                    }
-                }
-
-                char* endptr = nullptr;
-                value = 0;
-                // this calls appropriate overload depending on T
-                strtof(value, data, &endptr);
-
-                // parsing was successful iff strtof parsed exactly the number
-                // of characters determined by the lexer (len)
-                const bool ok = (endptr == (data + len));
-
-                if (ok and (value == static_cast<T>(0.0)) and (*data == '-'))
-                {
-                    // some implementations forget to negate the zero
-                    value = -0.0;
-                }
-
-                return ok;
-            }
-
-            // integral conversion
-
-            signed long long parse_integral(char** endptr, /*is_signed*/std::true_type) const
-            {
-                return std::strtoll(m_start, endptr, 10);
-            }
-
-            unsigned long long parse_integral(char** endptr, /*is_signed*/std::false_type) const
-            {
-                return std::strtoull(m_start, endptr, 10);
-            }
-
-            template<typename T>
-            bool parse(T& value, /*is_integral=*/std::true_type) const
-            {
-                char* endptr = nullptr;
-                errno = 0; // these are thread-local
-                const auto x = parse_integral(&endptr, std::is_signed<T>());
-
-                // called right overload?
-                static_assert(std::is_signed<T>() == std::is_signed<decltype(x)>(), "");
-
-                value = static_cast<T>(x);
-
-                return (x == static_cast<decltype(x)>(value)) // x fits into destination T
-                       and (x < 0) == (value < 0)             // preserved sign
-                       //and ((x != 0) or is_integral())        // strto[u]ll did nto fail
-                       and (errno == 0)                       // strto[u]ll did not overflow
-                       and (m_start < m_end)                  // token was not empty
-                       and (endptr == m_end);                 // parsed entire token exactly
-            }
-        };
-
-        /*!
-        @brief return number value for number tokens
-
-        This function translates the last token into the most appropriate
-        number type (either integer, unsigned integer or floating point),
-        which is passed back to the caller via the result parameter.
-
-        integral numbers that don't fit into the the range of the respective
-        type are parsed as number_float_t
-
-        floating-point values do not satisfy std::isfinite predicate
-        are converted to value_t::null
-
-        throws if the entire string [m_start .. m_cursor) cannot be
-        interpreted as a number
-
-        @param[out] result  @ref basic_json object to receive the number.
-        @param[in]  token   the type of the number token
-        */
-        bool get_number(basic_json& result, const token_type token) const
-        {
-            assert(m_start != nullptr);
-            assert(m_start < m_cursor);
-            assert((token == token_type::value_unsigned) or
-                   (token == token_type::value_integer) or
-                   (token == token_type::value_float));
-
-            strtonum num_converter(reinterpret_cast<const char*>(m_start),
-                                   reinterpret_cast<const char*>(m_cursor));
-
-            switch (token)
-            {
-                case lexer::token_type::value_unsigned:
-                {
-                    number_unsigned_t val;
-                    if (num_converter.to(val))
-                    {
-                        // parsing successful
-                        result.m_type = value_t::number_unsigned;
-                        result.m_value = val;
-                        return true;
-                    }
-                    break;
-                }
-
-                case lexer::token_type::value_integer:
-                {
-                    number_integer_t val;
-                    if (num_converter.to(val))
-                    {
-                        // parsing successful
-                        result.m_type = value_t::number_integer;
-                        result.m_value = val;
-                        return true;
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    break;
-                }
-            }
-
-            // parse float (either explicitly or because a previous conversion
-            // failed)
-            number_float_t val;
-            if (num_converter.to(val))
-            {
-                // parsing successful
-                result.m_type = value_t::number_float;
-                result.m_value = val;
-
-                // replace infinity and NAN by null
-                if (not std::isfinite(result.m_value.number_float))
-                {
-                    result.m_type  = value_t::null;
-                    result.m_value = basic_json::json_value();
-                }
-
-                return true;
-            }
-
-            // couldn't parse number in any format
-            return false;
-        }
-
-      private:
-        /// optional input stream
-        std::istream* m_stream = nullptr;
-        /// line buffer buffer for m_stream
-        string_t m_line_buffer {};
-        /// used for filling m_line_buffer
-        string_t m_line_buffer_tmp {};
-        /// the buffer pointer
-        const lexer_char_t* m_content = nullptr;
-        /// pointer to the beginning of the current symbol
-        const lexer_char_t* m_start = nullptr;
-        /// pointer for backtracking information
-        const lexer_char_t* m_marker = nullptr;
-        /// pointer to the current symbol
-        const lexer_char_t* m_cursor = nullptr;
-        /// pointer to the end of the buffer
-        const lexer_char_t* m_limit = nullptr;
-        /// the last token type
-        token_type last_token_type = token_type::end_of_input;
-    };
-
-    /*!
-    @brief syntax analysis
-
-    This class implements a recursive decent parser.
-    */
-    class parser
-    {
-      public:
-        /// a parser reading from a string literal
-        parser(const char* buff, const parser_callback_t cb = nullptr)
-            : callback(cb),
-              m_lexer(reinterpret_cast<const typename lexer::lexer_char_t*>(buff), std::strlen(buff))
-        {}
-
-        /// a parser reading from an input stream
-        parser(std::istream& is, const parser_callback_t cb = nullptr)
-            : callback(cb), m_lexer(is)
-        {}
-
-        /// a parser reading from an iterator range with contiguous storage
-        template<class IteratorType, typename std::enable_if<
-                     std::is_same<typename std::iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value
-                     , int>::type
-                 = 0>
-        parser(IteratorType first, IteratorType last, const parser_callback_t cb = nullptr)
-            : callback(cb),
-              m_lexer(reinterpret_cast<const typename lexer::lexer_char_t*>(&(*first)),
-                      static_cast<size_t>(std::distance(first, last)))
-        {}
-
-        /// public parser interface
-        basic_json parse()
-        {
-            // read first token
-            get_token();
-
-            basic_json result = parse_internal(true);
-            result.assert_invariant();
-
-            expect(lexer::token_type::end_of_input);
-
-            // return parser result and replace it with null in case the
-            // top-level value was discarded by the callback function
-            return result.is_discarded() ? basic_json() : std::move(result);
-        }
-
-      private:
-        /// the actual parser
-        basic_json parse_internal(bool keep)
-        {
-            auto result = basic_json(value_t::discarded);
-
-            switch (last_token)
-            {
-                case lexer::token_type::begin_object:
-                {
-                    if (keep and (not callback
-                                  or ((keep = callback(depth++, parse_event_t::object_start, result)) != 0)))
-                    {
-                        // explicitly set result to object to cope with {}
-                        result.m_type = value_t::object;
-                        result.m_value = value_t::object;
-                    }
-
-                    // read next token
-                    get_token();
-
-                    // closing } -> we are done
-                    if (last_token == lexer::token_type::end_object)
-                    {
-                        get_token();
-                        if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
-                        {
-                            result = basic_json(value_t::discarded);
-                        }
-                        return result;
-                    }
-
-                    // no comma is expected here
-                    unexpect(lexer::token_type::value_separator);
-
-                    // otherwise: parse key-value pairs
-                    do
-                    {
-                        // ugly, but could be fixed with loop reorganization
-                        if (last_token == lexer::token_type::value_separator)
-                        {
-                            get_token();
-                        }
-
-                        // store key
-                        expect(lexer::token_type::value_string);
-                        const auto key = m_lexer.get_string();
-
-                        bool keep_tag = false;
-                        if (keep)
-                        {
-                            if (callback)
-                            {
-                                basic_json k(key);
-                                keep_tag = callback(depth, parse_event_t::key, k);
-                            }
-                            else
-                            {
-                                keep_tag = true;
-                            }
-                        }
-
-                        // parse separator (:)
-                        get_token();
-                        expect(lexer::token_type::name_separator);
-
-                        // parse and add value
-                        get_token();
-                        auto value = parse_internal(keep);
-                        if (keep and keep_tag and not value.is_discarded())
-                        {
-                            result[key] = std::move(value);
-                        }
-                    }
-                    while (last_token == lexer::token_type::value_separator);
-
-                    // closing }
-                    expect(lexer::token_type::end_object);
-                    get_token();
-                    if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
-                    {
-                        result = basic_json(value_t::discarded);
-                    }
-
-                    return result;
-                }
-
-                case lexer::token_type::begin_array:
-                {
-                    if (keep and (not callback
-                                  or ((keep = callback(depth++, parse_event_t::array_start, result)) != 0)))
-                    {
-                        // explicitly set result to object to cope with []
-                        result.m_type = value_t::array;
-                        result.m_value = value_t::array;
-                    }
-
-                    // read next token
-                    get_token();
-
-                    // closing ] -> we are done
-                    if (last_token == lexer::token_type::end_array)
-                    {
-                        get_token();
-                        if (callback and not callback(--depth, parse_event_t::array_end, result))
-                        {
-                            result = basic_json(value_t::discarded);
-                        }
-                        return result;
-                    }
-
-                    // no comma is expected here
-                    unexpect(lexer::token_type::value_separator);
-
-                    // otherwise: parse values
-                    do
-                    {
-                        // ugly, but could be fixed with loop reorganization
-                        if (last_token == lexer::token_type::value_separator)
-                        {
-                            get_token();
-                        }
-
-                        // parse value
-                        auto value = parse_internal(keep);
-                        if (keep and not value.is_discarded())
-                        {
-                            result.push_back(std::move(value));
-                        }
-                    }
-                    while (last_token == lexer::token_type::value_separator);
-
-                    // closing ]
-                    expect(lexer::token_type::end_array);
-                    get_token();
-                    if (keep and callback and not callback(--depth, parse_event_t::array_end, result))
-                    {
-                        result = basic_json(value_t::discarded);
-                    }
-
-                    return result;
-                }
-
-                case lexer::token_type::literal_null:
-                {
-                    get_token();
-                    result.m_type = value_t::null;
-                    break;
-                }
-
-                case lexer::token_type::value_string:
-                {
-                    const auto s = m_lexer.get_string();
-                    get_token();
-                    result = basic_json(s);
-                    break;
-                }
-
-                case lexer::token_type::literal_true:
-                {
-                    get_token();
-                    result.m_type = value_t::boolean;
-                    result.m_value = true;
-                    break;
-                }
-
-                case lexer::token_type::literal_false:
-                {
-                    get_token();
-                    result.m_type = value_t::boolean;
-                    result.m_value = false;
-                    break;
-                }
-
-                case lexer::token_type::value_unsigned:
-                case lexer::token_type::value_integer:
-                case lexer::token_type::value_float:
-                {
-                    m_lexer.get_number(result, last_token);
-                    get_token();
-                    break;
-                }
-
-                default:
-                {
-                    // the last token was unexpected
-                    unexpect(last_token);
-                }
-            }
-
-            if (keep and callback and not callback(depth, parse_event_t::value, result))
-            {
-                result = basic_json(value_t::discarded);
-            }
-            return result;
-        }
-
-        /// get next token from lexer
-        typename lexer::token_type get_token()
-        {
-            last_token = m_lexer.scan();
-            return last_token;
-        }
-
-        void expect(typename lexer::token_type t) const
-        {
-            if (t != last_token)
-            {
-                std::string error_msg = "parse error - unexpected ";
-                error_msg += (last_token == lexer::token_type::parse_error ? ("'" +  m_lexer.get_token_string() +
-                              "'") :
-                              lexer::token_type_name(last_token));
-                error_msg += "; expected " + lexer::token_type_name(t);
-                JSON_THROW(std::invalid_argument(error_msg));
-            }
-        }
-
-        void unexpect(typename lexer::token_type t) const
-        {
-            if (t == last_token)
-            {
-                std::string error_msg = "parse error - unexpected ";
-                error_msg += (last_token == lexer::token_type::parse_error ? ("'" +  m_lexer.get_token_string() +
-                              "'") :
-                              lexer::token_type_name(last_token));
-                JSON_THROW(std::invalid_argument(error_msg));
-            }
-        }
-
-      private:
-        /// current level of recursion
-        int depth = 0;
-        /// callback function
-        const parser_callback_t callback = nullptr;
-        /// the type of the last read token
-        typename lexer::token_type last_token = lexer::token_type::uninitialized;
-        /// the lexer
-        lexer m_lexer;
-    };
-
-  public:
-    /*!
-    @brief JSON Pointer
-
-    A JSON pointer defines a string syntax for identifying a specific value
-    within a JSON document. It can be used with functions `at` and
-    `operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-    @sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
-    */
-    class json_pointer
-    {
-        /// allow basic_json to access private members
-        friend class basic_json;
-
-      public:
-        /*!
-        @brief create JSON pointer
-
-        Create a JSON pointer according to the syntax described in
-        [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
-
-        @param[in] s  string representing the JSON pointer; if omitted, the
-                      empty string is assumed which references the whole JSON
-                      value
-
-        @throw std::domain_error if reference token is nonempty and does not
-        begin with a slash (`/`); example: `"JSON pointer must be empty or
-        begin with /"`
-        @throw std::domain_error if a tilde (`~`) is not followed by `0`
-        (representing `~`) or `1` (representing `/`); example: `"escape error:
-        ~ must be followed with 0 or 1"`
-
-        @liveexample{The example shows the construction several valid JSON
-        pointers as well as the exceptional behavior.,json_pointer}
-
-        @since version 2.0.0
-        */
-        explicit json_pointer(const std::string& s = "")
-            : reference_tokens(split(s))
-        {}
-
-        /*!
-        @brief return a string representation of the JSON pointer
-
-        @invariant For each JSON pointer `ptr`, it holds:
-        @code {.cpp}
-        ptr == json_pointer(ptr.to_string());
-        @endcode
-
-        @return a string representation of the JSON pointer
-
-        @liveexample{The example shows the result of `to_string`.,
-        json_pointer__to_string}
-
-        @since version 2.0.0
-        */
-        std::string to_string() const noexcept
-        {
-            return std::accumulate(reference_tokens.begin(),
-                                   reference_tokens.end(), std::string{},
-                                   [](const std::string & a, const std::string & b)
-            {
-                return a + "/" + escape(b);
-            });
-        }
-
-        /// @copydoc to_string()
-        operator std::string() const
-        {
-            return to_string();
-        }
-
-      private:
-        /// remove and return last reference pointer
-        std::string pop_back()
-        {
-            if (is_root())
-            {
-                JSON_THROW(std::domain_error("JSON pointer has no parent"));
-            }
-
-            auto last = reference_tokens.back();
-            reference_tokens.pop_back();
-            return last;
-        }
-
-        /// return whether pointer points to the root document
-        bool is_root() const
-        {
-            return reference_tokens.empty();
-        }
-
-        json_pointer top() const
-        {
-            if (is_root())
-            {
-                JSON_THROW(std::domain_error("JSON pointer has no parent"));
-            }
-
-            json_pointer result = *this;
-            result.reference_tokens = {reference_tokens[0]};
-            return result;
-        }
-
-        /*!
-        @brief create and return a reference to the pointed to value
-
-        @complexity Linear in the number of reference tokens.
-        */
-        reference get_and_create(reference j) const
-        {
-            pointer result = &j;
-
-            // in case no reference tokens exist, return a reference to the
-            // JSON value j which will be overwritten by a primitive value
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (result->m_type)
-                {
-                    case value_t::null:
-                    {
-                        if (reference_token == "0")
-                        {
-                            // start a new array if reference token is 0
-                            result = &result->operator[](0);
-                        }
-                        else
-                        {
-                            // start a new object otherwise
-                            result = &result->operator[](reference_token);
-                        }
-                        break;
-                    }
-
-                    case value_t::object:
-                    {
-                        // create an entry in the object
-                        result = &result->operator[](reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        // create an entry in the array
-                        result = &result->operator[](static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    /*
-                    The following code is only reached if there exists a
-                    reference token _and_ the current value is primitive. In
-                    this case, we have an error situation, because primitive
-                    values may only occur as single value; that is, with an
-                    empty list of reference tokens.
-                    */
-                    default:
-                    {
-                        JSON_THROW(std::domain_error("invalid value to unflatten"));
-                    }
-                }
-            }
-
-            return *result;
-        }
-
-        /*!
-        @brief return a reference to the pointed to value
-
-        @note This version does not throw if a value is not present, but tries
-        to create nested values instead. For instance, calling this function
-        with pointer `"/this/that"` on a null value is equivalent to calling
-        `operator[]("this").operator[]("that")` on that value, effectively
-        changing the null value to an object.
-
-        @param[in] ptr  a JSON value
-
-        @return reference to the JSON value pointed to by the JSON pointer
-
-        @complexity Linear in the length of the JSON pointer.
-
-        @throw std::out_of_range      if the JSON pointer can not be resolved
-        @throw std::domain_error      if an array index begins with '0'
-        @throw std::invalid_argument  if an array index was not a number
-        */
-        reference get_unchecked(pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                // convert null values to arrays or objects before continuing
-                if (ptr->m_type == value_t::null)
-                {
-                    // check if reference token is a number
-                    const bool nums = std::all_of(reference_token.begin(),
-                                                  reference_token.end(),
-                                                  [](const char x)
-                    {
-                        return std::isdigit(x);
-                    });
-
-                    // change value to array for numbers or "-" or to object
-                    // otherwise
-                    if (nums or reference_token == "-")
-                    {
-                        *ptr = value_t::array;
-                    }
-                    else
-                    {
-                        *ptr = value_t::object;
-                    }
-                }
-
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // use unchecked object access
-                        ptr = &ptr->operator[](reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        if (reference_token == "-")
-                        {
-                            // explicitly treat "-" as index beyond the end
-                            ptr = &ptr->operator[](ptr->m_value.array->size());
-                        }
-                        else
-                        {
-                            // convert array index to number; unchecked access
-                            ptr = &ptr->operator[](static_cast<size_type>(std::stoi(reference_token)));
-                        }
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        reference get_checked(pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // note: at performs range check
-                        ptr = &ptr->at(reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (reference_token == "-")
-                        {
-                            // "-" always fails the range check
-                            JSON_THROW(std::out_of_range("array index '-' (" +
-                                                         std::to_string(ptr->m_value.array->size()) +
-                                                         ") is out of range"));
-                        }
-
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        // note: at performs range check
-                        ptr = &ptr->at(static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        /*!
-        @brief return a const reference to the pointed to value
-
-        @param[in] ptr  a JSON value
-
-        @return const reference to the JSON value pointed to by the JSON
-                pointer
-        */
-        const_reference get_unchecked(const_pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // use unchecked object access
-                        ptr = &ptr->operator[](reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (reference_token == "-")
-                        {
-                            // "-" cannot be used for const access
-                            JSON_THROW(std::out_of_range("array index '-' (" +
-                                                         std::to_string(ptr->m_value.array->size()) +
-                                                         ") is out of range"));
-                        }
-
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        // use unchecked array access
-                        ptr = &ptr->operator[](static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        const_reference get_checked(const_pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // note: at performs range check
-                        ptr = &ptr->at(reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (reference_token == "-")
-                        {
-                            // "-" always fails the range check
-                            JSON_THROW(std::out_of_range("array index '-' (" +
-                                                         std::to_string(ptr->m_value.array->size()) +
-                                                         ") is out of range"));
-                        }
-
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        // note: at performs range check
-                        ptr = &ptr->at(static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        /// split the string input to reference tokens
-        static std::vector<std::string> split(const std::string& reference_string)
-        {
-            std::vector<std::string> result;
-
-            // special case: empty reference string -> no reference tokens
-            if (reference_string.empty())
-            {
-                return result;
-            }
-
-            // check if nonempty reference string begins with slash
-            if (reference_string[0] != '/')
-            {
-                JSON_THROW(std::domain_error("JSON pointer must be empty or begin with '/'"));
-            }
-
-            // extract the reference tokens:
-            // - slash: position of the last read slash (or end of string)
-            // - start: position after the previous slash
-            for (
-                // search for the first slash after the first character
-                size_t slash = reference_string.find_first_of('/', 1),
-                // set the beginning of the first reference token
-                start = 1;
-                // we can stop if start == string::npos+1 = 0
-                start != 0;
-                // set the beginning of the next reference token
-                // (will eventually be 0 if slash == std::string::npos)
-                start = slash + 1,
-                // find next slash
-                slash = reference_string.find_first_of('/', start))
-            {
-                // use the text between the beginning of the reference token
-                // (start) and the last slash (slash).
-                auto reference_token = reference_string.substr(start, slash - start);
-
-                // check reference tokens are properly escaped
-                for (size_t pos = reference_token.find_first_of('~');
-                        pos != std::string::npos;
-                        pos = reference_token.find_first_of('~', pos + 1))
-                {
-                    assert(reference_token[pos] == '~');
-
-                    // ~ must be followed by 0 or 1
-                    if (pos == reference_token.size() - 1 or
-                            (reference_token[pos + 1] != '0' and
-                             reference_token[pos + 1] != '1'))
-                    {
-                        JSON_THROW(std::domain_error("escape error: '~' must be followed with '0' or '1'"));
-                    }
-                }
-
-                // finally, store the reference token
-                unescape(reference_token);
-                result.push_back(reference_token);
-            }
-
-            return result;
-        }
-
-      private:
-        /*!
-        @brief replace all occurrences of a substring by another string
-
-        @param[in,out] s  the string to manipulate; changed so that all
-                          occurrences of @a f are replaced with @a t
-        @param[in]     f  the substring to replace with @a t
-        @param[in]     t  the string to replace @a f
-
-        @pre The search string @a f must not be empty.
-
-        @since version 2.0.0
-        */
-        static void replace_substring(std::string& s,
-                                      const std::string& f,
-                                      const std::string& t)
-        {
-            assert(not f.empty());
-
-            for (
-                size_t pos = s.find(f);         // find first occurrence of f
-                pos != std::string::npos;       // make sure f was found
-                s.replace(pos, f.size(), t),    // replace with t
-                pos = s.find(f, pos + t.size()) // find next occurrence of f
-            );
-        }
-
-        /// escape tilde and slash
-        static std::string escape(std::string s)
-        {
-            // escape "~"" to "~0" and "/" to "~1"
-            replace_substring(s, "~", "~0");
-            replace_substring(s, "/", "~1");
-            return s;
-        }
-
-        /// unescape tilde and slash
-        static void unescape(std::string& s)
-        {
-            // first transform any occurrence of the sequence '~1' to '/'
-            replace_substring(s, "~1", "/");
-            // then transform any occurrence of the sequence '~0' to '~'
-            replace_substring(s, "~0", "~");
-        }
-
-        /*!
-        @param[in] reference_string  the reference string to the current value
-        @param[in] value             the value to consider
-        @param[in,out] result        the result object to insert values to
-
-        @note Empty objects or arrays are flattened to `null`.
-        */
-        static void flatten(const std::string& reference_string,
-                            const basic_json& value,
-                            basic_json& result)
-        {
-            switch (value.m_type)
-            {
-                case value_t::array:
-                {
-                    if (value.m_value.array->empty())
-                    {
-                        // flatten empty array as null
-                        result[reference_string] = nullptr;
-                    }
-                    else
-                    {
-                        // iterate array and use index as reference string
-                        for (size_t i = 0; i < value.m_value.array->size(); ++i)
-                        {
-                            flatten(reference_string + "/" + std::to_string(i),
-                                    value.m_value.array->operator[](i), result);
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::object:
-                {
-                    if (value.m_value.object->empty())
-                    {
-                        // flatten empty object as null
-                        result[reference_string] = nullptr;
-                    }
-                    else
-                    {
-                        // iterate object and use keys as reference string
-                        for (const auto& element : *value.m_value.object)
-                        {
-                            flatten(reference_string + "/" + escape(element.first),
-                                    element.second, result);
-                        }
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    // add primitive value with its reference string
-                    result[reference_string] = value;
-                    break;
-                }
-            }
-        }
-
-        /*!
-        @param[in] value  flattened JSON
-
-        @return unflattened JSON
-        */
-        static basic_json unflatten(const basic_json& value)
-        {
-            if (not value.is_object())
-            {
-                JSON_THROW(std::domain_error("only objects can be unflattened"));
-            }
-
-            basic_json result;
-
-            // iterate the JSON object values
-            for (const auto& element : *value.m_value.object)
-            {
-                if (not element.second.is_primitive())
-                {
-                    JSON_THROW(std::domain_error("values in object must be primitive"));
-                }
-
-                // assign value to reference pointed to by JSON pointer; Note
-                // that if the JSON pointer is "" (i.e., points to the whole
-                // value), function get_and_create returns a reference to
-                // result itself. An assignment will then create a primitive
-                // value.
-                json_pointer(element.first).get_and_create(result) = element.second;
-            }
-
-            return result;
-        }
-
-      private:
-        friend bool operator==(json_pointer const& lhs,
-                               json_pointer const& rhs) noexcept
-        {
-            return lhs.reference_tokens == rhs.reference_tokens;
-        }
-
-        friend bool operator!=(json_pointer const& lhs,
-                               json_pointer const& rhs) noexcept
-        {
-            return !(lhs == rhs);
-        }
-
-        /// the reference tokens
-        std::vector<std::string> reference_tokens {};
-    };
-
-    //////////////////////////
-    // JSON Pointer support //
-    //////////////////////////
-
-    /// @name JSON Pointer functions
-    /// @{
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. Similar to @ref operator[](const typename
-    object_t::key_type&), `null` values are created in arrays and objects if
-    necessary.
-
-    In particular:
-    - If the JSON pointer points to an object key that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned.
-    - If the JSON pointer points to an array index that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned. All indices between the current maximum and the given
-      index are also filled with `null`.
-    - The special value `-` is treated as a synonym for the index past the
-      end.
-
-    @param[in] ptr  a JSON pointer
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
-
-    @since version 2.0.0
-    */
-    reference operator[](const json_pointer& ptr)
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the the special value
-    `-` yields an exception.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return const reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
-
-    @since version 2.0.0
-    */
-    const_reference operator[](const json_pointer& ptr) const
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a reference to the element at with specified JSON pointer @a ptr,
-    with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
-
-    @liveexample{The behavior is shown in the example.,at_json_pointer}
-
-    @since version 2.0.0
-    */
-    reference at(const json_pointer& ptr)
-    {
-        return ptr.get_checked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a const reference to the element at with specified JSON pointer @a
-    ptr, with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
-
-    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
-
-    @since version 2.0.0
-    */
-    const_reference at(const json_pointer& ptr) const
-    {
-        return ptr.get_checked(this);
-    }
-
-    /*!
-    @brief return flattened JSON value
-
-    The function creates a JSON object whose keys are JSON pointers (see [RFC
-    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
-    primitive. The original JSON value can be restored using the @ref
-    unflatten() function.
-
-    @return an object that maps JSON pointers to primitive values
-
-    @note Empty objects and arrays are flattened to `null` and will not be
-          reconstructed correctly by the @ref unflatten() function.
-
-    @complexity Linear in the size the JSON value.
-
-    @liveexample{The following code shows how a JSON object is flattened to an
-    object whose keys consist of JSON pointers.,flatten}
-
-    @sa @ref unflatten() for the reverse function
-
-    @since version 2.0.0
-    */
-    basic_json flatten() const
-    {
-        basic_json result(value_t::object);
-        json_pointer::flatten("", *this, result);
-        return result;
-    }
-
-    /*!
-    @brief unflatten a previously flattened JSON value
-
-    The function restores the arbitrary nesting of a JSON value that has been
-    flattened before using the @ref flatten() function. The JSON value must
-    meet certain constraints:
-    1. The value must be an object.
-    2. The keys must be JSON pointers (see
-       [RFC 6901](https://tools.ietf.org/html/rfc6901))
-    3. The mapped values must be primitive JSON types.
-
-    @return the original JSON from a flattened version
-
-    @note Empty objects and arrays are flattened by @ref flatten() to `null`
-          values and can not unflattened to their original type. Apart from
-          this example, for a JSON value `j`, the following is always true:
-          `j == j.flatten().unflatten()`.
-
-    @complexity Linear in the size the JSON value.
-
-    @liveexample{The following code shows how a flattened JSON object is
-    unflattened into the original nested JSON object.,unflatten}
-
-    @sa @ref flatten() for the reverse function
-
-    @since version 2.0.0
-    */
-    basic_json unflatten() const
-    {
-        return json_pointer::unflatten(*this);
-    }
-
-    /// @}
-
-    //////////////////////////
-    // JSON Patch functions //
-    //////////////////////////
-
-    /// @name JSON Patch functions
-    /// @{
-
-    /*!
-    @brief applies a JSON patch
-
-    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
-    expressing a sequence of operations to apply to a JSON) document. With
-    this function, a JSON Patch is applied to the current JSON value by
-    executing all operations from the patch.
-
-    @param[in] json_patch  JSON patch document
-    @return patched document
-
-    @note The application of a patch is atomic: Either all operations succeed
-          and the patched document is returned or an exception is thrown. In
-          any case, the original value is not changed: the patch is applied
-          to a copy of the value.
-
-    @throw std::out_of_range if a JSON pointer inside the patch could not
-    be resolved successfully in the current JSON value; example: `"key baz
-    not found"`
-    @throw invalid_argument if the JSON patch is malformed (e.g., mandatory
-    attributes are missing); example: `"operation add must have member path"`
-
-    @complexity Linear in the size of the JSON value and the length of the
-    JSON patch. As usually only a fraction of the JSON value is affected by
-    the patch, the complexity can usually be neglected.
-
-    @liveexample{The following code shows how a JSON patch is applied to a
-    value.,patch}
-
-    @sa @ref diff -- create a JSON patch by comparing two JSON values
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
-    */
-    basic_json patch(const basic_json& json_patch) const
-    {
-        // make a working copy to apply the patch to
-        basic_json result = *this;
-
-        // the valid JSON Patch operations
-        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
-
-        const auto get_op = [](const std::string op)
-        {
-            if (op == "add")
-            {
-                return patch_operations::add;
-            }
-            if (op == "remove")
-            {
-                return patch_operations::remove;
-            }
-            if (op == "replace")
-            {
-                return patch_operations::replace;
-            }
-            if (op == "move")
-            {
-                return patch_operations::move;
-            }
-            if (op == "copy")
-            {
-                return patch_operations::copy;
-            }
-            if (op == "test")
-            {
-                return patch_operations::test;
-            }
-
-            return patch_operations::invalid;
-        };
-
-        // wrapper for "add" operation; add value at ptr
-        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
-        {
-            // adding to the root of the target document means replacing it
-            if (ptr.is_root())
-            {
-                result = val;
-            }
-            else
-            {
-                // make sure the top element of the pointer exists
-                json_pointer top_pointer = ptr.top();
-                if (top_pointer != ptr)
-                {
-                    result.at(top_pointer);
-                }
-
-                // get reference to parent of JSON pointer ptr
-                const auto last_path = ptr.pop_back();
-                basic_json& parent = result[ptr];
-
-                switch (parent.m_type)
-                {
-                    case value_t::null:
-                    case value_t::object:
-                    {
-                        // use operator[] to add value
-                        parent[last_path] = val;
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (last_path == "-")
-                        {
-                            // special case: append to back
-                            parent.push_back(val);
-                        }
-                        else
-                        {
-                            const auto idx = std::stoi(last_path);
-                            if (static_cast<size_type>(idx) > parent.size())
-                            {
-                                // avoid undefined behavior
-                                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
-                            }
-                            else
-                            {
-                                // default case: insert add offset
-                                parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
-                            }
-                        }
-                        break;
-                    }
-
-                    default:
-                    {
-                        // if there exists a parent it cannot be primitive
-                        assert(false);  // LCOV_EXCL_LINE
-                    }
-                }
-            }
-        };
-
-        // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [&result](json_pointer & ptr)
-        {
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.pop_back();
-            basic_json& parent = result.at(ptr);
-
-            // remove child
-            if (parent.is_object())
-            {
-                // perform range check
-                auto it = parent.find(last_path);
-                if (it != parent.end())
-                {
-                    parent.erase(it);
-                }
-                else
-                {
-                    JSON_THROW(std::out_of_range("key '" + last_path + "' not found"));
-                }
-            }
-            else if (parent.is_array())
-            {
-                // note erase performs range check
-                parent.erase(static_cast<size_type>(std::stoi(last_path)));
-            }
-        };
-
-        // type check
-        if (not json_patch.is_array())
-        {
-            // a JSON patch must be an array of objects
-            JSON_THROW(std::invalid_argument("JSON patch must be an array of objects"));
-        }
-
-        // iterate and apply the operations
-        for (const auto& val : json_patch)
-        {
-            // wrapper to get a value for an operation
-            const auto get_value = [&val](const std::string & op,
-                                          const std::string & member,
-                                          bool string_type) -> basic_json&
-            {
-                // find value
-                auto it = val.m_value.object->find(member);
-
-                // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
-
-                // check if desired value is present
-                if (it == val.m_value.object->end())
-                {
-                    JSON_THROW(std::invalid_argument(error_msg + " must have member '" + member + "'"));
-                }
-
-                // check if result is of type string
-                if (string_type and not it->second.is_string())
-                {
-                    JSON_THROW(std::invalid_argument(error_msg + " must have string member '" + member + "'"));
-                }
-
-                // no error: return value
-                return it->second;
-            };
-
-            // type check
-            if (not val.is_object())
-            {
-                JSON_THROW(std::invalid_argument("JSON patch must be an array of objects"));
-            }
-
-            // collect mandatory members
-            const std::string op = get_value("op", "op", true);
-            const std::string path = get_value(op, "path", true);
-            json_pointer ptr(path);
-
-            switch (get_op(op))
-            {
-                case patch_operations::add:
-                {
-                    operation_add(ptr, get_value("add", "value", false));
-                    break;
-                }
-
-                case patch_operations::remove:
-                {
-                    operation_remove(ptr);
-                    break;
-                }
-
-                case patch_operations::replace:
-                {
-                    // the "path" location must exist - use at()
-                    result.at(ptr) = get_value("replace", "value", false);
-                    break;
-                }
-
-                case patch_operations::move:
-                {
-                    const std::string from_path = get_value("move", "from", true);
-                    json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The move operation is functionally identical to a
-                    // "remove" operation on the "from" location, followed
-                    // immediately by an "add" operation at the target
-                    // location with the value that was just removed.
-                    operation_remove(from_ptr);
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::copy:
-                {
-                    const std::string from_path = get_value("copy", "from", true);;
-                    const json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    result[ptr] = result.at(from_ptr);
-                    break;
-                }
-
-                case patch_operations::test:
-                {
-                    bool success = false;
-                    JSON_TRY
-                    {
-                        // check if "value" matches the one at "path"
-                        // the "path" location must exist - use at()
-                        success = (result.at(ptr) == get_value("test", "value", false));
-                    }
-                    JSON_CATCH (std::out_of_range&)
-                    {
-                        // ignore out of range errors: success remains false
-                    }
-
-                    // throw an exception if test fails
-                    if (not success)
-                    {
-                        JSON_THROW(std::domain_error("unsuccessful: " + val.dump()));
-                    }
-
-                    break;
-                }
-
-                case patch_operations::invalid:
-                {
-                    // op must be "add", "remove", "replace", "move", "copy", or
-                    // "test"
-                    JSON_THROW(std::invalid_argument("operation value '" + op + "' is invalid"));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief creates a diff as a JSON patch
-
-    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
-    be changed into the value @a target by calling @ref patch function.
-
-    @invariant For two JSON values @a source and @a target, the following code
-    yields always `true`:
-    @code {.cpp}
-    source.patch(diff(source, target)) == target;
-    @endcode
-
-    @note Currently, only `remove`, `add`, and `replace` operations are
-          generated.
-
-    @param[in] source  JSON value to compare from
-    @param[in] target  JSON value to compare against
-    @param[in] path    helper value to create JSON pointers
-
-    @return a JSON patch to convert the @a source to @a target
-
-    @complexity Linear in the lengths of @a source and @a target.
-
-    @liveexample{The following code shows how a JSON patch is created as a
-    diff for two JSON values.,diff}
-
-    @sa @ref patch -- apply a JSON patch
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-
-    @since version 2.0.0
-    */
-    static basic_json diff(const basic_json& source,
-                           const basic_json& target,
-                           const std::string& path = "")
-    {
-        // the patch
-        basic_json result(value_t::array);
-
-        // if the values are the same, return empty patch
-        if (source == target)
-        {
-            return result;
-        }
-
-        if (source.type() != target.type())
-        {
-            // different types: replace value
-            result.push_back(
-            {
-                {"op", "replace"},
-                {"path", path},
-                {"value", target}
-            });
-        }
-        else
-        {
-            switch (source.type())
-            {
-                case value_t::array:
-                {
-                    // first pass: traverse common elements
-                    size_t i = 0;
-                    while (i < source.size() and i < target.size())
-                    {
-                        // recursive call to compare array values at index i
-                        auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
-                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                        ++i;
-                    }
-
-                    // i now reached the end of at least one array
-                    // in a second pass, traverse the remaining elements
-
-                    // remove my remaining elements
-                    const auto end_index = static_cast<difference_type>(result.size());
-                    while (i < source.size())
-                    {
-                        // add operations in reverse order to avoid invalid
-                        // indices
-                        result.insert(result.begin() + end_index, object(
-                        {
-                            {"op", "remove"},
-                            {"path", path + "/" + std::to_string(i)}
-                        }));
-                        ++i;
-                    }
-
-                    // add other remaining elements
-                    while (i < target.size())
-                    {
-                        result.push_back(
-                        {
-                            {"op", "add"},
-                            {"path", path + "/" + std::to_string(i)},
-                            {"value", target[i]}
-                        });
-                        ++i;
-                    }
-
-                    break;
-                }
-
-                case value_t::object:
-                {
-                    // first pass: traverse this object's elements
-                    for (auto it = source.begin(); it != source.end(); ++it)
-                    {
-                        // escape the key name to be used in a JSON patch
-                        const auto key = json_pointer::escape(it.key());
-
-                        if (target.find(it.key()) != target.end())
-                        {
-                            // recursive call to compare object values at key it
-                            auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
-                            result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                        }
-                        else
-                        {
-                            // found a key that is not in o -> remove it
-                            result.push_back(object(
-                            {
-                                {"op", "remove"},
-                                {"path", path + "/" + key}
-                            }));
-                        }
-                    }
-
-                    // second pass: traverse other object's elements
-                    for (auto it = target.begin(); it != target.end(); ++it)
-                    {
-                        if (source.find(it.key()) == source.end())
-                        {
-                            // found a key that is not in this -> add it
-                            const auto key = json_pointer::escape(it.key());
-                            result.push_back(
-                            {
-                                {"op", "add"},
-                                {"path", path + "/" + key},
-                                {"value", it.value()}
-                            });
-                        }
-                    }
-
-                    break;
-                }
-
-                default:
-                {
-                    // both primitive type: replace value
-                    result.push_back(
-                    {
-                        {"op", "replace"},
-                        {"path", path},
-                        {"value", target}
-                    });
-                    break;
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /// @}
-};
-
-/////////////
-// presets //
-/////////////
-
-/*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
-*/
-using json = basic_json<>;
-} // namespace nlohmann
-
-
-///////////////////////
-// nonmember support //
-///////////////////////
-
-// specialization of std::swap, and std::hash
-namespace std
-{
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap(nlohmann::json& j1,
-                 nlohmann::json& j2) noexcept(
-                     is_nothrow_move_constructible<nlohmann::json>::value and
-                     is_nothrow_move_assignable<nlohmann::json>::value
-                 )
-{
-    j1.swap(j2);
-}
-
-/// hash value for JSON objects
-template<>
-struct hash<nlohmann::json>
-{
-    /*!
-    @brief return a hash value for a JSON object
-
-    @since version 1.0.0
-    */
-    std::size_t operator()(const nlohmann::json& j) const
-    {
-        // a naive hashing via the string representation
-        const auto& h = hash<nlohmann::json::string_t>();
-        return h(j.dump());
-    }
-};
-} // namespace std
-
-/*!
-@brief user-defined string literal for JSON values
-
-This operator implements a user-defined string literal for JSON objects. It
-can be used by adding `"_json"` to a string literal and returns a JSON object
-if no parse error occurred.
-
-@param[in] s  a string representation of a JSON object
-@param[in] n  the length of string @a s
-@return a JSON object
-
-@since version 1.0.0
-*/
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/*!
-@brief user-defined string literal for JSON pointer
-
-This operator implements a user-defined string literal for JSON Pointers. It
-can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
-object if no parse error occurred.
-
-@param[in] s  a string representation of a JSON Pointer
-@param[in] n  the length of string @a s
-@return a JSON pointer object
-
-@since version 2.0.0
-*/
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
-
-// restore GCC/clang diagnostic settings
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic pop
-#endif
-
-// clean up
-#undef JSON_CATCH
-#undef JSON_DEPRECATED
-#undef JSON_THROW
-#undef JSON_TRY
-
-#endif
diff --git a/CAN-config-generator/CMakeLists.txt b/CAN-config-generator/CMakeLists.txt
deleted file mode 100644
index ec910897..00000000
--- a/CAN-config-generator/CMakeLists.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-# contrib: Romain Forlot <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-
-#--------------------------------------------------------------------------
-#  WARNING: 
-#     Do not change this cmake template
-#     Customise your preferences in "./etc/config.cmake"
-#--------------------------------------------------------------------------
-
-
-# Generic useful macro
-# -----------------------
-macro(PROJECT_TARGET_ADD TARGET_NAME)
-	set(PROJECT_TARGETS ${PROJECT_TARGETS} ${TARGET_NAME} CACHE INTERNAL PROJECT_TARGETS)
-	set(TARGET_NAME ${TARGET_NAME})
-endmacro(PROJECT_TARGET_ADD)
-
-macro(defstr name value)
-	add_definitions(-D${name}=${value})
-endmacro(defstr)
-
-macro(setc name value)
-	if(NOT DEFINED ${name})
-	set(${name} ${value})
-	endif(NOT DEFINED ${name})
-endmacro(setc)
-
-# Dumb macro to add each directory under a path. Make sure we grab all header files!
-macro(fill_include_dir path)
-	file(GLOB_RECURSE dirlist LIST_DIRECTORIES true "${path}/*")
-	foreach(filename ${dirlist})
-		if(IS_DIRECTORY ${filename})
-			include_directories(${filename})
-		endif(IS_DIRECTORY ${filename})
-	endforeach()
-endmacro(fill_include_dir)
-
-# Helper function to retrieve source files from a library repo.
-function(find_source_files path)
-	file(GLOB_RECURSE filelist "${path}/*.[cpx]")
-	foreach(filename ${filelist})
-		if(NOT ${filename} MATCHES ".*(test|example|sample).*")
-			string(APPEND sources "${filename};")
-		endif(NOT ${filename} MATCHES ".*(test|example|sample).*")
-	endforeach()
-	set(sources_files ${sources} PARENT_SCOPE)
-endfunction(find_source_files)
-
-# WGT packaging function. TYPE can be HTML5, NATIVE, HTML5-HYBRID or BINDING
-macro(build_widget type)
-	message(STATUS "Creation of ${TARGET_NAME}.wgt package for AppFW")
-
-	configure_file(${PROJECT_WGT_DIR}/config.xml config.xml)
-
-	if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR}/etc")
-		file(GLOB conf_files "${PROJECT_WGT_DIR}/etc/*")
-		foreach(filename ${conf_files})
-			STRING(REGEX REPLACE "^.*/(.*)$" "\\1" shortname ${filename})
-			message(STATUS "Copying config file ${shortname}")
-			configure_file(${filename} ${shortname})
-		endforeach()
-	endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR}/etc")
-
-	# Include HTML5 files to be packaged
-	if(${type} STREQUAL "HTML5")
-		file(GLOB_RECURSE HTML5FILES app/*)
-
-		if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gulpfile.js")
-			set(HTML5FILES ${HTML5FILES} "${CMAKE_CURRENT_SOURCE_DIR}/gulpfile.js")
-		endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gulpfile.js")
-
-		if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/bower.json")
-			set(HTML5FILES ${HTML5FILES} "${CMAKE_CURRENT_SOURCE_DIR}/bower.json")
-		endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/bower.json")
-
-		if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/package.json")
-			set(HTML5FILES ${HTML5FILES} "${CMAKE_CURRENT_SOURCE_DIR}/package.json")
-		endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/package.json")
-	endif(${type} STREQUAL "HTML5")
-
-	if(${type} STREQUAL "HTML5")
-		add_custom_command(
-			OUTPUT ${TARGET_NAME}.wgt
-			DEPENDS ${HTML5FILES} ${PROJECT_WGT_DIR}/config.xml
-			COMMAND rm -rf package
-			COMMAND mkdir -p package/lib package/htdocs package/etc package/bin
-			COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && gulp widget-config-prod
-			COMMAND cp -a dist.prod/* ${CMAKE_CURRENT_BINARY_DIR}/package/htdocs
-		)
-	endif(${type} STREQUAL "HTML5")
-
-	if(${type} STREQUAL "HTML5-HYBRID")
-		add_custom_command(
-			OUTPUT ${TARGET_NAME}.wgt
-			DEPENDS ${HTML5FILES} ${PROJECT_WGT_DIR}/config.xml 
-			COMMAND rm -rf package
-			COMMAND mkdir -p package/lib package/htdocs package/etc package/bin
-			COMMAND cp ${TARGET_NAME}.so package/lib
-		)
-	endif(${type} STREQUAL "HTML5-HYBRID")
-
-	if(${type} STREQUAL "BINDING")
-		add_custom_command(
-			OUTPUT ${TARGET_NAME}.wgt
-			DEPENDS ${PROJECT_WGT_DIR}/config.xml
-			COMMAND rm -rf package
-			COMMAND mkdir -p package/lib package/htdocs package/etc package/bin
-			COMMAND cp ${TARGET_NAME}.so package/lib
-		)
-	endif(${type} STREQUAL "BINDING")
-
-	if(${type} STREQUAL "NATIVE")
-		add_custom_command(
-			OUTPUT ${TARGET_NAME}.wgt
-			DEPENDS ${PROJECT_WGT_DIR}/config.xml
-			COMMAND rm -rf package
-			COMMAND mkdir -p package/lib package/htdocs package/etc package/bin
-			COMMAND cp ${TARGET_NAME} package/bin
-		)
-	endif(${type} STREQUAL "NATIVE")
-
-	add_custom_command(
-		OUTPUT ${TARGET_NAME}.wgt
-		COMMAND cp config.xml package/
-		COMMAND cp ${conf_files} package/etc
-		COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wgt/${PROJECT_ICON} package/icon.png
-		COMMAND wgtpkg-pack -f -o ${TARGET_NAME}.wgt package
-		APPEND
-	)
-	add_custom_target(widget ALL DEPENDS ${TARGET_NAME}.wgt)
-endmacro()
-
-CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
-setc(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMP0048 1)
-
-# Compiler selection should append before project definition
-# -----------------------------------------------------------
-foreach (GCC_VERSION "6" "5")
-	execute_process(COMMAND gcc-${GCC_VERSION} -dumpversion RESULT_VARIABLE GCCRC OUTPUT_QUIET ERROR_QUIET)
-	if(GCCRC EQUAL 0)
-		set(CMAKE_C_COMPILER "gcc-${GCC_VERSION}")
-		set(CMAKE_CXX_COMPILER "g++-${GCC_VERSION}")
-		set(CMAKE_C_VERSION ${GCC_VERSION})
-		break()
-	endif(GCCRC EQUAL 0)
-endforeach(GCC_VERSION)
-
-# Include project configuration
-# ------------------------------
-include(${CMAKE_CURRENT_SOURCE_DIR}/etc/config.cmake)
-project(${NAME} VERSION ${VERSION})
-setc(PROJECT_PRETTY_NAME "${PRETTY_NAME}")
-setc(PROJECT_DESCRIPTION "${DESCRIPTION}")
-setc(PROJECT_WGT_DIR "packaging/wgt")
-setc(PROJECT_LIBDIR "libs")
-setc(PROJECT_RESOURCES "data")
-
-message(STATUS "")
-message(STATUS "Project=${PROJECT_NAME}/${VERSION}[${PRETTY_NAME} ${DESCRIPTION}]")
-message(STATUS "")
-message(STATUS "gcc/g++ version-${CMAKE_C_VERSION}.x selected")
-
-INCLUDE(FindPkgConfig)
-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(GNUInstallDirs)
-
-# Default compilation options
-############################################################################
-link_libraries(-Wl,--as-needed -Wl,--gc-sections)
-add_compile_options(-Wall -Wextra -Wconversion)
-add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care?
-add_compile_options(-Wno-sign-compare -Wno-sign-conversion)
-add_compile_options(-Werror=maybe-uninitialized)
-add_compile_options(-Werror=implicit-function-declaration)
-add_compile_options(-ffunction-sections -fdata-sections)
-add_compile_options(-fPIC)
-add_compile_options(-g)
-
-setc(CMAKE_C_FLAGS_PROFILING   "-g -O2 -pg -Wp,-U_FORTIFY_SOURCE")
-setc(CMAKE_C_FLAGS_DEBUG       "-g -O2 -ggdb -Wp,-U_FORTIFY_SOURCE")
-setc(CMAKE_C_FLAGS_RELEASE     "-O2")
-setc(CMAKE_C_FLAGS_CCOV        "-g -O2 --coverage")
-
-set(CMAKE_CXX_FLAGS_PROFILING    "-g -O0 -std=c++11 -pg -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_CXX_FLAGS_DEBUG        "-g -O0 -std=c++11 -ggdb -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_CXX_FLAGS_RELEASE      "-g -O2 -std=c++11")
-set(CMAKE_CXX_FLAGS_CCOV "-g -O2 -std=c++11 --coverage")
-
-setc(CMAKE_INSTALL_PREFIX      "${CMAKE_SOURCE_DIR}/Install")
-
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
-setc(PKG_CONFIG_USE_CMAKE_PREFIX_PATH 1)
-
-# Loop on required package and add options
-foreach (PKG_CONFIG ${PKG_REQUIRED_LIST})
-	PKG_CHECK_MODULES(${PKG_CONFIG} REQUIRED ${PKG_CONFIG})
-
-	INCLUDE_DIRECTORIES(${${PKG_CONFIG}_INCLUDE_DIRS})
-	list (APPEND link_libraries ${${PKG_CONFIG}_LIBRARIES})
-	add_compile_options (${${PKG_CONFIG}_CFLAGS})
-endforeach(PKG_CONFIG)
-
-# Optional LibEfence Malloc debug library
-IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
-CHECK_LIBRARY_EXISTS(efence malloc "" HAVE_LIBEFENCE)
-IF(HAVE_LIBEFENCE)
-	MESSAGE(STATUS "Linking with ElectricFence for debugging purposes...")
-	SET(libefence_LIBRARIES "-lefence")
-	list (APPEND link_libraries libefence_LIBRARIES})
-ENDIF(HAVE_LIBEFENCE)
-ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
-
-# set default include directories
-#INCLUDE_DIRECTORIES(${EXTRA_INCLUDE_DIRS})
-# Brutal but efficace:
-fill_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
-
-# If no install dir try to guest some smart default
-if(BINDINGS_INSTALL_PREFIX)
-	set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME})
-else()
-	set(BINDINGS_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
-endif()
-
-# Default Linkflag
-if(NOT BINDINGS_LINK_FLAG)
-	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/etc/export.map")
-endif()
-
-# Bindings to compile
-# --------------------
-file(GLOB filelist "*")
-foreach(filename ${filelist})
-if(EXISTS "${filename}/CMakeLists.txt")
-	add_subdirectory(${filename})
-endif(EXISTS "${filename}/CMakeLists.txt")
-endforeach()
-
-# Add a dummy target to enable global dependency order
-# -----------------------------------------------------
-if(EXTRA_DEPENDENCIES_ORDER)
-	set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies)
-	add_custom_target(${DEPENDENCIES_TARGET} ALL
-		DEPENDS ${EXTRA_DEPENDENCY_ORDER} 
-	)
-endif()
-
-# Cmake does not maintain targets list before 3.7
-# -------------------------------------------------
-if(${CMAKE_VERSION} VERSION_LESS 3.7)
-	set(GLOBAL_TARGET_LIST ${PROJECT_TARGETS})
-else()
-	get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList)
-endif()
-
-# Print developer helper message when everything is done
-# -------------------------------------------------------
-if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST)
-	add_custom_target(${PROJECT_NAME}_done ALL
-		DEPENDS ${DEPENDENCIES_TARGET} ${GLOBAL_TARGET_LIST}
-		COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
-	)
-endif()
diff --git a/CAN-config-generator/LICENSE b/CAN-config-generator/LICENSE
deleted file mode 100644
index 8dada3ed..00000000
--- a/CAN-config-generator/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/CAN-config-generator/Makefile b/CAN-config-generator/Makefile
deleted file mode 100644
index 658ef325..00000000
--- a/CAN-config-generator/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2015, 2016 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	 http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-BUILD_DIR   := build
-
-.PHONY: all clean mrproper ${BUILD_DIR}/Makefile
-
-all: build package
-
-clean:
-	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
-
-mrproper:
-	rm -rf ${BUILD_DIR}
-
-build:  ${BUILD_DIR}/Makefile
-	cmake --build ${BUILD_DIR} --clean-first
-
-
-package:
-	cmake --build ${BUILD_DIR} --target widget
-
-${BUILD_DIR}/Makefile:
-	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..)
diff --git a/CAN-config-generator/README.md b/CAN-config-generator/README.md
deleted file mode 100644
index b6771b99..00000000
--- a/CAN-config-generator/README.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# CAN Configuration Generator

-

-## Abstract

-

-This tool is used to generate a configuration source file for the [Low Level CAN bus binding](https://github.com/iotbzh/CAN_signaling).

-This binding needs a configuration provided as a C++ source file.

-As long this binding is based on [OpenXC vi-firmware](https://github.com/openxc/vi-firmware), this generator use the JSON format from the [python generator](https://github.com/openxc/openxc-python).

-The reference documentation of the JSON file can be found [here](https://github.com/openxc/vi-firmware/blob/master/docs/config/reference.rst).

-

-## Getting started

-

-### Build requirements

-

-* CMake version 3.0 or later

-* G++, Clang++ or any C++11 complient compiler.

-

-* Make sure you already set up the AGL SDK using the following [SDK Quick Setup Guide](http://docs.iot.bzh/docs/getting_started/en/dev/reference/setup-sdk-environment.html). Alternatively, please refer to official guides available on [AGL Developer Site](http://docs.automotivelinux.org/docs/devguides/en/dev/#guides).

-

-> **CAUTION** Don't source the environment file to get this project compile. We just use CMake from SDK environment, so make sure to not have CMake on the system or remove it if needed with ```sudo apt-get remove cmake```. 

-

-## Compile

-

-```bash

-$ export PATH=$PATH:/xdt/sdk/sysroots/x86_64-aglsdk-linux/usr/bin

-$ export WD=$(pwd)

-$ git clone --recursive https://gerrit.automotivelinux.org/gerrit/apps/low-level-can-service

-$ cd can-config-generator

-$ mkdir -p build

-$ cd build

-$ cmake -G "Unix Makefiles" ..

-$ make

-```

-

-### Naming convention

-

-We chose a doted naming convention because it's a well know schema.

-

-It separates and organize names into hierarchy. From the left to right, you describe your names using the more common ancestor at the left then more you go to the right the more it will be accurate.

-

-Let's take an example, here is an example about standard PID name following this convention:

-

-```

-engine.load

-engine.coolant.temperature

-fuel.pressure

-intake.manifold.pressure

-engine.speed

-vehicle.speed

-intake.air.temperature

-mass.airflow

-throttle.position

-running.time

-EGR.error

-fuel.level

-barometric.pressure

-commanded.throttle.position

-ethanol.fuel.percentage

-accelerator.pedal.position

-hybrid.battery-pack.remaining.life

-engine.oil.temperature

-engine.torque

-```

-

-> **NOTE** It's recommended that you follow this naming convention to name your CAN signals.

->

-> There is only character `*` that is forbidden in names because it's used as wildcard for subscription and unsubscrition.

->

-> This described in the below chapter.

-

-### Available decoder

-

-You can use some basic decoder provided by default by the binding which are:

-

-* decoder_t::noopDecoder : Default decoder if not specified, return raw value from signal's bitfield.

-* decoder_t::booleanDecoder : Coerces a numerical value to a boolean.

-* decoder_t::stateDecoder : Find and return the corresponding string state for a CAN signal's raw integer value.

-

-## Generate your config file

-

-To generate your config file you just have to run the generator using the `-m` option to specify your JSON file.

-

-```bash

-./can-config-generator -m ../tests/basic.json -o configuration-generated.cpp

-```

-

-If you omit the `-o` option, then code is generated on the stdout.

-You also can specify a header and a footer file.

-These files must be valid C++ fragment as long as they will be inserted as is.

-Use the `-h` option to display help.

-

-## Supported OpenXC items

-

-As long as the low level CAN signaling binding doesn't fully support OpenXC yet, this generator is also limited.

-For instance, `initializers`, `loopers`, `commands` and `handlers` nodes are ignored for now.

-This generator will follow OpenXC support status of the low level CAN signaling binding.

-

-The `buses` item will not be supported by this generator because the binding use another way to declare and configure buses. Please refer to the binding's documentation.

-

-## Known issues

-

-* Each `diagnostic_message` must define the same `bus` as the binding will use only one bus.

-* Only 1 messages_set is used

-

-## Dependencies

-

-* [json](https://github.com/nlohmann/json) by nlohmann

-

-## License

-

-Copyright 2017 - iotbzh

-

-Licensed under the [Apache License 2.0](https://github.com/iotbzh/can-config-generator/blob/master/LICENSE)

diff --git a/CAN-config-generator/build.sh b/CAN-config-generator/build.sh
deleted file mode 100755
index b6d9216a..00000000
--- a/CAN-config-generator/build.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-function build {
-	echo "ACTION: build"
-	if [ ! -d "$1/$2" ]; then
-		echo "INFO: build dir ($1/$2) doesn't exist, created it!"
-		mkdir -p "$1/$2"
-	fi
-	pushd "$1/$2"
-	#cd "$1/$2"
-	cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$3 $1
-	make
-	popd
-}
-
-function clean {
-	echo "ACTION: clean"
-	if [ -d "$1/$2" ]; then
-		rm -vrf "$1/$2"
-	fi
-}
-
-function rebuild {
-	clean $1 $2
-	build $1 $2 $3
-}
-
-function printhelp {
-	echo "Usage: build.sh <action> <subdir> [config]"
-	echo "	action: can be one of the following"
-	echo "		build: build this project."
-	echo "		rebuild: rebuild this project."
-	echo "		clean: clean the previous build."
-	echo "		install: install the build result."
-	echo "	subdir: the subdir into which the build is done."
-	echo "	config: can be Debug or Release. Ignored if the action is 'clean'."
-}
-
-function checkparams {
-	if [ "$#" -ne "$(($1+1))" ]; then
-		echo "ERROR: Wrong number of parameters, expected $1 but got $(($#-1))"
-		printhelp
-		exit 1
-	fi
-}
-
-function main {
-	CURRENT_DIR=$( dirname "$(readlink -f "$0")" )
-	echo "Current script: $CURRENT_DIR"
-
-	if [ "$#" -lt "1" ]; then
-		echo "ERROR: At least <action> must be specified!"
-		exit 1
-	fi
-
-	case "$1" in
-		"build")
-			checkparams 3 $*
-			build $CURRENT_DIR $2 $3
-			;;
-		"rebuild")
-			checkparams 3 $*
-			rebuild $CURRENT_DIR $2 $3
-			;;
-		"clean")
-			checkparams 2 $*
-			clean $CURRENT_DIR $2
-			;;
-		"install")
-			checkparams 3 $*
-			echo "ERROR: Not implemented yet!"
-			;;
-		*)
-			echo "ERROR: Unknown action '$3'!"
-			exit 1 
-			;;
-	esac
-}
-
-main $*
-
diff --git a/CAN-config-generator/can-config-generator.sln b/CAN-config-generator/can-config-generator.sln
deleted file mode 100644
index aa58f4a2..00000000
--- a/CAN-config-generator/can-config-generator.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 15

-VisualStudioVersion = 15.0.26228.4

-MinimumVisualStudioVersion = 10.0.40219.1

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can-config-generator", "can-config-generator.vcxproj", "{9DCC61FB-6E10-4D4C-A66D-D694238D4169}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|x64 = Debug|x64

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{9DCC61FB-6E10-4D4C-A66D-D694238D4169}.Debug|x64.ActiveCfg = Debug|x64

-		{9DCC61FB-6E10-4D4C-A66D-D694238D4169}.Debug|x64.Build.0 = Debug|x64

-		{9DCC61FB-6E10-4D4C-A66D-D694238D4169}.Release|x64.ActiveCfg = Release|x64

-		{9DCC61FB-6E10-4D4C-A66D-D694238D4169}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/CAN-config-generator/can-config-generator.vcxproj b/CAN-config-generator/can-config-generator.vcxproj
deleted file mode 100644
index f51296a5..00000000
--- a/CAN-config-generator/can-config-generator.vcxproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="build.sh" />

-    <None Include="LICENSE" />

-    <None Include="README.md" />

-    <None Include="tests\basic.json" />

-    <None Include="tests\signals.json" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="3rdparty\json\json.hpp" />

-    <ClInclude Include="src\openxc\can_bus.hpp" />

-    <ClInclude Include="src\openxc\can_message.hpp" />

-    <ClInclude Include="src\openxc\command.hpp" />

-    <ClInclude Include="src\openxc\diagnostic_message.hpp" />

-    <ClInclude Include="src\openxc\mapping.hpp" />

-    <ClInclude Include="src\openxc\message_set.hpp" />

-    <ClInclude Include="src\openxc\signal.hpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="src\main.cpp" />

-    <ClCompile Include="src\openxc\can_bus.cpp" />

-    <ClCompile Include="src\openxc\can_message.cpp" />

-    <ClCompile Include="src\openxc\command.cpp" />

-    <ClCompile Include="src\openxc\diagnostic_message.cpp" />

-    <ClCompile Include="src\openxc\mapping.cpp" />

-    <ClCompile Include="src\openxc\message_set.cpp" />

-    <ClCompile Include="src\openxc\signal.cpp" />

-    <ClCompile Include="tests\generated.cpp" />

-    <ClCompile Include="tests\handlers.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <Text Include="CMakeLists.txt" />

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{9dcc61fb-6e10-4d4c-a66d-d694238d4169}</ProjectGuid>

-    <Keyword>Linux</Keyword>

-    <RootNamespace>can_config_generator</RootNamespace>

-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>

-    <ApplicationType>Linux</ApplicationType>

-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>

-    <TargetLinuxPlatform>Generic</TargetLinuxPlatform>

-    <LinuxProjectType>{FC1A4D80-50E9-41DA-9192-61C0DBAA00D2}</LinuxProjectType>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <ConfigurationType>Makefile</ConfigurationType>

-    <RemoteRootDir>~/agl/projects</RemoteRootDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <ConfigurationType>Makefile</ConfigurationType>

-    <RemoteRootDir>~/agl/projects</RemoteRootDir>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings" />

-  <ImportGroup Label="Shared" />

-  <ImportGroup Label="PropertySheets" />

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LocalRemoteCopySources>false</LocalRemoteCopySources>

-    <NMakeIncludeSearchPath>D:\home\ctxnop\agl\sdk\porter\sysroots\cortexa15hf-neon-agl-linux-gnueabi\usr\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

-    <RemoteBuildCommandLine>$(RemoteProjectDir)/build.sh build bin/$(PlatformTarget)/$(Configuration) $(Configuration)</RemoteBuildCommandLine>

-    <RemoteReBuildCommandLine>$(RemoteProjectDir)/build.sh rebuild bin/$(PlatformTarget)/$(Configuration) $(Configuration)</RemoteReBuildCommandLine>

-    <RemoteCleanCommandLine>$(RemoteProjectDir)/build.sh clean bin/$(PlatformTarget)/$(Configuration)</RemoteCleanCommandLine>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LocalRemoteCopySources>false</LocalRemoteCopySources>

-    <NMakeIncludeSearchPath>D:\home\ctxnop\agl\sdk\porter\sysroots\cortexa15hf-neon-agl-linux-gnueabi\usr\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

-    <RemoteBuildCommandLine>$(RemoteProjectDir)/build.sh build bin/$(PlatformTarget)/$(Configuration) $(Configuration)</RemoteBuildCommandLine>

-    <RemoteReBuildCommandLine>$(RemoteProjectDir)/build.sh rebuild bin/$(PlatformTarget)/$(Configuration) $(Configuration)</RemoteReBuildCommandLine>

-    <RemoteCleanCommandLine>$(RemoteProjectDir)/build.sh clean bin/$(PlatformTarget)/$(Configuration)</RemoteCleanCommandLine>

-  </PropertyGroup>

-  <ItemDefinitionGroup />

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets" />

-</Project>
\ No newline at end of file
diff --git a/CAN-config-generator/etc/config.cmake b/CAN-config-generator/etc/config.cmake
deleted file mode 100644
index 50cb3460..00000000
--- a/CAN-config-generator/etc/config.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-# Project Info
-# ------------------
-set(NAME can-config-generator)
-set(VERSION "1.0")
-set(PRETTY_NAME "CAN configuration generator")
-set(DESCRIPTION "Generator that convert JSON file following OpenXC spec to configuration-generated.cpp file for the low level CAN binding.")
-set(URL "https://github.com/iotbzh/CAN_signaling")
-set(PROJECT_ICON "icon.png")
-
-# Compilation Mode (DEBUG, RELEASE)
-# ----------------------------------
-setc(CMAKE_BUILD_TYPE "DEBUG")
-
-# PKG_CONFIG required packages
-# -----------------------------
-set (PKG_REQUIRED_LIST
-	json-c
-	libsystemd
-	afb-daemon
-)
-
-# Static constante definition
-# -----------------------------
-add_compile_options(-D_REENTRANT)
-add_compile_options(-DPB_FIELD_16BIT)
-
-# LANG Specific compile flags set for all build types
-set(CMAKE_C_FLAGS "" CACHE STRING "C compile flags")
-set(CMAKE_CXX_FLAGS "-std=c++11" CACHE STRING "C++ compile flags")
-
-# Print a helper message when every thing is finished
-setc(CLOSING_MESSAGE "Test with: ./can-config-generator -m ../tests/basic.json -o configuration-generated.cpp")
-# ----------------------------------------------------
-
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
-# ---------------------------------------------------------------------
-setc(CMAKE_INSTALL_PREFIX ${HOME}/opt)
-setc(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-setc(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
-
-# Optional dependencies order
-# ---------------------------
-set(EXTRA_DEPENDENCIES_ORDER can-config-generator low-can-binding)
-
-# Optional Extra global include path
-# -----------------------------------
-#set(EXTRA_INCLUDE_DIRS inc_dir1 inc_dir2 ...)
-
-# Optional extra libraries
-# -------------------------
-#set(EXTRA_LINK_LIBRARIES)
-
-# Optional force binding installation
-# ------------------------------------
-# set(BINDINGS_INSTALL_PREFIX DestinationPath )
-
-# Optional force binding Linking flag
-# ------------------------------------
-# set(BINDINGS_LINK_FLAG LinkOptions )
-
-
diff --git a/CAN-config-generator/etc/export.map b/CAN-config-generator/etc/export.map
deleted file mode 100644
index 52c1b4aa..00000000
--- a/CAN-config-generator/etc/export.map
+++ /dev/null
@@ -1 +0,0 @@
-{ global: afbBindingV1*; local: *; };
diff --git a/CAN-config-generator/src/CMakeLists.txt b/CAN-config-generator/src/CMakeLists.txt
deleted file mode 100644
index 39ceba1e..00000000
--- a/CAN-config-generator/src/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-# contrib: Romain Forlot <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(can-config-generator)
-
-	# Define project Targets
-	add_executable(can-config-generator
-		main.cpp
-		openxc/message_set.cpp
-		openxc/can_bus.cpp
-		openxc/can_message.cpp
-		openxc/command.cpp
-		openxc/diagnostic_message.cpp
-		openxc/mapping.cpp
-		openxc/signal.cpp)
-
-	# Library dependencies (include updates automatically)
-	TARGET_LINK_LIBRARIES(can-config-generator
-		${link_libraries}
-	)
-
-	# installation directory
-	INSTALL(TARGETS can-config-generator
-RUNTIME DESTINATION ${BINDINGS_INSTALL_DIR})
diff --git a/CAN-config-generator/src/main.cpp b/CAN-config-generator/src/main.cpp
deleted file mode 100644
index d30428ed..00000000
--- a/CAN-config-generator/src/main.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-/*

- * Copyright (C) 2015, 2016 "IoT.bzh"

- * Author "Loïc Collignon" <loic.collignon@iot.bzh>

- * Author "Romain Forlot" <romain.forlot@iot.bzh>

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *	 http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-#include <unistd.h>

-#include <stdlib.h>

-#include <libgen.h>

-#include <exception>

-#include <fstream>

-#include <iostream>

-#include <string>

-#include <numeric>

-#include <iterator>

-#include <json.hpp>

-#include "openxc/message_set.hpp"

-

-#define EXIT_SUCCESS				0

-#define EXIT_UNKNOWN_ERROR			1

-#define EXIT_COMMAND_LINE_ERROR		2

-#define EXIT_PROGRAM_ERROR			3

-

-template <typename T>

-struct generator

-{

-	T v_;

-	std::string line_prefix_;

-	generator(T v, std::string line_prefix = "") : v_{v}, line_prefix_{line_prefix} {}

-};

-

-template <>

-struct generator<openxc::signal>

-{

-	const openxc::signal& v_;

-	std::uint32_t index_;

-	std::string line_prefix_;

-	generator(const openxc::signal& v, std::uint32_t index, std::string line_prefix = "")

-		: v_{v}, index_{index}, line_prefix_{line_prefix}

-	{

-	}

-};

-

-template <typename T>

-generator<T> gen(const T& v, std::string line_prefix = "") { return generator<T>(v, line_prefix); }

-

-generator<openxc::signal> gen(const openxc::signal& v, std::uint32_t index, std::string line_prefix = "")

-{

-	return generator<openxc::signal>(v, index, line_prefix);

-}

-

-template <typename T>

-std::ostream& operator<<(std::ostream& o, const generator<T>& v)

-{

-	o << v.line_prefix_ << v.v_;

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<bool>& v)

-{

-	o << v.line_prefix_ << (v.v_ ? "true" : "false");

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<float>& v)

-{

-	o << v.line_prefix_ << std::showpoint << v.v_ << "f";

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<std::string>& v)

-{

-	o << v.line_prefix_ << '\"' << v.v_ << '\"';

-	return o;

-}

-

-template <typename T>

-std::ostream& operator<<(std::ostream& o, const generator<std::vector<T>>& v)

-{

-//	o << v.line_prefix_;

-	auto sz = v.v_.size();

-	for(const T& i : v.v_)

-	{

-		o << gen(i, v.line_prefix_ + '\t');

-		if (sz > 1) o << ",";

-		--sz;

-//		o << '\n';

-	}

-//	o << v.line_prefix_;

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<openxc::message_set>& v)

-{

-	o	<< v.line_prefix_

-		<< "{std::make_shared<can_message_set_t>(can_message_set_t{"

-		<< "0,"

-		<< gen(v.v_.name()) << ",\n"

-		<< "\t\t\t{ // beginning can_message_definition_ vector\n"

-		<< gen(v.v_.messages(), "\t\t\t")

-		<< "\n\t\t}, // end can_message_definition vector\n"

-		<< "\t\t\t{ // beginning diagnostic_messages_ vector\n"

-		<< gen(v.v_.diagnostic_messages(),"\t\t\t") << "\n"

-		<< "\t\t\t} // end diagnostic_messages_ vector\n"

-		<< "\t\t})} // end can_message_set entry\n";

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<std::map<std::string, std::vector<std::uint32_t>>>& v)

-{

-	o << v.line_prefix_ << "{\n";

-	std::uint32_t c1 = (uint32_t)v.v_.size();

-	for(const auto& state : v.v_)

-	{

-		std::uint32_t c2 = (uint32_t)state.second.size();

-		for(const auto& i : state.second)

-		{

-			o << v.line_prefix_ << "\t" << "{" << i << "," << gen(state.first) << "}";

-			if (c1 > 1 || c2 > 1) o << ',';

-			o << '\n';

-			--c2;

-		}

-		--c1;

-	}

-	o << v.line_prefix_ << "}";

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<openxc::signal>& v)

-{

-	o	<< v.line_prefix_ << "{std::make_shared<can_signal_t> (can_signal_t{\n"

-		<< v.line_prefix_ << "\t" << gen(v.v_.generic_name()) << ",\n"

-		<< v.line_prefix_ << "\t" << v.v_.bit_position() << ",\n"

-		<< v.line_prefix_ << "\t" << v.v_.bit_size() << ",\n"

-		<< v.line_prefix_ << "\t" << gen(v.v_.factor()) << ",\n"

-		<< v.line_prefix_ << "\t" << v.v_.offset() << ",\n"

-		<< v.line_prefix_ << "\t" << "0,\n"

-		<< v.line_prefix_ << "\t" << "0,\n"

-		<< v.line_prefix_ << "\tfrequency_clock_t(" << gen(v.v_.max_frequency()) << "),\n"

-		<< v.line_prefix_ << "\t" << gen(v.v_.send_same()) << ",\n"

-		<< v.line_prefix_ << "\t" << gen(v.v_.force_send_changed()) << ",\n"

-		<< gen(v.v_.states(), v.line_prefix_ + '\t') << ",\n"

-		<< v.line_prefix_ << '\t' << gen(v.v_.writable()) << ",\n"

-		<< v.line_prefix_ << '\t' << (v.v_.decoder().size() ? v.v_.decoder() : "nullptr") << ",\n"

-		<< v.line_prefix_ << '\t' << (v.v_.encoder().size() ? v.v_.encoder() : "nullptr") << ",\n"

-		<< v.line_prefix_ << '\t' << "false\n"

-		<< v.line_prefix_ << "})}";

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<openxc::can_message>& v)

-{

-	o	<< v.line_prefix_

-		<< "{std::make_shared<can_message_definition_t>(can_message_definition_t{"

-		<< gen(v.v_.bus()) << ","

-		<< v.v_.id() << ","

-		<< "can_message_format_t::STANDARD,"

-		<< "frequency_clock_t(" << gen(v.v_.max_frequency()) << "),"

-		<< gen(v.v_.force_send_changed()) << ",\n";

-		std::uint32_t index = 0;

-	o	<< "\t\t\t\t\t{ // beginning can_signals vector\n";

-			std::uint32_t signal_count = (uint32_t)v.v_.signals().size();

-			for(const openxc::signal& s : v.v_.signals())

-			{

-	o			<< gen(s, index,"\t\t\t\t\t\t");

-				if (signal_count > 1) o << ',';

-				--signal_count;

-	o			<< '\n';

-			}

-	o	<< "\t\t\t\t\t} // end can_signals vector\n"

-		<< "\t\t\t\t})} // end can_message_definition entry\n";

-	return o;

-}

-

-template <>

-std::ostream& operator<<(std::ostream& o, const generator<openxc::diagnostic_message>& v)

-{

-	o	<< v.line_prefix_ << "{std::make_shared<diagnostic_message_t>(diagnostic_message_t{\n"

-		<< v.line_prefix_ << "\t" << v.v_.pid() << ",\n"

-		<< v.line_prefix_ << "\t" << gen(v.v_.name()) << ",\n"

-		<< v.line_prefix_ << "\t" << 0 << ",\n"

-		<< v.line_prefix_ << "\t" << 0 << ",\n"

-		<< v.line_prefix_ << "\t" << "UNIT::INVALID" << ",\n"

-		<< v.line_prefix_ << "\t" << gen(v.v_.frequency()) << ",\n"

-		<< v.line_prefix_ << "\t" << (v.v_.decoder().size() ? v.v_.decoder() : "nullptr") << ",\n"

-		<< v.line_prefix_ << "\t" << (v.v_.callback().size() ? v.v_.callback() : "nullptr") << ",\n"

-		<< v.line_prefix_ << "\t" << "true" << "\n"

-		<< v.line_prefix_ << "})}\n";

-	return o;

-}

-

-/// @brief Generate the application code.

-/// @param[in] header Content to be inserted as a header.

-/// @param[in] footer Content to be inserted as a footer.

-/// @param[in] message_set application read from the json file.

-/// @param[in] out Stream to write on.

-void generate(const std::string& header, const std::string& footer, const openxc::message_set& message_set, std::ostream& out)

-{

-	out << "#include \"application.hpp\"\n"

-		<< "#include \"../can/can-decoder.hpp\"\n\n";

-

-	if (header.size()) out << header << "\n";

-

-	out	<< "application_t::application_t()\n"

-		<< "	: can_bus_manager_{utils::config_parser_t{\"/etc/dev-mapping.conf\"}}\n"

-		<< "	, can_message_set_{\n"

-		<< gen(message_set, "\t\t")

-		<< "\t} // end can_message_set vector\n"

-		<< "{\n"

-		<< "	for(auto& cms: can_message_set_)\n"

-		<< "	{\n"

-		<< "		std::vector<std::shared_ptr<can_message_definition_t> >& can_messages_definition = cms->get_can_message_definition();\n"

-		<< "		for(auto& cmd : can_messages_definition)\n"

-		<< "		{\n"

-		<< "			cmd->set_parent(cms.get());\n"

-		<< "			std::vector<std::shared_ptr<can_signal_t> >& can_signals = cmd->get_can_signals();\n"

-		<< "			for(auto& sig: can_signals)\n"

-		<< "			{\n"

-		<< "				sig->set_parent(cmd.get());\n"

-		<< "			}\n"

-		<< "		}\n\n"

-		<< "		std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages = cms->get_diagnostic_messages();\n"

-		<< "		for(auto& dm : diagnostic_messages)\n"

-		<< "		{\n"

-		<< "			dm->set_parent(cms.get());\n"

-		<< "		}\n"

-		<< "	}\n"

-		<< "		}\n\n"

-		<< "const std::string application_t::get_diagnostic_bus() const\n"

-		<< "{\n";

-

-		std::string active_bus = "";

-		for (const auto& d : message_set.diagnostic_messages())

-		{

-			if (d.bus().size() == 0) std::cerr << "ERROR: The bus name should be set for each diagnostic message." << std::endl;

-			if (active_bus.size() == 0) active_bus = d.bus();

-			if (active_bus != d.bus()) std::cerr << "ERROR: The bus name should be the same for each diagnostic message." << std::endl;

-		}

-

-	out	<< "\treturn " << gen(active_bus) << ";\n"

-		<< "}\n\n";

-	out	<< footer << std::endl;

-}

-

-/// @brief Read whole file content to a string.

-/// @param[in] file Path to the file.

-/// @return A std::string which contains the file content. If @c file is an empty string, the return value is also empty.

-/// @exception std::runtime_error Throw this exception if the specified file is not found or cannot be opened.

-std::string read_file(const std::string& file)

-{

-	if(file.size() == 0) return std::string();

-	

-	std::string content;

-	std::ifstream stream(file);

-	if (stream)

-	{

-		stream.seekg(0, std::ios::end);

-		content.reserve(stream.tellg());

-		stream.seekg(0, std::ios::beg);

-		content.assign((std::istreambuf_iterator<char>(stream)), std::istreambuf_iterator<char>());

-		return content;

-	}

-	std::stringstream ss;

-	ss << "The specified file (" << file << ") is not found!";

-	throw std::runtime_error(ss.str());

-}

-

-/// @brief Read whole file content as a json document.

-/// @param[in] file Path to the file.

-/// @return A @c nlohmann::json object.

-/// @exception std::runtime_error Throw this exception if the specified file is not found or cannot be opened.

-nlohmann::json read_json(const std::string& file)

-{

-	std::ifstream stream(file);

-	if (stream)

-	{

-		nlohmann::json result;

-		stream >> result;

-		return result;

-	}

-	std::stringstream ss;

-	ss << "The specified file (" << file << ") is not found!";

-	throw std::runtime_error(ss.str());

-}

-

-// function that show the help information

-void showhelpinfo(char *s)

-{

-std::cout<<"Usage:   "<<s<<" <-m inpout.json> [-o application-generated.cpp]"<< std::endl;

-std::cout<<"option:  "<<"-m  input.json : JSON file describing CAN messages and signals"<< std::endl;

-std::cout<<"         "<<"-h header.cpp : header source file insert at the beginning of generated file"<< std::endl;

-std::cout<<"         "<<"-f footer.cpp : footer source file append to generated file."<< std::endl;

-std::cout<<"         "<<"-o application-generated.cpp : output source file. Name has to be application-generated.cpp"<< std::endl;

-}

-

-/// @brief Entry point.

-/// @param[in] argc Argument's count.

-/// @param[in] argv Argument's array.

-/// @return Exit code, zero if success.

-int main(int argc, char *argv[])

-{

-	try

-	{

-		std::string appName = argv[0];

-		std::string message_set_file;

-		std::string output_file;

-		std::string header_file;

-		std::string footer_file;

-

-		char tmp;

-		/*if the program is ran witout options ,it will show the usgage and exit*/

-		if(argc == 1)

-		{

-			showhelpinfo(argv[0]);

-			exit(1);

-		}

-		/*use function getopt to get the arguments with option."hu:p:s:v" indicate 

-		that option h,v are the options without arguments while u,p,s are the

-		options with arguments*/

-		while((tmp=(char)getopt(argc,argv,"m:h:f:o:"))!=-1)

-		{

-			switch(tmp)

-			{

-			case 'h':

-				header_file = optarg;

-				break;

-			case 'f':

-				footer_file = optarg;

-				break;

-			case 'm':

-				message_set_file = optarg;

-				break;

-			case 'o':

-				output_file = optarg;

-				break;

-			default:

-				showhelpinfo(argv[0]);

-			break;

-			}

-		}

-

-		std::stringstream header;

-		header << read_file(header_file);

-

-		std::string footer = read_file(footer_file);

-		openxc::message_set message_set;

-		message_set.from_json(read_json(message_set_file));

-

-		std::string message_set_path = dirname(strdup(message_set_file.c_str()));

-		for(const auto& s : message_set.extra_sources())

-		{

-			std::string extra_source = s;

-			extra_source = message_set_path + "/" + extra_source;

-			header << "\n// >>>>> " << s << " >>>>>\n" << read_file(extra_source) << "\n// <<<<< " << s << " <<<<<\n";

-		}

-

-		std::ofstream out;

-		if (output_file.size())

-		{

-			out.open(output_file);

-			if(!out)

-			{

-				std::stringstream ss;

-				ss << "Can't open the ouput file (" << output_file << ") for writing!";

-				throw std::runtime_error(ss.str());

-			}

-		}

-		generate(header.str(), footer, message_set, output_file.size() ? out : std::cout); 

-	}

-	catch (std::exception& e)

-	{

-		std::cerr << "ERROR: Unhandled exception - " << e.what() << std::endl;

-		return EXIT_UNKNOWN_ERROR;

-	}

-	return EXIT_SUCCESS;

-}

diff --git a/CAN-config-generator/src/main.hpp b/CAN-config-generator/src/main.hpp
deleted file mode 100644
index cf08e1a4..00000000
--- a/CAN-config-generator/src/main.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2015, 20"IoT.bzh"
- * Author "Romain Forlot" <romain.forlot@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *	 http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-struct afb_config_list {
-		struct afb_config_list *next;
-		char *value;
-};
-
-// main config structure
-struct afb_config {
-		char *console;          // console device name (can be a file or a tty)
-		char *rootdir;          // base dir for files
-		char *roothttp;         // directory for http files
-		char *rootbase;         // Angular HTML5 base URL
-		char *rootapi;          // Base URL for REST APIs
-		char *workdir;          // where to run the program
-		char *uploaddir;        // where to store transient files
-		char *token;            // initial authentication token [default NULL no session]
-
-		struct afb_config_list *aliases;
-		struct afb_config_list *dbus_clients;
-		struct afb_config_list *dbus_servers;
-		struct afb_config_list *ws_clients;
-		struct afb_config_list *ws_servers;
-		struct afb_config_list *so_bindings;
-		struct afb_config_list *ldpaths;
-
-		char **exec;
-
-		int httpdPort;
-		int background;         // run in backround mode
-		int cacheTimeout;
-		int apiTimeout;
-		int cntxTimeout;        // Client Session Context timeout
-		int nbSessionMax;       // max count of sessions
-		int mode;               // mode of listening
-		int tracereq;
-		int noHttpd;
-};
-
-extern struct afb_config *parse_arguments(int argc, char **argv);
\ No newline at end of file
diff --git a/CAN-config-generator/src/openxc/can_bus.cpp b/CAN-config-generator/src/openxc/can_bus.cpp
deleted file mode 100755
index 0a968a9e..00000000
--- a/CAN-config-generator/src/openxc/can_bus.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "can_bus.hpp"

-

-namespace openxc

-{

-	std::uint32_t can_bus::controller() const

-	{

-		return controller_;

-	}

-	

-	std::uint32_t can_bus::speed() const

-	{

-		return speed_;

-	}

-	

-	can_bus_mode can_bus::raw_can_mode() const

-	{

-		return raw_can_mode_;

-	}

-	

-	bool can_bus::raw_writable() const

-	{

-		return raw_writable_;

-	}

-	

-	float can_bus::max_message_frequency() const

-	{

-		return max_message_frequency_;

-	}

-	

-	bool can_bus::force_send_changed() const

-	{

-		return force_send_changed_;

-	}

-	

-	void can_bus::from_json(const nlohmann::json& j)

-	{

-		controller_ = j.count("controller") ? j["controller"].get<std::uint32_t>() : 1;

-		speed_ = j.count("speed") ? j["speed"].get<std::uint32_t>() : 0;

-		raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;

-		raw_writable_ = j.count("raw_writable") ? j["raw_writable"].get<bool>() : false;

-		max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<float>() : 0;

-		force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : false;

-	}

-

-	nlohmann::json can_bus::to_json() const

-	{

-		nlohmann::json j;

-		j["controller"] = controller_;

-		j["speed"] = speed_;

-		j["raw_can_mode"] = raw_can_mode_;

-		j["raw_writable"] = raw_writable_;

-		j["max_message_frequency"] = max_message_frequency_;

-		j["force_send_changed"] = force_send_changed_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const can_bus& p)

-	{

-		j = p.to_json();

-	}

-

-	void from_json(const nlohmann::json& j, can_bus& p)

-	{

-		p.from_json(j);

-	}

-

-	void to_json(nlohmann::json& j, const can_bus_mode& p)

-	{

-		switch (p)

-		{

-		case can_bus_mode::off:

-			j = std::string("off");

-			break;

-		case can_bus_mode::filtered:

-			j = std::string("filtered");

-			break;

-		case can_bus_mode::unfiltered:

-			j = std::string("unfiltered");

-			break;

-		}

-	}

-

-	void from_json(const nlohmann::json& j, can_bus_mode& p)

-	{

-		if (j.get<std::string>() == "off") p = can_bus_mode::off;

-		else if (j.get<std::string>() == "filtered") p = can_bus_mode::filtered;

-		else p = can_bus_mode::unfiltered;

-	}

-}

diff --git a/CAN-config-generator/src/openxc/can_bus.hpp b/CAN-config-generator/src/openxc/can_bus.hpp
deleted file mode 100755
index 74e1273f..00000000
--- a/CAN-config-generator/src/openxc/can_bus.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once

-

-#include <cstdint>

-#include <json.hpp>

-

-namespace openxc

-{

-	enum class can_bus_mode

-	{

-		off,

-		filtered,

-		unfiltered

-	};

-

-	class can_bus

-	{

-	private:

-		std::uint32_t	controller_;

-		std::uint32_t	speed_;

-		can_bus_mode	raw_can_mode_;

-		bool			raw_writable_;

-		float			max_message_frequency_;

-		bool			force_send_changed_;

-

-	public:

-		std::uint32_t controller() const;

-		std::uint32_t speed() const;

-		can_bus_mode raw_can_mode() const;

-		bool raw_writable() const;

-		float max_message_frequency() const;

-		bool force_send_changed() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-	};

-

-	void to_json(nlohmann::json& j, const can_bus& p);

-	void from_json(const nlohmann::json& j, can_bus& p);

-

-	void to_json(nlohmann::json& j, const can_bus_mode& p);

-	void from_json(const nlohmann::json& j, can_bus_mode& p);

-}

diff --git a/CAN-config-generator/src/openxc/can_message.cpp b/CAN-config-generator/src/openxc/can_message.cpp
deleted file mode 100755
index 40e897b2..00000000
--- a/CAN-config-generator/src/openxc/can_message.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "can_message.hpp"

-

-namespace openxc

-{

-	std::string can_message::id() const

-	{

-		return id_;

-	}

-	

-	void can_message::id(const std::string& id)

-	{

-		id_ = id;

-	}

-	

-	std::string can_message::bus() const

-	{

-		return bus_;

-	}

-	

-	bool can_message::bit_numbering_inverted() const

-	{

-		return bit_numbering_inverted_;

-	}

-	

-	const std::vector<signal>& can_message::signals() const

-	{

-		return signals_;

-	}

-	

-	std::string can_message::name() const

-	{

-		return name_;

-	}

-	

-	std::vector<std::string> can_message::handlers() const

-	{

-		return handlers_;

-	}

-	

-	bool can_message::enabled() const

-	{

-		return enabled_;

-	}

-	

-	float can_message::max_frequency() const

-	{

-		return max_frequency_;

-	}

-	

-	float can_message::max_signal_frequency() const

-	{

-		return max_signal_frequency_;

-	}

-	

-	bool can_message::force_send_changed() const

-	{

-		return force_send_changed_;

-	}

-	

-	bool can_message::force_send_changed_signals() const

-	{

-		return force_send_changed_;

-	}

-	

-	void can_message::from_json(const nlohmann::json& j)

-	{

-		bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";

-		bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false;

-		name_ = j.count("name") ? j["name"].get<std::string>() : "";

-		handlers_ = j.count("handlers") ? j["handlers"].get<std::vector<std::string>>() : std::vector<std::string>();

-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;

-		max_frequency_ = (float)j.count("max_frequency") ? j["max_frequency"].get<float>() : 5;

-		max_signal_frequency_ = j.count("max_signal_frequency") ? j["max_signal_frequency"].get<float>() : 5;

-		force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : true;

-		force_send_changed_signals_ = j.count("force_send_changed_signals") ? j["force_send_changed_signals"].get<bool>() : false;

-		

-		if(j.count("signals"))

-		{

-			std::map<std::string, nlohmann::json> signals = j["signals"];

-			for(const auto& s : signals)

-			{

-				signal sig = s.second.get<signal>();

-				sig.id(s.first);

-				signals_.push_back(sig);

-			}

-		}

-		

-	}

-	

-	std::uint32_t can_message::get_signals_count() const

-	{

-		return (uint32_t)signals_.size();

-	}

-

-	nlohmann::json can_message::to_json() const

-	{

-		nlohmann::json j;

-		j["bus"] = bus_;

-		j["bit_numbering_inverted"] = bit_numbering_inverted_;

-		j["signals"] = signals_;

-		j["name"] = name_;

-		j["handlers"] = handlers_;

-		j["enabled"] = enabled_;

-		j["max_frequency"] = max_frequency_;

-		j["max_signal_frequency"] = max_signal_frequency_;

-		j["force_send_changed"] = force_send_changed_;

-		j["force_send_changed_signals"] = force_send_changed_signals_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const can_message& p)

-	{

-		j = p.to_json();

-	}

-	

-	void from_json(const nlohmann::json& j, can_message& p)

-	{

-		p.from_json(j);

-	}

-

-	void from_json(const nlohmann::json& j, can_message& p, const std::string& id)

-	{

-		p.from_json(j);

-		p.id(id);

-	}

-}

diff --git a/CAN-config-generator/src/openxc/can_message.hpp b/CAN-config-generator/src/openxc/can_message.hpp
deleted file mode 100755
index 3f7b0181..00000000
--- a/CAN-config-generator/src/openxc/can_message.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once

-

-#include <string>

-#include <vector>

-#include <json.hpp>

-

-#include "signal.hpp"

-

-namespace openxc

-{

-	class can_message

-	{

-	private:

-		std::string						id_;

-		std::string						bus_;

-		bool							bit_numbering_inverted_;

-		std::vector<signal>				signals_;

-		std::string						name_;

-		std::vector<std::string>		handlers_;

-		bool							enabled_;

-		float							max_frequency_;

-		float							max_signal_frequency_;

-		bool							force_send_changed_;

-		bool							force_send_changed_signals_;

-

-	public:

-		std::string id() const;

-		void id(const std::string& id);

-		std::string	bus() const;

-		bool bit_numbering_inverted() const;

-		const std::vector<signal>& signals() const;

-		std::string name() const;

-		std::vector<std::string> handlers() const;

-		bool enabled() const;

-		float max_frequency() const;

-		float max_signal_frequency() const;

-		bool force_send_changed() const;

-		bool force_send_changed_signals() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-		

-		std::uint32_t get_signals_count() const;

-	};

-

-	void to_json(nlohmann::json& j, const can_message& p);

-	void from_json(const nlohmann::json& j, can_message& p);

-	void from_json(const nlohmann::json& j, can_message& p, const std::string& id);

-}

diff --git a/CAN-config-generator/src/openxc/command.cpp b/CAN-config-generator/src/openxc/command.cpp
deleted file mode 100755
index 4cc0682f..00000000
--- a/CAN-config-generator/src/openxc/command.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "command.hpp"

-

-namespace openxc

-{

-	std::string command::name() const

-	{

-		return name_;

-	}

-	

-	bool command::enabled() const

-	{

-		return enabled_;

-	}

-	

-	std::string command::handler() const

-	{

-		return handler_;

-	}

-	

-	void command::from_json(const nlohmann::json& j)

-	{

-		name_ = j.count("name") ? j["name"].get<std::string>() : "";

-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;

-		handler_ = j.count("handler") ? j["handler"].get<std::string>() : "";

-	}

-

-	nlohmann::json command::to_json() const

-	{

-		nlohmann::json j;

-		j["name"] = name_;

-		j["enabled"] = enabled_;

-		j["handler"] = handler_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const command& p)

-	{

-		j = p.to_json();

-	}

-

-	void from_json(const nlohmann::json& j, command& p)

-	{

-		p.from_json(j);

-	}

-}

diff --git a/CAN-config-generator/src/openxc/command.hpp b/CAN-config-generator/src/openxc/command.hpp
deleted file mode 100755
index 2c052266..00000000
--- a/CAN-config-generator/src/openxc/command.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once

-

-#include <string>

-#include <json.hpp>

-

-namespace openxc

-{

-	class command

-	{

-	private:

-		std::string		name_;

-		bool			enabled_;

-		std::string		handler_;

-	public:

-		std::string name() const;

-		bool enabled() const;

-		std::string handler() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-	};

-

-	void to_json(nlohmann::json& j, const command& p);

-	void from_json(const nlohmann::json& j, command& p);

-}

diff --git a/CAN-config-generator/src/openxc/diagnostic_message.cpp b/CAN-config-generator/src/openxc/diagnostic_message.cpp
deleted file mode 100755
index 3881abef..00000000
--- a/CAN-config-generator/src/openxc/diagnostic_message.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "diagnostic_message.hpp"

-

-namespace openxc

-{

-	std::string diagnostic_message::bus() const

-	{

-		return bus_;

-	}

-	

-	std::uint32_t diagnostic_message::id() const

-	{

-		return id_;

-	}

-	

-	std::uint32_t diagnostic_message::mode() const

-	{

-		return mode_;

-	}

-	

-	float diagnostic_message::frequency() const

-	{

-		return frequency_;

-	}

-	

-	std::uint32_t diagnostic_message::pid() const

-	{

-		return pid_;

-	}

-	

-	std::string diagnostic_message::name() const

-	{

-		return name_;

-	}

-	

-	std::string diagnostic_message::decoder() const

-	{

-		return decoder_;

-	}

-	

-	std::string diagnostic_message::callback() const

-	{

-		return callback_;

-	}

-	

-	void diagnostic_message::from_json(const nlohmann::json& j)

-	{

-		bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";

-		id_ = j.count("id") ? j["id"].get<std::uint32_t>() : 0;

-		mode_ = j.count("mode") ? j["mode"].get<std::uint32_t>() : 1;

-		frequency_ = j.count("frequency") ? j["frequency"].get<float>() : 0;

-		pid_ = j.count("pid") ? j["pid"].get<std::uint32_t>() : 0;

-		name_ = j.count("name") ? j["name"].get<std::string>() : "";

-		decoder_ = j.count("decoder") ? j["decoder"].get<std::string>() : "";

-		callback_ = j.count("callback") ? j["callback"].get<std::string>() : "";

-	}

-

-	nlohmann::json diagnostic_message::to_json() const

-	{

-		nlohmann::json j;

-		j["bus"] = bus_;

-		j["id"] = id_;

-		j["mode"] = mode_;

-		j["frequency"] = frequency_;

-		j["pid"] = pid_;

-		j["name"] = name_;

-		j["decoder"] = decoder_;

-		j["callback"] = callback_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const diagnostic_message& p)

-	{

-		j = p.to_json();

-	}

-

-	void from_json(const nlohmann::json& j, diagnostic_message& p)

-	{

-		p.from_json(j);

-	}

-}

diff --git a/CAN-config-generator/src/openxc/diagnostic_message.hpp b/CAN-config-generator/src/openxc/diagnostic_message.hpp
deleted file mode 100755
index 1ceba1bd..00000000
--- a/CAN-config-generator/src/openxc/diagnostic_message.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once

-

-#include <string>

-#include <json.hpp>

-

-namespace openxc

-{

-	class diagnostic_message

-	{

-	private:

-		std::string		bus_;

-		std::uint32_t	id_;

-		std::uint32_t	mode_;

-		float			frequency_;

-		std::uint32_t	pid_;

-		std::string		name_;

-		std::string		decoder_;

-		std::string		callback_;

-	public:

-		std::string bus() const;

-		std::uint32_t id() const;

-		std::uint32_t mode() const;

-		float frequency() const;

-		std::uint32_t pid() const;

-		std::string name() const;

-		std::string decoder() const;

-		std::string callback() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-	};

-

-	void to_json(nlohmann::json& j, const diagnostic_message& p);

-	void from_json(const nlohmann::json& j, diagnostic_message& p);

-}

diff --git a/CAN-config-generator/src/openxc/mapping.cpp b/CAN-config-generator/src/openxc/mapping.cpp
deleted file mode 100755
index 74d5c94e..00000000
--- a/CAN-config-generator/src/openxc/mapping.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "mapping.hpp"

-

-namespace openxc

-{

-	std::string mapping::mapping_name() const

-	{

-		return mapping_name_;

-	}

-	

-	std::string mapping::bus() const

-	{

-		return bus_;

-	}

-	

-	std::string mapping::database() const

-	{

-		return database_;

-	}

-	

-	bool mapping::bit_numbering_inverted() const

-	{

-		return bit_numbering_inverted_;

-	}

-	

-	bool mapping::enabled() const

-	{

-		return enabled_;

-	}

-	

-	void mapping::from_json(const nlohmann::json& j)

-	{

-		mapping_name_ = j.count("mapping") ? j["mapping"].get<std::string>() : "";

-		bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";

-		database_ = j.count("database") ? j["database"].get<std::string>() : "";

-		bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false;

-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;

-	}

-

-	nlohmann::json mapping::to_json() const

-	{

-		nlohmann::json j;

-		j["mapping"] = mapping_name_;

-		j["bus"] = bus_;

-		j["database"] = database_;

-		j["bit_numbering_inverted"] = bit_numbering_inverted_;

-		j["enabled"] = enabled_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const mapping& p)

-	{

-		j = p.to_json();

-	}

-

-	void from_json(const nlohmann::json& j, mapping& p)

-	{

-		p.from_json(j);

-	}

-}

diff --git a/CAN-config-generator/src/openxc/mapping.hpp b/CAN-config-generator/src/openxc/mapping.hpp
deleted file mode 100755
index 30895cba..00000000
--- a/CAN-config-generator/src/openxc/mapping.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once

-

-#include <string>

-#include <json.hpp>

-

-namespace openxc

-{

-	class mapping

-	{

-	private:

-		std::string		mapping_name_;

-		std::string		bus_;

-		std::string		database_;

-		bool			bit_numbering_inverted_;

-		bool			enabled_;

-	public:

-		std::string mapping_name() const;

-		std::string bus() const;

-		std::string database() const;

-		bool bit_numbering_inverted() const;

-		bool enabled() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-	};

-

-	void to_json(nlohmann::json& j, const mapping& p);

-	void from_json(const nlohmann::json& j, mapping& p);

-}

diff --git a/CAN-config-generator/src/openxc/message_set.cpp b/CAN-config-generator/src/openxc/message_set.cpp
deleted file mode 100755
index d6745bfc..00000000
--- a/CAN-config-generator/src/openxc/message_set.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <sstream>

-#include "message_set.hpp"

-

-namespace openxc

-{

-	message_set::message_set()

-		: name_{""}

-		, bit_numbering_inverted_{false}

-		, max_message_frequency_{0}

-		, raw_can_mode_{can_bus_mode::off}

-		, parents_{}

-		, initializers_{}

-		, loopers_{}

-		, buses_{}

-		, messages_{}

-		, diagnostic_messages_{}

-		, mappings_{}

-		, extra_sources_{}

-		, commands_{}

-	{

-	}

-	

-	std::string message_set::name() const

-	{

-		return name_;

-	}

-	

-	bool message_set::bit_numbering_inverted() const

-	{

-		return bit_numbering_inverted_;

-	}

-	

-	float message_set::max_message_frequency() const

-	{

-		return max_message_frequency_;

-	}

-	

-	can_bus_mode message_set::raw_can_mode() const

-	{

-		return raw_can_mode_;

-	}

-	

-	const std::vector<std::string>& message_set::parents() const

-	{

-		return parents_;

-	}

-	

-	const std::vector<std::string>& message_set::initializers() const

-	{

-		return initializers_;

-	}

-	

-	const std::vector<std::string>& message_set::loopers() const

-	{

-		return loopers_;

-	}

-	

-	const std::map<std::string, can_bus>& message_set::buses() const

-	{

-		return buses_;

-	}

-	

-	const std::vector<can_message>& message_set::messages() const

-	{

-		return messages_;

-	}

-	

-	const std::vector<diagnostic_message>& message_set::diagnostic_messages() const

-	{

-		return diagnostic_messages_;

-	}

-	

-	const std::vector<mapping>& message_set::mappings() const

-	{

-		return mappings_;

-	}

-	

-	const std::vector<std::string>& message_set::extra_sources() const

-	{

-		return extra_sources_;

-	}

-	

-	const std::vector<command>& message_set::commands() const

-	{

-		return commands_;

-	}

-

-	void message_set::from_json(const nlohmann::json& j)

-	{

-		name_ = j["name"].get<std::string>();

-		bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false; // TODO: should be true by default if database-backed.

-		max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<float>() : 0.0f;

-		raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;

-		parents_ = j.count("parents") ? j["parents"].get<std::vector<std::string>>() : std::vector<std::string>();

-		initializers_ = j.count("initializers") ? j["initializers"].get<std::vector<std::string>>() : std::vector<std::string>();

-		loopers_ = j.count("loopers") ? j["loopers"].get<std::vector<std::string>>() : std::vector<std::string>();

-		buses_ = j.count("buses") ? j["buses"].get<std::map<std::string, can_bus>>() : std::map<std::string, can_bus>();

-		//messages_ = j.count("messages") ? j["messages"].get<std::map<std::string, can_message>>() : std::map<std::string, can_message>();

-		diagnostic_messages_ = j.count("diagnostic_messages") ? j["diagnostic_messages"].get<std::vector<diagnostic_message>>() : std::vector<diagnostic_message>();

-		mappings_ = j.count("mappings") ? j["mappings"].get<std::vector<mapping>>() : std::vector<mapping>();

-		extra_sources_ = j.count("extra_sources") ? j["extra_sources"].get<std::vector<std::string>>() : std::vector<std::string>();

-		commands_ = j.count("commands") ? j["commands"].get<std::vector<command>>() : std::vector<command>();

-		

-		

-		if (j.count("messages"))

-		{

-			std::map<std::string, nlohmann::json> messages = j["messages"];

-			for(const std::map<std::string, nlohmann::json>::value_type& m : messages)

-			{

-				can_message cm = m.second.get<can_message>();

-				cm.id(m.first);

-				messages_.push_back(cm);

-			}

-		}

-	}

-

-	nlohmann::json message_set::to_json() const

-	{

-		nlohmann::json j;

-		j["name_"]						= name_;

-		j["bit_numbering_inverted"]		= bit_numbering_inverted_;

-		j["max_message_frequency"]		= max_message_frequency_;

-		j["raw_can_mode"]				= raw_can_mode_;

-		j["parents"]					= parents_;

-		j["initializers"]				= initializers_;

-		j["loopers"]					= loopers_;

-		j["buses"]						= buses_;

-		j["messages"]					= messages_;

-		j["diagnostic_messages"]		= diagnostic_messages_;

-		j["mappings"]					= mappings_;

-		j["extra_sources"]				= extra_sources_;

-		j["commands"]					= commands_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const message_set& p)

-	{

-		j = p.to_json();

-	}

-

-	void from_json(const nlohmann::json& j, message_set& p)

-	{

-		p.from_json(j);

-	}

-}

diff --git a/CAN-config-generator/src/openxc/message_set.hpp b/CAN-config-generator/src/openxc/message_set.hpp
deleted file mode 100755
index 935817ee..00000000
--- a/CAN-config-generator/src/openxc/message_set.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once

-

-#include <string>

-#include <vector>

-#include <map>

-#include <json.hpp>

-

-#include "can_bus.hpp"

-#include "can_message.hpp"

-#include "diagnostic_message.hpp"

-#include "mapping.hpp"

-#include "command.hpp"

-

-namespace openxc

-{

-	class message_set

-	{

-	private:

-		std::string							name_;

-		bool								bit_numbering_inverted_;

-		float								max_message_frequency_;

-		can_bus_mode						raw_can_mode_;

-		std::vector<std::string>			parents_;

-		std::vector<std::string>			initializers_;

-		std::vector<std::string>			loopers_;

-		std::map<std::string, can_bus>		buses_;

-		//std::map<std::string, can_message>	messages_;

-		std::vector<can_message>			messages_;

-		std::vector<diagnostic_message>		diagnostic_messages_;

-		std::vector<mapping>				mappings_;

-		std::vector<std::string>			extra_sources_;

-		std::vector<command>				commands_;

-

-	public:

-		message_set();

-		message_set(const message_set&) = default;

-		message_set(message_set&&) = default;

-		

-		std::string name() const;

-		bool bit_numbering_inverted() const;

-		float max_message_frequency() const;

-		can_bus_mode raw_can_mode() const;

-		const std::vector<std::string>& parents() const;

-		const std::vector<std::string>& initializers() const;

-		const std::vector<std::string>& loopers() const;

-		const std::map<std::string, can_bus>& buses() const;

-		const std::vector<can_message>& messages() const;

-		const std::vector<diagnostic_message>& diagnostic_messages() const;

-		const std::vector<mapping>& mappings() const;

-		const std::vector<std::string>& extra_sources() const;

-		const std::vector<command>& commands() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-	};

-

-	void to_json(nlohmann::json& j, const message_set& p);

-	void from_json(const nlohmann::json& j, message_set& p);

-}

diff --git a/CAN-config-generator/src/openxc/signal.cpp b/CAN-config-generator/src/openxc/signal.cpp
deleted file mode 100755
index e9c1088b..00000000
--- a/CAN-config-generator/src/openxc/signal.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "signal.hpp"

-

-namespace openxc

-{

-	std::string signal::id() const

-	{

-		return id_;

-	}

-	

-	void signal::id(const std::string& id)

-	{

-		id_ = id;

-	}

-	

-	void id(const std::string& id);

-	

-	std::string signal::generic_name() const

-	{

-		return generic_name_;

-	}

-	

-	std::uint32_t signal::bit_position() const

-	{

-		return bit_position_;

-	}

-	

-	std::uint32_t signal::bit_size() const

-	{

-		return bit_size_;

-	}

-	

-	float signal::factor() const

-	{

-		return factor_;

-	}

-	

-	float signal::offset() const

-	{

-		return offset_;

-	}

-	

-	std::string signal::decoder() const

-	{

-		return decoder_;

-	}

-	

-	bool signal::ignore() const

-	{

-		return ignore_;

-	}

-	

-	bool signal::enabled() const

-	{

-		return enabled_;

-	}

-	

-	const std::map<std::string, std::vector<std::uint32_t>>& signal::states() const

-	{

-		return states_;

-	}

-	

-	float signal::max_frequency() const

-	{

-		return max_frequency_;

-	}

-	

-	bool signal::send_same() const

-	{

-		return send_same_;

-	}

-	

-	bool signal::force_send_changed() const

-	{

-		return force_send_changed_;

-	}

-	

-	bool signal::writable() const

-	{

-		return writable_;

-	}

-	

-	std::string signal::encoder() const

-	{

-		return encoder_;

-	}

-	

-	void signal::from_json(const nlohmann::json& j)

-	{

-		generic_name_ = j.count("generic_name") ? j["generic_name"].get<std::string>() : "";

-		bit_position_ = j.count("bit_position") ? j["bit_position"].get<std::uint32_t>() : 0;

-		bit_size_ = j.count("bit_size") ? j["bit_size"].get<std::uint32_t>() : 0;

-		factor_ = j.count("factor") ? j["factor"].get<float>() : 1.0f;

-		offset_ = j.count("offset") ? j["offset"].get<float>() : 0.0f;

-		decoder_ = j.count("decoder") ? j["decoder"].get<std::string>() : "";

-		ignore_ = j.count("ignore") ? j["ignore"].get<bool>() : false;

-		enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;

-		max_frequency_ = j.count("max_frequency") ? j["max_frequency"].get<float>() : 0.0f;

-		send_same_ = j.count("send_same") ? j["send_same"].get<bool>() : true;

-		force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : false;

-		writable_ = j.count("writable") ? j["writable"].get<bool>() : false;

-		encoder_ = j.count("encoder") ? j["encoder"].get<std::string>() : "";

-

-		if (j.count("states"))

-		{

-			std::map<std::string, nlohmann::json> items = j["states"];

-			for(const auto& i : items)

-			{

-				states_[i.first] = i.second.get<std::vector<std::uint32_t>>();

-			}

-		}

-	}

-

-	nlohmann::json signal::to_json() const

-	{

-		nlohmann::json j;

-		j["generic_name"] = generic_name_;

-		j["bit_position"] = bit_position_;

-		j["bit_size"] = bit_size_;

-		j["factor"] = factor_;

-		j["offset"] = offset_;

-		j["decoder"] = decoder_;

-		j["ignore"] = ignore_;

-		j["enabled"] = enabled_;

-		j["states"] = states_;

-		j["max_frequency"] = max_frequency_;

-		j["send_same"] = send_same_;

-		j["force_send_changed"] = force_send_changed_;

-		j["writable"] = writable_;

-		j["encoder"] = encoder_;

-		return j;

-	}

-

-	void to_json(nlohmann::json& j, const signal& p)

-	{

-		j = p.to_json();

-	}

-

-	void from_json(const nlohmann::json& j, signal& p)

-	{

-		p.from_json(j);

-	}

-}

diff --git a/CAN-config-generator/src/openxc/signal.hpp b/CAN-config-generator/src/openxc/signal.hpp
deleted file mode 100755
index e0124c35..00000000
--- a/CAN-config-generator/src/openxc/signal.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once

-

-#include <string>

-#include <map>

-#include <vector>

-#include <cstdint>

-#include <json.hpp>

-

-namespace openxc

-{

-	class signal

-	{

-	private:

-		std::string											id_;

-		std::string											generic_name_;

-		std::uint32_t										bit_position_;

-		std::uint32_t										bit_size_;

-		float												factor_;

-		float												offset_;

-		std::string											decoder_;

-		bool												ignore_;

-		bool												enabled_;

-		std::map<std::string, std::vector<std::uint32_t>>	states_;

-		float										max_frequency_;

-		bool												send_same_;

-		bool												force_send_changed_;

-		bool												writable_;

-		std::string											encoder_;

-	public:

-		std::string id() const;

-		void id(const std::string& id);

-		std::string generic_name() const;

-		std::uint32_t bit_position() const;

-		std::uint32_t bit_size() const;

-		float factor() const;

-		float offset() const;

-		std::string decoder() const;

-		bool ignore() const;

-		bool enabled() const;

-		const std::map<std::string, std::vector<std::uint32_t>>& states() const;

-		float max_frequency() const;

-		bool send_same() const;

-		bool force_send_changed() const;

-		bool writable() const;

-		std::string encoder() const;

-		

-		void from_json(const nlohmann::json& j);

-		nlohmann::json to_json() const;

-	};

-

-	void to_json(nlohmann::json& j, const signal& p);

-	void from_json(const nlohmann::json& j, signal& p);

-}

diff --git a/CAN-config-generator/tests/basic.json b/CAN-config-generator/tests/basic.json
deleted file mode 100755
index 32cd1b45..00000000
--- a/CAN-config-generator/tests/basic.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "name": "example",
-  "extra_sources": [
-  ],
-  "initializers": [
-  ],
-  "loopers": [
-  ],
-  "buses": {
-    "hs": {
-      "controller": 1,
-      "speed": 500000
-    },
-    "can0": {
-      "controller": 1,
-      "speed": 111111
-    }
-  },
-  "commands": [
-    {
-    }
-  ],
-  "messages": {
-    "0x128": {
-      "name": "ECM_z_5D2",
-      "bus": "can0",
-      "signals": {
-        "StrAnglAct": {
-          "generic_name": "SteeringWheelAngle",
-          "bit_position": 52,
-          "bit_size": 12,
-          "factor": 0.15392,
-          "offset": 0
-        },
-        "StrAnglSign": {
-          "generic_name": "steering_angle_sign",
-          "bit_position": 52,
-          "bit_size": 12
-        },
-        "EngSpd": {
-          "generic_name": "engine_speed",
-          "max_frequency": 15,
-          "bit_position": 12,
-          "bit_size": 8
-        },
-        "GrshftPos": {
-          "generic_name": "GearshiftPosition",
-          "bit_position": 41,
-          "bit_size": 3,
-          "states": {
-            "FIRST": [ 1 ],
-            "SECOND": [ 2 ],
-            "THIRD": [ 3 ],
-            "FOURTH": [ 4 ],
-            "REVERSE": [ 5 ],
-            "NEUTRAL": [ 6 ]
-          }
-        },
-        "StrAnglErr": {
-          "generic_name": "steering_wheel_angle_error",
-          "bit_position": 44,
-          "bit_size": 12
-        }
-      },
-      "handlers": [ ]
-    },
-	"0x813": {
-      "name": "ECM_z_5D2",
-      "bus": "can0",
-      "signals": {
-        "ABC": {
-          "generic_name": "abc",
-          "bit_position": 52,
-          "bit_size": 12,
-          "factor": 0.15392,
-          "offset": 0
-        },
-        "DEF": {
-          "generic_name": "def",
-          "decoder": "decoder_t::ignoreDecoder",
-          "bit_position": 52,
-          "bit_size": 12
-        }
-      }
-    }
-  },
-  "diagnostic_messages": [
-    {
-      "bus": "hs",
-      "id": 2015,
-      "mode": 1,
-      "pid": 12,
-      "frequency": 1,
-      "decoder": "decoder_t::decode_obd2_response"
-    },
-    {
-      "bus": "hs",
-      "id": 2016,
-      "mode": 2,
-      "pid": 12,
-      "frequency": 1
-    },
-    {
-      "bus": "hs",
-      "id": 2016,
-      "mode": 22,
-      "pid": 6,
-      "frequency": 1,
-      "decoder": "decoder_t::decode_obd2_response"
-    }
-  ]
-}
diff --git a/CAN-config-generator/tests/generated.cpp b/CAN-config-generator/tests/generated.cpp
deleted file mode 100644
index 9768860a..00000000
--- a/CAN-config-generator/tests/generated.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-#include "application.hpp"
-#include "can/can-decoder.hpp"
-
-
-// >>>>> handlers.cpp >>>>>
-#include "can/canread.h"
-
-using openxc::can::read::publishNumericalMessage;
-
-void handleSteeringWheelMessage(CanMessage* message,
-        CanSignal* signals, int signalCount, Pipeline* pipeline) {
-    publishNumericalMessage("latitude", 42.0, pipeline);
-}
-
-openxc_DynamicField handleInverted(CanSignal* signal, CanSignal* signals,
-        int signalCount, float value, bool* send) {
-    return openxc::payload::wrapNumber(value * -1);
-}
-
-void initializeMyStuff() { }
-
-void initializeOtherStuff() { }
-
-void myLooper() {
-    // this function will be called once each time through the main loop, after
-    // all CAN message processing has been completed
-}
-
-// <<<<< handlers.cpp <<<<<
-
-application_t::application_t()
-	: can_message_set_{0, "example", 2, 2, 7, 1, 3}
-	, can_message_definition_
-	{
-		{
-			can_message_definition_t(0, "can0", 0x128, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true),
-			can_message_definition_t(0, "can0", 0x813, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true)
-		}
-	}
-	, can_signals_
-	{
-		{
-			{
-				0,
-				0,
-				"engine_speed",
-				12,
-				8,
-				1.00000, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(15.0000f),
-				true,
-				false,
-				{
-				},
-				false,
-				nullptr,
-				nullptr,
-				false
-			},
-			{
-				0,
-				0,
-				"GearshiftPosition",
-				41,
-				3,
-				1.00000, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(0.00000f),
-				true,
-				false,
-				{
-					{1, "FIRST"},
-					{4, "FOURTH"},
-					{6, "NEUTRAL"},
-					{5, "REVERSE"},
-					{2, "SECOND"},
-					{3, "THIRD"}
-				},
-				false,
-				nullptr,
-				nullptr,
-				false
-			},
-			{
-				0,
-				0,
-				"SteeringWheelAngle",
-				52,
-				12,
-				0.153920, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(0.00000f),
-				true,
-				false,
-				{
-				},
-				false,
-				handleUnsignedSteeringWheelAngle,
-				nullptr,
-				false
-			},
-			{
-				0,
-				0,
-				"steering_wheel_angle_error",
-				44,
-				12,
-				1.00000, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(0.00000f),
-				true,
-				false,
-				{
-				},
-				false,
-				ignoreDecoder,
-				nullptr,
-				false
-			},
-			{
-				0,
-				0,
-				"steering_angle_sign",
-				52,
-				12,
-				1.00000, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(0.00000f),
-				true,
-				false,
-				{
-				},
-				false,
-				ignoreDecoder,
-				nullptr,
-				false
-			}
-		},
-		{
-			{
-				0,
-				1,
-				"abc",
-				52,
-				12,
-				0.153920, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(0.00000f),
-				true,
-				false,
-				{
-				},
-				false,
-				handleUnsignedSteeringWheelAngle,
-				nullptr,
-				false
-			},
-			{
-				0,
-				1,
-				"def",
-				52,
-				12,
-				1.00000, 
-				0, 
-				0,
-				0,
-				frequency_clock_t(0.00000f),
-				true,
-				false,
-				{
-				},
-				false,
-				decoder_t::ignoreDecoder,
-				nullptr,
-				false
-			}
-		}
-	}
-	//, obd2_signals_{/*...*/}
-{
-}
-
-
diff --git a/CAN-config-generator/tests/handlers.cpp b/CAN-config-generator/tests/handlers.cpp
deleted file mode 100644
index 4316f15f..00000000
--- a/CAN-config-generator/tests/handlers.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "can/canread.h"
-
-using openxc::can::read::publishNumericalMessage;
-
-void handleSteeringWheelMessage(CanMessage* message,
-        CanSignal* signals, int signalCount, Pipeline* pipeline) {
-    publishNumericalMessage("latitude", 42.0, pipeline);
-}
-
-openxc_DynamicField handleInverted(CanSignal* signal, CanSignal* signals,
-        int signalCount, float value, bool* send) {
-    return openxc::payload::wrapNumber(value * -1);
-}
-
-void initializeMyStuff() { }
-
-void initializeOtherStuff() { }
-
-void myLooper() {
-    // this function will be called once each time through the main loop, after
-    // all CAN message processing has been completed
-}
diff --git a/CAN-config-generator/tests/signals.json b/CAN-config-generator/tests/signals.json
deleted file mode 100755
index 648427a9..00000000
--- a/CAN-config-generator/tests/signals.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "name": "example",
-  "extra_sources": [
-    "handlers.cpp"
-  ],
-  "initializers": [
-    "initializeMyStuff"
-  ],
-  "loopers": [
-    "myLooper"
-  ],
-  "buses": {
-    "hs": {
-      "controller": 1,
-      "speed": 500000
-    },
-    "can0": {
-      "controller": 1,
-      "speed": 111111
-    }
-  },
-  "commands": [
-    {
-      "name": "turn_signal_status",
-      "handler": "handleTurnSignalCommand"
-    }
-  ],
-  "messages": {
-    "0x128": {
-      "name": "ECM_z_5D2",
-      "bus": "can0",
-      "signals": {
-        "StrAnglAct": {
-          "generic_name": "SteeringWheelAngle",
-          "bit_position": 52,
-          "bit_size": 12,
-          "factor": 0.15392,
-          "offset": 0,
-          "decoder": "handleUnsignedSteeringWheelAngle"
-        },
-        "StrAnglSign": {
-          "generic_name": "steering_angle_sign",
-          "decoder": "ignoreDecoder",
-          "bit_position": 52,
-          "bit_size": 12
-        },
-        "EngSpd": {
-          "generic_name": "engine_speed",
-          "max_frequency": 15,
-          "bit_position": 12,
-          "bit_size": 8
-        },
-        "GrshftPos": {
-          "generic_name": "GearshiftPosition",
-          "bit_position": 41,
-          "bit_size": 3,
-          "states": {
-            "FIRST": [ 1 ],
-            "SECOND": [ 2 ],
-            "THIRD": [ 3 ],
-            "FOURTH": [ 4 ],
-            "REVERSE": [ 5 ],
-            "NEUTRAL": [ 6 ]
-          }
-        },
-        "StrAnglErr": {
-          "decoder": "ignoreDecoder",
-          "generic_name": "steering_wheel_angle_error",
-          "bit_position": 44,
-          "bit_size": 12
-        }
-      },
-      "handlers": [ "handleSteeringWheelMessage" ]
-    },
-	"0x813": {
-      "name": "ECM_z_5D2",
-      "bus": "can0",
-      "signals": {
-        "ABC": {
-          "generic_name": "abc",
-          "bit_position": 52,
-          "bit_size": 12,
-          "factor": 0.15392,
-          "offset": 0,
-          "decoder": "handleUnsignedSteeringWheelAngle"
-        },
-        "DEF": {
-          "generic_name": "def",
-          "decoder": "decoder_t::ignoreDecoder",
-          "bit_position": 52,
-          "bit_size": 12
-        }
-      }
-    }
-  },
-  "diagnostic_messages": [
-    {
-      "bus": "hs",
-      "id": 2015,
-      "mode": 1,
-      "pid": 12,
-      "frequency": 1,
-      "decoder": "handleObd2Pid"
-    },
-    {
-      "bus": "hs",
-      "id": 2016,
-      "mode": 2,
-      "pid": 12,
-      "frequency": 1
-    },
-    {
-      "bus": "hs",
-      "id": 2016,
-      "mode": 22,
-      "pid": 6,
-      "frequency": 1,
-      "decoder": "handleMyDiagRequest"
-    }
-  ]
-}
diff --git a/CAN-binder/CMakeLists.txt b/CMakeLists.txt
index 2a97f85d..2a97f85d 100644
--- a/CAN-binder/CMakeLists.txt
+++ b/CMakeLists.txt
diff --git a/CAN-binder/build.mk b/build.mk
index 7c2c7fe7..7c2c7fe7 100755
--- a/CAN-binder/build.mk
+++ b/build.mk
diff --git a/CAN-binder/can_samples/citroen/citroen_c5_highway_1 b/can_samples/citroen/citroen_c5_highway_1
index f904932e..f904932e 100644
--- a/CAN-binder/can_samples/citroen/citroen_c5_highway_1
+++ b/can_samples/citroen/citroen_c5_highway_1
diff --git a/CAN-binder/can_samples/citroen/citroen_c5_highway_2 b/can_samples/citroen/citroen_c5_highway_2
index 7aa923a4..7aa923a4 100644
--- a/CAN-binder/can_samples/citroen/citroen_c5_highway_2
+++ b/can_samples/citroen/citroen_c5_highway_2
diff --git a/CAN-binder/can_samples/ford/focus/accel b/can_samples/ford/focus/accel
index 9c63a7b7..9c63a7b7 100644
--- a/CAN-binder/can_samples/ford/focus/accel
+++ b/can_samples/ford/focus/accel
diff --git a/CAN-binder/can_samples/ford/focus/alldoors_lock b/can_samples/ford/focus/alldoors_lock
index d4a3a56e..d4a3a56e 100644
--- a/CAN-binder/can_samples/ford/focus/alldoors_lock
+++ b/can_samples/ford/focus/alldoors_lock
diff --git a/CAN-binder/can_samples/ford/focus/alldoors_open b/can_samples/ford/focus/alldoors_open
index 72552d9e..72552d9e 100644
--- a/CAN-binder/can_samples/ford/focus/alldoors_open
+++ b/can_samples/ford/focus/alldoors_open
diff --git a/CAN-binder/can_samples/ford/focus/brake b/can_samples/ford/focus/brake
index 141ce80c..141ce80c 100644
--- a/CAN-binder/can_samples/ford/focus/brake
+++ b/can_samples/ford/focus/brake
diff --git a/CAN-binder/can_samples/ford/focus/handbrake b/can_samples/ford/focus/handbrake
index 6614e087..6614e087 100644
--- a/CAN-binder/can_samples/ford/focus/handbrake
+++ b/can_samples/ford/focus/handbrake
diff --git a/CAN-binder/can_samples/ford/focus/ignition b/can_samples/ford/focus/ignition
index e33a991f..e33a991f 100644
--- a/CAN-binder/can_samples/ford/focus/ignition
+++ b/can_samples/ford/focus/ignition
diff --git a/CAN-binder/can_samples/ford/focus/lights b/can_samples/ford/focus/lights
index ae7b0368..ae7b0368 100644
--- a/CAN-binder/can_samples/ford/focus/lights
+++ b/can_samples/ford/focus/lights
diff --git a/CAN-binder/can_samples/ford/focus/turnleft b/can_samples/ford/focus/turnleft
index 83b20003..83b20003 100644
--- a/CAN-binder/can_samples/ford/focus/turnleft
+++ b/can_samples/ford/focus/turnleft
diff --git a/CAN-binder/can_samples/ford/focus/turnright b/can_samples/ford/focus/turnright
index f039a4ba..f039a4ba 100644
--- a/CAN-binder/can_samples/ford/focus/turnright
+++ b/can_samples/ford/focus/turnright
diff --git a/CAN-binder/can_samples/init_can.sh b/can_samples/init_can.sh
index a7900343..a7900343 100755
--- a/CAN-binder/can_samples/init_can.sh
+++ b/can_samples/init_can.sh
diff --git a/CAN-binder/can_samples/init_vcan.sh b/can_samples/init_vcan.sh
index d016289c..d016289c 100755
--- a/CAN-binder/can_samples/init_vcan.sh
+++ b/can_samples/init_vcan.sh
diff --git a/CAN-binder/can_samples/toyota/auris/accel b/can_samples/toyota/auris/accel
index 9ddd9212..9ddd9212 100644
--- a/CAN-binder/can_samples/toyota/auris/accel
+++ b/can_samples/toyota/auris/accel
diff --git a/CAN-binder/can_samples/toyota/auris/alldoors_lock b/can_samples/toyota/auris/alldoors_lock
index 10705c9b..10705c9b 100644
--- a/CAN-binder/can_samples/toyota/auris/alldoors_lock
+++ b/can_samples/toyota/auris/alldoors_lock
diff --git a/CAN-binder/can_samples/toyota/auris/alldoors_unlock b/can_samples/toyota/auris/alldoors_unlock
index 06260c73..06260c73 100644
--- a/CAN-binder/can_samples/toyota/auris/alldoors_unlock
+++ b/can_samples/toyota/auris/alldoors_unlock
diff --git a/CAN-binder/can_samples/toyota/auris/brake b/can_samples/toyota/auris/brake
index 75704e30..75704e30 100644
--- a/CAN-binder/can_samples/toyota/auris/brake
+++ b/can_samples/toyota/auris/brake
diff --git a/CAN-binder/can_samples/toyota/auris/engineoff b/can_samples/toyota/auris/engineoff
index 67451f0f..67451f0f 100644
--- a/CAN-binder/can_samples/toyota/auris/engineoff
+++ b/can_samples/toyota/auris/engineoff
diff --git a/CAN-binder/can_samples/toyota/auris/handbrake b/can_samples/toyota/auris/handbrake
index 1d939e93..1d939e93 100644
--- a/CAN-binder/can_samples/toyota/auris/handbrake
+++ b/can_samples/toyota/auris/handbrake
diff --git a/CAN-binder/can_samples/toyota/auris/ignition b/can_samples/toyota/auris/ignition
index 7a3209c4..7a3209c4 100644
--- a/CAN-binder/can_samples/toyota/auris/ignition
+++ b/can_samples/toyota/auris/ignition
diff --git a/CAN-binder/can_samples/toyota/auris/keydisengage b/can_samples/toyota/auris/keydisengage
index 2b4e87ad..2b4e87ad 100644
--- a/CAN-binder/can_samples/toyota/auris/keydisengage
+++ b/can_samples/toyota/auris/keydisengage
diff --git a/CAN-binder/can_samples/toyota/auris/keyengage b/can_samples/toyota/auris/keyengage
index 7802370c..7802370c 100644
--- a/CAN-binder/can_samples/toyota/auris/keyengage
+++ b/can_samples/toyota/auris/keyengage
diff --git a/CAN-binder/can_samples/toyota/auris/keyin b/can_samples/toyota/auris/keyin
index c6e0dd94..c6e0dd94 100644
--- a/CAN-binder/can_samples/toyota/auris/keyin
+++ b/can_samples/toyota/auris/keyin
diff --git a/CAN-binder/can_samples/toyota/auris/keyout b/can_samples/toyota/auris/keyout
index 633943f7..633943f7 100644
--- a/CAN-binder/can_samples/toyota/auris/keyout
+++ b/can_samples/toyota/auris/keyout
diff --git a/CAN-binder/can_samples/toyota/auris/lights b/can_samples/toyota/auris/lights
index fc476cd7..fc476cd7 100644
--- a/CAN-binder/can_samples/toyota/auris/lights
+++ b/can_samples/toyota/auris/lights
diff --git a/CAN-binder/can_samples/toyota/auris/ok b/can_samples/toyota/auris/ok
index 2c8e995d..2c8e995d 100644
--- a/CAN-binder/can_samples/toyota/auris/ok
+++ b/can_samples/toyota/auris/ok
diff --git a/CAN-binder/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests b/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests
index b2585120..b2585120 100644
--- a/CAN-binder/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests
+++ b/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests
diff --git a/CAN-binder/can_samples/toyota/auris/turnleft b/can_samples/toyota/auris/turnleft
index b82a7c39..b82a7c39 100644
--- a/CAN-binder/can_samples/toyota/auris/turnleft
+++ b/can_samples/toyota/auris/turnleft
diff --git a/CAN-binder/can_samples/toyota/auris/turnright b/can_samples/toyota/auris/turnright
index f9192e47..f9192e47 100644
--- a/CAN-binder/can_samples/toyota/auris/turnright
+++ b/can_samples/toyota/auris/turnright
diff --git a/CAN-binder/conf.d/app-templates b/conf.d/app-templates
-Subproject 21ae95d8eb61745ca54fd143e25dba065a817f6
+Subproject 21ae95d8eb61745ca54fd143e25dba065a817f6
diff --git a/CAN-binder/conf.d/config.cmake b/conf.d/config.cmake
index 527cd261..527cd261 100644
--- a/CAN-binder/conf.d/config.cmake
+++ b/conf.d/config.cmake
diff --git a/CAN-binder/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 7e14751d..7e14751d 100644
--- a/CAN-binder/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
diff --git a/docs/2-Installation.md b/docs/2-Installation.md
index a80aa03a..13b2cd61 100644
--- a/docs/2-Installation.md
+++ b/docs/2-Installation.md
@@ -37,10 +37,9 @@ prepare_meta -f iotbzh -o /xdt -l /home/devel/mirror -p /home/devel/share/propri
 source /xdt/sdk/environment-setup-aarch64-agl-linux
 export PATH=$PATH:/xdt/sdk/sysroots/x86_64-aglsdk-linux/usr/bin
 export WD=$(pwd)
-git clone --recursive https://gerrit.automotivelinux.org/gerrit/apps/low-level-can-service
+git clone --recursive https://gerrit.automotivelinux.org/gerrit/apps/low-level-can-service -b Renesas_delivery_Q2
 git clone --recursive https://gerrit.automotivelinux.org/gerrit/apps/low-level-can-generator
-export GENERATOR=${WD}/low-level-can-generator
-cd ${GENERATOR}
+cd ${WD}/low-level-can-generator
 mkdir -p build
 cd build
 cmake -G "Unix Makefiles" ..
@@ -156,7 +155,7 @@ cp ${GENERATOR}/build/application-generated.cpp ../low-can-binding/binding
 ### Installation
 
 ```bash
-cd $WD/low-level-can-service/CAN-binder
+cd $CAN_/CAN-binder
 mkdir build
 cd build
 cmake ..
diff --git a/CAN-binder/examples/basic/generate_example.cpp b/examples/basic/generate_example.cpp
index 24b01df1..24b01df1 100644
--- a/CAN-binder/examples/basic/generate_example.cpp
+++ b/examples/basic/generate_example.cpp
diff --git a/CAN-binder/examples/basic/handlers.cpp b/examples/basic/handlers.cpp
index 4316f15f..4316f15f 100644
--- a/CAN-binder/examples/basic/handlers.cpp
+++ b/examples/basic/handlers.cpp
diff --git a/CAN-binder/examples/basic/signals.json b/examples/basic/signals.json
index 8d9a2d24..8d9a2d24 100644
--- a/CAN-binder/examples/basic/signals.json
+++ b/examples/basic/signals.json
diff --git a/CAN-binder/examples/toyota/configuration-generated.cpp b/examples/toyota/configuration-generated.cpp
index 95b50872..95b50872 100644
--- a/CAN-binder/examples/toyota/configuration-generated.cpp
+++ b/examples/toyota/configuration-generated.cpp
diff --git a/CAN-binder/examples/toyota/signals.json b/examples/toyota/signals.json
index cd089188..cd089188 100644
--- a/CAN-binder/examples/toyota/signals.json
+++ b/examples/toyota/signals.json
diff --git a/CAN-binder/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 995c4e77..995c4e77 100644
--- a/CAN-binder/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
diff --git a/CAN-binder/libs/bitfield-c/.gitignore b/libs/bitfield-c/.gitignore
index 834a305d..834a305d 100644
--- a/CAN-binder/libs/bitfield-c/.gitignore
+++ b/libs/bitfield-c/.gitignore
diff --git a/CAN-binder/libs/bitfield-c/.travis.yml b/libs/bitfield-c/.travis.yml
index 7654abaa..7654abaa 100644
--- a/CAN-binder/libs/bitfield-c/.travis.yml
+++ b/libs/bitfield-c/.travis.yml
diff --git a/CAN-binder/libs/bitfield-c/CHANGELOG.mkd b/libs/bitfield-c/CHANGELOG.mkd
index eea48c06..eea48c06 100644
--- a/CAN-binder/libs/bitfield-c/CHANGELOG.mkd
+++ b/libs/bitfield-c/CHANGELOG.mkd
diff --git a/CAN-binder/libs/bitfield-c/CMakeLists.txt b/libs/bitfield-c/CMakeLists.txt
index d4c91128..d4c91128 100644
--- a/CAN-binder/libs/bitfield-c/CMakeLists.txt
+++ b/libs/bitfield-c/CMakeLists.txt
diff --git a/CAN-binder/libs/bitfield-c/LICENSE b/libs/bitfield-c/LICENSE
index 330d61f4..330d61f4 100644
--- a/CAN-binder/libs/bitfield-c/LICENSE
+++ b/libs/bitfield-c/LICENSE
diff --git a/CAN-binder/libs/bitfield-c/Makefile b/libs/bitfield-c/Makefile
index e93efb47..e93efb47 100644
--- a/CAN-binder/libs/bitfield-c/Makefile
+++ b/libs/bitfield-c/Makefile
diff --git a/CAN-binder/libs/bitfield-c/README.mkd b/libs/bitfield-c/README.mkd
index 439b3dd0..439b3dd0 100644
--- a/CAN-binder/libs/bitfield-c/README.mkd
+++ b/libs/bitfield-c/README.mkd
diff --git a/CAN-binder/libs/bitfield-c/runtests.sh b/libs/bitfield-c/runtests.sh
index 4781636b..4781636b 100644
--- a/CAN-binder/libs/bitfield-c/runtests.sh
+++ b/libs/bitfield-c/runtests.sh
diff --git a/CAN-binder/libs/bitfield-c/src/bitfield/8byte.c b/libs/bitfield-c/src/bitfield/8byte.c
index 9325ed1b..9325ed1b 100644
--- a/CAN-binder/libs/bitfield-c/src/bitfield/8byte.c
+++ b/libs/bitfield-c/src/bitfield/8byte.c
diff --git a/CAN-binder/libs/bitfield-c/src/bitfield/8byte.h b/libs/bitfield-c/src/bitfield/8byte.h
index 04512690..04512690 100644
--- a/CAN-binder/libs/bitfield-c/src/bitfield/8byte.h
+++ b/libs/bitfield-c/src/bitfield/8byte.h
diff --git a/CAN-binder/libs/bitfield-c/src/bitfield/bitarray.c b/libs/bitfield-c/src/bitfield/bitarray.c
index dcb9a08f..dcb9a08f 100644
--- a/CAN-binder/libs/bitfield-c/src/bitfield/bitarray.c
+++ b/libs/bitfield-c/src/bitfield/bitarray.c
diff --git a/CAN-binder/libs/bitfield-c/src/bitfield/bitfield.c b/libs/bitfield-c/src/bitfield/bitfield.c
index 795f0208..795f0208 100644
--- a/CAN-binder/libs/bitfield-c/src/bitfield/bitfield.c
+++ b/libs/bitfield-c/src/bitfield/bitfield.c
diff --git a/CAN-binder/libs/bitfield-c/src/bitfield/bitfield.h b/libs/bitfield-c/src/bitfield/bitfield.h
index df92639a..df92639a 100644
--- a/CAN-binder/libs/bitfield-c/src/bitfield/bitfield.h
+++ b/libs/bitfield-c/src/bitfield/bitfield.h
diff --git a/CAN-binder/libs/bitfield-c/src/canutil/read.c b/libs/bitfield-c/src/canutil/read.c
index d0cbb71a..d0cbb71a 100644
--- a/CAN-binder/libs/bitfield-c/src/canutil/read.c
+++ b/libs/bitfield-c/src/canutil/read.c
diff --git a/CAN-binder/libs/bitfield-c/src/canutil/read.h b/libs/bitfield-c/src/canutil/read.h
index 86fea785..86fea785 100644
--- a/CAN-binder/libs/bitfield-c/src/canutil/read.h
+++ b/libs/bitfield-c/src/canutil/read.h
diff --git a/CAN-binder/libs/bitfield-c/src/canutil/write.c b/libs/bitfield-c/src/canutil/write.c
index 7f3a3e04..7f3a3e04 100644
--- a/CAN-binder/libs/bitfield-c/src/canutil/write.c
+++ b/libs/bitfield-c/src/canutil/write.c
diff --git a/CAN-binder/libs/bitfield-c/src/canutil/write.h b/libs/bitfield-c/src/canutil/write.h
index c2bef20e..c2bef20e 100644
--- a/CAN-binder/libs/bitfield-c/src/canutil/write.h
+++ b/libs/bitfield-c/src/canutil/write.h
diff --git a/CAN-binder/libs/bitfield-c/tests/8byte_tests.c b/libs/bitfield-c/tests/8byte_tests.c
index 64554acc..64554acc 100644
--- a/CAN-binder/libs/bitfield-c/tests/8byte_tests.c
+++ b/libs/bitfield-c/tests/8byte_tests.c
diff --git a/CAN-binder/libs/bitfield-c/tests/bitfield_tests.c b/libs/bitfield-c/tests/bitfield_tests.c
index b8c83b59..b8c83b59 100644
--- a/CAN-binder/libs/bitfield-c/tests/bitfield_tests.c
+++ b/libs/bitfield-c/tests/bitfield_tests.c
diff --git a/CAN-binder/libs/bitfield-c/tests/read_tests.c b/libs/bitfield-c/tests/read_tests.c
index 5008cc52..5008cc52 100644
--- a/CAN-binder/libs/bitfield-c/tests/read_tests.c
+++ b/libs/bitfield-c/tests/read_tests.c
diff --git a/CAN-binder/libs/bitfield-c/tests/write_tests.c b/libs/bitfield-c/tests/write_tests.c
index 4d5d8fc3..4d5d8fc3 100644
--- a/CAN-binder/libs/bitfield-c/tests/write_tests.c
+++ b/libs/bitfield-c/tests/write_tests.c
diff --git a/CAN-binder/libs/ini-config/CMakeLists.txt b/libs/ini-config/CMakeLists.txt
index ceb48259..ceb48259 100644
--- a/CAN-binder/libs/ini-config/CMakeLists.txt
+++ b/libs/ini-config/CMakeLists.txt
diff --git a/CAN-binder/libs/ini-config/ini-config.cpp b/libs/ini-config/ini-config.cpp
index ef3ab25c..ef3ab25c 100644
--- a/CAN-binder/libs/ini-config/ini-config.cpp
+++ b/libs/ini-config/ini-config.cpp
diff --git a/CAN-binder/libs/ini-config/ini-config.hpp b/libs/ini-config/ini-config.hpp
index 4c8cc118..4c8cc118 100644
--- a/CAN-binder/libs/ini-config/ini-config.hpp
+++ b/libs/ini-config/ini-config.hpp
diff --git a/CAN-binder/libs/isotp-c/.gitignore b/libs/isotp-c/.gitignore
index 96a3694f..96a3694f 100644
--- a/CAN-binder/libs/isotp-c/.gitignore
+++ b/libs/isotp-c/.gitignore
diff --git a/CAN-binder/libs/isotp-c/.travis.yml b/libs/isotp-c/.travis.yml
index 31bfdeb3..31bfdeb3 100644
--- a/CAN-binder/libs/isotp-c/.travis.yml
+++ b/libs/isotp-c/.travis.yml
diff --git a/CAN-binder/libs/isotp-c/CHANGELOG.mkd b/libs/isotp-c/CHANGELOG.mkd
index e6fd5cc0..e6fd5cc0 100644
--- a/CAN-binder/libs/isotp-c/CHANGELOG.mkd
+++ b/libs/isotp-c/CHANGELOG.mkd
diff --git a/CAN-binder/libs/isotp-c/CMakeLists.txt b/libs/isotp-c/CMakeLists.txt
index fbb5161f..fbb5161f 100644
--- a/CAN-binder/libs/isotp-c/CMakeLists.txt
+++ b/libs/isotp-c/CMakeLists.txt
diff --git a/CAN-binder/libs/isotp-c/LICENSE b/libs/isotp-c/LICENSE
index 330d61f4..330d61f4 100644
--- a/CAN-binder/libs/isotp-c/LICENSE
+++ b/libs/isotp-c/LICENSE
diff --git a/CAN-binder/libs/isotp-c/Makefile b/libs/isotp-c/Makefile
index 90165ba6..90165ba6 100644
--- a/CAN-binder/libs/isotp-c/Makefile
+++ b/libs/isotp-c/Makefile
diff --git a/CAN-binder/libs/isotp-c/README.mkd b/libs/isotp-c/README.mkd
index 98030483..98030483 100644
--- a/CAN-binder/libs/isotp-c/README.mkd
+++ b/libs/isotp-c/README.mkd
diff --git a/CAN-binder/libs/isotp-c/runtests.sh b/libs/isotp-c/runtests.sh
index 4781636b..4781636b 100644
--- a/CAN-binder/libs/isotp-c/runtests.sh
+++ b/libs/isotp-c/runtests.sh
diff --git a/CAN-binder/libs/isotp-c/src/isotp/isotp.c b/libs/isotp-c/src/isotp/isotp.c
index ce87f1bd..ce87f1bd 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/isotp.c
+++ b/libs/isotp-c/src/isotp/isotp.c
diff --git a/CAN-binder/libs/isotp-c/src/isotp/isotp.h b/libs/isotp-c/src/isotp/isotp.h
index 3a3658c7..3a3658c7 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/isotp.h
+++ b/libs/isotp-c/src/isotp/isotp.h
diff --git a/CAN-binder/libs/isotp-c/src/isotp/isotp_types.h b/libs/isotp-c/src/isotp/isotp_types.h
index 3b7fd26d..3b7fd26d 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/isotp_types.h
+++ b/libs/isotp-c/src/isotp/isotp_types.h
diff --git a/CAN-binder/libs/isotp-c/src/isotp/receive.c b/libs/isotp-c/src/isotp/receive.c
index 35b7a2a6..35b7a2a6 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/receive.c
+++ b/libs/isotp-c/src/isotp/receive.c
diff --git a/CAN-binder/libs/isotp-c/src/isotp/receive.h b/libs/isotp-c/src/isotp/receive.h
index 6788914a..6788914a 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/receive.h
+++ b/libs/isotp-c/src/isotp/receive.h
diff --git a/CAN-binder/libs/isotp-c/src/isotp/send.c b/libs/isotp-c/src/isotp/send.c
index e849bb2c..e849bb2c 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/send.c
+++ b/libs/isotp-c/src/isotp/send.c
diff --git a/CAN-binder/libs/isotp-c/src/isotp/send.h b/libs/isotp-c/src/isotp/send.h
index 1af32668..1af32668 100644
--- a/CAN-binder/libs/isotp-c/src/isotp/send.h
+++ b/libs/isotp-c/src/isotp/send.h
diff --git a/CAN-binder/libs/isotp-c/tests/common.c b/libs/isotp-c/tests/common.c
index a9eed39e..a9eed39e 100644
--- a/CAN-binder/libs/isotp-c/tests/common.c
+++ b/libs/isotp-c/tests/common.c
diff --git a/CAN-binder/libs/isotp-c/tests/test_core.c b/libs/isotp-c/tests/test_core.c
index 73b47af0..73b47af0 100644
--- a/CAN-binder/libs/isotp-c/tests/test_core.c
+++ b/libs/isotp-c/tests/test_core.c
diff --git a/CAN-binder/libs/isotp-c/tests/test_receive.c b/libs/isotp-c/tests/test_receive.c
index 607f9061..607f9061 100644
--- a/CAN-binder/libs/isotp-c/tests/test_receive.c
+++ b/libs/isotp-c/tests/test_receive.c
diff --git a/CAN-binder/libs/isotp-c/tests/test_send.c b/libs/isotp-c/tests/test_send.c
index 29cf5dec..29cf5dec 100644
--- a/CAN-binder/libs/isotp-c/tests/test_send.c
+++ b/libs/isotp-c/tests/test_send.c
diff --git a/CAN-binder/libs/nanopb/.gitignore b/libs/nanopb/.gitignore
index 3bb09db1..3bb09db1 100644
--- a/CAN-binder/libs/nanopb/.gitignore
+++ b/libs/nanopb/.gitignore
diff --git a/CAN-binder/libs/nanopb/.travis.yml b/libs/nanopb/.travis.yml
index 2e77e7c0..2e77e7c0 100644
--- a/CAN-binder/libs/nanopb/.travis.yml
+++ b/libs/nanopb/.travis.yml
diff --git a/CAN-binder/libs/nanopb/AUTHORS b/libs/nanopb/AUTHORS
index 7618ff77..7618ff77 100644
--- a/CAN-binder/libs/nanopb/AUTHORS
+++ b/libs/nanopb/AUTHORS
diff --git a/CAN-binder/libs/nanopb/BUILD b/libs/nanopb/BUILD
index f9fc57f5..f9fc57f5 100644
--- a/CAN-binder/libs/nanopb/BUILD
+++ b/libs/nanopb/BUILD
diff --git a/CAN-binder/libs/nanopb/CHANGELOG.txt b/libs/nanopb/CHANGELOG.txt
index 194d6136..194d6136 100644
--- a/CAN-binder/libs/nanopb/CHANGELOG.txt
+++ b/libs/nanopb/CHANGELOG.txt
diff --git a/CAN-binder/libs/nanopb/CONTRIBUTING.md b/libs/nanopb/CONTRIBUTING.md
index 4041bc3c..4041bc3c 100644
--- a/CAN-binder/libs/nanopb/CONTRIBUTING.md
+++ b/libs/nanopb/CONTRIBUTING.md
diff --git a/CAN-binder/libs/nanopb/LICENSE.txt b/libs/nanopb/LICENSE.txt
index d11c9af1..d11c9af1 100644
--- a/CAN-binder/libs/nanopb/LICENSE.txt
+++ b/libs/nanopb/LICENSE.txt
diff --git a/CAN-binder/libs/nanopb/README.md b/libs/nanopb/README.md
index 07860f06..07860f06 100644
--- a/CAN-binder/libs/nanopb/README.md
+++ b/libs/nanopb/README.md
diff --git a/CAN-binder/libs/nanopb/docs/Makefile b/libs/nanopb/docs/Makefile
index 0dbd97cf..0dbd97cf 100644
--- a/CAN-binder/libs/nanopb/docs/Makefile
+++ b/libs/nanopb/docs/Makefile
diff --git a/CAN-binder/libs/nanopb/docs/concepts.rst b/libs/nanopb/docs/concepts.rst
index 2e0d3f9b..2e0d3f9b 100644
--- a/CAN-binder/libs/nanopb/docs/concepts.rst
+++ b/libs/nanopb/docs/concepts.rst
diff --git a/CAN-binder/libs/nanopb/docs/generator_flow.svg b/libs/nanopb/docs/generator_flow.svg
index e30277a7..e30277a7 100644
--- a/CAN-binder/libs/nanopb/docs/generator_flow.svg
+++ b/libs/nanopb/docs/generator_flow.svg
diff --git a/CAN-binder/libs/nanopb/docs/index.rst b/libs/nanopb/docs/index.rst
index afc7ee4f..afc7ee4f 100644
--- a/CAN-binder/libs/nanopb/docs/index.rst
+++ b/libs/nanopb/docs/index.rst
diff --git a/CAN-binder/libs/nanopb/docs/logo/logo.png b/libs/nanopb/docs/logo/logo.png
index 0d9534fa..0d9534fa 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo.png
+++ b/libs/nanopb/docs/logo/logo.png
diff --git a/CAN-binder/libs/nanopb/docs/logo/logo.svg b/libs/nanopb/docs/logo/logo.svg
index 91ab28b6..91ab28b6 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo.svg
+++ b/libs/nanopb/docs/logo/logo.svg
diff --git a/CAN-binder/libs/nanopb/docs/logo/logo16px.png b/libs/nanopb/docs/logo/logo16px.png
index 8db0e2ef..8db0e2ef 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo16px.png
+++ b/libs/nanopb/docs/logo/logo16px.png
diff --git a/CAN-binder/libs/nanopb/docs/logo/logo48px.png b/libs/nanopb/docs/logo/logo48px.png
index b598c011..b598c011 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo48px.png
+++ b/libs/nanopb/docs/logo/logo48px.png
diff --git a/CAN-binder/libs/nanopb/docs/lsr.css b/libs/nanopb/docs/lsr.css
index 429bce51..429bce51 100644
--- a/CAN-binder/libs/nanopb/docs/lsr.css
+++ b/libs/nanopb/docs/lsr.css
diff --git a/CAN-binder/libs/nanopb/docs/menu.rst b/libs/nanopb/docs/menu.rst
index 2c110def..2c110def 100644
--- a/CAN-binder/libs/nanopb/docs/menu.rst
+++ b/libs/nanopb/docs/menu.rst
diff --git a/CAN-binder/libs/nanopb/docs/migration.rst b/libs/nanopb/docs/migration.rst
index d6b32b53..d6b32b53 100644
--- a/CAN-binder/libs/nanopb/docs/migration.rst
+++ b/libs/nanopb/docs/migration.rst
diff --git a/CAN-binder/libs/nanopb/docs/reference.rst b/libs/nanopb/docs/reference.rst
index e59a0c94..e59a0c94 100644
--- a/CAN-binder/libs/nanopb/docs/reference.rst
+++ b/libs/nanopb/docs/reference.rst
diff --git a/CAN-binder/libs/nanopb/docs/security.rst b/libs/nanopb/docs/security.rst
index d8546122..d8546122 100644
--- a/CAN-binder/libs/nanopb/docs/security.rst
+++ b/libs/nanopb/docs/security.rst
diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/CMakeLists.txt b/libs/nanopb/examples/cmake_simple/CMakeLists.txt
index e5f33a02..e5f33a02 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/CMakeLists.txt
+++ b/libs/nanopb/examples/cmake_simple/CMakeLists.txt
diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/README.txt b/libs/nanopb/examples/cmake_simple/README.txt
index aa0f3f3a..aa0f3f3a 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/README.txt
+++ b/libs/nanopb/examples/cmake_simple/README.txt
diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.c b/libs/nanopb/examples/cmake_simple/simple.c
index 1f6b1373..1f6b1373 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.c
+++ b/libs/nanopb/examples/cmake_simple/simple.c
diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.proto b/libs/nanopb/examples/cmake_simple/simple.proto
index 5c73a3b2..5c73a3b2 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.proto
+++ b/libs/nanopb/examples/cmake_simple/simple.proto
diff --git a/CAN-binder/libs/nanopb/examples/network_server/Makefile b/libs/nanopb/examples/network_server/Makefile
index 2c7639a1..2c7639a1 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/Makefile
+++ b/libs/nanopb/examples/network_server/Makefile
diff --git a/CAN-binder/libs/nanopb/examples/network_server/README.txt b/libs/nanopb/examples/network_server/README.txt
index 7bdcbed5..7bdcbed5 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/README.txt
+++ b/libs/nanopb/examples/network_server/README.txt
diff --git a/CAN-binder/libs/nanopb/examples/network_server/client.c b/libs/nanopb/examples/network_server/client.c
index 00f6dab8..00f6dab8 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/client.c
+++ b/libs/nanopb/examples/network_server/client.c
diff --git a/CAN-binder/libs/nanopb/examples/network_server/common.c b/libs/nanopb/examples/network_server/common.c
index 04a5aa85..04a5aa85 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/common.c
+++ b/libs/nanopb/examples/network_server/common.c
diff --git a/CAN-binder/libs/nanopb/examples/network_server/common.h b/libs/nanopb/examples/network_server/common.h
index 8dab3b7c..8dab3b7c 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/common.h
+++ b/libs/nanopb/examples/network_server/common.h
diff --git a/CAN-binder/libs/nanopb/examples/network_server/fileproto.options b/libs/nanopb/examples/network_server/fileproto.options
index 29a2ab0e..29a2ab0e 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/fileproto.options
+++ b/libs/nanopb/examples/network_server/fileproto.options
diff --git a/CAN-binder/libs/nanopb/examples/network_server/fileproto.proto b/libs/nanopb/examples/network_server/fileproto.proto
index 5640b8d5..5640b8d5 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/fileproto.proto
+++ b/libs/nanopb/examples/network_server/fileproto.proto
diff --git a/CAN-binder/libs/nanopb/examples/network_server/server.c b/libs/nanopb/examples/network_server/server.c
index 46a5f38d..46a5f38d 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/server.c
+++ b/libs/nanopb/examples/network_server/server.c
diff --git a/CAN-binder/libs/nanopb/examples/simple/Makefile b/libs/nanopb/examples/simple/Makefile
index 970a8650..970a8650 100644
--- a/CAN-binder/libs/nanopb/examples/simple/Makefile
+++ b/libs/nanopb/examples/simple/Makefile
diff --git a/CAN-binder/libs/nanopb/examples/simple/README.txt b/libs/nanopb/examples/simple/README.txt
index ee77bfc7..ee77bfc7 100644
--- a/CAN-binder/libs/nanopb/examples/simple/README.txt
+++ b/libs/nanopb/examples/simple/README.txt
diff --git a/CAN-binder/libs/nanopb/examples/simple/simple.c b/libs/nanopb/examples/simple/simple.c
index 1f6b1373..1f6b1373 100644
--- a/CAN-binder/libs/nanopb/examples/simple/simple.c
+++ b/libs/nanopb/examples/simple/simple.c
diff --git a/CAN-binder/libs/nanopb/examples/simple/simple.proto b/libs/nanopb/examples/simple/simple.proto
index 5c73a3b2..5c73a3b2 100644
--- a/CAN-binder/libs/nanopb/examples/simple/simple.proto
+++ b/libs/nanopb/examples/simple/simple.proto
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/Makefile b/libs/nanopb/examples/using_double_on_avr/Makefile
index 874a64bd..874a64bd 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/Makefile
+++ b/libs/nanopb/examples/using_double_on_avr/Makefile
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/README.txt b/libs/nanopb/examples/using_double_on_avr/README.txt
index d9fcdfc6..d9fcdfc6 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/README.txt
+++ b/libs/nanopb/examples/using_double_on_avr/README.txt
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/decode_double.c b/libs/nanopb/examples/using_double_on_avr/decode_double.c
index 5802eca7..5802eca7 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/decode_double.c
+++ b/libs/nanopb/examples/using_double_on_avr/decode_double.c
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.c b/libs/nanopb/examples/using_double_on_avr/double_conversion.c
index cf79b9a0..cf79b9a0 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.c
+++ b/libs/nanopb/examples/using_double_on_avr/double_conversion.c
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.h b/libs/nanopb/examples/using_double_on_avr/double_conversion.h
index 62b6a8ae..62b6a8ae 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.h
+++ b/libs/nanopb/examples/using_double_on_avr/double_conversion.h
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/doubleproto.proto b/libs/nanopb/examples/using_double_on_avr/doubleproto.proto
index 72d3f9c1..72d3f9c1 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/doubleproto.proto
+++ b/libs/nanopb/examples/using_double_on_avr/doubleproto.proto
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/encode_double.c b/libs/nanopb/examples/using_double_on_avr/encode_double.c
index cd532d46..cd532d46 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/encode_double.c
+++ b/libs/nanopb/examples/using_double_on_avr/encode_double.c
diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/test_conversions.c b/libs/nanopb/examples/using_double_on_avr/test_conversions.c
index 22620a6a..22620a6a 100644
--- a/CAN-binder/libs/nanopb/examples/using_double_on_avr/test_conversions.c
+++ b/libs/nanopb/examples/using_double_on_avr/test_conversions.c
diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/Makefile b/libs/nanopb/examples/using_union_messages/Makefile
index 66396a02..66396a02 100644
--- a/CAN-binder/libs/nanopb/examples/using_union_messages/Makefile
+++ b/libs/nanopb/examples/using_union_messages/Makefile
diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/README.txt b/libs/nanopb/examples/using_union_messages/README.txt
index 7a1e75d4..7a1e75d4 100644
--- a/CAN-binder/libs/nanopb/examples/using_union_messages/README.txt
+++ b/libs/nanopb/examples/using_union_messages/README.txt
diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/decode.c b/libs/nanopb/examples/using_union_messages/decode.c
index b9f4af55..b9f4af55 100644
--- a/CAN-binder/libs/nanopb/examples/using_union_messages/decode.c
+++ b/libs/nanopb/examples/using_union_messages/decode.c
diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/encode.c b/libs/nanopb/examples/using_union_messages/encode.c
index e124bf91..e124bf91 100644
--- a/CAN-binder/libs/nanopb/examples/using_union_messages/encode.c
+++ b/libs/nanopb/examples/using_union_messages/encode.c
diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/unionproto.proto b/libs/nanopb/examples/using_union_messages/unionproto.proto
index 209df0d2..209df0d2 100644
--- a/CAN-binder/libs/nanopb/examples/using_union_messages/unionproto.proto
+++ b/libs/nanopb/examples/using_union_messages/unionproto.proto
diff --git a/CAN-binder/libs/nanopb/extra/FindNanopb.cmake b/libs/nanopb/extra/FindNanopb.cmake
index 9afb21d0..9afb21d0 100644
--- a/CAN-binder/libs/nanopb/extra/FindNanopb.cmake
+++ b/libs/nanopb/extra/FindNanopb.cmake
diff --git a/CAN-binder/libs/nanopb/extra/nanopb-config-version.cmake.in b/libs/nanopb/extra/nanopb-config-version.cmake.in
index f9292a83..f9292a83 100644
--- a/CAN-binder/libs/nanopb/extra/nanopb-config-version.cmake.in
+++ b/libs/nanopb/extra/nanopb-config-version.cmake.in
diff --git a/CAN-binder/libs/nanopb/extra/nanopb-config.cmake b/libs/nanopb/extra/nanopb-config.cmake
index 4f726a68..4f726a68 100644
--- a/CAN-binder/libs/nanopb/extra/nanopb-config.cmake
+++ b/libs/nanopb/extra/nanopb-config.cmake
diff --git a/CAN-binder/libs/nanopb/extra/nanopb.mk b/libs/nanopb/extra/nanopb.mk
index 5c2cff56..5c2cff56 100644
--- a/CAN-binder/libs/nanopb/extra/nanopb.mk
+++ b/libs/nanopb/extra/nanopb.mk
diff --git a/CAN-binder/libs/nanopb/extra/pb_syshdr.h b/libs/nanopb/extra/pb_syshdr.h
index 55d06a3a..55d06a3a 100644
--- a/CAN-binder/libs/nanopb/extra/pb_syshdr.h
+++ b/libs/nanopb/extra/pb_syshdr.h
diff --git a/CAN-binder/libs/nanopb/generator/nanopb/options.proto b/libs/nanopb/generator/nanopb/options.proto
index f08e53d1..f08e53d1 100644
--- a/CAN-binder/libs/nanopb/generator/nanopb/options.proto
+++ b/libs/nanopb/generator/nanopb/options.proto
diff --git a/CAN-binder/libs/nanopb/generator/nanopb_generator.py b/libs/nanopb/generator/nanopb_generator.py
index 42669ace..42669ace 100755
--- a/CAN-binder/libs/nanopb/generator/nanopb_generator.py
+++ b/libs/nanopb/generator/nanopb_generator.py
diff --git a/CAN-binder/libs/nanopb/generator/proto/Makefile b/libs/nanopb/generator/proto/Makefile
index 89bfe528..89bfe528 100644
--- a/CAN-binder/libs/nanopb/generator/proto/Makefile
+++ b/libs/nanopb/generator/proto/Makefile
diff --git a/CAN-binder/libs/nanopb/generator/proto/__init__.py b/libs/nanopb/generator/proto/__init__.py
index e69de29b..e69de29b 100644
--- a/CAN-binder/libs/nanopb/generator/proto/__init__.py
+++ b/libs/nanopb/generator/proto/__init__.py
diff --git a/CAN-binder/libs/nanopb/generator/proto/google/protobuf/descriptor.proto b/libs/nanopb/generator/proto/google/protobuf/descriptor.proto
index e17c0cc8..e17c0cc8 100644
--- a/CAN-binder/libs/nanopb/generator/proto/google/protobuf/descriptor.proto
+++ b/libs/nanopb/generator/proto/google/protobuf/descriptor.proto
diff --git a/CAN-binder/libs/nanopb/generator/proto/nanopb.proto b/libs/nanopb/generator/proto/nanopb.proto
index e4c1da79..e4c1da79 100644
--- a/CAN-binder/libs/nanopb/generator/proto/nanopb.proto
+++ b/libs/nanopb/generator/proto/nanopb.proto
diff --git a/CAN-binder/libs/nanopb/generator/proto/plugin.proto b/libs/nanopb/generator/proto/plugin.proto
index e627289b..e627289b 100644
--- a/CAN-binder/libs/nanopb/generator/proto/plugin.proto
+++ b/libs/nanopb/generator/proto/plugin.proto
diff --git a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb b/libs/nanopb/generator/protoc-gen-nanopb
index 471a620b..471a620b 100755
--- a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb
+++ b/libs/nanopb/generator/protoc-gen-nanopb
diff --git a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb.bat b/libs/nanopb/generator/protoc-gen-nanopb.bat
index e6cf187f..e6cf187f 100644
--- a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb.bat
+++ b/libs/nanopb/generator/protoc-gen-nanopb.bat
diff --git a/CAN-binder/libs/nanopb/library.json b/libs/nanopb/library.json
index 8e963f34..8e963f34 100644
--- a/CAN-binder/libs/nanopb/library.json
+++ b/libs/nanopb/library.json
diff --git a/CAN-binder/libs/nanopb/pb.h b/libs/nanopb/pb.h
index c7e6bc67..c7e6bc67 100644
--- a/CAN-binder/libs/nanopb/pb.h
+++ b/libs/nanopb/pb.h
diff --git a/CAN-binder/libs/nanopb/pb_common.c b/libs/nanopb/pb_common.c
index 4fb7186b..4fb7186b 100644
--- a/CAN-binder/libs/nanopb/pb_common.c
+++ b/libs/nanopb/pb_common.c
diff --git a/CAN-binder/libs/nanopb/pb_common.h b/libs/nanopb/pb_common.h
index 60b3d374..60b3d374 100644
--- a/CAN-binder/libs/nanopb/pb_common.h
+++ b/libs/nanopb/pb_common.h
diff --git a/CAN-binder/libs/nanopb/pb_decode.c b/libs/nanopb/pb_decode.c
index 06d766af..06d766af 100644
--- a/CAN-binder/libs/nanopb/pb_decode.c
+++ b/libs/nanopb/pb_decode.c
diff --git a/CAN-binder/libs/nanopb/pb_decode.h b/libs/nanopb/pb_decode.h
index a426bdd7..a426bdd7 100644
--- a/CAN-binder/libs/nanopb/pb_decode.h
+++ b/libs/nanopb/pb_decode.h
diff --git a/CAN-binder/libs/nanopb/pb_encode.c b/libs/nanopb/pb_encode.c
index 05d691df..05d691df 100644
--- a/CAN-binder/libs/nanopb/pb_encode.c
+++ b/libs/nanopb/pb_encode.c
diff --git a/CAN-binder/libs/nanopb/pb_encode.h b/libs/nanopb/pb_encode.h
index d9909fb0..d9909fb0 100644
--- a/CAN-binder/libs/nanopb/pb_encode.h
+++ b/libs/nanopb/pb_encode.h
diff --git a/CAN-binder/libs/nanopb/tests/Makefile b/libs/nanopb/tests/Makefile
index cee6bf67..cee6bf67 100644
--- a/CAN-binder/libs/nanopb/tests/Makefile
+++ b/libs/nanopb/tests/Makefile
diff --git a/CAN-binder/libs/nanopb/tests/SConstruct b/libs/nanopb/tests/SConstruct
index ae79f710..ae79f710 100644
--- a/CAN-binder/libs/nanopb/tests/SConstruct
+++ b/libs/nanopb/tests/SConstruct
diff --git a/CAN-binder/libs/nanopb/tests/alltypes/SConscript b/libs/nanopb/tests/alltypes/SConscript
index 6c6238c6..6c6238c6 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/SConscript
+++ b/libs/nanopb/tests/alltypes/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.options b/libs/nanopb/tests/alltypes/alltypes.options
index 0d5ab12b..0d5ab12b 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.options
+++ b/libs/nanopb/tests/alltypes/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.proto b/libs/nanopb/tests/alltypes/alltypes.proto
index b2250c00..b2250c00 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.proto
+++ b/libs/nanopb/tests/alltypes/alltypes.proto
diff --git a/CAN-binder/libs/nanopb/tests/alltypes/decode_alltypes.c b/libs/nanopb/tests/alltypes/decode_alltypes.c
index 2e609e56..2e609e56 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/decode_alltypes.c
+++ b/libs/nanopb/tests/alltypes/decode_alltypes.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes/encode_alltypes.c b/libs/nanopb/tests/alltypes/encode_alltypes.c
index 1b863555..1b863555 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/encode_alltypes.c
+++ b/libs/nanopb/tests/alltypes/encode_alltypes.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/SConscript b/libs/nanopb/tests/alltypes_callback/SConscript
index 8be53908..8be53908 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_callback/SConscript
+++ b/libs/nanopb/tests/alltypes_callback/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/alltypes.options b/libs/nanopb/tests/alltypes_callback/alltypes.options
index 74d7a9c0..74d7a9c0 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_callback/alltypes.options
+++ b/libs/nanopb/tests/alltypes_callback/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c b/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c
index 576ce307..576ce307 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c
+++ b/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c b/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c
index b206783b..b206783b 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c
+++ b/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/SConscript b/libs/nanopb/tests/alltypes_pointer/SConscript
index b095ae03..b095ae03 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_pointer/SConscript
+++ b/libs/nanopb/tests/alltypes_pointer/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/alltypes.options b/libs/nanopb/tests/alltypes_pointer/alltypes.options
index 8699fe27..8699fe27 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_pointer/alltypes.options
+++ b/libs/nanopb/tests/alltypes_pointer/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c b/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c
index 4ee6f8bf..4ee6f8bf 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c
+++ b/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c b/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c
index a39af6fa..a39af6fa 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c
+++ b/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/SConscript b/libs/nanopb/tests/alltypes_proto3/SConscript
index c0b2fc1b..c0b2fc1b 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/SConscript
+++ b/libs/nanopb/tests/alltypes_proto3/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.options b/libs/nanopb/tests/alltypes_proto3/alltypes.options
index 78dd08d1..78dd08d1 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.options
+++ b/libs/nanopb/tests/alltypes_proto3/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.proto b/libs/nanopb/tests/alltypes_proto3/alltypes.proto
index f66109ec..f66109ec 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.proto
+++ b/libs/nanopb/tests/alltypes_proto3/alltypes.proto
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c b/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c
index 51c1c41e..51c1c41e 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c
+++ b/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c b/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c
index 1da06688..1da06688 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c
+++ b/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/SConscript b/libs/nanopb/tests/alltypes_proto3_callback/SConscript
index 183a138a..183a138a 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/SConscript
+++ b/libs/nanopb/tests/alltypes_proto3_callback/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options b/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options
index 74d7a9c0..74d7a9c0 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options
+++ b/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c b/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c
index 2b3c2f32..2b3c2f32 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c
+++ b/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c b/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c
index 8c7bdd66..8c7bdd66 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c
+++ b/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c
diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/SConscript b/libs/nanopb/tests/anonymous_oneof/SConscript
index 10672287..10672287 100644
--- a/CAN-binder/libs/nanopb/tests/anonymous_oneof/SConscript
+++ b/libs/nanopb/tests/anonymous_oneof/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/decode_oneof.c b/libs/nanopb/tests/anonymous_oneof/decode_oneof.c
index 0f774dbc..0f774dbc 100644
--- a/CAN-binder/libs/nanopb/tests/anonymous_oneof/decode_oneof.c
+++ b/libs/nanopb/tests/anonymous_oneof/decode_oneof.c
diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/oneof.proto b/libs/nanopb/tests/anonymous_oneof/oneof.proto
index d56285c0..d56285c0 100644
--- a/CAN-binder/libs/nanopb/tests/anonymous_oneof/oneof.proto
+++ b/libs/nanopb/tests/anonymous_oneof/oneof.proto
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/SConscript b/libs/nanopb/tests/backwards_compatibility/SConscript
index 81b03182..81b03182 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/SConscript
+++ b/libs/nanopb/tests/backwards_compatibility/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c
index 7311fd45..7311fd45 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c
+++ b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h
index 4e0a63be..4e0a63be 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h
+++ b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options
index b31e3cf0..b31e3cf0 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options
+++ b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto
index f5bc35ce..f5bc35ce 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto
+++ b/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/decode_legacy.c b/libs/nanopb/tests/backwards_compatibility/decode_legacy.c
index 5f5b6bbe..5f5b6bbe 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/decode_legacy.c
+++ b/libs/nanopb/tests/backwards_compatibility/decode_legacy.c
diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/encode_legacy.c b/libs/nanopb/tests/backwards_compatibility/encode_legacy.c
index 5c9d41b3..5c9d41b3 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/encode_legacy.c
+++ b/libs/nanopb/tests/backwards_compatibility/encode_legacy.c
diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript b/libs/nanopb/tests/basic_buffer/SConscript
index acaf5ffa..acaf5ffa 100644
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript
+++ b/libs/nanopb/tests/basic_buffer/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c b/libs/nanopb/tests/basic_buffer/decode_buffer.c
index 291d164c..291d164c 100644
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c
+++ b/libs/nanopb/tests/basic_buffer/decode_buffer.c
diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c b/libs/nanopb/tests/basic_buffer/encode_buffer.c
index c412c14e..c412c14e 100644
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c
+++ b/libs/nanopb/tests/basic_buffer/encode_buffer.c
diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/SConscript b/libs/nanopb/tests/basic_stream/SConscript
index 7d668562..7d668562 100644
--- a/CAN-binder/libs/nanopb/tests/basic_stream/SConscript
+++ b/libs/nanopb/tests/basic_stream/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/decode_stream.c b/libs/nanopb/tests/basic_stream/decode_stream.c
index 798dcc50..798dcc50 100644
--- a/CAN-binder/libs/nanopb/tests/basic_stream/decode_stream.c
+++ b/libs/nanopb/tests/basic_stream/decode_stream.c
diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/encode_stream.c b/libs/nanopb/tests/basic_stream/encode_stream.c
index 7f571c41..7f571c41 100644
--- a/CAN-binder/libs/nanopb/tests/basic_stream/encode_stream.c
+++ b/libs/nanopb/tests/basic_stream/encode_stream.c
diff --git a/CAN-binder/libs/nanopb/tests/buffer_only/SConscript b/libs/nanopb/tests/buffer_only/SConscript
index 55b747b0..55b747b0 100644
--- a/CAN-binder/libs/nanopb/tests/buffer_only/SConscript
+++ b/libs/nanopb/tests/buffer_only/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/callbacks/SConscript b/libs/nanopb/tests/callbacks/SConscript
index 44521439..44521439 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/SConscript
+++ b/libs/nanopb/tests/callbacks/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/callbacks/callbacks.proto b/libs/nanopb/tests/callbacks/callbacks.proto
index 96ac744d..96ac744d 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/callbacks.proto
+++ b/libs/nanopb/tests/callbacks/callbacks.proto
diff --git a/CAN-binder/libs/nanopb/tests/callbacks/decode_callbacks.c b/libs/nanopb/tests/callbacks/decode_callbacks.c
index 45724d0b..45724d0b 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/decode_callbacks.c
+++ b/libs/nanopb/tests/callbacks/decode_callbacks.c
diff --git a/CAN-binder/libs/nanopb/tests/callbacks/encode_callbacks.c b/libs/nanopb/tests/callbacks/encode_callbacks.c
index 6cb67b1e..6cb67b1e 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/encode_callbacks.c
+++ b/libs/nanopb/tests/callbacks/encode_callbacks.c
diff --git a/CAN-binder/libs/nanopb/tests/common/SConscript b/libs/nanopb/tests/common/SConscript
index 05e2f852..05e2f852 100644
--- a/CAN-binder/libs/nanopb/tests/common/SConscript
+++ b/libs/nanopb/tests/common/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.c b/libs/nanopb/tests/common/malloc_wrappers.c
index ad69f1ce..ad69f1ce 100644
--- a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.c
+++ b/libs/nanopb/tests/common/malloc_wrappers.c
diff --git a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.h b/libs/nanopb/tests/common/malloc_wrappers.h
index 7eec7952..7eec7952 100644
--- a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.h
+++ b/libs/nanopb/tests/common/malloc_wrappers.h
diff --git a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers_syshdr.h b/libs/nanopb/tests/common/malloc_wrappers_syshdr.h
index d295d9ed..d295d9ed 100644
--- a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers_syshdr.h
+++ b/libs/nanopb/tests/common/malloc_wrappers_syshdr.h
diff --git a/CAN-binder/libs/nanopb/tests/common/person.proto b/libs/nanopb/tests/common/person.proto
index becefdf3..becefdf3 100644
--- a/CAN-binder/libs/nanopb/tests/common/person.proto
+++ b/libs/nanopb/tests/common/person.proto
diff --git a/CAN-binder/libs/nanopb/tests/common/test_helpers.h b/libs/nanopb/tests/common/test_helpers.h
index f77760a5..f77760a5 100644
--- a/CAN-binder/libs/nanopb/tests/common/test_helpers.h
+++ b/libs/nanopb/tests/common/test_helpers.h
diff --git a/CAN-binder/libs/nanopb/tests/common/unittestproto.proto b/libs/nanopb/tests/common/unittestproto.proto
index 23b5b97f..23b5b97f 100644
--- a/CAN-binder/libs/nanopb/tests/common/unittestproto.proto
+++ b/libs/nanopb/tests/common/unittestproto.proto
diff --git a/CAN-binder/libs/nanopb/tests/common/unittests.h b/libs/nanopb/tests/common/unittests.h
index c2b470ad..c2b470ad 100644
--- a/CAN-binder/libs/nanopb/tests/common/unittests.h
+++ b/libs/nanopb/tests/common/unittests.h
diff --git a/CAN-binder/libs/nanopb/tests/cxx_main_program/SConscript b/libs/nanopb/tests/cxx_main_program/SConscript
index edb88127..edb88127 100644
--- a/CAN-binder/libs/nanopb/tests/cxx_main_program/SConscript
+++ b/libs/nanopb/tests/cxx_main_program/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/SConscript b/libs/nanopb/tests/cyclic_messages/SConscript
index c782001c..c782001c 100644
--- a/CAN-binder/libs/nanopb/tests/cyclic_messages/SConscript
+++ b/libs/nanopb/tests/cyclic_messages/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic.proto b/libs/nanopb/tests/cyclic_messages/cyclic.proto
index 8cab0b14..8cab0b14 100644
--- a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic.proto
+++ b/libs/nanopb/tests/cyclic_messages/cyclic.proto
diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic_callback.options b/libs/nanopb/tests/cyclic_messages/cyclic_callback.options
index fd4e1e1c..fd4e1e1c 100644
--- a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic_callback.options
+++ b/libs/nanopb/tests/cyclic_messages/cyclic_callback.options
diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c b/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c
index 7f67e70c..7f67e70c 100644
--- a/CAN-binder/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c
+++ b/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c
diff --git a/CAN-binder/libs/nanopb/tests/decode_unittests/SConscript b/libs/nanopb/tests/decode_unittests/SConscript
index 369b9dc7..369b9dc7 100644
--- a/CAN-binder/libs/nanopb/tests/decode_unittests/SConscript
+++ b/libs/nanopb/tests/decode_unittests/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/decode_unittests/decode_unittests.c b/libs/nanopb/tests/decode_unittests/decode_unittests.c
index a6f5c17e..a6f5c17e 100644
--- a/CAN-binder/libs/nanopb/tests/decode_unittests/decode_unittests.c
+++ b/libs/nanopb/tests/decode_unittests/decode_unittests.c
diff --git a/CAN-binder/libs/nanopb/tests/encode_unittests/SConscript b/libs/nanopb/tests/encode_unittests/SConscript
index bf6d1404..bf6d1404 100644
--- a/CAN-binder/libs/nanopb/tests/encode_unittests/SConscript
+++ b/libs/nanopb/tests/encode_unittests/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/encode_unittests/encode_unittests.c b/libs/nanopb/tests/encode_unittests/encode_unittests.c
index 583af5c6..583af5c6 100644
--- a/CAN-binder/libs/nanopb/tests/encode_unittests/encode_unittests.c
+++ b/libs/nanopb/tests/encode_unittests/encode_unittests.c
diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/SConscript b/libs/nanopb/tests/enum_sizes/SConscript
index 048592ed..048592ed 100644
--- a/CAN-binder/libs/nanopb/tests/enum_sizes/SConscript
+++ b/libs/nanopb/tests/enum_sizes/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes.proto b/libs/nanopb/tests/enum_sizes/enumsizes.proto
index a85d4160..a85d4160 100644
--- a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes.proto
+++ b/libs/nanopb/tests/enum_sizes/enumsizes.proto
diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c b/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c
index 5606895a..5606895a 100644
--- a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c
+++ b/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c
diff --git a/CAN-binder/libs/nanopb/tests/enum_to_string/SConscript b/libs/nanopb/tests/enum_to_string/SConscript
index e86fcca0..e86fcca0 100644
--- a/CAN-binder/libs/nanopb/tests/enum_to_string/SConscript
+++ b/libs/nanopb/tests/enum_to_string/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/enum_to_string/enum.proto b/libs/nanopb/tests/enum_to_string/enum.proto
index 07c67363..07c67363 100644
--- a/CAN-binder/libs/nanopb/tests/enum_to_string/enum.proto
+++ b/libs/nanopb/tests/enum_to_string/enum.proto
diff --git a/CAN-binder/libs/nanopb/tests/enum_to_string/enum_to_string.c b/libs/nanopb/tests/enum_to_string/enum_to_string.c
index c4fb31d4..c4fb31d4 100644
--- a/CAN-binder/libs/nanopb/tests/enum_to_string/enum_to_string.c
+++ b/libs/nanopb/tests/enum_to_string/enum_to_string.c
diff --git a/CAN-binder/libs/nanopb/tests/extensions/SConscript b/libs/nanopb/tests/extensions/SConscript
index a2c87428..a2c87428 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/SConscript
+++ b/libs/nanopb/tests/extensions/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c b/libs/nanopb/tests/extensions/decode_extensions.c
index e4374380..e4374380 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c
+++ b/libs/nanopb/tests/extensions/decode_extensions.c
diff --git a/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c b/libs/nanopb/tests/extensions/encode_extensions.c
index 00745826..00745826 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c
+++ b/libs/nanopb/tests/extensions/encode_extensions.c
diff --git a/CAN-binder/libs/nanopb/tests/extensions/extensions.options b/libs/nanopb/tests/extensions/extensions.options
index a5cd61dd..a5cd61dd 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/extensions.options
+++ b/libs/nanopb/tests/extensions/extensions.options
diff --git a/CAN-binder/libs/nanopb/tests/extensions/extensions.proto b/libs/nanopb/tests/extensions/extensions.proto
index fcd5b43b..fcd5b43b 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/extensions.proto
+++ b/libs/nanopb/tests/extensions/extensions.proto
diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/SConscript b/libs/nanopb/tests/extra_fields/SConscript
index 75ac5c5e..75ac5c5e 100644
--- a/CAN-binder/libs/nanopb/tests/extra_fields/SConscript
+++ b/libs/nanopb/tests/extra_fields/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb b/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb
index f9f53941..f9f53941 100644
--- a/CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb
+++ b/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb
diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected b/libs/nanopb/tests/extra_fields/person_with_extra_field.expected
index da9c32df..da9c32df 100644
--- a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected
+++ b/libs/nanopb/tests/extra_fields/person_with_extra_field.expected
diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb b/libs/nanopb/tests/extra_fields/person_with_extra_field.pb
index ffb303dd..ffb303dd 100644
--- a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb
+++ b/libs/nanopb/tests/extra_fields/person_with_extra_field.pb
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16/SConscript b/libs/nanopb/tests/field_size_16/SConscript
index ffb29c4e..ffb29c4e 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16/SConscript
+++ b/libs/nanopb/tests/field_size_16/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16/alltypes.options b/libs/nanopb/tests/field_size_16/alltypes.options
index 78dd08d1..78dd08d1 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16/alltypes.options
+++ b/libs/nanopb/tests/field_size_16/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16/alltypes.proto b/libs/nanopb/tests/field_size_16/alltypes.proto
index 46ac46af..46ac46af 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16/alltypes.proto
+++ b/libs/nanopb/tests/field_size_16/alltypes.proto
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/SConscript b/libs/nanopb/tests/field_size_16_proto3/SConscript
index 912c0389..912c0389 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/SConscript
+++ b/libs/nanopb/tests/field_size_16_proto3/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.options b/libs/nanopb/tests/field_size_16_proto3/alltypes.options
index edfbe788..edfbe788 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.options
+++ b/libs/nanopb/tests/field_size_16_proto3/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.proto b/libs/nanopb/tests/field_size_16_proto3/alltypes.proto
index f66109ec..f66109ec 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.proto
+++ b/libs/nanopb/tests/field_size_16_proto3/alltypes.proto
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c b/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c
index 6611f8cc..6611f8cc 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c
+++ b/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c
diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c b/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c
index 1da06688..1da06688 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c
+++ b/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c
diff --git a/CAN-binder/libs/nanopb/tests/field_size_32/SConscript b/libs/nanopb/tests/field_size_32/SConscript
index 0b8dc0e3..0b8dc0e3 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_32/SConscript
+++ b/libs/nanopb/tests/field_size_32/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/field_size_32/alltypes.options b/libs/nanopb/tests/field_size_32/alltypes.options
index 0d5ab12b..0d5ab12b 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_32/alltypes.options
+++ b/libs/nanopb/tests/field_size_32/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/field_size_32/alltypes.proto b/libs/nanopb/tests/field_size_32/alltypes.proto
index ac76c8ef..ac76c8ef 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_32/alltypes.proto
+++ b/libs/nanopb/tests/field_size_32/alltypes.proto
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/SConscript b/libs/nanopb/tests/fuzztest/SConscript
index d2fb689c..d2fb689c 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/SConscript
+++ b/libs/nanopb/tests/fuzztest/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_pointer.options b/libs/nanopb/tests/fuzztest/alltypes_pointer.options
index 7e3ad1e5..7e3ad1e5 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_pointer.options
+++ b/libs/nanopb/tests/fuzztest/alltypes_pointer.options
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_static.options b/libs/nanopb/tests/fuzztest/alltypes_static.options
index e197e1df..e197e1df 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_static.options
+++ b/libs/nanopb/tests/fuzztest/alltypes_static.options
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/fuzzstub.c b/libs/nanopb/tests/fuzztest/fuzzstub.c
index ec9e2afe..ec9e2afe 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/fuzzstub.c
+++ b/libs/nanopb/tests/fuzztest/fuzzstub.c
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/fuzztest.c b/libs/nanopb/tests/fuzztest/fuzztest.c
index ee851ec0..ee851ec0 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/fuzztest.c
+++ b/libs/nanopb/tests/fuzztest/fuzztest.c
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/generate_message.c b/libs/nanopb/tests/fuzztest/generate_message.c
index 6e492990..6e492990 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/generate_message.c
+++ b/libs/nanopb/tests/fuzztest/generate_message.c
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/run_radamsa.sh b/libs/nanopb/tests/fuzztest/run_radamsa.sh
index 52cd40a8..52cd40a8 100755
--- a/CAN-binder/libs/nanopb/tests/fuzztest/run_radamsa.sh
+++ b/libs/nanopb/tests/fuzztest/run_radamsa.sh
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample1.pb b/libs/nanopb/tests/fuzztest/sample_data/sample1.pb
index 07527885..07527885 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample1.pb
+++ b/libs/nanopb/tests/fuzztest/sample_data/sample1.pb
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample2.pb b/libs/nanopb/tests/fuzztest/sample_data/sample2.pb
index cc89f91b..cc89f91b 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample2.pb
+++ b/libs/nanopb/tests/fuzztest/sample_data/sample2.pb
diff --git a/CAN-binder/libs/nanopb/tests/inline/SConscript b/libs/nanopb/tests/inline/SConscript
index 34371fda..34371fda 100644
--- a/CAN-binder/libs/nanopb/tests/inline/SConscript
+++ b/libs/nanopb/tests/inline/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/inline/inline.expected b/libs/nanopb/tests/inline/inline.expected
index 593e972b..593e972b 100644
--- a/CAN-binder/libs/nanopb/tests/inline/inline.expected
+++ b/libs/nanopb/tests/inline/inline.expected
diff --git a/CAN-binder/libs/nanopb/tests/inline/inline.proto b/libs/nanopb/tests/inline/inline.proto
index 6e511f0a..6e511f0a 100644
--- a/CAN-binder/libs/nanopb/tests/inline/inline.proto
+++ b/libs/nanopb/tests/inline/inline.proto
diff --git a/CAN-binder/libs/nanopb/tests/inline/inline_unittests.c b/libs/nanopb/tests/inline/inline_unittests.c
index b5834c7e..b5834c7e 100644
--- a/CAN-binder/libs/nanopb/tests/inline/inline_unittests.c
+++ b/libs/nanopb/tests/inline/inline_unittests.c
diff --git a/CAN-binder/libs/nanopb/tests/intsizes/SConscript b/libs/nanopb/tests/intsizes/SConscript
index a90680bc..a90680bc 100644
--- a/CAN-binder/libs/nanopb/tests/intsizes/SConscript
+++ b/libs/nanopb/tests/intsizes/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/intsizes/intsizes.proto b/libs/nanopb/tests/intsizes/intsizes.proto
index 91444d41..91444d41 100644
--- a/CAN-binder/libs/nanopb/tests/intsizes/intsizes.proto
+++ b/libs/nanopb/tests/intsizes/intsizes.proto
diff --git a/CAN-binder/libs/nanopb/tests/intsizes/intsizes_unittests.c b/libs/nanopb/tests/intsizes/intsizes_unittests.c
index 79ef0369..79ef0369 100644
--- a/CAN-binder/libs/nanopb/tests/intsizes/intsizes_unittests.c
+++ b/libs/nanopb/tests/intsizes/intsizes_unittests.c
diff --git a/CAN-binder/libs/nanopb/tests/io_errors/SConscript b/libs/nanopb/tests/io_errors/SConscript
index 60146cc0..60146cc0 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors/SConscript
+++ b/libs/nanopb/tests/io_errors/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/io_errors/alltypes.options b/libs/nanopb/tests/io_errors/alltypes.options
index 0d5ab12b..0d5ab12b 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors/alltypes.options
+++ b/libs/nanopb/tests/io_errors/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/io_errors/io_errors.c b/libs/nanopb/tests/io_errors/io_errors.c
index 76f35b08..76f35b08 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors/io_errors.c
+++ b/libs/nanopb/tests/io_errors/io_errors.c
diff --git a/CAN-binder/libs/nanopb/tests/io_errors_pointers/SConscript b/libs/nanopb/tests/io_errors_pointers/SConscript
index 03727df9..03727df9 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors_pointers/SConscript
+++ b/libs/nanopb/tests/io_errors_pointers/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/io_errors_pointers/alltypes.options b/libs/nanopb/tests/io_errors_pointers/alltypes.options
index 7e3ad1e5..7e3ad1e5 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors_pointers/alltypes.options
+++ b/libs/nanopb/tests/io_errors_pointers/alltypes.options
diff --git a/CAN-binder/libs/nanopb/tests/mem_release/SConscript b/libs/nanopb/tests/mem_release/SConscript
index 6754e285..6754e285 100644
--- a/CAN-binder/libs/nanopb/tests/mem_release/SConscript
+++ b/libs/nanopb/tests/mem_release/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.c b/libs/nanopb/tests/mem_release/mem_release.c
index dc6f87de..dc6f87de 100644
--- a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.c
+++ b/libs/nanopb/tests/mem_release/mem_release.c
diff --git a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto b/libs/nanopb/tests/mem_release/mem_release.proto
index 0816dc22..0816dc22 100644
--- a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto
+++ b/libs/nanopb/tests/mem_release/mem_release.proto
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript b/libs/nanopb/tests/message_sizes/SConscript
index e7524e02..e7524e02 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript
+++ b/libs/nanopb/tests/message_sizes/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c b/libs/nanopb/tests/message_sizes/dummy.c
index 767ad463..767ad463 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c
+++ b/libs/nanopb/tests/message_sizes/dummy.c
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto b/libs/nanopb/tests/message_sizes/messages1.proto
index b66fad71..b66fad71 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto
+++ b/libs/nanopb/tests/message_sizes/messages1.proto
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto b/libs/nanopb/tests/message_sizes/messages2.proto
index 67614080..67614080 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto
+++ b/libs/nanopb/tests/message_sizes/messages2.proto
diff --git a/CAN-binder/libs/nanopb/tests/missing_fields/SConscript b/libs/nanopb/tests/missing_fields/SConscript
index 86ba0833..86ba0833 100644
--- a/CAN-binder/libs/nanopb/tests/missing_fields/SConscript
+++ b/libs/nanopb/tests/missing_fields/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.c b/libs/nanopb/tests/missing_fields/missing_fields.c
index 8aded827..8aded827 100644
--- a/CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.c
+++ b/libs/nanopb/tests/missing_fields/missing_fields.c
diff --git a/CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.proto b/libs/nanopb/tests/missing_fields/missing_fields.proto
index cc5e550b..cc5e550b 100644
--- a/CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.proto
+++ b/libs/nanopb/tests/missing_fields/missing_fields.proto
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript b/libs/nanopb/tests/multiple_files/SConscript
index b1281e17..b1281e17 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript
+++ b/libs/nanopb/tests/multiple_files/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options b/libs/nanopb/tests/multiple_files/multifile1.options
index c44d2669..c44d2669 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options
+++ b/libs/nanopb/tests/multiple_files/multifile1.options
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto b/libs/nanopb/tests/multiple_files/multifile1.proto
index 18f2c672..18f2c672 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto
+++ b/libs/nanopb/tests/multiple_files/multifile1.proto
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto b/libs/nanopb/tests/multiple_files/multifile2.proto
index 4af45fd9..4af45fd9 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto
+++ b/libs/nanopb/tests/multiple_files/multifile2.proto
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto b/libs/nanopb/tests/multiple_files/subdir/multifile2.proto
index 847a9290..847a9290 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto
+++ b/libs/nanopb/tests/multiple_files/subdir/multifile2.proto
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c b/libs/nanopb/tests/multiple_files/test_multiple_files.c
index 70a3e596..70a3e596 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c
+++ b/libs/nanopb/tests/multiple_files/test_multiple_files.c
diff --git a/CAN-binder/libs/nanopb/tests/no_errmsg/SConscript b/libs/nanopb/tests/no_errmsg/SConscript
index 629bfa68..629bfa68 100644
--- a/CAN-binder/libs/nanopb/tests/no_errmsg/SConscript
+++ b/libs/nanopb/tests/no_errmsg/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/no_messages/SConscript b/libs/nanopb/tests/no_messages/SConscript
index 6492e2cf..6492e2cf 100644
--- a/CAN-binder/libs/nanopb/tests/no_messages/SConscript
+++ b/libs/nanopb/tests/no_messages/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/no_messages/no_messages.proto b/libs/nanopb/tests/no_messages/no_messages.proto
index 45bb2e66..45bb2e66 100644
--- a/CAN-binder/libs/nanopb/tests/no_messages/no_messages.proto
+++ b/libs/nanopb/tests/no_messages/no_messages.proto
diff --git a/CAN-binder/libs/nanopb/tests/oneof/SConscript b/libs/nanopb/tests/oneof/SConscript
index 22634fb0..22634fb0 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/SConscript
+++ b/libs/nanopb/tests/oneof/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/oneof/decode_oneof.c b/libs/nanopb/tests/oneof/decode_oneof.c
index 37075cd6..37075cd6 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/decode_oneof.c
+++ b/libs/nanopb/tests/oneof/decode_oneof.c
diff --git a/CAN-binder/libs/nanopb/tests/oneof/encode_oneof.c b/libs/nanopb/tests/oneof/encode_oneof.c
index 913d2d43..913d2d43 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/encode_oneof.c
+++ b/libs/nanopb/tests/oneof/encode_oneof.c
diff --git a/CAN-binder/libs/nanopb/tests/oneof/oneof.proto b/libs/nanopb/tests/oneof/oneof.proto
index b4fe56f2..b4fe56f2 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/oneof.proto
+++ b/libs/nanopb/tests/oneof/oneof.proto
diff --git a/CAN-binder/libs/nanopb/tests/options/SConscript b/libs/nanopb/tests/options/SConscript
index 215e3bd0..215e3bd0 100644
--- a/CAN-binder/libs/nanopb/tests/options/SConscript
+++ b/libs/nanopb/tests/options/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/options/options.expected b/libs/nanopb/tests/options/options.expected
index 9e47e6a4..9e47e6a4 100644
--- a/CAN-binder/libs/nanopb/tests/options/options.expected
+++ b/libs/nanopb/tests/options/options.expected
diff --git a/CAN-binder/libs/nanopb/tests/options/options.proto b/libs/nanopb/tests/options/options.proto
index c6ca5e25..c6ca5e25 100644
--- a/CAN-binder/libs/nanopb/tests/options/options.proto
+++ b/libs/nanopb/tests/options/options.proto
diff --git a/CAN-binder/libs/nanopb/tests/options/proto3_options.expected b/libs/nanopb/tests/options/proto3_options.expected
index cc2f29c0..cc2f29c0 100644
--- a/CAN-binder/libs/nanopb/tests/options/proto3_options.expected
+++ b/libs/nanopb/tests/options/proto3_options.expected
diff --git a/CAN-binder/libs/nanopb/tests/options/proto3_options.proto b/libs/nanopb/tests/options/proto3_options.proto
index 1017f046..1017f046 100644
--- a/CAN-binder/libs/nanopb/tests/options/proto3_options.proto
+++ b/libs/nanopb/tests/options/proto3_options.proto
diff --git a/CAN-binder/libs/nanopb/tests/package_name/SConscript b/libs/nanopb/tests/package_name/SConscript
index 4afc5037..4afc5037 100644
--- a/CAN-binder/libs/nanopb/tests/package_name/SConscript
+++ b/libs/nanopb/tests/package_name/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_118/SConscript b/libs/nanopb/tests/regression/issue_118/SConscript
index 833d9dec..833d9dec 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_118/SConscript
+++ b/libs/nanopb/tests/regression/issue_118/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_118/enumdef.proto b/libs/nanopb/tests/regression/issue_118/enumdef.proto
index 46845bc9..46845bc9 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_118/enumdef.proto
+++ b/libs/nanopb/tests/regression/issue_118/enumdef.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_118/enumuse.proto b/libs/nanopb/tests/regression/issue_118/enumuse.proto
index 4afc4521..4afc4521 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_118/enumuse.proto
+++ b/libs/nanopb/tests/regression/issue_118/enumuse.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/SConscript b/libs/nanopb/tests/regression/issue_125/SConscript
index f2155e63..f2155e63 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_125/SConscript
+++ b/libs/nanopb/tests/regression/issue_125/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.expected b/libs/nanopb/tests/regression/issue_125/extensionbug.expected
index fc213354..fc213354 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.expected
+++ b/libs/nanopb/tests/regression/issue_125/extensionbug.expected
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.options b/libs/nanopb/tests/regression/issue_125/extensionbug.options
index 30b464a4..30b464a4 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.options
+++ b/libs/nanopb/tests/regression/issue_125/extensionbug.options
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.proto b/libs/nanopb/tests/regression/issue_125/extensionbug.proto
index fd1e74f1..fd1e74f1 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.proto
+++ b/libs/nanopb/tests/regression/issue_125/extensionbug.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_141/SConscript b/libs/nanopb/tests/regression/issue_141/SConscript
index b6526bed..b6526bed 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_141/SConscript
+++ b/libs/nanopb/tests/regression/issue_141/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.expected b/libs/nanopb/tests/regression/issue_141/testproto.expected
index 75bc195c..75bc195c 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.expected
+++ b/libs/nanopb/tests/regression/issue_141/testproto.expected
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.proto b/libs/nanopb/tests/regression/issue_141/testproto.proto
index a445c68a..a445c68a 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.proto
+++ b/libs/nanopb/tests/regression/issue_141/testproto.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/SConscript b/libs/nanopb/tests/regression/issue_145/SConscript
index 0b793a7a..0b793a7a 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_145/SConscript
+++ b/libs/nanopb/tests/regression/issue_145/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.expected b/libs/nanopb/tests/regression/issue_145/comments.expected
index 7f874587..7f874587 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.expected
+++ b/libs/nanopb/tests/regression/issue_145/comments.expected
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.options b/libs/nanopb/tests/regression/issue_145/comments.options
index 89959ba2..89959ba2 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.options
+++ b/libs/nanopb/tests/regression/issue_145/comments.options
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.proto b/libs/nanopb/tests/regression/issue_145/comments.proto
index 621779f5..621779f5 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.proto
+++ b/libs/nanopb/tests/regression/issue_145/comments.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_166/SConscript b/libs/nanopb/tests/regression/issue_166/SConscript
index c50b9193..c50b9193 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_166/SConscript
+++ b/libs/nanopb/tests/regression/issue_166/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c b/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c
index 84e1c7de..84e1c7de 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c
+++ b/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_166/enums.proto b/libs/nanopb/tests/regression/issue_166/enums.proto
index 36948044..36948044 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_166/enums.proto
+++ b/libs/nanopb/tests/regression/issue_166/enums.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript b/libs/nanopb/tests/regression/issue_172/SConscript
index 49c919e8..49c919e8 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript
+++ b/libs/nanopb/tests/regression/issue_172/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c b/libs/nanopb/tests/regression/issue_172/msg_size.c
index be45acb4..be45acb4 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c
+++ b/libs/nanopb/tests/regression/issue_172/msg_size.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options b/libs/nanopb/tests/regression/issue_172/submessage/submessage.options
index 12fb1984..12fb1984 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options
+++ b/libs/nanopb/tests/regression/issue_172/submessage/submessage.options
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto b/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto
index ce6804af..ce6804af 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto
+++ b/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto b/libs/nanopb/tests/regression/issue_172/test.proto
index fbd97be5..fbd97be5 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto
+++ b/libs/nanopb/tests/regression/issue_172/test.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_188/SConscript b/libs/nanopb/tests/regression/issue_188/SConscript
index 6bc32712..6bc32712 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_188/SConscript
+++ b/libs/nanopb/tests/regression/issue_188/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_188/oneof.proto b/libs/nanopb/tests/regression/issue_188/oneof.proto
index e37f5c02..e37f5c02 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_188/oneof.proto
+++ b/libs/nanopb/tests/regression/issue_188/oneof.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_195/SConscript b/libs/nanopb/tests/regression/issue_195/SConscript
index 78326d32..78326d32 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_195/SConscript
+++ b/libs/nanopb/tests/regression/issue_195/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_195/test.expected b/libs/nanopb/tests/regression/issue_195/test.expected
index 83ea7ab8..83ea7ab8 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_195/test.expected
+++ b/libs/nanopb/tests/regression/issue_195/test.expected
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_195/test.proto b/libs/nanopb/tests/regression/issue_195/test.proto
index 7a77d69d..7a77d69d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_195/test.proto
+++ b/libs/nanopb/tests/regression/issue_195/test.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_203/SConscript b/libs/nanopb/tests/regression/issue_203/SConscript
index 8b4d6cc7..8b4d6cc7 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_203/SConscript
+++ b/libs/nanopb/tests/regression/issue_203/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_203/file1.proto b/libs/nanopb/tests/regression/issue_203/file1.proto
index dae250b8..dae250b8 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_203/file1.proto
+++ b/libs/nanopb/tests/regression/issue_203/file1.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_203/file2.proto b/libs/nanopb/tests/regression/issue_203/file2.proto
index 513b0f0d..513b0f0d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_203/file2.proto
+++ b/libs/nanopb/tests/regression/issue_203/file2.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_205/SConscript b/libs/nanopb/tests/regression/issue_205/SConscript
index ed8899dd..ed8899dd 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_205/SConscript
+++ b/libs/nanopb/tests/regression/issue_205/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.c b/libs/nanopb/tests/regression/issue_205/size_corruption.c
index 08cef457..08cef457 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.c
+++ b/libs/nanopb/tests/regression/issue_205/size_corruption.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.proto b/libs/nanopb/tests/regression/issue_205/size_corruption.proto
index 6c9c2453..6c9c2453 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.proto
+++ b/libs/nanopb/tests/regression/issue_205/size_corruption.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_227/SConscript b/libs/nanopb/tests/regression/issue_227/SConscript
index 10741240..10741240 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_227/SConscript
+++ b/libs/nanopb/tests/regression/issue_227/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c b/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c
index 17c1d779..17c1d779 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c
+++ b/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto b/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto
index f0269f60..f0269f60 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto
+++ b/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_229/SConscript b/libs/nanopb/tests/regression/issue_229/SConscript
index b0f8376d..b0f8376d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_229/SConscript
+++ b/libs/nanopb/tests/regression/issue_229/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.c b/libs/nanopb/tests/regression/issue_229/multiple_oneof.c
index 902248d0..902248d0 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.c
+++ b/libs/nanopb/tests/regression/issue_229/multiple_oneof.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto b/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto
index 22373e1d..22373e1d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto
+++ b/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_242/SConscript b/libs/nanopb/tests/regression/issue_242/SConscript
index 000063ef..000063ef 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_242/SConscript
+++ b/libs/nanopb/tests/regression/issue_242/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.c b/libs/nanopb/tests/regression/issue_242/zero_value.c
index b3d96b7a..b3d96b7a 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.c
+++ b/libs/nanopb/tests/regression/issue_242/zero_value.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.proto b/libs/nanopb/tests/regression/issue_242/zero_value.proto
index 020a39a5..020a39a5 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.proto
+++ b/libs/nanopb/tests/regression/issue_242/zero_value.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_247/SConscript b/libs/nanopb/tests/regression/issue_247/SConscript
index b41e9f29..b41e9f29 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_247/SConscript
+++ b/libs/nanopb/tests/regression/issue_247/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_247/padding.c b/libs/nanopb/tests/regression/issue_247/padding.c
index 8860179d..8860179d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_247/padding.c
+++ b/libs/nanopb/tests/regression/issue_247/padding.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_247/padding.proto b/libs/nanopb/tests/regression/issue_247/padding.proto
index 20bddac3..20bddac3 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_247/padding.proto
+++ b/libs/nanopb/tests/regression/issue_247/padding.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_249/SConscript b/libs/nanopb/tests/regression/issue_249/SConscript
index ba667129..ba667129 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_249/SConscript
+++ b/libs/nanopb/tests/regression/issue_249/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_249/test.c b/libs/nanopb/tests/regression/issue_249/test.c
index a37180fd..a37180fd 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_249/test.c
+++ b/libs/nanopb/tests/regression/issue_249/test.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_249/test.proto b/libs/nanopb/tests/regression/issue_249/test.proto
index eaa2abde..eaa2abde 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_249/test.proto
+++ b/libs/nanopb/tests/regression/issue_249/test.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_253/SConscript b/libs/nanopb/tests/regression/issue_253/SConscript
index 5a16948c..5a16948c 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_253/SConscript
+++ b/libs/nanopb/tests/regression/issue_253/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.c b/libs/nanopb/tests/regression/issue_253/short_array.c
index 5ed6c3f7..5ed6c3f7 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.c
+++ b/libs/nanopb/tests/regression/issue_253/short_array.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.proto b/libs/nanopb/tests/regression/issue_253/short_array.proto
index 5a5d8a3d..5a5d8a3d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.proto
+++ b/libs/nanopb/tests/regression/issue_253/short_array.proto
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_256/SConscript b/libs/nanopb/tests/regression/issue_256/SConscript
index b2c3e864..b2c3e864 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_256/SConscript
+++ b/libs/nanopb/tests/regression/issue_256/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.c b/libs/nanopb/tests/regression/issue_256/submsg_array.c
index c63bd30a..c63bd30a 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.c
+++ b/libs/nanopb/tests/regression/issue_256/submsg_array.c
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.proto b/libs/nanopb/tests/regression/issue_256/submsg_array.proto
index 4964a05f..4964a05f 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.proto
+++ b/libs/nanopb/tests/regression/issue_256/submsg_array.proto
diff --git a/CAN-binder/libs/nanopb/tests/site_scons/site_init.py b/libs/nanopb/tests/site_scons/site_init.py
index da5f6d65..da5f6d65 100644
--- a/CAN-binder/libs/nanopb/tests/site_scons/site_init.py
+++ b/libs/nanopb/tests/site_scons/site_init.py
diff --git a/CAN-binder/libs/nanopb/tests/site_scons/site_tools/nanopb.py b/libs/nanopb/tests/site_scons/site_tools/nanopb.py
index c72a45d3..c72a45d3 100644
--- a/CAN-binder/libs/nanopb/tests/site_scons/site_tools/nanopb.py
+++ b/libs/nanopb/tests/site_scons/site_tools/nanopb.py
diff --git a/CAN-binder/libs/nanopb/tests/special_characters/SConscript b/libs/nanopb/tests/special_characters/SConscript
index 2309cf2e..2309cf2e 100644
--- a/CAN-binder/libs/nanopb/tests/special_characters/SConscript
+++ b/libs/nanopb/tests/special_characters/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto b/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto
index 26b2cb1b..26b2cb1b 100644
--- a/CAN-binder/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto
+++ b/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto
diff --git a/CAN-binder/libs/nanopb/tests/splint/SConscript b/libs/nanopb/tests/splint/SConscript
index cd4b5b9d..cd4b5b9d 100644
--- a/CAN-binder/libs/nanopb/tests/splint/SConscript
+++ b/libs/nanopb/tests/splint/SConscript
diff --git a/CAN-binder/libs/nanopb/tests/splint/splint.rc b/libs/nanopb/tests/splint/splint.rc
index e47d3c21..e47d3c21 100644
--- a/CAN-binder/libs/nanopb/tests/splint/splint.rc
+++ b/libs/nanopb/tests/splint/splint.rc
diff --git a/CAN-binder/libs/nanopb/tools/make_linux_package.sh b/libs/nanopb/tools/make_linux_package.sh
index aea1c567..aea1c567 100755
--- a/CAN-binder/libs/nanopb/tools/make_linux_package.sh
+++ b/libs/nanopb/tools/make_linux_package.sh
diff --git a/CAN-binder/libs/nanopb/tools/make_mac_package.sh b/libs/nanopb/tools/make_mac_package.sh
index 32bba5cc..32bba5cc 100755
--- a/CAN-binder/libs/nanopb/tools/make_mac_package.sh
+++ b/libs/nanopb/tools/make_mac_package.sh
diff --git a/CAN-binder/libs/nanopb/tools/make_windows_package.sh b/libs/nanopb/tools/make_windows_package.sh
index 72de6f33..72de6f33 100755
--- a/CAN-binder/libs/nanopb/tools/make_windows_package.sh
+++ b/libs/nanopb/tools/make_windows_package.sh
diff --git a/CAN-binder/libs/nanopb/tools/set_version.sh b/libs/nanopb/tools/set_version.sh
index 729ca0d7..729ca0d7 100755
--- a/CAN-binder/libs/nanopb/tools/set_version.sh
+++ b/libs/nanopb/tools/set_version.sh
diff --git a/CAN-binder/libs/openxc-message-format/.gitignore b/libs/openxc-message-format/.gitignore
index b25c15b8..b25c15b8 100644
--- a/CAN-binder/libs/openxc-message-format/.gitignore
+++ b/libs/openxc-message-format/.gitignore
diff --git a/CAN-binder/libs/openxc-message-format/CHANGELOG.md b/libs/openxc-message-format/CHANGELOG.md
index 294826cd..294826cd 100644
--- a/CAN-binder/libs/openxc-message-format/CHANGELOG.md
+++ b/libs/openxc-message-format/CHANGELOG.md
diff --git a/CAN-binder/libs/openxc-message-format/CMakeLists.txt b/libs/openxc-message-format/CMakeLists.txt
index f6964e8a..f6964e8a 100644
--- a/CAN-binder/libs/openxc-message-format/CMakeLists.txt
+++ b/libs/openxc-message-format/CMakeLists.txt
diff --git a/CAN-binder/libs/openxc-message-format/JSON.mkd b/libs/openxc-message-format/JSON.mkd
index d320aad0..d320aad0 100644
--- a/CAN-binder/libs/openxc-message-format/JSON.mkd
+++ b/libs/openxc-message-format/JSON.mkd
diff --git a/CAN-binder/libs/openxc-message-format/LICENSE b/libs/openxc-message-format/LICENSE
index 9a30ce45..9a30ce45 100644
--- a/CAN-binder/libs/openxc-message-format/LICENSE
+++ b/libs/openxc-message-format/LICENSE
diff --git a/CAN-binder/libs/openxc-message-format/Makefile b/libs/openxc-message-format/Makefile
index 7b968e63..7b968e63 100644
--- a/CAN-binder/libs/openxc-message-format/Makefile
+++ b/libs/openxc-message-format/Makefile
diff --git a/CAN-binder/libs/openxc-message-format/README.md b/libs/openxc-message-format/README.md
index 77758b83..77758b83 100644
--- a/CAN-binder/libs/openxc-message-format/README.md
+++ b/libs/openxc-message-format/README.md
diff --git a/CAN-binder/libs/openxc-message-format/benchmark/proto/.gitignore b/libs/openxc-message-format/benchmark/proto/.gitignore
index 0520d7d2..0520d7d2 100644
--- a/CAN-binder/libs/openxc-message-format/benchmark/proto/.gitignore
+++ b/libs/openxc-message-format/benchmark/proto/.gitignore
diff --git a/CAN-binder/libs/openxc-message-format/benchmark/proto/compare_sizes.py b/libs/openxc-message-format/benchmark/proto/compare_sizes.py
index 0ed445fd..0ed445fd 100755
--- a/CAN-binder/libs/openxc-message-format/benchmark/proto/compare_sizes.py
+++ b/libs/openxc-message-format/benchmark/proto/compare_sizes.py
diff --git a/CAN-binder/libs/openxc-message-format/gen/README.mkd b/libs/openxc-message-format/gen/README.mkd
index e607772d..e607772d 100644
--- a/CAN-binder/libs/openxc-message-format/gen/README.mkd
+++ b/libs/openxc-message-format/gen/README.mkd
diff --git a/CAN-binder/libs/openxc-message-format/gen/cpp/openxc.pb b/libs/openxc-message-format/gen/cpp/openxc.pb
index 104c2065..104c2065 100644
--- a/CAN-binder/libs/openxc-message-format/gen/cpp/openxc.pb
+++ b/libs/openxc-message-format/gen/cpp/openxc.pb
diff --git a/CAN-binder/libs/openxc-message-format/gen/cpp/openxc.pb.c b/libs/openxc-message-format/gen/cpp/openxc.pb.c
index 9b90c36b..9b90c36b 100644
--- a/CAN-binder/libs/openxc-message-format/gen/cpp/openxc.pb.c
+++ b/libs/openxc-message-format/gen/cpp/openxc.pb.c
diff --git a/CAN-binder/libs/openxc-message-format/gen/cpp/openxc.pb.h b/libs/openxc-message-format/gen/cpp/openxc.pb.h
index 09735ee7..09735ee7 100644
--- a/CAN-binder/libs/openxc-message-format/gen/cpp/openxc.pb.h
+++ b/libs/openxc-message-format/gen/cpp/openxc.pb.h
diff --git a/CAN-binder/libs/openxc-message-format/gen/java/com/openxc/BinaryMessages.java b/libs/openxc-message-format/gen/java/com/openxc/BinaryMessages.java
index 4fad1d6a..4fad1d6a 100644
--- a/CAN-binder/libs/openxc-message-format/gen/java/com/openxc/BinaryMessages.java
+++ b/libs/openxc-message-format/gen/java/com/openxc/BinaryMessages.java
diff --git a/CAN-binder/libs/openxc-message-format/gen/python/openxc_pb2.py b/libs/openxc-message-format/gen/python/openxc_pb2.py
index cd5ec5f0..cd5ec5f0 100644
--- a/CAN-binder/libs/openxc-message-format/gen/python/openxc_pb2.py
+++ b/libs/openxc-message-format/gen/python/openxc_pb2.py
diff --git a/CAN-binder/libs/openxc-message-format/openxc.options b/libs/openxc-message-format/openxc.options
index 53726fc4..53726fc4 100644
--- a/CAN-binder/libs/openxc-message-format/openxc.options
+++ b/libs/openxc-message-format/openxc.options
diff --git a/CAN-binder/libs/openxc-message-format/openxc.proto b/libs/openxc-message-format/openxc.proto
index db7164ff..db7164ff 100644
--- a/CAN-binder/libs/openxc-message-format/openxc.proto
+++ b/libs/openxc-message-format/openxc.proto
diff --git a/CAN-binder/libs/openxc-message-format/pip-requirements.txt b/libs/openxc-message-format/pip-requirements.txt
index 7f147d92..7f147d92 100644
--- a/CAN-binder/libs/openxc-message-format/pip-requirements.txt
+++ b/libs/openxc-message-format/pip-requirements.txt
diff --git a/CAN-binder/libs/openxc-message-format/script/bootstrap.sh b/libs/openxc-message-format/script/bootstrap.sh
index c0422422..c0422422 100755
--- a/CAN-binder/libs/openxc-message-format/script/bootstrap.sh
+++ b/libs/openxc-message-format/script/bootstrap.sh
diff --git a/CAN-binder/libs/uds-c/.gitignore b/libs/uds-c/.gitignore
index 834a305d..834a305d 100644
--- a/CAN-binder/libs/uds-c/.gitignore
+++ b/libs/uds-c/.gitignore
diff --git a/CAN-binder/libs/uds-c/.travis.yml b/libs/uds-c/.travis.yml
index 31bfdeb3..31bfdeb3 100644
--- a/CAN-binder/libs/uds-c/.travis.yml
+++ b/libs/uds-c/.travis.yml
diff --git a/CAN-binder/libs/uds-c/CHANGELOG.mkd b/libs/uds-c/CHANGELOG.mkd
index 96eaa178..96eaa178 100644
--- a/CAN-binder/libs/uds-c/CHANGELOG.mkd
+++ b/libs/uds-c/CHANGELOG.mkd
diff --git a/CAN-binder/libs/uds-c/CMakeLists.txt b/libs/uds-c/CMakeLists.txt
index 8f78fd6d..8f78fd6d 100644
--- a/CAN-binder/libs/uds-c/CMakeLists.txt
+++ b/libs/uds-c/CMakeLists.txt
diff --git a/CAN-binder/libs/uds-c/LICENSE b/libs/uds-c/LICENSE
index 330d61f4..330d61f4 100644
--- a/CAN-binder/libs/uds-c/LICENSE
+++ b/libs/uds-c/LICENSE
diff --git a/CAN-binder/libs/uds-c/Makefile b/libs/uds-c/Makefile
index 4adf3ceb..4adf3ceb 100644
--- a/CAN-binder/libs/uds-c/Makefile
+++ b/libs/uds-c/Makefile
diff --git a/CAN-binder/libs/uds-c/README.mkd b/libs/uds-c/README.mkd
index aa0d7fd7..aa0d7fd7 100644
--- a/CAN-binder/libs/uds-c/README.mkd
+++ b/libs/uds-c/README.mkd
diff --git a/CAN-binder/libs/uds-c/runtests.sh b/libs/uds-c/runtests.sh
index 4781636b..4781636b 100644
--- a/CAN-binder/libs/uds-c/runtests.sh
+++ b/libs/uds-c/runtests.sh
diff --git a/CAN-binder/libs/uds-c/src/uds/extras.c b/libs/uds-c/src/uds/extras.c
index 2be6bdd8..2be6bdd8 100644
--- a/CAN-binder/libs/uds-c/src/uds/extras.c
+++ b/libs/uds-c/src/uds/extras.c
diff --git a/CAN-binder/libs/uds-c/src/uds/extras.h b/libs/uds-c/src/uds/extras.h
index 126e5d42..126e5d42 100644
--- a/CAN-binder/libs/uds-c/src/uds/extras.h
+++ b/libs/uds-c/src/uds/extras.h
diff --git a/CAN-binder/libs/uds-c/src/uds/uds.c b/libs/uds-c/src/uds/uds.c
index 0114384d..0114384d 100644
--- a/CAN-binder/libs/uds-c/src/uds/uds.c
+++ b/libs/uds-c/src/uds/uds.c
diff --git a/CAN-binder/libs/uds-c/src/uds/uds.h b/libs/uds-c/src/uds/uds.h
index 43058342..43058342 100644
--- a/CAN-binder/libs/uds-c/src/uds/uds.h
+++ b/libs/uds-c/src/uds/uds.h
diff --git a/CAN-binder/libs/uds-c/src/uds/uds_types.h b/libs/uds-c/src/uds/uds_types.h
index 4ebc150c..4ebc150c 100644
--- a/CAN-binder/libs/uds-c/src/uds/uds_types.h
+++ b/libs/uds-c/src/uds/uds_types.h
diff --git a/CAN-binder/libs/uds-c/tests/common.c b/libs/uds-c/tests/common.c
index fd1e4b2c..fd1e4b2c 100644
--- a/CAN-binder/libs/uds-c/tests/common.c
+++ b/libs/uds-c/tests/common.c
diff --git a/CAN-binder/libs/uds-c/tests/test_core.c b/libs/uds-c/tests/test_core.c
index 81200cca..81200cca 100644
--- a/CAN-binder/libs/uds-c/tests/test_core.c
+++ b/libs/uds-c/tests/test_core.c
diff --git a/CAN-binder/low-can-binding/CMakeLists.txt b/low-can-binding/CMakeLists.txt
index cd38fca3..cd38fca3 100644
--- a/CAN-binder/low-can-binding/CMakeLists.txt
+++ b/low-can-binding/CMakeLists.txt
diff --git a/CAN-binder/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp
index 60a21f51..60a21f51 100644
--- a/CAN-binder/low-can-binding/binding/application-generated.cpp
+++ b/low-can-binding/binding/application-generated.cpp
diff --git a/CAN-binder/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp
index 6e6353b8..6e6353b8 100644
--- a/CAN-binder/low-can-binding/binding/application.cpp
+++ b/low-can-binding/binding/application.cpp
diff --git a/CAN-binder/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp
index 5fa64782..5fa64782 100644
--- a/CAN-binder/low-can-binding/binding/application.hpp
+++ b/low-can-binding/binding/application.hpp
diff --git a/CAN-binder/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 97b6d206..97b6d206 100644
--- a/CAN-binder/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
diff --git a/CAN-binder/low-can-binding/binding/low-can-hat.cpp b/low-can-binding/binding/low-can-hat.cpp
index 7113b69a..7113b69a 100644
--- a/CAN-binder/low-can-binding/binding/low-can-hat.cpp
+++ b/low-can-binding/binding/low-can-hat.cpp
diff --git a/CAN-binder/low-can-binding/binding/low-can-hat.hpp b/low-can-binding/binding/low-can-hat.hpp
index cf3d999e..cf3d999e 100644
--- a/CAN-binder/low-can-binding/binding/low-can-hat.hpp
+++ b/low-can-binding/binding/low-can-hat.hpp
diff --git a/CAN-binder/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 5488cc53..5488cc53 100644
--- a/CAN-binder/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
diff --git a/CAN-binder/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp
index 0ad7e3a2..0ad7e3a2 100644
--- a/CAN-binder/low-can-binding/binding/low-can-subscription.hpp
+++ b/low-can-binding/binding/low-can-subscription.hpp
diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index 61673350..61673350 100644
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/low-can-binding/can/can-bus.hpp
index a76d3e87..a76d3e87 100644
--- a/CAN-binder/low-can-binding/can/can-bus.hpp
+++ b/low-can-binding/can/can-bus.hpp
diff --git a/CAN-binder/low-can-binding/can/can-command.hpp b/low-can-binding/can/can-command.hpp
index 4cf20cb5..4cf20cb5 100644
--- a/CAN-binder/low-can-binding/can/can-command.hpp
+++ b/low-can-binding/can/can-command.hpp
diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/low-can-binding/can/can-decoder.cpp
index 61bfe753..61bfe753 100644
--- a/CAN-binder/low-can-binding/can/can-decoder.cpp
+++ b/low-can-binding/can/can-decoder.cpp
diff --git a/CAN-binder/low-can-binding/can/can-decoder.hpp b/low-can-binding/can/can-decoder.hpp
index 7eaa4a72..7eaa4a72 100644
--- a/CAN-binder/low-can-binding/can/can-decoder.hpp
+++ b/low-can-binding/can/can-decoder.hpp
diff --git a/CAN-binder/low-can-binding/can/can-message-definition.cpp b/low-can-binding/can/can-message-definition.cpp
index 28d45fe5..28d45fe5 100644
--- a/CAN-binder/low-can-binding/can/can-message-definition.cpp
+++ b/low-can-binding/can/can-message-definition.cpp
diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/low-can-binding/can/can-message-definition.hpp
index 6d0f17d6..6d0f17d6 100644
--- a/CAN-binder/low-can-binding/can/can-message-definition.hpp
+++ b/low-can-binding/can/can-message-definition.hpp
diff --git a/CAN-binder/low-can-binding/can/can-message-set.cpp b/low-can-binding/can/can-message-set.cpp
index c31dec62..c31dec62 100644
--- a/CAN-binder/low-can-binding/can/can-message-set.cpp
+++ b/low-can-binding/can/can-message-set.cpp
diff --git a/CAN-binder/low-can-binding/can/can-message-set.hpp b/low-can-binding/can/can-message-set.hpp
index 2a7cb53c..2a7cb53c 100644
--- a/CAN-binder/low-can-binding/can/can-message-set.hpp
+++ b/low-can-binding/can/can-message-set.hpp
diff --git a/CAN-binder/low-can-binding/can/can-message.cpp b/low-can-binding/can/can-message.cpp
index 057bc71f..057bc71f 100644
--- a/CAN-binder/low-can-binding/can/can-message.cpp
+++ b/low-can-binding/can/can-message.cpp
diff --git a/CAN-binder/low-can-binding/can/can-message.hpp b/low-can-binding/can/can-message.hpp
index b206ebdb..b206ebdb 100644
--- a/CAN-binder/low-can-binding/can/can-message.hpp
+++ b/low-can-binding/can/can-message.hpp
diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/low-can-binding/can/can-signals.cpp
index fe74115c..fe74115c 100644
--- a/CAN-binder/low-can-binding/can/can-signals.cpp
+++ b/low-can-binding/can/can-signals.cpp
diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/low-can-binding/can/can-signals.hpp
index a56fc8cd..a56fc8cd 100644
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/low-can-binding/can/can-signals.hpp
diff --git a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp b/low-can-binding/diagnostic/active-diagnostic-request.cpp
index f503e0a5..f503e0a5 100644
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
+++ b/low-can-binding/diagnostic/active-diagnostic-request.cpp
diff --git a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp b/low-can-binding/diagnostic/active-diagnostic-request.hpp
index d263a2d2..d263a2d2 100644
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp
+++ b/low-can-binding/diagnostic/active-diagnostic-request.hpp
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp
index 61aa699d..61aa699d 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
+++ b/low-can-binding/diagnostic/diagnostic-manager.cpp
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp b/low-can-binding/diagnostic/diagnostic-manager.hpp
index 05a67c81..05a67c81 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/low-can-binding/diagnostic/diagnostic-manager.hpp
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp b/low-can-binding/diagnostic/diagnostic-message.cpp
index 69ca4e34..69ca4e34 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
+++ b/low-can-binding/diagnostic/diagnostic-message.cpp
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp b/low-can-binding/diagnostic/diagnostic-message.hpp
index 99c48110..99c48110 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
+++ b/low-can-binding/diagnostic/diagnostic-message.hpp
diff --git a/CAN-binder/low-can-binding/utils/config-parser.cpp b/low-can-binding/utils/config-parser.cpp
index 8ccf5bcb..8ccf5bcb 100644
--- a/CAN-binder/low-can-binding/utils/config-parser.cpp
+++ b/low-can-binding/utils/config-parser.cpp
diff --git a/CAN-binder/low-can-binding/utils/config-parser.hpp b/low-can-binding/utils/config-parser.hpp
index 3115e9bd..3115e9bd 100644
--- a/CAN-binder/low-can-binding/utils/config-parser.hpp
+++ b/low-can-binding/utils/config-parser.hpp
diff --git a/CAN-binder/low-can-binding/utils/openxc-utils.cpp b/low-can-binding/utils/openxc-utils.cpp
index f39f4184..f39f4184 100644
--- a/CAN-binder/low-can-binding/utils/openxc-utils.cpp
+++ b/low-can-binding/utils/openxc-utils.cpp
diff --git a/CAN-binder/low-can-binding/utils/openxc-utils.hpp b/low-can-binding/utils/openxc-utils.hpp
index 83d63797..83d63797 100644
--- a/CAN-binder/low-can-binding/utils/openxc-utils.hpp
+++ b/low-can-binding/utils/openxc-utils.hpp
diff --git a/CAN-binder/low-can-binding/utils/signals.cpp b/low-can-binding/utils/signals.cpp
index fbc49044..fbc49044 100644
--- a/CAN-binder/low-can-binding/utils/signals.cpp
+++ b/low-can-binding/utils/signals.cpp
diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/low-can-binding/utils/signals.hpp
index 555c5dd6..555c5dd6 100644
--- a/CAN-binder/low-can-binding/utils/signals.hpp
+++ b/low-can-binding/utils/signals.hpp
diff --git a/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp b/low-can-binding/utils/socketcan-bcm.cpp
index e16b246f..e16b246f 100644
--- a/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp
+++ b/low-can-binding/utils/socketcan-bcm.cpp
diff --git a/CAN-binder/low-can-binding/utils/socketcan-bcm.hpp b/low-can-binding/utils/socketcan-bcm.hpp
index 97f093df..97f093df 100644
--- a/CAN-binder/low-can-binding/utils/socketcan-bcm.hpp
+++ b/low-can-binding/utils/socketcan-bcm.hpp
diff --git a/CAN-binder/low-can-binding/utils/socketcan-raw.cpp b/low-can-binding/utils/socketcan-raw.cpp
index 31965c3d..31965c3d 100644
--- a/CAN-binder/low-can-binding/utils/socketcan-raw.cpp
+++ b/low-can-binding/utils/socketcan-raw.cpp
diff --git a/CAN-binder/low-can-binding/utils/socketcan-raw.hpp b/low-can-binding/utils/socketcan-raw.hpp
index 61672411..61672411 100644
--- a/CAN-binder/low-can-binding/utils/socketcan-raw.hpp
+++ b/low-can-binding/utils/socketcan-raw.hpp
diff --git a/CAN-binder/low-can-binding/utils/socketcan.cpp b/low-can-binding/utils/socketcan.cpp
index 71588a6e..71588a6e 100644
--- a/CAN-binder/low-can-binding/utils/socketcan.cpp
+++ b/low-can-binding/utils/socketcan.cpp
diff --git a/CAN-binder/low-can-binding/utils/socketcan.hpp b/low-can-binding/utils/socketcan.hpp
index 82b797e0..82b797e0 100644
--- a/CAN-binder/low-can-binding/utils/socketcan.hpp
+++ b/low-can-binding/utils/socketcan.hpp
diff --git a/CAN-binder/low-can-binding/utils/timer.cpp b/low-can-binding/utils/timer.cpp
index f3cdd5e7..f3cdd5e7 100644
--- a/CAN-binder/low-can-binding/utils/timer.cpp
+++ b/low-can-binding/utils/timer.cpp
diff --git a/CAN-binder/low-can-binding/utils/timer.hpp b/low-can-binding/utils/timer.hpp
index a667022a..a667022a 100644
--- a/CAN-binder/low-can-binding/utils/timer.hpp
+++ b/low-can-binding/utils/timer.hpp