🔀 Merge branch 'release/2.0.9'

Replace class iterator and const_iterator by using a single template class to reduce code.

.github/CONTRIBUTING.md

@@ -36,7 +36,7 @@ There are currently two files which need to be edited:
    make re2c
    ```
 
-   To run [`re2c`](http://re2c.org) and generate/overwrite file `src/json.hpp` with your changes in file `src/json.hpp.re2c`.
+   To run [`re2c`](http://re2c.org) and generate/overwrite file `src/json.hpp` with your changes in file `src/json.hpp.re2c`. We currently use re2c version 0.16. Please also use this version, because other re2c versions tend to create code that differs a lot from which makes diffs unusable.
 
 
 2. [`test/src/unit.cpp`](https://github.com/nlohmann/json/blob/master/test/unit.cpp) - This contains the [Catch](https://github.com/philsquared/Catch) unit tests which currently cover [100 %](https://coveralls.io/github/nlohmann/json) of the library's code.
@@ -59,10 +59,13 @@ Please understand that I cannot accept pull requests changing only file `src/jso
 
 ## Please don't
 
-- Only make changes to file `src/json.hpp` -- please read the paragraph above and understand why `src/json.hpp.re2c` exists.
+- Please do not only make changes to file `src/json.hpp` -- please read the paragraph above and understand why `src/json.hpp.re2c` exists.
 - The C++11 support varies between different **compilers** and versions. Please note the [list of supported compilers](https://github.com/nlohmann/json/blob/master/README.md#supported-compilers). Some compilers like GCC 4.8 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with `#ifdef`s or other means.
 - Specifically, I am aware of compilation problems with **Microsoft Visual Studio** (there even is an [issue label](https://github.com/nlohmann/json/issues?utf8=✓&q=label%3A%22visual+studio%22+) for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
 - Please refrain from proposing changes that would **break [JSON](http://json.org) conformance**. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
+  - We shall not extend the library to **support comments**. There is quite some [controversy](https://www.reddit.com/r/programming/comments/4v6chu/why_json_doesnt_support_comments_douglas_crockford/) around this topic, and there were quite some [issues](https://github.com/nlohmann/json/issues/376) on this. We believe that JSON is fine without comments.
+  - We do not preserve the **insertion order of object elements**. The [JSON standard](https://tools.ietf.org/html/rfc7159.html) defines objects as "an unordered collection of zero or more name/value pairs". To this end, this library does not preserve insertion order of name/value pairs. (In fact, keys will be traversed in alphabetical order as `std::map` with `std::less` is used by default.) Note this behavior conforms to the standard, and we shall not it to any other order.
+
 - Please do not open pull requests that address **multiple issues**.
 
 ## Wanted

.gitignore

@@ -18,3 +18,5 @@ benchmarks/files/numbers/*.json
 .idea
 cmake-build-debug
 
+
+test/test-*

.travis.yml

@@ -39,7 +39,17 @@ matrix:
         sources: ['ubuntu-toolchain-r-test']
         packages: [g++-4.9, valgrind]
     after_success:
-      - valgrind --error-exitcode=1 --leak-check=full test/json_unit
+      - make check TEST_PREFIX="valgrind --error-exitcode=1 --leak-check=full " TEST_PATTERN=""
+
+  # cLang sanitizer
+
+  #- os: linux
+  #  env:
+  #    - LLVM_VERSION=3.8.1
+  #    - SPECIAL=sanitizer
+  #  compiler: clang
+  #  before_script:
+  #    - make clang_sanitize
 
   # cppcheck
 
@@ -68,9 +78,10 @@ matrix:
       - tar xf lcov_1.11.orig.tar.gz
       - sudo make -C lcov-1.11/ install
       - gem install coveralls-lcov
+      - pip install --user cpp-coveralls
     after_success:
       - make clean
-      - CXXFLAGS="--coverage -g -O0" CPPFLAGS="-DNDEBUG" make
+      - CXXFLAGS="--coverage -g -O0" CPPFLAGS="-DNDEBUG" make json_unit
       - test/json_unit "*"
       - coveralls --build-root test --exclude src/catch.hpp --exclude src/unit-algorithms.cpp --exclude src/unit-allocator.cpp --exclude src/unit-capacity.cpp --exclude src/unit-class_const_iterator.cpp --exclude src/unit-class_iterator.cpp --exclude src/unit-class_lexer.cpp --exclude src/unit-class_parser.cpp --exclude src/unit-comparison.cpp --exclude src/unit-concepts.cpp --exclude src/unit-constructor1.cpp --exclude src/unit-constructor2.cpp --exclude src/unit-convenience.cpp --exclude src/unit-conversions.cpp --exclude src/unit-deserialization.cpp --exclude src/unit-element_access1.cpp --exclude src/unit-element_access2.cpp --exclude src/unit-inspection.cpp --exclude src/unit-iterator_wrapper.cpp --exclude src/unit-iterators1.cpp --exclude src/unit-iterators2.cpp --exclude src/unit-json_patch.cpp --exclude src/unit-json_pointer.cpp --exclude src/unit-modifiers.cpp --exclude src/unit-pointer_access.cpp --exclude src/unit-readme.cpp --exclude src/unit-reference_access.cpp --exclude src/unit-regression.cpp --exclude src/unit-serialization.cpp --exclude src/unit-testsuites.cpp --exclude src/unit-unicode.cpp --include ../src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
       - lcov --directory src --directory test/src --capture --output-file coverage.info --rc lcov_branch_coverage=1 --no-external
@@ -236,11 +247,8 @@ script:
   - uname -a
   - $CXX --version
 
-  # compile
+  # compile and execute unit tests
-  - make
+  - make check
-
-  # execute unit tests
-  - test/json_unit "*"
 
   # check if homebrew works (only checks develop branch)
   - if [ `which brew` ]; then
@@ -249,51 +257,3 @@ script:
     brew install nlohmann_json --HEAD ;
     brew test nlohmann_json ;
     fi
-
-#language: cpp
-#
-#dist: trusty
-#sudo: required
-#
-#env:
-#  global:
-#   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-#   #   via the "travis encrypt" command using the project repo's public key
-#   - secure: "m89SSgE+ASLO38rSKx7MTXK3n5NkP9bIx95jwY71YEiuFzib30PDJ/DifKnXxBjvy/AkCGztErQRk/8ZCvq+4HXozU2knEGnL/RUitvlwbhzfh2D4lmS3BvWBGS3N3NewoPBrRmdcvnT0xjOGXxtZaJ3P74TkB9GBnlz/HmKORA="
-#
-## from http://stackoverflow.com/a/32127147/266378
-#matrix:
-#  include:
-#    - os: linux
-#      compiler: gcc
-#      addons:
-#        apt:
-#          sources: ['ubuntu-toolchain-r-test']
-#          packages: ['g++-4.9', 'valgrind', 'python-pip', 'python-yaml']
-#      before_script:
-#        - pip install --user git+git://github.com/eddyxu/cpp-coveralls.git
-#      after_success:
-#        - make clean
-#        - touch src/json.hpp
-#        - make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage -std=c++11 -lstdc++" CXX=$COMPILER
-#        - test/json_unit "*"
-#        - coveralls --build-root test --exclude src/catch.hpp --exclude src/unit-algorithms.cpp --exclude src/unit-allocator.cpp --exclude src/unit-capacity.cpp --exclude src/unit-class_const_iterator.cpp --exclude src/unit-class_iterator.cpp --exclude src/unit-class_lexer.cpp --exclude src/unit-class_parser.cpp --exclude src/unit-comparison.cpp --exclude src/unit-concepts.cpp --exclude src/unit-constructor1.cpp --exclude src/unit-constructor2.cpp --exclude src/unit-convenience.cpp --exclude src/unit-conversions.cpp --exclude src/unit-deserialization.cpp --exclude src/unit-element_access1.cpp --exclude src/unit-element_access2.cpp --exclude src/unit-inspection.cpp --exclude src/unit-iterator_wrapper.cpp --exclude src/unit-iterators1.cpp --exclude src/unit-iterators2.cpp --exclude src/unit-json_patch.cpp --exclude src/unit-json_pointer.cpp --exclude src/unit-modifiers.cpp --exclude src/unit-pointer_access.cpp --exclude src/unit-readme.cpp --exclude src/unit-reference_access.cpp --exclude src/unit-regression.cpp --exclude src/unit-serialization.cpp --exclude src/unit-testsuites.cpp --exclude src/unit-unicode.cpp --include ../src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
-#      env: COMPILER=g++-4.9  
-#
-#    - os: linux
-#      compiler: gcc
-#      before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
-#      addons:
-#        apt:
-#          sources: ['ubuntu-toolchain-r-test']
-#          packages: ['g++-5', 'valgrind']
-#        coverity_scan:
-#          project:
-#            name: "nlohmann/json"
-#            description: "Build submitted via Travis CI"
-#          notification_email: niels.lohmann@gmail.com
-#          build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
-#          build_command: "make"
-#          branch_pattern: coverity_scan
-#      env: COMPILER=g++-5
-#

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 # define the project
-project(nlohmann_json VERSION 2.0.8 LANGUAGES CXX)
+project(nlohmann_json VERSION 2.0.9 LANGUAGES CXX)
 
 enable_testing()
 

ChangeLog.md

@@ -1,6 +1,29 @@
 # Change Log
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v2.0.9](https://github.com/nlohmann/json/releases/tag/v2.0.9) (2016-12-16)
+[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.8...v2.0.9)
+
+- \#pragma GCC diagnostic ignored "-Wdocumentation" [\#393](https://github.com/nlohmann/json/issues/393)
+- How to parse this json file and write separate sub object as json files? [\#392](https://github.com/nlohmann/json/issues/392)
+- Integer-overflow \(OSS-Fuzz issue 267\) [\#389](https://github.com/nlohmann/json/issues/389)
+- Implement indefinite-length types from RFC 7049 [\#387](https://github.com/nlohmann/json/issues/387)
+- template parameter "T" is not used in declaring the parameter types of function template [\#386](https://github.com/nlohmann/json/issues/386)
+- Serializing json instances containing already serialized string values without escaping [\#385](https://github.com/nlohmann/json/issues/385)
+- Add test cases from RFC 7049 [\#384](https://github.com/nlohmann/json/issues/384)
+- Add a table of contents to the README file [\#383](https://github.com/nlohmann/json/issues/383)
+- Update FAQ section in the guidelines for contributing [\#382](https://github.com/nlohmann/json/issues/382)
+- Allow for forward declaring nlohmann::json [\#381](https://github.com/nlohmann/json/issues/381)
+- Bug in overflow detection when parsing integers [\#380](https://github.com/nlohmann/json/issues/380)
+- A unique name to mention the library? [\#377](https://github.com/nlohmann/json/issues/377)
+- Support for comments. [\#376](https://github.com/nlohmann/json/issues/376)
+- Non-unique keys in objects. [\#375](https://github.com/nlohmann/json/issues/375)
+- Request: binary serialization/deserialization [\#358](https://github.com/nlohmann/json/issues/358)
+
+- Replace class iterator and const\_iterator by using a single template class to reduce code. [\#395](https://github.com/nlohmann/json/pull/395) ([Bosswestfalen](https://github.com/Bosswestfalen))
+- Clang: quiet a warning [\#391](https://github.com/nlohmann/json/pull/391) ([jaredgrubb](https://github.com/jaredgrubb))
+- Fix issue \#380: Signed integer overflow check [\#390](https://github.com/nlohmann/json/pull/390) ([qwename](https://github.com/qwename))
+
 ## [v2.0.8](https://github.com/nlohmann/json/releases/tag/v2.0.8) (2016-12-02)
 [Full Changelog](https://github.com/nlohmann/json/compare/v2.0.7...v2.0.8)
 
@@ -8,7 +31,6 @@ All notable changes to this project will be documented in this file. This projec
 - Compiler warnings? [\#372](https://github.com/nlohmann/json/issues/372)
 - docs: how to release a json object in memory? [\#371](https://github.com/nlohmann/json/issues/371)
 - crash in dump [\#370](https://github.com/nlohmann/json/issues/370)
-- Conversion operators not considered [\#369](https://github.com/nlohmann/json/issues/369)
 - Coverity issue \(FORWARD\_NULL\) in lexer\(std::istream& s\) [\#368](https://github.com/nlohmann/json/issues/368)
 - json::parse on failed stream gets stuck [\#366](https://github.com/nlohmann/json/issues/366)
 - Performance improvements [\#365](https://github.com/nlohmann/json/issues/365)

Makefile

@@ -5,7 +5,8 @@ RE2C = re2c
 SED = sed
 
 # main target
-all: json_unit
+all:
+	$(MAKE) -C test
 
 # clean up
 clean:
@@ -21,14 +22,14 @@ clean:
 
 # build unit tests
 json_unit:
-	@$(MAKE) -C test
+	@$(MAKE) json_unit -C test
 
 # run unit tests
-check: json_unit
+check:
-	test/json_unit "*"
+	$(MAKE) check -C test
 
-check-fast: json_unit
+check-fast:
-	test/json_unit
+	$(MAKE) check -C test TEST_PATTERN=""
 
 
 ##########################################################################
@@ -69,6 +70,7 @@ cppcheck:
 clang_sanitize: clean
 	CXX=clang++ CXXFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer" $(MAKE)
 
+
 ##########################################################################
 # maintainer targets
 ##########################################################################

README.md

@@ -4,13 +4,29 @@
 [![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true)](https://ci.appveyor.com/project/nlohmann/json)
 [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/fsf5FqYe6GoX68W6)
+[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/8soFCqS532vOyZcK)
 [![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
 [![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
 [![Github Issues](https://img.shields.io/github/issues/nlohmann/json.svg)](http://github.com/nlohmann/json/issues)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289)
 
+- [Design goals](#design-goals)
+- [Integration](#integration)
+- [Examples](#examples)
+  - [JSON as first-class data type](#json-as-first-class-data-type)
+  - [Serialization / Deserialization](#serialization--deserialization)
+  - [STL-like access](#stl-like-access)
+  - [Conversion from STL containers](#conversion-from-stl-containers)
+  - [JSON Pointer and JSON Patch](#json-pointer-and-json-patch)
+  - [Implicit conversions](#implicit-conversions)
+  - [Binary formats (CBOR and MessagePack)](#binary-formats-cbor-and-messagepack)
+- [Supported compilers](#supported-compilers)
+- [License](#license)
+- [Thanks](#thanks)
+- [Notes](#notes)
+- [Execute unit tests](#execute-unit-tests)
+
 ## Design goals
 
 There are myriads of [JSON](http://json.org) libraries out there, and each may even have its reason to exist. Our class had these design goals:
@@ -48,6 +64,10 @@ to the files you want to use JSON objects. That's it. Do not forget to set the n
 
 ## Examples
 
+Beside the examples below, you may want to check the [documentation](https://nlohmann.github.io/json/) where each function contains a separate code example (e.g., check out [`emplace()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a602f275f0359ab181221384989810604.html#a602f275f0359ab181221384989810604)). All [example files](https://github.com/nlohmann/json/tree/develop/doc/examples) can be compiled and executed on their own (e.g., file [emplace.cpp](https://github.com/nlohmann/json/blob/develop/doc/examples/emplace.cpp)).
+
+### JSON as first-class data type
+
 Here are some examples to give you an idea how to use the class.
 
 Assume you want to create the JSON object
@@ -421,6 +441,31 @@ int vi = jn.get<int>();
 // etc.
 ```
 
+### Binary formats (CBOR and MessagePack)
+
+Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [CBOR](http://cbor.io) (Concise Binary Object Representation) and [MessagePack](http://msgpack.org) to efficiently encode JSON values to byte vectors and to decode such vectors.
+
+```cpp
+// create a JSON value
+json j = R"({"compact": true, "schema": 0})"_json;
+
+// serialize to CBOR
+std::vector<uint8_t> v_cbor = json::to_cbor(j);
+
+// 0xa2, 0x67, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63, 0x74, 0xf5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x00
+
+// roundtrip
+json j_from_cbor = json::from_cbor(v_cbor);
+
+// serialize to MessagePack
+std::vector<uint8_t> v_msgpack = json::to_msgpack(j);
+
+// 0x82, 0xa7, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63, 0x74, 0xc3, 0xa6, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x00
+
+// roundtrip
+json j_from_msgpack = json::from_msgpack(v_msgpack);
+```
+
 
 ## Supported compilers
 
@@ -537,6 +582,9 @@ I deeply appreciate the help of the following people.
 - [Pierre-Antoine Lacaze](https://github.com/palacaze) found a subtle bug in the `dump()` function.
 - [TurpentineDistillery](https://github.com/TurpentineDistillery) pointed to [`std::locale::classic()`](http://en.cppreference.com/w/cpp/locale/locale/classic) to avoid too much locale joggling, found some nice performance improvements in the parser and improved the benchmarking code.
 - [cgzones](https://github.com/cgzones) had an idea how to fix the Coverity scan.
+- [Jared Grubb](https://github.com/jaredgrubb) silenced a nasty documentation warning.
+- [Yixin Zhang](https://github.com/qwename) fixed an integer overflow check.
+- [Bosswestfalen](https://github.com/Bosswestfalen) merged two iterator classes into a smaller one.
 
 Thanks a lot for helping out!
 
@@ -560,7 +608,7 @@ To compile and run the tests, you need to execute
 $ make check
 
 ===============================================================================
-All tests passed (8905518 assertions in 36 test cases)
+All tests passed (11201893 assertions in 43 test cases)
 ```
 
 Alternatively, you can use [CMake](https://cmake.org) and run

doc/Doxyfile

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "JSON for Modern C++"
-PROJECT_NUMBER         = 2.0.8
+PROJECT_NUMBER         = 2.0.9
 PROJECT_BRIEF          = 
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = .

doc/examples/README.link

@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/G6Pdtdxq01HJvvJz"><b>online</b></a>
+<a target="_blank" href="http://melpon.org/wandbox/permlink/8soFCqS532vOyZcK"><b>online</b></a>

doc/examples/from_cbor.cpp

@@ -0,0 +1,18 @@
+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<uint8_t> v = {0xa2, 0x67, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
+                              0x74, 0xf5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6d,
+                              0x61, 0x00
+                             };
+
+    // deserialize it with CBOR
+    json j = json::from_cbor(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}

doc/examples/from_cbor.link

@@ -0,0 +1 @@
+<a target="_blank" href="http://melpon.org/wandbox/permlink/TDPaxmQ7PsvfWxrs"><b>online</b></a>

doc/examples/from_cbor.output

@@ -0,0 +1,4 @@
+{
+  "compact": true,
+  "schema": 0
+}

doc/examples/from_msgpack.cpp

@@ -0,0 +1,18 @@
+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<uint8_t> v = {0x82, 0xa7, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
+                              0x74, 0xc3, 0xa6, 0x73, 0x63, 0x68, 0x65, 0x6d,
+                              0x61, 0x00
+                             };
+
+    // deserialize it with MessagePack
+    json j = json::from_msgpack(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}

doc/examples/from_msgpack.link

@@ -0,0 +1 @@
+<a target="_blank" href="http://melpon.org/wandbox/permlink/7vRGmLdVcYM7POhE"><b>online</b></a>

doc/examples/from_msgpack.output

@@ -0,0 +1,4 @@
+{
+  "compact": true,
+  "schema": 0
+}

doc/examples/to_cbor.cpp

@@ -0,0 +1,19 @@
+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON value
+    json j = R"({"compact": true, "schema": 0})"_json;
+
+    // serialize it to CBOR
+    std::vector<uint8_t> v = json::to_cbor(j);
+
+    // print the vector content
+    for (auto& byte : v)
+    {
+        std::cout << "0x" << std::hex << std::setw(2) << std::setfill('0') << (int)byte << " ";
+    }
+    std::cout << std::endl;
+}

doc/examples/to_cbor.link

@@ -0,0 +1 @@
+<a target="_blank" href="http://melpon.org/wandbox/permlink/UaDbrgZ8OPWaShY8"><b>online</b></a>

doc/examples/to_cbor.output

@@ -0,0 +1 @@
+0xa2 0x67 0x63 0x6f 0x6d 0x70 0x61 0x63 0x74 0xf5 0x66 0x73 0x63 0x68 0x65 0x6d 0x61 0x00 

doc/examples/to_msgpack.cpp

@@ -0,0 +1,19 @@
+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON value
+    json j = R"({"compact": true, "schema": 0})"_json;
+
+    // serialize it to MessagePack
+    std::vector<uint8_t> v = json::to_msgpack(j);
+
+    // print the vector content
+    for (auto& byte : v)
+    {
+        std::cout << "0x" << std::hex << std::setw(2) << std::setfill('0') << (int)byte << " ";
+    }
+    std::cout << std::endl;
+}

doc/examples/to_msgpack.link

@@ -0,0 +1 @@
+<a target="_blank" href="http://melpon.org/wandbox/permlink/jvaU8GEfAusb5dKf"><b>online</b></a>

doc/examples/to_msgpack.output

@@ -0,0 +1 @@
+0x82 0xa7 0x63 0x6f 0x6d 0x70 0x61 0x63 0x74 0xc3 0xa6 0x73 0x63 0x68 0x65 0x6d 0x61 0x00 

doc/index.md

@@ -277,4 +277,4 @@ The container functions known from STL have been extended to support the differe
 @author [Niels Lohmann](http://nlohmann.me)
 @see https://github.com/nlohmann/json to download the source code
 
-@version 2.0.8
+@version 2.0.9

test/CMakeLists.txt

@@ -6,6 +6,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
     "src/unit-algorithms.cpp"
     "src/unit-allocator.cpp"
     "src/unit-capacity.cpp"
+    "src/unit-cbor.cpp"
     "src/unit-class_const_iterator.cpp"
     "src/unit-class_iterator.cpp"
     "src/unit-class_lexer.cpp"
@@ -26,6 +27,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
     "src/unit-json_patch.cpp"
     "src/unit-json_pointer.cpp"
     "src/unit-modifiers.cpp"
+    "src/unit-msgpack.cpp"
     "src/unit-pointer_access.cpp"
     "src/unit-readme.cpp"
     "src/unit-reference_access.cpp"

test/Makefile

@@ -10,6 +10,7 @@ SOURCES = src/unit.cpp \
           src/unit-algorithms.cpp \
           src/unit-allocator.cpp \
           src/unit-capacity.cpp \
+          src/unit-cbor.cpp \
           src/unit-class_const_iterator.cpp \
           src/unit-class_iterator.cpp \
           src/unit-class_lexer.cpp \
@@ -30,6 +31,7 @@ SOURCES = src/unit.cpp \
           src/unit-json_patch.cpp \
           src/unit-json_pointer.cpp \
           src/unit-modifiers.cpp \
+          src/unit-msgpack.cpp \
           src/unit-pointer_access.cpp \
           src/unit-readme.cpp \
           src/unit-reference_access.cpp \
@@ -40,7 +42,20 @@ SOURCES = src/unit.cpp \
 
 OBJECTS = $(SOURCES:.cpp=.o)
 
-all: json_unit
+TESTCASES = $(patsubst src/unit-%.cpp,test-%,$(wildcard src/unit-*.cpp))
+
+##############################################################################
+# main rules
+##############################################################################
+
+all: $(TESTCASES)
+
+clean:
+	rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda) $(TESTCASES)
+
+##############################################################################
+# single test file
+##############################################################################
 
 json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp
 	@echo "[CXXLD] $@"
@@ -50,5 +65,16 @@ json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp
 	@echo "[CXX]   $@"
 	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
-clean:
+
-	rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda)
+##############################################################################
+# individual test cases
+##############################################################################
+
+test-%: src/unit-%.cpp ../src/json.hpp src/catch.hpp
+	@echo "[CXXLD] $@"
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DCATCH_CONFIG_MAIN $< -o $@
+
+TEST_PATTERN = "*"
+TEST_PREFIX = ""
+check: $(TESTCASES)
+	@cd .. ; for testcase in $(TESTCASES); do echo "Executing $$testcase..."; $(TEST_PREFIX)test/$$testcase $(TEST_PATTERN) || exit 1; done

test/data/json.org/1.json.cbor

@@ -0,0 +1 @@
+¡hglossary¢hGlossDiv¢iGlossList¡jGlossEntry§hGlossDef¢lGlossSeeAlso‚cGMLcXMLdparaxHA meta-markup language, used to create markup languages such as DocBook.hGlossSeefmarkupgAcronymdSGMLiGlossTermx$Standard Generalized Markup LanguagefAbbrevmISO 8879:1986fSortAsdSGMLbIDdSGMLetitleaSetitlepexample glossary

test/data/json.org/2.json.cbor

@@ -0,0 +1 @@
+¡dmenu£epopup¡hmenuitemƒ¢gonclicknCreateNewDoc()evaluecNew¢gonclickiOpenDoc()evaluedOpen¢gonclickjCloseDoc()evalueeClosebiddfileevaluedFile

test/data/json.org/2.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD>menu<EFBFBD>popup<EFBFBD>menuitem<EFBFBD>吶nclick哽reateNewDoc()史alueΛew<65>onclick呢penDoc()史alue力pen<65>onclick杭loseDoc()史alue丘lose█d口ile史alue了ile

test/data/json.org/3.json.cbor

@@ -0,0 +1 @@
+¡fwidget¤edebugbondtext¨gvOffsetdestyledbolddnameetext1ghOffsetúionMouseUpx)sun1.opacity = (sun1.opacity / 100) * 90;ddatajClick Hereialignmentfcenterdsize$fwindow¤ewidth
ôfheight
ôdnamekmain_windowetitlexSample Konfabulator Widgeteimage¥gvOffsetúcsrcnImages/Sun.pngialignmentfcenterdnamedsun1ghOffsetú

test/data/json.org/4.json.cbor

@@ -0,0 +1,4 @@
+¡gweb-app£oservlet-mapping¥jcofaxToolsh/tools/*hcofaxCDSa/kfileServleti/static/*jcofaxAdminh/admin/*jcofaxEmails/cofaxutil/aemail/*ftaglib¢otaglib-locationw/WEB-INF/tlds/cofax.tldjtaglib-uriicofax.tldgservlet…£lservlet-namehcofaxCDSjinit-param¸*ocachePagesStoredxsearchEngineListTemplatexforSearchEnginesList.htmxconfigGlossary:adminEmailmksm@pobox.comlmaxUrlLength
ôrdataStoreTestQueryx"SET NOCOUNT ON;select test='test';sdefaultFileTemplatesarticleTemplate.htmpdataStoreLogFilex$/usr/local/tomcat/logs/datastore.logstemplateLoaderClassxorg.cofax.FilesTemplateLoaderndataStoreClassvorg.cofax.SqlDataStorepredirectionClassxorg.cofax.SqlRedirectionttemplateOverridePath`scacheTemplatesStore2ldataStoreUrlx;jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goonxsearchEngineFileTemplatetforSearchEngines.htmocachePagesTrackÈucachePackageTagsStoreÈmdataStoreNameecofaxqdataStorePasswordrdataStoreTestQueryfuseJSPôsdefaultListTemplateplistTemplate.htmxconfigGlossary:poweredByeCofaxmdataStoreUserbsaojspListTemplateplistTemplate.jspojspFileTemplatesarticleTemplate.jspqdataStoreMaxConnsdscachePagesDirtyRead
+qcachePagesRefresh
+scacheTemplatesTrackdwdataStoreConnUsageLimitdxconfigGlossary:installationAtpPhiladelphia, PAtsearchEngineRobotsDbqWEB-INF/robots.dbvtemplateProcessorClassxorg.cofax.WysiwygTemplatewcachePackageTagsRefresh<xconfigGlossary:staticPatho/content/staticltemplatePathitemplatesluseDataStoreõucacheTemplatesRefreshodataStoreDriverx,com.microsoft.jdbc.sqlserver.SQLServerDriverxconfigGlossary:poweredByIconq/images/cofax.gifucachePackageTagsTrackÈqdataStoreLogLeveledebugrdataStoreInitConns
+mservlet-classxorg.cofax.cds.CDSServlet£lservlet-namejcofaxEmailjinit-param¢pmailHostOverrideemail2hmailHostemail1mservlet-classxorg.cofax.cds.EmailServlet¢lservlet-namejcofaxAdminmservlet-classxorg.cofax.cds.AdminServlet¢lservlet-namekfileServletmservlet-classxorg.cofax.cds.FileServlet£lservlet-namejcofaxToolsjinit-param­klogLocationx%/usr/local/tomcat/logs/CofaxTools.logrfileTransferFolderx4/usr/local/tomcat/webapps/content/fileTransferFolderclog
gdataLog
odataLogLocationx"/usr/local/tomcat/logs/dataLog.logladminGroupIDmlookInContext
oremovePageCachex%/content/admin/remove?cache=pages&id=sremoveTemplateCachex)/content/admin/remove?cache=templates&id=jlogMaxSize`ndataLogMaxSize`jbetaServerõltemplatePathotoolstemplates/mservlet-classxorg.cofax.cms.CofaxToolsServlet

test/data/json.org/5.json.cbor

@@ -0,0 +1 @@
+¡dmenu¢fheaderjSVG Viewereitems–¡biddOpen¢bidgOpenNewelabelhOpen Newö¢bidfZoomInelabelgZoom In¢bidgZoomOutelabelhZoom Out¢bidlOriginalViewelabelmOriginal Viewö¡bidgQuality¡bidePause¡biddMuteö¢biddFindelabelgFind...¢bidiFindAgainelabeljFind Again¡biddCopy¢bidiCopyAgainelabeljCopy Again¢bidgCopySVGelabelhCopy SVG¢bidgViewSVGelabelhView SVG¢bidjViewSourceelabelkView Source¢bidfSaveAselabelgSave Asö¡biddHelp¢bideAboutelabelxAbout Adobe CVG Viewer...

test/data/json_roundtrip/roundtrip01.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip01.json.msgpack

@@ -0,0 +1 @@
+‘À

test/data/json_roundtrip/roundtrip02.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip02.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip03.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip03.json.msgpack

@@ -0,0 +1 @@
+‘В

test/data/json_roundtrip/roundtrip05.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>cfoo

test/data/json_roundtrip/roundtrip05.json.msgpack

@@ -0,0 +1 @@
+‘£foo

test/data/json_roundtrip/roundtrip06.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>

test/data/json_roundtrip/roundtrip06.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD>

test/data/json_roundtrip/roundtrip07.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>

test/data/json_roundtrip/roundtrip07.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD>

test/data/json_roundtrip/roundtrip09.json.cbor

@@ -0,0 +1 @@
+¡cfoocbar

test/data/json_roundtrip/roundtrip09.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD>£foo£bar

test/data/json_roundtrip/roundtrip10.json.cbor

@@ -0,0 +1 @@
+¢aaöcfoocbar

test/data/json_roundtrip/roundtrip10.json.msgpack

@@ -0,0 +1 @@
+‚¡aÀ£foo£bar

test/data/json_roundtrip/roundtrip11.json.cbor

@@ -0,0 +1 @@
+<EFBFBD> 

test/data/json_roundtrip/roundtrip11.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip12.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>:<><7F><EFBFBD>

test/data/json_roundtrip/roundtrip13.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>;"τ}ι<>

test/data/json_roundtrip/roundtrip13.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><0B>~<7E>

test/data/json_roundtrip/roundtrip14.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>;<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip15.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>

test/data/json_roundtrip/roundtrip15.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD>

test/data/json_roundtrip/roundtrip16.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><><7F><EFBFBD>

test/data/json_roundtrip/roundtrip16.json.msgpack

@@ -0,0 +1 @@
+𤥵<EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip17.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><1A><><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip17.json.msgpack

@@ -0,0 +1 @@
+懳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip18.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>"τ}ι<>

test/data/json_roundtrip/roundtrip18.json.msgpack

@@ -0,0 +1 @@
+‘Ο"τ}ι<>

test/data/json_roundtrip/roundtrip19.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip19.json.msgpack

@@ -0,0 +1 @@
+‘Ο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip22.json.cbor

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>?<3F><><EFBFBD>n<><6E>

test/data/json_roundtrip/roundtrip22.json.msgpack

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD>?鸚<>n<><6E>

test/data/json_roundtrip/roundtrip23.json.cbor

@@ -0,0 +1 @@
+侞矿纼n棈

test/data/json_roundtrip/roundtrip23.json.msgpack

@@ -0,0 +1 @@
+懰矿纼n棈

test/data/json_roundtrip/roundtrip27.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>ϋο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip27.json.msgpack

@@ -0,0 +1 @@
+‘Λο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

test/data/json_roundtrip/roundtrip30.json.cbor

@@ -0,0 +1 @@
+<EFBFBD>9ｹ	脉<>

test/data/json_roundtrip/roundtrip30.json.msgpack

@@ -0,0 +1 @@
+騨9ｹ	脉<>

test/data/json_roundtrip/roundtrip31.json.cbor

@@ -0,0 +1 @@
+ЃыF/)До±Uе