Add valijson.

Currently it seg faults due to stack overflow when validating with `glTF.schema.json`
Remove validator example scine it requires nlohmann's json.hpp
2026-06-08 19:23:50 +00:00 · 2019-05-29 20:09:47 +09:00 · 2019-02-15 17:51:55 +09:00 · 2019-02-15 16:09:42 +09:00 · 2019-02-09 21:58:40 +09:00 · 2019-02-08 16:32:58 +09:00
115 changed files with 22333 additions and 36086 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +0,0 @@
-blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/issue-report.md
+++ b/.github/ISSUE_TEMPLATE/issue-report.md
@@ -1,30 +0,0 @@
---
-name: Issue report
-about: Create a report
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the issue**
-
-A clear and concise description of what the issue is.
-
-**To Reproduce**
-
- OS
- Compiler, compiler version, compile options
- Please attach minimal and reproducible .glTF file if you got an issue related to .glTF data
-
-**Expected behaviour**
-
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-
-If applicable, add screenshots to help explain your problem.
-
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -1,165 +0,0 @@
-name: C/C++ CI
-
-on: [push, pull_request]
-
-jobs:
-
-  # compile with older gcc4.8
-  build-gcc48:
-
-    runs-on: ubuntu-18.04
-    name: Build with gcc 4.8
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Build
-        run: |
-            sudo apt-get update
-            sudo apt-get install -y build-essential
-            sudo apt-get install -y gcc-4.8 g++-4.8
-            g++-4.8 -std=c++11 -o loader_example loader_example.cc
-
-      - name: NoexceptBuild
-        run: |
-            g++-4.8 -DTINYGLTF_NOEXCEPTION -std=c++11 -o loader_example loader_example.cc
-
-      - name: RapidjsonBuild
-        run: |
-            git clone https://github.com/Tencent/rapidjson
-            g++-4.8 -DTINYGLTF_USE_RAPIDJSON -I./rapidjson/include/rapidjson -std=c++11 -o loader_example loader_example.cc
-
-  # compile with mingw gcc cross
-  build-mingw-cross:
-
-    runs-on: ubuntu-18.04
-    name: Build with MinGW gcc cross
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Build
-        run: |
-            sudo apt-get update
-            sudo apt-get install -y build-essential
-            sudo apt-get install -y mingw-w64
-            x86_64-w64-mingw32-g++ -std=c++11 -o loader_example loader_example.cc
-
-  # Windows(x64) + Visual Studio 2019 build
-  build-windows-msvc:
-
-    runs-on: windows-latest
-    name: Build for Windows(x64, MSVC)
-
-    # Use system installed cmake
-    # https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Configure
-        run: |
-          mkdir build
-          cd build
-          cmake -G "Visual Studio 16 2019" -DTINYGLTF_BUILD_LOADER_EXAMPLE=On -DTINYGLTF_BUILD_GL_EXAMPLES=Off -DTINYGLTF_BUILD_VALIDATOR_EXAMPLE=On ..
-          cd ..
-      - name: Build
-        run: cmake --build build --config Release
-
-
-  build-linux:
-
-    runs-on: ubuntu-latest
-    name: Buld with gcc
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: build
-      run: |
-        g++ -std=c++11 -o loader_example loader_example.cc
-    - name: test
-      run: |
-        ./loader_example models/Cube/Cube.gltf
-
-    - name: tests
-      run: |
-        cd tests
-        g++ -I../  -std=c++11 -g -O0 -o tester tester.cc
-        ./tester
-        cd ..
-
-    - name: noexcept_tests
-      run: |
-        cd tests
-        g++ -DTINYGLTF_NOEXCEPTION -I../  -std=c++11 -g -O0 -o tester_noexcept tester.cc
-        ./tester_noexcept
-        cd ..
-
-
-  build-rapidjson-linux:
-
-    runs-on: ubuntu-latest
-    name: Buld with gcc + rapidjson
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: build
-      run: |
-        git clone https://github.com/Tencent/rapidjson
-        g++ -v
-        g++ -DTINYGLTF_USE_RAPIDJSON -I./rapidjson/include/rapidjson -std=c++11 -o loader_example loader_example.cc
-
-    - name: loader_example_test
-      run: |
-        ./loader_example models/Cube/Cube.gltf
-
-    - name: tests
-      run: |
-        cd tests
-        g++ -DTINYGLTF_USE_RAPIDJSON -I../rapidjson/include/rapidjson -I../  -std=c++11 -g -O0 -o tester tester.cc
-        ./tester
-        cd ..
-
-    - name: noexcept_tests
-      run: |
-        cd tests
-        g++ -DTINYGLTF_USE_RAPIDJSON -I../rapidjson/include/rapidjson -DTINYGLTF_NOEXCEPTION -I../  -std=c++11 -g -O0 -o tester_noexcept tester.cc
-        ./tester_noexcept
-        cd ..
-
-  # Cross-compile for aarch64 linux target
-  build-cross-aarch64:
-
-    runs-on: ubuntu-18.04
-    name: Build on cross aarch64
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Build
-        run: |
-            sudo apt-get update
-            sudo apt-get install -y build-essential
-            sudo apt-get install -y gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu
-
-            git clone https://github.com/Tencent/rapidjson
-            aarch64-linux-gnu-g++-8 -DTINYGLTF_USE_RAPIDJSON -I./rapidjson/include/rapidjson -std=c++11 -g -O0 -o loader_example loader_example.cc
-
-  # macOS clang
-  build-macos:
-
-    runs-on: macos-latest
-    name: Build on macOS
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Build
-        run: |
-            clang++ -std=c++11 -g -O0 -o loader_example loader_example.cc
-            ./loader_example models/Cube/Cube.gltf
-
-            git clone https://github.com/Tencent/rapidjson
-            clang++ -DTINYGLTF_USE_RAPIDJSON -I./rapidjson/include/rapidjson -std=c++11 -g -O0 -o loader_example loader_example.cc
-
--- a/.gitignore
+++ b/.gitignore
@@ -67,5 +67,4 @@ imgui.ini
 loader_example
 tests/tester
 tests/tester_noexcept
-tests/issue-97.gltf

--- a/.travis.yml
+++ b/.travis.yml
@@ -31,17 +31,6 @@ matrix:
  - addons: *1
    compiler: clang
    env: COMPILER_VERSION=3.9 BUILD_TYPE=Debug CFLAGS="-O0" CXXFLAGS="-O0"
-  - addons: &3
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        packages:
-        - g++-4.8
-    compiler: gcc
-    env: COMPILER_VERSION=4.8 BUILD_TYPE=Debug
-  - addons: *3
-    compiler: gcc
-    env: COMPILER_VERSION=4.8 BUILD_TYPE=Release

 before_install:
  - ./.travis-before-install.sh
@@ -53,11 +42,6 @@ script:
  - ${CC} -v
  - ${CXX} ${EXTRA_CXXFLAGS} -std=c++11 -Wall -g -o loader_example loader_example.cc
  - ./loader_example ./models/Cube/Cube.gltf
-  - cd tests
-  - clang++ -v
-  - make
-  - ./tester
-  - ./tester_noexcept
-  - cd ../examples/raytrace
+  - cd examples/raytrace
  - ../../premake5 gmake
  - make
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,35 +4,14 @@ PROJECT (tinygltf)

 SET(CMAKE_CXX_STANDARD 11)

-option(TINYGLTF_BUILD_LOADER_EXAMPLE "Build loader_example" ON)
-option(TINYGLTF_BUILD_GL_EXAMPLES "Build GL exampels(requires glfw, OpenGL, etc)" OFF)
-option(TINYGLTF_BUILD_VALIDATOR_EXAMPLE "Build validator example" OFF)
-option(TINYGLTF_BUILD_BUILDER_EXAMPLE "Build glTF builder example" OFF)
+ADD_EXECUTABLE ( loader_example
+  loader_example.cc
+  )

-if (TINYGLTF_BUILD_LOADER_EXAMPLE)
-  ADD_EXECUTABLE ( loader_example
-    loader_example.cc
-    )
-endif (TINYGLTF_BUILD_LOADER_EXAMPLE)
+ADD_SUBDIRECTORY ( examples/gltfutil )
+ADD_SUBDIRECTORY ( examples/glview )

-if (TINYGLTF_BUILD_GL_EXAMPLES)
-  ADD_SUBDIRECTORY ( examples/gltfutil )
-  ADD_SUBDIRECTORY ( examples/glview )
-endif (TINYGLTF_BUILD_GL_EXAMPLES)
-
-if (TINYGLTF_BUILD_VALIDATOR_EXAMPLE)
-  ADD_SUBDIRECTORY ( examples/validator )
-endif (TINYGLTF_BUILD_VALIDATOR_EXAMPLE)
-
-if (TINYGLTF_BUILD_BUILDER_EXAMPLE)
-  ADD_SUBDIRECTORY ( examples/build-gltf )
-endif (TINYGLTF_BUILD_BUILDER_EXAMPLE)
-
-#
-# TinuGLTF is a header-only library, so no library build. just install header files.
-#
 INSTALL ( FILES
-  json.hpp
  stb_image.h
  stb_image_write.h
  tiny_gltf.h
--- a/6
+++ b/6
@@ -2,12 +2,8 @@
 # Use this for strict compilation check(will work on clang 3.8+)
 #EXTRA_CXXFLAGS := -fsanitize=address -Wall -Werror -Weverything -Wno-c++11-long-long -Wno-c++98-compat

-# With draco
-# EXTRA_CXXFLAGS := -I../draco/src/ -I../draco/build -DTINYGLTF_ENABLE_DRACO -L../draco/build
-# EXTRA_LINKFLAGS := -L../draco/build/ -ldracodec -ldraco
-
 all:
-	clang++  $(EXTRA_CXXFLAGS) -std=c++11 -g -O0 -o loader_example loader_example.cc $(EXTRA_LINKFLAGS)
+	clang++  $(EXTRA_CXXFLAGS) -std=c++11 -g -O0 -o loader_example loader_example.cc

 lint:
 	deps/cpplint.py tiny_gltf.h
--- a/README.md
+++ b/README.md
@@ -2,20 +2,13 @@

 `TinyGLTF` is a header only C++11 glTF 2.0 https://github.com/KhronosGroup/glTF library.

-`TinyGLTF` uses Niels Lohmann's json library(https://github.com/nlohmann/json), so now it requires C++11 compiler.
-If you are looking for old, C++03 version, please use `devel-picojson` branch(but not maintained anymore).
+`TinyGLTF` uses dropbox/json11 JSON library(https://github.com/dropbox/json11), so now it requires C++11 compiler.
+If you are looking for old, C++03 version, please use `devel-picojson` branch.  

 ## Status

- - v2.4.0 Experimental RapidJSON support. Experimental C++14 support(C++14 may give better performance)
- - v2.3.0 Modified Material representation according to glTF 2.0 schema(and introduced TextureInfo class)
- - v2.2.0 release(Support loading 16bit PNG. Sparse accessor support)
- - v2.1.0 release(Draco support)
- - v2.0.0 release(22 Aug, 2018)!
-
-### Branches
-
-* `sajson` : Use sajson to parse JSON. Parsing only but faster compile time(2x reduction compared to json.hpp and RapidJson)
+v2.2.0 Use dropbox/json11 instead of nlohmann's json.hpp
+v2.0.0 release(22 Aug, 2018)! 

 ## Builds

@@ -23,8 +16,6 @@ If you are looking for old, C++03 version, please use `devel-picojson` branch(bu

 [![Build status](https://ci.appveyor.com/api/projects/status/warngenu9wjjhlm8?svg=true)](https://ci.appveyor.com/project/syoyo/tinygltf)

-![C/C++ CI](https://github.com/syoyo/tinygltf/workflows/C/C++%20CI/badge.svg)
-
 ## Features

 * Written in portable C++. C++-11 with STL dependency only.
@@ -33,51 +24,38 @@ If you are looking for old, C++03 version, please use `devel-picojson` branch(bu
  * [x] Linux + gcc/clang
  * [x] Windows + MinGW
  * [x] Windows + Visual Studio 2015 Update 3 or later.
-    * Visual Studio 2013 is not supported since they have limited C++11 support and failed to compile `json.hpp`.
+    * Visual Studio 2013 is not supported since they have limited C++11 support.
  * [x] Android NDK
  * [x] Android + CrystaX(NDK drop-in replacement) GCC
  * [x] Web using Emscripten(LLVM)
+  * [x] Can be compiled with no RTTI, noexception.
 * Moderate parsing time and memory consumption.
 * glTF specification v2.0.0
  * [x] ASCII glTF
-    * [x] Load
-    * [x] Save
  * [x] Binary glTF(GLB)
-    * [x] Load
-    * [x] Save(.bin embedded .glb)
+  * [x] PBR material description
 * Buffers
  * [x] Parse BASE64 encoded embedded buffer data(DataURI).
  * [x] Load `.bin` file.
 * Image(Using stb_image)
  * [x] Parse BASE64 encoded embedded image data(DataURI).
  * [x] Load external image file.
-  * [x] Load PNG(8bit and 16bit)
-  * [x] Load JPEG(8bit only)
-  * [x] Load BMP
-  * [x] Load GIF
+  * [x] PNG(8bit only)
+  * [x] JPEG(8bit only)
+  * [x] BMP
+  * [x] GIF
  * [x] Custom Image decoder callback(e.g. for decoding OpenEXR image)
-* Morph traget
-  * [x] Sparse accessor
-* Load glTF from memory
+* Load from memory
 * Custom callback handler
  * [x] Image load
-  * [x] Image save
 * Extensions
  * [x] Draco mesh decoding
-  * [ ] Draco mesh encoding
-
-## Note on extension property
-
-In extension(`ExtensionMap`), JSON number value is parsed as int or float(number) and stored as `tinygltf::Value` object. If you want a floating point value from `tinygltf::Value`, use `GetNumberAsDouble()` method.
-
-`IsNumber()` returns true if the underlying value is an int value or a floating point value.

 ## Examples

 * [glview](examples/glview) : Simple glTF geometry viewer.
 * [validator](examples/validator) : Simple glTF validator with JSON schema.
 * [basic](examples/basic) : Basic glTF viewer with texturing support.
-* [build-gltf](examples/build-gltf) : Build simple glTF scene from a scratch.

 ## Projects using TinyGLTF

@@ -85,13 +63,6 @@ In extension(`ExtensionMap`), JSON number value is parsed as int or float(number
 * Physical based rendering with Vulkan using glTF 2.0 models https://github.com/SaschaWillems/Vulkan-glTF-PBR
 * GLTF loader plugin for OGRE 2.1. Support for PBR materials via HLMS/PBS https://github.com/Ybalrid/Ogre_glTF
 * [TinyGltfImporter](http://doc.magnum.graphics/magnum/classMagnum_1_1Trade_1_1TinyGltfImporter.html) plugin for [Magnum](https://github.com/mosra/magnum), a lightweight and modular C++11/C++14 graphics middleware for games and data visualization.
-* [Diligent Engine](https://github.com/DiligentGraphics/DiligentEngine) - A modern cross-platform low-level graphics library and rendering framework
-* Lighthouse 2: a rendering framework for real-time ray tracing / path tracing experiments. https://github.com/jbikker/lighthouse2
-* [QuickLook GLTF](https://github.com/toshiks/glTF-quicklook) - quicklook plugin for macos. Also SceneKit wrapper for tinygltf.
-* [GlslViewer](https://github.com/patriciogonzalezvivo/glslViewer) - live GLSL coding for MacOS and Linux
-* [Vulkan-Samples](https://github.com/KhronosGroup/Vulkan-Samples) - The Vulkan Samples is collection of resources to help you develop optimized Vulkan applications.
-* [TDME2](https://github.com/andreasdr/tdme2) - TDME2 - ThreeDeeMiniEngine2 is a lightweight 3D engine including tools suited for 3D game development using C++11
-* [SanityEngine](https://github.com/DethRaid/SanityEngine) - A C++/D3D12 renderer focused on the personal and proessional development of its developer
 * Your projects here! (Please send PR)

 ## TODOs
@@ -99,13 +70,13 @@ In extension(`ExtensionMap`), JSON number value is parsed as int or float(number
 * [ ] Write C++ code generator which emits C++ code from JSON schema for robust parsing.
 * [ ] Mesh Compression/decompression(Open3DGC, etc)
  * [x] Load Draco compressed mesh
-  * [ ] Save Draco compressed mesh
-  * [ ] Open3DGC?
-* [x] Support `extensions` and `extras` property
+  * [x] Save Draco compressed mesh
+* [ ] Support `extensions` and `extras` property
 * [ ] HDR image?
  * [ ] OpenEXR extension through TinyEXR.
-* [ ] 16bit PNG support in Serialization
-* [ ] Write example and tests for `animation` and `skin`
+* [ ] Write example and tests for `animation` and `skin` 
+  * [ ] Skinning
+  * [ ] Morph targets

 ## Licenses

@@ -113,7 +84,7 @@ TinyGLTF is licensed under MIT license.

 TinyGLTF uses the following third party libraries.

-* json.hpp : Copyright (c) 2013-2017 Niels Lohmann. MIT license.
+* json11 : Copyright (c) 2013 Dropbox, Inc. MIT license.
 * base64 : Copyright (C) 2004-2008 René Nyffenegger
 * stb_image.h : v2.08 - public domain image loader - [Github link](https://github.com/nothings/stb/blob/master/stb_image.h)
 * stb_image_write.h : v1.09 - public domain image writer - [Github link](https://github.com/nothings/stb/blob/master/stb_image_write.h)
@@ -121,7 +92,8 @@ TinyGLTF uses the following third party libraries.

 ## Build and example

-Copy `stb_image.h`, `stb_image_write.h`, `json.hpp` and `tiny_gltf.h` to your project.
+Copy `stb_image.h`, `stb_image_write.h`, and `tiny_gltf.h` to your project.
+json11 code is embeded into `tiny_gltf.h`

 ### Loading glTF 2.0 model

@@ -130,18 +102,20 @@ Copy `stb_image.h`, `stb_image_write.h`, `json.hpp` and `tiny_gltf.h` to your pr
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-// #define TINYGLTF_NOEXCEPTION // optional. disable exception handling.
+// Optional. Uncomment these if you want external json11.cpp instead of embedded json11.cpp code 
+//#define TINYGLTF_USE_EXTERNAL_JSON11_CPP
+//#include "json11.hpp"
 #include "tiny_gltf.h"

 using namespace tinygltf;

-Model model;
+Model model; 
 TinyGLTF loader;
 std::string err;
 std::string warn;
-
+  
 bool ret = loader.LoadASCIIFromFile(&model, &err, &warn, argv[1]);
-//bool ret = loader.LoadBinaryFromFile(&model, &err, &warn, argv[1]); // for binary glTF(.glb)
+//bool ret = loader.LoadBinaryFromFile(&model, &err, &warn, argv[1]); // for binary glTF(.glb) 

 if (!warn.empty()) {
  printf("Warn: %s\n", warn.c_str());
@@ -157,38 +131,24 @@ if (!ret) {
 }
 ```

-#### Loader options
-
-* `TinyGLTF::SetPreserveimageChannels(bool onoff)`. `true` to preserve image channels as stored in image file for loaded image. `false` by default for backward compatibility(image channels are widen to `RGBA` 4 channels). Effective only when using builtin image loader(STB image loader).
-
 ## Compile options

-* `TINYGLTF_NOEXCEPTION` : Disable C++ exception in JSON parsing. You can use `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION` and `TINYGLTF_NOEXCEPTION`  to fully remove C++ exception codes when compiling TinyGLTF.
 * `TINYGLTF_NO_STB_IMAGE` : Do not load images with stb_image. Instead use `TinyGLTF::SetImageLoader(LoadimageDataFunction LoadImageData, void *user_data)` to set a callback for loading images.
 * `TINYGLTF_NO_STB_IMAGE_WRITE` : Do not write images with stb_image_write. Instead use `TinyGLTF::SetImageWriter(WriteimageDataFunction WriteImageData, void *user_data)` to set a callback for writing images.
-* `TINYGLTF_NO_EXTERNAL_IMAGE` : Do not try to load external image file. This option would be helpful if you do not want to load image files during glTF parsing.
+* `TINYGLTF_NO_EXTERNAL_IMAGE` : Do not try to load external image file. This option woulde be helpful if you do not want load image file during glTF parsing.
 * `TINYGLTF_ANDROID_LOAD_FROM_ASSETS`: Load all files from packaged app assets instead of the regular file system. **Note:** You must pass a valid asset manager from your android app to `tinygltf::asset_manager` beforehand.
 * `TINYGLTF_ENABLE_DRACO`: Enable Draco compression. User must provide include path and link correspnding libraries in your project file.
-* `TINYGLTF_NO_INCLUDE_JSON `: Disable including `json.hpp` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_NO_INCLUDE_RAPIDJSON `: Disable including RapidJson's header files from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_NO_INCLUDE_STB_IMAGE `: Disable including `stb_image.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE `: Disable including `stb_image_write.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_USE_RAPIDJSON` : Use RapidJSON as a JSON parser/serializer. RapidJSON files are not included in TinyGLTF repo. Please set an include path to RapidJSON if you enable this featrure.
-* `TINYGLTF_USE_CPP14` : Use C++14 feature(requires C++14 compiler). This may give better performance than C++11.
-
+* `TINYGLTF_USE_EXTERNAL_JSON11_CPP` : Use externally supplied json11.cpp/json11.hpp. This option may be helpful if you use json11.cpp in other source codes of your project.

 ### Saving gltTF 2.0 model
-
-* Buffers.
+* [ ] Buffers.
  * [x] To file
  * [x] Embedded
  * [ ] Draco compressed?
 * [x] Images
  * [x] To file
  * [x] Embedded
-* Binary(.glb)
-  * [x] .bin embedded single .glb
-  * [ ] External .bin
+* [ ] Binary(.glb)

 ## Running tests.

@@ -216,17 +176,8 @@ $ ./tester
 $ ./tester_noexcept
 ```

-### Fuzzing tests
-
-See `tests/fuzzer` for details.
-
-After running fuzzer on Ryzen9 3950X a week, at least `LoadASCIIFromString` looks safe except for out-of-memory error in Fuzzer.
-We may be better to introduce bounded memory size checking when parsing glTF data.
-
 ## Third party licenses

-* json.hpp : Licensed under the MIT License <http://opensource.org/licenses/MIT>. Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+* json11 : Licensed under the MIT License <http://opensource.org/licenses/MIT>. 
 * stb_image : Public domain.
 * catch : Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. Distributed under the Boost Software License, Version 1.0.
-* RapidJSON : Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved. http://rapidjson.org/
-* dlib(uridecode, uriencode) : Copyright (C) 2003  Davis E. King Boost Software License 1.0. http://dlib.net/dlib/server/server_http.cpp.html
--- a/examples/basic/.gitignore
+++ b/examples/basic/.gitignore
@@ -1,6 +1,5 @@
 .vs
 Debug
-Release
 x64
 packages

--- a/examples/basic/README.md
+++ b/examples/basic/README.md
@@ -19,7 +19,3 @@ $ make
 Plese use solution file located at `basic` folder.


-## Limitation
-
-There are so many limitations in this example(e.g. no PBR shader. the shader only shows texture of textures[0] if available).
-
--- a/examples/basic/basic/basic.vcxproj
+++ b/examples/basic/basic/basic.vcxproj
@@ -22,32 +22,32 @@
    <VCProjectVersion>15.0</VCProjectVersion>
    <ProjectGuid>{0589AC44-0CF3-40D8-8D89-68393CFD40F3}</ProjectGuid>
    <RootNamespace>basic</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
--- a/examples/basic/main.cpp
+++ b/examples/basic/main.cpp
@@ -1,381 +1,338 @@
-#include <fstream>
-#include <iostream>
-
-#include <GL/glew.h>
-#include <GLFW/glfw3.h>
-#include <glm/gtc/matrix_transform.hpp>
-
-#include "shaders.h"
-#include "window.h"
-
-#define TINYGLTF_IMPLEMENTATION
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#define TINYGLTF_NOEXCEPTION
-#define JSON_NOEXCEPTION
-#include "../../tiny_gltf.h"
-
-#define BUFFER_OFFSET(i) ((char *)NULL + (i))
-
-bool loadModel(tinygltf::Model &model, const char *filename) {
-  tinygltf::TinyGLTF loader;
-  std::string err;
-  std::string warn;
-
-  bool res = loader.LoadASCIIFromFile(&model, &err, &warn, filename);
-  if (!warn.empty()) {
-    std::cout << "WARN: " << warn << std::endl;
-  }
-
-  if (!err.empty()) {
-    std::cout << "ERR: " << err << std::endl;
-  }
-
-  if (!res)
-    std::cout << "Failed to load glTF: " << filename << std::endl;
-  else
-    std::cout << "Loaded glTF: " << filename << std::endl;
-
-  return res;
-}
-
-std::map<int, GLuint> bindMesh(std::map<int, GLuint> vbos,
-                               tinygltf::Model &model, tinygltf::Mesh &mesh) {
-  for (size_t i = 0; i < model.bufferViews.size(); ++i) {
-    const tinygltf::BufferView &bufferView = model.bufferViews[i];
-    if (bufferView.target == 0) {  // TODO impl drawarrays
-      std::cout << "WARN: bufferView.target is zero" << std::endl;
-      continue;  // Unsupported bufferView.
-                 /*
-                   From spec2.0 readme:
-                   https://github.com/KhronosGroup/glTF/tree/master/specification/2.0
-                            ... drawArrays function should be used with a count equal to
-                   the count            property of any of the accessors referenced by the
-                   attributes            property            (they are all equal for a given
-                   primitive).
-                 */
-    }
-
-    const tinygltf::Buffer &buffer = model.buffers[bufferView.buffer];
-    std::cout << "bufferview.target " << bufferView.target << std::endl;
-
-    GLuint vbo;
-    glGenBuffers(1, &vbo);
-    vbos[i] = vbo;
-    glBindBuffer(bufferView.target, vbo);
-
-    std::cout << "buffer.data.size = " << buffer.data.size()
-              << ", bufferview.byteOffset = " << bufferView.byteOffset
-              << std::endl;
-
-    glBufferData(bufferView.target, bufferView.byteLength,
-                 &buffer.data.at(0) + bufferView.byteOffset, GL_STATIC_DRAW);
-  }
-
-  for (size_t i = 0; i < mesh.primitives.size(); ++i) {
-    tinygltf::Primitive primitive = mesh.primitives[i];
-    tinygltf::Accessor indexAccessor = model.accessors[primitive.indices];
-
-    for (auto &attrib : primitive.attributes) {
-      tinygltf::Accessor accessor = model.accessors[attrib.second];
-      int byteStride =
-          accessor.ByteStride(model.bufferViews[accessor.bufferView]);
-      glBindBuffer(GL_ARRAY_BUFFER, vbos[accessor.bufferView]);
-
-      int size = 1;
-      if (accessor.type != TINYGLTF_TYPE_SCALAR) {
-        size = accessor.type;
-      }
-
-      int vaa = -1;
-      if (attrib.first.compare("POSITION") == 0) vaa = 0;
-      if (attrib.first.compare("NORMAL") == 0) vaa = 1;
-      if (attrib.first.compare("TEXCOORD_0") == 0) vaa = 2;
-      if (vaa > -1) {
-        glEnableVertexAttribArray(vaa);
-        glVertexAttribPointer(vaa, size, accessor.componentType,
-                              accessor.normalized ? GL_TRUE : GL_FALSE,
-                              byteStride, BUFFER_OFFSET(accessor.byteOffset));
-      } else
-        std::cout << "vaa missing: " << attrib.first << std::endl;
-    }
-
-    if (model.textures.size() > 0) {
-      // fixme: Use material's baseColor
-      tinygltf::Texture &tex = model.textures[0];
-
-      if (tex.source > -1) {
-
-        GLuint texid;
-        glGenTextures(1, &texid);
-
-        tinygltf::Image &image = model.images[tex.source];
-
-        glBindTexture(GL_TEXTURE_2D, texid);
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-        GLenum format = GL_RGBA;
-
-        if (image.component == 1) {
-          format = GL_RED;
-        } else if (image.component == 2) {
-          format = GL_RG;
-        } else if (image.component == 3) {
-          format = GL_RGB;
-        } else {
-          // ???
-        }
-
-        GLenum type = GL_UNSIGNED_BYTE;
-        if (image.bits == 8) {
-          // ok
-        } else if (image.bits == 16) {
-          type = GL_UNSIGNED_SHORT;
-        } else {
-          // ???
-        }
-
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width, image.height, 0,
-                     format, type, &image.image.at(0));
-      }
-    }
-  }
-
-  return vbos;
-}
-
-// bind models
-void bindModelNodes(std::map<int, GLuint> vbos, tinygltf::Model &model,
-                    tinygltf::Node &node) {
-  if ((node.mesh >= 0) && (node.mesh < model.meshes.size())) {
-    bindMesh(vbos, model, model.meshes[node.mesh]);
-  }
-
-  for (size_t i = 0; i < node.children.size(); i++) {
-    assert((node.children[i] >= 0) && (node.children[i] < model.nodes.size()));
-    bindModelNodes(vbos, model, model.nodes[node.children[i]]);
-  }
-}
-GLuint bindModel(tinygltf::Model &model) {
-  std::map<int, GLuint> vbos;
-  GLuint vao;
-  glGenVertexArrays(1, &vao);
-  glBindVertexArray(vao);
-
-  const tinygltf::Scene &scene = model.scenes[model.defaultScene];
-  for (size_t i = 0; i < scene.nodes.size(); ++i) {
-    assert((scene.nodes[i] >= 0) && (scene.nodes[i] < model.nodes.size()));
-    bindModelNodes(vbos, model, model.nodes[scene.nodes[i]]);
-  }
-
-  glBindVertexArray(0);
-  // cleanup vbos
-  for (size_t i = 0; i < vbos.size(); ++i) {
-    glDeleteBuffers(1, &vbos[i]);
-  }
-
-  return vao;
-}
-
-void drawMesh(tinygltf::Model &model, tinygltf::Mesh &mesh) {
-  for (size_t i = 0; i < mesh.primitives.size(); ++i) {
-    tinygltf::Primitive primitive = mesh.primitives[i];
-    tinygltf::Accessor indexAccessor = model.accessors[primitive.indices];
-
-    glDrawElements(primitive.mode, indexAccessor.count,
-                   indexAccessor.componentType,
-                   BUFFER_OFFSET(indexAccessor.byteOffset));
-  }
-}
-
-// recursively draw node and children nodes of model
-void drawModelNodes(tinygltf::Model &model, tinygltf::Node &node) {
-  if ((node.mesh >= 0) && (node.mesh < model.meshes.size())) {
-    drawMesh(model, model.meshes[node.mesh]);
-  }
-  for (size_t i = 0; i < node.children.size(); i++) {
-    drawModelNodes(model, model.nodes[node.children[i]]);
-  }
-}
-void drawModel(GLuint vao, tinygltf::Model &model) {
-  glBindVertexArray(vao);
-
-  const tinygltf::Scene &scene = model.scenes[model.defaultScene];
-  for (size_t i = 0; i < scene.nodes.size(); ++i) {
-    drawModelNodes(model, model.nodes[scene.nodes[i]]);
-  }
-
-  glBindVertexArray(0);
-}
-
-void dbgModel(tinygltf::Model &model) {
-  for (auto &mesh : model.meshes) {
-    std::cout << "mesh : " << mesh.name << std::endl;
-    for (auto &primitive : mesh.primitives) {
-      const tinygltf::Accessor &indexAccessor =
-          model.accessors[primitive.indices];
-
-      std::cout << "indexaccessor: count " << indexAccessor.count << ", type "
-                << indexAccessor.componentType << std::endl;
-
-      tinygltf::Material &mat = model.materials[primitive.material];
-      for (auto &mats : mat.values) {
-        std::cout << "mat : " << mats.first.c_str() << std::endl;
-      }
-
-      for (auto &image : model.images) {
-        std::cout << "image name : " << image.uri << std::endl;
-        std::cout << "  size : " << image.image.size() << std::endl;
-        std::cout << "  w/h : " << image.width << "/" << image.height
-                  << std::endl;
-      }
-
-      std::cout << "indices : " << primitive.indices << std::endl;
-      std::cout << "mode     : "
-                << "(" << primitive.mode << ")" << std::endl;
-
-      for (auto &attrib : primitive.attributes) {
-        std::cout << "attribute : " << attrib.first.c_str() << std::endl;
-      }
-    }
-  }
-}
-
-glm::mat4 genView(glm::vec3 pos, glm::vec3 lookat) {
-  // Camera matrix
-  glm::mat4 view = glm::lookAt(
-      pos,                // Camera in World Space
-      lookat,             // and looks at the origin
-      glm::vec3(0, 1, 0)  // Head is up (set to 0,-1,0 to look upside-down)
-  );
-
-  return view;
-}
-
-glm::mat4 genMVP(glm::mat4 view_mat, glm::mat4 model_mat, float fov, int w,
-                 int h) {
-  glm::mat4 Projection =
-      glm::perspective(glm::radians(fov), (float)w / (float)h, 0.01f, 1000.0f);
-
-  // Or, for an ortho camera :
-  // glm::mat4 Projection = glm::ortho(-10.0f,10.0f,-10.0f,10.0f,0.0f,100.0f);
-  // // In world coordinates
-
-  glm::mat4 mvp = Projection * view_mat * model_mat;
-
-  return mvp;
-}
-
-void displayLoop(Window &window, const std::string &filename) {
-  Shaders shader = Shaders();
-  glUseProgram(shader.pid);
-
-  // grab uniforms to modify
-  GLuint MVP_u = glGetUniformLocation(shader.pid, "MVP");
-  GLuint sun_position_u = glGetUniformLocation(shader.pid, "sun_position");
-  GLuint sun_color_u = glGetUniformLocation(shader.pid, "sun_color");
-
-  tinygltf::Model model;
-  if (!loadModel(model, filename.c_str())) return;
-
-  GLuint vao = bindModel(model);
-  // dbgModel(model); return;
-
-  // Model matrix : an identity matrix (model will be at the origin)
-  glm::mat4 model_mat = glm::mat4(1.0f);
-  glm::mat4 model_rot = glm::mat4(1.0f);
-  glm::vec3 model_pos = glm::vec3(-3, 0, -3);
-
-  // generate a camera view, based on eye-position and lookAt world-position
-  glm::mat4 view_mat = genView(glm::vec3(2, 2, 20), model_pos);
-
-  glm::vec3 sun_position = glm::vec3(3.0, 10.0, -5.0);
-  glm::vec3 sun_color = glm::vec3(1.0);
-
-  while (!window.Close()) {
-    window.Resize();
-
-    glClearColor(0.2, 0.2, 0.2, 1.0);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glm::mat4 trans =
-        glm::translate(glm::mat4(1.0f), model_pos);  // reposition model
-    model_rot = glm::rotate(model_rot, glm::radians(0.8f),
-                            glm::vec3(0, 1, 0));  // rotate model on y axis
-    model_mat = trans * model_rot;
-
-    // build a model-view-projection
-    GLint w, h;
-    glfwGetWindowSize(window.window, &w, &h);
-    glm::mat4 mvp = genMVP(view_mat, model_mat, 45.0f, w, h);
-    glUniformMatrix4fv(MVP_u, 1, GL_FALSE, &mvp[0][0]);
-
-    glUniform3fv(sun_position_u, 1, &sun_position[0]);
-    glUniform3fv(sun_color_u, 1, &sun_color[0]);
-
-    drawModel(vao, model);
-    glfwSwapBuffers(window.window);
-    glfwPollEvents();
-  }
-}
-
-static void error_callback(int error, const char *description) {
-  (void)error;
-  fprintf(stderr, "Error: %s\n", description);
-}
-
-int main(int argc, char **argv) {
-  std::string filename = "../../../models/Cube/Cube.gltf";
-
-  if (argc > 1) {
-    filename = argv[1];
-  }
-
-  glfwSetErrorCallback(error_callback);
-
-  if (!glfwInit()) return -1;
-
-  // Force create OpenGL 3.3
-  // NOTE(syoyo): Linux + NVIDIA driver segfaults for some reason? commenting out glfwWindowHint will work.
-  // Note (PE): On laptops with intel hd graphics card you can overcome the segfault by enabling experimental, see below (tested on lenovo thinkpad)
-  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-  glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-  glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-  glewExperimental = GL_TRUE;
-
-#ifdef __APPLE__
-  glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-#endif
-
-  Window window = Window(800, 600, "TinyGLTF basic example");
-  glfwMakeContextCurrent(window.window);
-
-#ifdef __APPLE__
-  // https://stackoverflow.com/questions/50192625/openggl-segmentation-fault
-  glewExperimental = GL_TRUE;
-#endif
-
-  glewInit();
-  std::cout << glGetString(GL_RENDERER) << ", " << glGetString(GL_VERSION)
-            << std::endl;
-
-  if (!GLEW_VERSION_3_3) {
-    std::cerr << "OpenGL 3.3 is required to execute this app." << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  glEnable(GL_DEPTH_TEST);
-  glDepthFunc(GL_LESS);
-
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  glEnable(GL_BLEND);
-
-  displayLoop(window, filename);
-
-  glfwTerminate();
-  return 0;
-}
+#include <fstream>
+#include <iostream>
+
+#include <GL/glew.h>
+#include <GLFW/glfw3.h>
+#include <glm/gtc/matrix_transform.hpp>
+
+#include "shaders.h"
+#include "window.h"
+
+#define TINYGLTF_IMPLEMENTATION
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#define TINYGLTF_NOEXCEPTION
+#define JSON_NOEXCEPTION
+#include "../../tiny_gltf.h"
+
+#define BUFFER_OFFSET(i) ((char *)NULL + (i))
+
+bool loadModel(tinygltf::Model &model, const char *filename) {
+  tinygltf::TinyGLTF loader;
+  std::string err;
+  std::string warn;
+
+  bool res = loader.LoadASCIIFromFile(&model, &err, &warn, filename);
+  if (!warn.empty()) {
+    std::cout << "WARN: " << warn << std::endl;
+  }
+
+  if (!err.empty()) {
+    std::cout << "ERR: " << err << std::endl;
+  }
+
+  if (!res)
+    std::cout << "Failed to load glTF: " << filename << std::endl;
+  else
+    std::cout << "Loaded glTF: " << filename << std::endl;
+
+  return res;
+}
+
+std::map<int, GLuint> bindMesh(std::map<int, GLuint> vbos,
+                               tinygltf::Model &model, tinygltf::Mesh &mesh) {
+  for (size_t i = 0; i < model.bufferViews.size(); ++i) {
+    const tinygltf::BufferView &bufferView = model.bufferViews[i];
+    if (bufferView.target == 0) {  // TODO impl drawarrays
+      std::cout << "WARN: bufferView.target is zero" << std::endl;
+      continue;  // Unsupported bufferView.
+                 /*
+                   From spec2.0 readme:
+                   https://github.com/KhronosGroup/glTF/tree/master/specification/2.0
+                            ... drawArrays function should be used with a count equal to
+                   the count            property of any of the accessors referenced by the attributes
+                   property            (they are all equal for a given primitive).
+                 */
+    }
+
+    tinygltf::Buffer buffer = model.buffers[bufferView.buffer];
+    std::cout << "bufferview.target " << bufferView.target << std::endl;
+
+    GLuint vbo;
+    glGenBuffers(1, &vbo);
+    vbos[i] = vbo;
+    glBindBuffer(bufferView.target, vbo);
+
+    std::cout << "buffer.data.size = " << buffer.data.size()
+              << ", bufferview.byteOffset = " << bufferView.byteOffset
+              << std::endl;
+
+    glBufferData(bufferView.target, bufferView.byteLength,
+                 &buffer.data.at(0) + bufferView.byteOffset, GL_STATIC_DRAW);
+  }
+
+  for (size_t i = 0; i < mesh.primitives.size(); ++i) {
+    tinygltf::Primitive primitive = mesh.primitives[i];
+    tinygltf::Accessor indexAccessor = model.accessors[primitive.indices];
+
+    for (auto &attrib : primitive.attributes) {
+      tinygltf::Accessor accessor = model.accessors[attrib.second];
+      int byteStride =
+          accessor.ByteStride(model.bufferViews[accessor.bufferView]);
+      glBindBuffer(GL_ARRAY_BUFFER, vbos[accessor.bufferView]);
+
+      int size = 1;
+      if (accessor.type != TINYGLTF_TYPE_SCALAR) {
+        size = accessor.type;
+      }
+
+      int vaa = -1;
+      if (attrib.first.compare("POSITION") == 0) vaa = 0;
+      if (attrib.first.compare("NORMAL") == 0) vaa = 1;
+      if (attrib.first.compare("TEXCOORD_0") == 0) vaa = 2;
+      if (vaa > -1) {
+        glEnableVertexAttribArray(vaa);
+        glVertexAttribPointer(vaa, size, accessor.componentType,
+                              accessor.normalized ? GL_TRUE : GL_FALSE,
+                              byteStride, BUFFER_OFFSET(accessor.byteOffset));
+      } else
+        std::cout << "vaa missing: " << attrib.first << std::endl;
+    }
+
+    GLuint texid;
+    glGenTextures(1, &texid);
+
+    tinygltf::Texture &tex = model.textures[0];
+    tinygltf::Image &image = model.images[tex.source];
+
+    glBindTexture(GL_TEXTURE_2D, texid);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width, image.height, 0,
+                 GL_RGBA, GL_UNSIGNED_BYTE, &image.image.at(0));
+  }
+
+  return vbos;
+}
+
+// bind models
+void bindModelNodes(std::map<int, GLuint> vbos, tinygltf::Model &model,
+                    tinygltf::Node &node) {
+  bindMesh(vbos, model, model.meshes[node.mesh]);
+  for (size_t i = 0; i < node.children.size(); i++) {
+    bindModelNodes(vbos, model, model.nodes[node.children[i]]);
+  }
+}
+GLuint bindModel(tinygltf::Model &model) {
+  std::map<int, GLuint> vbos;
+  GLuint vao;
+  glGenVertexArrays(1, &vao);
+  glBindVertexArray(vao);
+
+  const tinygltf::Scene &scene = model.scenes[model.defaultScene];
+  for (size_t i = 0; i < scene.nodes.size(); ++i) {
+    bindModelNodes(vbos, model, model.nodes[scene.nodes[i]]);
+  }
+
+  glBindVertexArray(0);
+  // cleanup vbos
+  for (size_t i = 0; i < vbos.size(); ++i) {
+    glDeleteBuffers(1, &vbos[i]);
+  }
+
+  return vao;
+}
+
+void drawMesh(tinygltf::Model &model, tinygltf::Mesh &mesh) {
+  for (size_t i = 0; i < mesh.primitives.size(); ++i) {
+    tinygltf::Primitive primitive = mesh.primitives[i];
+    tinygltf::Accessor indexAccessor = model.accessors[primitive.indices];
+
+    glDrawElements(primitive.mode, indexAccessor.count,
+                   indexAccessor.componentType,
+                   BUFFER_OFFSET(indexAccessor.byteOffset));
+  }
+}
+
+// recursively draw node and children nodes of model
+void drawModelNodes(tinygltf::Model &model, tinygltf::Node &node) {
+  drawMesh(model, model.meshes[node.mesh]);
+  for (size_t i = 0; i < node.children.size(); i++) {
+    drawModelNodes(model, model.nodes[node.children[i]]);
+  }
+}
+void drawModel(GLuint vao, tinygltf::Model &model) {
+  glBindVertexArray(vao);
+
+  const tinygltf::Scene &scene = model.scenes[model.defaultScene];
+  for (size_t i = 0; i < scene.nodes.size(); ++i) {
+    drawModelNodes(model, model.nodes[scene.nodes[i]]);
+  }
+
+  glBindVertexArray(0);
+}
+
+void dbgModel(tinygltf::Model &model) {
+  for (auto &mesh : model.meshes) {
+    std::cout << "mesh : " << mesh.name << std::endl;
+    for (auto &primitive : mesh.primitives) {
+      const tinygltf::Accessor &indexAccessor =
+          model.accessors[primitive.indices];
+
+      std::cout << "indexaccessor: count " << indexAccessor.count << ", type "
+                << indexAccessor.componentType << std::endl;
+
+      tinygltf::Material &mat = model.materials[primitive.material];
+      for (auto &mats : mat.values) {
+        std::cout << "mat : " << mats.first.c_str() << std::endl;
+      }
+
+      for (auto &image : model.images) {
+        std::cout << "image name : " << image.uri << std::endl;
+        std::cout << "  size : " << image.image.size() << std::endl;
+        std::cout << "  w/h : " << image.width << "/" << image.height
+                  << std::endl;
+      }
+
+      std::cout << "indices : " << primitive.indices << std::endl;
+      std::cout << "mode     : "
+                << "(" << primitive.mode << ")" << std::endl;
+
+      for (auto &attrib : primitive.attributes) {
+        std::cout << "attribute : " << attrib.first.c_str() << std::endl;
+      }
+    }
+  }
+}
+
+glm::mat4 genView(glm::vec3 pos, glm::vec3 lookat) {
+  // Camera matrix
+  glm::mat4 view = glm::lookAt(
+      pos,                // Camera in World Space
+      lookat,             // and looks at the origin
+      glm::vec3(0, 1, 0)  // Head is up (set to 0,-1,0 to look upside-down)
+  );
+
+  return view;
+}
+
+glm::mat4 genMVP(glm::mat4 view_mat, glm::mat4 model_mat, float fov, int w,
+                 int h) {
+  glm::mat4 Projection =
+      glm::perspective(glm::radians(fov), (float)w / (float)h, 0.01f, 1000.0f);
+
+  // Or, for an ortho camera :
+  // glm::mat4 Projection = glm::ortho(-10.0f,10.0f,-10.0f,10.0f,0.0f,100.0f);
+  // // In world coordinates
+
+  glm::mat4 mvp = Projection * view_mat * model_mat;
+
+  return mvp;
+}
+
+void displayLoop(Window &window, const std::string &filename) {
+  Shaders shader = Shaders();
+  glUseProgram(shader.pid);
+
+  // grab uniforms to modify
+  GLuint MVP_u = glGetUniformLocation(shader.pid, "MVP");
+  GLuint sun_position_u = glGetUniformLocation(shader.pid, "sun_position");
+  GLuint sun_color_u = glGetUniformLocation(shader.pid, "sun_color");
+
+  tinygltf::Model model;
+  if (!loadModel(model, filename.c_str())) return;
+
+  GLuint vao = bindModel(model);
+  // dbgModel(model); return;
+
+  // Model matrix : an identity matrix (model will be at the origin)
+  glm::mat4 model_mat = glm::mat4(1.0f);
+  glm::mat4 model_rot = glm::mat4(1.0f);
+  glm::vec3 model_pos = glm::vec3(-3, 0, -3);
+
+  // generate a camera view, based on eye-position and lookAt world-position
+  glm::mat4 view_mat = genView(glm::vec3(2, 2, 2), model_pos);
+
+  glm::vec3 sun_position = glm::vec3(3.0, 10.0, -5.0);
+  glm::vec3 sun_color = glm::vec3(1.0);
+
+  while (!window.Close()) {
+    window.Resize();
+
+    glClearColor(0.2, 0.2, 0.2, 1.0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glm::mat4 trans =
+        glm::translate(glm::mat4(1.0f), model_pos);  // reposition model
+    model_rot = glm::rotate(model_rot, glm::radians(0.8f),
+                            glm::vec3(0, 1, 0));  // rotate model on y axis
+    model_mat = trans * model_rot;
+
+    // build a model-view-projection
+    GLint w, h;
+    glfwGetWindowSize(window.window, &w, &h);
+    glm::mat4 mvp = genMVP(view_mat, model_mat, 45.0f, w, h);
+    glUniformMatrix4fv(MVP_u, 1, GL_FALSE, &mvp[0][0]);
+
+    glUniform3fv(sun_position_u, 1, &sun_position[0]);
+    glUniform3fv(sun_color_u, 1, &sun_color[0]);
+
+    drawModel(vao, model);
+    glfwSwapBuffers(window.window);
+    glfwPollEvents();
+  }
+}
+
+int main(int argc, char **argv) {
+  std::string filename = "../../models/Cube/Cube.gltf";
+
+  if (argc > 1) {
+    filename = argv[1];
+  }
+
+  if (!glfwInit()) return -1;
+
+  // Force create 3.3 profile.
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+  glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+#ifdef __APPLE__
+  glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+#endif
+
+  Window window = Window(800, 600, "TinyGLTF basic example");
+  glfwMakeContextCurrent(window.window);
+
+#ifdef __APPLE__
+  // https://stackoverflow.com/questions/50192625/openggl-segmentation-fault
+  glewExperimental = GL_TRUE;
+#endif
+
+  if (glewInit() != GLEW_OK) {
+    std::cerr << "glew init error." << std::endl;
+    return EXIT_FAILURE;
+  }
+    
+  std::cout << glGetString(GL_RENDERER) << ", " << glGetString(GL_VERSION)
+            << std::endl;
+
+  if (!GLEW_VERSION_3_3) {
+    std::cerr << "OpenGL 3.3 is required to execute this app." << std::endl;
+    return EXIT_FAILURE;
+  }
+
+  glEnable(GL_DEPTH_TEST);
+  glDepthFunc(GL_LESS);
+
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glEnable(GL_BLEND);
+
+  displayLoop(window, filename);
+
+  glfwTerminate();
+  return 0;
+}
--- a/examples/build-gltf/Makefile
+++ b/examples/build-gltf/Makefile
@@ -1,2 +0,0 @@
-all:
-	$(CXX) -o create_triangle_gltf -I../../ create_triangle_gltf.cpp
--- a/examples/build-gltf/create_triangle_gltf.cpp
+++ b/examples/build-gltf/create_triangle_gltf.cpp
@@ -1,121 +0,0 @@
-// An example of how to generate a gltf file from scratch. This example
-// was translated from the pygltlib documentation in the pypi project page,
-// which in turn is based on the Khronos Sample Models at:
-//
-// https://github.com/KhronosGroup/glTF-Sample-Models
-//
-// This example is released under the MIT license. 
-//
-// 2021-02-25 Thu
-// Dov Grobgeld <dov.grobgeld@gmail.com>
-
-
-// Define these only in *one* .cc file.
-#define TINYGLTF_IMPLEMENTATION
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-
-// #define TINYGLTF_NOEXCEPTION // optional. disable exception handling.
-#include "tiny_gltf.h"
-
-int main(int argc, char **argv)
-{
-  // Create a model with a single mesh and save it as a gltf file
-  tinygltf::Model m;
-  tinygltf::Scene scene;
-  tinygltf::Mesh mesh;
-  tinygltf::Primitive primitive;
-  tinygltf::Node node;
-  tinygltf::Buffer buffer;
-  tinygltf::BufferView bufferView1;
-  tinygltf::BufferView bufferView2;
-  tinygltf::Accessor accessor1;
-  tinygltf::Accessor accessor2;
-  tinygltf::Asset asset;
-
-  // This is the raw data buffer. 
-  buffer.data = {
-    // 6 bytes of indices and two bytes of padding
-    0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,
-    // 36 bytes of floating point numbers
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x3f,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x3f,
-    0x00,0x00,0x00,0x00};
-
-  // "The indices of the vertices (ELEMENT_ARRAY_BUFFER) take up 6 bytes in the
-  // start of the buffer.
-  bufferView1.buffer = 0;
-  bufferView1.byteOffset=0;
-  bufferView1.byteLength=6;
-  bufferView1.target = TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER;
-
-  // The vertices take up 36 bytes (3 vertices * 3 floating points * 4 bytes)
-  // at position 8 in the buffer and are of type ARRAY_BUFFER
-  bufferView2.buffer = 0;
-  bufferView2.byteOffset=8;
-  bufferView2.byteLength=36;
-  bufferView2.target = TINYGLTF_TARGET_ARRAY_BUFFER;
-
-  // Describe the layout of bufferView1, the indices of the vertices
-  accessor1.bufferView = 0;
-  accessor1.byteOffset = 0;
-  accessor1.componentType = TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT;
-  accessor1.count = 3;
-  accessor1.type = TINYGLTF_TYPE_SCALAR;
-  accessor1.maxValues.push_back(2);
-  accessor1.minValues.push_back(0);
-
-  // Describe the layout of bufferView2, the vertices themself
-  accessor2.bufferView = 1;
-  accessor2.byteOffset = 0;
-  accessor2.componentType = TINYGLTF_COMPONENT_TYPE_FLOAT;
-  accessor2.count = 3;
-  accessor2.type = TINYGLTF_TYPE_VEC3;
-  accessor2.maxValues = {1.0, 1.0, 0.0};
-  accessor2.minValues = {0.0, 0.0, 0.0};
-
-  // Build the mesh primitive and add it to the mesh
-  primitive.indices = 0;                 // The index of the accessor for the vertex indices
-  primitive.attributes["POSITION"] = 1;  // The index of the accessor for positions
-  primitive.material = 0;
-  primitive.mode = TINYGLTF_MODE_TRIANGLES;
-  mesh.primitives.push_back(primitive);
-
-  // Other tie ups
-  node.mesh = 0;
-  scene.nodes.push_back(0); // Default scene
-
-  // Define the asset. The version is required
-  asset.version = "2.0";
-  asset.generator = "tinygltf";
-
-  // Now all that remains is to tie back all the loose objects into the
-  // our single model.
-  m.scenes.push_back(scene);
-  m.meshes.push_back(mesh);
-  m.nodes.push_back(node);
-  m.buffers.push_back(buffer);
-  m.bufferViews.push_back(bufferView1);
-  m.bufferViews.push_back(bufferView2);
-  m.accessors.push_back(accessor1);
-  m.accessors.push_back(accessor2);
-  m.asset = asset;
-
-  // Create a simple material
-  tinygltf::Material mat;
-  mat.pbrMetallicRoughness.baseColorFactor = {1.0f, 0.9f, 0.9f, 1.0f};  
-  mat.doubleSided = true;
-  m.materials.push_back(mat);
-
-  // Save it to a file
-  tinygltf::TinyGLTF gltf;
-  gltf.WriteGltfSceneToFile(&m, "triangle.gltf",
-                           true, // embedImages
-                           true, // embedBuffers
-                           true, // pretty print
-                           false); // write binary
-  
-  exit(0);
-}
--- a/examples/common/LICENSE.lodepng
+++ b/examples/common/LICENSE.lodepng
@@ -1,21 +0,0 @@
-Copyright (c) 2005-2018 Lode Vandevenne
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-    distribution.
-    
--- a/examples/common/lodepng.cpp
+++ b/examples/common/lodepng.cpp
--- a/examples/common/lodepng.h
+++ b/examples/common/lodepng.h
--- a/examples/common/tinyexr.h
+++ b/examples/common/tinyexr.h
--- a/examples/dxview/CMakeLists.txt
+++ b/examples/dxview/CMakeLists.txt
@@ -1,36 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(dxview)
-
-find_package(glfw3 CONFIG REQUIRED)
-find_package(spdlog CONFIG REQUIRED)
-
-add_executable(dxview
-    src/Viewer.h
-    src/Viewer.cc
-    src/dxview.cc
-)
-
-target_include_directories(dxview
-PRIVATE
-    ../../
-)
-
-target_compile_definitions(dxview
-PRIVATE
-    DXVIEW_SWAP_CHAIN_BUFFER_COUNT=3
-    DXVIEW_RES_DIR=L"${PROJECT_SOURCE_DIR}/res"
-)
-
-target_link_libraries(dxview
-PRIVATE
-    dxgi
-    d3dcompiler
-    d3d12
-    glfw
-    spdlog::spdlog
-)
-
-set_target_properties(dxview
-PROPERTIES
-    CXX_STANDARD 17
-)
--- a/examples/dxview/README.md
+++ b/examples/dxview/README.md
@@ -1,37 +0,0 @@
-# DirectX glTF Viewer
-
-## Overview
-
-This project was motivated by a lack of sample code demonstrating the graphics API agnostic nature of the glTF specification. The sample code is written using modern C++ and DirectX 12 for the client application.
-
-## Features
-
-* [x] DirectX 12
-* [ ] Loader
-* [ ] Animation
-* [ ] Morph Target
-* [ ] Physical Base Rendering
-* [ ] Environment Map
-
-## Dependencies
-
-* [CMake](https://github.com/Kitware/CMake)
-* [Vcpkg](https://github.com/Microsoft/vcpkg)
-* [GLFW](https://github.com/glfw/glfw)
-* [spdlog](https://github.com/gabime/spdlog)
-
-## Building
-
-### Install dependencies
-
-```
-vcpkg install glfw3:x64-windows
-vcpkg install spdlog:x64-windows
-```
-
-### Generate Project Files
-
-```
-mkdir build
-cmake . -B build -DCMAKE_TOOLCHAIN_FILE=${VCPKG_DIR}/script/buildsystem/vcpkg.cmake
-```
--- a/examples/dxview/res/gray.hlsl
+++ b/examples/dxview/res/gray.hlsl
@@ -1,3 +0,0 @@
-float4 main() : SV_Target {
-    return float4(0.5, 0.5, 0.5, 1.0);
-}
--- a/examples/dxview/res/lighting.hlsl
+++ b/examples/dxview/res/lighting.hlsl
@@ -1,52 +0,0 @@
-struct RS2PS {
-    float4 position : SV_POSITION;
-
-#ifdef HAS_TEXCOORD_0
-    float2 texcoord_0: TEXCOORD_0;
-#endif
-};
-
-struct TextureInfo {
-    uint textureIndex;
-    uint samplerIndex;
-};
-
-struct PBRMetallicRoughness {
-    float4 baseColorFactor;
-    TextureInfo baseColorTexture;
-    float metallicFactor;
-    float roughnessFactor;
-    TextureInfo metallicRoughnessTexture;
-};
-
-cbuffer Material : register(b2) {
-    PBRMetallicRoughness pbrMetallicRoughness;
-};
-
-Texture2D textures[5] : register(t0);
-SamplerState samplerState[5] : register(s0);
-
-float4 getBaseColor(float2 uv) {
-    float4 baseColor = pbrMetallicRoughness.baseColorFactor;
-
-#ifdef HAS_TEXCOORD_0
-    TextureInfo baseColorTexture = pbrMetallicRoughness.baseColorTexture;
-    if (baseColorTexture.textureIndex >= 0) {
-        baseColor *= textures[baseColorTexture.textureIndex].Sample(samplerState[baseColorTexture.samplerIndex], uv);
-    }
-#endif
-
-    return baseColor;
-}
-
-float4 main(RS2PS input) : SV_Target {
-    float2 uv = float2(0.0, 0.0);
-
-#ifdef HAS_TEXCOORD_0
-    uv = input.texcoord_0;
-#endif
-
-    float4 color = getBaseColor(uv);
-
-    return color;
-}
--- a/examples/dxview/res/primitive.hlsl
+++ b/examples/dxview/res/primitive.hlsl
@@ -1,46 +0,0 @@
-struct IA2VS {
-    float3 position  : POSITION;
-
-#ifdef HAS_NORMAL
-    float3 normal : NORMAL;
-#endif
-
-#ifdef HAS_TANGENT
-    float4 tangent : TANGENT;
-#endif
-
-#ifdef HAS_TEXCOORD_0
-    float2 texcoord_0: TEXCOORD_0;
-#endif
-};
-
-struct VS2RS {
-    float4 position : SV_POSITION;
-
-#ifdef HAS_TEXCOORD_0
-    float2 texcoord_0: TEXCOORD_0;
-#endif
-};
-
-cbuffer Camera : register(b0) {
-    float4x4 V;
-    float4x4 P;
-    float4x4 VP;
-};
-
-cbuffer Node : register(b1) {
-    float4x4 M;
-};
-
-VS2RS main(IA2VS input) {
-    VS2RS output;
-    output.position = mul(float4(input.position, 1.0), M);
-    output.position = mul(output.position, V);
-    output.position = mul(output.position, P);
-
-#ifdef HAS_TEXCOORD_0
-    output.texcoord_0 = input.texcoord_0;
-#endif
-
-    return output;
-}
--- a/examples/dxview/src/Viewer.cc
+++ b/examples/dxview/src/Viewer.cc
--- a/examples/dxview/src/Viewer.h
+++ b/examples/dxview/src/Viewer.h
@@ -1,130 +0,0 @@
-#ifndef DXVIEW_VIEWER_GUARD
-#define DXVIEW_VIEWER_GUARD
-
-#include <DirectXMath.h>
-#include <d3d12.h>
-#include <dxgi1_6.h>
-#include <tiny_gltf.h>
-#include <wrl.h>
-
-#include <filesystem>
-#include <map>
-#include <string>
-#include <vector>
-
-using Microsoft::WRL::ComPtr;
-
-enum RenderPassType { RENDER_PASS_TYPE_PRESENT = 0, RENDER_PASS_TYPE_COUNT };
-
-struct RenderTarget {
-  ComPtr<ID3D12Resource> pTexture;
-  D3D12_CPU_DESCRIPTOR_HANDLE viewDescriptor;
-};
-
-struct TextureInfo {
-  int32_t textureIndex;
-  int32_t samplerIndex;
-};
-
-struct PBRMetallicRoughness {
-  DirectX::XMFLOAT4 baseColorFactor;
-  TextureInfo baseColorTexture;
-  float metallicFactor;
-  float roughnessFactor;
-  TextureInfo metallicRoughnessTexture;
-};
-
-struct Material {
-  std::string name;
-  D3D12_BLEND_DESC blendDesc;
-  D3D12_RASTERIZER_DESC rasterizerDesc;
-  ComPtr<ID3D12Resource> pBuffer;
-  void* pBufferData;
-  ComPtr<ID3D12DescriptorHeap> pSRVDescriptorHeap;
-  ComPtr<ID3D12DescriptorHeap> pSamplerDescriptorHeap;
-};
-
-struct Attribute {
-  std::string name;
-  DXGI_FORMAT format;
-  D3D12_VERTEX_BUFFER_VIEW vertexBufferView;
-};
-
-struct Primitive {
-  std::vector<Attribute> attributes;
-  uint32_t vertexCount;
-  D3D12_PRIMITIVE_TOPOLOGY primitiveTopology;
-  D3D12_INDEX_BUFFER_VIEW indexBufferView;
-  uint32_t indexCount;
-  Material* pMaterial;
-  ComPtr<ID3D12RootSignature> pRootSignature;
-  ComPtr<ID3D12PipelineState> pPipelineState;
-};
-
-struct Mesh {
-  std::string name;
-  std::vector<Primitive> primitives;
-};
-
-struct Node {
-  DirectX::XMFLOAT4X4 M;
-};
-
-struct Camera {
-  DirectX::XMFLOAT4X4 V;
-  DirectX::XMFLOAT4X4 P;
-  DirectX::XMFLOAT4X4 VP;
-};
-
-class Viewer {
- public:
-  Viewer(HWND window, tinygltf::Model* pModel);
-
-  void update(double deltaTime);
-  void render(double deltaTime);
-
- private:
-  void initDirectX(HWND window);
-  void buildRenderTargets();
-  void buildResources();
-  void buildBuffers(std::vector<ComPtr<ID3D12Resource> >* pStagingResources);
-  void buildImages(std::vector<ComPtr<ID3D12Resource> >* pStagingResources);
-  void buildSamplerDescs();
-  void buildMaterials();
-  void buildMeshes();
-  void buildNodes();
-
-  void drawNode(uint64_t nodeIndex);
-
- private:
-  tinygltf::Model* pModel_;
-  ComPtr<IDXGIFactory1> pFactory_;
-  ComPtr<IDXGIAdapter1> pAdapter_;
-  ComPtr<ID3D12Device> pDevice_;
-  ComPtr<ID3D12CommandQueue> pDirectCommandQueue_;
-  UINT64 directFenceValue_;
-  ComPtr<ID3D12Fence> pDirectFence_;
-  ComPtr<ID3D12CommandQueue> pCopyCommandQueue_;
-  UINT64 copyFenceValue_;
-  ComPtr<ID3D12Fence> pCopyFence_;
-  ComPtr<IDXGISwapChain3> pSwapChain_;
-  ComPtr<ID3D12Resource> pSwapChainBuffers_[DXVIEW_SWAP_CHAIN_BUFFER_COUNT];
-  ComPtr<ID3D12CommandAllocator>
-      pDirectCommandAllocators_[DXVIEW_SWAP_CHAIN_BUFFER_COUNT];
-  ComPtr<ID3D12GraphicsCommandList> pDirectCommandList_;
-  ComPtr<ID3D12CommandAllocator> pCopyCommandAllocator_;
-  ComPtr<ID3D12GraphicsCommandList> pCopyCommandList_;
-  UINT descriptorIncrementSize_[D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES];
-  ComPtr<ID3D12DescriptorHeap>
-      pRTVDescriptorHeaps_[DXVIEW_SWAP_CHAIN_BUFFER_COUNT];
-  std::vector<RenderTarget> renderTargets_[DXVIEW_SWAP_CHAIN_BUFFER_COUNT];
-  std::vector<ComPtr<ID3D12Resource> > pBuffers_;
-  std::vector<ComPtr<ID3D12Resource> > pTextures_;
-  std::vector<D3D12_SAMPLER_DESC> samplerDescs_;
-  std::vector<Material> materials_;
-  std::vector<Mesh> meshes_;
-  std::vector<ComPtr<ID3D12Resource> > pNodeBuffers_;
-  ComPtr<ID3D12Resource> pCameraBuffer_;
-};
-
-#endif
--- a/examples/dxview/src/dxview.cc
+++ b/examples/dxview/src/dxview.cc
@@ -1,90 +0,0 @@
-#define GLFW_EXPOSE_NATIVE_WIN32
-#define TINYGLTF_IMPLEMENTATION
-#define STBI_MSC_SECURE_CRT
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-
-#include <GLFW/glfw3.h>
-#include <GLFW/glfw3native.h>
-#include <spdlog/spdlog.h>
-#include <tiny_gltf.h>
-
-#undef GLFW_EXPOSE_NATIVE_WIN32
-#undef TINYGLTF_IMPLEMENTATION
-#undef STBI_MSC_SECURE_CRT
-#undef STB_IMAGE_IMPLEMENTATION
-#undef STB_IMAGE_WRITE_IMPLEMENTATION
-
-#include <iostream>
-#include <string>
-
-#include "Viewer.h"
-
-static void onError(int error, const char* message) {
-  spdlog::error("[{}] {}", error, message);
-}
-
-static void onRender(Viewer* pViewer, double deltaTime) {
-  pViewer->update(deltaTime);
-  pViewer->render(deltaTime);
-}
-
-int main(int argc, char* argv[]) {
-  tinygltf::TinyGLTF context;
-
-  tinygltf::Model model;
-  std::string error;
-  std::string warning;
-  if (!context.LoadASCIIFromFile(&model, &error, &warning, argv[1])) {
-    if (!error.empty()) {
-      spdlog::error("{}", error);
-    }
-
-    if (!warning.empty()) {
-      spdlog::warn("{}", warning);
-    }
-
-    exit(EXIT_FAILURE);
-  }
-
-  GLFWwindow* pWindow;
-
-  glfwSetErrorCallback(onError);
-
-  if (!glfwInit()) {
-    spdlog::error("Fail to initialize GLFW!!!");
-    exit(EXIT_FAILURE);
-  }
-
-  glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
-  glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
-
-  pWindow = glfwCreateWindow(512, 512, "dxview", nullptr, nullptr);
-  if (!pWindow) {
-    spdlog::error("Fail to create GLFWwindow!!!");
-    glfwTerminate();
-    exit(EXIT_FAILURE);
-  }
-
-  auto pViewer = std::make_unique<Viewer>(glfwGetWin32Window(pWindow), &model);
-  if (!pViewer) {
-    spdlog::error("Fail to create Viewer");
-    glfwDestroyWindow(pWindow);
-    glfwTerminate();
-    exit(EXIT_FAILURE);
-  }
-
-  auto prevTimeStamp = glfwGetTime();
-  while (!glfwWindowShouldClose(pWindow)) {
-    auto currTimeStamp = glfwGetTime();
-
-    onRender(pViewer.get(), currTimeStamp - prevTimeStamp);
-    prevTimeStamp = currTimeStamp;
-
-    glfwPollEvents();
-  }
-
-  glfwDestroyWindow(pWindow);
-  glfwTerminate();
-  exit(EXIT_SUCCESS);
-}
--- a/examples/gltfutil/CMakeLists.txt
+++ b/examples/gltfutil/CMakeLists.txt
@@ -4,10 +4,9 @@ project(gltfutil)
 set(CMAKE_CXX_STANDARD 11)

 include_directories(../../)
-include_directories(../common/)

 file(GLOB gltfutil_sources *.cc *.h)
-add_executable(gltfutil ${gltfutil_sources} ../common/lodepng.cpp)
+add_executable(gltfutil ${gltfutil_sources})

 install ( TARGETS
  gltfutil
--- a/examples/gltfutil/gltfuilconfig.h
+++ b/examples/gltfutil/gltfuilconfig.h
@@ -49,7 +49,6 @@ struct configuration {
  cli_action action = cli_action::not_set;
  texture_dumper::texture_output_format requested_format =
      texture_dumper::texture_output_format::not_specified;
-  bool use_exr = false;

  bool has_output_dir;
  bool is_valid() {
--- a/examples/gltfutil/main.cc
+++ b/examples/gltfutil/main.cc
@@ -11,9 +11,6 @@
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"

-#define TINYEXR_IMPLEMENTATION
-#include "tinyexr.h"
-
 namespace gltfutil {
 int usage(int ret = 0) {
  using std::cout;
@@ -23,9 +20,8 @@ int usage(int ret = 0) {
          "[path to output directory])\n\n"
       //<< "\t\t -i: start in interactive mode\n"
       << "\t\t -d: dump enclosed content (image assets)\n"
-       << "\t\t -f: file format for image output\n"
-       << "\t\t -o: ouptput directory path\n"
-       << "\t\t -e: Use OpenEXR format for 16bit image\n"
+       << "\t\t -f: file format for image output"
+       << "\t\t -o: ouptput directory path"
       << "\t\t -h: print this help\n";
  return ret;
 }
@@ -48,9 +44,6 @@ int parse_args(int argc, char** argv) {
          config.mode = ui_mode::cli;
          config.action = cli_action::dump;
          break;
-        case 'e':
-          config.use_exr = true;
-          break;
        case 'i':
          config.mode = ui_mode::interactive;
          break;
@@ -104,11 +97,6 @@ int parse_args(int argc, char** argv) {

        case cli_action::dump: {
          texture_dumper dumper(model);
-
-          if (config.use_exr) {
-            dumper.set_use_exr(true);
-          }
-
          if (config.requested_format !=
              texture_dumper::texture_output_format::not_specified)
            dumper.set_output_format(config.requested_format);
--- a/examples/gltfutil/texture_dumper.cc
+++ b/examples/gltfutil/texture_dumper.cc
@@ -1,84 +1,15 @@
-#include <algorithm>
 #include <iostream>
+#include <algorithm>

 #include "stb_image_write.h"
 #include "texture_dumper.h"

-#include "lodepng.h"  // ../common
-
-#include "tinyexr.h"
-
 #include <tiny_gltf.h>

 using namespace gltfutil;
 using namespace tinygltf;
 using std::cout;

-static LodePNGColorType GetLodePNGColorType(int channels) {
-  if (channels == 1) {
-    return LodePNGColorType::LCT_GREY;
-  } else if (channels == 2) {
-    return LodePNGColorType::LCT_GREY_ALPHA;
-  } else if (channels == 3) {
-    return LodePNGColorType::LCT_RGB;
-  } else if (channels == 4) {
-    return LodePNGColorType::LCT_RGBA;
-  } else {
-    std::cerr << "??? unsupported channels " << channels << "\n";
-    return LodePNGColorType::LCT_RGB;  // FIXME(syoyo): Raise error
-  }
-}
-
-static void ToBigEndian(std::vector<uint8_t>* image) {
-
-  assert(image->size() % 2 == 0);
-
-  union {
-    unsigned int i;
-    char c[4];
-  } bint = {0x01020304};
-
-  bool is_big_endian = (bint.c[0] == 1);
-
-  if (is_big_endian) {
-    return;
-  }
-
-  uint16_t *ptr = reinterpret_cast<uint16_t *>(image->data());
-  size_t n = image->size() / 2;
-
-  for (size_t i = 0; i < n; i++) {
-    ptr[i] = ((0xFF00 & ptr[i]) >> 8) | ((0x00FF & ptr[i]) << 8);
-  }
-}
-
-static bool Save16bitImageAsEXR(const std::string& filename,
-                                const tinygltf::Image& image) {
-  assert(image.bits == 16);
-
-  std::vector<float> buf(image.width * image.height * image.component);
-
-  // widen to float image.
-  // Store as is(i.e, pixel value range is [0.0, 65535.0])
-  const unsigned short* ptr =
-      reinterpret_cast<const unsigned short*>(image.image.data());
-  for (size_t i = 0; i < image.width * image.height * image.component; i++) {
-    buf[i] = float(ptr[i]);
-  }
-
-  const char* err = nullptr;
-  int ret = SaveEXR(buf.data(), image.width, image.height, image.component,
-                    /* save_as_fp16 */ 0, filename.c_str(), &err);
-
-  if (err) {
-    std::cerr << "EXR err: " << err << std::endl;
-    FreeEXRErrorMessage(err);
-    return false;
-  }
-
-  return (ret == TINYEXR_SUCCESS);
-}
-
 texture_dumper::texture_dumper(const Model& input)
    : model(input), configured_format(texture_output_format::png) {
  cout << "Texture dumper\n";
@@ -95,58 +26,26 @@ void texture_dumper::dump_to_folder(const std::string& path) {
    cout << "image name is: \"" << image.name << "\"\n";
    cout << "image size is: " << image.width << 'x' << image.height << '\n';
    cout << "pixel channel count :" << image.component << '\n';
-    cout << "pixel bit depth :" << image.bits << '\n';
-    std::string basename =
-        image.name.empty() ? std::to_string(index) : image.name;
+    std::string name = image.name.empty() ? std::to_string(index) : image.name;

-    unsigned char* bytes_to_write =
-        const_cast<unsigned char*>(image.image.data());
-
-    std::string filename;
    switch (configured_format) {
      case texture_output_format::png:
-        filename = path + "/" + basename + ".png";
-
-        if (this->use_exr) {
-          if (image.pixel_type == TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT) {
-            filename = path + "/" + basename + ".exr";
-          }
-        }
-
-        std::cout << "Image will be written to " << filename << '\n';
-
-        if (image.pixel_type == TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT) {
-          if (this->use_exr) {
-            bool ret = Save16bitImageAsEXR(filename, image);
-            assert(ret);
-          } else {
-            // Use lodepng to save 16bit PNG.
-            // NOTE(syoyo): `loadpng::encode` requires image data must be stored in big endian.
-            std::vector<uint8_t> tmp = image.image; // copy
-            ToBigEndian(&tmp);
-
-            unsigned ret = lodepng::encode(
-                filename, tmp.data(), image.width, image.height,
-                GetLodePNGColorType(image.component), /* bits */ 16);
-            assert(ret == 0);  // 0 = no err.
-          }
-        } else {
-          // TODO(syoyo): check status
-          stbi_write_png(filename.c_str(), image.width, image.height,
-                         image.component, bytes_to_write, 0);
-        }
+        name = path + "/" + name + ".png";
+        std::cout << "Image will be written to " << name << '\n';
+        stbi_write_png(name.c_str(), image.width, image.height, image.component,
+                       image.image.data(), 0);
        break;
      case texture_output_format::bmp:
-        filename = path + "/" + basename + ".bmp";
-        std::cout << "Image will be written to " << filename << '\n';
-        stbi_write_bmp(filename.c_str(), image.width, image.height,
-                       image.component, bytes_to_write);
+        std::cout << "Image will be written to " << name << '\n';
+        name = path + "/" + name + ".bmp";
+        stbi_write_bmp(name.c_str(), image.width, image.height, image.component,
+                       image.image.data());
        break;
      case texture_output_format::tga:
-        filename = path + "/" + basename + ".tga";
-        std::cout << "Image will be written to " << filename << '\n';
-        stbi_write_tga(filename.c_str(), image.width, image.height,
-                       image.component, bytes_to_write);
+        std::cout << "Image will be written to " << name << '\n';
+        name = path + "/" + name + ".tga";
+        stbi_write_tga(name.c_str(), image.width, image.height, image.component,
+                       image.image.data());
        break;
    }
  }
--- a/examples/gltfutil/texture_dumper.h
+++ b/examples/gltfutil/texture_dumper.h
@@ -12,15 +12,11 @@ class texture_dumper {
 private:
  const tinygltf::Model& model;
  texture_output_format configured_format;
-  bool use_exr = false; // Use EXR for 16bit image?

 public:
  texture_dumper(const tinygltf::Model& inputModel);
  void dump_to_folder(const std::string& path = "./");
  void set_output_format(texture_output_format format);
-  void set_use_exr(const bool value) {
-    use_exr = value;
-  }

  static texture_output_format get_fromat_from_string(const std::string& str);
 };
--- a/examples/glview/glview.cc
+++ b/examples/glview/glview.cc
@@ -28,6 +28,7 @@
 #include "tiny_gltf.h"
 #endif

+
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))

 #define CheckGLErrors(desc)                                                   \
@@ -54,9 +55,7 @@ float eye[3], lookat[3], up[3];

 GLFWwindow *window;

-typedef struct {
-  GLuint vb;
-} GLBufferState;
+typedef struct { GLuint vb; } GLBufferState;

 typedef struct {
  std::vector<GLuint> diffuseTex;  // for each primitive in mesh
@@ -255,26 +254,6 @@ void motionFunc(GLFWwindow *window, double mouse_x, double mouse_y) {
  prevMouseY = mouse_y;
 }

-static size_t ComponentTypeByteSize(int type) {
-  switch (type) {
-    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
-    case TINYGLTF_COMPONENT_TYPE_BYTE:
-      return sizeof(char);
-    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
-    case TINYGLTF_COMPONENT_TYPE_SHORT:
-      return sizeof(short);
-    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
-    case TINYGLTF_COMPONENT_TYPE_INT:
-      return sizeof(int);
-    case TINYGLTF_COMPONENT_TYPE_FLOAT:
-      return sizeof(float);
-    case TINYGLTF_COMPONENT_TYPE_DOUBLE:
-      return sizeof(double);
-    default:
-      return 0;
-  }
-}
-
 static void SetupMeshState(tinygltf::Model &model, GLuint progId) {
  // Buffer
  {
@@ -285,117 +264,14 @@ static void SetupMeshState(tinygltf::Model &model, GLuint progId) {
        continue;  // Unsupported bufferView.
      }

-      int sparse_accessor = -1;
-      for (size_t a_i = 0; a_i < model.accessors.size(); ++a_i) {
-        const auto &accessor = model.accessors[a_i];
-        if (accessor.bufferView == i) {
-          std::cout << i << " is used by accessor " << a_i << std::endl;
-          if (accessor.sparse.isSparse) {
-            std::cout
-                << "WARN: this bufferView has at least one sparse accessor to "
-                   "it. We are going to load the data as patched by this "
-                   "sparse accessor, not the original data"
-                << std::endl;
-            sparse_accessor = a_i;
-            break;
-          }
-        }
-      }
-
      const tinygltf::Buffer &buffer = model.buffers[bufferView.buffer];
      GLBufferState state;
      glGenBuffers(1, &state.vb);
      glBindBuffer(bufferView.target, state.vb);
      std::cout << "buffer.size= " << buffer.data.size()
                << ", byteOffset = " << bufferView.byteOffset << std::endl;
-
-      if (sparse_accessor < 0)
-        glBufferData(bufferView.target, bufferView.byteLength,
-                     &buffer.data.at(0) + bufferView.byteOffset,
-                     GL_STATIC_DRAW);
-      else {
-        const auto accessor = model.accessors[sparse_accessor];
-        // copy the buffer to a temporary one for sparse patching
-        unsigned char *tmp_buffer = new unsigned char[bufferView.byteLength];
-        memcpy(tmp_buffer, buffer.data.data() + bufferView.byteOffset,
-               bufferView.byteLength);
-
-        const size_t size_of_object_in_buffer =
-            ComponentTypeByteSize(accessor.componentType);
-        const size_t size_of_sparse_indices =
-            ComponentTypeByteSize(accessor.sparse.indices.componentType);
-
-        const auto &indices_buffer_view =
-            model.bufferViews[accessor.sparse.indices.bufferView];
-        const auto &indices_buffer = model.buffers[indices_buffer_view.buffer];
-
-        const auto &values_buffer_view =
-            model.bufferViews[accessor.sparse.values.bufferView];
-        const auto &values_buffer = model.buffers[values_buffer_view.buffer];
-
-        for (size_t sparse_index = 0; sparse_index < accessor.sparse.count;
-             ++sparse_index) {
-          int index = 0;
-          // std::cout << "accessor.sparse.indices.componentType = " <<
-          // accessor.sparse.indices.componentType << std::endl;
-          switch (accessor.sparse.indices.componentType) {
-            case TINYGLTF_COMPONENT_TYPE_BYTE:
-            case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
-              index = (int)*(
-                  unsigned char *)(indices_buffer.data.data() +
-                                   indices_buffer_view.byteOffset +
-                                   accessor.sparse.indices.byteOffset +
-                                   (sparse_index * size_of_sparse_indices));
-              break;
-            case TINYGLTF_COMPONENT_TYPE_SHORT:
-            case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
-              index = (int)*(
-                  unsigned short *)(indices_buffer.data.data() +
-                                    indices_buffer_view.byteOffset +
-                                    accessor.sparse.indices.byteOffset +
-                                    (sparse_index * size_of_sparse_indices));
-              break;
-            case TINYGLTF_COMPONENT_TYPE_INT:
-            case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
-              index = (int)*(
-                  unsigned int *)(indices_buffer.data.data() +
-                                  indices_buffer_view.byteOffset +
-                                  accessor.sparse.indices.byteOffset +
-                                  (sparse_index * size_of_sparse_indices));
-              break;
-          }
-          std::cout << "updating sparse data at index  : " << index
-                    << std::endl;
-          // index is now the target of the sparse index to patch in
-          const unsigned char *read_from =
-              values_buffer.data.data() +
-              (values_buffer_view.byteOffset +
-               accessor.sparse.values.byteOffset) +
-              (sparse_index * (size_of_object_in_buffer * accessor.type));
-
-          /*
-          std::cout << ((float*)read_from)[0] << "\n";
-          std::cout << ((float*)read_from)[1] << "\n";
-          std::cout << ((float*)read_from)[2] << "\n";
-          */
-
-          unsigned char *write_to =
-              tmp_buffer + index * (size_of_object_in_buffer * accessor.type);
-
-          memcpy(write_to, read_from, size_of_object_in_buffer * accessor.type);
-        }
-
-        // debug:
-        /*for(size_t p = 0; p < bufferView.byteLength/sizeof(float); p++)
-        {
-          float* b = (float*)tmp_buffer;
-          std::cout << "modified_buffer [" << p << "] = " << b[p] << '\n';
-        }*/
-
-        glBufferData(bufferView.target, bufferView.byteLength, tmp_buffer,
-                     GL_STATIC_DRAW);
-        delete[] tmp_buffer;
-      }
+      glBufferData(bufferView.target, bufferView.byteLength,
+                   &buffer.data.at(0) + bufferView.byteOffset, GL_STATIC_DRAW);
      glBindBuffer(bufferView.target, 0);

      gBufferState[i] = state;
@@ -403,55 +279,55 @@ static void SetupMeshState(tinygltf::Model &model, GLuint progId) {
  }

 #if 0  // TODO(syoyo): Implement
-	// Texture
-	{
-		for (size_t i = 0; i < model.meshes.size(); i++) {
-			const tinygltf::Mesh &mesh = model.meshes[i];
+  // Texture
+  {
+    for (size_t i = 0; i < model.meshes.size(); i++) {
+      const tinygltf::Mesh &mesh = model.meshes[i];

-			gMeshState[mesh.name].diffuseTex.resize(mesh.primitives.size());
-			for (size_t primId = 0; primId < mesh.primitives.size(); primId++) {
-				const tinygltf::Primitive &primitive = mesh.primitives[primId];
+      gMeshState[mesh.name].diffuseTex.resize(mesh.primitives.size());
+      for (size_t primId = 0; primId < mesh.primitives.size(); primId++) {
+        const tinygltf::Primitive &primitive = mesh.primitives[primId];

-				gMeshState[mesh.name].diffuseTex[primId] = 0;
+        gMeshState[mesh.name].diffuseTex[primId] = 0;

-				if (primitive.material < 0) {
-					continue;
-				}
-				tinygltf::Material &mat = model.materials[primitive.material];
-				// printf("material.name = %s\n", mat.name.c_str());
-				if (mat.values.find("diffuse") != mat.values.end()) {
-					std::string diffuseTexName = mat.values["diffuse"].string_value;
-					if (model.textures.find(diffuseTexName) != model.textures.end()) {
-						tinygltf::Texture &tex = model.textures[diffuseTexName];
-						if (scene.images.find(tex.source) != model.images.end()) {
-							tinygltf::Image &image = model.images[tex.source];
-							GLuint texId;
-							glGenTextures(1, &texId);
-							glBindTexture(tex.target, texId);
-							glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-							glTexParameterf(tex.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-							glTexParameterf(tex.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        if (primitive.material < 0) {
+          continue;
+        }
+        tinygltf::Material &mat = model.materials[primitive.material];
+        // printf("material.name = %s\n", mat.name.c_str());
+        if (mat.values.find("diffuse") != mat.values.end()) {
+          std::string diffuseTexName = mat.values["diffuse"].string_value;
+          if (model.textures.find(diffuseTexName) != model.textures.end()) {
+            tinygltf::Texture &tex = model.textures[diffuseTexName];
+            if (scene.images.find(tex.source) != model.images.end()) {
+              tinygltf::Image &image = model.images[tex.source];
+              GLuint texId;
+              glGenTextures(1, &texId);
+              glBindTexture(tex.target, texId);
+              glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+              glTexParameterf(tex.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+              glTexParameterf(tex.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-							// Ignore Texture.fomat.
-							GLenum format = GL_RGBA;
-							if (image.component == 3) {
-								format = GL_RGB;
-							}
-							glTexImage2D(tex.target, 0, tex.internalFormat, image.width,
-									image.height, 0, format, tex.type,
-									&image.image.at(0));
+              // Ignore Texture.fomat.
+              GLenum format = GL_RGBA;
+              if (image.component == 3) {
+                format = GL_RGB;
+              }
+              glTexImage2D(tex.target, 0, tex.internalFormat, image.width,
+                           image.height, 0, format, tex.type,
+                           &image.image.at(0));

-							CheckErrors("texImage2D");
-							glBindTexture(tex.target, 0);
+              CheckErrors("texImage2D");
+              glBindTexture(tex.target, 0);

-							printf("TexId = %d\n", texId);
-							gMeshState[mesh.name].diffuseTex[primId] = texId;
-						}
-					}
-				}
-			}
-		}
-	}
+              printf("TexId = %d\n", texId);
+              gMeshState[mesh.name].diffuseTex[primId] = texId;
+            }
+          }
+        }
+      }
+    }
+  }
 #endif

  glUseProgram(progId);
@@ -472,164 +348,164 @@ static void SetupMeshState(tinygltf::Model &model, GLuint progId) {
 #if 0  // TODO(syoyo): Implement
 // Setup curves geometry extension
 static void SetupCurvesState(tinygltf::Scene &scene, GLuint progId) {
-	// Find curves primitive.
-	{
-		std::map<std::string, tinygltf::Mesh>::const_iterator it(
-				scene.meshes.begin());
-		std::map<std::string, tinygltf::Mesh>::const_iterator itEnd(
-				scene.meshes.end());
+  // Find curves primitive.
+  {
+    std::map<std::string, tinygltf::Mesh>::const_iterator it(
+        scene.meshes.begin());
+    std::map<std::string, tinygltf::Mesh>::const_iterator itEnd(
+        scene.meshes.end());

-		for (; it != itEnd; it++) {
-			const tinygltf::Mesh &mesh = it->second;
+    for (; it != itEnd; it++) {
+      const tinygltf::Mesh &mesh = it->second;

-			// Currently we only support one primitive per mesh.
-			if (mesh.primitives.size() > 1) {
-				continue;
-			}
+      // Currently we only support one primitive per mesh.
+      if (mesh.primitives.size() > 1) {
+        continue;
+      }

-			for (size_t primId = 0; primId < mesh.primitives.size(); primId++) {
-				const tinygltf::Primitive &primitive = mesh.primitives[primId];
+      for (size_t primId = 0; primId < mesh.primitives.size(); primId++) {
+        const tinygltf::Primitive &primitive = mesh.primitives[primId];

-				gMeshState[mesh.name].diffuseTex[primId] = 0;
+        gMeshState[mesh.name].diffuseTex[primId] = 0;

-				if (primitive.material.empty()) {
-					continue;
-				}
+        if (primitive.material.empty()) {
+          continue;
+        }

-				bool has_curves = false;
-				if (primitive.extras.IsObject()) {
-					if (primitive.extras.Has("ext_mode")) {
-						const tinygltf::Value::Object &o =
-							primitive.extras.Get<tinygltf::Value::Object>();
-						const tinygltf::Value &ext_mode = o.find("ext_mode")->second;
+        bool has_curves = false;
+        if (primitive.extras.IsObject()) {
+          if (primitive.extras.Has("ext_mode")) {
+            const tinygltf::Value::Object &o =
+                primitive.extras.Get<tinygltf::Value::Object>();
+            const tinygltf::Value &ext_mode = o.find("ext_mode")->second;

-						if (ext_mode.IsString()) {
-							const std::string &str = ext_mode.Get<std::string>();
-							if (str.compare("curves") == 0) {
-								has_curves = true;
-							}
-						}
-					}
-				}
+            if (ext_mode.IsString()) {
+              const std::string &str = ext_mode.Get<std::string>();
+              if (str.compare("curves") == 0) {
+                has_curves = true;
+              }
+            }
+          }
+        }

-				if (!has_curves) {
-					continue;
-				}
+        if (!has_curves) {
+          continue;
+        }

-				// Construct curves buffer
-				const tinygltf::Accessor &vtx_accessor =
-					scene.accessors[primitive.attributes.find("POSITION")->second];
-				const tinygltf::Accessor &nverts_accessor =
-					scene.accessors[primitive.attributes.find("NVERTS")->second];
-				const tinygltf::BufferView &vtx_bufferView =
-					scene.bufferViews[vtx_accessor.bufferView];
-				const tinygltf::BufferView &nverts_bufferView =
-					scene.bufferViews[nverts_accessor.bufferView];
-				const tinygltf::Buffer &vtx_buffer =
-					scene.buffers[vtx_bufferView.buffer];
-				const tinygltf::Buffer &nverts_buffer =
-					scene.buffers[nverts_bufferView.buffer];
+        // Construct curves buffer
+        const tinygltf::Accessor &vtx_accessor =
+            scene.accessors[primitive.attributes.find("POSITION")->second];
+        const tinygltf::Accessor &nverts_accessor =
+            scene.accessors[primitive.attributes.find("NVERTS")->second];
+        const tinygltf::BufferView &vtx_bufferView =
+            scene.bufferViews[vtx_accessor.bufferView];
+        const tinygltf::BufferView &nverts_bufferView =
+            scene.bufferViews[nverts_accessor.bufferView];
+        const tinygltf::Buffer &vtx_buffer =
+            scene.buffers[vtx_bufferView.buffer];
+        const tinygltf::Buffer &nverts_buffer =
+            scene.buffers[nverts_bufferView.buffer];

-				// std::cout << "vtx_bufferView = " << vtx_accessor.bufferView <<
-				// std::endl;
-				// std::cout << "nverts_bufferView = " << nverts_accessor.bufferView <<
-				// std::endl;
-				// std::cout << "vtx_buffer.size = " << vtx_buffer.data.size() <<
-				// std::endl;
-				// std::cout << "nverts_buffer.size = " << nverts_buffer.data.size() <<
-				// std::endl;
+        // std::cout << "vtx_bufferView = " << vtx_accessor.bufferView <<
+        // std::endl;
+        // std::cout << "nverts_bufferView = " << nverts_accessor.bufferView <<
+        // std::endl;
+        // std::cout << "vtx_buffer.size = " << vtx_buffer.data.size() <<
+        // std::endl;
+        // std::cout << "nverts_buffer.size = " << nverts_buffer.data.size() <<
+        // std::endl;

-				const int *nverts =
-					reinterpret_cast<const int *>(nverts_buffer.data.data());
-				const float *vtx =
-					reinterpret_cast<const float *>(vtx_buffer.data.data());
+        const int *nverts =
+            reinterpret_cast<const int *>(nverts_buffer.data.data());
+        const float *vtx =
+            reinterpret_cast<const float *>(vtx_buffer.data.data());

-				// Convert to GL_LINES data.
-				std::vector<float> line_pts;
-				size_t vtx_offset = 0;
-				for (int k = 0; k < static_cast<int>(nverts_accessor.count); k++) {
-					for (int n = 0; n < nverts[k] - 1; n++) {
+        // Convert to GL_LINES data.
+        std::vector<float> line_pts;
+        size_t vtx_offset = 0;
+        for (int k = 0; k < static_cast<int>(nverts_accessor.count); k++) {
+          for (int n = 0; n < nverts[k] - 1; n++) {

-						line_pts.push_back(vtx[3 * (vtx_offset + n) + 0]);
-						line_pts.push_back(vtx[3 * (vtx_offset + n) + 1]);
-						line_pts.push_back(vtx[3 * (vtx_offset + n) + 2]);
+            line_pts.push_back(vtx[3 * (vtx_offset + n) + 0]);
+            line_pts.push_back(vtx[3 * (vtx_offset + n) + 1]);
+            line_pts.push_back(vtx[3 * (vtx_offset + n) + 2]);

-						line_pts.push_back(vtx[3 * (vtx_offset + n + 1) + 0]);
-						line_pts.push_back(vtx[3 * (vtx_offset + n + 1) + 1]);
-						line_pts.push_back(vtx[3 * (vtx_offset + n + 1) + 2]);
+            line_pts.push_back(vtx[3 * (vtx_offset + n + 1) + 0]);
+            line_pts.push_back(vtx[3 * (vtx_offset + n + 1) + 1]);
+            line_pts.push_back(vtx[3 * (vtx_offset + n + 1) + 2]);

-						// std::cout << "p0 " << vtx[3 * (vtx_offset + n) + 0] << ", "
-						//                  << vtx[3 * (vtx_offset + n) + 1] << ", "
-						//                  << vtx[3 * (vtx_offset + n) + 2] << std::endl;
+            // std::cout << "p0 " << vtx[3 * (vtx_offset + n) + 0] << ", "
+            //                  << vtx[3 * (vtx_offset + n) + 1] << ", "
+            //                  << vtx[3 * (vtx_offset + n) + 2] << std::endl;

-						// std::cout << "p1 " << vtx[3 * (vtx_offset + n+1) + 0] << ", "
-						//                  << vtx[3 * (vtx_offset + n+1) + 1] << ", "
-						//                  << vtx[3 * (vtx_offset + n+1) + 2] << std::endl;
-					}
+            // std::cout << "p1 " << vtx[3 * (vtx_offset + n+1) + 0] << ", "
+            //                  << vtx[3 * (vtx_offset + n+1) + 1] << ", "
+            //                  << vtx[3 * (vtx_offset + n+1) + 2] << std::endl;
+          }

-					vtx_offset += nverts[k];
-				}
+          vtx_offset += nverts[k];
+        }

-				GLCurvesState state;
-				glGenBuffers(1, &state.vb);
-				glBindBuffer(GL_ARRAY_BUFFER, state.vb);
-				glBufferData(GL_ARRAY_BUFFER, line_pts.size() * sizeof(float),
-						line_pts.data(), GL_STATIC_DRAW);
-				glBindBuffer(GL_ARRAY_BUFFER, 0);
+        GLCurvesState state;
+        glGenBuffers(1, &state.vb);
+        glBindBuffer(GL_ARRAY_BUFFER, state.vb);
+        glBufferData(GL_ARRAY_BUFFER, line_pts.size() * sizeof(float),
+                     line_pts.data(), GL_STATIC_DRAW);
+        glBindBuffer(GL_ARRAY_BUFFER, 0);

-				state.count = line_pts.size() / 3;
-				gCurvesMesh[mesh.name] = state;
+        state.count = line_pts.size() / 3;
+        gCurvesMesh[mesh.name] = state;

-				// Material
-				tinygltf::Material &mat = scene.materials[primitive.material];
-				// printf("material.name = %s\n", mat.name.c_str());
-				if (mat.values.find("diffuse") != mat.values.end()) {
-					std::string diffuseTexName = mat.values["diffuse"].string_value;
-					if (scene.textures.find(diffuseTexName) != scene.textures.end()) {
-						tinygltf::Texture &tex = scene.textures[diffuseTexName];
-						if (scene.images.find(tex.source) != scene.images.end()) {
-							tinygltf::Image &image = scene.images[tex.source];
-							GLuint texId;
-							glGenTextures(1, &texId);
-							glBindTexture(tex.target, texId);
-							glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-							glTexParameterf(tex.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-							glTexParameterf(tex.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        // Material
+        tinygltf::Material &mat = scene.materials[primitive.material];
+        // printf("material.name = %s\n", mat.name.c_str());
+        if (mat.values.find("diffuse") != mat.values.end()) {
+          std::string diffuseTexName = mat.values["diffuse"].string_value;
+          if (scene.textures.find(diffuseTexName) != scene.textures.end()) {
+            tinygltf::Texture &tex = scene.textures[diffuseTexName];
+            if (scene.images.find(tex.source) != scene.images.end()) {
+              tinygltf::Image &image = scene.images[tex.source];
+              GLuint texId;
+              glGenTextures(1, &texId);
+              glBindTexture(tex.target, texId);
+              glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+              glTexParameterf(tex.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+              glTexParameterf(tex.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-							// Ignore Texture.fomat.
-							GLenum format = GL_RGBA;
-							if (image.component == 3) {
-								format = GL_RGB;
-							}
-							glTexImage2D(tex.target, 0, tex.internalFormat, image.width,
-									image.height, 0, format, tex.type,
-									&image.image.at(0));
+              // Ignore Texture.fomat.
+              GLenum format = GL_RGBA;
+              if (image.component == 3) {
+                format = GL_RGB;
+              }
+              glTexImage2D(tex.target, 0, tex.internalFormat, image.width,
+                           image.height, 0, format, tex.type,
+                           &image.image.at(0));

-							CheckErrors("texImage2D");
-							glBindTexture(tex.target, 0);
+              CheckErrors("texImage2D");
+              glBindTexture(tex.target, 0);

-							printf("TexId = %d\n", texId);
-							gMeshState[mesh.name].diffuseTex[primId] = texId;
-						}
-					}
-				}
-			}
-		}
-	}
+              printf("TexId = %d\n", texId);
+              gMeshState[mesh.name].diffuseTex[primId] = texId;
+            }
+          }
+        }
+      }
+    }
+  }

-	glUseProgram(progId);
-	GLint vtloc = glGetAttribLocation(progId, "in_vertex");
-	GLint nrmloc = glGetAttribLocation(progId, "in_normal");
-	GLint uvloc = glGetAttribLocation(progId, "in_texcoord");
+  glUseProgram(progId);
+  GLint vtloc = glGetAttribLocation(progId, "in_vertex");
+  GLint nrmloc = glGetAttribLocation(progId, "in_normal");
+  GLint uvloc = glGetAttribLocation(progId, "in_texcoord");

-	GLint diffuseTexLoc = glGetUniformLocation(progId, "diffuseTex");
-	GLint isCurvesLoc = glGetUniformLocation(progId, "uIsCurves");
+  GLint diffuseTexLoc = glGetUniformLocation(progId, "diffuseTex");
+  GLint isCurvesLoc = glGetUniformLocation(progId, "uIsCurves");

-	gGLProgramState.attribs["POSITION"] = vtloc;
-	gGLProgramState.attribs["NORMAL"] = nrmloc;
-	gGLProgramState.attribs["TEXCOORD_0"] = uvloc;
-	gGLProgramState.uniforms["diffuseTex"] = diffuseTexLoc;
-	gGLProgramState.uniforms["uIsCurves"] = isCurvesLoc;
+  gGLProgramState.attribs["POSITION"] = vtloc;
+  gGLProgramState.attribs["NORMAL"] = nrmloc;
+  gGLProgramState.attribs["TEXCOORD_0"] = uvloc;
+  gGLProgramState.uniforms["diffuseTex"] = diffuseTexLoc;
+  gGLProgramState.uniforms["uIsCurves"] = isCurvesLoc;
 };
 #endif

@@ -682,13 +558,12 @@ static void DrawMesh(tinygltf::Model &model, const tinygltf::Mesh &mesh) {
          (it->first.compare("TEXCOORD_0") == 0)) {
        if (gGLProgramState.attribs[it->first] >= 0) {
          // Compute byteStride from Accessor + BufferView combination.
-          int byteStride =
-              accessor.ByteStride(model.bufferViews[accessor.bufferView]);
+          int byteStride = accessor.ByteStride(model.bufferViews[accessor.bufferView]);
          assert(byteStride != -1);
          glVertexAttribPointer(gGLProgramState.attribs[it->first], size,
-                                accessor.componentType,
-                                accessor.normalized ? GL_TRUE : GL_FALSE,
-                                byteStride, BUFFER_OFFSET(accessor.byteOffset));
+                                accessor.componentType, accessor.normalized ? GL_TRUE : GL_FALSE,
+                                byteStride,
+                                BUFFER_OFFSET(accessor.byteOffset));
          CheckErrors("vertex attrib pointer");
          glEnableVertexAttribArray(gGLProgramState.attribs[it->first]);
          CheckErrors("enable vertex attrib array");
@@ -742,32 +617,32 @@ static void DrawMesh(tinygltf::Model &model, const tinygltf::Mesh &mesh) {

 #if 0  // TODO(syoyo): Implement
 static void DrawCurves(tinygltf::Scene &scene, const tinygltf::Mesh &mesh) {
-	(void)scene;
+  (void)scene;

-	if (gCurvesMesh.find(mesh.name) == gCurvesMesh.end()) {
-		return;
-	}
+  if (gCurvesMesh.find(mesh.name) == gCurvesMesh.end()) {
+    return;
+  }

-	if (gGLProgramState.uniforms["isCurvesLoc"] >= 0) {
-		glUniform1i(gGLProgramState.uniforms["isCurvesLoc"], 1);
-	}
+  if (gGLProgramState.uniforms["isCurvesLoc"] >= 0) {
+    glUniform1i(gGLProgramState.uniforms["isCurvesLoc"], 1);
+  }

-	GLCurvesState &state = gCurvesMesh[mesh.name];
+  GLCurvesState &state = gCurvesMesh[mesh.name];

-	if (gGLProgramState.attribs["POSITION"] >= 0) {
-		glBindBuffer(GL_ARRAY_BUFFER, state.vb);
-		glVertexAttribPointer(gGLProgramState.attribs["POSITION"], 3, GL_FLOAT,
-				GL_FALSE, /* stride */ 0, BUFFER_OFFSET(0));
-		CheckErrors("curve: vertex attrib pointer");
-		glEnableVertexAttribArray(gGLProgramState.attribs["POSITION"]);
-		CheckErrors("curve: enable vertex attrib array");
-	}
+  if (gGLProgramState.attribs["POSITION"] >= 0) {
+    glBindBuffer(GL_ARRAY_BUFFER, state.vb);
+    glVertexAttribPointer(gGLProgramState.attribs["POSITION"], 3, GL_FLOAT,
+                          GL_FALSE, /* stride */ 0, BUFFER_OFFSET(0));
+    CheckErrors("curve: vertex attrib pointer");
+    glEnableVertexAttribArray(gGLProgramState.attribs["POSITION"]);
+    CheckErrors("curve: enable vertex attrib array");
+  }

-	glDrawArrays(GL_LINES, 0, state.count);
+  glDrawArrays(GL_LINES, 0, state.count);

-	if (gGLProgramState.attribs["POSITION"] >= 0) {
-		glDisableVertexAttribArray(gGLProgramState.attribs["POSITION"]);
-	}
+  if (gGLProgramState.attribs["POSITION"] >= 0) {
+    glDisableVertexAttribArray(gGLProgramState.attribs["POSITION"]);
+  }
 }
 #endif

@@ -803,13 +678,13 @@ static void DrawNode(tinygltf::Model &model, const tinygltf::Node &node) {
  // FIXME(syoyo): Refactor.
  // DrawCurves(scene, it->second);
  if (node.mesh > -1) {
-    assert(node.mesh < model.meshes.size());
+    assert(node.mesh < int(model.meshes.size()));
    DrawMesh(model, model.meshes[node.mesh]);
  }

  // Draw child nodes.
  for (size_t i = 0; i < node.children.size(); i++) {
-    assert(node.children[i] < model.nodes.size());
+    assert(node.children[i] < int(model.nodes.size()));
    DrawNode(model, model.nodes[node.children[i]]);
  }

@@ -818,16 +693,16 @@ static void DrawNode(tinygltf::Model &model, const tinygltf::Node &node) {

 static void DrawModel(tinygltf::Model &model) {
 #if 0
-	std::map<std::string, tinygltf::Mesh>::const_iterator it(scene.meshes.begin());
-	std::map<std::string, tinygltf::Mesh>::const_iterator itEnd(scene.meshes.end());
+  std::map<std::string, tinygltf::Mesh>::const_iterator it(scene.meshes.begin());
+  std::map<std::string, tinygltf::Mesh>::const_iterator itEnd(scene.meshes.end());

-	for (; it != itEnd; it++) {
-		DrawMesh(scene, it->second);
-		DrawCurves(scene, it->second);
-	}
+  for (; it != itEnd; it++) {
+    DrawMesh(scene, it->second);
+    DrawCurves(scene, it->second);
+  }
 #else
-  // If the glTF asset has at least one scene, and doesn't define a default one
-  // just show the first one we can find
+  //If the glTF asset has at least one scene, and doesn't define a default one
+  //just show the first one we can find
  assert(model.scenes.size() > 0);
  int scene_to_display = model.defaultScene > -1 ? model.defaultScene : 0;
  const tinygltf::Scene &scene = model.scenes[scene_to_display];
@@ -877,8 +752,7 @@ int main(int argc, char **argv) {

 #ifdef _WIN32
 #ifdef _DEBUG
-  std::string input_filename(argv[1] ? argv[1]
-                                     : "../../../models/Cube/Cube.gltf");
+    std::string input_filename(argv[1] ? argv[1] : "../../../models/Cube/Cube.gltf");
 #endif
 #else
  std::string input_filename(argv[1] ? argv[1] : "../../models/Cube/Cube.gltf");
@@ -889,8 +763,7 @@ int main(int argc, char **argv) {
  bool ret = false;
  if (ext.compare("glb") == 0) {
    // assume binary glTF.
-    ret =
-        loader.LoadBinaryFromFile(&model, &err, &warn, input_filename.c_str());
+    ret = loader.LoadBinaryFromFile(&model, &err, &warn, input_filename.c_str());
  } else {
    // assume ascii glTF.
    ret = loader.LoadASCIIFromFile(&model, &err, &warn, input_filename.c_str());
@@ -952,14 +825,15 @@ int main(int argc, char **argv) {

 #ifdef _WIN32
 #ifdef _DEBUG
-  const char *shader_frag_filename = "../shader.frag";
-  const char *shader_vert_filename = "../shader.vert";
+    const char *shader_frag_filename = "../shader.frag";
+    const char *shader_vert_filename = "../shader.vert";
 #endif
 #else
  const char *shader_frag_filename = "shader.frag";
  const char *shader_vert_filename = "shader.vert";
 #endif

+
  if (false == LoadShader(GL_VERTEX_SHADER, vertId, shader_vert_filename)) {
    return -1;
  }
--- a/examples/glview/premake5.lua
+++ b/examples/glview/premake5.lua
@@ -8,7 +8,7 @@ solution "glview"
      kind "ConsoleApp"
      language "C++"
 	  cppdialect "C++11"
-      files { "glview.cc", "../common/trackball.cc" }
+      files { "glview.cc", "../../json11.cpp", "../common/trackball.cc" }
      includedirs { "./" }
      includedirs { "../../" }
      includedirs { "../common/" }
--- a/examples/validator/CMakeLists.txt
+++ b/examples/validator/CMakeLists.txt
@@ -2,21 +2,20 @@ project(tinygltf-validator CXX)

 cmake_minimum_required(VERSION 3.2)

+# Use C++11
+set(CMAKE_CXX_STANDARD 11)
+
 # exe
 add_executable(tinygltf-validator
-    app/tinygltf-validate.cc
-    src/json-schema.hpp
-    src/json-schema-draft4.json.cpp
-    src/json-uri.cpp
-    src/json-validator.cpp)
+    tinygltf-validate.cc
+    json11.cpp)

 target_include_directories(tinygltf-validator
    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/src)
+        ${CMAKE_CURRENT_SOURCE_DIR}/valijson/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/
+    )

-target_compile_features(tinygltf-validator
-    PUBLIC
-        cxx_range_for) # for C++11 - flags
 # Enable more compiler warnings, except when using Visual Studio compiler
 if(NOT MSVC)
    target_compile_options(tinygltf-validator
@@ -51,3 +50,4 @@ install ( TARGETS
  DESTINATION
  bin
  )
+
--- a/examples/validator/LICENSE.json-schema-validator.MIT
+++ b/examples/validator/LICENSE.json-schema-validator.MIT
@@ -1,22 +0,0 @@
-Modern C++ JSON schema validator is licensed under the MIT License
-<http://opensource.org/licenses/MIT>:
-
-Copyright (c) 2016 Patrick Boettcher
-
-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.
--- a/examples/validator/LICENSE.jsonhpp.MIT
+++ b/examples/validator/LICENSE.jsonhpp.MIT
@@ -1,6 +1,4 @@
-MIT License 
-
-Copyright (c) 2013-2017 Niels Lohmann
+Copyright (c) 2013 Dropbox, Inc.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +7,13 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
--- a/examples/validator/Makefile
+++ b/examples/validator/Makefile
@@ -0,0 +1,4 @@
+EXTRA_CXXFLAGS=-fsanitize=address
+
+all:
+	clang++ $(EXTRA_CXXFLAGS) -g -O1 -I. -Ivalijson/include tinygltf-validate.cc json11.cpp -o tinygltf-validate
--- a/examples/validator/README.md
+++ b/examples/validator/README.md
@@ -1,32 +1,15 @@
-# tinygltf-validator
-
-TinyGLTF validator based on Modern C++ JSON schema validator https://github.com/pboettch/json-schema-validator
-
-## Status
-
-Experimental. W.I.P.
-
-## Requirements
-
-* C++11 compiler
-* CMake
-
-## How to build
+Currently it causes stack-overflow in runtime.

 ```
-$ mkdir build
-$ cd build
-$ cmake ..
-$ make
+$ ./tinygltf-validate schema_dir ../../models/Cube/Cube.gltf
+
+...
+
+==17033==ERROR: AddressSanitizer: stack-overflow on address 0x7fff55415d68 (pc 0x0000004c62de bp 0x7fff554165c0 sp 0x7fff55415d70 T0)
+    #0 0x4c62dd in __asan_memset /tmp/final/llvm.src/projects/compiler-rt/lib/asan/asan_interceptors_memintrinsics.cc:27:3
+    #1 0x53a7a7 in std::_Vector_base<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_Vector_impl::_Vector_impl(std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&) /usr/lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h:91:37
+    #2 0x53a6f1 in std::_Vector_base<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_Vector_base(unsigned long, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&) /usr/lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h:135:9
+    #3 0x53a9e2 in std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::vector(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&) /usr/lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h:319:9
+    #4 0x584313 in valijson::ValidationVisitor<valijson::adapters::Json11Adapter>::ValidationVisitor(valijson::ValidationVisitor<valijson::adapters::Json11Adapter> const&) /home/syoyo/work/tinygltf/examples/validator/valijson/include/valijson/validation_visitor.hpp:26:7
 ```

-## How to use
-
-```
-$ gltf-validator /path/to/file.gltf /path/to/gltf-schema
-```
-
-## Third party licenses
-
-* json.hpp https://github.com/nlohmann/json : MIT
-* json-schema-validator https://github.com/pboettch/json-schema-validator : MIT
--- a/examples/validator/app/tinygltf-validate.cc
+++ b/examples/validator/app/tinygltf-validate.cc
@@ -1,140 +0,0 @@
-/*
- * Modern C++ JSON schema validator
- *
- * Licensed under the MIT License <http://opensource.org/licenses/MIT>.
- *
- * Copyright (c) 2016 Patrick Boettcher <patrick.boettcher@posteo.de>.
- *
- * 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.
- */
-#include <json-schema.hpp>
-
-#include <fstream>
-#include <iostream>
-
-using nlohmann::json;
-using nlohmann::json_uri;
-using nlohmann::json_schema_draft4::json_validator;
-
-static void usage(const char *name)
-{
-	std::cerr << "Usage: " << name << " <gltf file> <gltf schema dir>\n";
-	std::cerr << "  schema dir : $glTF/specification/2.0/schema\n";
-	exit(EXIT_FAILURE);
-}
-
-#if 0
-	resolver r(nlohmann::json_schema_draft4::root_schema,
-			   nlohmann::json_schema_draft4::root_schema["id"]);
-	schema_refs_.insert(r.schema_refs.begin(), r.schema_refs.end());
-	assert(r.undefined_refs.size() == 0);
-#endif
-
-#if 0
-static void loader(const json_uri &uri, json &schema)
-{
-	std::fstream lf("." + uri.path());
-	if (!lf.good())
-		throw std::invalid_argument("could not open " + uri.url() + " tried with " + uri.path());
-
-	try {
-		lf >> schema;
-	} catch (std::exception &e) {
-		throw e;
-	}
-}
-#endif
-
-bool validate(const std::string &schema_dir, const std::string &filename)
-{
-  std::string gltf_schema = schema_dir + "/glTF.schema.json";
-
-	std::fstream f(gltf_schema);
-	if (!f.good()) {
-		std::cerr << "could not open " << gltf_schema << " for reading\n";
-    return false;
-  }
-
-	// 1) Read the schema for the document you want to validate
-	json schema;
-	try {
-		f >> schema;
-	} catch (std::exception &e) {
-		std::cerr << e.what() << " at " << f.tellp() << " - while parsing the schema\n";
-		return false;
-	}
-
-	// 2) create the validator and
-	json_validator validator([&schema_dir](const json_uri &uri, json &schema) {
-    std::cout << "uri.url  : " << uri.url() << std::endl;
-    std::cout << "uri.path : " << uri.path() << std::endl;
-
-    std::fstream lf(schema_dir + "/" + uri.path());
-    if (!lf.good())
-      throw std::invalid_argument("could not open " + uri.url() + " tried with " + uri.path());
-
-    try {
-      lf >> schema;
-    } catch (std::exception &e) {
-      throw e;
-    }
-  }, [](const std::string &, const std::string &) {});
-
-	try {
-		// insert this schema as the root to the validator
-		// this resolves remote-schemas, sub-schemas and references via the given loader-function
-		validator.set_root_schema(schema);
-	} catch (std::exception &e) {
-		std::cerr << "setting root schema failed\n";
-		std::cerr << e.what() << "\n";
-	}
-
-	// 3) do the actual validation of the document
-	json document;
-
-	std::fstream d(filename);
-	if (!d.good()) {
-		std::cerr << "could not open " << filename << " for reading\n";
-    return false;
-  }
-
-	try {
-		d >> document;
-		validator.validate(document);
-	} catch (std::exception &e) {
-		std::cerr << "schema validation failed\n";
-		std::cerr << e.what() << " at offset: " << d.tellg() << "\n";
-		return false;
-	}
-
-	std::cerr << "document is valid\n";
-
-  return true;
-
-}
-
-int main(int argc, char *argv[])
-{
-	if (argc != 3)
-		usage(argv[0]);
-
-  bool ret = validate(argv[1], argv[2]);
-
-	return ret ? EXIT_SUCCESS : EXIT_FAILURE;
-}
--- a/examples/validator/json11.cpp
+++ b/examples/validator/json11.cpp
@@ -0,0 +1,788 @@
+/* Copyright (c) 2013 Dropbox, Inc.
+ *
+ * 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.
+ */
+
+#include "json11.hpp"
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
+#include <limits>
+
+namespace json11 {
+
+static const int max_depth = 200;
+
+using std::string;
+using std::vector;
+using std::map;
+using std::make_shared;
+using std::initializer_list;
+using std::move;
+
+/* Helper for representing null - just a do-nothing struct, plus comparison
+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
+ * it may not be orderable.
+ */
+struct NullStruct {
+    bool operator==(NullStruct) const { return true; }
+    bool operator<(NullStruct) const { return false; }
+};
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Serialization
+ */
+
+static void dump(NullStruct, string &out) {
+    out += "null";
+}
+
+static void dump(double value, string &out) {
+    if (std::isfinite(value)) {
+        char buf[32];
+        snprintf(buf, sizeof buf, "%.17g", value);
+        out += buf;
+    } else {
+        out += "null";
+    }
+}
+
+static void dump(int value, string &out) {
+    char buf[32];
+    snprintf(buf, sizeof buf, "%d", value);
+    out += buf;
+}
+
+static void dump(bool value, string &out) {
+    out += value ? "true" : "false";
+}
+
+static void dump(const string &value, string &out) {
+    out += '"';
+    for (size_t i = 0; i < value.length(); i++) {
+        const char ch = value[i];
+        if (ch == '\\') {
+            out += "\\\\";
+        } else if (ch == '"') {
+            out += "\\\"";
+        } else if (ch == '\b') {
+            out += "\\b";
+        } else if (ch == '\f') {
+            out += "\\f";
+        } else if (ch == '\n') {
+            out += "\\n";
+        } else if (ch == '\r') {
+            out += "\\r";
+        } else if (ch == '\t') {
+            out += "\\t";
+        } else if (static_cast<uint8_t>(ch) <= 0x1f) {
+            char buf[8];
+            snprintf(buf, sizeof buf, "\\u%04x", ch);
+            out += buf;
+        } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x80
+                   && static_cast<uint8_t>(value[i+2]) == 0xa8) {
+            out += "\\u2028";
+            i += 2;
+        } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x80
+                   && static_cast<uint8_t>(value[i+2]) == 0xa9) {
+            out += "\\u2029";
+            i += 2;
+        } else {
+            out += ch;
+        }
+    }
+    out += '"';
+}
+
+static void dump(const Json::array &values, string &out) {
+    bool first = true;
+    out += "[";
+    for (const auto &value : values) {
+        if (!first)
+            out += ", ";
+        value.dump(out);
+        first = false;
+    }
+    out += "]";
+}
+
+static void dump(const Json::object &values, string &out) {
+    bool first = true;
+    out += "{";
+    for (const auto &kv : values) {
+        if (!first)
+            out += ", ";
+        dump(kv.first, out);
+        out += ": ";
+        kv.second.dump(out);
+        first = false;
+    }
+    out += "}";
+}
+
+void Json::dump(string &out) const {
+    m_ptr->dump(out);
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Value wrappers
+ */
+
+template <Json::Type tag, typename T>
+class Value : public JsonValue {
+protected:
+
+    // Constructors
+    explicit Value(const T &value) : m_value(value) {}
+    explicit Value(T &&value)      : m_value(move(value)) {}
+
+    // Get type tag
+    Json::Type type() const override {
+        return tag;
+    }
+
+    // Comparisons
+    bool equals(const JsonValue * other) const override {
+        return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
+    }
+    bool less(const JsonValue * other) const override {
+        return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
+    }
+
+    const T m_value;
+    void dump(string &out) const override { json11::dump(m_value, out); }
+};
+
+class JsonDouble final : public Value<Json::NUMBER, double> {
+    double number_value() const override { return m_value; }
+    int int_value() const override { return static_cast<int>(m_value); }
+    bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
+    bool less(const JsonValue * other)   const override { return m_value <  other->number_value(); }
+public:
+    explicit JsonDouble(double value) : Value(value) {}
+};
+
+class JsonInt final : public Value<Json::NUMBER, int> {
+    double number_value() const override { return m_value; }
+    int int_value() const override { return m_value; }
+    bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
+    bool less(const JsonValue * other)   const override { return m_value <  other->number_value(); }
+public:
+    explicit JsonInt(int value) : Value(value) {}
+};
+
+class JsonBoolean final : public Value<Json::BOOL, bool> {
+    bool bool_value() const override { return m_value; }
+public:
+    explicit JsonBoolean(bool value) : Value(value) {}
+};
+
+class JsonString final : public Value<Json::STRING, string> {
+    const string &string_value() const override { return m_value; }
+public:
+    explicit JsonString(const string &value) : Value(value) {}
+    explicit JsonString(string &&value)      : Value(move(value)) {}
+};
+
+class JsonArray final : public Value<Json::ARRAY, Json::array> {
+    const Json::array &array_items() const override { return m_value; }
+    const Json & operator[](size_t i) const override;
+public:
+    explicit JsonArray(const Json::array &value) : Value(value) {}
+    explicit JsonArray(Json::array &&value)      : Value(move(value)) {}
+};
+
+class JsonObject final : public Value<Json::OBJECT, Json::object> {
+    const Json::object &object_items() const override { return m_value; }
+    const Json & operator[](const string &key) const override;
+public:
+    explicit JsonObject(const Json::object &value) : Value(value) {}
+    explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
+};
+
+class JsonNull final : public Value<Json::NUL, NullStruct> {
+public:
+    JsonNull() : Value({}) {}
+};
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Static globals - static-init-safe
+ */
+struct Statics {
+    const std::shared_ptr<JsonValue> null = make_shared<JsonNull>();
+    const std::shared_ptr<JsonValue> t = make_shared<JsonBoolean>(true);
+    const std::shared_ptr<JsonValue> f = make_shared<JsonBoolean>(false);
+    const string empty_string;
+    const vector<Json> empty_vector;
+    const map<string, Json> empty_map;
+    Statics() {}
+};
+
+static const Statics & statics() {
+    static const Statics s {};
+    return s;
+}
+
+static const Json & static_null() {
+    // This has to be separate, not in Statics, because Json() accesses statics().null.
+    static const Json json_null;
+    return json_null;
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Constructors
+ */
+
+Json::Json() noexcept                  : m_ptr(statics().null) {}
+Json::Json(std::nullptr_t) noexcept    : m_ptr(statics().null) {}
+Json::Json(double value)               : m_ptr(make_shared<JsonDouble>(value)) {}
+Json::Json(int value)                  : m_ptr(make_shared<JsonInt>(value)) {}
+Json::Json(bool value)                 : m_ptr(value ? statics().t : statics().f) {}
+Json::Json(const string &value)        : m_ptr(make_shared<JsonString>(value)) {}
+Json::Json(string &&value)             : m_ptr(make_shared<JsonString>(move(value))) {}
+Json::Json(const char * value)         : m_ptr(make_shared<JsonString>(value)) {}
+Json::Json(const Json::array &values)  : m_ptr(make_shared<JsonArray>(values)) {}
+Json::Json(Json::array &&values)       : m_ptr(make_shared<JsonArray>(move(values))) {}
+Json::Json(const Json::object &values) : m_ptr(make_shared<JsonObject>(values)) {}
+Json::Json(Json::object &&values)      : m_ptr(make_shared<JsonObject>(move(values))) {}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Accessors
+ */
+
+Json::Type Json::type()                           const { return m_ptr->type();         }
+double Json::number_value()                       const { return m_ptr->number_value(); }
+int Json::int_value()                             const { return m_ptr->int_value();    }
+bool Json::bool_value()                           const { return m_ptr->bool_value();   }
+const string & Json::string_value()               const { return m_ptr->string_value(); }
+const vector<Json> & Json::array_items()          const { return m_ptr->array_items();  }
+const map<string, Json> & Json::object_items()    const { return m_ptr->object_items(); }
+const Json & Json::operator[] (size_t i)          const { return (*m_ptr)[i];           }
+const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key];         }
+
+double                    JsonValue::number_value()              const { return 0; }
+int                       JsonValue::int_value()                 const { return 0; }
+bool                      JsonValue::bool_value()                const { return false; }
+const string &            JsonValue::string_value()              const { return statics().empty_string; }
+const vector<Json> &      JsonValue::array_items()               const { return statics().empty_vector; }
+const map<string, Json> & JsonValue::object_items()              const { return statics().empty_map; }
+const Json &              JsonValue::operator[] (size_t)         const { return static_null(); }
+const Json &              JsonValue::operator[] (const string &) const { return static_null(); }
+
+const Json & JsonObject::operator[] (const string &key) const {
+    auto iter = m_value.find(key);
+    return (iter == m_value.end()) ? static_null() : iter->second;
+}
+const Json & JsonArray::operator[] (size_t i) const {
+    if (i >= m_value.size()) return static_null();
+    else return m_value[i];
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Comparison
+ */
+
+bool Json::operator== (const Json &other) const {
+    if (m_ptr == other.m_ptr)
+        return true;
+    if (m_ptr->type() != other.m_ptr->type())
+        return false;
+
+    return m_ptr->equals(other.m_ptr.get());
+}
+
+bool Json::operator< (const Json &other) const {
+    if (m_ptr == other.m_ptr)
+        return false;
+    if (m_ptr->type() != other.m_ptr->type())
+        return m_ptr->type() < other.m_ptr->type();
+
+    return m_ptr->less(other.m_ptr.get());
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Parsing
+ */
+
+/* esc(c)
+ *
+ * Format char c suitable for printing in an error message.
+ */
+static inline string esc(char c) {
+    char buf[12];
+    if (static_cast<uint8_t>(c) >= 0x20 && static_cast<uint8_t>(c) <= 0x7f) {
+        snprintf(buf, sizeof buf, "'%c' (%d)", c, c);
+    } else {
+        snprintf(buf, sizeof buf, "(%d)", c);
+    }
+    return string(buf);
+}
+
+static inline bool in_range(long x, long lower, long upper) {
+    return (x >= lower && x <= upper);
+}
+
+namespace {
+/* JsonParser
+ *
+ * Object that tracks all state of an in-progress parse.
+ */
+struct JsonParser final {
+
+    /* State
+     */
+    const string &str;
+    size_t i;
+    string &err;
+    bool failed;
+    const JsonParse strategy;
+
+    /* fail(msg, err_ret = Json())
+     *
+     * Mark this parse as failed.
+     */
+    Json fail(string &&msg) {
+        return fail(move(msg), Json());
+    }
+
+    template <typename T>
+    T fail(string &&msg, const T err_ret) {
+        if (!failed)
+            err = std::move(msg);
+        failed = true;
+        return err_ret;
+    }
+
+    /* consume_whitespace()
+     *
+     * Advance until the current character is non-whitespace.
+     */
+    void consume_whitespace() {
+        while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t')
+            i++;
+    }
+
+    /* consume_comment()
+     *
+     * Advance comments (c-style inline and multiline).
+     */
+    bool consume_comment() {
+      bool comment_found = false;
+      if (str[i] == '/') {
+        i++;
+        if (i == str.size())
+          return fail("unexpected end of input after start of comment", false);
+        if (str[i] == '/') { // inline comment
+          i++;
+          // advance until next line, or end of input
+          while (i < str.size() && str[i] != '\n') {
+            i++;
+          }
+          comment_found = true;
+        }
+        else if (str[i] == '*') { // multiline comment
+          i++;
+          if (i > str.size()-2)
+            return fail("unexpected end of input inside multi-line comment", false);
+          // advance until closing tokens
+          while (!(str[i] == '*' && str[i+1] == '/')) {
+            i++;
+            if (i > str.size()-2)
+              return fail(
+                "unexpected end of input inside multi-line comment", false);
+          }
+          i += 2;
+          comment_found = true;
+        }
+        else
+          return fail("malformed comment", false);
+      }
+      return comment_found;
+    }
+
+    /* consume_garbage()
+     *
+     * Advance until the current character is non-whitespace and non-comment.
+     */
+    void consume_garbage() {
+      consume_whitespace();
+      if(strategy == JsonParse::COMMENTS) {
+        bool comment_found = false;
+        do {
+          comment_found = consume_comment();
+          if (failed) return;
+          consume_whitespace();
+        }
+        while(comment_found);
+      }
+    }
+
+    /* get_next_token()
+     *
+     * Return the next non-whitespace character. If the end of the input is reached,
+     * flag an error and return 0.
+     */
+    char get_next_token() {
+        consume_garbage();
+        if (failed) return (char)0;
+        if (i == str.size())
+            return fail("unexpected end of input", (char)0);
+
+        return str[i++];
+    }
+
+    /* encode_utf8(pt, out)
+     *
+     * Encode pt as UTF-8 and add it to out.
+     */
+    void encode_utf8(long pt, string & out) {
+        if (pt < 0)
+            return;
+
+        if (pt < 0x80) {
+            out += static_cast<char>(pt);
+        } else if (pt < 0x800) {
+            out += static_cast<char>((pt >> 6) | 0xC0);
+            out += static_cast<char>((pt & 0x3F) | 0x80);
+        } else if (pt < 0x10000) {
+            out += static_cast<char>((pt >> 12) | 0xE0);
+            out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
+            out += static_cast<char>((pt & 0x3F) | 0x80);
+        } else {
+            out += static_cast<char>((pt >> 18) | 0xF0);
+            out += static_cast<char>(((pt >> 12) & 0x3F) | 0x80);
+            out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
+            out += static_cast<char>((pt & 0x3F) | 0x80);
+        }
+    }
+
+    /* parse_string()
+     *
+     * Parse a string, starting at the current position.
+     */
+    string parse_string() {
+        string out;
+        long last_escaped_codepoint = -1;
+        while (true) {
+            if (i == str.size())
+                return fail("unexpected end of input in string", "");
+
+            char ch = str[i++];
+
+            if (ch == '"') {
+                encode_utf8(last_escaped_codepoint, out);
+                return out;
+            }
+
+            if (in_range(ch, 0, 0x1f))
+                return fail("unescaped " + esc(ch) + " in string", "");
+
+            // The usual case: non-escaped characters
+            if (ch != '\\') {
+                encode_utf8(last_escaped_codepoint, out);
+                last_escaped_codepoint = -1;
+                out += ch;
+                continue;
+            }
+
+            // Handle escapes
+            if (i == str.size())
+                return fail("unexpected end of input in string", "");
+
+            ch = str[i++];
+
+            if (ch == 'u') {
+                // Extract 4-byte escape sequence
+                string esc = str.substr(i, 4);
+                // Explicitly check length of the substring. The following loop
+                // relies on std::string returning the terminating NUL when
+                // accessing str[length]. Checking here reduces brittleness.
+                if (esc.length() < 4) {
+                    return fail("bad \\u escape: " + esc, "");
+                }
+                for (size_t j = 0; j < 4; j++) {
+                    if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F')
+                            && !in_range(esc[j], '0', '9'))
+                        return fail("bad \\u escape: " + esc, "");
+                }
+
+                long codepoint = strtol(esc.data(), nullptr, 16);
+
+                // JSON specifies that characters outside the BMP shall be encoded as a pair
+                // of 4-hex-digit \u escapes encoding their surrogate pair components. Check
+                // whether we're in the middle of such a beast: the previous codepoint was an
+                // escaped lead (high) surrogate, and this is a trail (low) surrogate.
+                if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF)
+                        && in_range(codepoint, 0xDC00, 0xDFFF)) {
+                    // Reassemble the two surrogate pairs into one astral-plane character, per
+                    // the UTF-16 algorithm.
+                    encode_utf8((((last_escaped_codepoint - 0xD800) << 10)
+                                 | (codepoint - 0xDC00)) + 0x10000, out);
+                    last_escaped_codepoint = -1;
+                } else {
+                    encode_utf8(last_escaped_codepoint, out);
+                    last_escaped_codepoint = codepoint;
+                }
+
+                i += 4;
+                continue;
+            }
+
+            encode_utf8(last_escaped_codepoint, out);
+            last_escaped_codepoint = -1;
+
+            if (ch == 'b') {
+                out += '\b';
+            } else if (ch == 'f') {
+                out += '\f';
+            } else if (ch == 'n') {
+                out += '\n';
+            } else if (ch == 'r') {
+                out += '\r';
+            } else if (ch == 't') {
+                out += '\t';
+            } else if (ch == '"' || ch == '\\' || ch == '/') {
+                out += ch;
+            } else {
+                return fail("invalid escape character " + esc(ch), "");
+            }
+        }
+    }
+
+    /* parse_number()
+     *
+     * Parse a double.
+     */
+    Json parse_number() {
+        size_t start_pos = i;
+
+        if (str[i] == '-')
+            i++;
+
+        // Integer part
+        if (str[i] == '0') {
+            i++;
+            if (in_range(str[i], '0', '9'))
+                return fail("leading 0s not permitted in numbers");
+        } else if (in_range(str[i], '1', '9')) {
+            i++;
+            while (in_range(str[i], '0', '9'))
+                i++;
+        } else {
+            return fail("invalid " + esc(str[i]) + " in number");
+        }
+
+        if (str[i] != '.' && str[i] != 'e' && str[i] != 'E'
+                && (i - start_pos) <= static_cast<size_t>(std::numeric_limits<int>::digits10)) {
+            return std::atoi(str.c_str() + start_pos);
+        }
+
+        // Decimal part
+        if (str[i] == '.') {
+            i++;
+            if (!in_range(str[i], '0', '9'))
+                return fail("at least one digit required in fractional part");
+
+            while (in_range(str[i], '0', '9'))
+                i++;
+        }
+
+        // Exponent part
+        if (str[i] == 'e' || str[i] == 'E') {
+            i++;
+
+            if (str[i] == '+' || str[i] == '-')
+                i++;
+
+            if (!in_range(str[i], '0', '9'))
+                return fail("at least one digit required in exponent");
+
+            while (in_range(str[i], '0', '9'))
+                i++;
+        }
+
+        return std::strtod(str.c_str() + start_pos, nullptr);
+    }
+
+    /* expect(str, res)
+     *
+     * Expect that 'str' starts at the character that was just read. If it does, advance
+     * the input and return res. If not, flag an error.
+     */
+    Json expect(const string &expected, Json res) {
+        assert(i != 0);
+        i--;
+        if (str.compare(i, expected.length(), expected) == 0) {
+            i += expected.length();
+            return res;
+        } else {
+            return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length()));
+        }
+    }
+
+    /* parse_json()
+     *
+     * Parse a JSON object.
+     */
+    Json parse_json(int depth) {
+        if (depth > max_depth) {
+            return fail("exceeded maximum nesting depth");
+        }
+
+        char ch = get_next_token();
+        if (failed)
+            return Json();
+
+        if (ch == '-' || (ch >= '0' && ch <= '9')) {
+            i--;
+            return parse_number();
+        }
+
+        if (ch == 't')
+            return expect("true", true);
+
+        if (ch == 'f')
+            return expect("false", false);
+
+        if (ch == 'n')
+            return expect("null", Json());
+
+        if (ch == '"')
+            return parse_string();
+
+        if (ch == '{') {
+            map<string, Json> data;
+            ch = get_next_token();
+            if (ch == '}')
+                return data;
+
+            while (1) {
+                if (ch != '"')
+                    return fail("expected '\"' in object, got " + esc(ch));
+
+                string key = parse_string();
+                if (failed)
+                    return Json();
+
+                ch = get_next_token();
+                if (ch != ':')
+                    return fail("expected ':' in object, got " + esc(ch));
+
+                data[std::move(key)] = parse_json(depth + 1);
+                if (failed)
+                    return Json();
+
+                ch = get_next_token();
+                if (ch == '}')
+                    break;
+                if (ch != ',')
+                    return fail("expected ',' in object, got " + esc(ch));
+
+                ch = get_next_token();
+            }
+            return data;
+        }
+
+        if (ch == '[') {
+            vector<Json> data;
+            ch = get_next_token();
+            if (ch == ']')
+                return data;
+
+            while (1) {
+                i--;
+                data.push_back(parse_json(depth + 1));
+                if (failed)
+                    return Json();
+
+                ch = get_next_token();
+                if (ch == ']')
+                    break;
+                if (ch != ',')
+                    return fail("expected ',' in list, got " + esc(ch));
+
+                ch = get_next_token();
+                (void)ch;
+            }
+            return data;
+        }
+
+        return fail("expected value, got " + esc(ch));
+    }
+};
+}//namespace {
+
+Json Json::parse(const string &in, string &err, JsonParse strategy) {
+    JsonParser parser { in, 0, err, false, strategy };
+    Json result = parser.parse_json(0);
+
+    // Check for any trailing garbage
+    parser.consume_garbage();
+    if (parser.failed)
+        return Json();
+    if (parser.i != in.size())
+        return parser.fail("unexpected trailing " + esc(in[parser.i]));
+
+    return result;
+}
+
+// Documented in json11.hpp
+vector<Json> Json::parse_multi(const string &in,
+                               std::string::size_type &parser_stop_pos,
+                               string &err,
+                               JsonParse strategy) {
+    JsonParser parser { in, 0, err, false, strategy };
+    parser_stop_pos = 0;
+    vector<Json> json_vec;
+    while (parser.i != in.size() && !parser.failed) {
+        json_vec.push_back(parser.parse_json(0));
+        if (parser.failed)
+            break;
+
+        // Check for another object
+        parser.consume_garbage();
+        if (parser.failed)
+            break;
+        parser_stop_pos = parser.i;
+    }
+    return json_vec;
+}
+
+/* * * * * * * * * * * * * * * * * * * *
+ * Shape-checking
+ */
+
+bool Json::has_shape(const shape & types, string & err) const {
+    if (!is_object()) {
+        err = "expected JSON object, got " + dump();
+        return false;
+    }
+
+    for (auto & item : types) {
+        if ((*this)[item.first].type() != item.second) {
+            err = "bad type for " + item.first + " in " + dump();
+            return false;
+        }
+    }
+
+    return true;
+}
+
+} // namespace json11
--- a/examples/validator/json11.hpp
+++ b/examples/validator/json11.hpp
@@ -0,0 +1,232 @@
+/* json11
+ *
+ * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
+ *
+ * The core object provided by the library is json11::Json. A Json object represents any JSON
+ * value: null, bool, number (int or double), string (std::string), array (std::vector), or
+ * object (std::map).
+ *
+ * Json objects act like values: they can be assigned, copied, moved, compared for equality or
+ * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and
+ * Json::parse (static) to parse a std::string as a Json object.
+ *
+ * Internally, the various types of Json object are represented by the JsonValue class
+ * hierarchy.
+ *
+ * A note on numbers - JSON specifies the syntax of number formatting but not its semantics,
+ * so some JSON implementations distinguish between integers and floating-point numbers, while
+ * some don't. In json11, we choose the latter. Because some JSON implementations (namely
+ * Javascript itself) treat all numbers as the same type, distinguishing the two leads
+ * to JSON that will be *silently* changed by a round-trip through those implementations.
+ * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also
+ * provides integer helpers.
+ *
+ * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the
+ * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int64
+ * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch
+ * will be exact for +/- 275 years.)
+ */
+
+/* Copyright (c) 2013 Dropbox, Inc.
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include <map>
+#include <memory>
+#include <initializer_list>
+
+#ifdef _MSC_VER
+    #if _MSC_VER <= 1800 // VS 2013
+        #ifndef noexcept
+            #define noexcept throw()
+        #endif
+
+        #ifndef snprintf
+            #define snprintf _snprintf_s
+        #endif
+    #endif
+#endif
+
+namespace json11 {
+
+enum JsonParse {
+    STANDARD, COMMENTS
+};
+
+class JsonValue;
+
+class Json final {
+public:
+    // Types
+    enum Type {
+        NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT
+    };
+
+    // Array and object typedefs
+    typedef std::vector<Json> array;
+    typedef std::map<std::string, Json> object;
+
+    // Constructors for the various types of JSON value.
+    Json() noexcept;                // NUL
+    Json(std::nullptr_t) noexcept;  // NUL
+    Json(double value);             // NUMBER
+    Json(int value);                // NUMBER
+    Json(bool value);               // BOOL
+    Json(const std::string &value); // STRING
+    Json(std::string &&value);      // STRING
+    Json(const char * value);       // STRING
+    Json(const array &values);      // ARRAY
+    Json(array &&values);           // ARRAY
+    Json(const object &values);     // OBJECT
+    Json(object &&values);          // OBJECT
+
+    // Implicit constructor: anything with a to_json() function.
+    template <class T, class = decltype(&T::to_json)>
+    Json(const T & t) : Json(t.to_json()) {}
+
+    // Implicit constructor: map-like objects (std::map, std::unordered_map, etc)
+    template <class M, typename std::enable_if<
+        std::is_constructible<std::string, decltype(std::declval<M>().begin()->first)>::value
+        && std::is_constructible<Json, decltype(std::declval<M>().begin()->second)>::value,
+            int>::type = 0>
+    Json(const M & m) : Json(object(m.begin(), m.end())) {}
+
+    // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc)
+    template <class V, typename std::enable_if<
+        std::is_constructible<Json, decltype(*std::declval<V>().begin())>::value,
+            int>::type = 0>
+    Json(const V & v) : Json(array(v.begin(), v.end())) {}
+
+    // This prevents Json(some_pointer) from accidentally producing a bool. Use
+    // Json(bool(some_pointer)) if that behavior is desired.
+    Json(void *) = delete;
+
+    // Accessors
+    Type type() const;
+
+    bool is_null()   const { return type() == NUL; }
+    bool is_number() const { return type() == NUMBER; }
+    bool is_bool()   const { return type() == BOOL; }
+    bool is_string() const { return type() == STRING; }
+    bool is_array()  const { return type() == ARRAY; }
+    bool is_object() const { return type() == OBJECT; }
+
+    // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not
+    // distinguish between integer and non-integer numbers - number_value() and int_value()
+    // can both be applied to a NUMBER-typed object.
+    double number_value() const;
+    int int_value() const;
+
+    // Return the enclosed value if this is a boolean, false otherwise.
+    bool bool_value() const;
+    // Return the enclosed string if this is a string, "" otherwise.
+    const std::string &string_value() const;
+    // Return the enclosed std::vector if this is an array, or an empty vector otherwise.
+    const array &array_items() const;
+    // Return the enclosed std::map if this is an object, or an empty map otherwise.
+    const object &object_items() const;
+
+    // Return a reference to arr[i] if this is an array, Json() otherwise.
+    const Json & operator[](size_t i) const;
+    // Return a reference to obj[key] if this is an object, Json() otherwise.
+    const Json & operator[](const std::string &key) const;
+
+    // Serialize.
+    void dump(std::string &out) const;
+    std::string dump() const {
+        std::string out;
+        dump(out);
+        return out;
+    }
+
+    // Parse. If parse fails, return Json() and assign an error message to err.
+    static Json parse(const std::string & in,
+                      std::string & err,
+                      JsonParse strategy = JsonParse::STANDARD);
+    static Json parse(const char * in,
+                      std::string & err,
+                      JsonParse strategy = JsonParse::STANDARD) {
+        if (in) {
+            return parse(std::string(in), err, strategy);
+        } else {
+            err = "null input";
+            return nullptr;
+        }
+    }
+    // Parse multiple objects, concatenated or separated by whitespace
+    static std::vector<Json> parse_multi(
+        const std::string & in,
+        std::string::size_type & parser_stop_pos,
+        std::string & err,
+        JsonParse strategy = JsonParse::STANDARD);
+
+    static inline std::vector<Json> parse_multi(
+        const std::string & in,
+        std::string & err,
+        JsonParse strategy = JsonParse::STANDARD) {
+        std::string::size_type parser_stop_pos;
+        return parse_multi(in, parser_stop_pos, err, strategy);
+    }
+
+    bool operator== (const Json &rhs) const;
+    bool operator<  (const Json &rhs) const;
+    bool operator!= (const Json &rhs) const { return !(*this == rhs); }
+    bool operator<= (const Json &rhs) const { return !(rhs < *this); }
+    bool operator>  (const Json &rhs) const { return  (rhs < *this); }
+    bool operator>= (const Json &rhs) const { return !(*this < rhs); }
+
+    /* has_shape(types, err)
+     *
+     * Return true if this is a JSON object and, for each item in types, has a field of
+     * the given type. If not, return false and set err to a descriptive message.
+     */
+    typedef std::initializer_list<std::pair<std::string, Type>> shape;
+    bool has_shape(const shape & types, std::string & err) const;
+
+private:
+    std::shared_ptr<JsonValue> m_ptr;
+};
+
+// Internal class hierarchy - JsonValue objects are not exposed to users of this API.
+class JsonValue {
+protected:
+    friend class Json;
+    friend class JsonInt;
+    friend class JsonDouble;
+    virtual Json::Type type() const = 0;
+    virtual bool equals(const JsonValue * other) const = 0;
+    virtual bool less(const JsonValue * other) const = 0;
+    virtual void dump(std::string &out) const = 0;
+    virtual double number_value() const;
+    virtual int int_value() const;
+    virtual bool bool_value() const;
+    virtual const std::string &string_value() const;
+    virtual const Json::array &array_items() const;
+    virtual const Json &operator[](size_t i) const;
+    virtual const Json::object &object_items() const;
+    virtual const Json &operator[](const std::string &key) const;
+    virtual ~JsonValue() {}
+};
+
+} // namespace json11
--- a/examples/validator/src/json-schema-draft4.json.cpp
+++ b/examples/validator/src/json-schema-draft4.json.cpp
@@ -1,160 +0,0 @@
-#include <json-schema.hpp>
-
-namespace nlohmann
-{
-namespace json_schema_draft4
-{
-
-json draft4_schema_builtin = R"( {
-    "id": "http://json-schema.org/draft-04/schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Core schema meta-schema",
-    "definitions": {
-        "schemaArray": {
-            "type": "array",
-            "minItems": 1,
-            "items": { "$ref": "#" }
-        },
-        "positiveInteger": {
-            "type": "integer",
-            "minimum": 0
-        },
-        "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
-        },
-        "simpleTypes": {
-            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
-        },
-        "stringArray": {
-            "type": "array",
-            "items": { "type": "string" },
-            "minItems": 1,
-            "uniqueItems": true
-        }
-    },
-    "type": "object",
-    "properties": {
-        "id": {
-            "type": "string",
-            "format": "uri"
-        },
-        "$schema": {
-            "type": "string",
-            "format": "uri"
-        },
-        "title": {
-            "type": "string"
-        },
-        "description": {
-            "type": "string"
-        },
-        "default": {},
-        "multipleOf": {
-            "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
-        },
-        "maximum": {
-            "type": "number"
-        },
-        "exclusiveMaximum": {
-            "type": "boolean",
-            "default": false
-        },
-        "minimum": {
-            "type": "number"
-        },
-        "exclusiveMinimum": {
-            "type": "boolean",
-            "default": false
-        },
-        "maxLength": { "$ref": "#/definitions/positiveInteger" },
-        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "pattern": {
-            "type": "string",
-            "format": "regex"
-        },
-        "additionalItems": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
-        "items": {
-            "anyOf": [
-                { "$ref": "#" },
-                { "$ref": "#/definitions/schemaArray" }
-            ],
-            "default": {}
-        },
-        "maxItems": { "$ref": "#/definitions/positiveInteger" },
-        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "uniqueItems": {
-            "type": "boolean",
-            "default": false
-        },
-        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
-        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "required": { "$ref": "#/definitions/stringArray" },
-        "additionalProperties": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
-        "definitions": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "properties": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "patternProperties": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "dependencies": {
-            "type": "object",
-            "additionalProperties": {
-                "anyOf": [
-                    { "$ref": "#" },
-                    { "$ref": "#/definitions/stringArray" }
-                ]
-            }
-        },
-        "enum": {
-            "type": "array",
-            "minItems": 1,
-            "uniqueItems": true
-        },
-        "type": {
-            "anyOf": [
-                { "$ref": "#/definitions/simpleTypes" },
-                {
-                    "type": "array",
-                    "items": { "$ref": "#/definitions/simpleTypes" },
-                    "minItems": 1,
-                    "uniqueItems": true
-                }
-            ]
-        },
-        "allOf": { "$ref": "#/definitions/schemaArray" },
-        "anyOf": { "$ref": "#/definitions/schemaArray" },
-        "oneOf": { "$ref": "#/definitions/schemaArray" },
-        "not": { "$ref": "#" }
-    },
-    "dependencies": {
-        "exclusiveMaximum": [ "maximum" ],
-        "exclusiveMinimum": [ "minimum" ]
-    },
-    "default": {}
-} )"_json;
-
-}
-}
--- a/examples/validator/src/json-schema.hpp
+++ b/examples/validator/src/json-schema.hpp
@@ -1,201 +0,0 @@
-/*
- * Modern C++ JSON schema validator
- *
- * Licensed under the MIT License <http://opensource.org/licenses/MIT>.
- *
- * Copyright (c) 2016 Patrick Boettcher <patrick.boettcher@posteo.de>.
- *
- * 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_SCHEMA_HPP__
-#define NLOHMANN_JSON_SCHEMA_HPP__
-
-#ifdef _WIN32
-#    ifdef JSON_SCHEMA_VALIDATOR_EXPORTS
-#        define JSON_SCHEMA_VALIDATOR_API __declspec(dllexport)
-#    else
-#        define JSON_SCHEMA_VALIDATOR_API __declspec(dllimport)
-#    endif
-#else
-#    define JSON_SCHEMA_VALIDATOR_API
-#endif
-
-#include <json.hpp>
-
-// make yourself a home - welcome to nlohmann's namespace
-namespace nlohmann
-{
-
-// a class representing a JSON-pointer RFC6901
-//
-// examples of JSON pointers
-//
-//   #     - root of the current document
-//   #item - refers to the object which is identified ("id") by `item`
-//           in the current document
-//   #/path/to/element
-//         - refers to the element in /path/to from the root-document
-//
-//
-// The json_pointer-class stores everything in a string, which might seem bizarre
-// as parsing is done from a string to a string, but from_string() is also
-// doing some formatting.
-//
-// TODO
-//   ~ and %  - codec
-//   needs testing and clarification regarding the '#' at the beginning
-
-class json_pointer
-{
-	std::string str_;
-
-	void from_string(const std::string &r);
-
-public:
-	json_pointer(const std::string &s = "")
-	{
-		from_string(s);
-	}
-
-	void append(const std::string &elem)
-	{
-		str_.append(elem);
-	}
-
-	const std::string &to_string() const
-	{
-		return str_;
-	}
-};
-
-// A class representing a JSON-URI for schemas derived from
-// section 8 of JSON Schema: A Media Type for Describing JSON Documents
-// draft-wright-json-schema-00
-//
-// New URIs can be derived from it using the derive()-method.
-// This is useful for resolving refs or subschema-IDs in json-schemas.
-//
-// This is done implement the requirements described in section 8.2.
-//
-class JSON_SCHEMA_VALIDATOR_API json_uri
-{
-	std::string urn_;
-
-	std::string proto_;
-	std::string hostname_;
-	std::string path_;
-	json_pointer pointer_;
-
-protected:
-	// decodes a JSON uri and replaces all or part of the currently stored values
-	void from_string(const std::string &uri);
-
-	std::tuple<std::string, std::string, std::string, std::string, std::string> tie() const
-	{
-		return std::tie(urn_, proto_, hostname_, path_, pointer_.to_string());
-	}
-
-public:
-	json_uri(const std::string &uri)
-	{
-		from_string(uri);
-	}
-
-	const std::string protocol() const { return proto_; }
-	const std::string hostname() const { return hostname_; }
-	const std::string path() const { return path_; }
-	const json_pointer pointer() const { return pointer_; }
-
-	const std::string url() const;
-
-	// decode and encode strings for ~ and % escape sequences
-	static std::string unescape(const std::string &);
-	static std::string escape(const std::string &);
-
-	// create a new json_uri based in this one and the given uri
-	// resolves relative changes (pathes or pointers) and resets part if proto or hostname changes
-	json_uri derive(const std::string &uri) const
-	{
-		json_uri u = *this;
-		u.from_string(uri);
-		return u;
-	}
-
-	// append a pointer-field to the pointer-part of this uri
-	json_uri append(const std::string &field) const
-	{
-		json_uri u = *this;
-		u.pointer_.append("/" + field);
-		return u;
-	}
-
-	std::string to_string() const;
-
-	friend bool operator<(const json_uri &l, const json_uri &r)
-	{
-		return l.tie() < r.tie();
-	}
-
-	friend bool operator==(const json_uri &l, const json_uri &r)
-	{
-		return l.tie() == r.tie();
-	}
-
-	friend std::ostream &operator<<(std::ostream &os, const json_uri &u);
-};
-
-namespace json_schema_draft4
-{
-
-extern json draft4_schema_builtin;
-
-class JSON_SCHEMA_VALIDATOR_API json_validator
-{
-	std::vector<std::shared_ptr<json>> schema_store_;
-	std::shared_ptr<json> root_schema_;
-	std::function<void(const json_uri &, json &)> schema_loader_ = nullptr;
-	std::function<void(const std::string &, const std::string &)> format_check_ = nullptr;
-
-	std::map<json_uri, const json *> schema_refs_;
-
-	void validate(const json &instance, const json &schema_, const std::string &name);
-	void validate_array(const json &instance, const json &schema_, const std::string &name);
-	void validate_object(const json &instance, const json &schema_, const std::string &name);
-    void validate_string(const json &instance, const json &schema, const std::string &name);
-
-	void insert_schema(const json &input, const json_uri &id);
-
-public:
-	json_validator(std::function<void(const json_uri &, json &)> loader = nullptr,
-	               std::function<void(const std::string &, const std::string &)> format = nullptr)
-	    : schema_loader_(loader), format_check_(format)
-	{
-	}
-
-	// insert and set a root-schema
-	void set_root_schema(const json &);
-
-	// validate a json-document based on the root-schema
-	void validate(const json &instance);
-};
-
-} // json_schema_draft4
-} // nlohmann
-
-#endif /* NLOHMANN_JSON_SCHEMA_HPP__ */
--- a/examples/validator/src/json-uri.cpp
+++ b/examples/validator/src/json-uri.cpp
@@ -1,190 +0,0 @@
-/*
- * Modern C++ JSON schema validator
- *
- * Licensed under the MIT License <http://opensource.org/licenses/MIT>.
- *
- * Copyright (c) 2016 Patrick Boettcher <patrick.boettcher@posteo.de>.
- *
- * 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.
- */
-#include "json-schema.hpp"
-
-namespace nlohmann
-{
-
-void json_pointer::from_string(const std::string &r)
-{
-	str_ = "#";
-
-	if (r.size() == 0)
-		return;
-
-	if (r[0] != '#')
-		throw std::invalid_argument("not a valid JSON pointer - missing # at the beginning");
-
-	if (r.size() == 1)
-		return;
-
-	std::size_t pos = 1;
-
-	do {
-		std::size_t next = r.find('/', pos + 1);
-		str_.append(r.substr(pos, next - pos));
-		pos = next;
-	} while (pos != std::string::npos);
-}
-
-void json_uri::from_string(const std::string &uri)
-{
-	// if it is an urn take it as it is - maybe there is more to be done
-	if (uri.find("urn:") == 0) {
-		urn_ = uri;
-		return;
-	}
-
-	std::string pointer = "#"; // default pointer is the root
-
-	// first split the URI into URL and JSON-pointer
-	auto pointer_separator = uri.find('#');
-	if (pointer_separator != std::string::npos) // and extract the JSON-pointer-string if found
-		pointer = uri.substr(pointer_separator);
-
-	// the rest is an URL
-	std::string url = uri.substr(0, pointer_separator);
-	if (url.size()) { // if an URL is part of the URI
-
-		std::size_t pos = 0;
-		auto proto = url.find("://", pos);
-		if (proto != std::string::npos) { // extract the protocol
-			proto_ = url.substr(pos, proto - pos);
-			pos = 3 + proto; // 3 == "://"
-
-			auto hostname = url.find("/", pos);
-			if (hostname != std::string::npos) { // and the hostname (no proto without hostname)
-				hostname_ = url.substr(pos, hostname - pos);
-				pos = hostname;
-			}
-		}
-
-		// the rest is the path
-		auto path = url.substr(pos);
-		if (path[0] == '/') // if it starts with a / it is root-path
-			path_ = path;
-		else { // otherwise it is a subfolder
-      // HACK(syoyo): Force append '/' for glTF json schemas
-			path_ = path;
-			//path_.append(path);
-    }
-
-		pointer_ = json_pointer("");
-	}
-
-	if (pointer.size() > 0)
-		pointer_ = pointer;
-}
-
-const std::string json_uri::url() const
-{
-	std::stringstream s;
-
-	if (proto_.size() > 0)
-		s << proto_ << "://";
-
-	s << hostname_
-	  << path_;
-
-	return s.str();
-}
-
-std::string json_uri::to_string() const
-{
-	std::stringstream s;
-
-	s << urn_
-	  << url()
-	  << pointer_.to_string();
-
-	return s.str();
-}
-
-std::ostream &operator<<(std::ostream &os, const json_uri &u)
-{
-	return os << u.to_string();
-}
-
-std::string json_uri::unescape(const std::string &src)
-{
-	std::string l = src;
-	std::size_t pos = src.size() - 1;
-
-	do {
-		pos = l.rfind('~', pos);
-
-		if (pos == std::string::npos)
-			break;
-
-		if (pos < l.size() - 1) {
-			switch (l[pos + 1]) {
-			case '0':
-				l.replace(pos, 2, "~");
-				break;
-
-			case '1':
-				l.replace(pos, 2, "/");
-				break;
-
-			default:
-				break;
-			}
-		}
-
-		if (pos == 0)
-			break;
-		pos--;
-	} while (pos != std::string::npos);
-
-	// TODO - percent handling
-
-	return l;
-}
-
-std::string json_uri::escape(const std::string &src)
-{
-	std::vector<std::pair<std::string, std::string>> chars = {
-	    {"~", "~0"},
-	    {"/", "~1"},
-	    {"%", "%25"}};
-
-	std::string l = src;
-
-	for (const auto &c : chars) {
-		std::size_t pos = 0;
-		do {
-			pos = l.find(c.first, pos);
-			if (pos == std::string::npos)
-				break;
-			l.replace(pos, 1, c.second);
-			pos += c.second.size();
-		} while (1);
-	}
-
-	return l;
-}
-
-} // nlohmann
--- a/examples/validator/src/json-validator.cpp
+++ b/examples/validator/src/json-validator.cpp
@@ -1,738 +0,0 @@
-/*
- * Modern C++ JSON schema validator
- *
- * Licensed under the MIT License <http://opensource.org/licenses/MIT>.
- *
- * Copyright (c) 2016 Patrick Boettcher <patrick.boettcher@posteo.de>.
- *
- * 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.
- */
-#include <json-schema.hpp>
-
-#include <set>
-
-using nlohmann::json;
-using nlohmann::json_uri;
-
-#ifdef JSON_SCHEMA_BOOST_REGEX
- #include <boost/regex.hpp>
- #define REGEX_NAMESPACE boost
-#elif defined(JSON_SCHEMA_NO_REGEX)
- #define NO_STD_REGEX
-#else
- #include <regex>
- #define REGEX_NAMESPACE std
-#endif
-
-namespace
-{
-
-class resolver
-{
-	void resolve(json &schema, json_uri id)
-	{
-		// look for the id-field in this schema
-		auto fid = schema.find("id");
-
-		// found?
-		if (fid != schema.end() &&
-		    fid.value().type() == json::value_t::string)
-			id = id.derive(fid.value()); // resolve to a full id with URL + path based on the parent
-
-		// already existing - error
-		if (schema_refs.find(id) != schema_refs.end())
-			throw std::invalid_argument("schema " + id.to_string() + " already present in local resolver");
-
-		// store a raw pointer to this (sub-)schema referenced by its absolute json_uri
-		// this (sub-)schema is part of a schema stored inside schema_store_ so we can the a raw-pointer-ref
-		schema_refs[id] = &schema;
-
-		for (auto i = schema.begin(), end = schema.end(); i != end; ++i) {
-			// FIXME: this inhibits the user adding properties with the key "default"
-			if (i.key() == "default") /* default value can be objects, but are not schemas */
-				continue;
-
-			switch (i.value().type()) {
-
-			case json::value_t::object: // child is object, it is a schema
-				resolve(i.value(), id.append(json_uri::escape(i.key())));
-				break;
-
-			case json::value_t::array: {
-				std::size_t index = 0;
-				auto child_id = id.append(json_uri::escape(i.key()));
-				for (auto &v : i.value()) {
-					if (v.type() == json::value_t::object) // array element is object
-						resolve(v, child_id.append(std::to_string(index)));
-					index++;
-				}
-			} break;
-
-			case json::value_t::string:
-				if (i.key() == "$ref") {
-					json_uri ref = id.derive(i.value());
-					i.value() = ref.to_string();
-					refs.insert(ref);
-				}
-				break;
-
-			default:
-				break;
-			}
-		}
-	}
-
-	std::set<json_uri> refs;
-
-public:
-	std::set<json_uri> undefined_refs;
-
-	std::map<json_uri, const json *> schema_refs;
-
-	resolver(json &schema, json_uri id)
-	{
-		// if schema has an id use it as name and to retrieve the namespace (URL)
-		auto fid = schema.find("id");
-		if (fid != schema.end())
-			id = id.derive(fid.value());
-
-		resolve(schema, id);
-
-		// refs now contains all references
-		//
-		// local references should be resolvable inside the same URL
-		//
-		// undefined_refs will only contain external references
-		for (auto r : refs) {
-			if (schema_refs.find(r) == schema_refs.end()) {
-				if (r.url() == id.url()) // same url means referencing a sub-schema
-					                       // of the same document, which has not been found
-					throw std::invalid_argument("sub-schema " + r.pointer().to_string() +
-					                            " in schema " + id.to_string() + " not found");
-				undefined_refs.insert(r.url());
-			}
-		}
-	}
-};
-
-void validate_type(const json &schema, const std::string &expected_type, const std::string &name)
-{
-	const auto &type_it = schema.find("type");
-	if (type_it == schema.end())
-		/* TODO something needs to be done here, I think */
-		return;
-
-	const auto &type_instance = type_it.value();
-
-	// any of the types in this array
-	if (type_instance.type() == json::value_t::array) {
-		if ((std::find(type_instance.begin(),
-		               type_instance.end(),
-		               expected_type) != type_instance.end()) ||
-		    (expected_type == "integer" &&
-		     std::find(type_instance.begin(),
-		               type_instance.end(),
-		               "number") != type_instance.end()))
-			return;
-
-		std::ostringstream s;
-		s << expected_type << " is not any of " << type_instance << " for " << name;
-		throw std::invalid_argument(s.str());
-
-	} else { // type_instance is a string
-		if (type_instance == expected_type ||
-		    (type_instance == "number" && expected_type == "integer"))
-			return;
-
-		throw std::invalid_argument(name + " is " + expected_type +
-		                            ", but required type is " + type_instance.get<std::string>());
-	}
-}
-
-void validate_enum(const json &instance, const json &schema, const std::string &name)
-{
-	const auto &enum_value = schema.find("enum");
-	if (enum_value == schema.end())
-		return;
-
-	if (std::find(enum_value.value().begin(), enum_value.value().end(), instance) != enum_value.value().end())
-		return;
-
-	std::ostringstream s;
-	s << "invalid enum-value '" << instance << "' "
-	  << "for instance '" << name << "'. Candidates are " << enum_value.value() << ".";
-
-	throw std::invalid_argument(s.str());
-}
-
-void validate_boolean(const json & /*instance*/, const json &schema, const std::string &name)
-{
-	validate_type(schema, "boolean", name);
-}
-
-void validate_numeric(const json &schema, const std::string &name, double value)
-{
-	// multipleOf - if the rest of the division is 0 -> OK
-	const auto &multipleOf = schema.find("multipleOf");
-	if (multipleOf != schema.end()) {
-		if (multipleOf.value().get<double>() != 0.0) {
-
-			double v = value;
-			v /= multipleOf.value().get<double>();
-
-			if (v != (double) (long) v)
-				throw std::out_of_range(name + " is not a multiple ...");
-		}
-	}
-
-	const auto &maximum = schema.find("maximum");
-	if (maximum != schema.end()) {
-		double maxi = maximum.value();
-		auto ex = std::out_of_range(name + " exceeds maximum of " + std::to_string(maxi));
-		if (schema.find("exclusiveMaximum") != schema.end()) {
-			if (value >= maxi)
-				throw ex;
-		} else {
-			if (value > maxi)
-				throw ex;
-		}
-	}
-
-	const auto &minimum = schema.find("minimum");
-	if (minimum != schema.end()) {
-		double mini = minimum.value();
-		auto ex = std::out_of_range(name + " exceeds minimum of " + std::to_string(mini));
-		if (schema.find("exclusiveMinimum") != schema.end()) {
-			if (value <= mini)
-				throw ex;
-		} else {
-			if (value < mini)
-				throw ex;
-		}
-	}
-}
-
-void validate_integer(const json &instance, const json &schema, const std::string &name)
-{
-	validate_type(schema, "integer", name);
-	validate_numeric(schema, name, instance.get<int>());
-}
-
-void validate_unsigned(const json &instance, const json &schema, const std::string &name)
-{
-	validate_type(schema, "integer", name);
-	validate_numeric(schema, name, instance.get<unsigned>());
-}
-
-void validate_float(const json &instance, const json &schema, const std::string &name)
-{
-	validate_type(schema, "number", name);
-	validate_numeric(schema, name, instance.get<double>());
-}
-
-void validate_null(const json & /*instance*/, const json &schema, const std::string &name)
-{
-	validate_type(schema, "null", name);
-}
-
-} // anonymous namespace
-
-namespace nlohmann
-{
-namespace json_schema_draft4
-{
-
-void json_validator::insert_schema(const json &input, const json_uri &id)
-{
-	// allocate create a copy for later storage - if resolving reference works
-	std::shared_ptr<json> schema = std::make_shared<json>(input);
-
-	do {
-		// resolve all local schemas and references
-		resolver r(*schema, id);
-
-		// check whether all undefined schema references can be resolved with existing ones
-		std::set<json_uri> undefined;
-		for (auto &ref : r.undefined_refs)
-			if (schema_refs_.find(ref) == schema_refs_.end()) // exact schema reference not found
-				undefined.insert(ref);
-
-		if (undefined.size() == 0) { // no undefined references
-			// now insert all schema-references
-			// check whether all schema-references are new
-			for (auto &sref : r.schema_refs) {
-				if (schema_refs_.find(sref.first) != schema_refs_.end())
-          // HACK(syoyo): Skip duplicated schema.
-          break;
-					//throw std::invalid_argument("schema " + sref.first.to_string() + " already present in validator.");
-			}
-			// no undefined references and no duplicated schema - store the schema
-			schema_store_.push_back(schema);
-
-			// and insert all references
-			schema_refs_.insert(r.schema_refs.begin(), r.schema_refs.end());
-
-			break;
-		}
-
-		if (schema_loader_ == nullptr)
-			throw std::invalid_argument("schema contains undefined references to other schemas, needed schema-loader.");
-
-		for (auto undef : undefined) {
-			json ext;
-
-			schema_loader_(undef, ext);
-			insert_schema(ext, undef.url());
-		}
-	} while (1);
-
-	// store the document root-schema
-	if (id == json_uri("#"))
-		root_schema_ = schema;
-}
-
-void json_validator::validate(const json &instance)
-{
-	if (root_schema_ == nullptr)
-		throw std::invalid_argument("no root-schema has been inserted. Cannot validate an instance without it.");
-
-	validate(instance, *root_schema_, "root");
-}
-
-void json_validator::set_root_schema(const json &schema)
-{
-	insert_schema(schema, json_uri("#"));
-}
-
-void json_validator::validate(const json &instance, const json &schema_, const std::string &name)
-{
-	const json *schema = &schema_;
-
-	// $ref resolution
-	do {
-		const auto &ref = schema->find("$ref");
-		if (ref == schema->end())
-			break;
-
-		auto it = schema_refs_.find(ref.value().get<std::string>());
-
-		if (it == schema_refs_.end())
-			throw std::invalid_argument("schema reference " + ref.value().get<std::string>() + " not found. Make sure all schemas have been inserted before validation.");
-
-		schema = it->second;
-	} while (1); // loop in case of nested refs
-
-	// not
-	const auto attr = schema->find("not");
-	if (attr != schema->end()) {
-		bool ok;
-
-		try {
-			validate(instance, attr.value(), name);
-			ok = false;
-		} catch (std::exception &) {
-			ok = true;
-		}
-		if (!ok)
-			throw std::invalid_argument("schema match for " + name + " but a not-match is defined by schema.");
-		return; // return here - not cannot be mixed with based-schemas?
-	}
-
-	// allOf, anyOf, oneOf
-	const json *combined_schemas = nullptr;
-	enum {
-		none,
-		allOf,
-		anyOf,
-		oneOf
-	} combine_logic = none;
-
-	{
-		const auto &attr = schema->find("allOf");
-		if (attr != schema->end()) {
-			combine_logic = allOf;
-			combined_schemas = &attr.value();
-		}
-	}
-	{
-		const auto &attr = schema->find("anyOf");
-		if (attr != schema->end()) {
-			combine_logic = anyOf;
-			combined_schemas = &attr.value();
-		}
-	}
-	{
-		const auto &attr = schema->find("oneOf");
-		if (attr != schema->end()) {
-			combine_logic = oneOf;
-			combined_schemas = &attr.value();
-		}
-	}
-
-	if (combine_logic != none) {
-		std::size_t count = 0;
-		std::ostringstream sub_schema_err;
-
-		for (const auto &s : *combined_schemas) {
-			try {
-				validate(instance, s, name);
-				count++;
-			} catch (std::exception &e) {
-				sub_schema_err << "  one schema failed because: " << e.what() << "\n";
-
-				if (combine_logic == allOf)
-					throw std::out_of_range("At least one schema has failed for " + name + " where allOf them were requested.\n" + sub_schema_err.str());
-			}
-			if (combine_logic == oneOf && count > 1)
-				throw std::out_of_range("More than one schema has succeeded for " + name + " where only oneOf them was requested.\n" + sub_schema_err.str());
-		}
-		if ((combine_logic == anyOf || combine_logic == oneOf) && count == 0)
-			throw std::out_of_range("No schema has succeeded for " + name + " but anyOf/oneOf them should have worked.\n" + sub_schema_err.str());
-	}
-
-	// check (base) schema
-	validate_enum(instance, *schema, name);
-
-	switch (instance.type()) {
-	case json::value_t::object:
-		validate_object(instance, *schema, name);
-		break;
-
-	case json::value_t::array:
-		validate_array(instance, *schema, name);
-		break;
-
-	case json::value_t::string:
-		validate_string(instance, *schema, name);
-		break;
-
-	case json::value_t::number_unsigned:
-		validate_unsigned(instance, *schema, name);
-		break;
-
-	case json::value_t::number_integer:
-		validate_integer(instance, *schema, name);
-		break;
-
-	case json::value_t::number_float:
-		validate_float(instance, *schema, name);
-		break;
-
-	case json::value_t::boolean:
-		validate_boolean(instance, *schema, name);
-		break;
-
-	case json::value_t::null:
-		validate_null(instance, *schema, name);
-		break;
-
-	default:
-		assert(0 && "unexpected instance type for validation");
-		break;
-	}
-}
-
-void json_validator::validate_array(const json &instance, const json &schema, const std::string &name)
-{
-	validate_type(schema, "array", name);
-
-	// maxItems
-	const auto &maxItems = schema.find("maxItems");
-	if (maxItems != schema.end())
-		if (instance.size() > maxItems.value().get<size_t>())
-			throw std::out_of_range(name + " has too many items.");
-
-	// minItems
-	const auto &minItems = schema.find("minItems");
-	if (minItems != schema.end())
-		if (instance.size() < minItems.value().get<size_t>())
-			throw std::out_of_range(name + " has too few items.");
-
-	// uniqueItems
-	const auto &uniqueItems = schema.find("uniqueItems");
-	if (uniqueItems != schema.end())
-		if (uniqueItems.value().get<bool>() == true) {
-			std::set<json> array_to_set;
-			for (auto v : instance) {
-				auto ret = array_to_set.insert(v);
-				if (ret.second == false)
-					throw std::out_of_range(name + " should have only unique items.");
-			}
-		}
-
-	// items and additionalItems
-	// default to empty schemas
-	auto items_iter = schema.find("items");
-	json items = {};
-	if (items_iter != schema.end())
-		items = items_iter.value();
-
-	auto additionalItems_iter = schema.find("additionalItems");
-	json additionalItems = {};
-	if (additionalItems_iter != schema.end())
-		additionalItems = additionalItems_iter.value();
-
-	size_t i = 0;
-	bool validation_done = false;
-
-	for (auto &value : instance) {
-		std::string sub_name = name + "[" + std::to_string(i) + "]";
-
-		switch (items.type()) {
-
-		case json::value_t::array:
-
-			if (i < items.size())
-				validate(value, items[i], sub_name);
-			else {
-				switch (additionalItems.type()) { // items is an array
-				                                  // we need to take into consideration additionalItems
-				case json::value_t::object:
-					validate(value, additionalItems, sub_name);
-					break;
-
-				case json::value_t::boolean:
-					if (additionalItems.get<bool>() == false)
-						throw std::out_of_range("additional values in array are not allowed for " + sub_name);
-					else
-						validation_done = true;
-					break;
-
-				default:
-					break;
-				}
-			}
-
-			break;
-
-		case json::value_t::object: // items is a schema
-			validate(value, items, sub_name);
-			break;
-
-		default:
-			break;
-		}
-		if (validation_done)
-			break;
-
-		i++;
-	}
-}
-
-void json_validator::validate_object(const json &instance, const json &schema, const std::string &name)
-{
-	validate_type(schema, "object", name);
-
-	json properties = {};
-	if (schema.find("properties") != schema.end())
-		properties = schema["properties"];
-
-#if 0
-	// check for default values of properties
-	// and insert them into this object, if they don't exists
-	// works only for object properties for the moment
-	if (default_value_insertion)
-		for (auto it = properties.begin(); it != properties.end(); ++it) {
-
-			const auto &default_value = it.value().find("default");
-			if (default_value == it.value().end())
-				continue; /* no default value -> continue */
-
-			if (instance.find(it.key()) != instance.end())
-				continue; /* value is present */
-
-			/* create element from default value */
-			instance[it.key()] = default_value.value();
-		}
-#endif
-	// maxProperties
-	const auto &maxProperties = schema.find("maxProperties");
-	if (maxProperties != schema.end())
-		if (instance.size() > maxProperties.value().get<size_t>())
-			throw std::out_of_range(name + " has too many properties.");
-
-	// minProperties
-	const auto &minProperties = schema.find("minProperties");
-	if (minProperties != schema.end())
-		if (instance.size() < minProperties.value().get<size_t>())
-			throw std::out_of_range(name + " has too few properties.");
-
-	// additionalProperties
-	enum {
-		True,
-		False,
-		Object
-	} additionalProperties = True;
-
-	const auto &additionalPropertiesVal = schema.find("additionalProperties");
-	if (additionalPropertiesVal != schema.end()) {
-		if (additionalPropertiesVal.value().type() == json::value_t::boolean)
-			additionalProperties = additionalPropertiesVal.value().get<bool>() == true ? True : False;
-		else
-			additionalProperties = Object;
-	}
-
-	// patternProperties
-	json patternProperties = {};
-	if (schema.find("patternProperties") != schema.end())
-		patternProperties = schema["patternProperties"];
-
-	// check all elements in object
-	for (auto child = instance.begin(); child != instance.end(); ++child) {
-		std::string child_name = name + "." + child.key();
-
-		bool property_or_patternProperties_has_validated = false;
-		// is this a property which is described in the schema
-		const auto &object_prop = properties.find(child.key());
-		if (object_prop != properties.end()) {
-			// validate the element with its schema
-			validate(child.value(), object_prop.value(), child_name);
-			property_or_patternProperties_has_validated = true;
-		}
-
-		for (auto pp = patternProperties.begin();
-		     pp != patternProperties.end(); ++pp) {
-#ifndef NO_STD_REGEX
-			REGEX_NAMESPACE::regex re(pp.key(), REGEX_NAMESPACE::regex::ECMAScript);
-
-			if (REGEX_NAMESPACE::regex_search(child.key(), re)) {
-				validate(child.value(), pp.value(), child_name);
-				property_or_patternProperties_has_validated = true;
-			}
-#else
-			// accept everything in case of a patternProperty
-			property_or_patternProperties_has_validated = true;
-			break;
-#endif
-		}
-
-		if (property_or_patternProperties_has_validated)
-			continue;
-
-		switch (additionalProperties) {
-		case True:
-			break;
-
-		case Object:
-			validate(child.value(), additionalPropertiesVal.value(), child_name);
-			break;
-
-		case False:
-			throw std::invalid_argument("unknown property '" + child.key() + "' in object '" + name + "'");
-			break;
-		};
-	}
-
-	// required
-	const auto &required = schema.find("required");
-	if (required != schema.end())
-		for (const auto &element : required.value()) {
-			if (instance.find(element) == instance.end()) {
-				throw std::invalid_argument("required element '" + element.get<std::string>() +
-				                            "' not found in object '" + name + "'");
-			}
-		}
-
-	// dependencies
-	const auto &dependencies = schema.find("dependencies");
-	if (dependencies == schema.end())
-		return;
-
-	for (auto dep = dependencies.value().cbegin();
-	     dep != dependencies.value().cend();
-	     ++dep) {
-
-		// property not present in this instance - next
-		if (instance.find(dep.key()) == instance.end())
-			continue;
-
-		std::string sub_name = name + ".dependency-of-" + dep.key();
-
-		switch (dep.value().type()) {
-
-		case json::value_t::object:
-			validate(instance, dep.value(), sub_name);
-			break;
-
-		case json::value_t::array:
-			for (const auto &prop : dep.value())
-				if (instance.find(prop) == instance.end())
-					throw std::invalid_argument("failed dependency for " + sub_name + ". Need property " + prop.get<std::string>());
-			break;
-
-		default:
-			break;
-		}
-	}
-}
-
-static std::size_t utf8_length(const std::string &s)
-{
-	size_t len = 0;
-	for (const unsigned char &c : s)
-		if ((c & 0xc0) != 0x80)
-			len++;
-	return len;
-}
-
-void json_validator::validate_string(const json &instance, const json &schema, const std::string &name)
-{
-	validate_type(schema, "string", name);
-
-	// minLength
-	auto attr = schema.find("minLength");
-	if (attr != schema.end())
-		if (utf8_length(instance) < attr.value().get<size_t>()) {
-			std::ostringstream s;
-			s << "'" << name << "' of value '" << instance << "' is too short as per minLength ("
-			  << attr.value() << ")";
-			throw std::out_of_range(s.str());
-		}
-
-	// maxLength
-	attr = schema.find("maxLength");
-	if (attr != schema.end())
-		if (utf8_length(instance) > attr.value().get<size_t>()) {
-			std::ostringstream s;
-			s << "'" << name << "' of value '" << instance << "' is too long as per maxLength ("
-			  << attr.value() << ")";
-			throw std::out_of_range(s.str());
-		}
-
-#ifndef NO_STD_REGEX
-	// pattern
-	attr = schema.find("pattern");
-	if (attr != schema.end()) {
-		REGEX_NAMESPACE::regex re(attr.value().get<std::string>(), REGEX_NAMESPACE::regex::ECMAScript);
-		if (!REGEX_NAMESPACE::regex_search(instance.get<std::string>(), re))
-			throw std::invalid_argument(instance.get<std::string>() + " does not match regex pattern: " + attr.value().get<std::string>() + " for " + name);
-	}
-#endif
-
-	// format
-	attr = schema.find("format");
-	if (attr != schema.end()) {
-		if (format_check_ == nullptr)
-			throw std::logic_error("A format checker was not provided but a format-attribute for this string is present. " +
-			                       name + " cannot be validated for " + attr.value().get<std::string>());
-		format_check_(attr.value(), instance);
-	}
-}
-}
-}
--- a/examples/validator/src/json.hpp
+++ b/examples/validator/src/json.hpp
--- a/examples/validator/tinygltf-validate.cc
+++ b/examples/validator/tinygltf-validate.cc
@@ -0,0 +1,170 @@
+#include <cstdio>
+#include <cstdlib>
+#include <fstream>
+#include <iostream>
+
+#include "json11.hpp"
+
+#include "valijson/adapters/json11_adapter.hpp"
+#include "valijson/utils/json11_utils.hpp"
+
+#include "valijson/schema.hpp"
+#include "valijson/schema_parser.hpp"
+#include "valijson/validator.hpp"
+
+static void usage(const char *name) {
+  std::cerr << "Usage: " << name << " <gltf schema dir> <gltf file>\n";
+  std::cerr << "  schema dir is usually : $glTF/specification/2.0/schema\n";
+  std::cerr << "    where $glTF is a directory of https://github.com/KhronosGroup/glTF\n";
+
+  exit(EXIT_FAILURE);
+}
+
+#if 0
+  resolver r(nlohmann::json_schema_draft4::root_schema,
+         nlohmann::json_schema_draft4::root_schema["id"]);
+  schema_refs_.insert(r.schema_refs.begin(), r.schema_refs.end());
+  assert(r.undefined_refs.size() == 0);
+#endif
+
+#if 0
+static void loader(const json_uri &uri, json &schema)
+{
+  std::fstream lf("." + uri.path());
+  if (!lf.good())
+    throw std::invalid_argument("could not open " + uri.url() + " tried with " + uri.path());
+
+  try {
+    lf >> schema;
+  } catch (std::exception &e) {
+    throw e;
+  }
+}
+
+bool validate(const std::string &schema_dir, const std::string &filename)
+{
+  std::string gltf_schema = schema_dir + "/glTF.schema.json";
+
+  std::fstream f(gltf_schema);
+  if (!f.good()) {
+    std::cerr << "could not open " << gltf_schema << " for reading\n";
+    return false;
+  }
+
+  // 1) Read the schema for the document you want to validate
+  json schema;
+  try {
+    f >> schema;
+  } catch (std::exception &e) {
+    std::cerr << e.what() << " at " << f.tellp() << " - while parsing the schema\n";
+    return false;
+  }
+
+  // 2) create the validator and
+  json_validator validator([&schema_dir](const json_uri &uri, json &schema) {
+    std::cout << "uri.url  : " << uri.url() << std::endl;
+    std::cout << "uri.path : " << uri.path() << std::endl;
+
+    std::fstream lf(schema_dir + "/" + uri.path());
+    if (!lf.good())
+      throw std::invalid_argument("could not open " + uri.url() + " tried with " + uri.path());
+
+    try {
+      lf >> schema;
+    } catch (std::exception &e) {
+      throw e;
+    }
+  }, [](const std::string &, const std::string &) {});
+
+  try {
+    // insert this schema as the root to the validator
+    // this resolves remote-schemas, sub-schemas and references via the given loader-function
+    validator.set_root_schema(schema);
+  } catch (std::exception &e) {
+    std::cerr << "setting root schema failed\n";
+    std::cerr << e.what() << "\n";
+  }
+
+  // 3) do the actual validation of the document
+  json document;
+
+  std::fstream d(filename);
+  if (!d.good()) {
+    std::cerr << "could not open " << filename << " for reading\n";
+    return false;
+  }
+
+  try {
+    d >> document;
+    validator.validate(document);
+  } catch (std::exception &e) {
+    std::cerr << "schema validation failed\n";
+    std::cerr << e.what() << " at offset: " << d.tellg() << "\n";
+    return false;
+  }
+
+  std::cerr << "document is valid\n";
+
+  return true;
+
+}
+#endif
+
+bool validate(const std::string &schema_dir, const std::string &filename) {
+  std::string gltf_schema = schema_dir + "/glTF.schema.json";
+
+  // 1) Read the schema for the document you want to validate
+  json11::Json schema_doc;
+  bool ret = valijson::utils::loadDocument(gltf_schema, schema_doc);
+  if (!ret) {
+    std::cerr << "Failed to load schema file : " << gltf_schema << "\n";
+    return false;
+  }
+
+  // 2) Parse JSON schema content using valijson
+  valijson::Schema mySchema;
+  valijson::SchemaParser parser;
+  valijson::adapters::Json11Adapter mySchemaAdapter(schema_doc);
+  parser.populateSchema(mySchemaAdapter, mySchema);
+
+  // 3) Load a document to validate
+  json11::Json target_doc;
+  if (!valijson::utils::loadDocument(filename, target_doc)) {
+    std::cerr << "Failed to load JSON file to validate : " << filename << "\n";
+    return false;
+  }
+
+  valijson::Validator validator;
+  valijson::ValidationResults results;
+  valijson::adapters::Json11Adapter myTargetAdapter(target_doc);
+  if (!validator.validate(mySchema, myTargetAdapter, &results)) {
+    std::cerr << "Validation failed.\n";
+
+    valijson::ValidationResults::Error error;
+    unsigned int errorNum = 1;
+    while (results.popError(error)) {
+      std::cerr << "Error #" << errorNum << std::endl;
+      std::cerr << "  ";
+      for (const std::string &contextElement : error.context) {
+        std::cerr << contextElement << " ";
+      }
+      std::cerr << std::endl;
+      std::cerr << "    - " << error.description << std::endl;
+      ++errorNum;
+    }
+
+    return false;
+  }
+
+  std::cout << "Valid glTF file!\n";
+
+  return true;
+}
+
+int main(int argc, char *argv[]) {
+  if (argc != 3) usage(argv[0]);
+
+  bool ret = validate(argv[1], argv[2]);
+
+  return ret ? EXIT_SUCCESS : EXIT_FAILURE;
+}
--- a/examples/validator/valijson/LICENSE
+++ b/examples/validator/valijson/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2016, Tristan Penman
+Copyright (c) 2016, Akamai Technolgies, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/examples/validator/valijson/include/compat/optional.hpp
+++ b/examples/validator/valijson/include/compat/optional.hpp
--- a/examples/validator/valijson/include/valijson/adapters/adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/adapter.hpp
@@ -0,0 +1,476 @@
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_ADAPTER_HPP
+
+#include <functional>
+
+namespace valijson {
+namespace adapters {
+
+class FrozenValue;
+
+/**
+ * @brief   An interface that encapsulates access to the JSON values provided
+ *          by a JSON parser implementation.
+ *
+ * This interface allows JSON processing code to be parser-agnostic. It provides
+ * functions to access the plain old datatypes (PODs) that are described in the
+ * JSON specification, and callback-based access to the contents of arrays and
+ * objects.
+ *
+ * The interface also defines a set of functions that allow for type-casting and
+ * type-comparison based on value rather than on type.
+ */
+class Adapter
+{
+public:
+
+    /// Typedef for callback function supplied to applyToArray.
+    typedef std::function<bool (const Adapter &)>
+        ArrayValueCallback;
+
+    /// Typedef for callback function supplied to applyToObject.
+    typedef std::function<bool (const std::string &, const Adapter &)>
+        ObjectMemberCallback;
+
+    /**
+     * @brief   Virtual destructor defined to ensure deletion via base-class
+     *          pointers is safe.
+     */
+    virtual ~Adapter() { };
+
+    /**
+     * @brief   Apply a callback function to each value in an array.
+     *
+     * The callback function is invoked for each element in the array, until
+     * it has been applied to all values, or it returns false.
+     *
+     * @param   fn  Callback function to invoke
+     *
+     * @returns true if Adapter contains an array and all values are equal,
+     *          false otherwise.
+     */
+    virtual bool applyToArray(ArrayValueCallback fn) const = 0;
+
+    /**
+     * @brief   Apply a callback function to each member in an object.
+     *
+     * The callback function shall be invoked for each member in the object,
+     * until it has been applied to all values, or it returns false.
+     *
+     * @param   fn  Callback function to invoke
+     *
+     * @returns true if Adapter contains an object, and callback function
+     *          returns true for each member in the object, false otherwise.
+     */
+    virtual bool applyToObject(ObjectMemberCallback fn) const = 0;
+
+    /**
+     * @brief   Return the boolean representation of the contained value.
+     *
+     * This function shall return a boolean value if the Adapter contains either
+     * an actual boolean value, or one of the strings 'true' or 'false'.
+     * The string comparison is case sensitive.
+     *
+     * An exception shall be thrown if the value cannot be cast to a boolean.
+     *
+     * @returns  Boolean representation of contained value.
+     */
+    virtual bool asBool() const = 0;
+
+    /**
+     * @brief   Retrieve the boolean representation of the contained value.
+     *
+     * This function shall retrieve a boolean value if the Adapter contains
+     * either an actual boolean value, or one of the strings 'true' or 'false'.
+     * The string comparison is case sensitive.
+     *
+     * The retrieved value is returned via reference.
+     *
+     * @param   result  reference to a bool to set with retrieved value.
+     *
+     * @returns true if the value could be retrieved, false otherwise
+     */
+    virtual bool asBool(bool &result) const = 0;
+
+    /**
+     * @brief   Return the double representation of the contained value.
+     *
+     * This function shall return a double value if the Adapter contains either
+     * an actual double, an integer, or a string that contains a valid
+     * representation of a numeric value (according to the C++ Std Library).
+     *
+     * An exception shall be thrown if the value cannot be cast to a double.
+     *
+     * @returns  Double representation of contained value.
+     */
+    virtual double asDouble() const = 0;
+
+    /**
+     * @brief   Retrieve the double representation of the contained value.
+     *
+     * This function shall retrieve a double value if the Adapter contains either
+     * an actual double, an integer, or a string that contains a valid
+     * representation of a numeric value (according to the C++ Std Library).
+     *
+     * The retrieved value is returned via reference.
+     *
+     * @param   result  reference to a double to set with retrieved value.
+     *
+     * @returns true if the value could be retrieved, false otherwise
+     */
+    virtual bool asDouble(double &result) const = 0;
+
+    /**
+     * @brief   Return the int64_t representation of the contained value.
+     *
+     * This function shall return an int64_t value if the Adapter contains either
+     * an actual integer, or a string that contains a valid representation of an
+     * integer value (according to the C++ Std Library).
+     *
+     * An exception shall be thrown if the value cannot be cast to an int64_t.
+     *
+     * @returns  int64_t representation of contained value.
+     */
+    virtual int64_t asInteger() const = 0;
+
+    /**
+     * @brief   Retrieve the int64_t representation of the contained value.
+     *
+     * This function shall retrieve an int64_t value if the Adapter contains
+     * either an actual integer, or a string that contains a valid
+     * representation of an integer value (according to the C++ Std Library).
+     *
+     * The retrieved value is returned via reference.
+     *
+     * @param   result  reference to a int64_t to set with retrieved value.
+     *
+     * @returns true if the value could be retrieved, false otherwise
+     */
+    virtual bool asInteger(int64_t &result) const = 0;
+
+    /**
+     * @brief   Return the string representation of the contained value.
+     *
+     * This function shall return a string value if the Adapter contains either
+     * an actual string, a literal value of another POD type, an empty array,
+     * an empty object, or null.
+     *
+     * An exception shall be thrown if the value cannot be cast to a string.
+     *
+     * @returns  string representation of contained value.
+     */
+    virtual std::string asString() const = 0;
+
+    /**
+     * @brief   Retrieve the string representation of the contained value.
+     *
+     * This function shall retrieve a string value if the Adapter contains either
+     * an actual string, a literal value of another POD type, an empty array,
+     * an empty object, or null.
+     *
+     * The retrieved value is returned via reference.
+     *
+     * @param   result  reference to a string to set with retrieved value.
+     *
+     * @returns true if the value could be retrieved, false otherwise
+     */
+    virtual bool asString(std::string &result) const = 0;
+
+    /**
+     * @brief   Compare the value held by this Adapter instance with the value
+     *          held by another Adapter instance.
+     *
+     * @param   other   the other adapter instance
+     * @param   strict  flag to use strict type comparison
+     *
+     * @returns true if values are equal, false otherwise
+     */
+    virtual bool equalTo(const Adapter &other, bool strict) const = 0;
+
+    /**
+     * @brief   Create a new FrozenValue instance that is equivalent to the
+     *          value contained by the Adapter.
+     *
+     * @returns pointer to a new FrozenValue instance, belonging to the caller.
+     */
+    virtual FrozenValue* freeze() const = 0;
+
+    /**
+     * @brief   Return the number of elements in the array.
+     *
+     * Throws an exception if the value is not an array.
+     *
+     * @return  number of elements if value is an array
+     */
+    virtual size_t getArraySize() const = 0;
+
+    /**
+     * @brief   Retrieve the number of elements in the array.
+     *
+     * This function shall return true or false to indicate whether or not the
+     * result value was set. If the contained value is not an array, the
+     * result value shall not be set. This applies even if the value could be
+     * cast to an empty array. The calling code is expected to handles those
+     * cases manually.
+     *
+     * @param   result  reference to size_t variable to set with result.
+     *
+     * @return  true if value retrieved successfully, false otherwise.
+     */
+    virtual bool getArraySize(size_t &result) const = 0;
+
+    /**
+     * @brief   Return the contained boolean value.
+     *
+     * This function shall throw an exception if the contained value is not a
+     * boolean.
+     *
+     * @returns contained boolean value.
+     */
+    virtual bool getBool() const = 0;
+
+    /**
+     * @brief   Retrieve the contained boolean value.
+     *
+     * This function shall retrieve the boolean value contained by this Adapter,
+     * and store it in the result variable that was passed by reference.
+     *
+     * @param   result  reference to boolean variable to set with result.
+     *
+     * @returns true if the value was retrieved, false otherwise.
+     */
+    virtual bool getBool(bool &result) const = 0;
+
+    /**
+     * @brief   Return the contained double value.
+     *
+     * This function shall throw an exception if the contained value is not a
+     * double.
+     *
+     * @returns contained double value.
+     */
+    virtual double getDouble() const = 0;
+
+    /**
+     * @brief   Retrieve the contained double value.
+     *
+     * This function shall retrieve the double value contained by this Adapter,
+     * and store it in the result variable that was passed by reference.
+     *
+     * @param   result  reference to double variable to set with result.
+     *
+     * @returns true if the value was retrieved, false otherwise.
+     */
+    virtual bool getDouble(double &result) const = 0;
+
+    /**
+     * @brief   Return the contained integer value.
+     *
+     * This function shall throw an exception if the contained value is not a
+     * integer.
+     *
+     * @returns contained integer value.
+     */
+    virtual int64_t getInteger() const = 0;
+
+    /**
+     * @brief   Retrieve the contained integer value.
+     *
+     * This function shall retrieve the integer value contained by this Adapter,
+     * and store it in the result variable that was passed by reference.
+     *
+     * @param   result  reference to integer variable to set with result.
+     *
+     * @returns true if the value was retrieved, false otherwise.
+     */
+    virtual bool getInteger(int64_t &result) const = 0;
+
+    /**
+     * @brief   Return the contained numeric value as a double.
+     *
+     * This function shall throw an exception if the contained value is not a
+     * integer or a double.
+     *
+     * @returns contained double or integral value.
+     */
+    virtual double getNumber() const = 0;
+
+    /**
+     * @brief   Retrieve the contained numeric value as a double.
+     *
+     * This function shall retrieve the double or integral value contained by
+     * this Adapter, and store it in the result variable that was passed by
+     * reference.
+     *
+     * @param   result  reference to double variable to set with result.
+     *
+     * @returns true if the value was retrieved, false otherwise.
+     */
+    virtual bool getNumber(double &result) const = 0;
+
+    /**
+     * @brief   Return the number of members in the object.
+     *
+     * Throws an exception if the value is not an object.
+     *
+     * @return  number of members if value is an object
+     */
+    virtual size_t getObjectSize() const = 0;
+
+    /**
+     * @brief   Retrieve the number of members in the object.
+     *
+     * This function shall return true or false to indicate whether or not the
+     * result value was set. If the contained value is not an object, the
+     * result value shall not be set. This applies even if the value could be
+     * cast to an empty object. The calling code is expected to handles those
+     * cases manually.
+     *
+     * @param   result  reference to size_t variable to set with result.
+     *
+     * @return  true if value retrieved successfully, false otherwise.
+     */
+    virtual bool getObjectSize(size_t &result) const = 0;
+
+    /**
+     * @brief   Return the contained string value.
+     *
+     * This function shall throw an exception if the contained value is not a
+     * string - even if the value could be cast to a string. The asString()
+     * function should be used when casting is allowed.
+     *
+     * @returns string contained by this Adapter
+     */
+    virtual std::string getString() const = 0;
+
+    /**
+     * @brief   Retrieve the contained string value.
+     *
+     * This function shall retrieve the string value contained by this Adapter,
+     * and store it in result variable that is passed by reference.
+     *
+     * @param   result  reference to string to set with result
+     *
+     * @returns true if string was retrieved, false otherwise
+     */
+    virtual bool getString(std::string &result) const = 0;
+
+    /**
+     * @brief   Returns whether or not this Adapter supports strict types.
+     *
+     * This function shall return true if the Adapter implementation supports
+     * strict types, or false if the Adapter fails to store any part of the
+     * type information supported by the Adapter interface.
+     *
+     * For example, the PropertyTreeAdapter implementation stores POD values as
+     * strings, effectively discarding any other type information. If you were
+     * to call isDouble() on a double stored by this Adapter, the result would
+     * be false. The maybeDouble(), asDouble() and various related functions
+     * are provided to perform type checking based on value rather than on type.
+     *
+     * The BasicAdapter template class provides implementations for the type-
+     * casting functions so that Adapter implementations are semantically
+     * equivalent in their type-casting behaviour.
+     *
+     * @returns true if Adapter supports strict types, false otherwise
+     */
+    virtual bool hasStrictTypes() const = 0;
+
+    /// Returns true if the contained value is definitely an array.
+    virtual bool isArray() const = 0;
+
+    /// Returns true if the contained value is definitely a boolean.
+    virtual bool isBool() const = 0;
+
+    /// Returns true if the contained value is definitely a double.
+    virtual bool isDouble() const = 0;
+
+    /// Returns true if the contained value is definitely an integer.
+    virtual bool isInteger() const = 0;
+
+    /// Returns true if the contained value is definitely a null.
+    virtual bool isNull() const = 0;
+
+    /// Returns true if the contained value is either a double or an integer.
+    virtual bool isNumber() const = 0;
+
+    /// Returns true if the contained value is definitely an object.
+    virtual bool isObject() const = 0;
+
+    /// Returns true if the contained value is definitely a string.
+    virtual bool isString() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to an array.
+     *
+     * @returns true if the contained value is an array, an empty string, or an
+     *          empty object.
+     */
+    virtual bool maybeArray() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to a boolean.
+     *
+     * @returns true if the contained value is a boolean, or one of the strings
+     *          'true' or 'false'. Note that numeric values are not to be cast
+     *          to boolean values.
+     */
+    virtual bool maybeBool() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to a double.
+     *
+     * @returns true if the contained value is a double, an integer, or a string
+     *          containing a double or integral value.
+     */
+    virtual bool maybeDouble() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to an integer.
+     *
+     * @returns true if the contained value is an integer, or a string
+     *          containing an integral value.
+     */
+    virtual bool maybeInteger() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to a null.
+     *
+     * @returns true if the contained value is null or an empty string.
+     */
+    virtual bool maybeNull() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to an object.
+     *
+     * @returns true if the contained value is an object, an empty array or
+     *          an empty string.
+     */
+    virtual bool maybeObject() const = 0;
+
+    /**
+     * @brief   Returns true if the contained value can be cast to a string.
+     *
+     * @returns true if the contained value is a non-null POD type, an empty
+     *          array, or an empty object.
+     */
+    virtual bool maybeString() const = 0;
+};
+
+/**
+ * @brief  Template struct that should be specialised for each concrete Adapter
+ *         class.
+ *
+ * @deprecated  This is a bit of a hack, and I'd like to remove it.
+ */
+template<typename T>
+struct AdapterTraits
+{
+
+};
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/basic_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/basic_adapter.hpp
@@ -0,0 +1,868 @@
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_BASIC_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_BASIC_ADAPTER_HPP
+
+#include <stdint.h>
+#include <sstream>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/internal/optional.hpp>
+
+namespace valijson {
+namespace adapters {
+
+/**
+ * @brief  A helper for the array and object member iterators.
+ *
+ * See http://www.stlsoft.org/doc-1.9/group__group____pattern____dereference__proxy.html
+ * for motivation
+ *
+ * @tparam Value  Name of the value type
+ */
+template<class Value>
+struct DerefProxy
+{
+    explicit DerefProxy(const Value& x)
+      : m_ref(x) { }
+
+    Value* operator->()
+    {
+        return std::addressof(m_ref);
+    }
+
+    operator Value*()
+    {
+        return std::addressof(m_ref);
+    }
+
+private:
+    Value m_ref;
+};
+
+/**
+ * @brief  Template class that implements the expected semantics of an Adapter.
+ *
+ * Implementing all of the type-casting functionality for each Adapter is error
+ * prone and tedious, so this template class aims to minimise the duplication
+ * of code between various Adapter implementations. This template doesn't quite
+ * succeed in removing all duplication, but it has greatly simplified the
+ * implementation of a new Adapter by encapsulating the type-casting semantics
+ * and a lot of the trivial functionality associated with the Adapter interface.
+ *
+ * By inheriting from this template class, Adapter implementations will inherit
+ * the exception throwing behaviour that is expected by other parts of the
+ * Valijson library.
+ *
+ * @tparam  AdapterType       Self-referential name of the Adapter being
+ *                            specialised.
+ * @tparam  ArrayType         Name of the type that will be returned by the
+ *                            getArray() function. Instances of this type should
+ *                            provide begin(), end() and size() functions so
+ *                            that it is possible to iterate over the values in
+ *                            the array.
+ * @tparam  ObjectMemberType  Name of the type exposed when iterating over the
+ *                            contents of an object returned by getObject().
+ * @tparam  ObjectType        Name of the type that will be returned by the
+ *                            getObject() function. Instances of this type
+ *                            should provide begin(), end(), find() and size()
+ *                            functions so that it is possible to iterate over
+ *                            the members of the object.
+ * @tparam  ValueType         Name of the type that provides a consistent
+ *                            interface to a JSON value for a parser. For
+ *                            example, this type should provide the getDouble()
+ *                            and isDouble() functions. But it does not need to
+ *                            know how to cast values from one type to another -
+ *                            that functionality is provided by this template
+ *                            class.
+ */
+template<
+    typename AdapterType,
+    typename ArrayType,
+    typename ObjectMemberType,
+    typename ObjectType,
+    typename ValueType>
+class BasicAdapter: public Adapter
+{
+protected:
+
+    /**
+     * @brief   Functor for comparing two arrays.
+     *
+     * This functor is used to compare the elements in an array of the type
+     * ArrayType with individual values provided as generic Adapter objects.
+     * Comparison is performed by the () operator.
+     *
+     * The functor works by maintaining an iterator for the current position
+     * in an array. Each time the () operator is called, the value at this
+     * position is compared with the value passed as an argument to ().
+     * Immediately after the comparison, the iterator will be incremented.
+     *
+     * This functor is designed to be passed to the applyToArray() function
+     * of an Adapter object.
+     */
+    class ArrayComparisonFunctor
+    {
+    public:
+
+        /**
+         * @brief   Construct an ArrayComparisonFunctor for an array.
+         *
+         * @param   array   Array to compare values against
+         * @param   strict  Flag to use strict type comparison
+         */
+        ArrayComparisonFunctor(const ArrayType &array, bool strict)
+          : itr(array.begin()),
+            end(array.end()),
+            strict(strict) { }
+
+        /**
+         * @brief   Compare a value against the current element in the array.
+         *
+         * @param   adapter  Value to be compared with current element
+         *
+         * @returns true if values are equal, false otherwise.
+         */
+        bool operator()(const Adapter &adapter)
+        {
+            if (itr == end) {
+                return false;
+            }
+
+            return AdapterType(*itr++).equalTo(adapter, strict);
+        }
+
+    private:
+
+        /// Iterator for current element in the array
+        typename ArrayType::const_iterator itr;
+
+        /// Iterator for one-past the last element of the array
+        typename ArrayType::const_iterator end;
+
+        /// Flag to use strict type comparison
+        const bool strict;
+    };
+
+    /**
+     * @brief   Functor for comparing two objects
+     *
+     * This functor is used to compare the members of an object of the type
+     * ObjectType with key-value pairs belonging to another object.
+     *
+     * The functor works by maintaining a reference to an object provided via
+     * the constructor. When time the () operator is called with a key-value
+     * pair as arguments, the function will attempt to find the key in the
+     * base object. If found, the associated value will be compared with the
+     * value provided to the () operator.
+     *
+     * This functor is designed to be passed to the applyToObject() function
+     * of an Adapter object.
+     */
+    class ObjectComparisonFunctor
+    {
+    public:
+
+        /**
+         * @brief   Construct a new ObjectComparisonFunctor for an object.
+         *
+         * @param   object  object to use as comparison baseline
+         * @param   strict  flag to use strict type-checking
+         */
+        ObjectComparisonFunctor(
+            const ObjectType &object, bool strict)
+          : object(object),
+            strict(strict) { }
+
+        /**
+         * @brief   Find a key in the object and compare its value.
+         *
+         * @param   key    Key to find
+         * @param   value  Value to be compared against
+         *
+         * @returns true if key is found and values are equal, false otherwise.
+         */
+        bool operator()(const std::string &key, const Adapter &value)
+        {
+            const typename ObjectType::const_iterator itr = object.find(key);
+            if (itr == object.end()) {
+                return false;
+            }
+
+            return (*itr).second.equalTo(value, strict);
+        }
+
+    private:
+
+        /// Object to be used as a comparison baseline
+        const ObjectType &object;
+
+        /// Flag to use strict type-checking
+        bool strict;
+    };
+
+
+public:
+
+    /// Alias for ArrayType template parameter
+    typedef ArrayType Array;
+
+    /// Alias for ObjectMemberType template parameter
+    typedef ObjectMemberType ObjectMember;
+
+    /// Alias for ObjectType template parameter
+    typedef ObjectType Object;
+
+    /**
+     * @brief   Construct an Adapter using the default value.
+     *
+     * This constructor relies on the default constructor of the ValueType
+     * class provided as a template argument.
+     */
+    BasicAdapter() { }
+
+    /**
+     * @brief   Construct an Adapter using a specified ValueType object.
+     *
+     * This constructor relies on the copy constructor of the ValueType
+     * class provided as template argument.
+     */
+    BasicAdapter(const ValueType &value)
+      : value(value) { }
+
+    virtual bool applyToArray(ArrayValueCallback fn) const
+    {
+        if (!maybeArray()) {
+            return false;
+        }
+
+        // Due to the fact that the only way a value can be 'maybe an array' is
+        // if it is an empty string or empty object, we only need to go to
+        // effort of constructing an ArrayType instance if the value is
+        // definitely an array.
+        if (value.isArray()) {
+            const opt::optional<Array> array = value.getArrayOptional();
+            for (const AdapterType element : *array) {
+                if (!fn(element)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    virtual bool applyToObject(ObjectMemberCallback fn) const
+    {
+        if (!maybeObject()) {
+            return false;
+        }
+
+        if (value.isObject()) {
+            const opt::optional<Object> object = value.getObjectOptional();
+            for (const ObjectMemberType member : *object) {
+                if (!fn(member.first, AdapterType(member.second))) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @brief   Return an ArrayType instance containing an array representation
+     *          of the value held by this Adapter.
+     *
+     * This is a convenience function that is not actually declared in the
+     * Adapter interface, but allows for useful techniques such as procedural
+     * iteration over the elements in an array. The ArrayType instance that is
+     * returned by this function is compatible with the BOOST_FOREACH macro.
+     *
+     * If the contained value is either an empty object, or an empty string,
+     * then this function will cast the value to an empty array.
+     *
+     * @returns ArrayType instance containing an array representation of the
+     *          value held by this Adapter.
+     */
+    ArrayType asArray() const
+    {
+        if (value.isArray()) {
+            return *value.getArrayOptional();
+        } else if (value.isObject()) {
+            size_t objectSize;
+            if (value.getObjectSize(objectSize) && objectSize == 0) {
+                return ArrayType();
+            }
+        } else if (value.isString()) {
+            std::string stringValue;
+            if (value.getString(stringValue) && stringValue.empty()) {
+                return ArrayType();
+            }
+        }
+
+        throw std::runtime_error("JSON value cannot be cast to an array.");
+    }
+
+    virtual bool asBool() const
+    {
+        bool result;
+        if (asBool(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value cannot be cast to a boolean.");
+    }
+
+    virtual bool asBool(bool &result) const
+    {
+        if (value.isBool()) {
+            return value.getBool(result);
+        } else if (value.isString()) {
+            std::string s;
+            if (value.getString(s)) {
+                if (s.compare("true") == 0) {
+                    result = true;
+                    return true;
+                } else if (s.compare("false") == 0) {
+                    result = false;
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    virtual double asDouble() const
+    {
+        double result;
+        if (asDouble(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value cannot be cast to a double.");
+    }
+
+    virtual bool asDouble(double &result) const
+    {
+        if (value.isDouble()) {
+            return value.getDouble(result);
+        } else if (value.isInteger()) {
+            int64_t i;
+            if (value.getInteger(i)) {
+                result = double(i);
+                return true;
+            }
+        } else if (value.isString()) {
+            std::string s;
+            if (value.getString(s)) {
+                const char *b = s.c_str();
+                char *e = NULL;
+                double x = strtod(b, &e);
+                if (e == b || e != b + s.length()) {
+                    return false;
+                }
+                result = x;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual int64_t asInteger() const
+    {
+        int64_t result;
+        if (asInteger(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value cannot be cast as an integer.");
+    }
+
+    virtual bool asInteger(int64_t &result) const
+    {
+        if (value.isInteger()) {
+            return value.getInteger(result);
+        } else if (value.isString()) {
+            std::string s;
+            if (value.getString(s)) {
+                std::istringstream i(s);
+                int64_t x;
+                char c;
+                if (!(!(i >> x) || i.get(c))) {
+                    result = x;
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Return an ObjectType instance containing an array representation
+     *          of the value held by this Adapter.
+     *
+     * This is a convenience function that is not actually declared in the
+     * Adapter interface, but allows for useful techniques such as procedural
+     * iteration over the members of the object. The ObjectType instance that is
+     * returned by this function is compatible with the BOOST_FOREACH macro.
+     *
+     * @returns ObjectType instance containing an object representation of the
+     *          value held by this Adapter.
+     */
+    ObjectType asObject() const
+    {
+        if (value.isObject()) {
+            return *value.getObjectOptional();
+        } else if (value.isArray()) {
+            size_t arraySize;
+            if (value.getArraySize(arraySize) && arraySize == 0) {
+                return ObjectType();
+            }
+        } else if (value.isString()) {
+            std::string stringValue;
+            if (value.getString(stringValue) && stringValue.empty()) {
+                return ObjectType();
+            }
+        }
+
+        throw std::runtime_error("JSON value cannot be cast to an object.");
+    }
+
+    virtual std::string asString() const
+    {
+        std::string result;
+        if (asString(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value cannot be cast to a string.");
+    }
+
+    virtual bool asString(std::string &result) const
+    {
+        if (value.isString()) {
+            return value.getString(result);
+        } else if (value.isNull()) {
+            result.clear();
+            return true;
+        } else if (value.isArray()) {
+            size_t arraySize;
+            if (value.getArraySize(arraySize) && arraySize == 0) {
+                result.clear();
+                return true;
+            }
+        } else if (value.isObject()) {
+            size_t objectSize;
+            if (value.getObjectSize(objectSize) && objectSize == 0) {
+                result.clear();
+                return true;
+            }
+        } else if (value.isBool()) {
+            bool boolValue;
+            if (value.getBool(boolValue)) {
+                result = boolValue ? "true" : "false";
+                return true;
+            }
+        } else if (value.isInteger()) {
+            int64_t integerValue;
+            if (value.getInteger(integerValue)) {
+                result = std::to_string(integerValue);
+                return true;
+            }
+        } else if (value.isDouble()) {
+            double doubleValue;
+            if (value.getDouble(doubleValue)) {
+                result = std::to_string(doubleValue);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const
+    {
+        if (isNull() || (!strict && maybeNull())) {
+            return other.isNull() || (!strict && other.maybeNull());
+        } else if (isBool() || (!strict && maybeBool())) {
+            return (other.isBool() || (!strict && other.maybeBool())) &&
+                other.asBool() == asBool();
+        } else if (isNumber() && strict) {
+            return other.isNumber() && other.getNumber() == getNumber();
+        } else if (!strict && maybeDouble()) {
+            return (other.maybeDouble() &&
+                    other.asDouble() == asDouble());
+        } else if (!strict && maybeInteger()) {
+            return (other.maybeInteger() &&
+                    other.asInteger() == asInteger());
+        } else if (isString() || (!strict && maybeString())) {
+            return (other.isString() || (!strict && other.maybeString())) &&
+                other.asString() == asString();
+        } else if (isArray()) {
+            if (other.isArray() && getArraySize() == other.getArraySize()) {
+                const opt::optional<ArrayType> array = value.getArrayOptional();
+                if (array) {
+                    ArrayComparisonFunctor fn(*array, strict);
+                    return other.applyToArray(fn);
+                }
+            } else if (!strict && other.maybeArray() && getArraySize() == 0) {
+                return true;
+            }
+        } else if (isObject()) {
+            if (other.isObject() && other.getObjectSize() == getObjectSize()) {
+                const opt::optional<ObjectType> object = value.getObjectOptional();
+                if (object) {
+                    ObjectComparisonFunctor fn(*object, strict);
+                    return other.applyToObject(fn);
+                }
+            } else if (!strict && other.maybeObject() && getObjectSize() == 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Return an ArrayType instance representing the array contained
+     *          by this Adapter instance.
+     *
+     * This is a convenience function that is not actually declared in the
+     * Adapter interface, but allows for useful techniques such as procedural
+     * iteration over the elements in an array. The ArrayType instance that is
+     * returned by this function is compatible with the BOOST_FOREACH macro.
+     *
+     * If the contained is not an array, this function will throw an exception.
+     *
+     * @returns ArrayType instance containing an array representation of the
+     *          value held by this Adapter.
+     */
+    ArrayType getArray() const
+    {
+        opt::optional<ArrayType> arrayValue = value.getArrayOptional();
+        if (arrayValue) {
+            return *arrayValue;
+        }
+
+        throw std::runtime_error("JSON value is not an array.");
+    }
+
+    virtual size_t getArraySize() const
+    {
+        size_t result;
+        if (value.getArraySize(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not an array.");
+    }
+
+    virtual bool getArraySize(size_t &result) const
+    {
+        return value.getArraySize(result);
+    }
+
+    virtual bool getBool() const
+    {
+        bool result;
+        if (getBool(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not a boolean.");
+    }
+
+    virtual bool getBool(bool &result) const
+    {
+        return value.getBool(result);
+    }
+
+    virtual double getDouble() const
+    {
+        double result;
+        if (getDouble(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not a double.");
+    }
+
+    virtual bool getDouble(double &result) const
+    {
+        return value.getDouble(result);
+    }
+
+    virtual int64_t getInteger() const
+    {
+        int64_t result;
+        if (getInteger(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not an integer.");
+    }
+
+    virtual bool getInteger(int64_t &result) const
+    {
+        return value.getInteger(result);
+    }
+
+    virtual double getNumber() const
+    {
+        double result;
+        if (getNumber(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not a number.");
+    }
+
+    virtual bool getNumber(double &result) const
+    {
+        if (isDouble()) {
+            return getDouble(result);
+        } else if (isInteger()) {
+            int64_t integerResult;
+            if (getInteger(integerResult)) {
+                result = static_cast<double>(integerResult);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Return an ObjectType instance representing the object contained
+     *          by this Adapter instance.
+     *
+     * This is a convenience function that is not actually declared in the
+     * Adapter interface, but allows for useful techniques such as procedural
+     * iteration over the members of an object. The ObjectType instance that is
+     * returned by this function is compatible with the BOOST_FOREACH macro.
+     *
+     * If the contained is not an object, this function will throw an exception.
+     *
+     * @returns ObjectType instance containing an array representation of the
+     *          value held by this Adapter.
+     */
+    ObjectType getObject() const
+    {
+        opt::optional<ObjectType> objectValue = value.getObjectOptional();
+        if (objectValue) {
+            return *objectValue;
+        }
+
+        throw std::runtime_error("JSON value is not an object.");
+    }
+
+    virtual size_t getObjectSize() const
+    {
+        size_t result;
+        if (getObjectSize(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not an object.");
+    }
+
+    virtual bool getObjectSize(size_t &result) const
+    {
+        return value.getObjectSize(result);
+    }
+
+    virtual std::string getString() const
+    {
+        std::string result;
+        if (getString(result)) {
+            return result;
+        }
+
+        throw std::runtime_error("JSON value is not a string.");
+    }
+
+    virtual bool getString(std::string &result) const
+    {
+        return value.getString(result);
+    }
+
+    virtual FrozenValue * freeze() const
+    {
+        return value.freeze();
+    }
+
+    virtual bool hasStrictTypes() const
+    {
+        return ValueType::hasStrictTypes();
+    }
+
+    virtual bool isArray() const
+    {
+        return value.isArray();
+    }
+
+    virtual bool isBool() const
+    {
+        return value.isBool();
+    }
+
+    virtual bool isDouble() const
+    {
+        return value.isDouble();
+    }
+
+    virtual bool isInteger() const
+    {
+        return value.isInteger();
+    }
+
+    virtual bool isNull() const
+    {
+        return value.isNull();
+    }
+
+    virtual bool isNumber() const
+    {
+        return value.isInteger() || value.isDouble();
+    }
+
+    virtual bool isObject() const
+    {
+        return value.isObject();
+    }
+
+    virtual bool isString() const
+    {
+        return value.isString();
+    }
+
+    virtual bool maybeArray() const
+    {
+        if (value.isArray()) {
+            return true;
+        } else if (value.isObject()) {
+            size_t objectSize;
+            if (value.getObjectSize(objectSize) && objectSize == 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool maybeBool() const
+    {
+        if (value.isBool()) {
+            return true;
+        } else if (value.isString()) {
+            std::string stringValue;
+            if (value.getString(stringValue)) {
+                if (stringValue.compare("true") == 0 || stringValue.compare("false") == 0) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool maybeDouble() const
+    {
+        if (value.isNumber()) {
+            return true;
+        } else if (value.isString()) {
+            std::string s;
+            if (value.getString(s)) {
+                const char *b = s.c_str();
+                char *e = NULL;
+                strtod(b, &e);
+                return e != b && e == b + s.length();
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool maybeInteger() const
+    {
+        if (value.isInteger()) {
+            return true;
+        } else if (value.isString()) {
+            std::string s;
+            if (value.getString(s)) {
+                std::istringstream i(s);
+                int64_t x;
+                char c;
+                if (!(i >> x) || i.get(c)) {
+                    return false;
+                }
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool maybeNull() const
+    {
+        if (value.isNull()) {
+            return true;
+        } else if (value.isString()) {
+            std::string stringValue;
+            if (value.getString(stringValue)) {
+                if (stringValue.empty()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool maybeObject() const
+    {
+        if (value.isObject()) {
+            return true;
+        } else if (value.isArray()) {
+            size_t arraySize;
+            if (value.getArraySize(arraySize) && arraySize == 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool maybeString() const
+    {
+        if (value.isString() || value.isBool() || value.isInteger() ||
+            value.isDouble()) {
+            return true;
+        } else if (value.isObject()) {
+            size_t objectSize;
+            if (value.getObjectSize(objectSize) && objectSize == 0) {
+                return true;
+            }
+        } else if (value.isArray()) {
+            size_t arraySize;
+            if (value.getArraySize(arraySize) && arraySize == 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+private:
+
+    const ValueType value;
+
+};
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/frozen_value.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/frozen_value.hpp
@@ -0,0 +1,56 @@
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_FROZEN_VALUE_HPP
+#define __VALIJSON_ADAPTERS_FROZEN_VALUE_HPP
+
+#include <valijson/adapters/adapter.hpp>
+
+namespace valijson {
+namespace adapters {
+
+/**
+ * @brief   An interface that provides minimal access to a stored JSON value.
+ *
+ * The main reason that this interface exists is to support the 'enum'
+ * constraint. Each Adapter type is expected to provide an implementation of
+ * this interface. That class should be able to maintain its own copy of a
+ * JSON value, independent of the original document.
+ *
+ * This interface currently provides just the clone and equalTo functions, but
+ * could be expanded to include other functions declared in the Adapter
+ * interface.
+ *
+ * @todo  it would be nice to better integrate this with the Adapter interface
+ */
+class FrozenValue
+{
+public:
+
+    /**
+     * @brief   Virtual destructor defined to ensure deletion via base-class
+     *          pointers is safe.
+     */
+    virtual ~FrozenValue() { }
+
+    /**
+     * @brief   Clone the stored value and return a pointer to a new FrozenValue
+     *          object containing the value.
+     */
+    virtual FrozenValue *clone() const = 0;
+
+    /**
+     * @brief   Return true if the stored value is equal to the value contained
+     *          by an Adapter instance.
+     *
+     * @param   adapter  Adapter to compare value against
+     * @param   strict   Flag to use strict type comparison
+     *
+     * @returns true if values are equal, false otherwise
+     */
+    virtual bool equalTo(const Adapter &adapter, bool strict) const = 0;
+
+};
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/json11_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/json11_adapter.hpp
@@ -0,0 +1,713 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the json11 parser library.
+ *
+ * Include this file in your program to enable support for json11.
+ *
+ * This file defines the following classes (not in this order):
+ *  - Json11Adapter
+ *  - Json11Array
+ *  - Json11ArrayValueIterator
+ *  - Json11FrozenValue
+ *  - Json11Object
+ *  - Json11ObjectMember
+ *  - Json11ObjectMemberIterator
+ *  - Json11Value
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is Json11Adapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_JSON11_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_JSON11_ADAPTER_HPP
+
+#include <string>
+#include <json11.hpp>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+class Json11Adapter;
+class Json11ArrayValueIterator;
+class Json11ObjectMemberIterator;
+
+typedef std::pair<std::string, Json11Adapter> Json11ObjectMember;
+
+/**
+ * @brief  Light weight wrapper for a Json11 array value.
+ *
+ * This class is light weight wrapper for a Json11 array. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * Json11 value, assumed to be an array, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class Json11Array
+{
+public:
+
+    typedef Json11ArrayValueIterator const_iterator;
+    typedef Json11ArrayValueIterator iterator;
+
+    /// Construct a Json11Array referencing an empty array.
+    Json11Array()
+      : value(emptyArray()) { }
+
+    /**
+     * @brief   Construct a Json11Array referencing a specific Json11
+     *          value.
+     *
+     * @param   value   reference to a Json11 value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an array.
+     */
+    Json11Array(const json11::Json &value)
+      : value(value)
+    {
+        if (!value.is_array()) {
+            throw std::runtime_error("Value is not an array.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for the first element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying Json11 implementation.
+     */
+    Json11ArrayValueIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for one-past the last element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying Json11 implementation.
+     */
+    Json11ArrayValueIterator end() const;
+
+    /// Return the number of elements in the array
+    size_t size() const
+    {
+        return value.array_items().size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a Json11 value that is an empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const json11::Json & emptyArray()
+    {
+        static const json11::Json array((json11::Json::array()));
+        return array;
+    }
+
+    /// Reference to the contained value
+    const json11::Json &value;
+};
+
+/**
+ * @brief  Light weight wrapper for a Json11 object.
+ *
+ * This class is light weight wrapper for a Json11 object. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * Json11 value, assumed to be an object, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class Json11Object
+{
+public:
+
+    typedef Json11ObjectMemberIterator const_iterator;
+    typedef Json11ObjectMemberIterator iterator;
+
+    /// Construct a Json11Object referencing an empty object singleton.
+    Json11Object()
+      : value(emptyObject()) { }
+
+    /**
+     * @brief   Construct a Json11Object referencing a specific Json11
+     *          value.
+     *
+     * @param   value  reference to a Json11 value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an object.
+     */
+    Json11Object(const json11::Json &value)
+      : value(value)
+    {
+        if (!value.is_object()) {
+            throw std::runtime_error("Value is not an object.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying Json11 implementation.
+     */
+    Json11ObjectMemberIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying Json11 implementation.
+     */
+    Json11ObjectMemberIterator end() const;
+
+    /**
+     * @brief   Return an iterator for the object member with the specified
+     *          property name.
+     *
+     * If an object member with the specified name does not exist, the iterator
+     * returned will be the same as the iterator returned by the end() function.
+     *
+     * @param   propertyName  property name to search for
+     */
+    Json11ObjectMemberIterator find(const std::string &propertyName) const;
+
+    /// Returns the number of members belonging to this object.
+    size_t size() const
+    {
+        return value.object_items().size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a Json11 value that is empty object.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const json11::Json & emptyObject()
+    {
+        static const json11::Json object((json11::Json::object()));
+        return object;
+    }
+
+    /// Reference to the contained object
+    const json11::Json &value;
+};
+
+/**
+ * @brief   Stores an independent copy of a Json11 value.
+ *
+ * This class allows a Json11 value to be stored independent of its original
+ * document. Json11 makes this easy to do, as it does not perform any
+ * custom memory management.
+ *
+ * @see FrozenValue
+ */
+class Json11FrozenValue: public FrozenValue
+{
+public:
+
+    /**
+     * @brief  Make a copy of a Json11 value
+     *
+     * @param  source  the Json11 value to be copied
+     */
+    explicit Json11FrozenValue(const json11::Json &source)
+      : value(source) { }
+
+    virtual FrozenValue * clone() const
+    {
+        return new Json11FrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /// Stored Json11 value
+    json11::Json value;
+};
+
+/**
+ * @brief   Light weight wrapper for a Json11 value.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a Json11 value. This class is responsible
+ * for the mechanics of actually reading a Json11 value, whereas the
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+class Json11Value
+{
+public:
+
+    /// Construct a wrapper for the empty object singleton
+    Json11Value()
+      : value(emptyObject()) { }
+
+    /// Construct a wrapper for a specific Json11 value
+    Json11Value(const json11::Json &value)
+      : value(value) { }
+
+    /**
+     * @brief   Create a new Json11FrozenValue instance that contains the
+     *          value referenced by this Json11Value instance.
+     *
+     * @returns pointer to a new Json11FrozenValue instance, belonging to the
+     *          caller.
+     */
+    FrozenValue * freeze() const
+    {
+        return new Json11FrozenValue(value);
+    }
+
+    /**
+     * @brief   Optionally return a Json11Array instance.
+     *
+     * If the referenced Json11 value is an array, this function will return
+     * a std::optional containing a Json11Array instance referencing the
+     * array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<Json11Array> getArrayOptional() const
+    {
+        if (value.is_array()) {
+            return opt::make_optional(Json11Array(value));
+        }
+
+        return opt::optional<Json11Array>();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced Json11 value is an array, this function will
+     * retrieve the number of elements in the array and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (value.is_array()) {
+            result = value.array_items().size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &result) const
+    {
+        if (value.is_bool()) {
+            result = value.bool_value();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getDouble(double &result) const
+    {
+        if (value.is_number()) {
+            result = value.number_value();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getInteger(int64_t &result) const
+    {
+        if(isInteger()) {
+            result = value.int_value();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a Json11Object instance.
+     *
+     * If the referenced Json11 value is an object, this function will return a
+     * std::optional containing a Json11Object instance referencing the
+     * object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<Json11Object> getObjectOptional() const
+    {
+        if (value.is_object()) {
+            return opt::make_optional(Json11Object(value));
+        }
+
+        return opt::optional<Json11Object>();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced Json11 value is an object, this function will
+     * retrieve the number of members in the object and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (value.is_object()) {
+            result = value.object_items().size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value.is_string()) {
+            result = value.string_value();
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return true;
+    }
+
+    bool isArray() const
+    {
+        return value.is_array();
+    }
+
+    bool isBool() const
+    {
+        return value.is_bool();
+    }
+
+    bool isDouble() const
+    {
+        return value.is_number();
+    }
+
+    bool isInteger() const
+    {
+        return value.is_number()
+            && value.int_value() == value.number_value();
+    }
+
+    bool isNull() const
+    {
+        return value.is_null();
+    }
+
+    bool isNumber() const
+    {
+        return value.is_number();
+    }
+
+    bool isObject() const
+    {
+        return value.is_object();
+    }
+
+    bool isString() const
+    {
+        return value.is_string();
+    }
+
+private:
+
+    /// Return a reference to an empty object singleton
+    static const json11::Json & emptyObject()
+    {
+        static const json11::Json object((json11::Json::object()));
+        return object;
+    }
+
+    /// Reference to the contained Json11 value.
+    const json11::Json &value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting Json11.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+class Json11Adapter:
+    public BasicAdapter<Json11Adapter,
+                        Json11Array,
+                        Json11ObjectMember,
+                        Json11Object,
+                        Json11Value>
+{
+public:
+
+    /// Construct a Json11Adapter that contains an empty object
+    Json11Adapter()
+      : BasicAdapter() { }
+
+    /// Construct a Json11Adapter containing a specific Json11 value
+    Json11Adapter(const json11::Json &value)
+      : BasicAdapter(value) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * Json11Adapter representing a value stored in the array. It has been
+ * implemented using the boost iterator_facade template.
+ *
+ * @see Json11Array
+ */
+class Json11ArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,  // bi-directional iterator
+        Json11Adapter>                    // value type
+{
+public:
+
+    /**
+     * @brief   Construct a new Json11ArrayValueIterator using an existing
+     *          Json11 iterator.
+     *
+     * @param   itr  Json11 iterator to store
+     */
+    Json11ArrayValueIterator(
+        const json11::Json::array::const_iterator &itr)
+      : itr(itr) { }
+
+    /// Returns a Json11Adapter that contains the value of the current
+    /// element.
+    Json11Adapter operator*() const
+    {
+        return Json11Adapter(*itr);
+    }
+
+    DerefProxy<Json11Adapter> operator->() const
+    {
+        return DerefProxy<Json11Adapter>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  iterator to compare against
+     *
+     * @returns true   if the iterators are equal, false otherwise.
+     */
+    bool operator==(const Json11ArrayValueIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const Json11ArrayValueIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const Json11ArrayValueIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    Json11ArrayValueIterator operator++(int)
+    {
+        Json11ArrayValueIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const Json11ArrayValueIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        itr += n;
+    }
+
+private:
+
+    json11::Json::array::const_iterator itr;
+};
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of Json11ObjectMember representing one of the members of the object. It
+ * has been implemented using the boost iterator_facade template.
+ *
+ * @see Json11Object
+ * @see Json11ObjectMember
+ */
+class Json11ObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,   // bi-directional iterator
+        Json11ObjectMember>                // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a Json11 iterator.
+     *
+     * @param   itr  Json11 iterator to store
+     */
+    Json11ObjectMemberIterator(
+        const json11::Json::object::const_iterator &itr)
+      : itr(itr) { }
+
+    /**
+     * @brief   Returns a Json11ObjectMember that contains the key and value
+     *          belonging to the object member identified by the iterator.
+     */
+    Json11ObjectMember operator*() const
+    {
+        return Json11ObjectMember(itr->first, itr->second);
+    }
+
+    DerefProxy<Json11ObjectMember> operator->() const
+    {
+        return DerefProxy<Json11ObjectMember>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const Json11ObjectMemberIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const Json11ObjectMemberIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const Json11ObjectMemberIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    Json11ObjectMemberIterator operator++(int)
+    {
+        Json11ObjectMemberIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const Json11ObjectMemberIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+private:
+
+    /// Iternal copy of the original Json11 iterator
+    json11::Json::object::const_iterator itr;
+};
+
+/// Specialisation of the AdapterTraits template struct for Json11Adapter.
+template<>
+struct AdapterTraits<valijson::adapters::Json11Adapter>
+{
+    typedef json11::Json DocumentType;
+
+    static std::string adapterName()
+    {
+        return "Json11Adapter";
+    }
+};
+
+inline bool Json11FrozenValue::equalTo(const Adapter &other, bool strict) const
+{
+    return Json11Adapter(value).equalTo(other, strict);
+}
+
+inline Json11ArrayValueIterator Json11Array::begin() const
+{
+    return value.array_items().begin();
+}
+
+inline Json11ArrayValueIterator Json11Array::end() const
+{
+    return value.array_items().end();
+}
+
+inline Json11ObjectMemberIterator Json11Object::begin() const
+{
+    return value.object_items().begin();
+}
+
+inline Json11ObjectMemberIterator Json11Object::end() const
+{
+    return value.object_items().end();
+}
+
+inline Json11ObjectMemberIterator Json11Object::find(
+    const std::string &propertyName) const
+{
+    return value.object_items().find(propertyName);
+}
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/jsoncpp_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/jsoncpp_adapter.hpp
@@ -0,0 +1,724 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the JsonCpp parser library.
+ *
+ * Include this file in your program to enable support for JsonCpp.
+ *
+ * This file defines the following classes (not in this order):
+ *  - JsonCppAdapter
+ *  - JsonCppArray
+ *  - JsonCppArrayValueIterator
+ *  - JsonCppFrozenValue
+ *  - JsonCppObject
+ *  - JsonCppObjectMember
+ *  - JsonCppObjectMemberIterator
+ *  - JsonCppValue
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is JsonCppAdapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_JSONCPP_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_JSONCPP_ADAPTER_HPP
+
+#include <stdint.h>
+#include <string>
+#include <iterator>
+
+#include <json/json.h>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+class JsonCppAdapter;
+class JsonCppArrayValueIterator;
+class JsonCppObjectMemberIterator;
+
+typedef std::pair<std::string, JsonCppAdapter> JsonCppObjectMember;
+
+/**
+ * @brief  Light weight wrapper for a JsonCpp array value.
+ *
+ * This class is light weight wrapper for a JsonCpp array. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * JsonCpp value, assumed to be an array, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class JsonCppArray
+{
+public:
+
+    typedef JsonCppArrayValueIterator const_iterator;
+    typedef JsonCppArrayValueIterator iterator;
+
+    /// Construct a JsonCppArray referencing an empty array.
+    JsonCppArray()
+      : value(emptyArray()) { }
+
+    /**
+     * @brief   Construct a JsonCppArray referencing a specific JsonCpp value.
+     *
+     * @param   value   reference to a JsonCpp value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an array.
+     */
+    JsonCppArray(const Json::Value &value)
+      : value(value)
+    {
+        if (!value.isArray()) {
+            throw std::runtime_error("Value is not an array.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for the first element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying JsonCpp implementation.
+     */
+    JsonCppArrayValueIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for one-past the last element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying JsonCpp implementation.
+     */
+    JsonCppArrayValueIterator end() const;
+
+    /// Return the number of elements in the array.
+    size_t size() const
+    {
+        return value.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a JsonCpp value that is an empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const Json::Value & emptyArray()
+    {
+        static const Json::Value array(Json::arrayValue);
+        return array;
+    }
+
+    /// Reference to the contained array
+    const Json::Value &value;
+
+};
+
+/**
+ * @brief  Light weight wrapper for a JsonCpp object.
+ *
+ * This class is light weight wrapper for a JsonCpp object. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * JsonCpp object, assumed to be an object, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class JsonCppObject
+{
+public:
+
+    typedef JsonCppObjectMemberIterator const_iterator;
+    typedef JsonCppObjectMemberIterator iterator;
+
+    /// Construct a JsonCppObject referencing an empty object singleton.
+    JsonCppObject()
+      : value(emptyObject()) { }
+
+    /**
+     * @brief   Construct a JsonCppObject referencing a specific JsonCpp value.
+     *
+     * @param   value  reference to a JsonCpp value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an object.
+     */
+    JsonCppObject(const Json::Value &value)
+      : value(value)
+    {
+        if (!value.isObject()) {
+            throw std::runtime_error("Value is not an object.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying JsonCpp implementation.
+     */
+    JsonCppObjectMemberIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying JsonCpp implementation.
+     */
+    JsonCppObjectMemberIterator end() const;
+
+    /**
+     * @brief   Return an iterator for a member/property with the given name
+     *
+     * @param   propertyName   Property name
+     *
+     * @returns a valid iterator if found, or an invalid iterator if not found
+     */
+    JsonCppObjectMemberIterator find(const std::string &propertyName) const;
+
+    /// Return the number of members in the object
+    size_t size() const
+    {
+        return value.size();
+    }
+
+private:
+
+    /// Return a reference to an empty JsonCpp object
+    static const Json::Value & emptyObject()
+    {
+        static const Json::Value object(Json::objectValue);
+        return object;
+    }
+
+    /// Reference to the contained object
+    const Json::Value &value;
+};
+
+/**
+ * @brief   Stores an independent copy of a JsonCpp value.
+ *
+ * This class allows a JsonCpp value to be stored independent of its original
+ * document. JsonCpp makes this easy to do, as it does not perform any
+ * custom memory management.
+ *
+ * @see FrozenValue
+ */
+class JsonCppFrozenValue: public FrozenValue
+{
+public:
+
+    /**
+     * @brief  Make a copy of a JsonCpp value
+     *
+     * @param  source  the JsonCpp value to be copied
+     */
+    explicit JsonCppFrozenValue(const Json::Value &source)
+      : value(source) { }
+
+    virtual FrozenValue * clone() const
+    {
+        return new JsonCppFrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /// Stored JsonCpp value
+    Json::Value value;
+};
+
+/**
+ * @brief   Light weight wrapper for a JsonCpp value.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a JsonCpp value. This class is responsible
+ * for the mechanics of actually reading a JsonCpp value, whereas the
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+class JsonCppValue
+{
+public:
+
+    /// Construct a wrapper for the empty object singleton
+    JsonCppValue()
+      : value(emptyObject()) { }
+
+    /// Construct a wrapper for a specific JsonCpp value
+    JsonCppValue(const Json::Value &value)
+      : value(value) { }
+
+    /**
+     * @brief   Create a new JsonCppFrozenValue instance that contains the
+     *          value referenced by this JsonCppValue instance.
+     *
+     * @returns pointer to a new JsonCppFrozenValue instance, belonging to the
+     *          caller.
+     */
+    FrozenValue * freeze() const
+    {
+        return new JsonCppFrozenValue(value);
+    }
+
+    /**
+     * @brief   Optionally return a JsonCppArray instance.
+     *
+     * If the referenced JsonCpp value is an array, this function will return a
+     * std::optional containing a JsonCppArray instance referencing the
+     * array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<JsonCppArray> getArrayOptional() const
+    {
+        if (value.isArray()) {
+            return opt::make_optional(JsonCppArray(value));
+        }
+
+        return opt::optional<JsonCppArray>();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced JsonCpp value is an array, this function will retrieve
+     * the number of elements in the array and store it in the output variable
+     * provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (value.isArray()) {
+            result = value.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &result) const
+    {
+        if (value.isBool()) {
+            result = value.asBool();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getDouble(double &result) const
+    {
+        if (value.isDouble()) {
+            result = value.asDouble();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getInteger(int64_t &result) const
+    {
+        if (value.isIntegral()) {
+            result = static_cast<int64_t>(value.asInt());
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a JsonCppObject instance.
+     *
+     * If the referenced JsonCpp value is an object, this function will return a
+     * std::optional containing a JsonCppObject instance referencing the
+     * object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<JsonCppObject> getObjectOptional() const
+    {
+        if (value.isObject()) {
+            return opt::make_optional(JsonCppObject(value));
+        }
+
+        return opt::optional<JsonCppObject>();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced JsonCpp value is an object, this function will retrieve
+     * the number of members in the object and store it in the output variable
+     * provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (value.isObject()) {
+            result = value.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value.isString()) {
+            result = value.asString();
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return true;
+    }
+
+    bool isArray() const
+    {
+        return value.isArray() && !value.isNull();
+    }
+
+    bool isBool() const
+    {
+        return value.isBool();
+    }
+
+    bool isDouble() const
+    {
+        return value.isDouble();
+    }
+
+    bool isInteger() const
+    {
+        return value.isIntegral() && !value.isBool();
+    }
+
+    bool isNull() const
+    {
+        return value.isNull();
+    }
+
+    bool isNumber() const
+    {
+        return value.isNumeric()  && !value.isBool();
+    }
+
+    bool isObject() const
+    {
+        return value.isObject() && !value.isNull();
+    }
+
+    bool isString() const
+    {
+        return value.isString();
+    }
+
+private:
+
+    /// Return a reference to an empty object singleton.
+    static const Json::Value &emptyObject()
+    {
+        static Json::Value object(Json::objectValue);
+        return object;
+    }
+
+    /// Reference to the contained JsonCpp value
+    const Json::Value &value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting JsonCpp.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+class JsonCppAdapter:
+    public BasicAdapter<JsonCppAdapter,
+                        JsonCppArray,
+                        JsonCppObjectMember,
+                        JsonCppObject,
+                        JsonCppValue>
+{
+public:
+
+    /// Construct a JsonCppAdapter that contains an empty object
+    JsonCppAdapter()
+      : BasicAdapter() { }
+
+    /// Construct a JsonCppAdapter containing a specific JsonCpp value
+    JsonCppAdapter(const Json::Value &value)
+      : BasicAdapter(value) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * JsonCppAdapter representing a value stored in the array. It has been
+ * implemented using the boost iterator_facade template.
+ *
+ * @see JsonCppArray
+ */
+class JsonCppArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,     // bi-directional iterator
+        JsonCppAdapter>                      // value type
+{
+
+public:
+
+    /**
+     * @brief   Construct a new JsonCppArrayValueIterator using an existing
+     *          JsonCpp iterator.
+     *
+     * @param   itr  JsonCpp iterator to store
+     */
+    JsonCppArrayValueIterator(const Json::Value::const_iterator &itr)
+      : itr(itr) { }
+
+    /// Returns a JsonCppAdapter that contains the value of the current element.
+    JsonCppAdapter operator*() const
+    {
+        return JsonCppAdapter(*itr);
+    }
+
+    DerefProxy<JsonCppAdapter> operator->() const
+    {
+        return DerefProxy<JsonCppAdapter>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   rhs  iterator to compare against
+     *
+     * @returns true if the iterators are equal, false otherwise.
+     */
+    bool operator==(const JsonCppArrayValueIterator &rhs) const
+    {
+        return itr == rhs.itr;
+    }
+
+    bool operator!=(const JsonCppArrayValueIterator &rhs) const
+    {
+        return !(itr == rhs.itr);
+    }
+
+    JsonCppArrayValueIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    JsonCppArrayValueIterator operator++(int)
+    {
+        JsonCppArrayValueIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    JsonCppArrayValueIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        if (n > 0) {
+            while (n-- > 0) {
+                itr++;
+            }
+        } else {
+            while (n++ < 0) {
+                itr--;
+            }
+        }
+    }
+
+private:
+
+    Json::Value::const_iterator itr;
+};
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of JsonCppObjectMember representing one of the members of the object. It has
+ * been implemented using the boost iterator_facade template.
+ *
+ * @see JsonCppObject
+ * @see JsonCppObjectMember
+ */
+class JsonCppObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,     // bi-directional iterator
+        JsonCppObjectMember>                 // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a JsonCpp iterator.
+     *
+     * @param   itr  JsonCpp iterator to store
+     */
+    JsonCppObjectMemberIterator(const Json::ValueConstIterator &itr)
+      : itr(itr) { }
+
+    /**
+     * @brief   Returns a JsonCppObjectMember that contains the key and value
+     *          belonging to the object member identified by the iterator.
+     */
+    JsonCppObjectMember operator*() const
+    {
+        return JsonCppObjectMember(itr.key().asString(), *itr);
+    }
+
+    DerefProxy<JsonCppObjectMember> operator->() const
+    {
+        return DerefProxy<JsonCppObjectMember>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   rhs  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const JsonCppObjectMemberIterator &rhs) const
+    {
+        return itr == rhs.itr;
+    }
+
+    bool operator!=(const JsonCppObjectMemberIterator &rhs) const
+    {
+        return !(itr == rhs.itr);
+    }
+
+    const JsonCppObjectMemberIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    JsonCppObjectMemberIterator operator++(int)
+    {
+        JsonCppObjectMemberIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    JsonCppObjectMemberIterator operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+private:
+
+    /// Iternal copy of the original JsonCpp iterator
+    Json::ValueConstIterator itr;
+};
+
+/// Specialisation of the AdapterTraits template struct for JsonCppAdapter.
+template<>
+struct AdapterTraits<valijson::adapters::JsonCppAdapter>
+{
+    typedef Json::Value DocumentType;
+
+    static std::string adapterName()
+    {
+        return "JsonCppAdapter";
+    }
+};
+
+inline bool JsonCppFrozenValue::equalTo(const Adapter &other, bool strict) const
+{
+    return JsonCppAdapter(value).equalTo(other, strict);
+}
+
+inline JsonCppArrayValueIterator JsonCppArray::begin() const
+{
+    return value.begin();
+}
+
+inline JsonCppArrayValueIterator JsonCppArray::end() const
+{
+    return value.end();
+}
+
+inline JsonCppObjectMemberIterator JsonCppObject::begin() const
+{
+    return value.begin();
+}
+
+inline JsonCppObjectMemberIterator JsonCppObject::end() const
+{
+    return value.end();
+}
+
+inline JsonCppObjectMemberIterator JsonCppObject::find(
+    const std::string &propertyName) const
+{
+    if (value.isMember(propertyName)) {
+        Json::ValueConstIterator itr;
+        for ( itr = value.begin(); itr != value.end(); ++itr) {
+            if (itr.key() == propertyName) {
+                return itr;
+            }
+        }
+    }
+
+    return value.end();
+}
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/nlohmann_json_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/nlohmann_json_adapter.hpp
@@ -0,0 +1,712 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the nlohmann json parser library.
+ *
+ * Include this file in your program to enable support for nlohmann json.
+ *
+ * This file defines the following classes (not in this order):
+ *  - NlohmannJsonAdapter
+ *  - NlohmannJsonArray
+ *  - NlohmannJsonValueIterator
+ *  - NlohmannJsonFrozenValue
+ *  - NlohmannJsonObject
+ *  - NlohmannJsonObjectMember
+ *  - NlohmannJsonObjectMemberIterator
+ *  - NlohmannJsonValue
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is NlohmannJsonAdapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP
+
+#include <string>
+#include <json.hpp>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+class NlohmannJsonAdapter;
+class NlohmannJsonArrayValueIterator;
+class NlohmannJsonObjectMemberIterator;
+
+typedef std::pair<std::string, NlohmannJsonAdapter> NlohmannJsonObjectMember;
+
+/**
+ * @brief  Light weight wrapper for a NlohmannJson array value.
+ *
+ * This class is light weight wrapper for a NlohmannJson array. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * NlohmannJson value, assumed to be an array, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class NlohmannJsonArray
+{
+public:
+
+    typedef NlohmannJsonArrayValueIterator const_iterator;
+    typedef NlohmannJsonArrayValueIterator iterator;
+
+    /// Construct a NlohmannJsonArray referencing an empty array.
+    NlohmannJsonArray()
+      : value(emptyArray()) { }
+
+    /**
+     * @brief   Construct a NlohmannJsonArray referencing a specific NlohmannJson
+     *          value.
+     *
+     * @param   value   reference to a NlohmannJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an array.
+     */
+    NlohmannJsonArray(const nlohmann::json &value)
+      : value(value)
+    {
+        if (!value.is_array()) {
+            throw std::runtime_error("Value is not an array.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for the first element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying NlohmannJson implementation.
+     */
+    NlohmannJsonArrayValueIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for one-past the last element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying NlohmannJson implementation.
+     */
+    NlohmannJsonArrayValueIterator end() const;
+
+    /// Return the number of elements in the array
+    size_t size() const
+    {
+        return value.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a NlohmannJson value that is an empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const nlohmann::json & emptyArray()
+    {
+        static const nlohmann::json array = nlohmann::json::array();
+        return array;
+    }
+
+    /// Reference to the contained value
+    const nlohmann::json &value;
+};
+
+/**
+ * @brief  Light weight wrapper for a NlohmannJson object.
+ *
+ * This class is light weight wrapper for a NlohmannJson object. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * NlohmannJson value, assumed to be an object, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class NlohmannJsonObject
+{
+public:
+
+    typedef NlohmannJsonObjectMemberIterator const_iterator;
+    typedef NlohmannJsonObjectMemberIterator iterator;
+
+    /// Construct a NlohmannJsonObject referencing an empty object singleton.
+    NlohmannJsonObject()
+      : value(emptyObject()) { }
+
+    /**
+     * @brief   Construct a NlohmannJsonObject referencing a specific NlohmannJson
+     *          value.
+     *
+     * @param   value  reference to a NlohmannJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an object.
+     */
+    NlohmannJsonObject(const nlohmann::json &value)
+      : value(value)
+    {
+        if (!value.is_object()) {
+            throw std::runtime_error("Value is not an object.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying NlohmannJson implementation.
+     */
+    NlohmannJsonObjectMemberIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying NlohmannJson implementation.
+     */
+    NlohmannJsonObjectMemberIterator end() const;
+
+    /**
+     * @brief   Return an iterator for the object member with the specified
+     *          property name.
+     *
+     * If an object member with the specified name does not exist, the iterator
+     * returned will be the same as the iterator returned by the end() function.
+     *
+     * @param   propertyName  property name to search for
+     */
+    NlohmannJsonObjectMemberIterator find(const std::string &propertyName) const;
+
+    /// Returns the number of members belonging to this object.
+    size_t size() const
+    {
+        return value.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a NlohmannJson value that is empty object.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const nlohmann::json & emptyObject()
+    {
+        static const nlohmann::json object = nlohmann::json::object();
+        return object;
+    }
+
+    /// Reference to the contained object
+    const nlohmann::json &value;
+};
+
+
+/**
+ * @brief   Stores an independent copy of a NlohmannJson value.
+ *
+ * This class allows a NlohmannJson value to be stored independent of its original
+ * document. NlohmannJson makes this easy to do, as it does not perform any
+ * custom memory management.
+ *
+ * @see FrozenValue
+ */
+class NlohmannJsonFrozenValue: public FrozenValue
+{
+public:
+
+    /**
+     * @brief  Make a copy of a NlohmannJson value
+     *
+     * @param  source  the NlohmannJson value to be copied
+     */
+    explicit NlohmannJsonFrozenValue(const nlohmann::json &source)
+      : value(source) { }
+
+    virtual FrozenValue * clone() const
+    {
+        return new NlohmannJsonFrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /// Stored NlohmannJson value
+    nlohmann::json value;
+};
+
+
+/**
+ * @brief   Light weight wrapper for a NlohmannJson value.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a NlohmannJson value. This class is responsible
+ * for the mechanics of actually reading a NlohmannJson value, whereas the
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+class NlohmannJsonValue
+{
+public:
+
+    /// Construct a wrapper for the empty object singleton
+    NlohmannJsonValue()
+      : value(emptyObject()) { }
+
+    /// Construct a wrapper for a specific NlohmannJson value
+    NlohmannJsonValue(const nlohmann::json &value)
+      : value(value) { }
+
+    /**
+     * @brief   Create a new NlohmannJsonFrozenValue instance that contains the
+     *          value referenced by this NlohmannJsonValue instance.
+     *
+     * @returns pointer to a new NlohmannJsonFrozenValue instance, belonging to the
+     *          caller.
+     */
+    FrozenValue * freeze() const
+    {
+        return new NlohmannJsonFrozenValue(value);
+    }
+
+    /**
+     * @brief   Optionally return a NlohmannJsonArray instance.
+     *
+     * If the referenced NlohmannJson value is an array, this function will return
+     * a std::optional containing a NlohmannJsonArray instance referencing the
+     * array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<NlohmannJsonArray> getArrayOptional() const
+    {
+        if (value.is_array()) {
+            return opt::make_optional(NlohmannJsonArray(value));
+        }
+
+        return opt::optional<NlohmannJsonArray>();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced NlohmannJson value is an array, this function will
+     * retrieve the number of elements in the array and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (value.is_array()) {
+            result = value.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &result) const
+    {
+        if (value.is_boolean()) {
+            result = value.get<bool>();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getDouble(double &result) const
+    {
+        if (value.is_number_float()) {
+            result = value.get<double>();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getInteger(int64_t &result) const
+    {
+        if(value.is_number_integer()) {
+            result = value.get<int64_t>();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a NlohmannJsonObject instance.
+     *
+     * If the referenced NlohmannJson value is an object, this function will return a
+     * std::optional containing a NlohmannJsonObject instance referencing the
+     * object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<NlohmannJsonObject> getObjectOptional() const
+    {
+        if (value.is_object()) {
+            return opt::make_optional(NlohmannJsonObject(value));
+        }
+
+        return opt::optional<NlohmannJsonObject>();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced NlohmannJson value is an object, this function will
+     * retrieve the number of members in the object and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (value.is_object()) {
+            result = value.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value.is_string()) {
+            result = value.get<std::string>();
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return true;
+    }
+
+    bool isArray() const
+    {
+        return value.is_array();
+    }
+
+    bool isBool() const
+    {
+        return value.is_boolean();
+    }
+
+    bool isDouble() const
+    {
+        return value.is_number_float();
+    }
+
+    bool isInteger() const
+    {
+        return value.is_number_integer();
+    }
+
+    bool isNull() const
+    {
+        return value.is_null();
+    }
+
+    bool isNumber() const
+    {
+        return value.is_number();
+    }
+
+    bool isObject() const
+    {
+        return value.is_object();
+    }
+
+    bool isString() const
+    {
+        return value.is_string();
+    }
+
+private:
+
+    /// Return a reference to an empty object singleton
+    static const nlohmann::json & emptyObject()
+    {
+        static const nlohmann::json object = nlohmann::json::object();
+        return object;
+    }
+
+    /// Reference to the contained NlohmannJson value.
+    const nlohmann::json &value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting NlohmannJson.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+class NlohmannJsonAdapter:
+    public BasicAdapter<NlohmannJsonAdapter,
+        NlohmannJsonArray,
+        NlohmannJsonObjectMember,
+        NlohmannJsonObject,
+        NlohmannJsonValue>
+{
+public:
+    /// Construct a NlohmannJsonAdapter that contains an empty object
+    NlohmannJsonAdapter()
+      : BasicAdapter() { }
+
+    /// Construct a NlohmannJsonAdapter containing a specific Nlohmann Json object
+    NlohmannJsonAdapter(const nlohmann::json &value)
+      : BasicAdapter(NlohmannJsonValue{value}) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * NlohmannJsonAdapter representing a value stored in the array. It has been
+ * implemented using the boost iterator_facade template.
+ *
+ * @see NlohmannJsonArray
+ */
+class NlohmannJsonArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,  // bi-directional iterator
+        NlohmannJsonAdapter>                 // value type
+{
+public:
+
+    /**
+     * @brief   Construct a new NlohmannJsonArrayValueIterator using an existing
+     *          NlohmannJson iterator.
+     *
+     * @param   itr  NlohmannJson iterator to store
+     */
+    NlohmannJsonArrayValueIterator(const nlohmann::json::const_iterator &itr)
+      : itr(itr) { }
+
+    /// Returns a NlohmannJsonAdapter that contains the value of the current
+    /// element.
+    NlohmannJsonAdapter operator*() const
+    {
+        return NlohmannJsonAdapter(*itr);
+    }
+
+    DerefProxy<NlohmannJsonAdapter> operator->() const
+    {
+        return DerefProxy<NlohmannJsonAdapter>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  iterator to compare against
+     *
+     * @returns true   if the iterators are equal, false otherwise.
+     */
+    bool operator==(const NlohmannJsonArrayValueIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const NlohmannJsonArrayValueIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const NlohmannJsonArrayValueIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    NlohmannJsonArrayValueIterator operator++(int)
+    {
+        NlohmannJsonArrayValueIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const NlohmannJsonArrayValueIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        itr += n;
+    }
+
+private:
+    nlohmann::json::const_iterator itr;
+};
+
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of NlohmannJsonObjectMember representing one of the members of the object. It
+ * has been implemented using the boost iterator_facade template.
+ *
+ * @see NlohmannJsonObject
+ * @see NlohmannJsonObjectMember
+ */
+class NlohmannJsonObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,     // bi-directional iterator
+        NlohmannJsonObjectMember>            // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a NlohmannJson iterator.
+     *
+     * @param   itr  NlohmannJson iterator to store
+     */
+    NlohmannJsonObjectMemberIterator(const nlohmann::json::const_iterator &itr)
+      : itr(itr) { }
+
+    /**
+     * @brief   Returns a NlohmannJsonObjectMember that contains the key and value
+     *          belonging to the object member identified by the iterator.
+     */
+    NlohmannJsonObjectMember operator*() const
+    {
+        return NlohmannJsonObjectMember(itr.key(), itr.value());
+    }
+
+    DerefProxy<NlohmannJsonObjectMember> operator->() const
+    {
+        return DerefProxy<NlohmannJsonObjectMember>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const NlohmannJsonObjectMemberIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const NlohmannJsonObjectMemberIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const NlohmannJsonObjectMemberIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    NlohmannJsonObjectMemberIterator operator++(int)
+    {
+        NlohmannJsonObjectMemberIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const NlohmannJsonObjectMemberIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+private:
+
+    /// Iternal copy of the original NlohmannJson iterator
+    nlohmann::json::const_iterator itr;
+};
+
+/// Specialisation of the AdapterTraits template struct for NlohmannJsonAdapter.
+template<>
+struct AdapterTraits<valijson::adapters::NlohmannJsonAdapter>
+{
+    typedef nlohmann::json DocumentType;
+
+    static std::string adapterName()
+    {
+        return "NlohmannJsonAdapter";
+    }
+};
+
+inline bool NlohmannJsonFrozenValue::equalTo(const Adapter &other, bool strict) const
+{
+    return NlohmannJsonAdapter(value).equalTo(other, strict);
+}
+
+inline NlohmannJsonArrayValueIterator NlohmannJsonArray::begin() const
+{
+    return value.begin();
+}
+
+inline NlohmannJsonArrayValueIterator NlohmannJsonArray::end() const
+{
+    return value.end();
+}
+
+inline NlohmannJsonObjectMemberIterator NlohmannJsonObject::begin() const
+{
+    return value.begin();
+}
+
+inline NlohmannJsonObjectMemberIterator NlohmannJsonObject::end() const
+{
+    return value.end();
+}
+
+inline NlohmannJsonObjectMemberIterator NlohmannJsonObject::find(
+        const std::string &propertyName) const
+{
+    return value.find(propertyName);
+}
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
+
--- a/examples/validator/valijson/include/valijson/adapters/picojson_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/picojson_adapter.hpp
@@ -0,0 +1,727 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the PicoJson parser library.
+ *
+ * Include this file in your program to enable support for PicoJson.
+ *
+ * This file defines the following classes (not in this order):
+ *  - PicoJsonAdapter
+ *  - PicoJsonArray
+ *  - PicoJsonArrayValueIterator
+ *  - PicoJsonFrozenValue
+ *  - PicoJsonObject
+ *  - PicoJsonObjectMember
+ *  - PicoJsonObjectMemberIterator
+ *  - PicoJsonValue
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is PicoJsonAdapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_PICOJSON_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_PICOJSON_ADAPTER_HPP
+
+#include <string>
+
+#include <picojson.h>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+class PicoJsonAdapter;
+class PicoJsonArrayValueIterator;
+class PicoJsonObjectMemberIterator;
+
+typedef std::pair<std::string, PicoJsonAdapter> PicoJsonObjectMember;
+
+/**
+ * @brief  Light weight wrapper for a PicoJson array value.
+ *
+ * This class is light weight wrapper for a PicoJson array. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * PicoJson value, assumed to be an array, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class PicoJsonArray
+{
+public:
+
+    typedef PicoJsonArrayValueIterator const_iterator;
+    typedef PicoJsonArrayValueIterator iterator;
+
+    /// Construct a PicoJsonArray referencing an empty array.
+    PicoJsonArray()
+      : value(emptyArray()) { }
+
+    /**
+     * @brief   Construct a PicoJsonArray referencing a specific PicoJson
+     *          value.
+     *
+     * @param   value   reference to a PicoJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an array.
+     */
+    explicit PicoJsonArray(const picojson::value &value)
+      : value(value)
+    {
+        if (!value.is<picojson::array>()) {
+            throw std::runtime_error("Value is not an array.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for the first element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying PicoJson implementation.
+     */
+    PicoJsonArrayValueIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for one-past the last element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying PicoJson implementation.
+     */
+    PicoJsonArrayValueIterator end() const;
+
+    /// Return the number of elements in the array
+    size_t size() const
+    {
+        const picojson::array &array = value.get<picojson::array>();
+        return array.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a PicoJson value that is an empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const picojson::value & emptyArray()
+    {
+        static const picojson::value array(picojson::array_type, false);
+        return array;
+    }
+
+    /// Reference to the contained value
+    const picojson::value &value;
+};
+
+/**
+ * @brief  Light weight wrapper for a PicoJson object.
+ *
+ * This class is light weight wrapper for a PicoJson object. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * PicoJson value, assumed to be an object, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class PicoJsonObject
+{
+public:
+
+    typedef PicoJsonObjectMemberIterator const_iterator;
+    typedef PicoJsonObjectMemberIterator iterator;
+
+    /// Construct a PicoJsonObject referencing an empty object singleton.
+    PicoJsonObject()
+      : value(emptyObject()) { }
+
+    /**
+     * @brief   Construct a PicoJsonObject referencing a specific PicoJson
+     *          value.
+     *
+     * @param   value  reference to a PicoJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an object.
+     */
+    PicoJsonObject(const picojson::value &value)
+      : value(value)
+    {
+        if (!value.is<picojson::object>()) {
+            throw std::runtime_error("Value is not an object.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying PicoJson implementation.
+     */
+    PicoJsonObjectMemberIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying PicoJson implementation.
+     */
+    PicoJsonObjectMemberIterator end() const;
+
+    /**
+     * @brief   Return an iterator for the object member with the specified
+     *          property name.
+     *
+     * If an object member with the specified name does not exist, the iterator
+     * returned will be the same as the iterator returned by the end() function.
+     *
+     * @param   propertyName  property name to search for
+     */
+    PicoJsonObjectMemberIterator find(const std::string &propertyName) const;
+
+    /// Returns the number of members belonging to this object.
+    size_t size() const
+    {
+        const picojson::object &object = value.get<picojson::object>();
+        return object.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a PicoJson value that is empty object.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const picojson::value & emptyObject()
+    {
+        static const picojson::value object(picojson::object_type, false);
+        return object;
+    }
+
+    /// Reference to the contained object
+    const picojson::value &value;
+};
+
+/**
+ * @brief   Stores an independent copy of a PicoJson value.
+ *
+ * This class allows a PicoJson value to be stored independent of its original
+ * document. PicoJson makes this easy to do, as it does not perform any
+ * custom memory management.
+ *
+ * @see FrozenValue
+ */
+class PicoJsonFrozenValue: public FrozenValue
+{
+public:
+
+    /**
+     * @brief  Make a copy of a PicoJson value
+     *
+     * @param  source  the PicoJson value to be copied
+     */
+    explicit PicoJsonFrozenValue(const picojson::value &source)
+      : value(source) { }
+
+    virtual FrozenValue * clone() const
+    {
+        return new PicoJsonFrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /// Stored PicoJson value
+    picojson::value value;
+};
+
+/**
+ * @brief   Light weight wrapper for a PicoJson value.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a PicoJson value. This class is responsible
+ * for the mechanics of actually reading a PicoJson value, whereas the
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+class PicoJsonValue
+{
+public:
+
+    /// Construct a wrapper for the empty object singleton
+    PicoJsonValue()
+      : value(emptyObject()) { }
+
+    /// Construct a wrapper for a specific PicoJson value
+    PicoJsonValue(const picojson::value &value)
+      : value(value) { }
+
+    /**
+     * @brief   Create a new PicoJsonFrozenValue instance that contains the
+     *          value referenced by this PicoJsonValue instance.
+     *
+     * @returns pointer to a new PicoJsonFrozenValue instance, belonging to the
+     *          caller.
+     */
+    FrozenValue * freeze() const
+    {
+        return new PicoJsonFrozenValue(value);
+    }
+
+    /**
+     * @brief   Optionally return a PicoJsonArray instance.
+     *
+     * If the referenced PicoJson value is an array, this function will return
+     * a std::optional containing a PicoJsonArray instance referencing the
+     * array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<PicoJsonArray> getArrayOptional() const
+    {
+        if (value.is<picojson::array>()) {
+            return opt::make_optional(PicoJsonArray(value));
+        }
+
+        return opt::optional<PicoJsonArray>();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced PicoJson value is an array, this function will
+     * retrieve the number of elements in the array and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (value.is<picojson::array>()) {
+            const picojson::array& array = value.get<picojson::array>();
+            result = array.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &result) const
+    {
+        if (value.is<bool>()) {
+            result = value.get<bool>();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getDouble(double &result) const
+    {
+        if (value.is<double>()) {
+            result = value.get<double>();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getInteger(int64_t &result) const
+    {
+        if (value.is<int64_t>()) {
+            result = value.get<int64_t>();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a PicoJsonObject instance.
+     *
+     * If the referenced PicoJson value is an object, this function will return a
+     * std::optional containing a PicoJsonObject instance referencing the
+     * object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<PicoJsonObject> getObjectOptional() const
+    {
+        if (value.is<picojson::object>()) {
+            return opt::make_optional(PicoJsonObject(value));
+        }
+
+        return opt::optional<PicoJsonObject>();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced PicoJson value is an object, this function will
+     * retrieve the number of members in the object and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (value.is<picojson::object>()) {
+            const picojson::object &object = value.get<picojson::object>();
+            result = object.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value.is<std::string>()) {
+            result = value.get<std::string>();
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return true;
+    }
+
+    bool isArray() const
+    {
+        return value.is<picojson::array>();
+    }
+
+    bool isBool() const
+    {
+        return value.is<bool>();
+    }
+
+    bool isDouble() const
+    {
+        if (value.is<int64_t>()) {
+            return false;
+        }
+
+        return value.is<double>();
+    }
+
+    bool isInteger() const
+    {
+        return value.is<int64_t>();
+    }
+
+    bool isNull() const
+    {
+        return value.is<picojson::null>();
+    }
+
+    bool isNumber() const
+    {
+        return value.is<double>();
+    }
+
+    bool isObject() const
+    {
+        return value.is<picojson::object>();
+    }
+
+    bool isString() const
+    {
+        return value.is<std::string>();
+    }
+
+private:
+
+    /// Return a reference to an empty object singleton
+    static const picojson::value & emptyObject()
+    {
+        static const picojson::value object(picojson::object_type, false);
+        return object;
+    }
+
+    /// Reference to the contained PicoJson value.
+    const picojson::value &value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting PicoJson.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+class PicoJsonAdapter:
+    public BasicAdapter<PicoJsonAdapter,
+                        PicoJsonArray,
+                        PicoJsonObjectMember,
+                        PicoJsonObject,
+                        PicoJsonValue>
+{
+public:
+
+    /// Construct a PicoJsonAdapter that contains an empty object
+    PicoJsonAdapter()
+      : BasicAdapter() { }
+
+    /// Construct a PicoJsonAdapter containing a specific PicoJson value
+    PicoJsonAdapter(const picojson::value &value)
+      : BasicAdapter(value) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * PicoJsonAdapter representing a value stored in the array. It has been
+ * implemented using the std::iterator template.
+ *
+ * @see PicoJsonArray
+ */
+class PicoJsonArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,     // bi-directional iterator
+        PicoJsonAdapter>                     // value type
+{
+public:
+
+    /**
+     * @brief   Construct a new PicoJsonArrayValueIterator using an existing
+     *          PicoJson iterator.
+     *
+     * @param   itr  PicoJson iterator to store
+     */
+    PicoJsonArrayValueIterator(
+        const picojson::array::const_iterator &itr)
+      : itr(itr) { }
+
+    /// Returns a PicoJsonAdapter that contains the value of the current
+    /// element.
+    PicoJsonAdapter operator*() const
+    {
+        return PicoJsonAdapter(*itr);
+    }
+
+    DerefProxy<PicoJsonAdapter> operator->() const
+    {
+        return DerefProxy<PicoJsonAdapter>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  iterator to compare against
+     *
+     * @returns true   if the iterators are equal, false otherwise.
+     */
+    bool operator==(const PicoJsonArrayValueIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const PicoJsonArrayValueIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const PicoJsonArrayValueIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    PicoJsonArrayValueIterator operator++(int)
+    {
+        PicoJsonArrayValueIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const PicoJsonArrayValueIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        itr += n;
+    }
+
+private:
+
+    picojson::array::const_iterator itr;
+};
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of PicoJsonObjectMember representing one of the members of the object. It
+ * has been implemented using the boost iterator_facade template.
+ *
+ * @see PicoJsonObject
+ * @see PicoJsonObjectMember
+ */
+class PicoJsonObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,  // bi-directional iterator
+        PicoJsonObjectMember>             // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a PicoJson iterator.
+     *
+     * @param   itr  PicoJson iterator to store
+     */
+    PicoJsonObjectMemberIterator(
+        const picojson::object::const_iterator &itr)
+      : itr(itr) { }
+
+    /**
+     * @brief   Returns a PicoJsonObjectMember that contains the key and value
+     *          belonging to the object member identified by the iterator.
+     */
+    PicoJsonObjectMember operator*() const
+    {
+        return PicoJsonObjectMember(itr->first, itr->second);
+    }
+
+    DerefProxy<PicoJsonObjectMember> operator->() const
+    {
+        return DerefProxy<PicoJsonObjectMember>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const PicoJsonObjectMemberIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const PicoJsonObjectMemberIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const PicoJsonObjectMemberIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    PicoJsonObjectMemberIterator operator++(int)
+    {
+        PicoJsonObjectMemberIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const PicoJsonObjectMemberIterator& operator--(int)
+    {
+        itr--;
+
+        return *this;
+    }
+
+private:
+
+    /// Iternal copy of the original PicoJson iterator
+    picojson::object::const_iterator itr;
+};
+
+/// Specialisation of the AdapterTraits template struct for PicoJsonAdapter.
+template<>
+struct AdapterTraits<valijson::adapters::PicoJsonAdapter>
+{
+    typedef picojson::value DocumentType;
+
+    static std::string adapterName()
+    {
+        return "PicoJsonAdapter";
+    }
+};
+
+inline bool PicoJsonFrozenValue::equalTo(const Adapter &other, bool strict) const
+{
+    return PicoJsonAdapter(value).equalTo(other, strict);
+}
+
+inline PicoJsonArrayValueIterator PicoJsonArray::begin() const
+{
+    const picojson::array &array = value.get<picojson::array>();
+    return array.begin();
+}
+
+inline PicoJsonArrayValueIterator PicoJsonArray::end() const
+{
+    const picojson::array &array = value.get<picojson::array>();
+    return array.end();
+}
+
+inline PicoJsonObjectMemberIterator PicoJsonObject::begin() const
+{
+    const picojson::object &object = value.get<picojson::object>();
+    return object.begin();
+}
+
+inline PicoJsonObjectMemberIterator PicoJsonObject::end() const
+{
+    const picojson::object &object = value.get<picojson::object>();
+    return object.end();
+}
+
+inline PicoJsonObjectMemberIterator PicoJsonObject::find(
+    const std::string &propertyName) const
+{
+    const picojson::object &object = value.get<picojson::object>();
+    return object.find(propertyName);
+}
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/poco_json_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/poco_json_adapter.hpp
@@ -0,0 +1,728 @@
+/**
+* @file
+*
+* @brief   Adapter implementation for the Poco json parser library.
+*
+* Include this file in your program to enable support for Poco json.
+*
+* This file defines the following classes (not in this order):
+*  - PocoJsonAdapter
+*  - PocoJsonArray
+*  - PocoJsonValueIterator
+*  - PocoJsonFrozenValue
+*  - PocoJsonObject
+*  - PocoJsonObjectMember
+*  - PocoJsonObjectMemberIterator
+*  - PocoJsonValue
+*
+* Due to the dependencies that exist between these classes, the ordering of
+* class declarations and definitions may be a bit confusing. The best place to
+* start is PocoJsonAdapter. This class definition is actually very small,
+* since most of the functionality is inherited from the BasicAdapter class.
+* Most of the classes in this file are provided as template arguments to the
+* inherited BasicAdapter class.
+*/
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_POCO_JSON_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_POCO_JSON_ADAPTER_HPP
+
+#include <string>
+#include <Poco/JSON/Object.h>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson
+{
+    namespace adapters
+    {
+
+        class PocoJsonAdapter;
+        class PocoJsonArrayValueIterator;
+        class PocoJsonObjectMemberIterator;
+
+        typedef std::pair<std::string, PocoJsonAdapter> PocoJsonObjectMember;
+
+        /**
+        * @brief  Light weight wrapper for a PocoJson array value.
+        *
+        * This class is light weight wrapper for a PocoJson array. It provides a
+        * minimum set of container functions and typedefs that allow it to be used as
+        * an iterable container.
+        *
+        * An instance of this class contains a single reference to the underlying
+        * PocoJson value, assumed to be an array, so there is very little overhead
+        * associated with copy construction and passing by value.
+        */
+        class PocoJsonArray
+        {
+        public:
+
+            typedef PocoJsonArrayValueIterator const_iterator;
+            typedef PocoJsonArrayValueIterator iterator;
+
+            /// Construct a PocoJsonArray referencing an empty array.
+            PocoJsonArray()
+                : value(emptyArray())
+            { }
+
+            /**
+            * @brief   Construct a PocoJsonArray referencing a specific PocoJson
+            *          value.
+            *
+            * @param   value   reference to a PocoJson value
+            *
+            * Note that this constructor will throw an exception if the value is not
+            * an array.
+            */
+            PocoJsonArray(const Poco::Dynamic::Var &value)
+                : value(value)
+            {
+                if (value.type() != typeid(Poco::JSON::Array::Ptr)) {
+                    throw std::runtime_error("Value is not an array.");
+                }
+            }
+
+            /**
+            * @brief   Return an iterator for the first element of the array.
+            *
+            * The iterator return by this function is effectively the iterator
+            * returned by the underlying PocoJson implementation.
+            */
+            PocoJsonArrayValueIterator begin() const;
+
+            /**
+            * @brief   Return an iterator for one-past the last element of the array.
+            *
+            * The iterator return by this function is effectively the iterator
+            * returned by the underlying PocoJson implementation.
+            */
+            PocoJsonArrayValueIterator end() const;
+
+            /// Return the number of elements in the array
+            size_t size() const
+            {
+                return value.extract<Poco::JSON::Array::Ptr>()->size();
+            }
+
+        private:
+
+            /**
+            * @brief   Return a PocoJson value that is an empty array.
+            */
+            static Poco::Dynamic::Var emptyArray()
+            {
+                Poco::Dynamic::Var array = Poco::JSON::Array::Ptr();
+                return array;
+            }
+
+            /// Contained value
+            Poco::Dynamic::Var value;
+        };
+
+        /**
+        * @brief  Light weight wrapper for a PocoJson object.
+        *
+        * This class is light weight wrapper for a PocoJson object. It provides a
+        * minimum set of container functions and typedefs that allow it to be used as
+        * an iterable container.
+        *
+        * An instance of this class contains a single reference to the underlying
+        * PocoJson value, assumed to be an object, so there is very little overhead
+        * associated with copy construction and passing by value.
+        */
+        class PocoJsonObject
+        {
+        public:
+
+            typedef PocoJsonObjectMemberIterator const_iterator;
+            typedef PocoJsonObjectMemberIterator iterator;
+
+            /// Construct a PocoJsonObject an empty object.
+            PocoJsonObject()
+                : value(emptyObject())
+            { }
+
+            /**
+            * @brief   Construct a PocoJsonObject referencing a specific PocoJson
+            *          value.
+            *
+            * @param   value  reference to a PocoJson value
+            *
+            * Note that this constructor will throw an exception if the value is not
+            * an object.
+            */
+            PocoJsonObject(const Poco::Dynamic::Var &value)
+                : value(value)
+            {
+                if (value.type() != typeid(Poco::JSON::Object::Ptr)) {
+                    throw std::runtime_error("Value is not an object.");
+                }
+            }
+
+            /**
+            * @brief   Return an iterator for this first object member
+            *
+            * The iterator return by this function is effectively a wrapper around
+            * the iterator value returned by the underlying PocoJson implementation.
+            */
+            PocoJsonObjectMemberIterator begin() const;
+
+            /**
+            * @brief   Return an iterator for an invalid object member that indicates
+            *          the end of the collection.
+            *
+            * The iterator return by this function is effectively a wrapper around
+            * the iterator value returned by the underlying PocoJson implementation.
+            */
+            PocoJsonObjectMemberIterator end() const;
+
+            /**
+            * @brief   Return an iterator for the object member with the specified
+            *          property name.
+            *
+            * If an object member with the specified name does not exist, the iterator
+            * returned will be the same as the iterator returned by the end() function.
+            *
+            * @param   propertyName  property name to search for
+            */
+            PocoJsonObjectMemberIterator find(const std::string &propertyName) const;
+
+            /// Returns the number of members belonging to this object.
+            size_t size() const
+            {
+                return value.extract<Poco::JSON::Object::Ptr>()->size();
+            }
+
+        private:
+
+            /**
+            * @brief   Return a PocoJson value that is empty object.
+            */
+            static Poco::Dynamic::Var emptyObject()
+            {
+                Poco::Dynamic::Var object = Poco::JSON::Object::Ptr();
+                return object;
+            }
+
+            /// Contained value
+            Poco::Dynamic::Var value;
+        };
+
+        /**
+        * @brief   Stores an independent copy of a PocoJson value.
+        *
+        * This class allows a PocoJson value to be stored independent of its original
+        * document. PocoJson makes this easy to do, as it does not perform any
+        * custom memory management.
+        *
+        * @see FrozenValue
+        */
+        class PocoJsonFrozenValue : public FrozenValue
+        {
+        public:
+
+            /**
+            * @brief  Make a copy of a PocoJson value
+            *
+            * @param  source  the PocoJson value to be copied
+            */
+            explicit PocoJsonFrozenValue(const Poco::Dynamic::Var &source)
+                : value(source)
+            { }
+
+            virtual FrozenValue * clone() const
+            {
+                return new PocoJsonFrozenValue(value);
+            }
+
+            virtual bool equalTo(const Adapter &other, bool strict) const;
+
+        private:
+
+            /// Stored PocoJson value
+            Poco::Dynamic::Var value;
+        };
+
+
+        /**
+        * @brief   Light weight wrapper for a PocoJson value.
+        *
+        * This class is passed as an argument to the BasicAdapter template class,
+        * and is used to provide access to a PocoJson value. This class is responsible
+        * for the mechanics of actually reading a PocoJson value, whereas the
+        * BasicAdapter class is responsible for the semantics of type comparisons
+        * and conversions.
+        *
+        * The functions that need to be provided by this class are defined implicitly
+        * by the implementation of the BasicAdapter template class.
+        *
+        * @see BasicAdapter
+        */
+        class PocoJsonValue
+        {
+        public:
+
+            /// Construct a wrapper for the empty object
+            PocoJsonValue()
+                : value(emptyObject())
+            { }
+
+            /// Construct a wrapper for a specific PocoJson value
+            PocoJsonValue(const Poco::Dynamic::Var& value)
+                : value(value)
+            { }
+
+            /**
+            * @brief   Create a new PocoJsonFrozenValue instance that contains the
+            *          value referenced by this PocoJsonValue instance.
+            *
+            * @returns pointer to a new PocoJsonFrozenValue instance, belonging to the
+            *          caller.
+            */
+            FrozenValue * freeze() const
+            {
+                return new PocoJsonFrozenValue(value);
+            }
+
+            /**
+            * @brief   Optionally return a PocoJsonArray instance.
+            *
+            * If the referenced PocoJson value is an array, this function will return
+            * a std::optional containing a PocoJsonArray instance referencing the
+            * array.
+            *
+            * Otherwise it will return an empty optional.
+            */
+            opt::optional<PocoJsonArray> getArrayOptional() const
+            {
+                if (value.type() == typeid(Poco::JSON::Array::Ptr)) {
+                    return opt::make_optional(PocoJsonArray(value));
+                }
+
+                return opt::optional<PocoJsonArray>();
+            }
+
+            /**
+            * @brief   Retrieve the number of elements in the array
+            *
+            * If the referenced PocoJson value is an array, this function will
+            * retrieve the number of elements in the array and store it in the output
+            * variable provided.
+            *
+            * @param   result  reference to size_t to set with result
+            *
+            * @returns true if the number of elements was retrieved, false otherwise.
+            */
+            bool getArraySize(size_t &result) const
+            {
+                if (value.type() == typeid(Poco::JSON::Array::Ptr)) {
+                    result = value.extract<Poco::JSON::Array::Ptr>()->size();
+                    return true;
+                }
+
+                return false;
+            }
+
+            bool getBool(bool &result) const
+            {
+                if (value.isBoolean()) {
+                    result = value.convert<bool>();
+                    return true;
+                }
+
+                return false;
+            }
+
+            bool getDouble(double &result) const
+            {
+                if (value.isNumeric() && !value.isInteger()) {
+                    result = value.convert<double>();
+                    return true;
+                }
+
+                return false;
+            }
+
+            bool getInteger(int64_t &result) const
+            {
+                if (value.isInteger()) {
+                    result = value.convert<int>();
+                    return true;
+                }
+                return false;
+            }
+
+            /**
+            * @brief   Optionally return a PocoJsonObject instance.
+            *
+            * If the referenced PocoJson value is an object, this function will return a
+            * std::optional containing a PocoJsonObject instance referencing the
+            * object.
+            *
+            * Otherwise it will return an empty optional.
+            */
+            opt::optional<PocoJsonObject> getObjectOptional() const
+            {
+                if (value.type() == typeid(Poco::JSON::Object::Ptr)) {
+                    return opt::make_optional(PocoJsonObject(value));
+                }
+
+                return opt::optional<PocoJsonObject>();
+            }
+
+            /**
+            * @brief   Retrieve the number of members in the object
+            *
+            * If the referenced PocoJson value is an object, this function will
+            * retrieve the number of members in the object and store it in the output
+            * variable provided.
+            *
+            * @param   result  reference to size_t to set with result
+            *
+            * @returns true if the number of members was retrieved, false otherwise.
+            */
+            bool getObjectSize(size_t &result) const
+            {
+                if (value.type() == typeid(Poco::JSON::Object::Ptr)) {
+                    result = value.extract<Poco::JSON::Object::Ptr>()->size();
+                    return true;
+                }
+
+                return false;
+            }
+
+            bool getString(std::string &result) const
+            {
+                if (value.isString()) {
+                    result = value.convert<std::string>();
+                    return true;
+                }
+
+                return false;
+            }
+
+            static bool hasStrictTypes()
+            {
+                return true;
+            }
+
+            bool isArray() const
+            {
+                return value.type() == typeid(Poco::JSON::Array::Ptr);
+            }
+
+            bool isBool() const
+            {
+                return value.isBoolean();
+            }
+
+            bool isDouble() const
+            {
+                return value.isNumeric() && !value.isInteger();
+            }
+
+            bool isInteger() const
+            {
+                return !isBool() && value.isInteger();
+            }
+
+            bool isNull() const
+            {
+                return value.isEmpty();
+            }
+
+            bool isNumber() const
+            {
+                return value.isNumeric();
+            }
+
+            bool isObject() const
+            {
+                return value.type() == typeid(Poco::JSON::Object::Ptr);
+            }
+
+            bool isString() const
+            {
+                return value.isString();
+            }
+
+        private:
+
+            /// Return an empty object
+            static Poco::Dynamic::Var emptyObject()
+            {
+                Poco::Dynamic::Var object = Poco::JSON::Object::Ptr();
+                return object;
+            }
+
+            /// Contained value
+            Poco::Dynamic::Var value;
+        };
+
+        /**
+        * @brief   An implementation of the Adapter interface supporting PocoJson.
+        *
+        * This class is defined in terms of the BasicAdapter template class, which
+        * helps to ensure that all of the Adapter implementations behave consistently.
+        *
+        * @see Adapter
+        * @see BasicAdapter
+        */
+        class PocoJsonAdapter :
+            public BasicAdapter<PocoJsonAdapter,
+            PocoJsonArray,
+            PocoJsonObjectMember,
+            PocoJsonObject,
+            PocoJsonValue>
+        {
+        public:
+            /// Construct a PocoJsonAdapter that contains an empty object
+            PocoJsonAdapter()
+                : BasicAdapter()
+            { }
+
+            /// Construct a PocoJsonAdapter containing a specific Poco Json object
+            PocoJsonAdapter(const Poco::Dynamic::Var &value)
+                : BasicAdapter(PocoJsonValue {value})
+            { }
+        };
+
+        /**
+        * @brief   Class for iterating over values held in a JSON array.
+        *
+        * This class provides a JSON array iterator that dereferences as an instance of
+        * PocoJsonAdapter representing a value stored in the array. It has been
+        * implemented using the boost iterator_facade template.
+        *
+        * @see PocoJsonArray
+        */
+        class PocoJsonArrayValueIterator :
+            public std::iterator<
+            std::bidirectional_iterator_tag,  // bi-directional iterator
+            PocoJsonAdapter>                 // value type
+        {
+        public:
+
+            /**
+            * @brief   Construct a new PocoJsonArrayValueIterator using an existing
+            *          PocoJson iterator.
+            *
+            * @param   itr  PocoJson iterator to store
+            */
+            PocoJsonArrayValueIterator(const Poco::JSON::Array::ConstIterator &itr)
+                : itr(itr)
+            { }
+
+            /// Returns a PocoJsonAdapter that contains the value of the current
+            /// element.
+            PocoJsonAdapter operator*() const
+            {
+                return PocoJsonAdapter(*itr);
+            }
+
+            DerefProxy<PocoJsonAdapter> operator->() const
+            {
+                return DerefProxy<PocoJsonAdapter>(**this);
+            }
+
+            /**
+            * @brief   Compare this iterator against another iterator.
+            *
+            * Note that this directly compares the iterators, not the underlying
+            * values, and assumes that two identical iterators will point to the same
+            * underlying object.
+            *
+            * @param   other  iterator to compare against
+            *
+            * @returns true   if the iterators are equal, false otherwise.
+            */
+            bool operator==(const PocoJsonArrayValueIterator &other) const
+            {
+                return itr == other.itr;
+            }
+
+            bool operator!=(const PocoJsonArrayValueIterator &other) const
+            {
+                return !(itr == other.itr);
+            }
+
+            const PocoJsonArrayValueIterator& operator++()
+            {
+                itr++;
+
+                return *this;
+            }
+
+            PocoJsonArrayValueIterator operator++(int)
+            {
+                PocoJsonArrayValueIterator iterator_pre(itr);
+                ++(*this);
+                return iterator_pre;
+            }
+
+            const PocoJsonArrayValueIterator& operator--()
+            {
+                itr--;
+
+                return *this;
+            }
+
+            void advance(std::ptrdiff_t n)
+            {
+                itr += n;
+            }
+
+        private:
+            Poco::JSON::Array::ConstIterator itr;
+        };
+
+
+        /**
+        * @brief   Class for iterating over the members belonging to a JSON object.
+        *
+        * This class provides a JSON object iterator that dereferences as an instance
+        * of PocoJsonObjectMember representing one of the members of the object. It
+        * has been implemented using the boost iterator_facade template.
+        *
+        * @see PocoJsonObject
+        * @see PocoJsonObjectMember
+        */
+        class PocoJsonObjectMemberIterator :
+            public std::iterator<
+            std::bidirectional_iterator_tag,     // bi-directional iterator
+            PocoJsonObjectMember>            // value type
+        {
+        public:
+
+            /**
+            * @brief   Construct an iterator from a PocoJson iterator.
+            *
+            * @param   itr  PocoJson iterator to store
+            */
+            PocoJsonObjectMemberIterator(const Poco::JSON::Object::ConstIterator &itr)
+                : itr(itr)
+            { }
+
+            /**
+            * @brief   Returns a PocoJsonObjectMember that contains the key and value
+            *          belonging to the object member identified by the iterator.
+            */
+            PocoJsonObjectMember operator*() const
+            {
+                return PocoJsonObjectMember(itr->first, itr->second);
+            }
+
+            DerefProxy<PocoJsonObjectMember> operator->() const
+            {
+                return DerefProxy<PocoJsonObjectMember>(**this);
+            }
+
+            /**
+            * @brief   Compare this iterator with another iterator.
+            *
+            * Note that this directly compares the iterators, not the underlying
+            * values, and assumes that two identical iterators will point to the same
+            * underlying object.
+            *
+            * @param   other  Iterator to compare with
+            *
+            * @returns true if the underlying iterators are equal, false otherwise
+            */
+            bool operator==(const PocoJsonObjectMemberIterator &other) const
+            {
+                return itr == other.itr;
+            }
+
+            bool operator!=(const PocoJsonObjectMemberIterator &other) const
+            {
+                return !(itr == other.itr);
+            }
+
+            const PocoJsonObjectMemberIterator& operator++()
+            {
+                itr++;
+
+                return *this;
+            }
+
+            PocoJsonObjectMemberIterator operator++(int)
+            {
+                PocoJsonObjectMemberIterator iterator_pre(itr);
+                ++(*this);
+                return iterator_pre;
+            }
+
+            const PocoJsonObjectMemberIterator& operator--()
+            {
+                itr--;
+
+                return *this;
+            }
+
+        private:
+
+            /// Iternal copy of the original PocoJson iterator
+            Poco::JSON::Object::ConstIterator itr;
+        };
+
+        /// Specialisation of the AdapterTraits template struct for PocoJsonAdapter.
+        template<>
+        struct AdapterTraits<valijson::adapters::PocoJsonAdapter>
+        {
+            typedef Poco::Dynamic::Var DocumentType;
+
+            static std::string adapterName()
+            {
+                return "PocoJsonAdapter";
+            }
+        };
+
+        inline PocoJsonArrayValueIterator PocoJsonArray::begin() const
+        {
+            return value.extract<Poco::JSON::Array::Ptr>()->begin();
+        }
+
+        inline PocoJsonArrayValueIterator PocoJsonArray::end() const
+        {
+            return value.extract<Poco::JSON::Array::Ptr>()->end();
+        }
+
+        inline PocoJsonObjectMemberIterator PocoJsonObject::begin() const
+        {
+            return value.extract<Poco::JSON::Object::Ptr>()->begin();
+        }
+
+        inline PocoJsonObjectMemberIterator PocoJsonObject::end() const
+        {
+            return value.extract<Poco::JSON::Object::Ptr>()->end();
+        }
+
+        inline PocoJsonObjectMemberIterator PocoJsonObject::find(
+            const std::string &propertyName) const
+        {
+            auto& ptr = value.extract<Poco::JSON::Object::Ptr>();
+
+            auto it = std::find_if(ptr->begin(), ptr->end(),
+                                   [&propertyName](const Poco::JSON::Object::ValueType& p)
+            {
+                return p.first == propertyName;
+            });
+            return it;
+        }
+
+        inline bool PocoJsonFrozenValue::equalTo(const Adapter &other, bool strict) const
+        {
+            return PocoJsonAdapter(value).equalTo(other, strict);
+        }
+
+
+        
+
+    }  // namespace adapters
+}  // namespace valijson
+
+#endif // __VALIJSON_ADAPTERS_POCO_JSON_ADAPTER_HPP
+
--- a/examples/validator/valijson/include/valijson/adapters/property_tree_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/property_tree_adapter.hpp
@@ -0,0 +1,757 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the Boost property tree library.
+ *
+ * Include this file in your program to enable support for boost property trees.
+ *
+ * This file defines the following classes (not in this order):
+ *  - PropertyTreeAdapter
+ *  - PropertyTreeArray
+ *  - PropertyTreeArrayValueIterator
+ *  - PropertyTreeFrozenValue
+ *  - PropertyTreeObject
+ *  - PropertyTreeObjectMember
+ *  - PropertyTreeObjectMemberIterator
+ *  - PropertyTreeValue
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is PropertyTreeAdapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_PROPERTY_TREE_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_PROPERTY_TREE_ADAPTER_HPP
+
+#include <string>
+
+#include <boost/property_tree/ptree.hpp>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+class PropertyTreeAdapter;
+class PropertyTreeArrayValueIterator;
+class PropertyTreeObjectMemberIterator;
+
+typedef std::pair<std::string, PropertyTreeAdapter> PropertyTreeObjectMember;
+
+/**
+ * @brief   Light weight wrapper for a Boost property tree that contains
+ *          array-like data.
+ *
+ * This class is light weight wrapper for a Boost property tree. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to a Boost property
+ * tree that is assumed to contain unnamed key-value pairs. There is very little
+ * associated with copy construction and passing by value.
+ */
+class PropertyTreeArray
+{
+public:
+
+    typedef PropertyTreeArrayValueIterator const_iterator;
+    typedef PropertyTreeArrayValueIterator iterator;
+
+    /// Construct a PropertyTreeArra7 referencing an empty property tree
+    /// singleton.
+    PropertyTreeArray()
+      : array(emptyTree()) { }
+
+    /**
+     * @brief   Construct PropertyTreeArray referencing a specific Boost
+     *          property tree.
+     *
+     * @param   array   reference to a property tree containing an array
+     *
+     * It is assumed that this value contains array-like data, but this is not
+     * checked due to runtime cost.
+     */
+    explicit PropertyTreeArray(const boost::property_tree::ptree &array)
+      : array(array) { }
+
+    /// Return an iterator for the first element in the array.
+    PropertyTreeArrayValueIterator begin() const;
+
+    /// Return an iterator for one-past the last element of the array.
+    PropertyTreeArrayValueIterator end() const;
+
+    /// Return the number of elements in the array
+    size_t size() const
+    {
+        return array.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a property tree that looks like an
+     *          empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const boost::property_tree::ptree & emptyTree()
+    {
+        static const boost::property_tree::ptree tree;
+        return tree;
+    }
+
+    /// Reference to the contained value
+    const boost::property_tree::ptree &array;
+};
+
+/**
+ * @brief  Light weight wrapper for a Boost property tree that contains
+ *         object-like data.
+ *
+ * This class is light weight wrapper for a Boost property tree. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * property tree value, assumed to be object-like, so there is very little
+ * overhead associated with copy construction and passing by value.
+ */
+class PropertyTreeObject
+{
+public:
+
+    typedef PropertyTreeObjectMemberIterator const_iterator;
+    typedef PropertyTreeObjectMemberIterator iterator;
+
+    /// Construct a PropertyTreeObject referencing an empty property tree.
+    PropertyTreeObject()
+      : object(emptyTree()) { }
+
+    /**
+     * @brief   Construct a PropertyTreeObject referencing a specific property
+     *          tree.
+     *
+     * @param   object  reference to a property tree containing an object
+     *
+     * Note that the value of the property tree is not checked, due to the
+     * runtime cost of doing so.
+     */
+    PropertyTreeObject(const boost::property_tree::ptree &object)
+      : object(object) { }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying property tree
+     * implementation.
+     */
+    PropertyTreeObjectMemberIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the pointer value returned by the underlying property tree
+     * implementation.
+     */
+    PropertyTreeObjectMemberIterator end() const;
+
+    /**
+     * @brief   Return an iterator for the object member with the specified
+     *          property name.
+     *
+     * If an object member with the specified name does not exist, the iterator
+     * returned will be the same as the iterator returned by the end() function.
+     *
+     * @param   property   property name to search for
+     */
+    PropertyTreeObjectMemberIterator find(const std::string &property) const;
+
+    /// Returns the number of members belonging to this object.
+    size_t size() const
+    {
+        return object.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to an empty property tree.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const boost::property_tree::ptree & emptyTree()
+    {
+        static const boost::property_tree::ptree tree;
+        return tree;
+    }
+
+    /// Reference to the contained object
+    const boost::property_tree::ptree &object;
+
+};
+
+/**
+ * @brief   Stores an independent copy of a Boost property tree.
+ *
+ * This class allows a property tree value to be stored independent of its
+ * original 'document'. Boost property trees make this easy to do, as they do
+ * not perform any custom memory management.
+ *
+ * @see FrozenValue
+ */
+class PropertyTreeFrozenValue: public FrozenValue
+{
+public:
+
+    /**
+     * @brief  Make a copy of a Boost property tree POD value
+     *
+     * @param  source  string containing the POD vlaue
+     */
+    explicit PropertyTreeFrozenValue(
+            const boost::property_tree::ptree::data_type &source)
+      : value(source) { }
+
+    /**
+     * @brief  Make a copy of a Boost property tree object or array value
+     *
+     * @param  source  the property tree to be copied
+     */
+    explicit PropertyTreeFrozenValue(
+            const boost::property_tree::ptree &source)
+      : value(source) { }
+
+    virtual FrozenValue * clone() const
+    {
+        return new PropertyTreeFrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /// Stored value
+    boost::property_tree::ptree value;
+};
+
+/**
+ * @brief   Light weight wrapper for a Boost property tree.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a Boost property tree value. This class
+ * is responsible for the mechanics of actually reading a property tree, whereas
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+class PropertyTreeValue
+{
+public:
+
+    /// Construct a wrapper for an empty property tree
+    PropertyTreeValue()
+      : object(emptyTree()) { }
+
+    /**
+     * @brief  Construct a PropertyTreeValue from a tree object
+     *
+     * This function will determine whether the tree object represents an array
+     * or an object by scanning the key names for any non-empty strings. In the
+     * case of an empty tree object, it is not possible to determine whether it
+     * is an array or an object, so it will be treated as an array by default.
+     * Empty arrays are considered equal to empty objects when compared using
+     * non-strict type comparison. Empty strings will also be stored as empty
+     * arrays.
+     *
+     * @param  tree  Tree object to be wrapped
+     */
+    PropertyTreeValue(const boost::property_tree::ptree &tree)
+    {
+        if (tree.data().empty()) {    // No string content
+            if (tree.size() == 0) {   // No children
+                array.emplace(tree);         // Treat as empty array
+            } else {
+                bool isArray = true;
+                boost::property_tree::ptree::const_iterator itr;
+                for (itr = tree.begin(); itr != tree.end(); itr++) {
+                    if (!itr->first.empty()) {
+                        isArray = false;
+                        break;
+                    }
+                }
+
+                if (isArray) {
+                    array.emplace(tree);
+                } else {
+                    object.emplace(tree);
+                }
+            }
+        } else {
+            value = tree.data();
+        }
+    }
+
+    /**
+     * @brief   Create a new PropertyTreeFrozenValue instance that contains the
+     *          value referenced by this PropertyTreeValue instance.
+     *
+     * @returns pointer to a new PropertyTreeFrozenValue instance, belonging to
+     *          the caller.
+     */
+    FrozenValue* freeze() const
+    {
+        if (array) {
+            return new PropertyTreeFrozenValue(*array);
+        } else if (object) {
+            return new PropertyTreeFrozenValue(*object);
+        } else {
+            return new PropertyTreeFrozenValue(*value);
+        }
+    }
+
+    /**
+     * @brief  Return an instance of PropertyTreeArrayAdapter.
+     *
+     * If the referenced property tree value is an array, this function will
+     * return a std::optional containing a PropertyTreeArray instance
+     * referencing the array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<PropertyTreeArray> getArrayOptional() const
+    {
+        if (array) {
+            return opt::make_optional(PropertyTreeArray(*array));
+        }
+
+        return opt::optional<PropertyTreeArray>();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced property tree value is an array, this function will
+     * retrieve the number of elements in the array and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (array) {
+            result = array->size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &) const
+    {
+        return false;
+    }
+
+    bool getDouble(double &) const
+    {
+        return false;
+    }
+
+    bool getInteger(int64_t &) const
+    {
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a PropertyTreeObject instance.
+     *
+     * If the referenced property tree is an object, this function will return a
+     * std::optional containing a PropertyTreeObject instance referencing the
+     * object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<PropertyTreeObject> getObjectOptional() const
+    {
+        if (object) {
+            return opt::make_optional(PropertyTreeObject(*object));
+        }
+
+        return opt::optional<PropertyTreeObject>();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced property tree value is an object, this function will
+     * retrieve the number of members in the object and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (object) {
+            result = object->size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value) {
+            result = *value;
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return false;
+    }
+
+    bool isArray() const
+    {
+        return static_cast<bool>(array);
+    }
+
+    bool isBool() const
+    {
+        return false;
+    }
+
+    bool isDouble() const
+    {
+        return false;
+    }
+
+    bool isInteger() const
+    {
+        return false;
+    }
+
+    bool isNull() const
+    {
+        return false;
+    }
+
+    bool isNumber() const
+    {
+        return false;
+    }
+
+    bool isObject() const
+    {
+        return static_cast<bool>(object);
+    }
+
+    bool isString() const
+    {
+        return static_cast<bool>(value);
+    }
+
+private:
+
+    static const boost::property_tree::ptree & emptyTree()
+    {
+        static const boost::property_tree::ptree tree;
+        return tree;
+    }
+
+    /// Reference used if the value is known to be an array
+    opt::optional<const boost::property_tree::ptree &> array;
+
+    /// Reference used if the value is known to be an object
+    opt::optional<const boost::property_tree::ptree &> object;
+
+    /// Reference used if the value is known to be a POD type
+    opt::optional<std::string> value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting the Boost
+ *          property tree library.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+class PropertyTreeAdapter:
+    public BasicAdapter<PropertyTreeAdapter,
+                        PropertyTreeArray,
+                        PropertyTreeObjectMember,
+                        PropertyTreeObject,
+                        PropertyTreeValue>
+{
+public:
+
+    /// Construct a PropertyTreeAdapter for an empty property tree
+    PropertyTreeAdapter()
+      : BasicAdapter() { }
+
+    /// Construct a PropertyTreeAdapter using a specific property tree
+    PropertyTreeAdapter(const boost::property_tree::ptree &value)
+      : BasicAdapter(value) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * PropertyTreeAdapter representing a value stored in the array. It has been
+ * implemented using the boost iterator_facade template.
+ *
+ * @see PropertyTreeArray
+ */
+class PropertyTreeArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,    // bi-directional iterator
+        PropertyTreeAdapter>                // value type
+{
+public:
+
+    /**
+     * @brief   Construct a new PropertyTreeArrayValueIterator using an existing
+     *          property tree iterator.
+     *
+     * @param   itr  property tree iterator to store
+     */
+    PropertyTreeArrayValueIterator(
+        const boost::property_tree::ptree::const_iterator &itr)
+      : itr(itr) { }
+
+    /// Returns a PropertyTreeAdapter that contains the value of the current
+    /// element.
+    PropertyTreeAdapter operator*() const
+    {
+        return PropertyTreeAdapter(itr->second);
+    }
+
+    DerefProxy<PropertyTreeAdapter> operator->() const
+    {
+        return DerefProxy<PropertyTreeAdapter>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   rhs  iterator to compare against
+     *
+     * @returns true if the iterators are equal, false otherwise.
+     */
+    bool operator==(const PropertyTreeArrayValueIterator &rhs) const
+    {
+        return itr == rhs.itr;
+    }
+
+    bool operator!=(const PropertyTreeArrayValueIterator &rhs) const
+    {
+        return !(itr == rhs.itr);
+    }
+
+    const PropertyTreeArrayValueIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    PropertyTreeArrayValueIterator operator++(int)
+    {
+        PropertyTreeArrayValueIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const PropertyTreeArrayValueIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        if (n > 0) {
+            while (n-- > 0) {
+                itr++;
+            }
+        } else {
+            while (n++ < 0) {
+                itr--;
+            }
+        }
+    }
+
+private:
+
+    boost::property_tree::ptree::const_iterator itr;
+};
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of PropertyTreeObjectMember representing one of the members of the object.
+ * It has been implemented using the boost iterator_facade template.
+ *
+ * @see PropertyTreeObject
+ * @see PropertyTreeObjectMember
+ */
+class PropertyTreeObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,     // bi-directional iterator
+        PropertyTreeObjectMember>            // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a PropertyTree iterator.
+     *
+     * @param   itr  PropertyTree iterator to store
+     */
+    PropertyTreeObjectMemberIterator(
+        boost::property_tree::ptree::const_assoc_iterator itr)
+      : itr(itr) { }
+
+    /**
+     * @brief   Returns a PropertyTreeObjectMember that contains the key and
+     *          value belonging to the object member identified by the iterator.
+     */
+    PropertyTreeObjectMember operator*() const
+    {
+        return PropertyTreeObjectMember(itr->first, itr->second);
+    }
+
+    DerefProxy<PropertyTreeObjectMember> operator->() const
+    {
+        return DerefProxy<PropertyTreeObjectMember>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   rhs  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const PropertyTreeObjectMemberIterator &rhs) const
+    {
+        return itr == rhs.itr;
+    }
+
+    bool operator!=(const PropertyTreeObjectMemberIterator &rhs) const
+    {
+        return !(itr == rhs.itr);
+    }
+
+    const PropertyTreeObjectMemberIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    PropertyTreeObjectMemberIterator operator++(int)
+    {
+        PropertyTreeObjectMemberIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const PropertyTreeObjectMemberIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+private:
+
+    boost::property_tree::ptree::const_assoc_iterator itr;
+};
+
+/// Specialisation of the AdapterTraits template struct for PropertyTreeAdapter.
+template<>
+struct AdapterTraits<valijson::adapters::PropertyTreeAdapter>
+{
+    typedef boost::property_tree::ptree DocumentType;
+
+    static std::string adapterName()
+    {
+        return "PropertyTreeAdapter";
+    }
+};
+
+inline bool PropertyTreeFrozenValue::equalTo(const Adapter &other, bool strict) const
+{
+    return PropertyTreeAdapter(value).equalTo(other, strict);
+}
+
+inline PropertyTreeArrayValueIterator PropertyTreeArray::begin() const
+{
+    return array.begin();
+}
+
+inline PropertyTreeArrayValueIterator PropertyTreeArray::end() const
+{
+    return array.end();
+}
+
+inline PropertyTreeObjectMemberIterator PropertyTreeObject::begin() const
+{
+    return object.ordered_begin();
+}
+
+inline PropertyTreeObjectMemberIterator PropertyTreeObject::end() const
+{
+    return object.not_found();
+}
+
+inline PropertyTreeObjectMemberIterator PropertyTreeObject::find(
+    const std::string &propertyName) const
+{
+    const boost::property_tree::ptree::const_assoc_iterator
+        itr = object.find(propertyName);
+
+    if (itr != object.not_found()) {
+        return itr;
+    }
+
+    return object.not_found();
+}
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/qtjson_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/qtjson_adapter.hpp
@@ -0,0 +1,725 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the QtJson parser library.
+ *
+ * Include this file in your program to enable support for QtJson.
+ *
+ * This file defines the following classes (not in this order):
+ *  - QtJsonAdapter
+ *  - QtJsonArray
+ *  - QtJsonArrayValueIterator
+ *  - QtJsonFrozenValue
+ *  - QtJsonObject
+ *  - QtJsonObjectMember
+ *  - QtJsonObjectMemberIterator
+ *  - QtJsonValue
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is QtJsonAdapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_QTJSON_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_QTJSON_ADAPTER_HPP
+
+#include <string>
+
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonArray>
+
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+class QtJsonAdapter;
+class QtJsonArrayValueIterator;
+class QtJsonObjectMemberIterator;
+
+typedef std::pair<std::string, QtJsonAdapter> QtJsonObjectMember;
+
+/**
+ * @brief  Light weight wrapper for a QtJson array value.
+ *
+ * This class is light weight wrapper for a QtJson array. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * QtJson value, assumed to be an array, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class QtJsonArray
+{
+public:
+
+    typedef QtJsonArrayValueIterator const_iterator;
+    typedef QtJsonArrayValueIterator iterator;
+
+    /// Construct a QtJsonArray referencing an empty array.
+    QtJsonArray()
+      : value(emptyArray())
+    {
+    }
+
+    /**
+     * @brief   Construct a QtJsonArray referencing a specific QtJson
+     *          value.
+     *
+     * @param   value   reference to a QtJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an array.
+     */
+    explicit QtJsonArray(const QJsonValue &value)
+      : value(value.toArray())
+    {
+        if (!value.isArray()) {
+            throw std::runtime_error("Value is not an array.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for the first element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying QtJson implementation.
+     */
+    QtJsonArrayValueIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for one-past the last element of the array.
+     *
+     * The iterator return by this function is effectively the iterator
+     * returned by the underlying QtJson implementation.
+     */
+    QtJsonArrayValueIterator end() const;
+
+    /// Return the number of elements in the array
+    size_t size() const
+    {
+        return value.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a QtJson value that is an empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const QJsonArray emptyArray()
+    {
+        static const QJsonArray array;
+        return array;
+    }
+
+    /// Reference to the contained value
+    const QJsonArray value;
+};
+
+/**
+ * @brief  Light weight wrapper for a QtJson object.
+ *
+ * This class is light weight wrapper for a QtJson object. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * QtJson value, assumed to be an object, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+class QtJsonObject
+{
+public:
+
+    typedef QtJsonObjectMemberIterator const_iterator;
+    typedef QtJsonObjectMemberIterator iterator;
+
+    /// Construct a QtJsonObject referencing an empty object singleton.
+    QtJsonObject()
+      : value(emptyObject())
+    {
+    }
+
+    /**
+     * @brief   Construct a QtJsonObject referencing a specific QtJson
+     *          value.
+     *
+     * @param   value  reference to a QtJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an object.
+     */
+    QtJsonObject(const QJsonValue &value)
+      : value(value.toObject())
+    {
+        if (!value.isObject()) {
+            throw std::runtime_error("Value is not an object.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying QtJson implementation.
+     */
+    QtJsonObjectMemberIterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the iterator value returned by the underlying QtJson implementation.
+     */
+    QtJsonObjectMemberIterator end() const;
+
+    /**
+     * @brief   Return an iterator for the object member with the specified
+     *          property name.
+     *
+     * If an object member with the specified name does not exist, the iterator
+     * returned will be the same as the iterator returned by the end() function.
+     *
+     * @param   propertyName  property name to search for
+     */
+    QtJsonObjectMemberIterator find(const std::string &propertyName) const;
+
+    /// Returns the number of members belonging to this object.
+    size_t size() const
+    {
+        return value.size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a QtJson value that is empty object.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const QJsonObject emptyObject()
+    {
+        static const QJsonObject object;
+        return object;
+    }
+
+    /// Reference to the contained object
+    const QJsonObject value;
+};
+
+/**
+ * @brief   Stores an independent copy of a QtJson value.
+ *
+ * This class allows a QtJson value to be stored independent of its original
+ * document. QtJson makes this easy to do, as it does not perform any
+ * custom memory management.
+ *
+ * @see FrozenValue
+ */
+class QtJsonFrozenValue: public FrozenValue
+{
+public:
+
+    /**
+     * @brief  Make a copy of a QtJson value
+     *
+     * @param  source  the QtJson value to be copied
+     */
+    explicit QtJsonFrozenValue(const QJsonValue &source)
+      : value(source) { }
+
+    virtual FrozenValue * clone() const
+    {
+        return new QtJsonFrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /// Stored QtJson value
+    QJsonValue value;
+};
+
+/**
+ * @brief   Light weight wrapper for a QtJson value.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a QtJson value. This class is responsible
+ * for the mechanics of actually reading a QtJson value, whereas the
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+class QtJsonValue
+{
+public:
+
+    /// Construct a wrapper for the empty object singleton
+    QtJsonValue()
+      : value(emptyObject()) { }
+
+    /// Construct a wrapper for a specific QtJson value
+    QtJsonValue(const QJsonValue &value)
+      : value(value) { }
+
+    /**
+     * @brief   Create a new QtJsonFrozenValue instance that contains the
+     *          value referenced by this QtJsonValue instance.
+     *
+     * @returns pointer to a new QtJsonFrozenValue instance, belonging to the
+     *          caller.
+     */
+    FrozenValue * freeze() const
+    {
+        return new QtJsonFrozenValue(value);
+    }
+
+    /**
+     * @brief   Optionally return a QtJsonArray instance.
+     *
+     * If the referenced QtJson value is an array, this function will return
+     * a std::optional containing a QtJsonArray instance referencing the
+     * array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<QtJsonArray> getArrayOptional() const
+    {
+        if (value.isArray()) {
+            return opt::make_optional(QtJsonArray(value));
+        }
+
+        return opt::optional<QtJsonArray>();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced QtJson value is an array, this function will
+     * retrieve the number of elements in the array and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (value.isArray()) {
+            const QJsonArray array = value.toArray();
+            result = array.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &result) const
+    {
+        if (value.isBool()) {
+            result = value.toBool();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getDouble(double &result) const
+    {
+        if (value.isDouble()) {
+            result = value.toDouble();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getInteger(int64_t &result) const
+    {
+        if (value.isDouble()) {
+            result = value.toInt();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a QtJsonObject instance.
+     *
+     * If the referenced QtJson value is an object, this function will return a
+     * std::optional containing a QtJsonObject instance referencing the
+     * object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<QtJsonObject> getObjectOptional() const
+    {
+        if (value.isObject()) {
+            return opt::make_optional(QtJsonObject(value));
+        }
+
+        return opt::optional<QtJsonObject>();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced QtJson value is an object, this function will
+     * retrieve the number of members in the object and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (value.isObject()) {
+            const QJsonObject &object = value.toObject();
+            result = object.size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value.isString()) {
+            result = value.toString().toStdString();
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return true;
+    }
+
+    bool isArray() const
+    {
+        return value.isArray();
+    }
+
+    bool isBool() const
+    {
+        return value.isBool();
+    }
+
+    bool isDouble() const
+    {
+        return value.isDouble();
+    }
+
+    bool isInteger() const
+    {
+        //toInt returns the default value (0, 1) if the value is not a whole number
+        return value.isDouble() && (value.toInt(0) == value.toInt(1));
+    }
+
+    bool isNull() const
+    {
+        return value.isNull();
+    }
+
+    bool isNumber() const
+    {
+        return value.isDouble();
+    }
+
+    bool isObject() const
+    {
+        return value.isObject();
+    }
+
+    bool isString() const
+    {
+        return value.isString();
+    }
+
+private:
+
+    /// Return a reference to an empty object singleton
+    static const QJsonValue emptyObject()
+    {
+        static const QJsonValue object;
+        return object;
+    }
+
+    /// Reference to the contained QtJson value.
+    const QJsonValue value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting QtJson.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+class QtJsonAdapter:
+    public BasicAdapter<QtJsonAdapter,
+                        QtJsonArray,
+                        QtJsonObjectMember,
+                        QtJsonObject,
+                        QtJsonValue>
+{
+public:
+
+    /// Construct a QtJsonAdapter that contains an empty object
+    QtJsonAdapter()
+      : BasicAdapter() { }
+
+    /// Construct a QtJsonAdapter containing a specific QtJson value
+    QtJsonAdapter(const QJsonValue &value)
+      : BasicAdapter(value) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * QtJsonAdapter representing a value stored in the array. It has been
+ * implemented using the std::iterator template.
+ *
+ * @see QtJsonArray
+ */
+class QtJsonArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,     // bi-directional iterator
+        QtJsonAdapter>                     // value type
+{
+public:
+
+    /**
+     * @brief   Construct a new QtJsonArrayValueIterator using an existing
+     *          QtJson iterator.
+     *
+     * @param   itr  QtJson iterator to store
+     */
+    QtJsonArrayValueIterator(
+        const QJsonArray::const_iterator &itr)
+      : itr(itr) { }
+
+    /// Returns a QtJsonAdapter that contains the value of the current
+    /// element.
+    QtJsonAdapter operator*() const
+    {
+        return QtJsonAdapter(*itr);
+    }
+
+    DerefProxy<QtJsonAdapter> operator->() const
+    {
+        return DerefProxy<QtJsonAdapter>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  iterator to compare against
+     *
+     * @returns true   if the iterators are equal, false otherwise.
+     */
+    bool operator==(const QtJsonArrayValueIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const QtJsonArrayValueIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const QtJsonArrayValueIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    QtJsonArrayValueIterator operator++(int)
+    {
+        QtJsonArrayValueIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const QtJsonArrayValueIterator& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        itr += n;
+    }
+
+private:
+
+    QJsonArray::const_iterator itr;
+};
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of QtJsonObjectMember representing one of the members of the object. It
+ * has been implemented using the boost iterator_facade template.
+ *
+ * @see QtJsonObject
+ * @see QtJsonObjectMember
+ */
+class QtJsonObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,  // bi-directional iterator
+        QtJsonObjectMember>             // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a QtJson iterator.
+     *
+     * @param   itr  QtJson iterator to store
+     */
+    QtJsonObjectMemberIterator(
+        const QJsonObject::const_iterator &itr)
+      : itr(itr) { }
+
+    /**
+     * @brief   Returns a QtJsonObjectMember that contains the key and value
+     *          belonging to the object member identified by the iterator.
+     */
+    QtJsonObjectMember operator*() const
+    {
+        std::string key = itr.key().toStdString();
+        return QtJsonObjectMember(key, itr.value());
+    }
+
+    DerefProxy<QtJsonObjectMember> operator->() const
+    {
+        return DerefProxy<QtJsonObjectMember>(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const QtJsonObjectMemberIterator &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const QtJsonObjectMemberIterator &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    const QtJsonObjectMemberIterator& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    QtJsonObjectMemberIterator operator++(int)
+    {
+        QtJsonObjectMemberIterator iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    const QtJsonObjectMemberIterator& operator--(int)
+    {
+        itr--;
+
+        return *this;
+    }
+
+private:
+
+    /// Iternal copy of the original QtJson iterator
+    QJsonObject::const_iterator itr;
+};
+
+/// Specialisation of the AdapterTraits template struct for QtJsonAdapter.
+template<>
+struct AdapterTraits<valijson::adapters::QtJsonAdapter>
+{
+    typedef QJsonValue DocumentType;
+
+    static std::string adapterName()
+    {
+        return "QtJsonAdapter";
+    }
+};
+
+inline bool QtJsonFrozenValue::equalTo(const Adapter &other, bool strict) const
+{
+    return QtJsonAdapter(value).equalTo(other, strict);
+}
+
+inline QtJsonArrayValueIterator QtJsonArray::begin() const
+{
+    return value.begin();
+}
+
+inline QtJsonArrayValueIterator QtJsonArray::end() const
+{
+    return value.end();
+}
+
+inline QtJsonObjectMemberIterator QtJsonObject::begin() const
+{
+    return value.begin();
+}
+
+inline QtJsonObjectMemberIterator QtJsonObject::end() const
+{
+    return value.end();
+}
+
+inline QtJsonObjectMemberIterator QtJsonObject::find(
+    const std::string &propertyName) const
+{
+    return value.find(QString::fromStdString(propertyName));
+}
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/adapters/rapidjson_adapter.hpp
+++ b/examples/validator/valijson/include/valijson/adapters/rapidjson_adapter.hpp
@@ -0,0 +1,933 @@
+/**
+ * @file
+ *
+ * @brief   Adapter implementation for the RapidJson parser library.
+ *
+ * Include this file in your program to enable support for RapidJson.
+ *
+ * This file defines the following template classes (not in this order):
+ *  - GenericRapidJsonAdapter
+ *  - GenericRapidJsonArray
+ *  - GenericRapidJsonArrayValueIterator
+ *  - GenericRapidJsonFrozenValue
+ *  - GenericRapidJsonObject
+ *  - GenericRapidJsonObjectMember
+ *  - GenericRapidJsonObjectMemberIterator
+ *  - GenericRapidJsonValue
+ *
+ * All of these classes share a template argument called 'ValueType', which can
+ * be used to choose the underlying the RapidJson value type that is used. This
+ * allows different RapidJson encodings and allocators to be used.
+ *
+ * This file also defines the following typedefs, which use RapidJson's default
+ * ValueType:
+ *  - RapidJsonAdapter
+ *  - RapidJsonArray
+ *  - RapidJsonArrayValueIterator
+ *  - RapidJsonFrozenValue
+ *  - RapidJsonObject
+ *  - RapidJsonObjectMember
+ *  - RapidJsonObjectMemberIterator
+ *  - RapidJsonValue
+ *
+ * Due to the dependencies that exist between these classes, the ordering of
+ * class declarations and definitions may be a bit confusing. The best place to
+ * start is RapidJsonAdapter. This class definition is actually very small,
+ * since most of the functionality is inherited from the BasicAdapter class.
+ * Most of the classes in this file are provided as template arguments to the
+ * inherited BasicAdapter class.
+ */
+
+#pragma once
+#ifndef __VALIJSON_ADAPTERS_RAPIDJSON_ADAPTER_HPP
+#define __VALIJSON_ADAPTERS_RAPIDJSON_ADAPTER_HPP
+
+#include <string>
+#include <iterator>
+
+#include <rapidjson/document.h>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/adapters/basic_adapter.hpp>
+#include <valijson/adapters/frozen_value.hpp>
+
+namespace valijson {
+namespace adapters {
+
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonAdapter;
+
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonArrayValueIterator;
+
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonObjectMemberIterator;
+
+/// Container for a property name and an associated RapidJson value
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonObjectMember :
+        public std::pair<std::string, GenericRapidJsonAdapter<ValueType> >
+{
+private:
+    typedef std::pair<std::string, GenericRapidJsonAdapter<ValueType> > Super;
+
+public:
+    GenericRapidJsonObjectMember(
+            const std::string &name,
+            const GenericRapidJsonAdapter<ValueType> &value)
+      : Super(name, value) { }
+};
+
+/**
+ * @brief   Light weight wrapper for a RapidJson array value.
+ *
+ * This class is light weight wrapper for a RapidJson array. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to an underlying
+ * RapidJson value, assumed to be an array, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonArray
+{
+public:
+
+    typedef GenericRapidJsonArrayValueIterator<ValueType> const_iterator;
+    typedef GenericRapidJsonArrayValueIterator<ValueType> iterator;
+
+    /// Construct a RapidJsonArray referencing an empty array singleton.
+    GenericRapidJsonArray()
+      : value(emptyArray()) { }
+
+    /**
+     * @brief   Construct a RapidJsonArray referencing a specific RapidJson
+     *          value.
+     *
+     * @param   value   reference to a RapidJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an array.
+     */
+    GenericRapidJsonArray(const ValueType &value)
+      : value(value)
+    {
+        if (!value.IsArray()) {
+            throw std::runtime_error("Value is not an array.");
+        }
+    }
+
+    /// Return an iterator for the first element in the array.
+    iterator begin() const;
+
+    /// Return an iterator for one-past the last element of the array.
+    iterator end() const;
+
+    /// Return the number of elements in the array
+    size_t size() const
+    {
+        return value.Size();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a RapidJson value that is an empty array.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const ValueType & emptyArray()
+    {
+        static const ValueType array(rapidjson::kArrayType);
+        return array;
+    }
+
+    /// Reference to the contained value
+    const ValueType &value;
+};
+
+/**
+ * @brief  Light weight wrapper for a RapidJson object.
+ *
+ * This class is light weight wrapper for a RapidJson object. It provides a
+ * minimum set of container functions and typedefs that allow it to be used as
+ * an iterable container.
+ *
+ * An instance of this class contains a single reference to the underlying
+ * RapidJson value, assumed to be an object, so there is very little overhead
+ * associated with copy construction and passing by value.
+ */
+template <class ValueType = rapidjson::Value>
+class GenericRapidJsonObject
+{
+public:
+
+    typedef GenericRapidJsonObjectMemberIterator<ValueType> const_iterator;
+    typedef GenericRapidJsonObjectMemberIterator<ValueType> iterator;
+
+    /// Construct a GenericRapidJsonObject referencing an empty object singleton.
+    GenericRapidJsonObject()
+      : value(emptyObject()) { }
+
+    /**
+     * @brief   Construct a GenericRapidJsonObject referencing a specific
+     *          RapidJson value.
+     *
+     * @param   value  reference to a RapidJson value
+     *
+     * Note that this constructor will throw an exception if the value is not
+     * an object.
+     */
+    GenericRapidJsonObject(const ValueType &value)
+      : value(value)
+    {
+        if (!value.IsObject()) {
+            throw std::runtime_error("Value is not an object.");
+        }
+    }
+
+    /**
+     * @brief   Return an iterator for this first object member
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the pointer value returned by the underlying RapidJson implementation.
+     */
+    iterator begin() const;
+
+    /**
+     * @brief   Return an iterator for an invalid object member that indicates
+     *          the end of the collection.
+     *
+     * The iterator return by this function is effectively a wrapper around
+     * the pointer value returned by the underlying RapidJson implementation.
+     */
+    iterator end() const;
+
+    /**
+     * @brief   Return an iterator for the object member with the specified
+     *          property name.
+     *
+     * If an object member with the specified name does not exist, the iterator
+     * returned will be the same as the iterator returned by the end() function.
+     *
+     * @param   property   property name to search for
+     */
+    iterator find(const std::string &property) const;
+
+    /// Returns the number of members belonging to this object.
+    size_t size() const
+    {
+        return value.MemberEnd() - value.MemberBegin();
+    }
+
+private:
+
+    /**
+     * @brief   Return a reference to a RapidJson value that is empty object.
+     *
+     * Note that the value returned by this function is a singleton.
+     */
+    static const ValueType & emptyObject()
+    {
+        static ValueType object(rapidjson::kObjectType);
+        return object;
+    }
+
+    /// Reference to the contained object
+    const ValueType &value;
+};
+
+/**
+ * @brief   Stores an independent copy of a RapidJson value.
+ *
+ * This class allows a RapidJson value to be stored independent of its original
+ * document. RapidJson makes this a bit harder than usual, because RapidJson
+ * values are associated with a custom memory allocator. As such, RapidJson
+ * values have to be copied recursively, referencing a custom allocator held
+ * by this class.
+ *
+ * @see FrozenValue
+ */
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonFrozenValue: public FrozenValue
+{
+public:
+
+    explicit GenericRapidJsonFrozenValue(const char *str)
+    {
+        value.SetString(str, allocator);
+    }
+
+    explicit GenericRapidJsonFrozenValue(const std::string &str)
+    {
+        value.SetString(str.c_str(), (unsigned int)str.length(), allocator);
+    }
+
+    /**
+     * @brief   Make a copy of a RapidJson value
+     *
+     * @param   source  the RapidJson value to be copied
+     */
+    explicit GenericRapidJsonFrozenValue(const ValueType &source)
+    {
+        if (!copy(source, value, allocator)) {
+            throw std::runtime_error("Failed to copy ValueType");
+        }
+    }
+
+    virtual FrozenValue * clone() const
+    {
+        return new GenericRapidJsonFrozenValue(value);
+    }
+
+    virtual bool equalTo(const Adapter &other, bool strict) const;
+
+private:
+
+    /**
+     * @brief   Recursively copy a RapidJson value using a separate allocator
+     *
+     * @param   source      value to copy from
+     * @param   dest        value to copy into
+     * @param   allocator   reference to an allocator held by this class
+     *
+     * @tparam  Allocator   type of RapidJson Allocator to be used
+     *
+     * @returns true if copied successfully, false otherwise.
+     */
+    template<typename Allocator>
+    static bool copy(const ValueType &source,
+                     ValueType &dest,
+                     Allocator &allocator)
+    {
+        switch (source.GetType()) {
+        case rapidjson::kNullType:
+            dest.SetNull();
+            return true;
+        case rapidjson::kFalseType:
+            dest.SetBool(false);
+            return true;
+        case rapidjson::kTrueType:
+            dest.SetBool(true);
+            return true;
+        case rapidjson::kObjectType:
+            dest.SetObject();
+            for (typename ValueType::ConstMemberIterator itr = source.MemberBegin();
+                itr != source.MemberEnd(); ++itr) {
+                ValueType name(itr->name.GetString(), itr->name.GetStringLength(), allocator);
+                ValueType value;
+                copy(itr->value, value, allocator);
+                dest.AddMember(name, value, allocator);
+            }
+            return true;
+        case rapidjson::kArrayType:
+            dest.SetArray();
+            for (typename ValueType::ConstValueIterator itr = source.Begin(); itr != source.End(); ++itr) {
+                ValueType value;
+                copy(*itr, value, allocator);
+                dest.PushBack(value, allocator);
+            }
+            return true;
+        case rapidjson::kStringType:
+            dest.SetString(source.GetString(), source.GetStringLength(), allocator);
+            return true;
+        case rapidjson::kNumberType:
+            if (source.IsInt()) {
+                dest.SetInt(source.GetInt());
+            } else if (source.IsUint()) {
+                dest.SetUint(source.GetUint());
+            } else if (source.IsInt64()) {
+                dest.SetInt64(source.GetInt64());
+            } else if (source.IsUint64()) {
+                dest.SetUint64(source.GetUint64());
+            } else {
+                dest.SetDouble(source.GetDouble());
+            }
+            return true;
+        default:
+            break;
+        }
+
+        return false;
+    }
+
+    /// Local memory allocator for RapidJson value
+    typename ValueType::AllocatorType allocator;
+
+    /// Local RapidJson value
+    ValueType value;
+};
+
+/**
+ * @brief   Light weight wrapper for a RapidJson value.
+ *
+ * This class is passed as an argument to the BasicAdapter template class,
+ * and is used to provide access to a RapidJson value. This class is responsible
+ * for the mechanics of actually reading a RapidJson value, whereas the
+ * BasicAdapter class is responsible for the semantics of type comparisons
+ * and conversions.
+ *
+ * The functions that need to be provided by this class are defined implicitly
+ * by the implementation of the BasicAdapter template class.
+ *
+ * @see BasicAdapter
+ */
+template<class ValueType = rapidjson::Value>
+class GenericRapidJsonValue
+{
+public:
+    /// Construct a wrapper for the empty object singleton
+    GenericRapidJsonValue()
+      : value(emptyObject()) { }
+
+    /// Construct a wrapper for a specific RapidJson value
+    GenericRapidJsonValue(const ValueType &value)
+      : value(value) { }
+
+    /**
+     * @brief   Create a new GenericRapidJsonFrozenValue instance that contains
+     *          the value referenced by this GenericRapidJsonValue instance.
+     *
+     * @returns pointer to a new GenericRapidJsonFrozenValue instance, belonging
+     *          to the caller.
+     */
+    FrozenValue * freeze() const
+    {
+        return new GenericRapidJsonFrozenValue<ValueType>(value);
+    }
+
+    /**
+     * @brief   Optionally return a GenericRapidJsonArray instance.
+     *
+     * If the referenced RapidJson value is an array, this function will return
+     * a std::optional containing a GenericRapidJsonArray instance referencing
+     * the array.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<GenericRapidJsonArray<ValueType> > getArrayOptional() const
+    {
+        if (value.IsArray()) {
+            return opt::make_optional(GenericRapidJsonArray<ValueType>(value));
+        }
+
+        return opt::optional<GenericRapidJsonArray<ValueType> >();
+    }
+
+    /**
+     * @brief   Retrieve the number of elements in the array
+     *
+     * If the referenced RapidJson value is an array, this function will
+     * retrieve the number of elements in the array and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of elements was retrieved, false otherwise.
+     */
+    bool getArraySize(size_t &result) const
+    {
+        if (value.IsArray()) {
+            result = value.Size();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBool(bool &result) const
+    {
+        if (value.IsBool()) {
+            result = value.GetBool();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getDouble(double &result) const
+    {
+        if (value.IsDouble()) {
+            result = value.GetDouble();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getInteger(int64_t &result) const
+    {
+        if (value.IsInt()) {
+            result = value.GetInt();
+            return true;
+        } else if (value.IsInt64()) {
+            result = value.GetInt64();
+            return true;
+        } else if (value.IsUint()) {
+            result = static_cast<int64_t>(value.GetUint());
+            return true;
+        } else if (value.IsUint64()) {
+            result = static_cast<int64_t>(value.GetUint64());
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief   Optionally return a GenericRapidJsonObject instance.
+     *
+     * If the referenced RapidJson value is an object, this function will return
+     * a std::optional containing a GenericRapidJsonObject instance
+     * referencing the object.
+     *
+     * Otherwise it will return an empty optional.
+     */
+    opt::optional<GenericRapidJsonObject<ValueType> > getObjectOptional() const
+    {
+        if (value.IsObject()) {
+            return opt::make_optional(GenericRapidJsonObject<ValueType>(value));
+        }
+
+        return opt::optional<GenericRapidJsonObject<ValueType> >();
+    }
+
+    /**
+     * @brief   Retrieve the number of members in the object
+     *
+     * If the referenced RapidJson value is an object, this function will
+     * retrieve the number of members in the object and store it in the output
+     * variable provided.
+     *
+     * @param   result  reference to size_t to set with result
+     *
+     * @returns true if the number of members was retrieved, false otherwise.
+     */
+    bool getObjectSize(size_t &result) const
+    {
+        if (value.IsObject()) {
+            result = value.MemberEnd() - value.MemberBegin();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getString(std::string &result) const
+    {
+        if (value.IsString()) {
+            result.assign(value.GetString(), value.GetStringLength());
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool hasStrictTypes()
+    {
+        return true;
+    }
+
+    bool isArray() const
+    {
+        return value.IsArray();
+    }
+
+    bool isBool() const
+    {
+        return value.IsBool();
+    }
+
+    bool isDouble() const
+    {
+        return value.IsDouble();
+    }
+
+    bool isInteger() const
+    {
+        return value.IsInt() || value.IsInt64() || value.IsUint() ||
+               value.IsUint64();
+    }
+
+    bool isNull() const
+    {
+        return value.IsNull();
+    }
+
+    bool isNumber() const
+    {
+        return value.IsNumber();
+    }
+
+    bool isObject() const
+    {
+        return value.IsObject();
+    }
+
+    bool isString() const
+    {
+        return value.IsString();
+    }
+
+private:
+
+    /// Return a reference to an empty object singleton
+    static const ValueType & emptyObject()
+    {
+        static const ValueType object(rapidjson::kObjectType);
+        return object;
+    }
+
+    /// Reference to the contained RapidJson value.
+    const ValueType &value;
+};
+
+/**
+ * @brief   An implementation of the Adapter interface supporting RapidJson.
+ *
+ * This class is defined in terms of the BasicAdapter template class, which
+ * helps to ensure that all of the Adapter implementations behave consistently.
+ *
+ * @see Adapter
+ * @see BasicAdapter
+ */
+template<class ValueType>
+class GenericRapidJsonAdapter:
+    public BasicAdapter<GenericRapidJsonAdapter<ValueType>,
+                        GenericRapidJsonArray<ValueType>,
+                        GenericRapidJsonObjectMember<ValueType>,
+                        GenericRapidJsonObject<ValueType>,
+                        GenericRapidJsonValue<ValueType> >
+{
+public:
+
+    /// Construct a RapidJsonAdapter that contains an empty object
+    GenericRapidJsonAdapter()
+      : BasicAdapter<GenericRapidJsonAdapter<ValueType>,
+                        GenericRapidJsonArray<ValueType>,
+                        GenericRapidJsonObjectMember<ValueType>,
+                        GenericRapidJsonObject<ValueType>,
+                        GenericRapidJsonValue<ValueType> >() { }
+
+    /// Construct a RapidJsonAdapter containing a specific RapidJson value
+    GenericRapidJsonAdapter(const ValueType &value)
+      : BasicAdapter<GenericRapidJsonAdapter<ValueType>,
+                        GenericRapidJsonArray<ValueType>,
+                        GenericRapidJsonObjectMember<ValueType>,
+                        GenericRapidJsonObject<ValueType>,
+                        GenericRapidJsonValue<ValueType> >(value) { }
+};
+
+/**
+ * @brief   Class for iterating over values held in a JSON array.
+ *
+ * This class provides a JSON array iterator that dereferences as an instance of
+ * RapidJsonAdapter representing a value stored in the array. It has been
+ * implemented using the std::iterator template.
+ *
+ * @see RapidJsonArray
+ */
+template<class ValueType>
+class GenericRapidJsonArrayValueIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,                 // bi-directional iterator
+        GenericRapidJsonAdapter<ValueType> >             // value type
+{
+public:
+
+    /**
+     * @brief   Construct a new GenericRapidJsonArrayValueIterator using an
+     *          existing RapidJson iterator.
+     *
+     * @param   itr  RapidJson iterator to store
+     */
+    GenericRapidJsonArrayValueIterator(
+        const typename ValueType::ConstValueIterator &itr)
+      : itr(itr) { }
+
+    /// Returns a GenericRapidJsonAdapter that contains the value of the current
+    /// element.
+    GenericRapidJsonAdapter<ValueType> operator*() const
+    {
+        return GenericRapidJsonAdapter<ValueType>(*itr);
+    }
+
+    /// Returns a proxy for the value of the current element
+    DerefProxy<GenericRapidJsonAdapter<ValueType> > operator->() const
+    {
+        return DerefProxy<GenericRapidJsonAdapter<ValueType> >(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator against another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  iterator to compare against
+     *
+     * @returns true if the iterators are equal, false otherwise.
+     */
+    bool operator==(const GenericRapidJsonArrayValueIterator<ValueType> &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const GenericRapidJsonArrayValueIterator<ValueType>& other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    GenericRapidJsonArrayValueIterator<ValueType>& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    GenericRapidJsonArrayValueIterator<ValueType> operator++(int) {
+        GenericRapidJsonArrayValueIterator<ValueType> iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    GenericRapidJsonArrayValueIterator<ValueType>& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        itr += n;
+    }
+
+    std::ptrdiff_t difference(const GenericRapidJsonArrayValueIterator<ValueType> &other)
+    {
+        return std::distance(itr, other.itr);
+    }
+
+private:
+
+    typename ValueType::ConstValueIterator itr;
+};
+
+/**
+ * @brief   Class for iterating over the members belonging to a JSON object.
+ *
+ * This class provides a JSON object iterator that dereferences as an instance
+ * of GenericRapidJsonObjectMember representing one of the members of the
+ * object. It has been implemented using the std::iterator template.
+ *
+ * @see GenericRapidJsonObject
+ * @see GenericRapidJsonObjectMember
+ */
+template<class ValueType>
+class GenericRapidJsonObjectMemberIterator:
+    public std::iterator<
+        std::bidirectional_iterator_tag,                 // bi-directional iterator
+        GenericRapidJsonObjectMember<ValueType> >        // value type
+{
+public:
+
+    /**
+     * @brief   Construct an iterator from a RapidJson iterator.
+     *
+     * @param   itr  RapidJson iterator to store
+     */
+    GenericRapidJsonObjectMemberIterator(
+        const typename ValueType::ConstMemberIterator &itr)
+      : itr(itr) { }
+
+
+    /**
+     * @brief   Returns a GenericRapidJsonObjectMember that contains the key and
+     *          value belonging to the object member identified by the iterator.
+     */
+    GenericRapidJsonObjectMember<ValueType> operator*() const
+    {
+        return GenericRapidJsonObjectMember<ValueType>(
+            std::string(itr->name.GetString(), itr->name.GetStringLength()),
+            itr->value);
+    }
+
+    /// Returns a proxy for the value of the current element
+    DerefProxy<GenericRapidJsonObjectMember<ValueType> > operator->() const
+    {
+        return DerefProxy<GenericRapidJsonObjectMember<ValueType> >(**this);
+    }
+
+    /**
+     * @brief   Compare this iterator with another iterator.
+     *
+     * Note that this directly compares the iterators, not the underlying
+     * values, and assumes that two identical iterators will point to the same
+     * underlying object.
+     *
+     * @param   other  Iterator to compare with
+     *
+     * @returns true if the underlying iterators are equal, false otherwise
+     */
+    bool operator==(const GenericRapidJsonObjectMemberIterator<ValueType> &other) const
+    {
+        return itr == other.itr;
+    }
+
+    bool operator!=(const GenericRapidJsonObjectMemberIterator<ValueType> &other) const
+    {
+        return !(itr == other.itr);
+    }
+
+    GenericRapidJsonObjectMemberIterator<ValueType>& operator++()
+    {
+        itr++;
+
+        return *this;
+    }
+
+    GenericRapidJsonObjectMemberIterator<ValueType> operator++(int)
+    {
+        GenericRapidJsonObjectMemberIterator<ValueType> iterator_pre(itr);
+        ++(*this);
+        return iterator_pre;
+    }
+
+    GenericRapidJsonObjectMemberIterator<ValueType>& operator--()
+    {
+        itr--;
+
+        return *this;
+    }
+
+    std::ptrdiff_t difference(const GenericRapidJsonObjectMemberIterator &other)
+    {
+        return std::distance(itr, other.itr);
+    }
+
+private:
+
+    /// Iternal copy of the original RapidJson iterator
+    typename ValueType::ConstMemberIterator itr;
+};
+
+template<class ValueType>
+inline bool GenericRapidJsonFrozenValue<ValueType>::equalTo(
+        const Adapter &other, bool strict) const
+{
+    return GenericRapidJsonAdapter<ValueType>(value).equalTo(other, strict);
+}
+
+template<class ValueType>
+inline typename GenericRapidJsonArray<ValueType>::iterator
+        GenericRapidJsonArray<ValueType>::begin() const
+{
+    return value.Begin();
+}
+
+template<class ValueType>
+inline typename GenericRapidJsonArray<ValueType>::iterator
+        GenericRapidJsonArray<ValueType>::end() const
+{
+    return value.End();
+}
+
+template<class ValueType>
+inline typename GenericRapidJsonObject<ValueType>::iterator
+        GenericRapidJsonObject<ValueType>::begin() const
+{
+    return value.MemberBegin();
+}
+
+template<class ValueType>
+inline typename GenericRapidJsonObject<ValueType>::iterator
+        GenericRapidJsonObject<ValueType>::end() const
+{
+    return value.MemberEnd();
+}
+
+template<class ValueType>
+inline typename GenericRapidJsonObject<ValueType>::iterator
+        GenericRapidJsonObject<ValueType>::find(
+                const std::string &propertyName) const
+{
+    // Hack to support older versions of rapidjson where pointers are used as
+    // the built in iterator type. In those versions, the FindMember function
+    // would return a null pointer when the requested member could not be
+    // found. After calling FindMember on an empty object, we compare the
+    // result against what we would expect if a non-null-pointer iterator was
+    // returned.
+    const ValueType empty(rapidjson::kObjectType);
+    const typename ValueType::ConstMemberIterator maybeEnd = empty.FindMember("");
+    if (maybeEnd != empty.MemberBegin() + 1) {
+        // In addition to the pointer-based iterator issue, RapidJson's internal
+        // string comparison code seemed to rely on the query string being
+        // initialised to a length greater than or equal to that of the
+        // properties being compared. We get around this by implementing our
+        // own linear scan.
+        const size_t propertyNameLength = propertyName.length();
+        for (typename ValueType::ConstMemberIterator itr = value.MemberBegin();
+                itr != value.MemberEnd(); ++itr) {
+            const size_t memberNameLength = itr->name.GetStringLength();
+            if (memberNameLength == propertyNameLength &&
+                    strncmp(itr->name.GetString(), propertyName.c_str(),
+                        itr->name.GetStringLength()) == 0) {
+                return itr;
+            }
+        }
+
+        return value.MemberEnd();
+    }
+
+    return value.FindMember(propertyName.c_str());      // Times are good.
+}
+
+typedef GenericRapidJsonAdapter<> RapidJsonAdapter;
+typedef GenericRapidJsonArray<> RapidJsonArray;
+typedef GenericRapidJsonArrayValueIterator<> RapidJsonArrayValue;
+typedef GenericRapidJsonFrozenValue<> RapidJsonFrozenValue;
+typedef GenericRapidJsonObject<> RapidJsonObject;
+typedef GenericRapidJsonObjectMember<> RapidJsonObjectMember;
+typedef GenericRapidJsonObjectMemberIterator<> RapidJsonObjectMemberIterator;
+typedef GenericRapidJsonValue<> RapidJsonValue;
+
+/**
+ * @brief  Specialisation of the AdapterTraits template struct for a
+ *         RapidJsonAdapter that uses a pool allocator
+ */
+template<>
+struct AdapterTraits<valijson::adapters::RapidJsonAdapter>
+{
+    typedef rapidjson::Document DocumentType;
+
+    static std::string adapterName()
+    {
+        return "RapidJsonAdapter";
+    }
+};
+
+typedef rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator>
+        RapidJsonCrt;
+
+/**
+ * @brief  Specialisation of the AdapterTraits template struct for a
+ *         RapidJsonAdapter that uses the default CRT allocator
+ */
+template<>
+struct AdapterTraits<valijson::adapters::GenericRapidJsonAdapter<RapidJsonCrt> >
+{
+    typedef rapidjson::GenericDocument<rapidjson::UTF8<>,
+        rapidjson::CrtAllocator> DocumentType;
+
+    static std::string adapterName()
+    {
+        return "GenericRapidJsonAdapter (using CrtAllocator)";
+    }
+};
+
+}  // namespace adapters
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/constraint_builder.hpp
+++ b/examples/validator/valijson/include/valijson/constraint_builder.hpp
@@ -0,0 +1,25 @@
+#pragma once
+#ifndef __VALIJSON_CONSTRAINT_BUILDER_HPP
+#define __VALIJSON_CONSTRAINT_BUILDER_HPP
+
+namespace valijson {
+
+namespace adapters {
+    class Adapter;
+}
+
+namespace constraints {
+    struct Constraint;
+}
+
+class ConstraintBuilder
+{
+public:
+    virtual ~ConstraintBuilder() {}
+
+    virtual constraints::Constraint * make(const adapters::Adapter &) const = 0;
+};
+
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/constraints/basic_constraint.hpp
+++ b/examples/validator/valijson/include/valijson/constraints/basic_constraint.hpp
@@ -0,0 +1,69 @@
+#pragma once
+#ifndef __VALIJSON_CONSTRAINTS_BASIC_CONSTRAINT_HPP
+#define __VALIJSON_CONSTRAINTS_BASIC_CONSTRAINT_HPP
+
+#include <valijson/constraints/constraint.hpp>
+#include <valijson/constraints/constraint_visitor.hpp>
+
+#include <valijson/internal/custom_allocator.hpp>
+
+namespace valijson {
+namespace constraints {
+
+/**
+ * @brief   Template class that implements the accept() and clone() functions of
+ *          the Constraint interface.
+ *
+ * @tparam  ConstraintType   name of the concrete constraint type, which must
+ *                           provide a copy constructor.
+ */
+template<typename ConstraintType>
+struct BasicConstraint: Constraint
+{
+    typedef internal::CustomAllocator<void *> Allocator;
+
+    typedef std::basic_string<char, std::char_traits<char>,
+            internal::CustomAllocator<char> > String;
+
+    BasicConstraint()
+      : allocator() { }
+
+    BasicConstraint(Allocator::CustomAlloc allocFn, Allocator::CustomFree freeFn)
+      : allocator(allocFn, freeFn) { }
+
+    BasicConstraint(const BasicConstraint &other)
+      : allocator(other.allocator) { }
+
+    virtual ~BasicConstraint<ConstraintType>() { }
+
+    virtual bool accept(ConstraintVisitor &visitor) const
+    {
+        return visitor.visit(*static_cast<const ConstraintType*>(this));
+    }
+
+    virtual Constraint * clone(CustomAlloc allocFn, CustomFree freeFn) const
+    {
+        void *ptr = allocFn(sizeof(ConstraintType));
+        if (!ptr) {
+            throw std::runtime_error(
+                    "Failed to allocate memory for cloned constraint");
+        }
+
+        try {
+            return new (ptr) ConstraintType(
+                    *static_cast<const ConstraintType*>(this));
+        } catch (...) {
+            freeFn(ptr);
+            throw;
+        }
+    }
+
+protected:
+
+    Allocator allocator;
+};
+
+} // namespace constraints
+} // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/constraints/concrete_constraints.hpp
+++ b/examples/validator/valijson/include/valijson/constraints/concrete_constraints.hpp
--- a/examples/validator/valijson/include/valijson/constraints/constraint.hpp
+++ b/examples/validator/valijson/include/valijson/constraints/constraint.hpp
@@ -0,0 +1,54 @@
+#pragma once
+#ifndef __VALIJSON_CONSTRAINTS_CONSTRAINT_HPP
+#define __VALIJSON_CONSTRAINTS_CONSTRAINT_HPP
+
+namespace valijson {
+namespace constraints {
+
+class ConstraintVisitor;
+
+/**
+ * @brief  Interface that must be implemented by concrete constraint types.
+ *
+ * @todo  Consider using something like the boost::cloneable concept here.
+ */
+struct Constraint
+{
+    /// Typedef for custom new-/malloc-like function
+    typedef void * (*CustomAlloc)(size_t size);
+
+    /// Typedef for custom free-like function
+    typedef void (*CustomFree)(void *);
+
+    /**
+     * @brief  Virtual destructor.
+     */
+    virtual ~Constraint() { }
+
+    /**
+     * @brief  Perform an action on the constraint using the visitor pattern.
+     *
+     * Note that Constraints cannot be modified by visitors.
+     *
+     * @param  visitor  Reference to a ConstraintVisitor object.
+     *
+     * @returns  the boolean value returned by one of the visitor's visit
+     *           functions.
+     */
+    virtual bool accept(ConstraintVisitor &visitor) const = 0;
+
+    /**
+     * @brief  Make a copy of a constraint.
+     *
+     * Note that this should be a deep copy of the constraint.
+     *
+     * @returns  an owning-pointer to the new constraint.
+     */
+    virtual Constraint * clone(CustomAlloc, CustomFree) const = 0;
+
+};
+
+} // namespace constraints
+} // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/constraints/constraint_visitor.hpp
+++ b/examples/validator/valijson/include/valijson/constraints/constraint_visitor.hpp
@@ -0,0 +1,96 @@
+#pragma once
+#ifndef __VALIJSON_CONSTRAINTS_CONSTRAINT_VISITOR_HPP
+#define __VALIJSON_CONSTRAINTS_CONSTRAINT_VISITOR_HPP
+
+namespace valijson {
+namespace constraints {
+
+class AllOfConstraint;
+class AnyOfConstraint;
+class DependenciesConstraint;
+class EnumConstraint;
+class LinearItemsConstraint;
+class MaxItemsConstraint;
+class MaximumConstraint;
+class MaxLengthConstraint;
+class MaxPropertiesConstraint;
+class MinItemsConstraint;
+class MinimumConstraint;
+class MinLengthConstraint;
+class MinPropertiesConstraint;
+class MultipleOfDoubleConstraint;
+class MultipleOfIntConstraint;
+class NotConstraint;
+class OneOfConstraint;
+class PatternConstraint;
+class PolyConstraint;
+class PropertiesConstraint;
+class RequiredConstraint;
+class SingularItemsConstraint;
+class TypeConstraint;
+class UniqueItemsConstraint;
+
+/// Interface to allow usage of the visitor pattern with Constraints
+class ConstraintVisitor
+{
+protected:
+    virtual ~ConstraintVisitor() {}
+    
+    // Shorten type names for derived classes outside of this namespace
+    typedef constraints::AllOfConstraint AllOfConstraint;
+    typedef constraints::AnyOfConstraint AnyOfConstraint;
+    typedef constraints::DependenciesConstraint DependenciesConstraint;
+    typedef constraints::EnumConstraint EnumConstraint;
+    typedef constraints::LinearItemsConstraint LinearItemsConstraint;
+    typedef constraints::MaximumConstraint MaximumConstraint;
+    typedef constraints::MaxItemsConstraint MaxItemsConstraint;
+    typedef constraints::MaxLengthConstraint MaxLengthConstraint;
+    typedef constraints::MaxPropertiesConstraint MaxPropertiesConstraint;
+    typedef constraints::MinimumConstraint MinimumConstraint;
+    typedef constraints::MinItemsConstraint MinItemsConstraint;
+    typedef constraints::MinLengthConstraint MinLengthConstraint;
+    typedef constraints::MinPropertiesConstraint MinPropertiesConstraint;
+    typedef constraints::MultipleOfDoubleConstraint MultipleOfDoubleConstraint;
+    typedef constraints::MultipleOfIntConstraint MultipleOfIntConstraint;
+    typedef constraints::NotConstraint NotConstraint;
+    typedef constraints::OneOfConstraint OneOfConstraint;
+    typedef constraints::PatternConstraint PatternConstraint;
+    typedef constraints::PolyConstraint PolyConstraint;
+    typedef constraints::PropertiesConstraint PropertiesConstraint;
+    typedef constraints::RequiredConstraint RequiredConstraint;
+    typedef constraints::SingularItemsConstraint SingularItemsConstraint;
+    typedef constraints::TypeConstraint TypeConstraint;
+    typedef constraints::UniqueItemsConstraint UniqueItemsConstraint;
+
+public:
+
+    virtual bool visit(const AllOfConstraint &) = 0;
+    virtual bool visit(const AnyOfConstraint &) = 0;
+    virtual bool visit(const DependenciesConstraint &) = 0;
+    virtual bool visit(const EnumConstraint &) = 0;
+    virtual bool visit(const LinearItemsConstraint &) = 0;
+    virtual bool visit(const MaximumConstraint &) = 0;
+    virtual bool visit(const MaxItemsConstraint &) = 0;
+    virtual bool visit(const MaxLengthConstraint &) = 0;
+    virtual bool visit(const MaxPropertiesConstraint &) = 0;
+    virtual bool visit(const MinimumConstraint &) = 0;
+    virtual bool visit(const MinItemsConstraint &) = 0;
+    virtual bool visit(const MinLengthConstraint &) = 0;
+    virtual bool visit(const MinPropertiesConstraint &) = 0;
+    virtual bool visit(const MultipleOfDoubleConstraint &) = 0;
+    virtual bool visit(const MultipleOfIntConstraint &) = 0;
+    virtual bool visit(const NotConstraint &) = 0;
+    virtual bool visit(const OneOfConstraint &) = 0;
+    virtual bool visit(const PatternConstraint &) = 0;
+    virtual bool visit(const PolyConstraint &) = 0;
+    virtual bool visit(const PropertiesConstraint &) = 0;
+    virtual bool visit(const RequiredConstraint &) = 0;
+    virtual bool visit(const SingularItemsConstraint &) = 0;
+    virtual bool visit(const TypeConstraint &) = 0;
+    virtual bool visit(const UniqueItemsConstraint &) = 0;
+};
+
+}  // namespace constraints
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/internal/custom_allocator.hpp
+++ b/examples/validator/valijson/include/valijson/internal/custom_allocator.hpp
@@ -0,0 +1,110 @@
+#ifndef __VALIJSON_CUSTOM_ALLOCATOR_HPP
+#define __VALIJSON_CUSTOM_ALLOCATOR_HPP
+
+namespace valijson {
+namespace internal {
+
+template<class T>
+class CustomAllocator
+{
+public:
+    /// Typedef for custom new-/malloc-like function
+    typedef void * (*CustomAlloc)(size_t size);
+
+    /// Typedef for custom free-like function
+    typedef void (*CustomFree)(void *);
+
+    // Standard allocator typedefs
+    typedef T value_type;
+    typedef T* pointer;
+    typedef const T* const_pointer;
+    typedef T& reference;
+    typedef const T& const_reference;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+
+    template<typename U>
+    struct rebind
+    {
+        typedef CustomAllocator<U> other;
+    };
+
+    CustomAllocator()
+      : allocFn(::operator new),
+        freeFn(::operator delete) { }
+
+    CustomAllocator(CustomAlloc allocFn, CustomFree freeFn)
+      : allocFn(allocFn),
+        freeFn(freeFn) { }
+
+    CustomAllocator(const CustomAllocator &other)
+      : allocFn(other.allocFn),
+        freeFn(other.freeFn) { }
+
+    template<typename U>
+    CustomAllocator(CustomAllocator<U> const &other)
+      : allocFn(other.allocFn),
+        freeFn(other.freeFn) { }
+
+    CustomAllocator & operator=(const CustomAllocator &other)
+    {
+        allocFn = other.allocFn;
+        freeFn = other.freeFn;
+
+        return *this;
+    }
+
+    pointer address(reference r)
+    {
+        return &r;
+    }
+
+    const_pointer address(const_reference r)
+    {
+        return &r;
+    }
+
+    pointer allocate(size_type cnt, const void * = 0)
+    {
+        return reinterpret_cast<pointer>(allocFn(cnt * sizeof(T)));
+    }
+
+    void deallocate(pointer p, size_type)
+    {
+        freeFn(p);
+    }
+
+    size_type max_size() const
+    {
+        return std::numeric_limits<size_type>::max() / sizeof(T);
+    }
+
+    void construct(pointer p, const T& t)
+    {
+        new(p) T(t);
+    }
+
+    void destroy(pointer p)
+    {
+        p->~T();
+    }
+
+    bool operator==(const CustomAllocator &other) const
+    {
+        return other.allocFn == allocFn && other.freeFn == freeFn;
+    }
+
+    bool operator!=(const CustomAllocator &other) const
+    {
+        return !operator==(other);
+    }
+
+    CustomAlloc allocFn;
+
+    CustomFree freeFn;
+};
+
+} // end namespace internal
+} // end namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/internal/debug.hpp
+++ b/examples/validator/valijson/include/valijson/internal/debug.hpp
@@ -0,0 +1,33 @@
+#ifndef __VALIJSON_DEBUG_HPP
+#define __VALIJSON_DEBUG_HPP
+
+#include <string>
+
+namespace valijson {
+namespace internal {
+
+template<typename AdapterType>
+std::string nodeTypeAsString(const AdapterType &node) {
+    if (node.isArray()) {
+        return "array";
+    } else if (node.isObject()) {
+        return "object";
+    } else if (node.isString()) {
+        return "string";
+    } else if (node.isNull()) {
+        return "null";
+    } else if (node.isInteger()) {
+        return "integer";
+    } else if (node.isDouble()) {
+        return "double";
+    } else if (node.isBool()) {
+        return "bool";
+    }
+
+    return "unknown";
+}
+
+} // end namespace internal
+} // end namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/internal/json_pointer.hpp
+++ b/examples/validator/valijson/include/valijson/internal/json_pointer.hpp
@@ -0,0 +1,257 @@
+#pragma once
+#ifndef __VALIJSON_INTERNAL_JSON_POINTER_HPP
+#define __VALIJSON_INTERNAL_JSON_POINTER_HPP
+
+#include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string>
+
+#include <valijson/adapters/adapter.hpp>
+#include <valijson/internal/optional.hpp>
+
+namespace valijson {
+namespace internal {
+namespace json_pointer {
+
+/**
+ * @brief   Replace all occurrences of `search` with `replace`. Modifies `subject` in place
+ *
+ * @param   subject  string to operate on
+ * @param   search   string to search
+ * @param   replace  replacement string
+ */
+inline void replace_all_inplace(std::string& subject, const char* search,
+                                const char* replace)
+{
+    size_t pos = 0;
+
+    while((pos = subject.find(search, pos)) != std::string::npos) {
+        subject.replace(pos, strlen(search), replace);
+        pos += strlen(replace);
+    }
+}
+
+/**
+ * @brief   Return the char value corresponding to a 2-digit hexadecimal string
+ *
+ * @throws  std::runtime_error for strings that are not exactly two characters
+ *          in length and for strings that contain non-hexadecimal characters
+ *
+ * @return  decoded char value corresponding to the hexadecimal string
+ */
+inline char decodePercentEncodedChar(const std::string &digits)
+{
+    if (digits.length() != 2) {
+        throw std::runtime_error("Failed to decode %-encoded character '" +
+                digits + "' due to unexpected number of characters; "
+                "expected two characters");
+    }
+
+    errno = 0;
+    const char *begin = digits.c_str();
+    char *end = NULL;
+    const unsigned long value = strtoul(begin, &end, 16);
+    if (end != begin && *end != '\0') {
+        throw std::runtime_error("Failed to decode %-encoded character '" +
+                digits + "'");
+    }
+
+    return char(value);
+}
+
+/**
+ * @brief   Extract and transform the token between two iterators
+ *
+ * This function is responsible for extracting a JSON Reference token from
+ * between two iterators, and performing any necessary transformations, before
+ * returning the resulting string. Its main purpose is to replace the escaped
+ * character sequences defined in the RFC-6901 (JSON Pointer), and to decode
+ * %-encoded character sequences defined in RFC-3986 (URI).
+ *
+ * The encoding used in RFC-3986 should be familiar to many developers, but
+ * the escaped character sequences used in JSON Pointers may be less so. From
+ * the JSON Pointer specification (RFC 6901, April 2013):
+ *
+ *    Evaluation of each reference token begins by decoding any escaped
+ *    character sequence.  This is performed by first transforming any
+ *    occurrence of the sequence '~1' to '/', and then transforming any
+ *    occurrence of the sequence '~0' to '~'.  By performing the
+ *    substitutions in this order, an implementation avoids the error of
+ *    turning '~01' first into '~1' and then into '/', which would be
+ *    incorrect (the string '~01' correctly becomes '~1' after
+ *    transformation).
+ *
+ * @param   begin  iterator pointing to beginning of a token
+ * @param   end    iterator pointing to one character past the end of the token
+ *
+ * @return  string with escaped character sequences replaced
+ *
+ */
+inline std::string extractReferenceToken(std::string::const_iterator begin,
+        std::string::const_iterator end)
+{
+    std::string token(begin, end);
+
+    // Replace JSON Pointer-specific escaped character sequences
+    replace_all_inplace(token, "~1", "/");
+    replace_all_inplace(token, "~0", "~");
+
+    // Replace %-encoded character sequences with their actual characters
+    for (size_t n = token.find('%'); n != std::string::npos;
+            n = token.find('%', n + 1)) {
+
+        try {
+            const char c = decodePercentEncodedChar(token.substr(n + 1, 2));
+            token.replace(n, 3, &c, 1);
+
+        } catch (const std::runtime_error &e) {
+            throw std::runtime_error(
+                    std::string(e.what()) + "; in token: " + token);
+        }
+    }
+
+    return token;
+}
+
+/**
+ * @brief   Recursively locate the value referenced by a JSON Pointer
+ *
+ * This function takes both a string reference and an iterator to the beginning
+ * of the substring that is being resolved. This iterator is expected to point
+ * to the beginning of a reference token, whose length will be determined by
+ * searching for the next delimiter ('/' or '\0'). A reference token must be
+ * at least one character in length to be considered valid.
+ *
+ * Once the next reference token has been identified, it will be used either as
+ * an array index or as an the name an object member. The validity of a
+ * reference token depends on the type of the node currently being traversed,
+ * and the applicability of the token to that node. For example, an array can
+ * only be dereferenced by a non-negative integral index.
+ *
+ * Once the next node has been identified, the length of the remaining portion
+ * of the JSON Pointer will be used to determine whether recursion should
+ * terminate.
+ *
+ * @param   node            current node in recursive evaluation of JSON Pointer
+ * @param   jsonPointer     string containing complete JSON Pointer
+ * @param   jsonPointerItr  string iterator pointing the beginning of the next
+ *                          reference token
+ *
+ * @return  an instance of AdapterType that wraps the dereferenced node
+ */
+template<typename AdapterType>
+inline AdapterType resolveJsonPointer(
+        const AdapterType &node,
+        const std::string &jsonPointer,
+        const std::string::const_iterator jsonPointerItr)
+{
+    // TODO: This function will probably need to implement support for
+    // fetching documents referenced by JSON Pointers, similar to the
+    // populateSchema function.
+
+    const std::string::const_iterator jsonPointerEnd = jsonPointer.end();
+
+    // Terminate recursion if all reference tokens have been consumed
+    if (jsonPointerItr == jsonPointerEnd) {
+        return node;
+    }
+
+    // Reference tokens must begin with a leading slash
+    if (*jsonPointerItr != '/') {
+        throw std::runtime_error("Expected reference token to begin with "
+                "leading slash; remaining tokens: " +
+                std::string(jsonPointerItr, jsonPointerEnd));
+    }
+
+    // Find iterator that points to next slash or newline character; this is
+    // one character past the end of the current reference token
+    std::string::const_iterator jsonPointerNext =
+            std::find(jsonPointerItr + 1, jsonPointerEnd, '/');
+
+    // Extract the next reference token
+    const std::string referenceToken = extractReferenceToken(
+            jsonPointerItr + 1, jsonPointerNext);
+
+    // Empty reference tokens should be ignored
+    if (referenceToken.empty()) {
+        return resolveJsonPointer(node, jsonPointer, jsonPointerNext);
+
+    } else if (node.isArray()) {
+        if (referenceToken.compare("-") == 0) {
+            throw std::runtime_error("Hyphens cannot be used as array indices "
+                    "since the requested array element does not yet exist");
+        }
+
+        try {
+            // Fragment must be non-negative integer
+            const uint64_t index = std::stoul(referenceToken);
+            typedef typename AdapterType::Array Array;
+            typename Array::const_iterator itr = node.asArray().begin();
+
+            if (index > node.asArray().size() - 1) {
+                throw std::runtime_error("Expected reference token to identify "
+                        "an element in the current array, but array index is "
+                        "out of bounds; actual token: " + referenceToken);
+            }
+
+            if (index > static_cast<uint64_t>(std::numeric_limits<std::ptrdiff_t>::max())) {
+                throw std::runtime_error("Array index out of bounds; hard "
+                        "limit is " + std::to_string(
+                                std::numeric_limits<std::ptrdiff_t>::max()));
+            }
+
+            itr.advance(static_cast<std::ptrdiff_t>(index));
+
+            // Recursively process the remaining tokens
+            return resolveJsonPointer(*itr, jsonPointer, jsonPointerNext);
+
+        } catch (std::invalid_argument &) {
+            throw std::runtime_error("Expected reference token to contain a "
+                    "non-negative integer to identify an element in the "
+                    "current array; actual token: " + referenceToken);
+        }
+
+    } else if (node.maybeObject()) {
+        // Fragment must identify a member of the candidate object
+        typedef typename AdapterType::Object Object;
+        typename Object::const_iterator itr = node.asObject().find(
+                referenceToken);
+        if (itr == node.asObject().end()) {
+            throw std::runtime_error("Expected reference token to identify an "
+                    "element in the current object; "
+                    "actual token: " + referenceToken);
+        }
+
+        // Recursively process the remaining tokens
+        return resolveJsonPointer(itr->second, jsonPointer, jsonPointerNext);
+    }
+
+    throw std::runtime_error("Expected end of JSON Pointer, but at least "
+            "one reference token has not been processed; remaining tokens: " +
+            std::string(jsonPointerNext, jsonPointerEnd));
+}
+
+/**
+ * @brief   Return the JSON Value referenced by a JSON Pointer
+ *
+ * @param   rootNode     node to use as root for JSON Pointer resolution
+ * @param   jsonPointer  string containing JSON Pointer
+ *
+ * @return  an instance AdapterType in the specified document
+ */
+template<typename AdapterType>
+inline AdapterType resolveJsonPointer(
+        const AdapterType &rootNode,
+        const std::string &jsonPointer)
+{
+    return resolveJsonPointer(rootNode, jsonPointer, jsonPointer.begin());
+}
+
+} // namespace json_pointer
+} // namespace internal
+} // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/internal/json_reference.hpp
+++ b/examples/validator/valijson/include/valijson/internal/json_reference.hpp
@@ -0,0 +1,65 @@
+#pragma once
+#ifndef __VALIJSON_INTERNAL_JSON_REFERENCE_HPP
+#define __VALIJSON_INTERNAL_JSON_REFERENCE_HPP
+
+#include <stdexcept>
+#include <string>
+
+#include <valijson/internal/optional.hpp>
+
+namespace valijson {
+namespace internal {
+namespace json_reference {
+
+    /**
+     * @brief   Extract URI from JSON Reference relative to the current schema
+     *
+     * @param   jsonRef  JSON Reference to extract from
+     * @param   schema   Schema that JSON Reference URI is relative to
+     *
+     * @return  Optional string containing URI
+     */
+    inline opt::optional<std::string> getJsonReferenceUri(
+        const std::string &jsonRef)
+    {
+        const size_t ptrPos = jsonRef.find("#");
+        if (ptrPos == 0) {
+            // The JSON Reference does not contain a URI, but might contain a
+            // JSON Pointer that refers to the current document
+            return opt::optional<std::string>();
+        } else if (ptrPos != std::string::npos) {
+            // The JSON Reference contains a URI and possibly a JSON Pointer
+            return jsonRef.substr(0, ptrPos);
+        }
+
+        // The entire JSON Reference should be treated as a URI
+        return jsonRef;
+    }
+
+    /**
+     * @brief   Extract JSON Pointer portion of a JSON Reference
+     *
+     * @param   jsonRef  JSON Reference to extract from
+     *
+     * @return  Optional string containing JSON Pointer
+     */
+    inline opt::optional<std::string> getJsonReferencePointer(
+        const std::string &jsonRef)
+    {
+        // Attempt to extract JSON Pointer if '#' character is present. Note
+        // that a valid pointer would contain at least a leading forward
+        // slash character.
+        const size_t ptrPos = jsonRef.find("#");
+        if (ptrPos != std::string::npos) {
+            return jsonRef.substr(ptrPos + 1);
+        }
+
+        return opt::optional<std::string>();
+    }
+
+
+} // namespace json_reference
+} // namespace internal
+} // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/internal/optional.hpp
+++ b/examples/validator/valijson/include/valijson/internal/optional.hpp
@@ -0,0 +1,18 @@
+#pragma once
+#ifndef __VALIJSON_OPTIONAL_HPP
+#define __VALIJSON_OPTIONAL_HPP
+
+#if __cplusplus >= 201703
+// Visual C++ only supports __has_include in versions 14.12 and greater
+#  if !defined(_MSC_VER) || _MSC_VER >= 1912
+#    if __has_include(<optional>)
+#      include <optional>
+namespace opt = std;
+#    endif
+#  endif
+#else
+#  include <compat/optional.hpp>
+namespace opt = std::experimental;
+#endif
+
+#endif
--- a/examples/validator/valijson/include/valijson/internal/uri.hpp
+++ b/examples/validator/valijson/include/valijson/internal/uri.hpp
@@ -0,0 +1,37 @@
+#pragma once
+#ifndef __VALIJSON_INTERNAL_URI_HPP
+#define __VALIJSON_INTERNAL_URI_HPP
+
+#include <string>
+
+namespace valijson {
+namespace internal {
+namespace uri {
+
+    /**
+     * @brief  Placeholder function to check whether a URI is absolute
+     *
+     * This function just checks for '://'
+     */
+    inline bool isUriAbsolute(const std::string &documentUri)
+    {
+        static const char * placeholderMarker = "://";
+
+        return documentUri.find(placeholderMarker) != std::string::npos;
+    }
+
+    /**
+     * Placeholder function to resolve a relative URI within a given scope
+     */
+    inline std::string resolveRelativeUri(
+            const std::string &resolutionScope,
+            const std::string &relativeUri)
+    {
+        return resolutionScope + relativeUri;
+    }
+
+} // namespace uri
+} // namespace internal
+} // namespace valijson
+
+#endif  // __VALIJSON_INTERNAL_URI_HPP
--- a/examples/validator/valijson/include/valijson/schema.hpp
+++ b/examples/validator/valijson/include/valijson/schema.hpp
@@ -0,0 +1,213 @@
+#pragma once
+#ifndef __VALIJSON_SCHEMA_HPP
+#define __VALIJSON_SCHEMA_HPP
+
+#include <cstdio>
+#include <set>
+
+#include <valijson/subschema.hpp>
+
+namespace valijson {
+
+/**
+ * Represents the root of a JSON Schema
+ *
+ * The root is distinct from other sub-schemas because it is the canonical
+ * starting point for validation of a document against a given a JSON Schema.
+ */
+class Schema: public Subschema
+{
+public:
+    /**
+     * @brief  Construct a new Schema instance with no constraints
+     */
+    Schema()
+      : sharedEmptySubschema(newSubschema()) { }
+
+    /**
+     * @brief  Construct a new Schema using custom memory management
+     *         functions
+     *
+     * @param  allocFn  malloc- or new-like function to allocate memory
+     *                  within Schema, such as for Subschema instances
+     * @param  freeFn   free-like function to free memory allocated with
+     *                  the `customAlloc` function
+     */
+    Schema(CustomAlloc allocFn, CustomFree freeFn)
+      : Subschema(allocFn, freeFn),
+        sharedEmptySubschema(newSubschema()) { }
+
+    /**
+     * @brief  Clean up and free all memory managed by the Schema
+     *
+     * Note that any Subschema pointers created and returned by this Schema
+     * should be considered invalid.
+     */
+    virtual ~Schema()
+    {
+        sharedEmptySubschema->~Subschema();
+        freeFn(const_cast<Subschema *>(sharedEmptySubschema));
+        sharedEmptySubschema = NULL;
+
+        try {
+            for (std::set<Subschema *>::iterator itr = subschemaSet.begin();
+                    itr != subschemaSet.end(); ++itr) {
+                Subschema *subschema = *itr;
+                subschema->~Subschema();
+                freeFn(subschema);
+            }
+        } catch (const std::exception &e) {
+            fprintf(stderr, "Caught an exception while destroying Schema: %s",
+                    e.what());
+        }
+    }
+
+    /**
+     * @brief  Copy a constraint to a specific sub-schema
+     *
+     * @param  constraint  reference to a constraint that will be copied into
+     *                     the sub-schema
+     * @param  subschema   pointer to the sub-schema that will own the copied
+     *                     constraint
+     *
+     * @throws std::runtime_error if the sub-schema is not owned by this Schema
+     *         instance
+     */
+    void addConstraintToSubschema(const Constraint &constraint,
+            const Subschema *subschema)
+    {
+        // TODO: Check heirarchy for subschemas that do not belong...
+
+        mutableSubschema(subschema)->addConstraint(constraint);
+    }
+
+    /**
+     * @brief  Create a new Subschema instance that is owned by this Schema
+     *
+     * @returns  const pointer to the new Subschema instance
+     */
+    const Subschema * createSubschema()
+    {
+        Subschema *subschema = newSubschema();
+
+        try {
+            if (!subschemaSet.insert(subschema).second) {
+                throw std::runtime_error(
+                        "Failed to store pointer for new sub-schema");
+            }
+        } catch (...) {
+            subschema->~Subschema();
+            freeFn(subschema);
+            throw;
+        }
+
+        return subschema;
+    }
+
+    /**
+     * @brief  Return a pointer to the shared empty schema
+     */
+    const Subschema * emptySubschema() const
+    {
+        return sharedEmptySubschema;
+    }
+
+    /**
+     * @brief  Get a pointer to the root sub-schema of this Schema instance
+     */
+    const Subschema * root() const
+    {
+        return this;
+    }
+
+    /**
+     * @brief  Update the description for one of the sub-schemas owned by this
+     *         Schema instance
+     *
+     * @param  subschema    sub-schema to update
+     * @param  description  new description
+     */
+    void setSubschemaDescription(const Subschema *subschema,
+            const std::string &description)
+    {
+        mutableSubschema(subschema)->setDescription(description);
+    }
+
+    /**
+     * @brief  Update the ID for one of the sub-schemas owned by this Schema
+     *         instance
+     *
+     * @param  subschema  sub-schema to update
+     * @param  id         new ID
+     */
+    void setSubschemaId(const Subschema *subschema, const std::string &id)
+    {
+        mutableSubschema(subschema)->setId(id);
+    }
+
+    /**
+     * @brief  Update the title for one of the sub-schemas owned by this Schema
+     *         instance
+     *
+     * @param  subschema  sub-schema to update
+     * @param  title      new title
+     */
+    void setSubschemaTitle(const Subschema *subschema, const std::string &title)
+    {
+        mutableSubschema(subschema)->setTitle(title);
+    }
+
+private:
+
+    // Disable copy construction
+    Schema(const Schema &);
+
+    // Disable copy assignment
+    Schema & operator=(const Schema &);
+
+    Subschema *newSubschema()
+    {
+        void *ptr = allocFn(sizeof(Subschema));
+        if (!ptr) {
+            throw std::runtime_error(
+                    "Failed to allocate memory for shared empty sub-schema");
+        }
+
+        try {
+            return new (ptr) Subschema();
+        } catch (...) {
+            freeFn(ptr);
+            throw;
+        }
+    }
+
+    Subschema * mutableSubschema(const Subschema *subschema)
+    {
+        if (subschema == this) {
+            return this;
+        }
+
+        if (subschema == sharedEmptySubschema) {
+            throw std::runtime_error(
+                    "Cannot modify the shared empty sub-schema");
+        }
+
+        Subschema *noConst = const_cast<Subschema*>(subschema);
+        if (subschemaSet.find(noConst) == subschemaSet.end()) {
+            throw std::runtime_error(
+                    "Subschema pointer is not owned by this Schema instance");
+        }
+
+        return noConst;
+    }
+
+    /// Set of Subschema instances owned by this schema
+    std::set<Subschema*> subschemaSet;
+
+    /// Empty schema that can be reused by multiple constraints
+    const Subschema *sharedEmptySubschema;
+};
+
+} // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/schema_parser.hpp
+++ b/examples/validator/valijson/include/valijson/schema_parser.hpp
--- a/examples/validator/valijson/include/valijson/subschema.hpp
+++ b/examples/validator/valijson/include/valijson/subschema.hpp
@@ -0,0 +1,286 @@
+#pragma once
+#ifndef __VALIJSON_SUBSCHEMA_HPP
+#define __VALIJSON_SUBSCHEMA_HPP
+
+#include <vector>
+
+#include <memory>
+
+#include <valijson/constraints/constraint.hpp>
+#include <valijson/internal/optional.hpp>
+
+namespace valijson {
+
+/**
+ * Represents a sub-schema within a JSON Schema
+ *
+ * While all JSON Schemas have at least one sub-schema, the root, some will
+ * have additional sub-schemas that are defined as part of constraints that are
+ * included in the schema. For example, a 'oneOf' constraint maintains a set of
+ * references to one or more nested sub-schemas. As per the definition of a 
+ * oneOf constraint, a document is valid within that constraint if it validates
+ * against one of the nested sub-schemas.
+ */
+class Subschema
+{
+public:
+    /// Typedef for custom new-/malloc-like function
+    typedef void * (*CustomAlloc)(size_t size);
+
+    /// Typedef for custom free-like function
+    typedef void (*CustomFree)(void *);
+
+    /// Typedef the Constraint class into the local namespace for convenience
+    typedef constraints::Constraint Constraint;
+
+    /// Typedef for a function that can be applied to each of the Constraint
+    /// instances owned by a Schema.
+    typedef std::function<bool (const Constraint &)> ApplyFunction;
+
+    /**
+     * @brief  Construct a new Subschema object
+     */
+    Subschema()
+      : allocFn(::operator new)
+      , freeFn(::operator delete) { }
+
+    /**
+     * @brief  Construct a new Subschema using custom memory management
+     *         functions
+     *
+     * @param  allocFn  malloc- or new-like function to allocate memory
+     *                  within Schema, such as for Subschema instances
+     * @param  freeFn   free-like function to free memory allocated with
+     *                  the `customAlloc` function
+     */
+    Subschema(CustomAlloc allocFn, CustomFree freeFn)
+      : allocFn(allocFn)
+      , freeFn(freeFn) { }
+
+    /**
+     * @brief  Clean up and free all memory managed by the Subschema
+     */
+    virtual ~Subschema()
+    {
+        try {
+            for (std::vector<const Constraint *>::iterator itr =
+                    constraints.begin(); itr != constraints.end(); ++itr) {
+                Constraint *constraint = const_cast<Constraint *>(*itr);
+                constraint->~Constraint();
+                freeFn(constraint);
+            }
+            constraints.clear();
+        } catch (const std::exception &e) {
+            fprintf(stderr, "Caught an exception in Subschema destructor: %s",
+                    e.what());
+        }
+    }
+
+    /**
+     * @brief  Add a constraint to this sub-schema
+     *
+     * The constraint will be copied before being added to the list of
+     * constraints for this Subschema. Note that constraints will be copied
+     * only as deep as references to other Subschemas - e.g. copies of
+     * constraints that refer to sub-schemas, will continue to refer to the
+     * same Subschema instances.
+     *
+     * @param  constraint  Reference to the constraint to copy
+     */
+    void addConstraint(const Constraint &constraint)
+    {
+        Constraint *newConstraint = constraint.clone(allocFn, freeFn);
+        try {
+            constraints.push_back(newConstraint);
+        } catch (...) {
+            newConstraint->~Constraint();
+            freeFn(newConstraint);
+            throw;
+        }
+    }
+
+    /**
+     * @brief  Invoke a function on each child Constraint
+     *
+     * This function will apply the callback function to each constraint in
+     * the Subschema, even if one of the invokations returns \c false. However,
+     * if one or more invokations of the callback function return \c false,
+     * this function will also return \c false.
+     *
+     * @returns  \c true if all invokations of the callback function are
+     *           successful, \c false otherwise
+     */
+    bool apply(ApplyFunction &applyFunction) const
+    {
+        bool allTrue = true;
+        for (const Constraint *constraint : constraints) {
+            allTrue = allTrue && applyFunction(*constraint);
+        }
+
+        return allTrue;
+    }
+
+    /**
+     * @brief  Invoke a function on each child Constraint
+     *
+     * This is a stricter version of the apply() function that will return
+     * immediately if any of the invokations of the callback function return
+     * \c false.
+     *
+     * @returns  \c true if all invokations of the callback function are
+     *           successful, \c false otherwise
+     */
+    bool applyStrict(ApplyFunction &applyFunction) const
+    {
+        for (const Constraint *constraint : constraints) {
+            if (!applyFunction(*constraint)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @brief  Get the description associated with this sub-schema
+     *
+     * @throws  std::runtime_error if a description has not been set
+     *
+     * @returns  string containing sub-schema description
+     */
+    std::string getDescription() const
+    {
+        if (description) {
+            return *description;
+        }
+
+        throw std::runtime_error("Schema does not have a description");
+    }
+
+    /**
+     * @brief  Get the ID associated with this sub-schema
+     *
+     * @throws  std::runtime_error if an ID has not been set
+     *
+     * @returns  string containing sub-schema ID
+     */
+    std::string getId() const
+    {
+        if (id) {
+            return *id;
+        }
+
+        throw std::runtime_error("Schema does not have an ID");
+    }
+
+    /**
+     * @brief  Get the title associated with this sub-schema
+     *
+     * @throws  std::runtime_error if a title has not been set
+     *
+     * @returns  string containing sub-schema title
+     */
+    std::string getTitle() const
+    {
+        if (title) {
+            return *title;
+        }
+
+        throw std::runtime_error("Schema does not have a title");
+    }
+
+    /**
+     * @brief  Check whether this sub-schema has a description
+     *
+     * @return boolean value
+     */
+    bool hasDescription() const
+    {
+        return static_cast<bool>(description);
+    }
+
+    /**
+     * @brief  Check whether this sub-schema has an ID
+     *
+     * @return  boolean value
+     */
+    bool hasId() const
+    {
+        return static_cast<bool>(id);
+    }
+
+    /**
+     * @brief  Check whether this sub-schema has a title
+     *
+     * @return  boolean value
+     */
+    bool hasTitle() const
+    {
+        return static_cast<bool>(title);
+    }
+
+    /**
+     * @brief  Set the description for this sub-schema
+     *
+     * The description will not be used for validation, but may be used as part
+     * of the user interface for interacting with schemas and sub-schemas. As
+     * an example, it may be used as part of the validation error descriptions
+     * that are produced by the Validator and ValidationVisitor classes.
+     *
+     * @param  description  new description
+     */
+    void setDescription(const std::string &description)
+    {
+        this->description = description;
+    }
+
+    void setId(const std::string &id)
+    {
+        this->id = id;
+    }
+
+    /**
+     * @brief  Set the title for this sub-schema
+     *
+     * The title will not be used for validation, but may be used as part
+     * of the user interface for interacting with schemas and sub-schema. As an
+     * example, it may be used as part of the validation error descriptions 
+     * that are produced by the Validator and ValidationVisitor classes.
+     *
+     * @param  title  new title
+     */
+    void setTitle(const std::string &title)
+    {
+        this->title = title;
+    }
+
+protected:
+
+    CustomAlloc allocFn;
+
+    CustomFree freeFn;
+
+private:
+
+    // Disable copy construction
+    Subschema(const Subschema &);
+
+    // Disable copy assignment
+    Subschema & operator=(const Subschema &);
+
+    /// List of pointers to constraints that apply to this schema.
+    std::vector<const Constraint *> constraints;
+
+    /// Schema description (optional)
+    opt::optional<std::string> description;
+
+    /// Id to apply when resolving the schema URI
+    opt::optional<std::string> id;
+
+    /// Title string associated with the schema (optional)
+    opt::optional<std::string> title;
+};
+
+} // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/file_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/file_utils.hpp
@@ -0,0 +1,48 @@
+#pragma once
+#ifndef __VALIJSON_FILE_UTILS_HPP
+#define __VALIJSON_FILE_UTILS_HPP
+
+#include <fstream>
+#include <limits>
+
+namespace valijson {
+namespace utils {
+
+/**
+ * Load a file into a string
+ *
+ * @param  path  path to the file to be loaded
+ * @param  dest  string into which file should be loaded
+ *
+ * @return  true if loaded, false otherwise
+ */
+inline bool loadFile(const std::string &path, std::string &dest)
+{
+    // Open file for reading
+    std::ifstream file(path.c_str());
+    if (!file.is_open()) {
+        return false;
+    }
+
+    // Allocate space for file contents
+    file.seekg(0, std::ios::end);
+    const std::streamoff offset = file.tellg();
+    if (offset < 0 || offset > std::numeric_limits<unsigned int>::max()) {
+        return false;
+    }
+
+    dest.clear();
+    dest.reserve(static_cast<unsigned int>(offset));
+
+    // Assign file contents to destination string
+    file.seekg(0, std::ios::beg);
+    dest.assign(std::istreambuf_iterator<char>(file),
+                std::istreambuf_iterator<char>());
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/json11_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/json11_utils.hpp
@@ -0,0 +1,39 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_JSON11_UTILS_HPP
+#define __VALIJSON_UTILS_JSON11_UTILS_HPP
+
+#include <iostream>
+
+#include <json11.hpp>
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, json11::Json &document)
+{
+    // Load schema JSON from file
+    std::string file;
+    if (!loadFile(path, file)) {
+        std::cerr << "Failed to load json from file '" << path << "'." << std::endl;
+        return false;
+    }
+
+    // Parse schema
+    std::string err;
+    document = json11::Json::parse(file, err);
+    if (!err.empty()) {
+        std::cerr << "json11 failed to parse the document:" << std::endl
+                  << "Parse error: " << err << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
+
--- a/examples/validator/valijson/include/valijson/utils/jsoncpp_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/jsoncpp_utils.hpp
@@ -0,0 +1,37 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_JSONCPP_UTILS_HPP
+#define __VALIJSON_UTILS_JSONCPP_UTILS_HPP
+
+#include <iostream>
+
+#include <json/json.h>
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, Json::Value &document)
+{
+    // Load schema JSON from file
+    std::string file;
+    if (!loadFile(path, file)) {
+        std::cerr << "Failed to load json from file '" << path << "'." << std::endl;
+        return false;
+    }
+
+    Json::Reader reader;
+    bool parsingSuccessful = reader.parse(file, document);
+    if (!parsingSuccessful) {
+        std::cerr << "Jsoncpp parser failed to parse the document:" << std::endl
+                  << reader.getFormattedErrorMessages();
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/nlohmann_json_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/nlohmann_json_utils.hpp
@@ -0,0 +1,37 @@
+#pragma once
+#ifndef VALIJSON_NLOHMANN_JSON_UTILS_HPP
+#define VALIJSON_NLOHMANN_JSON_UTILS_HPP
+
+#include <iostream>
+
+#include <json.hpp>
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, nlohmann::json &document) {
+    // Load schema JSON from file
+    std::string file;
+    if (!loadFile(path, file)) {
+        std::cerr << "Failed to load json from file '" << path << "'."
+                  << std::endl;
+        return false;
+    }
+
+    // Parse schema
+    try {
+        document = nlohmann::json::parse(file);
+    } catch (std::invalid_argument const& exception) {
+        std::cerr << "nlohmann::json failed to parse the document\n"
+            << "Parse error:" << exception.what() << "\n";
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif //VALIJSON_NLOHMANN_JSON_UTILS_HPP
--- a/examples/validator/valijson/include/valijson/utils/picojson_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/picojson_utils.hpp
@@ -0,0 +1,37 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_PICOJSON_UTILS_HPP
+#define __VALIJSON_UTILS_PICOJSON_UTILS_HPP
+
+#include <iostream>
+
+#include <picojson.h>
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, picojson::value &document)
+{
+    // Load schema JSON from file
+    std::string file;
+    if (!loadFile(path, file)) {
+        std::cerr << "Failed to load json from file '" << path << "'." << std::endl;
+        return false;
+    }
+
+    // Parse schema
+    std::string err = picojson::parse(document, file);
+    if (!err.empty()) {
+        std::cerr << "PicoJson failed to parse the document:" << std::endl
+                  << "Parse error: " << err << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/poco_json_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/poco_json_utils.hpp
@@ -0,0 +1,40 @@
+#pragma once
+#ifndef VALIJSON_POCO_JSON_UTILS_HPP
+#define VALIJSON_POCO_JSON_UTILS_HPP
+
+#include <iostream>
+
+#include <Poco/JSON/JSONException.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Parser.h>
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, Poco::Dynamic::Var &document) {
+    // Load schema JSON from file
+    std::string file;
+    if (!loadFile(path, file)) {
+        std::cerr << "Failed to load json from file '" << path << "'."
+                  << std::endl;
+        return false;
+    }
+
+    // Parse schema
+    try {
+        document = Poco::JSON::Parser().parse(file);
+    } catch (Poco::Exception const& exception) {
+        std::cerr << "Poco::JSON failed to parse the document\n"
+            << "Parse error:" << exception.what() << "\n";
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif //VALIJSON_POCO_JSON_UTILS_HPP
--- a/examples/validator/valijson/include/valijson/utils/property_tree_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/property_tree_utils.hpp
@@ -0,0 +1,40 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_PROPERTY_TREE_UTILS_HPP
+#define __VALIJSON_UTILS_PROPERTY_TREE_UTILS_HPP
+
+#include <iostream>
+#include <sstream>
+
+#include <boost/property_tree/ptree.hpp>
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wshorten-64-to-32"
+# include <boost/property_tree/json_parser.hpp>
+# pragma clang diagnostic pop
+#else
+# include <boost/property_tree/json_parser.hpp>
+#endif
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, boost::property_tree::ptree &document)
+{
+    try {
+        boost::property_tree::read_json(path, document);
+    } catch (std::exception &e) {
+        std::cerr << "Boost Property Tree JSON parser failed to parse the document:" << std::endl;
+        std::cerr << e.what() << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/qtjson_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/qtjson_utils.hpp
@@ -0,0 +1,48 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_QTJSON_UTILS_HPP
+#define __VALIJSON_UTILS_QTJSON_UTILS_HPP
+
+#include <QFile>
+
+#include <QJsonDocument>
+#include <QJsonObject>
+
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+inline bool loadDocument(const std::string &path, QJsonValue &root)
+{
+    // Load schema JSON from file
+    QFile file(QString::fromStdString(path));
+    if (!file.open(QFile::ReadOnly)) {
+        std::cerr << "Failed to load json from file '" << path << "'." << std::endl;
+        return false;
+    }
+
+    QByteArray data = file.readAll();
+
+    // Parse schema
+    QJsonParseError parseError;
+    QJsonDocument doc = QJsonDocument::fromJson(data);
+    if (doc.isNull()) {
+        std::cerr << "qt failed to parse the document:" << std::endl
+                  << parseError.errorString().toStdString() << std::endl;
+        return false;
+    } else if (doc.isObject()) {
+        root = QJsonValue(doc.object());
+    } else if (doc.isArray()) {
+        root = QJsonValue(doc.array());
+    } else if (doc.isEmpty()) {
+        root = QJsonValue();
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/rapidjson_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/rapidjson_utils.hpp
@@ -0,0 +1,39 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_RAPIDJSON_UTILS_HPP
+#define __VALIJSON_UTILS_RAPIDJSON_UTILS_HPP
+
+#include <iostream>
+
+#include <rapidjson/document.h>
+
+#include <valijson/utils/file_utils.hpp>
+
+namespace valijson {
+namespace utils {
+
+template<typename Encoding, typename Allocator>
+inline bool loadDocument(const std::string &path, rapidjson::GenericDocument<Encoding, Allocator> &document)
+{
+    // Load schema JSON from file
+    std::string file;
+    if (!loadFile(path, file)) {
+        std::cerr << "Failed to load json from file '" << path << "'." << std::endl;
+        return false;
+    }
+
+    // Parse schema
+    document.template Parse<0>(file.c_str());
+    if (document.HasParseError()) {
+        std::cerr << "RapidJson failed to parse the document:" << std::endl;
+        std::cerr << "Parse error: " << document.GetParseError() << std::endl;
+        std::cerr << "Near: " << file.substr((std::max)(size_t(0), document.GetErrorOffset() - 20), 40) << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/utils/utf8_utils.hpp
+++ b/examples/validator/valijson/include/valijson/utils/utf8_utils.hpp
@@ -0,0 +1,64 @@
+#pragma once
+#ifndef __VALIJSON_UTILS_UTF8_UTILS_HPP
+#define __VALIJSON_UTILS_UTF8_UTILS_HPP
+
+#include <stdexcept>
+
+/*
+  Basic UTF-8 manipulation routines, adapted from code that was released into
+  the public domain by Jeff Bezanson.
+*/
+
+namespace valijson {
+namespace utils {
+
+static const uint32_t offsetsFromUTF8[6] = {
+    0x00000000UL, 0x00003080UL, 0x000E2080UL,
+    0x03C82080UL, 0xFA082080UL, 0x82082080UL
+};
+
+/* is c the start of a utf8 sequence? */
+inline bool isutf(char c) {
+    return ((c & 0xC0) != 0x80);
+}
+
+/* reads the next utf-8 sequence out of a string, updating an index */
+inline uint32_t u8_nextchar(const char *s, int *i)
+{
+    uint32_t ch = 0;
+    int sz = 0;
+
+    do {
+        ch <<= 6;
+        ch += (unsigned char)s[(*i)++];
+        sz++;
+    } while (s[*i] && !isutf(s[*i]));
+    ch -= offsetsFromUTF8[sz-1];
+
+    return ch;
+}
+
+/* number of characters */
+inline uint64_t u8_strlen(const char *s)
+{
+    static const int maxLength = std::numeric_limits<int>::max();
+
+    uint64_t count = 0;
+    int i = 0;
+
+    while (s[i] != 0 && u8_nextchar(s, &i) != 0) {
+        if (i == maxLength) {
+            throw std::runtime_error(
+                    "String exceeded maximum size of " +
+                    std::to_string(maxLength) + " bytes.");
+        }
+        count++;
+    }
+
+    return count;
+}
+
+}  // namespace utils
+}  // namespace valijson
+
+#endif
--- a/examples/validator/valijson/include/valijson/validation_results.hpp
+++ b/examples/validator/valijson/include/valijson/validation_results.hpp
@@ -0,0 +1,126 @@
+#pragma once
+#ifndef __VALIJSON_VALIDATION_RESULTS_HPP
+#define __VALIJSON_VALIDATION_RESULTS_HPP
+
+#include <deque>
+#include <string>
+#include <vector>
+
+namespace valijson {
+
+/**
+ * @brief  Class that encapsulates the storage of validation errors.
+ *
+ * This class maintains an internal FIFO queue of errors that are reported
+ * during validation. Errors are pushed on to the back of an internal
+ * queue, and can retrieved by popping them from the front of the queue.
+ */
+class ValidationResults
+{
+public:
+
+    /**
+     * @brief  Describes a validation error.
+     *
+     * This struct is used to pass around the context and description of a
+     * validation error.
+     */
+    struct Error
+    {
+        /**
+         * @brief  Construct an Error object with no context or description.
+         */
+        Error() { }
+
+        /**
+         * @brief  Construct an Error object using a context and description.
+         *
+         * @param  context      Context string to use
+         * @param  description  Description string to use
+         */
+        Error(const std::vector<std::string> &context, const std::string &description)
+          : context(context),
+            description(description) { }
+
+        /// Path to the node that failed validation.
+        std::vector<std::string> context;
+
+        /// A detailed description of the validation error.
+        std::string description;
+    };
+
+    /**
+     * @brief  Return begin iterator for results in the queue.
+     */
+    std::deque<Error>::const_iterator begin() const
+    {
+        return errors.begin();
+    }
+
+    /**
+     * @brief  Return end iterator for results in the queue.
+     */
+    std::deque<Error>::const_iterator end() const
+    {
+        return errors.end();
+    }
+
+    /**
+     * @brief  Return the number of errors in the queue.
+     */
+    size_t numErrors() const
+    {
+        return errors.size();
+    }
+
+    /**
+     * @brief  Copy an Error and push it on to the back of the queue.
+     *
+     * @param  error  Reference to an Error object to be copied.
+     */
+    void pushError(const Error &error)
+    {
+        errors.push_back(error);
+    }
+
+    /**
+     * @brief  Push an error onto the back of the queue.
+     *
+     * @param  context      Context of the validation error.
+     * @param  description  Description of the validation error.
+     */
+    void
+    pushError(const std::vector<std::string> &context, const std::string &description)
+    {
+        errors.push_back(Error(context, description));
+    }
+
+    /**
+     * @brief  Pop an error from the front of the queue.
+     *
+     * @param  error  Reference to an Error object to populate.
+     *
+     * @returns  true if an Error was popped, false otherwise.
+     */
+    bool
+    popError(Error &error)
+    {
+        if (errors.empty()) {
+            return false;
+        }
+
+        error = errors.front();
+        errors.pop_front();
+        return true;
+    }
+
+private:
+
+    /// FIFO queue of validation errors that have been reported
+    std::deque<Error> errors;
+
+};
+
+} // namespace valijson
+
+#endif // __VALIJSON_VALIDATION_RESULTS_HPP
--- a/examples/validator/valijson/include/valijson/validation_visitor.hpp
+++ b/examples/validator/valijson/include/valijson/validation_visitor.hpp
--- a/examples/validator/valijson/include/valijson/validator.hpp
+++ b/examples/validator/valijson/include/valijson/validator.hpp
@@ -0,0 +1,78 @@
+#pragma once
+#ifndef __VALIJSON_VALIDATOR_HPP
+#define __VALIJSON_VALIDATOR_HPP
+
+#include <valijson/schema.hpp>
+#include <valijson/validation_visitor.hpp>
+
+namespace valijson {
+
+class Schema;
+class ValidationResults;
+
+/**
+ * @brief  Class that provides validation functionality.
+ */
+class Validator
+{
+public:
+    enum TypeCheckingMode
+    {
+        kStrongTypes,
+        kWeakTypes
+    };
+
+    /**
+     * @brief  Construct a Validator that uses strong type checking by default
+     */
+    Validator()
+      : strictTypes(true) { }
+
+    /**
+     * @brief  Construct a Validator using a specific type checking mode
+     *
+     * @param  typeCheckingMode  choice of strong or weak type checking
+     */
+    Validator(TypeCheckingMode typeCheckingMode)
+      : strictTypes(typeCheckingMode == kStrongTypes) { }
+
+    /**
+     * @brief  Validate a JSON document and optionally return the results.
+     *
+     * When a ValidationResults object is provided via the \c results parameter,
+     * validation will be performed against each constraint defined by the
+     * schema, even if validation fails for some or all constraints.
+     *
+     * If a pointer to a ValidationResults instance is not provided, validation
+     * will only continue for as long as the constraints are validated
+     * successfully.
+     *
+     * @param  schema   The schema to validate against
+     * @param  target   A rapidjson::Value to be validated
+     *
+     * @param  results  An optional pointer to a ValidationResults instance that
+     *                  will be used to report validation errors
+     *
+     * @returns  true if validation succeeds, false otherwise
+     */
+    template<typename AdapterType>
+    bool validate(const Subschema &schema, const AdapterType &target,
+            ValidationResults *results)
+    {
+        // Construct a ValidationVisitor to perform validation at the root level
+        ValidationVisitor<AdapterType> v(target,
+                std::vector<std::string>(1, "<root>"), strictTypes, results);
+
+        return v.validateSchema(schema);
+    }
+
+private:
+
+    /// Flag indicating that strict type comparisons should be used
+    const bool strictTypes;
+
+};
+
+}  // namespace valijson
+
+#endif
--- a/loader_example.cc
+++ b/loader_example.cc
@@ -175,10 +175,7 @@ static std::string PrintIntArray(const std::vector<int> &arr) {
  std::stringstream ss;
  ss << "[ ";
  for (size_t i = 0; i < arr.size(); i++) {
-    ss << arr[i];
-    if (i != arr.size() - 1) {
-      ss << ", ";
-    }
+    ss << arr[i] << ((i != arr.size() - 1) ? ", " : "");
  }
  ss << " ]";

@@ -193,10 +190,7 @@ static std::string PrintFloatArray(const std::vector<double> &arr) {
  std::stringstream ss;
  ss << "[ ";
  for (size_t i = 0; i < arr.size(); i++) {
-    ss << arr[i];
-    if (i != arr.size() - 1) {
-      ss << ", ";
-    }
+    ss << arr[i] << ((i != arr.size() - 1) ? ", " : "");
  }
  ss << " ]";

@@ -234,8 +228,7 @@ static std::string PrintParameterMap(const tinygltf::ParameterMap &pmap) {
 #endif

 static std::string PrintValue(const std::string &name,
-                              const tinygltf::Value &value, const int indent,
-                              const bool tag = true) {
+                              const tinygltf::Value &value, const int indent, const bool tag = true) {
  std::stringstream ss;

  if (value.IsObject()) {
@@ -249,36 +242,36 @@ static std::string PrintValue(const std::string &name,
    if (tag) {
      ss << Indent(indent) << name << " : " << value.Get<std::string>();
    } else {
-      ss << Indent(indent) << value.Get<std::string>() << " ";
+      ss << " " << value.Get<std::string>() << " ";
    }
  } else if (value.IsBool()) {
    if (tag) {
      ss << Indent(indent) << name << " : " << value.Get<bool>();
    } else {
-      ss << Indent(indent) << value.Get<bool>() << " ";
+      ss << " " << value.Get<bool>() << " ";
    }
  } else if (value.IsNumber()) {
    if (tag) {
      ss << Indent(indent) << name << " : " << value.Get<double>();
    } else {
-      ss << Indent(indent) << value.Get<double>() << " ";
+      ss << " " << value.Get<double>() << " ";
    }
  } else if (value.IsInt()) {
    if (tag) {
      ss << Indent(indent) << name << " : " << value.Get<int>();
    } else {
-      ss << Indent(indent) << value.Get<int>() << " ";
+      ss << " " << value.Get<int>() << " ";
    }
  } else if (value.IsArray()) {
-    // TODO(syoyo): Better pretty printing of array item
-    ss << Indent(indent) << name << " [ \n";
+    ss << Indent(indent) << name << " [ ";
    for (size_t i = 0; i < value.Size(); i++) {
-      ss << PrintValue("", value.Get(int(i)), indent + 1, /* tag */ false);
-      if (i != (value.ArrayLen() - 1)) {
-        ss << ", \n";
+      ss << PrintValue("", value.Get(int(i)), indent + 1, /* tag */false);
+      if (i != (value.ArrayLen()-1)) {
+        ss << ", ";
      }
+
    }
-    ss << "\n" << Indent(indent) << "] ";
+    ss << Indent(indent) << "] ";
  }

  // @todo { binary }
@@ -322,15 +315,6 @@ static void DumpStringIntMap(const std::map<std::string, int> &m, int indent) {
  }
 }

-static void DumpExtensions(const tinygltf::ExtensionMap &extension,
-                           const int indent) {
-  // TODO(syoyo): pritty print Value
-  for (auto &e : extension) {
-    std::cout << Indent(indent) << e.first << std::endl;
-    std::cout << PrintValue("extensions", e.second, indent + 1) << std::endl;
-  }
-}
-
 static void DumpPrimitive(const tinygltf::Primitive &primitive, int indent) {
  std::cout << Indent(indent) << "material : " << primitive.material
            << std::endl;
@@ -342,80 +326,17 @@ static void DumpPrimitive(const tinygltf::Primitive &primitive, int indent) {
            << std::endl;
  DumpStringIntMap(primitive.attributes, indent + 1);

-  DumpExtensions(primitive.extensions, indent);
  std::cout << Indent(indent) << "extras :" << std::endl
            << PrintValue("extras", primitive.extras, indent + 1) << std::endl;
-
-  if (!primitive.extensions_json_string.empty()) {
-    std::cout << Indent(indent + 1) << "extensions(JSON string) = "
-              << primitive.extensions_json_string << "\n";
-  }
-
-  if (!primitive.extras_json_string.empty()) {
-    std::cout << Indent(indent + 1)
-              << "extras(JSON string) = " << primitive.extras_json_string
-              << "\n";
-  }
 }

-
-static void DumpTextureInfo(const tinygltf::TextureInfo &texinfo,
-                            const int indent) {
-  std::cout << Indent(indent) << "index     : " << texinfo.index << "\n";
-  std::cout << Indent(indent) << "texCoord  : TEXCOORD_" << texinfo.texCoord
-            << "\n";
-  DumpExtensions(texinfo.extensions, indent + 1);
-  std::cout << PrintValue("extras", texinfo.extras, indent + 1) << "\n";
-
-  if (!texinfo.extensions_json_string.empty()) {
-    std::cout << Indent(indent)
-              << "extensions(JSON string) = " << texinfo.extensions_json_string
-              << "\n";
-  }
-
-  if (!texinfo.extras_json_string.empty()) {
-    std::cout << Indent(indent)
-              << "extras(JSON string) = " << texinfo.extras_json_string << "\n";
-  }
-}
-
-static void DumpNormalTextureInfo(const tinygltf::NormalTextureInfo &texinfo,
-                                  const int indent) {
-  std::cout << Indent(indent) << "index     : " << texinfo.index << "\n";
-  std::cout << Indent(indent) << "texCoord  : TEXCOORD_" << texinfo.texCoord
-            << "\n";
-  std::cout << Indent(indent) << "scale     : " << texinfo.scale << "\n";
-  DumpExtensions(texinfo.extensions, indent + 1);
-  std::cout << PrintValue("extras", texinfo.extras, indent + 1) << "\n";
-}
-
-static void DumpOcclusionTextureInfo(
-    const tinygltf::OcclusionTextureInfo &texinfo, const int indent) {
-  std::cout << Indent(indent) << "index     : " << texinfo.index << "\n";
-  std::cout << Indent(indent) << "texCoord  : TEXCOORD_" << texinfo.texCoord
-            << "\n";
-  std::cout << Indent(indent) << "strength  : " << texinfo.strength << "\n";
-  DumpExtensions(texinfo.extensions, indent + 1);
-  std::cout << PrintValue("extras", texinfo.extras, indent + 1) << "\n";
-}
-
-static void DumpPbrMetallicRoughness(const tinygltf::PbrMetallicRoughness &pbr,
-                                     const int indent) {
-  std::cout << Indent(indent)
-            << "baseColorFactor   : " << PrintFloatArray(pbr.baseColorFactor)
-            << "\n";
-  std::cout << Indent(indent) << "baseColorTexture  :\n";
-  DumpTextureInfo(pbr.baseColorTexture, indent + 1);
-
-  std::cout << Indent(indent) << "metallicFactor    : " << pbr.metallicFactor
-            << "\n";
-  std::cout << Indent(indent) << "roughnessFactor   : " << pbr.roughnessFactor
-            << "\n";
-
-  std::cout << Indent(indent) << "metallicRoughnessTexture  :\n";
-  DumpTextureInfo(pbr.metallicRoughnessTexture, indent + 1);
-  DumpExtensions(pbr.extensions, indent + 1);
-  std::cout << PrintValue("extras", pbr.extras, indent + 1) << "\n";
+static void DumpExtensions(const tinygltf::ExtensionMap &extension, const int indent)
+{
+  // TODO(syoyo): pritty print Value
+  for (auto &e : extension) {
+    std::cout << Indent(indent) << e.first << std::endl;
+    std::cout << PrintValue("extensions", e.second, indent+1) << std::endl;
+  }  
 }

 static void Dump(const tinygltf::Model &model) {
@@ -488,30 +409,6 @@ static void Dump(const tinygltf::Model &model) {
        }
        std::cout << "]" << std::endl;
      }
-
-      if (accessor.sparse.isSparse) {
-        std::cout << Indent(2) << "sparse:" << std::endl;
-        std::cout << Indent(3) << "count  : " << accessor.sparse.count
-                  << std::endl;
-        std::cout << Indent(3) << "indices: " << std::endl;
-        std::cout << Indent(4)
-                  << "bufferView   : " << accessor.sparse.indices.bufferView
-                  << std::endl;
-        std::cout << Indent(4)
-                  << "byteOffset   : " << accessor.sparse.indices.byteOffset
-                  << std::endl;
-        std::cout << Indent(4) << "componentType: "
-                  << PrintComponentType(accessor.sparse.indices.componentType)
-                  << "(" << accessor.sparse.indices.componentType << ")"
-                  << std::endl;
-        std::cout << Indent(3) << "values : " << std::endl;
-        std::cout << Indent(4)
-                  << "bufferView   : " << accessor.sparse.values.bufferView
-                  << std::endl;
-        std::cout << Indent(4)
-                  << "byteOffset   : " << accessor.sparse.values.byteOffset
-                  << std::endl;
-      }
    }
  }

@@ -570,21 +467,6 @@ static void Dump(const tinygltf::Model &model) {
      std::cout << Indent(2)
                << "target       : " << PrintTarget(bufferView.target)
                << std::endl;
-      std::cout << Indent(1) << "-------------------------------------\n";
-
-      DumpExtensions(bufferView.extensions, 1);
-      std::cout << PrintValue("extras", bufferView.extras, 2) << std::endl;
-
-      if (!bufferView.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << bufferView.extensions_json_string << "\n";
-      }
-
-      if (!bufferView.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << bufferView.extras_json_string
-                  << "\n";
-      }
    }
  }

@@ -595,21 +477,6 @@ static void Dump(const tinygltf::Model &model) {
      std::cout << Indent(1) << "name         : " << buffer.name << std::endl;
      std::cout << Indent(2) << "byteLength   : " << buffer.data.size()
                << std::endl;
-      std::cout << Indent(1) << "-------------------------------------\n";
-
-      DumpExtensions(buffer.extensions, 1);
-      std::cout << PrintValue("extras", buffer.extras, 2) << std::endl;
-
-      if (!buffer.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << buffer.extensions_json_string << "\n";
-      }
-
-      if (!buffer.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << buffer.extras_json_string
-                  << "\n";
-      }
    }
  }

@@ -618,55 +485,16 @@ static void Dump(const tinygltf::Model &model) {
              << std::endl;
    for (size_t i = 0; i < model.materials.size(); i++) {
      const tinygltf::Material &material = model.materials[i];
-      std::cout << Indent(1) << "name                 : " << material.name
-                << std::endl;
-
-      std::cout << Indent(1) << "alphaMode            : " << material.alphaMode
-                << std::endl;
-      std::cout << Indent(1)
-                << "alphaCutoff          : " << material.alphaCutoff
-                << std::endl;
-      std::cout << Indent(1) << "doubleSided          : "
-                << (material.doubleSided ? "true" : "false") << std::endl;
-      std::cout << Indent(1) << "emissiveFactor       : "
-                << PrintFloatArray(material.emissiveFactor) << std::endl;
-
-      std::cout << Indent(1) << "pbrMetallicRoughness :\n";
-      DumpPbrMetallicRoughness(material.pbrMetallicRoughness, 2);
-
-      std::cout << Indent(1) << "normalTexture        :\n";
-      DumpNormalTextureInfo(material.normalTexture, 2);
-
-      std::cout << Indent(1) << "occlusionTexture     :\n";
-      DumpOcclusionTextureInfo(material.occlusionTexture, 2);
-
-      std::cout << Indent(1) << "emissiveTexture      :\n";
-      DumpTextureInfo(material.emissiveTexture, 2);
-
-      std::cout << Indent(1) << "----  legacy material parameter  ----\n";
+      std::cout << Indent(1) << "name         : " << material.name << std::endl;
      std::cout << Indent(1) << "values(items=" << material.values.size() << ")"
                << std::endl;
+
      tinygltf::ParameterMap::const_iterator p(material.values.begin());
      tinygltf::ParameterMap::const_iterator pEnd(material.values.end());
      for (; p != pEnd; p++) {
        std::cout << Indent(2) << p->first << ": "
                  << PrintParameterValue(p->second) << std::endl;
      }
-      std::cout << Indent(1) << "-------------------------------------\n";
-
-      DumpExtensions(material.extensions, 1);
-      std::cout << PrintValue("extras", material.extras, 2) << std::endl;
-
-      if (!material.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << material.extensions_json_string << "\n";
-      }
-
-      if (!material.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << material.extras_json_string
-                  << "\n";
-      }
    }
  }

@@ -690,18 +518,6 @@ static void Dump(const tinygltf::Model &model) {
      std::cout << Indent(2) << "height    : " << image.height << std::endl;
      std::cout << Indent(2) << "component : " << image.component << std::endl;
      DumpExtensions(image.extensions, 1);
-      std::cout << PrintValue("extras", image.extras, 2) << std::endl;
-
-      if (!image.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << image.extensions_json_string << "\n";
-      }
-
-      if (!image.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << image.extras_json_string
-                  << "\n";
-      }
    }
  }

@@ -714,18 +530,6 @@ static void Dump(const tinygltf::Model &model) {
      std::cout << Indent(1) << "source         : " << texture.source
                << std::endl;
      DumpExtensions(texture.extensions, 1);
-      std::cout << PrintValue("extras", texture.extras, 2) << std::endl;
-
-      if (!texture.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << texture.extensions_json_string << "\n";
-      }
-
-      if (!texture.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << texture.extras_json_string
-                  << "\n";
-      }
    }
  }

@@ -747,20 +551,6 @@ static void Dump(const tinygltf::Model &model) {
      std::cout << Indent(2)
                << "wrapT        : " << PrintWrapMode(sampler.wrapT)
                << std::endl;
-
-      DumpExtensions(sampler.extensions, 1);
-      std::cout << PrintValue("extras", sampler.extras, 2) << std::endl;
-
-      if (!sampler.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << sampler.extensions_json_string << "\n";
-      }
-
-      if (!sampler.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << sampler.extras_json_string
-                  << "\n";
-      }
    }
  }

@@ -793,61 +583,12 @@ static void Dump(const tinygltf::Model &model) {
                  << "znear         : " << camera.orthographic.znear
                  << std::endl;
      }
-
-      std::cout << Indent(1) << "-------------------------------------\n";
-
-      DumpExtensions(camera.extensions, 1);
-      std::cout << PrintValue("extras", camera.extras, 2) << std::endl;
-
-      if (!camera.extensions_json_string.empty()) {
-        std::cout << Indent(2) << "extensions(JSON string) = "
-                  << camera.extensions_json_string << "\n";
-      }
-
-      if (!camera.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << camera.extras_json_string
-                  << "\n";
-      }
    }
  }
-
-  {
-    std::cout << "skins(items=" << model.skins.size() << ")" << std::endl;
-    for (size_t i = 0; i < model.skins.size(); i++) {
-      const tinygltf::Skin &skin = model.skins[i];
-      std::cout << Indent(1) << "name         : " << skin.name << std::endl;
-      std::cout << Indent(2)
-                << "inverseBindMatrices   : " << skin.inverseBindMatrices
-                << std::endl;
-      std::cout << Indent(2) << "skeleton              : " << skin.skeleton
-                << std::endl;
-      std::cout << Indent(2)
-                << "joints                : " << PrintIntArray(skin.joints)
-                << std::endl;
-      std::cout << Indent(1) << "-------------------------------------\n";
-
-      DumpExtensions(skin.extensions, 1);
-      std::cout << PrintValue("extras", skin.extras, 2) << std::endl;
-
-      if (!skin.extensions_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extensions(JSON string) = " << skin.extensions_json_string
-                  << "\n";
-      }
-
-      if (!skin.extras_json_string.empty()) {
-        std::cout << Indent(2)
-                  << "extras(JSON string) = " << skin.extras_json_string
-                  << "\n";
-      }
-    }
-  }
-
+  
  // toplevel extensions
  {
-    std::cout << "extensions(items=" << model.extensions.size() << ")"
-              << std::endl;
+    std::cout << "extensions(items=" << model.extensions.size() << ")" << std::endl;
    DumpExtensions(model.extensions, 1);
  }
 }
@@ -858,39 +599,29 @@ int main(int argc, char **argv) {
    exit(1);
  }

-  // Store original JSON string for `extras` and `extensions`
-  bool store_original_json_for_extras_and_extensions = false;
-  if (argc > 2) {
-    store_original_json_for_extras_and_extensions = true;
-  }
-
  tinygltf::Model model;
  tinygltf::TinyGLTF gltf_ctx;
  std::string err;
-  std::string warn;
+  std::string warn; 
  std::string input_filename(argv[1]);
  std::string ext = GetFilePathExtension(input_filename);

-  gltf_ctx.SetStoreOriginalJSONForExtrasAndExtensions(
-      store_original_json_for_extras_and_extensions);
-
  bool ret = false;
  if (ext.compare("glb") == 0) {
    std::cout << "Reading binary glTF" << std::endl;
    // assume binary glTF.
-    ret = gltf_ctx.LoadBinaryFromFile(&model, &err, &warn,
-                                      input_filename.c_str());
+    ret = gltf_ctx.LoadBinaryFromFile(&model, &err, &warn, input_filename.c_str());
  } else {
    std::cout << "Reading ASCII glTF" << std::endl;
    // assume ascii glTF.
-    ret =
-        gltf_ctx.LoadASCIIFromFile(&model, &err, &warn, input_filename.c_str());
+    ret = gltf_ctx.LoadASCIIFromFile(&model, &err, &warn, input_filename.c_str());
  }

  if (!warn.empty()) {
    printf("Warn: %s\n", warn.c_str());
  }

+
  if (!err.empty()) {
    printf("Err: %s\n", err.c_str());
  }
--- a/models/BoundsChecking/integer-out-of-bounds.gltf
+++ b/models/BoundsChecking/integer-out-of-bounds.gltf
@@ -1,67 +0,0 @@
-{
-  "scenes": [
-    {
-      "nodes": [0]
-    }
-  ],
-  "nodes": [
-    {
-      "mesh": 0
-    }
-  ],
-  "meshes": [
-    {
-      "primitives": [
-        {
-          "attributes": {
-            "POSITION": 1
-          },
-          "indices": 0
-        }
-      ]
-    }
-  ],
-  "buffers": [
-    {
-      "uri": "simpleTriangle.bin",
-      "byteLength": 44
-    }
-  ],
-  "bufferViews": [
-    {
-      "buffer": 0,
-      "byteOffset": 0,
-      "byteLength": 1e300,
-      "target": 34963
-    },
-    {
-      "buffer": 0,
-      "byteOffset": 8,
-      "byteLength": 36,
-      "target": 34962
-    }
-  ],
-  "accessors": [
-    {
-      "bufferView": 0,
-      "byteOffset": 0,
-      "componentType": 5123,
-      "count": 3,
-      "type": "SCALAR",
-      "max": [2],
-      "min": [0]
-    },
-    {
-      "bufferView": 1,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 3,
-      "type": "VEC3",
-      "max": [1, 1, 0],
-      "min": [0, 0, 0]
-    }
-  ],
-  "asset": {
-    "version": "2.0"
-  }
-}
--- a/models/BoundsChecking/invalid-buffer-index.gltf
+++ b/models/BoundsChecking/invalid-buffer-index.gltf
@@ -1,53 +0,0 @@
-{
-  "scenes": [],
-  "nodes": [],
-  "meshes": [
-    {
-      "primitives": [
-        {
-          "attributes": {},
-          "indices": 0
-        }
-      ]
-    }
-  ],
-  "buffers": [
-    {
-      "uri": "simpleTriangle.bin",
-      "byteLength": 44
-    }
-  ],
-  "bufferViews": [
-    {
-      "buffer": 0,
-      "byteOffset": 0,
-      "byteLength": 6,
-      "target": 34963
-    },
-    {
-      "buffer": 1,
-      "byteOffset": 0,
-      "byteLength": 6,
-      "target": 34963
-    }
-  ],
-  "images": [
-    {
-      "bufferView": 1,
-      "mimeType": "image/png"
-    }
-  ],
-  "accessors": [
-    {
-      "bufferView": 0,
-      "componentType": 5123,
-      "count": 3,
-      "type": "SCALAR",
-      "max": [2],
-      "min": [0]
-    }
-  ],
-  "asset": {
-    "version": "2.0"
-  }
-}
--- a/models/BoundsChecking/invalid-buffer-view-index.gltf
+++ b/models/BoundsChecking/invalid-buffer-view-index.gltf
@@ -1,36 +0,0 @@
-{
-  "scenes": [],
-  "nodes": [],
-  "buffers": [],
-  "meshes": [
-    {
-      "primitives": [
-        {
-          "attributes": {},
-          "indices": 0
-        }
-      ]
-    }
-  ],
-  "bufferViews": [
-    {
-      "buffer": 0,
-      "byteOffset": 0,
-      "byteLength": 6,
-      "target": 34963
-    }
-  ],
-  "accessors": [
-    {
-      "bufferView": 1,
-      "componentType": 5123,
-      "count": 3,
-      "type": "SCALAR",
-      "max": [2],
-      "min": [0]
-    }
-  ],
-  "asset": {
-    "version": "2.0"
-  }
-}
--- a/models/BoundsChecking/invalid-primitive-indices.gltf
+++ b/models/BoundsChecking/invalid-primitive-indices.gltf
@@ -1,36 +0,0 @@
-{
-  "scenes": [],
-  "nodes": [],
-  "buffers": [],
-  "meshes": [
-    {
-      "primitives": [
-        {
-          "attributes": {},
-          "indices": 1
-        }
-      ]
-    }
-  ],
-  "bufferViews": [
-    {
-      "buffer": 0,
-      "byteOffset": 0,
-      "byteLength": 6,
-      "target": 34963
-    }
-  ],
-  "accessors": [
-    {
-      "bufferView": 1,
-      "componentType": 5123,
-      "count": 3,
-      "type": "SCALAR",
-      "max": [2],
-      "min": [0]
-    }
-  ],
-  "asset": {
-    "version": "2.0"
-  }
-}
--- a/models/BoundsChecking/simpleTriangle.bin
+++ b/models/BoundsChecking/simpleTriangle.bin
--- a/models/Cube-texture-ext/Cube-textransform.gltf
+++ b/models/Cube-texture-ext/Cube-textransform.gltf
@@ -1,224 +0,0 @@
-{
-  "accessors": [
-    {
-      "bufferView": 0,
-      "byteOffset": 0,
-      "componentType": 5123,
-      "count": 36,
-      "max": [
-        35
-      ],
-      "min": [
-        0
-      ],
-      "type": "SCALAR"
-    },
-    {
-      "bufferView": 1,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 36,
-      "max": [
-        1,
-        1,
-        1.000001
-      ],
-      "min": [
-        -1,
-        -1,
-        -1
-      ],
-      "type": "VEC3"
-    },
-    {
-      "bufferView": 2,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 36,
-      "max": [
-        1,
-        1,
-        1
-      ],
-      "min": [
-        -1,
-        -1,
-        -1
-      ],
-      "type": "VEC3"
-    },
-    {
-      "bufferView": 3,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 36,
-      "max": [
-        1,
-        -0,
-        -0,
-        1
-      ],
-      "min": [
-        0,
-        -0,
-        -1,
-        -1
-      ],
-      "type": "VEC4"
-    },
-    {
-      "bufferView": 4,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 36,
-      "max": [
-        1,
-        1
-      ],
-      "min": [
-        -1,
-        -1
-      ],
-      "type": "VEC2"
-    }
-  ],
-  "asset": {
-    "generator": "VKTS glTF 2.0 exporter",
-    "version": "2.0"
-  },
-  "bufferViews": [
-    {
-      "buffer": 0,
-      "byteLength": 72,
-      "byteOffset": 0,
-      "target": 34963
-    },
-    {
-      "buffer": 0,
-      "byteLength": 432,
-      "byteOffset": 72,
-      "target": 34962
-    },
-    {
-      "buffer": 0,
-      "byteLength": 432,
-      "byteOffset": 504,
-      "target": 34962
-    },
-    {
-      "buffer": 0,
-      "byteLength": 576,
-      "byteOffset": 936,
-      "target": 34962
-    },
-    {
-      "buffer": 0,
-      "byteLength": 288,
-      "byteOffset": 1512,
-      "target": 34962
-    }
-  ],
-  "buffers": [
-    {
-      "byteLength": 1800,
-      "uri": "Cube.bin"
-    }
-  ],
-  "images": [
-    {
-      "0comment": "Use Cube_MetallicRoughness.png to reduce scene filesize",
-      "uri": "Cube_MetallicRoughness.png"
-    },
-    {
-      "uri": "Cube_MetallicRoughness.png"
-    }
-  ],
-  "materials": [
-    {
-      "emissiveTexture": {
-        "index": 0,
-        "extensions": {
-          "KHR_texture_transform": {
-            "offset": [
-              0,
-              1
-            ],
-            "scale": [
-              1,
-              -1
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Cube",
-      "pbrMetallicRoughness": {
-        "baseColorTexture": {
-          "index": 0
-        },
-        "metallicRoughnessTexture": {
-          "index": 1,
-          "extensions": {
-            "KHR_texture_transform": {
-              "offset": [
-                0,
-                1
-              ],
-              "rotation": 1.57079632679,
-              "scale": [
-                0.5,
-                0.5
-              ]
-            }
-          }
-        }
-      }
-    }
-  ],
-  "meshes": [
-    {
-      "name": "Cube",
-      "primitives": [
-        {
-          "attributes": {
-            "NORMAL": 2,
-            "POSITION": 1,
-            "TANGENT": 3,
-            "TEXCOORD_0": 4
-          },
-          "indices": 0,
-          "material": 0,
-          "mode": 4
-        }
-      ]
-    }
-  ],
-  "nodes": [
-    {
-      "mesh": 0,
-      "name": "Cube"
-    }
-  ],
-  "samplers": [
-    {}
-  ],
-  "scene": 0,
-  "scenes": [
-    {
-      "nodes": [
-        0
-      ]
-    }
-  ],
-  "textures": [
-    {
-      "sampler": 0,
-      "source": 0
-    },
-    {
-      "sampler": 0,
-      "source": 1
-    }
-  ]
-}
--- a/models/Cube-texture-ext/Cube.bin
+++ b/models/Cube-texture-ext/Cube.bin
--- a/models/Cube-texture-ext/Cube_MetallicRoughness.png
+++ b/models/Cube-texture-ext/Cube_MetallicRoughness.png
--- a/models/Cube-texture-ext/README.md
+++ b/models/Cube-texture-ext/README.md
@@ -1,6 +0,0 @@
-Added KHR_texture_transform property to Cube scene.
-
-License: Donated by Norbert Nopper for glTF testing.
-
-https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/Cube
-
--- a/models/CubeImageUriSpaces/
+++ b/models/CubeImageUriSpaces/
--- a/models/CubeImageUriSpaces/2x2
+++ b/models/CubeImageUriSpaces/2x2
--- a/models/CubeImageUriSpaces/CubeImageUriMultipleSpaces.gltf
+++ b/models/CubeImageUriSpaces/CubeImageUriMultipleSpaces.gltf
@@ -1,171 +0,0 @@
-{
-  "asset": {
-    "version": "2.0"
-  },
-  "scenes": [
-    {
-      "nodes": [
-        0
-      ]
-    }
-  ],
-  "scene": 0,
-  "nodes": [
-    {
-      "mesh": 0
-    }
-  ],
-  "meshes": [
-    {
-      "primitives": [
-        {
-          "attributes": {
-            "NORMAL": 2,
-            "POSITION": 1,
-            "TEXCOORD_0": 3
-          },
-          "indices": 0,
-          "mode": 4,
-          "material": 0
-        }
-      ]
-    }
-  ],
-  "materials": [
-    {
-      "pbrMetallicRoughness": {
-        "baseColorTexture": {
-          "index": 0,
-          "texCoord": 0
-        },
-        "baseColorFactor": [
-          1,
-          1,
-          1,
-          1
-        ],
-        "metallicFactor": 1,
-        "roughnessFactor": 1
-      },
-      "emissiveFactor": [
-        0,
-        0,
-        0
-      ],
-      "alphaMode": "OPAQUE"
-    }
-  ],
-  "textures": [
-    {
-      "source": 0,
-      "sampler": 0
-    }
-  ],
-  "samplers": [
-    {
-      "wrapS": 33071,
-      "wrapT": 33071
-    }
-  ],
-  "images": [
-    {
-      "uri": " 2x2 image  has multiple      spaces.png"
-    }
-  ],
-  "accessors": [
-    {
-      "bufferView": 0,
-      "byteOffset": 0,
-      "componentType": 5121,
-      "count": 36,
-      "normalized": false,
-      "max": [
-        23
-      ],
-      "min": [
-        0
-      ],
-      "type": "SCALAR"
-    },
-    {
-      "bufferView": 1,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 24,
-      "normalized": false,
-      "max": [
-        0.5,
-        0.5,
-        0.5
-      ],
-      "min": [
-        -0.5,
-        -0.5,
-        -0.5
-      ],
-      "type": "VEC3"
-    },
-    {
-      "bufferView": 2,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 24,
-      "normalized": false,
-      "max": [
-        1,
-        1,
-        1
-      ],
-      "min": [
-        -1,
-        -1,
-        -1
-      ],
-      "type": "VEC3"
-    },
-    {
-      "bufferView": 3,
-      "byteOffset": 0,
-      "componentType": 5126,
-      "count": 24,
-      "normalized": false,
-      "max": [
-        1,
-        1
-      ],
-      "min": [
-        0,
-        0
-      ],
-      "type": "VEC2"
-    }
-  ],
-  "bufferViews": [
-    {
-      "buffer": 0,
-      "byteOffset": 0,
-      "byteLength": 36
-    },
-    {
-      "buffer": 0,
-      "byteOffset": 36,
-      "byteLength": 288
-    },
-    {
-      "buffer": 0,
-      "byteOffset": 324,
-      "byteLength": 288
-    },
-    {
-      "buffer": 0,
-      "byteOffset": 612,
-      "byteLength": 192
-    }
-  ],
-  "buffers": [
-    {
-      "byteLength": 804,
-      "uri": "CubeImageUriSpaces.bin"
-    }
-  ]
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Syoyo Fujita	6ac97adf6b	Add valijson. Currently it seg faults due to stack overflow when validating with `glTF.schema.json`	2019-05-29 20:09:47 +09:00
Syoyo Fujita	06f93c859d	Remove validator example scine it requires nlohmann's json.hpp Embed json11.cpp/json11.hpp into `tiny_gltf.h`	2019-02-15 17:51:55 +09:00
Syoyo Fujita	9e4a4d5b94	Compile with json11.cpp	2019-02-15 16:09:42 +09:00
Syoyo Fujita	4a35464d9b	Finish porting of using json11.	2019-02-09 21:58:40 +09:00
Syoyo Fujita	e316127243	Porting to use json11(W.I.P.)	2019-02-08 16:32:58 +09:00