Release 0.5.0

.clang-format

@@ -1,4 +0,0 @@
-BasedOnStyle:  LLVM
-DerivePointerAlignment: false
-PointerAlignment: Left
-SpacesBeforeTrailingComments: 1

.clang-tidy

@@ -1,11 +0,0 @@
----
-Checks:          'google-readability-casting,modernize-deprecated-headers,modernize-loop-convert,modernize-use-auto,modernize-use-default-member-init,modernize-use-using,readability-else-after-return,readability-redundant-member-init,readability-redundant-string-cstr'
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
-FormatStyle:     none
-CheckOptions:
-  - key:             modernize-use-using.IgnoreMacros
-    value:           '0'
-...
-

.gitattributes

@@ -1,11 +0,0 @@
-*           text=auto
-*.h         text
-*.cpp       text
-*.json      text
-*.in        text
-*.sh        eol=lf
-*.bat       eol=crlf
-*.vcproj    eol=crlf
-*.vcxproj   eol=crlf
-*.sln       eol=crlf
-devtools/agent_vm* eol=crlf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,26 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Meson version
- - Ninja version
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/clang-format.yml

@@ -1,20 +0,0 @@
-name: clang-format check
-on: [check_run, pull_request, push]
-
-jobs:
-  formatting-check:
-    name: formatting check
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        path:
-          - 'src'
-          - 'examples'
-          - 'include'
-    steps:
-    - uses: actions/checkout@v4
-    - name: runs clang-format style check for C/C++/Protobuf programs.
-      uses: jidicula/clang-format-action@v4.13.0
-      with:
-        clang-format-version: '18'
-        check-path: ${{ matrix.path }}

.github/workflows/cmake.yml

@@ -1,18 +0,0 @@
-name: cmake
-on: [check_run, push, pull_request]
-jobs:
-  cmake-publish:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        
-    steps:
-      - name: checkout project
-        uses: actions/checkout@v4
-
-      - name: build project
-        uses: threeal/cmake-action@v2.0.0
-        

.github/workflows/meson.yml

@@ -1,65 +0,0 @@
-name: meson build and test
-run-name: update pushed to ${{ github.ref }}
-on: [check_run, push, pull_request]
-
-jobs:
-  meson-publish:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-
-    steps:     
-      - name: checkout repository
-        uses: actions/checkout@v4
-        
-      - name: setup python
-        uses: actions/setup-python@v5
-      
-      - name: meson build
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          meson-version: 1.5.1
-          ninja-version: 1.11.1.1
-          action: build
-  
-      - name: meson test
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          meson-version: 1.5.1
-          ninja-version: 1.11.1.1
-          action: test
-
-  meson-coverage:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-        
-      - name: setup python
-        uses: actions/setup-python@v5
-      
-      - name: meson build
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          meson-version: 1.5.1
-          ninja-version: 1.11.1.1
-          setup-options: -Db_coverage=true
-          action: build 
-  
-      - name: meson test
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          meson-version: 1.5.1
-          ninja-version: 1.11.1.1
-          setup-options: -Db_coverage=true
-          action: test
-
-      - name: generate code coverage report
-        uses: threeal/gcovr-action@v1.0.0
-        with:
-          coveralls-send: true
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,61 +0,0 @@
-/build/
-/build-*/
-*.pyc
-*.swp
-*.actual
-*.actual-rewrite
-*.process-output
-*.rewrite
-/bin/
-/libs/
-/doc/doxyfile
-/dist/
-/.cache/
-
-# MSVC project files:
-*.sln
-*.vcxproj
-*.filters
-*.user
-*.sdf
-*.opensdf
-*.suo
-
-# MSVC build files:
-*.lib
-*.obj
-*.tlog/
-*.pdb
-
-# CMake-generated files:
-CMakeFiles/
-/pkg-config/jsoncpp.pc
-jsoncpp_lib_static.dir/
-compile_commands.json
-
-# In case someone runs cmake in the root-dir:
-/CMakeCache.txt
-/Makefile
-/include/Makefile
-/src/Makefile
-/src/jsontestrunner/Makefile
-/src/jsontestrunner/jsontestrunner_exe
-/src/lib_json/Makefile
-/src/test_lib_json/Makefile
-/src/test_lib_json/jsoncpp_test
-*.a
-
-# eclipse project files
-.project
-.cproject
-/.settings/
-
-# DS_Store
-.DS_Store
-
-# temps
-/version
-
-# Bazel output paths
-/bazel-*
-/MODULE.bazel.lock

AUTHORS

@@ -1,115 +1 @@
 Baptiste Lepilleur <blep@users.sourceforge.net>
-
-Aaron Jacobs <aaronjjacobs@gmail.com>
-Aaron Jacobs <jacobsa@google.com>
-Adam Boseley <ABoseley@agjunction.com>
-Adam Boseley <adam.boseley@gmail.com>
-Aleksandr Derbenev <13alexac@gmail.com>
-Alexander Gazarov <DrMetallius@users.noreply.github.com>
-Alexander V. Brezgin <abrezgin@appliedtech.ru>
-Alexandr Brezgin <albrezgin@mail.ru>
-Alexey Kruchinin <alexey@mopals.com>
-Anton Indrawan <anton.indrawan@gmail.com>
-Baptiste Jonglez <git@bitsofnetworks.org>
-Baptiste Lepilleur <baptiste.lepilleur@gmail.com>
-Baruch Siach <baruch@tkos.co.il>
-Ben Boeckel <mathstuf@gmail.com>
-Benjamin Knecht <bknecht@logitech.com>
-Bernd Kuhls <bernd.kuhls@t-online.de>
-Billy Donahue <billy.donahue@gmail.com>
-Braden McDorman <bmcdorman@gmail.com>
-Brandon Myers <bmyers1788@gmail.com>
-Brendan Drew <brendan.drew@daqri.com>
-chason <cxchao802@gmail.com>
-chenguoping <chenguopingdota@163.com>
-Chris Gilling <cgilling@iparadigms.com>
-Christopher Dawes <christopher.dawes.1981@googlemail.com>
-Christopher Dunn <cdunn2001@gmail.com>
-Chuck Atkins <chuck.atkins@kitware.com>
-Cody P Schafer <dev@codyps.com>
-Connor Manning <connor@hobu.co>
-Cory Quammen <cory.quammen@kitware.com>
-Cristóvão B da Cruz e Silva <CrisXed@gmail.com>
-Daniel Krügler <daniel.kruegler@gmail.com>
-Dani-Hub <daniel.kruegler@googlemail.com>
-Dan Liu <gzliudan>
-datadiode <datadiode@users.noreply.github.com>
-datadiode <jochen.neubeck@vodafone.de>
-David Seifert <soap@gentoo.org>
-David West <david-west@idexx.com>
-dawesc <chris.dawes@eftlab.co.uk>
-Devin Jeanpierre <jeanpierreda@google.com>
-Dmitry Marakasov <amdmi3@amdmi3.ru>
-dominicpezzuto <dom@dompezzuto.com>
-Don Milham <dmilham@gmail.com>
-drgler <daniel.kruegler@gmail.com>
-ds283 <D.Seery@sussex.ac.uk>
-Egor Tensin <Egor.Tensin@gmail.com>
-eightnoteight <mr.eightnoteight@gmail.com>
-Evince <baneyue@gmail.com>
-filipjs <filipjs@users.noreply.github.com>
-findblar <ft@finbarr.ca>
-Florian Meier <florian.meier@koalo.de>
-Gaëtan Lehmann <gaetan.lehmann@gmail.com>
-Gaurav <g.gupta@samsung.com>
-Gergely Nagy <ngg@ngg.hu>
-Gida Pataki <gida.pataki@prezi.com>
-I3ck <buckmartin@buckmartin.de>
-Iñaki Baz Castillo <ibc@aliax.net>
-Jacco <jacco@geul.net>
-Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
-Jonas Platte <mail@jonasplatte.de>
-Jordan Bayles <bayles.jordan@gmail.com>
-Jörg Krause <joerg.krause@embedded.rocks>
-Keith Lea <keith@whamcitylights.com>
-Kevin Grant <kbradleygrant@gmail.com>
-Kirill V. Lyadvinsky <jia3ep@gmail.com>
-Kirill V. Lyadvinsky <mail@codeatcpp.com>
-Kobi Gurkan <kobigurk@gmail.com>
-Magnus Bjerke Vik <mbvett@gmail.com>
-Malay Shah <malays@users.sourceforge.net>
-Mara Kim <hacker.root@gmail.com>
-Marek Kotewicz <marek.kotewicz@gmail.com>
-Mark Lakata <mark@lakata.org>
-Mark Zeren <mzeren@vmware.com>
-Martin Buck <buckmartin@buckmartin.de>
-Martyn Gigg <martyn.gigg@gmail.com>
-Mattes D <github@xoft.cz>
-Matthias Loy <matthias.loy@hbm.com>
-Merlyn Morgan-Graham <kavika@gmail.com>
-Michael Shields <mshields@google.com>
-Michał Górny <mgorny@gentoo.org>
-Mike Naberezny <mike@naberezny.com>
-mloy <matthias.loy@googlemail.com>
-Motti <lanzkron@gmail.com>
-nnkur <nnkur@mail.ru>
-Omkar Wagh <owagh@owaghlinux.ny.tower-research.com>
-paulo <paulobrizolara@users.noreply.github.com>
-pavel.pimenov <pavel.pimenov@gmail.com>
-Paweł Bylica <chfast@gmail.com>
-Péricles Lopes Machado <pericles.raskolnikoff@gmail.com>
-Peter Spiess-Knafl <psk@autistici.org>
-pffang <pffang@vip.qq.com>
-Rémi Verschelde <remi@verschelde.fr>
-renu555 <renu.tyagi@samsung.com>
-Robert Dailey <rcdailey@gmail.com>
-Sam Clegg <sbc@chromium.org>
-selaselah <selah@outlook.com>
-Sergiy80 <sil2004@gmail.com>
-sergzub <sergzub@gmail.com>
-Stefan Schweter <stefan@schweter.it>
-Stefano Fiorentino <stefano.fiore84@gmail.com>
-Steffen Kieß <Steffen.Kiess@ipvs.uni-stuttgart.de>
-Steven Hahn <hahnse@ornl.gov>
-Stuart Eichert <stuart@fivemicro.com>
-SuperManitu <supermanitu@gmail.com>
-Techwolf <dring@g33kworld.net>
-Tengiz Sharafiev <btolfa+github@gmail.com>
-Tomasz Maciejewski <tmaciejewsk@gmail.com>
-Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-xiaoyur347 <xiaoyur347@gmail.com>
-ycqiu <429148848@qq.com>
-yiqiju <fred_ju@selinc.com>
-Yu Xiaolei <dreifachstein@gmail.com>
-
-Google Inc.

BUILD.bazel

@@ -1,37 +0,0 @@
-licenses(["unencumbered"])  # Public Domain or MIT
-
-exports_files(["LICENSE"])
-
-cc_library(
-    name = "jsoncpp",
-    srcs = [
-        "src/lib_json/json_reader.cpp",
-        "src/lib_json/json_tool.h",
-        "src/lib_json/json_value.cpp",
-        "src/lib_json/json_writer.cpp",
-    ],
-    hdrs = [
-        "include/json/allocator.h",
-        "include/json/assertions.h",
-        "include/json/config.h",
-        "include/json/json_features.h",
-        "include/json/forwards.h",
-        "include/json/json.h",
-        "include/json/reader.h",
-        "include/json/value.h",
-        "include/json/version.h",
-        "include/json/writer.h",
-    ],
-    copts = [
-        "-DJSON_USE_EXCEPTION=0",
-        "-DJSON_HAS_INT64",
-    ],
-    includes = ["include"],
-    visibility = ["//visibility:public"],
-    deps = [":private"],
-)
-
-cc_library(
-    name = "private",
-    textual_hdrs = ["src/lib_json/json_valueiterator.inl"],
-)

CMakeLists.txt

@@ -1,214 +0,0 @@
-# vim: et ts=4 sts=4 sw=4 tw=0
-
-# ==== Define cmake build policies that affect compilation and linkage default behaviors
-#
-# Set the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION string to the newest cmake version
-# policies that provide successful builds. By setting JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION
-# to a value greater than the oldest policies, all policies between
-# JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION and CMAKE_VERSION (used for this build)
-# are set to their NEW behavior, thereby suppressing policy warnings related to policies
-# between the JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION and CMAKE_VERSION.
-#
-# CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will
-# continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
-#
-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")
-set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")
-cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})
-if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")
-    #Set and use the newest available cmake policies that are validated to work
-    set(JSONCPP_CMAKE_POLICY_VERSION "${CMAKE_VERSION}")
-else()
-    set(JSONCPP_CMAKE_POLICY_VERSION "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")
-endif()
-cmake_policy(VERSION ${JSONCPP_CMAKE_POLICY_VERSION})
-if(POLICY CMP0091)
-    cmake_policy(SET CMP0091 NEW)
-endif()
-#
-# Now enumerate specific policies newer than JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION
-# that may need to be individually set to NEW/OLD
-#
-foreach(pnew "") # Currently Empty
-    if(POLICY ${pnew})
-        cmake_policy(SET ${pnew} NEW)
-    endif()
-endforeach()
-foreach(pold "") # Currently Empty
-    if(POLICY ${pold})
-        cmake_policy(SET ${pold} OLD)
-    endif()
-endforeach()
-
-# Build the library with C++11 standard support, independent from other including
-# software which may use a different CXX_STANDARD or CMAKE_CXX_STANDARD.
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# Ensure that CMAKE_BUILD_TYPE has a value specified for single configuration generators.
-if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_BUILD_TYPE Release CACHE STRING
-        "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Coverage.")
-endif()
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-project(jsoncpp
-        # Note: version must be updated in four places when doing a release. This
-        # annoying process ensures that amalgamate, CMake, and meson all report the
-        # correct version.
-        # 1. ./meson.build
-        # 2. ./include/json/version.h
-        # 3. ./CMakeLists.txt
-        # 4. ./MODULE.bazel
-        # IMPORTANT: also update the PROJECT_SOVERSION!!
-        VERSION 1.9.7 # <major>[.<minor>[.<patch>[.<tweak>]]]
-        LANGUAGES CXX)
-
-message(STATUS "JsonCpp Version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-set(PROJECT_SOVERSION 27)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInSourceBuilds.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInBuildInstalls.cmake)
-
-option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON)
-option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
-option(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF)
-option(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON)
-option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)
-option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON)
-option(JSONCPP_WITH_EXAMPLE "Compile JsonCpp example" OFF)
-option(JSONCPP_STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" OFF)
-option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." ON)
-option(BUILD_STATIC_LIBS "Build jsoncpp_lib as a static library." ON)
-option(BUILD_OBJECT_LIBS "Build jsoncpp_lib as a object library." ON)
-
-# Adhere to GNU filesystem layout conventions
-include(GNUInstallDirs)
-
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Archive output dir.")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Library output dir.")
-    set(CMAKE_PDB_OUTPUT_DIRECTORY     "${CMAKE_BINARY_DIR}/bin" CACHE PATH "PDB (MSVC debug symbol)output dir.")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Executable/dll output dir.")
-endif()
-
-include(CheckFunctionExists)
-check_function_exists(memset_s HAVE_MEMSET_S)
-if(HAVE_MEMSET_S)
-    add_definitions("-DHAVE_MEMSET_S=1")
-endif()
-
-if(JSONCPP_USE_SECURE_MEMORY)
-    add_definitions("-DJSONCPP_USE_SECURE_MEMORY=1")
-endif()
-
-configure_file("${PROJECT_SOURCE_DIR}/version.in"
-    "${PROJECT_BINARY_DIR}/version"
-    NEWLINE_STYLE UNIX)
-
-macro(use_compilation_warning_as_error)
-    if(MSVC)
-        # Only enabled in debug because some old versions of VS STL generate
-        # warnings when compiled in release configuration.
-        add_compile_options($<$<CONFIG:Debug>:/WX>)
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        add_compile_options(-Werror)
-        if(JSONCPP_WITH_STRICT_ISO)
-            add_compile_options(-pedantic-errors)
-        endif()
-    endif()
-endmacro()
-
-# Include our configuration header
-include_directories(${jsoncpp_SOURCE_DIR}/include)
-
-if(MSVC)
-    # Only enabled in debug because some old versions of VS STL generate
-    # unreachable code warning when compiled in release configuration.
-    add_compile_options($<$<CONFIG:Debug>:/W4>)
-    if (JSONCPP_STATIC_WINDOWS_RUNTIME)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    endif()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # using regular Clang or AppleClang
-    add_compile_options(-Wall -Wconversion -Wshadow)
-
-    if(JSONCPP_WITH_WARNING_AS_ERROR)
-        add_compile_options(-Werror=conversion -Werror=sign-compare)
-    endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    # using GCC
-    add_compile_options(-Wall -Wconversion -Wshadow -Wextra)
-    # not yet ready for -Wsign-conversion
-
-    if(JSONCPP_WITH_STRICT_ISO)
-        add_compile_options(-Wpedantic)
-    endif()
-    if(JSONCPP_WITH_WARNING_AS_ERROR)
-        add_compile_options(-Werror=conversion)
-    endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-    # using Intel compiler
-    add_compile_options(-Wall -Wconversion -Wshadow -Wextra)
-
-    if(JSONCPP_WITH_WARNING_AS_ERROR)
-        add_compile_options(-Werror=conversion)
-    elseif(JSONCPP_WITH_STRICT_ISO)
-        add_compile_options(-Wpedantic)
-    endif()
-endif()
-
-if(JSONCPP_WITH_WARNING_AS_ERROR)
-    use_compilation_warning_as_error()
-endif()
-
-if(JSONCPP_WITH_PKGCONFIG_SUPPORT)
-    include(JoinPaths)
-
-    join_paths(libdir_for_pc_file "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
-    join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
-
-    configure_file(
-        "pkg-config/jsoncpp.pc.in"
-        "pkg-config/jsoncpp.pc"
-        @ONLY)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkg-config/jsoncpp.pc"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-endif()
-
-if(JSONCPP_WITH_CMAKE_PACKAGE)
-    include(CMakePackageConfigHelpers)
-    install(EXPORT jsoncpp
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp
-        FILE        jsoncpp-targets.cmake)
-    configure_package_config_file(jsoncppConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfig.cmake
-        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp)
-
-    write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfigVersion.cmake"
-        VERSION ${PROJECT_VERSION}
-        COMPATIBILITY SameMajorVersion)
-    install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfig.cmake
-        ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp-namespaced-targets.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp)
-endif()
-
-if(JSONCPP_WITH_TESTS)
-    enable_testing()
-    include(CTest)
-endif()
-
-# Build the different applications
-add_subdirectory(src)
-
-#install the includes
-add_subdirectory(include)
-
-#install the example
-if(JSONCPP_WITH_EXAMPLE)
-    add_subdirectory(example)
-endif()

CONTRIBUTING.md

@@ -1,152 +0,0 @@
-# Contributing to JsonCpp
-
-## Building
-
-Both CMake and Meson tools are capable of generating a variety of build environments for you preferred development environment.
-Using cmake or meson you can generate an XCode, Visual Studio, Unix Makefile, Ninja, or other environment that fits your needs.
-
-An example of a common Meson/Ninja environment is described next.
-
-## Building and testing with Meson/Ninja
-Thanks to David Seifert (@SoapGentoo), we (the maintainers) now use
-[meson](http://mesonbuild.com/) and [ninja](https://ninja-build.org/) to build
-for debugging, as well as for continuous integration (see
-[`./.travis_scripts/meson_builder.sh`](./.travis_scripts/meson_builder.sh) ). Other systems may work, but minor
-things like version strings might break.
-
-First, install both meson (which requires Python3) and ninja.
-If you wish to install to a directory other than /usr/local, set an environment variable called DESTDIR with the desired path:
-    DESTDIR=/path/to/install/dir
-
-Then,
-```sh
-    cd jsoncpp/
-    BUILD_TYPE=debug
-    #BUILD_TYPE=release
-    LIB_TYPE=shared
-    #LIB_TYPE=static
-    meson --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . build-${LIB_TYPE}
-    ninja -v -C build-${LIB_TYPE}
-
-    ninja -C build-static/ test
-
-    # Or
-    #cd build-${LIB_TYPE}
-    #meson test --no-rebuild --print-errorlogs
-
-    sudo ninja install
-```
-
-## Building and testing with other build systems
-See https://github.com/open-source-parsers/jsoncpp/wiki/Building
-
-## Running the tests manually
-
-You need to run tests manually only if you are troubleshooting an issue.
-
-In the instructions below, replace `path/to/jsontest` with the path of the
-`jsontest` executable that was compiled on your platform.
-
-    cd test
-    # This will run the Reader/Writer tests
-    python runjsontests.py path/to/jsontest
-
-    # This will run the Reader/Writer tests, using JSONChecker test suite
-    # (http://www.json.org/JSON_checker/).
-    # Notes: not all tests pass: JsonCpp is too lenient (for example,
-    # it allows an integer to start with '0'). The goal is to improve
-    # strict mode parsing to get all tests to pass.
-    python runjsontests.py --with-json-checker path/to/jsontest
-
-    # This will run the unit tests (mostly Value)
-    python rununittests.py path/to/test_lib_json
-
-    # You can run the tests using valgrind:
-    python rununittests.py --valgrind path/to/test_lib_json
-
-## Building the documentation
-
-Run the Python script `doxybuild.py` from the top directory:
-
-    python doxybuild.py --doxygen=$(which doxygen) --open --with-dot
-
-See `doxybuild.py --help` for options.
-
-## Adding a reader/writer test
-
-To add a test, you need to create two files in test/data:
-
-* a `TESTNAME.json` file, that contains the input document in JSON format.
-* a `TESTNAME.expected` file, that contains a flattened representation of the
-  input document.
-
-The `TESTNAME.expected` file format is as follows:
-
-* Each line represents a JSON element of the element tree represented by the
-  input document.
-* Each line has two parts: the path to access the element separated from the
-  element value by `=`. Array and object values are always empty (i.e.
-  represented by either `[]` or `{}`).
-* Element path `.` represents the root element, and is used to separate object
-  members. `[N]` is used to specify the value of an array element at index `N`.
-
-See the examples `test_complex_01.json` and `test_complex_01.expected` to better understand element paths.
-
-## Understanding reader/writer test output
-
-When a test is run, output files are generated beside the input test files. Below is a short description of the content of each file:
-
-* `test_complex_01.json`: input JSON document.
-* `test_complex_01.expected`: flattened JSON element tree used to check if
-  parsing was corrected.
-* `test_complex_01.actual`: flattened JSON element tree produced by `jsontest`
-  from reading `test_complex_01.json`.
-* `test_complex_01.rewrite`: JSON document written by `jsontest` using the
-  `Json::Value` parsed from `test_complex_01.json` and serialized using
-  `Json::StyledWritter`.
-* `test_complex_01.actual-rewrite`: flattened JSON element tree produced by
-  `jsontest` from reading `test_complex_01.rewrite`.
-* `test_complex_01.process-output`: `jsontest` output, typically useful for
-  understanding parsing errors.
-
-## Versioning rules
-
-Consumers of this library require a strict approach to incrementing versioning of the JsonCpp library. Currently, we follow the below set of rules:
-
-* Any new public symbols require a minor version bump.
-* Any alteration or removal of public symbols requires a major version bump, including changing the size of a class. This is necessary for
-consumers to do dependency injection properly.
-
-## Preparing code for submission
-
-Generally, JsonCpp's style guide has been pretty relaxed, with the following common themes:
-
-* Variables and function names use lower camel case (E.g. parseValue or collectComments).
-* Class use camel case (e.g. OurReader)
-* Member variables have a trailing underscore
-* Prefer `nullptr` over `NULL`.
-* Passing by non-const reference is allowed.
-* Single statement if blocks may omit brackets.
-* Generally prefer less space over more space.
-
-For an example:
-
-```c++
-bool Reader::decodeNumber(Token& token) {
-  Value decoded;
-  if (!decodeNumber(token, decoded))
-    return false;
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-```
-
-Before submitting your code, ensure that you meet the versioning requirements above, follow the style guide of the file you are modifying (or the above rules for new files), and run clang format. Meson exposes clang format with the following command:
-```
-ninja -v -C build-${LIB_TYPE}/ clang-format
-```
-
-For convenience, you can also run the `reformat.sh` script located in the root directory.
-

CTestConfig.cmake

@@ -1,15 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-##
-## # The following are required to submit to the CDash dashboard:
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-
-set(CTEST_PROJECT_NAME "jsoncpp")
-set(CTEST_NIGHTLY_START_TIME "01:23:45 UTC")
-
-set(CTEST_DROP_METHOD "https")
-set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=jsoncpp")
-set(CTEST_DROP_SITE_CDASH TRUE)

LICENSE

@@ -1,55 +1 @@
-The JsonCpp library's source code, including accompanying documentation,
+The json-cpp library and this documentation are in Public Domain.
-tests and demonstration applications, are licensed under the following
-conditions...
-
-Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
-this software is released into the Public Domain.
-
-In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
-The JsonCpp Authors, and is released under the terms of the MIT License (see below).
-
-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
-Public Domain/MIT License conditions described here, as they choose.
-
-The MIT License is about as close to Public Domain as a license can get, and is
-described in clear, concise terms at:
-
-   http://en.wikipedia.org/wiki/MIT_License
-
-The full text of the MIT License follows:
-
-========================================================================
-Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-
-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.
-========================================================================
-(END LICENSE TEXT)
-
-The MIT license is compatible with both the GPL and commercial
-software, affording one all of the rights of Public Domain with the
-minor nuisance of being required to keep the above copyright notice
-and license text in the source code. Note also that by accepting the
-Public Domain "license" you can re-license your copy using whatever
-license you like.

MODULE.bazel

@@ -1,14 +0,0 @@
-module(
-    name = "jsoncpp",
-
-    # Note: version must be updated in four places when doing a release. This
-    # annoying process ensures that amalgamate, CMake, and meson all report the
-    # correct version.
-    # 1. /meson.build
-    # 2. /include/json/version.h
-    # 3. /CMakeLists.txt
-    # 4. /MODULE.bazel
-    # IMPORTANT: also update the SOVERSION!!
-    version = "1.9.7",
-    compatibility_level = 1,
-)

README.md

@@ -1,67 +0,0 @@
-# JsonCpp
-
-[![badge](https://img.shields.io/badge/conan.io-jsoncpp%2F1.8.0-green.svg?logo=data:image/png;base64%2CiVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAA1VBMVEUAAABhlctjlstkl8tlmMtlmMxlmcxmmcxnmsxpnMxpnM1qnc1sn85voM91oM11oc1xotB2oc56pNF6pNJ2ptJ8ptJ8ptN9ptN8p9N5qNJ9p9N9p9R8qtOBqdSAqtOAqtR%2BrNSCrNJ/rdWDrNWCsNWCsNaJs9eLs9iRvNuVvdyVv9yXwd2Zwt6axN6dxt%2Bfx%2BChyeGiyuGjyuCjyuGly%2BGlzOKmzOGozuKoz%2BKqz%2BOq0OOv1OWw1OWw1eWx1eWy1uay1%2Baz1%2Baz1%2Bez2Oe02Oe12ee22ujUGwH3AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfgBQkREyOxFIh/AAAAiklEQVQI12NgAAMbOwY4sLZ2NtQ1coVKWNvoc/Eq8XDr2wB5Ig62ekza9vaOqpK2TpoMzOxaFtwqZua2Bm4makIM7OzMAjoaCqYuxooSUqJALjs7o4yVpbowvzSUy87KqSwmxQfnsrPISyFzWeWAXCkpMaBVIC4bmCsOdgiUKwh3JojLgAQ4ZCE0AMm2D29tZwe6AAAAAElFTkSuQmCC)](https://bintray.com/theirix/conan-repo/jsoncpp%3Atheirix)
-[![badge](https://img.shields.io/badge/license-MIT-blue)](https://github.com/open-source-parsers/jsoncpp/blob/master/LICENSE)
-[![badge](https://img.shields.io/badge/document-doxygen-brightgreen)](http://open-source-parsers.github.io/jsoncpp-docs/doxygen/index.html)
-[![Coverage Status](https://coveralls.io/repos/github/open-source-parsers/jsoncpp/badge.svg?branch=master)](https://coveralls.io/github/open-source-parsers/jsoncpp?branch=master)
-
-
-[JSON][json-org] is a lightweight data-interchange format. It can represent
-numbers, strings, ordered sequences of values, and collections of name/value
-pairs.
-
-[json-org]: http://json.org/
-
-JsonCpp is a C++ library that allows manipulating JSON values, including
-serialization and deserialization to and from strings. It can also preserve
-existing comment in unserialization/serialization steps, making it a convenient
-format to store user input files.
-
-
-## Documentation
-
-[JsonCpp documentation][JsonCpp-documentation] is generated using [Doxygen][].
-
-[JsonCpp-documentation]: http://open-source-parsers.github.io/jsoncpp-docs/doxygen/index.html
-[Doxygen]: http://www.doxygen.org
-
-
-## A note on backward-compatibility
-
-* `1.y.z` is built with C++11.
-* `0.y.z` can be used with older compilers.
-* `00.11.z` can be used both in old and new compilers.
-* Major versions maintain binary-compatibility.
-
-### Special note
-The branch `00.11.z`is a new branch, its major version number `00` is to show that it is
-different from `0.y.z` and `1.y.z`, the main purpose of this branch is to make a balance
-between the other two branches. Thus, users can use some new features in this new branch
-that introduced in 1.y.z, but can hardly applied into 0.y.z.
-
-## Using JsonCpp in your project
-
-### The vcpkg dependency manager
-You can download and install JsonCpp using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
-
-    git clone https://github.com/Microsoft/vcpkg.git
-    cd vcpkg
-    ./bootstrap-vcpkg.sh
-    ./vcpkg integrate install
-    ./vcpkg install jsoncpp
-
-The JsonCpp port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
-
-### Amalgamated source
-https://github.com/open-source-parsers/jsoncpp/wiki/Amalgamated-(Possibly-outdated)
-
-### The Meson Build System
-If you are using the [Meson Build System](http://mesonbuild.com), then you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/jsoncpp), or simply use `meson wrap install jsoncpp`.
-
-### Other ways
-If you have trouble, see the [Wiki](https://github.com/open-source-parsers/jsoncpp/wiki), or post a question as an Issue.
-
-## License
-
-See the `LICENSE` file for details. In summary, JsonCpp is licensed under the
-MIT license, or public domain if desired and recognized in your jurisdiction.

README.txt

@@ -0,0 +1,117 @@
+* Introduction:
+  =============
+
+JSON (JavaScript Object Notation) is a lightweight data-interchange format. 
+It can represent integer, real number, string, an ordered sequence of 
+value, and a collection of name/value pairs.
+
+JsonCpp is a simple API to manipulate JSON value, handle serialization 
+and unserialization to string.
+
+It can also preserve existing comment in unserialization/serialization steps,
+making it a convenient format to store user input files.
+
+Unserialization parsing is user friendly and provides precise error reports.
+
+
+* Building/Testing:
+  =================
+
+JsonCpp uses Scons (http://www.scons.org) as a build system. Scons requires
+python to be installed (http://www.python.org).
+
+You download scons-local distribution from the following url:
+http://sourceforge.net/project/showfiles.php?group_id=30337&package_id=67375
+
+Unzip it in the directory where you found this README file. scons.py Should be 
+at the same level as README.
+
+python scons.py platform=PLTFRM [TARGET]
+where PLTFRM may be one of:
+	suncc Sun C++ (Solaris)
+	vacpp Visual Age C++ (AIX)
+	mingw 
+	msvc6 Microsoft Visual Studio 6 service pack 5-6
+	msvc70 Microsoft Visual Studio 2002
+	msvc71 Microsoft Visual Studio 2003
+	msvc80 Microsoft Visual Studio 2005
+	linux-gcc Gnu C++ (linux, also reported to work for Mac OS X)
+	
+adding platform is fairly simple. You need to change the Sconstruct file 
+to do so.
+	
+and TARGET may be:
+	check: build library and run unit tests.
+
+    
+* Running the test manually:
+  ==========================
+
+cd test
+# This will run the Reader/Writer tests
+python runjsontests.py "path to jsontest.exe"
+
+# This will run the Reader/Writer tests, using JSONChecker test suite
+# (http://www.json.org/JSON_checker/).
+# Notes: not all tests pass: JsonCpp is too lenient (for example,
+# it allows an integer to start with '0'). The goal is to improve
+# strict mode parsing to get all tests to pass.
+python runjsontests.py --with-json-checker "path to jsontest.exe"
+
+# This will run the unit tests (mostly Value)
+python rununittests.py "path to test_lib_json.exe"
+
+You can run the tests using valgrind:
+python rununittests.py --valgrind "path to test_lib_json.exe"
+
+
+* Building the documentation:
+  ===========================
+
+Run the python script doxybuild.py from the top directory:
+
+python doxybuild.py --open --with-dot
+
+See doxybuild.py --help for options. 
+
+
+* Adding a reader/writer test:
+  ============================
+
+To add a test, you need to create two files in test/data:
+- a TESTNAME.json file, that contains the input document in JSON format.
+- a TESTNAME.expected file, that contains a flatened representation of 
+  the input document.
+  
+TESTNAME.expected file format:
+- each line represents a JSON element of the element tree represented 
+  by the input document.
+- each line has two parts: the path to access the element separated from
+  the element value by '='. Array and object values are always empty 
+  (e.g. represented by either [] or {}).
+- element path: '.' represented the root element, and is used to separate 
+  object members. [N] is used to specify the value of an array element
+  at index N.
+See test_complex_01.json and test_complex_01.expected to better understand
+element path.
+
+
+* Understanding reader/writer test output:
+  ========================================
+
+When a test is run, output files are generated aside the input test files. 
+Below is a short description of the content of each file:
+
+- test_complex_01.json: input JSON document
+- test_complex_01.expected: flattened JSON element tree used to check if 
+    parsing was corrected.
+
+- test_complex_01.actual: flattened JSON element tree produced by 
+    jsontest.exe from reading test_complex_01.json
+- test_complex_01.rewrite: JSON document written by jsontest.exe using the
+    Json::Value parsed from test_complex_01.json and serialized using
+    Json::StyledWritter.
+- test_complex_01.actual-rewrite: flattened JSON element tree produced by 
+    jsontest.exe from reading test_complex_01.rewrite.
+test_complex_01.process-output: jsontest.exe output, typically useful to
+    understand parsing error.

SConstruct

@@ -0,0 +1,235 @@
+"""
+Notes: 
+- shared library support is buggy: it assumes that a static and dynamic library can be build from the same object files. This is not true on many platforms. For this reason it is only enabled on linux-gcc at the current time.
+
+To add a platform:
+- add its name in options allowed_values below
+- add tool initialization for this platform. Search for "if platform == 'suncc'" as an example.
+"""
+
+import os
+import os.path
+import sys
+
+JSONCPP_VERSION = open(File('#version').abspath,'rt').read().strip()
+DIST_DIR = '#dist'
+
+options = Variables()
+options.Add( EnumVariable('platform',
+                        'Platform (compiler/stl) used to build the project',
+                        'msvc71',
+                        allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 linux-gcc'.split(),
+                        ignorecase=2) )
+
+try:
+    platform = ARGUMENTS['platform']
+    if platform == 'linux-gcc':
+        CXX = 'g++' # not quite right, but env is not yet available.
+        import commands
+        version = commands.getoutput('%s -dumpversion' %CXX)
+        platform = 'linux-gcc-%s' %version
+        print "Using platform '%s'" %platform
+        LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
+        LD_LIBRARY_PATH = "%s:libs/%s" %(LD_LIBRARY_PATH, platform)
+        os.environ['LD_LIBRARY_PATH'] = LD_LIBRARY_PATH
+        print "LD_LIBRARY_PATH =", LD_LIBRARY_PATH
+except KeyError:
+    print 'You must specify a "platform"'
+    sys.exit(2)
+
+print "Building using PLATFORM =", platform
+
+rootbuild_dir = Dir('#buildscons')
+build_dir = os.path.join( '#buildscons', platform )
+bin_dir = os.path.join( '#bin', platform )
+lib_dir = os.path.join( '#libs', platform )
+sconsign_dir_path = Dir(build_dir).abspath
+sconsign_path = os.path.join( sconsign_dir_path, '.sconsign.dbm' )
+
+# Ensure build directory exist (SConsignFile fail otherwise!)
+if not os.path.exists( sconsign_dir_path ):
+    os.makedirs( sconsign_dir_path )
+
+# Store all dependencies signature in a database
+SConsignFile( sconsign_path )
+
+def make_environ_vars():
+	"""Returns a dictionnary with environment variable to use when compiling."""
+	# PATH is required to find the compiler
+	# TEMP is required for at least mingw
+	vars = {}
+	for name in ('PATH', 'TEMP', 'TMP'):
+		if name in os.environ:
+			vars[name] = os.environ[name]
+	return vars
+	
+
+env = Environment( ENV = make_environ_vars(),
+                   toolpath = ['scons-tools'],
+                   tools=[] ) #, tools=['default'] )
+
+if platform == 'suncc':
+    env.Tool( 'sunc++' )
+    env.Tool( 'sunlink' )
+    env.Tool( 'sunar' )
+    env.Append( CCFLAGS = ['-mt'] )
+elif platform == 'vacpp':
+    env.Tool( 'default' )
+    env.Tool( 'aixcc' )
+    env['CXX'] = 'xlC_r'   #scons does not pick-up the correct one !
+    # using xlC_r ensure multi-threading is enabled:
+    # http://publib.boulder.ibm.com/infocenter/pseries/index.jsp?topic=/com.ibm.vacpp7a.doc/compiler/ref/cuselect.htm
+    env.Append( CCFLAGS = '-qrtti=all',
+                LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning
+elif platform == 'msvc6':
+    env['MSVS_VERSION']='6.0'
+    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
+        env.Tool( tool )
+    env['CXXFLAGS']='-GR -GX /nologo /MT'
+elif platform == 'msvc70':
+    env['MSVS_VERSION']='7.0'
+    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
+        env.Tool( tool )
+    env['CXXFLAGS']='-GR -GX /nologo /MT'
+elif platform == 'msvc71':
+    env['MSVS_VERSION']='7.1'
+    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
+        env.Tool( tool )
+    env['CXXFLAGS']='-GR -GX /nologo /MT'
+elif platform == 'msvc80':
+    env['MSVS_VERSION']='8.0'
+    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
+        env.Tool( tool )
+    env['CXXFLAGS']='-GR -EHsc /nologo /MT'
+elif platform == 'mingw':
+    env.Tool( 'mingw' )
+    env.Append( CPPDEFINES=[ "WIN32", "NDEBUG", "_MT" ] )
+elif platform.startswith('linux-gcc'):
+    env.Tool( 'default' )
+    env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )
+    env['SHARED_LIB_ENABLED'] = True
+else:
+    print "UNSUPPORTED PLATFORM."
+    env.Exit(1)
+
+env.Tool('targz')
+env.Tool('srcdist')
+env.Tool('globtool')
+
+env.Append( CPPPATH = ['#include'],
+            LIBPATH = lib_dir )
+short_platform = platform
+if short_platform.startswith('msvc'):
+    short_platform = short_platform[2:]
+# Notes: on Windows you need to rebuild the source for each variant
+# Build script does not support that yet so we only build static libraries.
+# This also fails on AIX because both dynamic and static library ends with
+# extension .a.
+env['SHARED_LIB_ENABLED'] = env.get('SHARED_LIB_ENABLED', False)
+env['LIB_PLATFORM'] = short_platform
+env['LIB_LINK_TYPE'] = 'lib'    # static
+env['LIB_CRUNTIME'] = 'mt'
+env['LIB_NAME_SUFFIX'] = '${LIB_PLATFORM}_${LIB_LINK_TYPE}${LIB_CRUNTIME}'  # must match autolink naming convention
+env['JSONCPP_VERSION'] = JSONCPP_VERSION
+env['BUILD_DIR'] = env.Dir(build_dir)
+env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)
+env['DIST_DIR'] = DIST_DIR
+if 'TarGz' in env['BUILDERS']:
+	class SrcDistAdder:
+		def __init__( self, env ):
+			self.env = env
+		def __call__( self, *args, **kw ):
+			apply( self.env.SrcDist, (self.env['SRCDIST_TARGET'],) + args, kw )
+	env['SRCDIST_BUILDER'] = env.TarGz
+else: # If tarfile module is missing
+	class SrcDistAdder:
+		def __init__( self, env ):
+			pass
+		def __call__( self, *args, **kw ):
+			pass
+env['SRCDIST_ADD'] = SrcDistAdder( env )
+env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
+                      
+env_testing = env.Clone( )
+env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )
+
+def buildJSONExample( env, target_sources, target_name ):
+    env = env.Clone()
+    env.Append( CPPPATH = ['#'] )
+    exe = env.Program( target=target_name,
+                       source=target_sources )
+    env['SRCDIST_ADD']( source=[target_sources] )
+    global bin_dir
+    return env.Install( bin_dir, exe )
+
+def buildJSONTests( env, target_sources, target_name ):
+    jsontests_node = buildJSONExample( env, target_sources, target_name )
+    check_alias_target = env.Alias( 'check', jsontests_node, RunJSONTests( jsontests_node, jsontests_node ) )
+    env.AlwaysBuild( check_alias_target )
+
+def buildUnitTests( env, target_sources, target_name ):
+    jsontests_node = buildJSONExample( env, target_sources, target_name )
+    check_alias_target = env.Alias( 'check', jsontests_node, 
+                                    RunUnitTests( jsontests_node, jsontests_node ) )
+    env.AlwaysBuild( check_alias_target )
+
+def buildLibrary( env, target_sources, target_name ):
+    static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
+                                    source=target_sources )
+    global lib_dir
+    env.Install( lib_dir, static_lib )
+    if env['SHARED_LIB_ENABLED']:
+        shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
+                                        source=target_sources )
+        env.Install( lib_dir, shared_lib )
+    env['SRCDIST_ADD']( source=[target_sources] )
+
+Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' )
+
+def buildProjectInDirectory( target_directory ):
+    global build_dir
+    target_build_dir = os.path.join( build_dir, target_directory )
+    target = os.path.join( target_directory, 'sconscript' )
+    SConscript( target, build_dir=target_build_dir, duplicate=0 )
+    env['SRCDIST_ADD']( source=[target] )
+
+
+def runJSONTests_action( target, source = None, env = None ):
+    # Add test scripts to python path
+    jsontest_path = Dir( '#test' ).abspath
+    sys.path.insert( 0, jsontest_path )
+    data_path = os.path.join( jsontest_path, 'data' )
+    import runjsontests
+    return runjsontests.runAllTests( os.path.abspath(source[0].path), data_path )
+
+def runJSONTests_string( target, source = None, env = None ):
+    return 'RunJSONTests("%s")' % source[0]
+
+import SCons.Action
+ActionFactory = SCons.Action.ActionFactory
+RunJSONTests = ActionFactory(runJSONTests_action, runJSONTests_string )
+
+def runUnitTests_action( target, source = None, env = None ):
+    # Add test scripts to python path
+    jsontest_path = Dir( '#test' ).abspath
+    sys.path.insert( 0, jsontest_path )
+    import rununittests
+    return rununittests.runAllTests( os.path.abspath(source[0].path) )
+
+def runUnitTests_string( target, source = None, env = None ):
+    return 'RunUnitTests("%s")' % source[0]
+
+RunUnitTests = ActionFactory(runUnitTests_action, runUnitTests_string )
+
+env.Alias( 'check' )
+
+srcdist_cmd = env['SRCDIST_ADD']( source = """
+    AUTHORS README.txt SConstruct
+    """.split() )
+env.Alias( 'src-dist', srcdist_cmd )
+
+buildProjectInDirectory( 'src/jsontestrunner' )
+buildProjectInDirectory( 'src/lib_json' )
+buildProjectInDirectory( 'src/test_lib_json' )
+#print env.Dump()
+

SECURITY.md

@@ -1,17 +0,0 @@
-# Security Policy
-
-If you have discovered a security vulnerability in this project, please report it
-privately. **Do not disclose it as a public issue.** This gives us time to work with you
-to fix the issue before public exposure, reducing the chance that the exploit will be
-used before a patch is released.
-
-Please submit the report by filling out
-[this form](https://github.com/open-source-parsers/jsoncpp/security/advisories/new).
-
-Please provide the following information in your report:
-
-- A description of the vulnerability and its impact
-- How to reproduce the issue
-
-This project is maintained by volunteers on a reasonable-effort basis. As such,
-we ask that you give us 90 days to work on a fix before public exposure.

amalgamate.py

@@ -1,161 +0,0 @@
-#!/usr/bin/env python
-
-"""Amalgamate json-cpp library sources into a single source and header file.
-
-Works with python2.6+ and python3.4+.
-
-Example of invocation (must be invoked from json-cpp top directory):
-python amalgamate.py
-"""
-import os
-import os.path
-import sys
-
-INCLUDE_PATH = "include/json"
-SRC_PATH = "src/lib_json"
-
-class AmalgamationFile:
-    def __init__(self, top_dir):
-        self.top_dir = top_dir
-        self.blocks = []
-
-    def add_text(self, text):
-        if not text.endswith("\n"):
-            text += "\n"
-        self.blocks.append(text)
-
-    def add_file(self, relative_input_path, wrap_in_comment=False):
-        def add_marker(prefix):
-            self.add_text("")
-            self.add_text("// " + "/"*70)
-            self.add_text("// %s of content of file: %s" % (prefix, relative_input_path.replace("\\","/")))
-            self.add_text("// " + "/"*70)
-            self.add_text("")
-        add_marker("Beginning")
-        f = open(os.path.join(self.top_dir, relative_input_path), "rt")
-        content = f.read()
-        if wrap_in_comment:
-            content = "/*\n" + content + "\n*/"
-        self.add_text(content)
-        f.close()
-        add_marker("End")
-        self.add_text("\n\n\n\n")
-
-    def get_value(self):
-        return "".join(self.blocks).replace("\r\n","\n")
-
-    def write_to(self, output_path):
-        output_dir = os.path.dirname(output_path)
-        if output_dir and not os.path.isdir(output_dir):
-            os.makedirs(output_dir)
-        f = open(output_path, "wb")
-        f.write(str.encode(self.get_value(), 'UTF-8'))
-        f.close()
-
-def amalgamate_source(source_top_dir=None,
-                       target_source_path=None,
-                       header_include_path=None):
-    """Produces amalgamated source.
-       Parameters:
-           source_top_dir: top-directory
-           target_source_path: output .cpp path
-           header_include_path: generated header path relative to target_source_path.
-    """
-    print("Amalgamating header...")
-    header = AmalgamationFile(source_top_dir)
-    header.add_text("/// Json-cpp amalgamated header (https://github.com/open-source-parsers/jsoncpp/).")
-    header.add_text('/// It is intended to be used with #include "%s"' % header_include_path)
-    header.add_file("LICENSE", wrap_in_comment=True)
-    header.add_text("#ifndef JSON_AMALGAMATED_H_INCLUDED")
-    header.add_text("# define JSON_AMALGAMATED_H_INCLUDED")
-    header.add_text("/// If defined, indicates that the source file is amalgamated")
-    header.add_text("/// to prevent private header inclusion.")
-    header.add_text("#define JSON_IS_AMALGAMATION")
-    header.add_file(os.path.join(INCLUDE_PATH, "version.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "allocator.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "config.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "forwards.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "json_features.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "value.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "reader.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "writer.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "assertions.h"))
-    header.add_text("#endif //ifndef JSON_AMALGAMATED_H_INCLUDED")
-
-    target_header_path = os.path.join(os.path.dirname(target_source_path), header_include_path)
-    print("Writing amalgamated header to %r" % target_header_path)
-    header.write_to(target_header_path)
-
-    base, ext = os.path.splitext(header_include_path)
-    forward_header_include_path = base + "-forwards" + ext
-    print("Amalgamating forward header...")
-    header = AmalgamationFile(source_top_dir)
-    header.add_text("/// Json-cpp amalgamated forward header (https://github.com/open-source-parsers/jsoncpp/).")
-    header.add_text('/// It is intended to be used with #include "%s"' % forward_header_include_path)
-    header.add_text("/// This header provides forward declaration for all JsonCpp types.")
-    header.add_file("LICENSE", wrap_in_comment=True)
-    header.add_text("#ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED")
-    header.add_text("# define JSON_FORWARD_AMALGAMATED_H_INCLUDED")
-    header.add_text("/// If defined, indicates that the source file is amalgamated")
-    header.add_text("/// to prevent private header inclusion.")
-    header.add_text("#define JSON_IS_AMALGAMATION")
-    header.add_file(os.path.join(INCLUDE_PATH, "version.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "allocator.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "config.h"))
-    header.add_file(os.path.join(INCLUDE_PATH, "forwards.h"))
-    header.add_text("#endif //ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED")
-
-    target_forward_header_path = os.path.join(os.path.dirname(target_source_path),
-                                               forward_header_include_path)
-    print("Writing amalgamated forward header to %r" % target_forward_header_path)
-    header.write_to(target_forward_header_path)
-
-    print("Amalgamating source...")
-    source = AmalgamationFile(source_top_dir)
-    source.add_text("/// Json-cpp amalgamated source (https://github.com/open-source-parsers/jsoncpp/).")
-    source.add_text('/// It is intended to be used with #include "%s"' % header_include_path)
-    source.add_file("LICENSE", wrap_in_comment=True)
-    source.add_text("")
-    source.add_text('#include "%s"' % header_include_path)
-    source.add_text("""
-#ifndef JSON_IS_AMALGAMATION
-#error "Compile with -I PATH_TO_JSON_DIRECTORY"
-#endif
-""")
-    source.add_text("")
-    source.add_file(os.path.join(SRC_PATH, "json_tool.h"))
-    source.add_file(os.path.join(SRC_PATH, "json_reader.cpp"))
-    source.add_file(os.path.join(SRC_PATH, "json_valueiterator.inl"))
-    source.add_file(os.path.join(SRC_PATH, "json_value.cpp"))
-    source.add_file(os.path.join(SRC_PATH, "json_writer.cpp"))
-
-    print("Writing amalgamated source to %r" % target_source_path)
-    source.write_to(target_source_path)
-
-def main():
-    usage = """%prog [options]
-Generate a single amalgamated source and header file from the sources.
-"""
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = False
-    parser.add_option("-s", "--source", dest="target_source_path", action="store", default="dist/jsoncpp.cpp",
-        help="""Output .cpp source path. [Default: %default]""")
-    parser.add_option("-i", "--include", dest="header_include_path", action="store", default="json/json.h",
-        help="""Header include path. Used to include the header from the amalgamated source file. [Default: %default]""")
-    parser.add_option("-t", "--top-dir", dest="top_dir", action="store", default=os.getcwd(),
-        help="""Source top-directory. [Default: %default]""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-
-    msg = amalgamate_source(source_top_dir=options.top_dir,
-                             target_source_path=options.target_source_path,
-                             header_include_path=options.header_include_path)
-    if msg:
-        sys.stderr.write(msg + "\n")
-        sys.exit(1)
-    else:
-        print("Source successfully amalgamated")
-
-if __name__ == "__main__":
-    main()

appveyor.yml

@@ -1,37 +0,0 @@
-clone_folder: c:\projects\jsoncpp
-
-environment:
-
-  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_GENERATOR: Visual Studio 14 2015
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_GENERATOR: Visual Studio 14 2015 Win64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: Visual Studio 15 2017
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: Visual Studio 15 2017 Win64
-
-build_script:
-  - cmake --version
-  # The build script starts in root.
-  - set JSONCPP_FOLDER=%cd%
-  - set JSONCPP_BUILD_FOLDER=%JSONCPP_FOLDER%\build\release
-  - mkdir -p %JSONCPP_BUILD_FOLDER%
-  - cd %JSONCPP_BUILD_FOLDER%
-  - cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX:PATH=%CD:\=/%/install -DBUILD_SHARED_LIBS:BOOL=ON %JSONCPP_FOLDER%
-  # Use ctest to make a dashboard build:
-  # - ctest -D Experimental(Start|Update|Configure|Build|Test|Coverage|MemCheck|Submit)
-  # NOTE: Testing on windows is not yet finished:
-  # - ctest -C Release -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
-  - ctest -C Release -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalSubmit
-  # Final step is to verify that installation succeeds
-  - cmake --build . --config Release --target install
-
-deploy:
-    provider: GitHub
-    auth_token:
-        secure: K2Tp1q8pIZ7rs0Ot24ZMWuwr12Ev6Tc6QkhMjGQxoQG3ng1pXtgPasiJ45IDXGdg
-    on:
-        branch: master
-        appveyor_repo_tag: true

cmake/JoinPaths.cmake

@@ -1,23 +0,0 @@
-# This module provides a function for joining paths
-# known from most languages
-#
-# SPDX-License-Identifier: (MIT OR CC0-1.0)
-# Copyright 2020 Jan Tojnar
-# https://github.com/jtojnar/cmake-snips
-#
-# Modelled after Python’s os.path.join
-# https://docs.python.org/3.7/library/os.path.html#os.path.join
-# Windows not supported
-function(join_paths joined_path first_path_segment)
-    set(temp_path "${first_path_segment}")
-    foreach(current_segment IN LISTS ARGN)
-        if(NOT ("${current_segment}" STREQUAL ""))
-            if(IS_ABSOLUTE "${current_segment}")
-                set(temp_path "${current_segment}")
-            else()
-                set(temp_path "${temp_path}/${current_segment}")
-            endif()
-        endif()
-    endforeach()
-    set(${joined_path} "${temp_path}" PARENT_SCOPE)
-endfunction()

dev.makefile

@@ -1,37 +0,0 @@
-# This is only for jsoncpp developers/contributors.
-# We use this to sign releases, generate documentation, etc.
-VER?=$(shell cat version)
-
-default:
-	@echo "VER=${VER}"
-update-version:
-	perl get_version.pl meson.build >| version
-sign: jsoncpp-${VER}.tar.gz
-	gpg --armor --detach-sign $<
-	gpg --verify $<.asc
-	# Then upload .asc to the release.
-jsoncpp-%.tar.gz:
-	curl https://github.com/open-source-parsers/jsoncpp/archive/$*.tar.gz -o $@
-dox:
-	python doxybuild.py --doxygen=$$(which doxygen) --in doc/web_doxyfile.in
-	rsync -va -c --delete dist/doxygen/jsoncpp-api-html-${VER}/ ../jsoncpp-docs/doxygen/
-	# Then 'git add -A' and 'git push' in jsoncpp-docs.
-build:
-	mkdir -p build/debug
-	cd build/debug; cmake -DCMAKE_BUILD_TYPE=debug -DBUILD_SHARED_LIBS=ON -G "Unix Makefiles" ../..
-	make -C build/debug
-
-# Currently, this depends on include/json/version.h generated
-# by cmake.
-test-amalgamate:
-	python2.7 amalgamate.py
-	python3.4 amalgamate.py
-	cd dist; gcc -I. -c jsoncpp.cpp
-
-valgrind:
-	valgrind --error-exitcode=42 --leak-check=full ./build/debug/src/test_lib_json/jsoncpp_test
-
-clean:
-	\rm -rf *.gz *.asc dist/
-
-.PHONY: build

devtools/__init__.py

@@ -1,6 +1 @@
-# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors
-# Distributed under MIT license, or public domain if desired and
-# recognized in your jurisdiction.
-# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 # module

devtools/agent_vmw7.json

@@ -1,33 +0,0 @@
-{
-    "cmake_variants" : [
-        {"name": "generator",
-         "generators": [
-            {"generator": [
-                "Visual Studio 7 .NET 2003",
-                "Visual Studio 9 2008",
-                "Visual Studio 9 2008 Win64",
-                "Visual Studio 10",
-                "Visual Studio 10 Win64",
-                "Visual Studio 11",
-                "Visual Studio 11 Win64"
-                ]
-            },
-            {"generator": ["MinGW Makefiles"],
-             "env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}]
-            }
-         ]
-        },
-        {"name": "shared_dll",
-         "variables": [
-            ["BUILD_SHARED_LIBS=true"],
-            ["BUILD_SHARED_LIBS=false"]
-          ]
-        },
-        {"name": "build_type",
-         "build_types": [
-            "debug",
-            "release"
-            ]
-        }
-    ]
-}

devtools/agent_vmxp.json

@@ -1,26 +0,0 @@
-{
-    "cmake_variants" : [
-        {"name": "generator",
-         "generators": [
-            {"generator": [
-                "Visual Studio 6",
-                "Visual Studio 7",
-                "Visual Studio 8 2005"
-                ]
-            }
-         ]
-        },
-        {"name": "shared_dll",
-         "variables": [
-            ["BUILD_SHARED_LIBS=true"],
-            ["BUILD_SHARED_LIBS=false"]
-          ]
-        },
-        {"name": "build_type",
-         "build_types": [
-            "debug",
-            "release"
-            ]
-        }
-    ]
-}

devtools/antglob.py

@@ -1,11 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
-# Copyright 2009 Baptiste Lepilleur and The JsonCpp Authors
+# Baptiste Lepilleur, 2009
-# Distributed under MIT license, or public domain if desired and
-# recognized in your jurisdiction.
-# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-from __future__ import print_function
 from dircache import listdir
 import re
 import fnmatch
@@ -57,9 +53,9 @@ LINKS = DIR_LINK | FILE_LINK
 ALL_NO_LINK = DIR | FILE
 ALL = DIR | FILE | LINKS
 
-_ANT_RE = re.compile(r'(/\*\*/)|(\*\*/)|(/\*\*)|(\*)|(/)|([^\*/]*)')
+_ANT_RE = re.compile( r'(/\*\*/)|(\*\*/)|(/\*\*)|(\*)|(/)|([^\*/]*)' )
 
-def ant_pattern_to_re(ant_pattern):
+def ant_pattern_to_re( ant_pattern ):
     """Generates a regular expression from the ant pattern.
     Matching convention:
     **/a: match 'a', 'dir/a', 'dir1/dir2/a'
@@ -68,30 +64,30 @@ def ant_pattern_to_re(ant_pattern):
     """
     rex = ['^']
     next_pos = 0
-    sep_rex = r'(?:/|%s)' % re.escape(os.path.sep)
+    sep_rex = r'(?:/|%s)' % re.escape( os.path.sep )
 ##    print 'Converting', ant_pattern
-    for match in _ANT_RE.finditer(ant_pattern):
+    for match in _ANT_RE.finditer( ant_pattern ):
 ##        print 'Matched', match.group()
 ##        print match.start(0), next_pos
         if match.start(0) != next_pos:
-            raise ValueError("Invalid ant pattern")
+            raise ValueError( "Invalid ant pattern" )
         if match.group(1): # /**/
-            rex.append(sep_rex + '(?:.*%s)?' % sep_rex)
+            rex.append( sep_rex + '(?:.*%s)?' % sep_rex )
         elif match.group(2): # **/
-            rex.append('(?:.*%s)?' % sep_rex)
+            rex.append( '(?:.*%s)?' % sep_rex )
         elif match.group(3): # /**
-            rex.append(sep_rex + '.*')
+            rex.append( sep_rex + '.*' )
         elif match.group(4): # *
-            rex.append('[^/%s]*' % re.escape(os.path.sep))
+            rex.append( '[^/%s]*' % re.escape(os.path.sep) )
         elif match.group(5): # /
-            rex.append(sep_rex)
+            rex.append( sep_rex )
         else: # somepath
-            rex.append(re.escape(match.group(6)))
+            rex.append( re.escape(match.group(6)) )
         next_pos = match.end()
     rex.append('$')
-    return re.compile(''.join(rex))
+    return re.compile( ''.join( rex ) )
 
-def _as_list(l):
+def _as_list( l ):
     if isinstance(l, basestring):
         return l.split()
     return l
@@ -108,37 +104,37 @@ def glob(dir_path,
     dir_path = dir_path.replace('/',os.path.sep)
     entry_type_filter = entry_type
 
-    def is_pruned_dir(dir_name):
+    def is_pruned_dir( dir_name ):
         for pattern in prune_dirs:
-            if fnmatch.fnmatch(dir_name, pattern):
+            if fnmatch.fnmatch( dir_name, pattern ):
                 return True
         return False
 
-    def apply_filter(full_path, filter_rexs):
+    def apply_filter( full_path, filter_rexs ):
         """Return True if at least one of the filter regular expression match full_path."""
         for rex in filter_rexs:
-            if rex.match(full_path):
+            if rex.match( full_path ):
                 return True
         return False
 
-    def glob_impl(root_dir_path):
+    def glob_impl( root_dir_path ):
         child_dirs = [root_dir_path]
         while child_dirs:
             dir_path = child_dirs.pop()
-            for entry in listdir(dir_path):
+            for entry in listdir( dir_path ):
-                full_path = os.path.join(dir_path, entry)
+                full_path = os.path.join( dir_path, entry )
 ##                print 'Testing:', full_path,
-                is_dir = os.path.isdir(full_path)
+                is_dir = os.path.isdir( full_path )
-                if is_dir and not is_pruned_dir(entry): # explore child directory ?
+                if is_dir and not is_pruned_dir( entry ): # explore child directory ?
 ##                    print '===> marked for recursion',
-                    child_dirs.append(full_path)
+                    child_dirs.append( full_path )
-                included = apply_filter(full_path, include_filter)
+                included = apply_filter( full_path, include_filter )
-                rejected = apply_filter(full_path, exclude_filter)
+                rejected = apply_filter( full_path, exclude_filter )
                 if not included or rejected: # do not include entry ?
 ##                    print '=> not included or rejected'
                     continue
-                link = os.path.islink(full_path)
+                link = os.path.islink( full_path )
-                is_file = os.path.isfile(full_path)
+                is_file = os.path.isfile( full_path )
                 if not is_file and not is_dir:
 ##                    print '=> unknown entry type'
                     continue
@@ -149,57 +145,57 @@ def glob(dir_path,
 ##                print '=> type: %d' % entry_type, 
                 if (entry_type & entry_type_filter) != 0:
 ##                    print ' => KEEP'
-                    yield os.path.join(dir_path, entry)
+                    yield os.path.join( dir_path, entry )
 ##                else:
 ##                    print ' => TYPE REJECTED'
-    return list(glob_impl(dir_path))
+    return list( glob_impl( dir_path ) )
 
 
 if __name__ == "__main__":
     import unittest
 
     class AntPatternToRETest(unittest.TestCase):
-##        def test_conversion(self):
+##        def test_conversion( self ):
-##            self.assertEqual('^somepath$', ant_pattern_to_re('somepath').pattern)
+##            self.assertEqual( '^somepath$', ant_pattern_to_re( 'somepath' ).pattern )
 
-        def test_matching(self):
+        def test_matching( self ):
-            test_cases = [ ('path',
+            test_cases = [ ( 'path',
                              ['path'],
-                             ['somepath', 'pathsuffix', '/path', '/path']),
+                             ['somepath', 'pathsuffix', '/path', '/path'] ),
-                           ('*.py',
+                           ( '*.py',
                              ['source.py', 'source.ext.py', '.py'],
-                             ['path/source.py', '/.py', 'dir.py/z', 'z.pyc', 'z.c']),
+                             ['path/source.py', '/.py', 'dir.py/z', 'z.pyc', 'z.c'] ),
-                           ('**/path',
+                           ( '**/path',
                              ['path', '/path', '/a/path', 'c:/a/path', '/a/b/path', '//a/path', '/a/path/b/path'],
-                             ['path/', 'a/path/b', 'dir.py/z', 'somepath', 'pathsuffix', 'a/somepath']),
+                             ['path/', 'a/path/b', 'dir.py/z', 'somepath', 'pathsuffix', 'a/somepath'] ),
-                           ('path/**',
+                           ( 'path/**',
                              ['path/a', 'path/path/a', 'path//'],
-                             ['path', 'somepath/a', 'a/path', 'a/path/a', 'pathsuffix/a']),
+                             ['path', 'somepath/a', 'a/path', 'a/path/a', 'pathsuffix/a'] ),
-                           ('/**/path',
+                           ( '/**/path',
                              ['/path', '/a/path', '/a/b/path/path', '/path/path'],
-                             ['path', 'path/', 'a/path', '/pathsuffix', '/somepath']),
+                             ['path', 'path/', 'a/path', '/pathsuffix', '/somepath'] ),
-                           ('a/b',
+                           ( 'a/b',
                              ['a/b'],
-                             ['somea/b', 'a/bsuffix', 'a/b/c']),
+                             ['somea/b', 'a/bsuffix', 'a/b/c'] ),
-                           ('**/*.py',
+                           ( '**/*.py',
                              ['script.py', 'src/script.py', 'a/b/script.py', '/a/b/script.py'],
-                             ['script.pyc', 'script.pyo', 'a.py/b']),
+                             ['script.pyc', 'script.pyo', 'a.py/b'] ),
-                           ('src/**/*.py',
+                           ( 'src/**/*.py',
                              ['src/a.py', 'src/dir/a.py'],
-                             ['a/src/a.py', '/src/a.py']),
+                             ['a/src/a.py', '/src/a.py'] ),
                            ]
             for ant_pattern, accepted_matches, rejected_matches in list(test_cases):
-                def local_path(paths):
+                def local_path( paths ):
                     return [ p.replace('/',os.path.sep) for p in paths ]
-                test_cases.append((ant_pattern, local_path(accepted_matches), local_path(rejected_matches)))
+                test_cases.append( (ant_pattern, local_path(accepted_matches), local_path( rejected_matches )) )
             for ant_pattern, accepted_matches, rejected_matches in test_cases:
-                rex = ant_pattern_to_re(ant_pattern)
+                rex = ant_pattern_to_re( ant_pattern )
-                print('ant_pattern:', ant_pattern, ' => ', rex.pattern)
+                print 'ant_pattern:', ant_pattern, ' => ', rex.pattern
                 for accepted_match in accepted_matches:
-                    print('Accepted?:', accepted_match)
+                    print 'Accepted?:', accepted_match
-                    self.assertTrue(rex.match(accepted_match) is not None)
+                    self.assert_( rex.match( accepted_match ) is not None )
                 for rejected_match in rejected_matches:
-                    print('Rejected?:', rejected_match)
+                    print 'Rejected?:', rejected_match
-                    self.assertTrue(rex.match(rejected_match) is None)
+                    self.assert_( rex.match( rejected_match ) is None )
 
     unittest.main()

devtools/batchbuild.py

@@ -1,278 +0,0 @@
-from __future__ import print_function
-import collections
-import itertools
-import json
-import os
-import os.path
-import re
-import shutil
-import string
-import subprocess
-import sys
-import html
-
-class BuildDesc:
-    def __init__(self, prepend_envs=None, variables=None, build_type=None, generator=None):
-        self.prepend_envs = prepend_envs or [] # [ { "var": "value" } ]
-        self.variables = variables or []
-        self.build_type = build_type
-        self.generator = generator
-
-    def merged_with(self, build_desc):
-        """Returns a new BuildDesc by merging field content.
-           Prefer build_desc fields to self fields for single valued field.
-        """
-        return BuildDesc(self.prepend_envs + build_desc.prepend_envs,
-                          self.variables + build_desc.variables,
-                          build_desc.build_type or self.build_type,
-                          build_desc.generator or self.generator)
-
-    def env(self):
-        environ = os.environ.copy()
-        for values_by_name in self.prepend_envs:
-            for var, value in list(values_by_name.items()):
-                var = var.upper()
-                if type(value) is unicode:
-                    value = value.encode(sys.getdefaultencoding())
-                if var in environ:
-                    environ[var] = value + os.pathsep + environ[var]
-                else:
-                    environ[var] = value
-        return environ
-
-    def cmake_args(self):
-        args = ["-D%s" % var for var in self.variables]
-        # skip build type for Visual Studio solution as it cause warning
-        if self.build_type and 'Visual' not in self.generator:
-            args.append("-DCMAKE_BUILD_TYPE=%s" % self.build_type)
-        if self.generator:
-            args.extend(['-G', self.generator])
-        return args
-
-    def __repr__(self):
-        return "BuildDesc(%s, build_type=%s)" %  (" ".join(self.cmake_args()), self.build_type)
-
-class BuildData:
-    def __init__(self, desc, work_dir, source_dir):
-        self.desc = desc
-        self.work_dir = work_dir
-        self.source_dir = source_dir
-        self.cmake_log_path = os.path.join(work_dir, 'batchbuild_cmake.log')
-        self.build_log_path = os.path.join(work_dir, 'batchbuild_build.log')
-        self.cmake_succeeded = False
-        self.build_succeeded = False
-
-    def execute_build(self):
-        print('Build %s' % self.desc)
-        self._make_new_work_dir()
-        self.cmake_succeeded = self._generate_makefiles()
-        if self.cmake_succeeded:
-            self.build_succeeded = self._build_using_makefiles()
-        return self.build_succeeded
-
-    def _generate_makefiles(self):
-        print('  Generating makefiles: ', end=' ')
-        cmd = ['cmake'] + self.desc.cmake_args() + [os.path.abspath(self.source_dir)]
-        succeeded = self._execute_build_subprocess(cmd, self.desc.env(), self.cmake_log_path)
-        print('done' if succeeded else 'FAILED')
-        return succeeded
-
-    def _build_using_makefiles(self):
-        print('  Building:', end=' ')
-        cmd = ['cmake', '--build', self.work_dir]
-        if self.desc.build_type:
-            cmd += ['--config', self.desc.build_type]
-        succeeded = self._execute_build_subprocess(cmd, self.desc.env(), self.build_log_path)
-        print('done' if succeeded else 'FAILED')
-        return succeeded
-
-    def _execute_build_subprocess(self, cmd, env, log_path):
-        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=self.work_dir,
-                                    env=env)
-        stdout, _ = process.communicate()
-        succeeded = (process.returncode == 0)
-        with open(log_path, 'wb') as flog:
-            log = ' '.join(cmd) + '\n' + stdout + '\nExit code: %r\n' % process.returncode
-            flog.write(fix_eol(log))
-        return succeeded
-
-    def _make_new_work_dir(self):
-        if os.path.isdir(self.work_dir):
-            print('  Removing work directory', self.work_dir)
-            shutil.rmtree(self.work_dir, ignore_errors=True)
-        if not os.path.isdir(self.work_dir):
-            os.makedirs(self.work_dir)
-
-def fix_eol(stdout):
-    """Fixes wrong EOL produced by cmake --build on Windows (\r\r\n instead of \r\n).
-    """
-    return re.sub('\r*\n', os.linesep, stdout)
-
-def load_build_variants_from_config(config_path):
-    with open(config_path, 'rb') as fconfig:
-        data = json.load(fconfig)
-    variants = data[ 'cmake_variants' ]
-    build_descs_by_axis = collections.defaultdict(list)
-    for axis in variants:
-        axis_name = axis["name"]
-        build_descs = []
-        if "generators" in axis:
-            for generator_data in axis["generators"]:
-                for generator in generator_data["generator"]:
-                    build_desc = BuildDesc(generator=generator,
-                                            prepend_envs=generator_data.get("env_prepend"))
-                    build_descs.append(build_desc)
-        elif "variables" in axis:
-            for variables in axis["variables"]:
-                build_desc = BuildDesc(variables=variables)
-                build_descs.append(build_desc)
-        elif "build_types" in axis:
-            for build_type in axis["build_types"]:
-                build_desc = BuildDesc(build_type=build_type)
-                build_descs.append(build_desc)
-        build_descs_by_axis[axis_name].extend(build_descs)
-    return build_descs_by_axis
-
-def generate_build_variants(build_descs_by_axis):
-    """Returns a list of BuildDesc generated for the partial BuildDesc for each axis."""
-    axis_names = list(build_descs_by_axis.keys())
-    build_descs = []
-    for axis_name, axis_build_descs in list(build_descs_by_axis.items()):
-        if len(build_descs):
-            # for each existing build_desc and each axis build desc, create a new build_desc
-            new_build_descs = []
-            for prototype_build_desc, axis_build_desc in itertools.product(build_descs, axis_build_descs):
-                new_build_descs.append(prototype_build_desc.merged_with(axis_build_desc))
-            build_descs = new_build_descs
-        else:
-            build_descs = axis_build_descs
-    return build_descs
-
-HTML_TEMPLATE = string.Template('''<html>
-<head>
-    <title>$title</title>
-    <style type="text/css">
-    td.failed {background-color:#f08080;}
-    td.ok {background-color:#c0eec0;}
-    </style>
-</head>
-<body>
-<table border="1">
-<thead>
-    <tr>
-        <th>Variables</th>
-        $th_vars
-    </tr>
-    <tr>
-        <th>Build type</th>
-        $th_build_types
-    </tr>
-</thead>
-<tbody>
-$tr_builds
-</tbody>
-</table>
-</body></html>''')
-
-def generate_html_report(html_report_path, builds):
-    report_dir = os.path.dirname(html_report_path)
-    # Vertical axis: generator
-    # Horizontal: variables, then build_type
-    builds_by_generator = collections.defaultdict(list)
-    variables = set()
-    build_types_by_variable = collections.defaultdict(set)
-    build_by_pos_key = {} # { (generator, var_key, build_type): build }
-    for build in builds:
-        builds_by_generator[build.desc.generator].append(build)
-        var_key = tuple(sorted(build.desc.variables))
-        variables.add(var_key)
-        build_types_by_variable[var_key].add(build.desc.build_type)
-        pos_key = (build.desc.generator, var_key, build.desc.build_type)
-        build_by_pos_key[pos_key] = build
-    variables = sorted(variables)
-    th_vars = []
-    th_build_types = []
-    for variable in variables:
-        build_types = sorted(build_types_by_variable[variable])
-        nb_build_type = len(build_types_by_variable[variable])
-        th_vars.append('<th colspan="%d">%s</th>' % (nb_build_type, html.escape(' '.join(variable))))
-        for build_type in build_types:
-            th_build_types.append('<th>%s</th>' % html.escape(build_type))
-    tr_builds = []
-    for generator in sorted(builds_by_generator):
-        tds = [ '<td>%s</td>\n' % html.escape(generator) ]
-        for variable in variables:
-            build_types = sorted(build_types_by_variable[variable])
-            for build_type in build_types:
-                pos_key = (generator, variable, build_type)
-                build = build_by_pos_key.get(pos_key)
-                if build:
-                    cmake_status = 'ok' if build.cmake_succeeded else 'FAILED'
-                    build_status = 'ok' if build.build_succeeded else 'FAILED'
-                    cmake_log_url = os.path.relpath(build.cmake_log_path, report_dir)
-                    build_log_url = os.path.relpath(build.build_log_path, report_dir)
-                    td = '<td class="%s"><a href="%s" class="%s">CMake: %s</a>' % (                        build_status.lower(), cmake_log_url, cmake_status.lower(), cmake_status)
-                    if build.cmake_succeeded:
-                        td += '<br><a href="%s" class="%s">Build: %s</a>' % (                            build_log_url, build_status.lower(), build_status)
-                    td += '</td>'
-                else:
-                    td = '<td></td>'
-                tds.append(td)
-        tr_builds.append('<tr>%s</tr>' % '\n'.join(tds))
-    html = HTML_TEMPLATE.substitute(        title='Batch build report',
-        th_vars=' '.join(th_vars),
-        th_build_types=' '.join(th_build_types),
-        tr_builds='\n'.join(tr_builds))
-    with open(html_report_path, 'wt') as fhtml:
-        fhtml.write(html)
-    print('HTML report generated in:', html_report_path)
-
-def main():
-    usage = r"""%prog WORK_DIR SOURCE_DIR CONFIG_JSON_PATH [CONFIG2_JSON_PATH...]
-Build a given CMake based project located in SOURCE_DIR with multiple generators/options.dry_run
-as described in CONFIG_JSON_PATH building in WORK_DIR.
-
-Example of call:
-python devtools\batchbuild.py e:\buildbots\jsoncpp\build . devtools\agent_vmw7.json
-"""
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = True
-#    parser.add_option('-v', '--verbose', dest="verbose", action='store_true',
-#        help="""Be verbose.""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-    if len(args) < 3:
-        parser.error("Missing one of WORK_DIR SOURCE_DIR CONFIG_JSON_PATH.")
-    work_dir = args[0]
-    source_dir = args[1].rstrip('/\\')
-    config_paths = args[2:]
-    for config_path in config_paths:
-        if not os.path.isfile(config_path):
-            parser.error("Can not read: %r" % config_path)
-
-    # generate build variants
-    build_descs = []
-    for config_path in config_paths:
-        build_descs_by_axis = load_build_variants_from_config(config_path)
-        build_descs.extend(generate_build_variants(build_descs_by_axis))
-    print('Build variants (%d):' % len(build_descs))
-    # assign build directory for each variant
-    if not os.path.isdir(work_dir):
-        os.makedirs(work_dir)
-    builds = []
-    with open(os.path.join(work_dir, 'matrix-dir-map.txt'), 'wt') as fmatrixmap:
-        for index, build_desc in enumerate(build_descs):
-            build_desc_work_dir = os.path.join(work_dir, '%03d' % (index+1))
-            builds.append(BuildData(build_desc, build_desc_work_dir, source_dir))
-            fmatrixmap.write('%s: %s\n' % (build_desc_work_dir, build_desc))
-    for build in builds:
-        build.execute_build()
-    html_report_path = os.path.join(work_dir, 'batchbuild-report.html')
-    generate_html_report(html_report_path, builds)
-    print('Done')
-
-
-if __name__ == '__main__':
-    main()
-

devtools/fixeol.py

@@ -1,20 +1,13 @@
-# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors
-# Distributed under MIT license, or public domain if desired and
-# recognized in your jurisdiction.
-# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-from __future__ import print_function
 import os.path
-import sys
 
-def fix_source_eol(path, is_dry_run = True, verbose = True, eol = '\n'):
+def fix_source_eol( path, is_dry_run = True, verbose = True, eol = '\n' ):
     """Makes sure that all sources have the specified eol sequence (default: unix)."""
-    if not os.path.isfile(path):
+    if not os.path.isfile( path ):
-        raise ValueError('Path "%s" is not a file' % path)
+        raise ValueError( 'Path "%s" is not a file' % path )
     try:
         f = open(path, 'rb')
-    except IOError as msg:
+    except IOError, msg:
-        print("%s: I/O Error: %s" % (file, str(msg)), file=sys.stderr)
+        print >> sys.stderr, "%s: I/O Error: %s" % (file, str(msg))
         return False
     try:
         raw_lines = f.readlines()
@@ -22,7 +15,7 @@ def fix_source_eol(path, is_dry_run = True, verbose = True, eol = '\n'):
         f.close()
     fixed_lines = [line.rstrip('\r\n') + eol for line in raw_lines]
     if raw_lines != fixed_lines:
-        print('%s =>' % path, end=' ')
+        print '%s =>' % path,
         if not is_dry_run:
             f = open(path, "wb")
             try:
@@ -30,32 +23,32 @@ def fix_source_eol(path, is_dry_run = True, verbose = True, eol = '\n'):
             finally:
                 f.close()
         if verbose:
-            print(is_dry_run and ' NEED FIX' or ' FIXED')
+            print is_dry_run and ' NEED FIX' or ' FIXED'
     return True
 ##    
 ##    
 ##
-##def _do_fix(is_dry_run = True):
+##def _do_fix( is_dry_run = True ):
 ##    from waftools import antglob
-##    python_sources = antglob.glob('.',
+##    python_sources = antglob.glob( '.',
 ##        includes = '**/*.py **/wscript **/wscript_build',
 ##        excludes = antglob.default_excludes + './waf.py',
-##        prune_dirs = antglob.prune_dirs + 'waf-* ./build')
+##        prune_dirs = antglob.prune_dirs + 'waf-* ./build' )
 ##    for path in python_sources:
-##        _fix_python_source(path, is_dry_run)
+##        _fix_python_source( path, is_dry_run )
 ##
-##    cpp_sources = antglob.glob('.',
+##    cpp_sources = antglob.glob( '.',
 ##        includes = '**/*.cpp **/*.h **/*.inl',
-##        prune_dirs = antglob.prune_dirs + 'waf-* ./build')
+##        prune_dirs = antglob.prune_dirs + 'waf-* ./build' )
 ##    for path in cpp_sources:
-##        _fix_source_eol(path, is_dry_run)
+##        _fix_source_eol( path, is_dry_run )
 ##
 ##
 ##def dry_fix(context):
-##    _do_fix(is_dry_run = True)
+##    _do_fix( is_dry_run = True )
 ##
 ##def fix(context):
-##    _do_fix(is_dry_run = False)
+##    _do_fix( is_dry_run = False )
 ##
 ##def shutdown():
 ##    pass

devtools/licenseupdater.py

@@ -1,94 +0,0 @@
-"""Updates the license text in source file.
-"""
-from __future__ import print_function
-
-# An existing license is found if the file starts with the string below,
-# and ends with the first blank line.
-LICENSE_BEGIN = "// Copyright "
-
-BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-""".replace('\r\n','\n')
-
-def update_license(path, dry_run, show_diff):
-    """Update the license statement in the specified file.
-    Parameters:
-      path: path of the C++ source file to update.
-      dry_run: if True, just print the path of the file that would be updated,
-               but don't change it.
-      show_diff: if True, print the path of the file that would be modified,
-                 as well as the change made to the file.
-    """
-    with open(path, 'rt') as fin:
-        original_text = fin.read().replace('\r\n','\n')
-        newline = fin.newlines and fin.newlines[0] or '\n'
-    if not original_text.startswith(LICENSE_BEGIN):
-        # No existing license found => prepend it
-        new_text = BRIEF_LICENSE + original_text
-    else:
-        license_end_index = original_text.index('\n\n') # search first blank line
-        new_text = BRIEF_LICENSE + original_text[license_end_index+2:]
-    if original_text != new_text:
-        if not dry_run:
-            with open(path, 'wb') as fout:
-                fout.write(new_text.replace('\n', newline))
-        print('Updated', path)
-        if show_diff:
-            import difflib
-            print('\n'.join(difflib.unified_diff(original_text.split('\n'),
-                                                   new_text.split('\n'))))
-        return True
-    return False
-
-def update_license_in_source_directories(source_dirs, dry_run, show_diff):
-    """Updates license text in C++ source files found in directory source_dirs.
-    Parameters:
-      source_dirs: list of directory to scan for C++ sources. Directories are
-                   scanned recursively.
-      dry_run: if True, just print the path of the file that would be updated,
-               but don't change it.
-      show_diff: if True, print the path of the file that would be modified,
-                 as well as the change made to the file.
-    """
-    from devtools import antglob
-    prune_dirs = antglob.prune_dirs + 'scons-local* ./build* ./libs ./dist'
-    for source_dir in source_dirs:
-        cpp_sources = antglob.glob(source_dir,
-            includes = '''**/*.h **/*.cpp **/*.inl''',
-            prune_dirs = prune_dirs)
-        for source in cpp_sources:
-            update_license(source, dry_run, show_diff)
-
-def main():
-    usage = """%prog DIR [DIR2...]
-Updates license text in sources of the project in source files found
-in the directory specified on the command-line.
-
-Example of call:
-python devtools\licenseupdater.py include src -n --diff
-=> Show change that would be made to the sources.
-
-python devtools\licenseupdater.py include src
-=> Update license statement on all sources in directories include/ and src/.
-"""
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = False
-    parser.add_option('-n', '--dry-run', dest="dry_run", action='store_true', default=False,
-        help="""Only show what files are updated, do not update the files""")
-    parser.add_option('--diff', dest="show_diff", action='store_true', default=False,
-        help="""On update, show change made to the file.""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-    update_license_in_source_directories(args, options.dry_run, options.show_diff)
-    print('Done')
-
-if __name__ == '__main__':
-    import sys
-    import os.path
-    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    main()
-

devtools/tarball.py

@@ -1,10 +1,5 @@
-# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors
+import os.path
-# Distributed under MIT license, or public domain if desired and
+import gzip
-# recognized in your jurisdiction.
-# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-from contextlib import closing
-import os
 import tarfile
 
 TARGZ_DEFAULT_COMPRESSION_LEVEL = 9
@@ -18,35 +13,41 @@ def make_tarball(tarball_path, sources, base_dir, prefix_dir=''):
     prefix_dir: all files stored in the tarball be sub-directory of prefix_dir. Set to ''
         to make them child of root.
     """
-    base_dir = os.path.normpath(os.path.abspath(base_dir))
+    base_dir = os.path.normpath( os.path.abspath( base_dir ) )
-    def archive_name(path):
+    def archive_name( path ):
         """Makes path relative to base_dir."""
-        path = os.path.normpath(os.path.abspath(path))
+        path = os.path.normpath( os.path.abspath( path ) )
-        common_path = os.path.commonprefix((base_dir, path))
+        common_path = os.path.commonprefix( (base_dir, path) )
         archive_name = path[len(common_path):]
-        if os.path.isabs(archive_name):
+        if os.path.isabs( archive_name ):
             archive_name = archive_name[1:]
-        return os.path.join(prefix_dir, archive_name)
+        return os.path.join( prefix_dir, archive_name )
     def visit(tar, dirname, names):
         for name in names:
             path = os.path.join(dirname, name)
             if os.path.isfile(path):
                 path_in_tar = archive_name(path)
-                tar.add(path, path_in_tar)
+                tar.add(path, path_in_tar )
     compression = TARGZ_DEFAULT_COMPRESSION_LEVEL
-    with closing(tarfile.TarFile.open(tarball_path, 'w:gz',
+    tar = tarfile.TarFile.gzopen( tarball_path, 'w', compresslevel=compression )
-            compresslevel=compression)) as tar:
+    try:
         for source in sources:
             source_path = source
-            if os.path.isdir(source):
+            if os.path.isdir( source ):
-                for dirpath, dirnames, filenames in os.walk(source_path):
+                os.path.walk(source_path, visit, tar)
-                    visit(tar, dirpath, filenames)
             else:
                 path_in_tar = archive_name(source_path)
-                tar.add(source_path, path_in_tar)      # filename, arcname
+                tar.add(source_path, path_in_tar )      # filename, arcname
+    finally:
+        tar.close()
 
-def decompress(tarball_path, base_dir):
+def decompress( tarball_path, base_dir ):
     """Decompress the gzipped tarball into directory base_dir.
     """
-    with closing(tarfile.TarFile.open(tarball_path)) as tar:
+    # !!! This class method is not documented in the online doc
-        tar.extractall(base_dir)
+    # nor is bz2open!
+    tar = tarfile.TarFile.gzopen(tarball_path, mode='r')
+    try:
+        tar.extractall( base_dir )
+    finally:
+        tar.close()

doc/footer.html

@@ -1,21 +1,23 @@
-<!-- HTML footer for doxygen 1.8.13-->
+<hr>
-<!-- start footer part -->
+<table width="100%">
-<!--BEGIN GENERATE_TREEVIEW-->
+  <tr>
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+    <td width="10%" align="left" valign="center">
-  <ul>
+      <a href="http://sourceforge.net"> 
-    $navpath
+      <img
-    <li class="footer">$generatedby
+      src="http://sourceforge.net/sflogo.php?group_id=144446"
-    <a href="http://www.doxygen.org/index.html">
+      width="88" height="31" border="0" alt="SourceForge Logo"></a>
-    <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
+    </td>
-  </ul>
+    <td width="20%" align="left" valign="center">
-</div>
+      hosts this site.
-<!--END GENERATE_TREEVIEW-->
+    </td>
-<!--BEGIN !GENERATE_TREEVIEW-->
+    <td>
-<hr class="footer"/><address class="footer"><small>
+    </td>
-$generatedby &#160;<a href="http://www.doxygen.org/index.html">
+    <td align="right" valign="center">
-<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+      Send comments to:<br>
-</a> $doxygenversion
+      <a href="mailto:jsoncpp-devel@lists.sourceforge.net">Json-cpp Developers</a>
-</small></address>
+    </td>
-<!--END !GENERATE_TREEVIEW-->
+  </tr>
+</table>
+
 </body> 
 </html>

doc/header.html

@@ -1,64 +1,24 @@
-<!-- HTML header for doxygen 1.8.13-->
+<html>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<title>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+JsonCpp - JSON data format manipulation library
-<meta name="generator" content="Doxygen $doxygenversion"/>
+</title>
-<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<link href="tabs.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
 </head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
-  <!--END PROJECT_LOGO-->
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-   <td>$searchbox</td>
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
- </tbody>
-</table>
-</div>
-<!--END TITLEAREA-->
 <body bgcolor="#ffffff"> 
 <table width="100%">
   <tr>
-    <td width="30%" align="left" valign="center">
+    <td width="40%" align="left" valign="center">
-      <a href="https://github.com/open-source-parsers/jsoncpp">
+      <a href="http://sourceforge.net/projects/jsoncpp">
       JsonCpp project page
       </a>
     </td>
-    <td width="20%" align="center" valign="center">
+    <td width="40%" align="right" valign="center">
-      <a href="hierarchy.html">
+      <a href="http://jsoncpp.sourceforge.net">JsonCpp home page</a>
-        Classes
-      </a>
-    </td>
-    <td width="20%" align="center" valign="center">
-      <a href="namespace_json.html">
-        Namespace
-      </a>
-    </td>
-    <td width="30%" align="right" valign="center">
-      <a href="http://open-source-parsers.github.io/jsoncpp-docs/doxygen/">JsonCpp home page</a>
     </td>
   </tr>
 </table>
 
 <hr>
-<!-- end header part -->

doc/jsoncpp.dox

@@ -4,21 +4,11 @@
 
 <a HREF="http://www.json.org/">JSON (JavaScript Object Notation)</a>
  is a lightweight data-interchange format. 
+It can represent integer, real number, string, an ordered sequence of value, and
+a collection of name/value pairs.
 
 Here is an example of JSON data:
 \verbatim
-{
-    "encoding" : "UTF-8",
-    "plug-ins" : [
-        "python",
-        "c++",
-        "ruby"
-        ],
-    "indent" : { "length" : 3, "use_space": true }
-}
-\endverbatim
-<b>JsonCpp</b> supports comments as <i>meta-data</i>:
-\code
 // Configuration options
 {
     // Default encoding for text
@@ -27,22 +17,21 @@ Here is an example of JSON data:
     // Plug-ins loaded at start-up
     "plug-ins" : [
         "python",
-        "c++",  // trailing comment
+        "c++",
         "ruby"
         ],
         
     // Tab indent size
-    // (multi-line comment)
+    "indent" : { "length" : 3, "use_space" = true }
-    "indent" : { /*embedded comment*/ "length" : 3, "use_space": true }
 }
-\endcode
+\endverbatim
 
 \section _features Features
 - read and write JSON document
-- attach C++ style comments to element during parsing
+- attach C and C++ style comments to element during parsing
 - rewrite JSON document preserving original comments
 
-Notes: Comments used to be supported in JSON but were removed for
+Notes: Comments used to be supported in JSON but where removed for 
 portability (C like comments are not supported in Python). Since
 comments are useful in configuration/input file, this feature was
 preserved.
@@ -50,115 +39,78 @@ preserved.
 \section _example Code example
 
 \code
-Json::Value root;   // 'root' will contain the root value after parsing.
+Json::Value root;   // will contains the root value after parsing.
-std::cin >> root;
+Json::Reader reader;
+bool parsingSuccessful = reader.parse( config_doc, root );
+if ( !parsingSuccessful )
+{
+    // report to the user the failure and their locations in the document.
+    std::cout  << "Failed to parse configuration\n"
+               << reader.getFormatedErrorMessages();
+    return;
+}
 
-// You can also read into a particular sub-value.
+// Get the value of the member of root named 'encoding', return 'UTF-8' if there is no
-std::cin >> root["subtree"];
+// such member.
-
-// Get the value of the member of root named 'encoding',
-// and return 'UTF-8' if there is no such member.
 std::string encoding = root.get("encoding", "UTF-8" ).asString();
-
+// Get the value of the member of root named 'encoding', return a 'null' value if
-// Get the value of the member of root named 'plug-ins'; return a 'null' value if
 // there is no such member.
 const Json::Value plugins = root["plug-ins"];
-
+for ( int index = 0; index < plugins.size(); ++index )  // Iterates over the sequence elements.
-// Iterate over the sequence elements.
-for ( int index = 0; index < plugins.size(); ++index )
    loadPlugIn( plugins[index].asString() );
    
-// Try other datatypes. Some are auto-convertible to others.
+setIndentLength( root["indent"].get("length", 3).asInt() );
-foo::setIndentLength( root["indent"].get("length", 3).asInt() );
+setIndentUseSpace( root["indent"].get("use_space", true).asBool() );
-foo::setIndentUseSpace( root["indent"].get("use_space", true).asBool() );
 
-// Since Json::Value has an implicit constructor for all value types, it is not
-// necessary to explicitly construct the Json::Value object.
-root["encoding"] = foo::getCurrentEncoding();
-root["indent"]["length"] = foo::getCurrentIndentLength();
-root["indent"]["use_space"] = foo::getCurrentIndentUseSpace();
-
-// If you like the defaults, you can insert directly into a stream.
-std::cout << root;
-// Of course, you can write to `std::ostringstream` if you prefer.
-
-// If desired, remember to add a linefeed and flush.
-std::cout << std::endl;
-\endcode
-
-\section _advanced Advanced usage
-
-Configure *builders* to create *readers* and *writers*. For
-configuration, we use our own `Json::Value` (rather than
-standard setters/getters) so that we can add
-features without losing binary-compatibility.
-
-\code
-// For convenience, use `writeString()` with a specialized builder.
-Json::StreamWriterBuilder wbuilder;
-wbuilder["indentation"] = "\t";
-std::string document = Json::writeString(wbuilder, root);
-
-// Here, using a specialized Builder, we discard comments and
-// record errors as we parse.
-Json::CharReaderBuilder rbuilder;
-rbuilder["collectComments"] = false;
-std::string errs;
-bool ok = Json::parseFromStream(rbuilder, std::cin, &root, &errs);
-\endcode
-
-Yes, compile-time configuration-checking would be helpful,
-but `Json::Value` lets you
-write and read the builder configuration, which is better! In other words,
-you can configure your JSON parser using JSON.
-
-CharReaders and StreamWriters are not thread-safe, but they are re-usable.
-\code
-Json::CharReaderBuilder rbuilder;
-cfg >> rbuilder.settings_;
-std::unique_ptr<Json::CharReader> const reader(rbuilder.newCharReader());
-reader->parse(start, stop, &value1, &errs);
 // ...
-reader->parse(start, stop, &value2, &errs);
+// At application shutdown to make the new configuration document:
-// etc.
+// Since Json::Value has implicit constructor for all value types, it is not
+// necessary to explicitly construct the Json::Value object:
+root["encoding"] = getCurrentEncoding();
+root["indent"]["length"] = getCurrentIndentLength();
+root["indent"]["use_space"] = getCurrentIndentUseSpace();
+
+Json::StyledWriter writer;
+// Make a new JSON document for the configuration. Preserve original comments.
+std::string outputConfig = writer.write( root );
+
+// You can also use streams.  This will put the contents of any JSON
+// stream at a particular sub-value, if you'd like.
+std::cin >> root["subtree"];
+
+// And you can write to a stream, using the StyledWriter automatically.
+std::cout << root;
 \endcode
 
-\section _pbuild Build instructions
+\section _plinks Build instructions
 The build instructions are located in the file 
-<a HREF="https://github.com/open-source-parsers/jsoncpp/blob/master/README.md">README.md</a> in the top-directory of the project.
+<a HREF="README.txt">README.txt</a> in the top-directory of the project.
 
-The latest version of the source is available in the project's GitHub repository:
+Permanent link to the latest revision of the file in subversion: 
-<a HREF="https://github.com/open-source-parsers/jsoncpp/">
+<a HREF="http://svn.sourceforge.net/viewcvs.cgi/jsoncpp/README.txt?view=markup">latest README.txt</a>
-jsoncpp</a>
 
-\section _news What's New?
+\section _pdownload Download
-The description of latest changes can be found in
+The sources can be downloaded from 
-<a HREF="https://github.com/open-source-parsers/jsoncpp/wiki/NEWS">
+<a HREF="http://sourceforge.net/projects/jsoncpp/files/">SourceForge download page</a>.
-  the NEWS wiki
+
-</a>.
+The latest version of the source is available in the project's subversion repository: 
+<a HREF="http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/">
+http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/</a>
+
+To checkout the source, see the following 
+<a HREF="http://sourceforge.net/scm/?type=svn&group_id=144446">instructions</a>.
+
+\section _plinks Project links
+- <a HREF="http://jsoncpp.sourceforge.net">json-cpp home</a>
+- <a HREF="http://www.sourceforge.net/projects/jsoncpp">json-cpp sourceforge project</a>
 
 \section _rlinks Related links
 - <a HREF="http://www.json.org/">JSON</a> Specification and alternate language implementations.
 - <a HREF="http://www.yaml.org/">YAML</a> A data format designed for human readability.
 - <a HREF="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode FAQ</a>.
 
-\section _plinks Old project links
-- <a href="https://sourceforge.net/projects/jsoncpp/">https://sourceforge.net/projects/jsoncpp/</a>
-- <a href="http://jsoncpp.sourceforge.net">http://jsoncpp.sourceforge.net</a>
-- <a href="http://sourceforge.net/projects/jsoncpp/files/">http://sourceforge.net/projects/jsoncpp/files/</a>
-- <a href="http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/">http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/</a>
-- <a href="http://jsoncpp.sourceforge.net/old.html">http://jsoncpp.sourceforge.net/old.html</a>
-
 \section _license License
-See file <a href="https://github.com/open-source-parsers/jsoncpp/blob/master/LICENSE"><code>LICENSE</code></a> in the top-directory of the project.
+The json-cpp library and this documentation are in Public Domain.
 
-Basically JsonCpp is licensed under MIT license, or public domain if desired
+\author Baptiste Lepilleur <blep@users.sourceforge.net>
-and recognized in your jurisdiction.
-
-\author Baptiste Lepilleur <blep@users.sourceforge.net> (originator)
-\author Christopher Dunn <cdunn2001@gmail.com> (primary maintainer)
-\version \include version
-We make strong guarantees about binary-compatibility, consistent with
-<a href="http://apr.apache.org/versioning.html">the Apache versioning scheme</a>.
-\sa version.h
 */

doc/roadmap.dox

@@ -1,3 +1,32 @@
 /*! \page roadmap JsonCpp roadmap
-  Moved to: https://github.com/open-source-parsers/jsoncpp/wiki/Roadmap
+  \section ms_release Makes JsonCpp ready for release
+  - Build system clean-up:
+	- Fix build on Windows (shared-library build is broken)
+	- Add enable/disable flag for static and shared library build
+	- Enhance help
+  - Platform portability check: (Notes: was ok on last check)
+	- linux/gcc, 
+	- solaris/cc, 
+	- windows/msvc678, 
+	- aix/vacpp
+  - Add JsonCpp version to header as numeric for use in preprocessor test
+  - Remove buggy experimental hash stuff
+  - Release on sourceforge download
+  \section ms_strict Adds a strict mode to reader/parser
+	Strict JSON support as specific in RFC 4627 (http://www.ietf.org/rfc/rfc4627.txt?number=4627).
+	- Enforce only object or array as root element
+	- Disable comment support
+    - Get jsonchecker failing tests to pass in strict mode
+  \section ms_separation Expose json reader/writer API that do not impose using Json::Value.
+	Some typical use-case involve an application specific structure to/from a JSON document.
+    - Event base parser to allow unserializing a Json document directly in datastructure instead of
+      using the intermediate Json::Value.
+    - "Stream" based parser to serialized a Json document without using Json::Value as input.
+	- Performance oriented parser/writer:
+		- Provides an event based parser. Should allow pulling & skipping events for ease of use.
+		- Provides a JSON document builder: fast only.
+  \section ms_perfo Performance tuning
+    - Provides support for static property name definition avoiding allocation
+    - Static property dictionnary can be provided to JSON reader
+    - Performance scenario & benchmarking
 */

doxybuild.py

@@ -1,27 +1,12 @@
 """Script to generate doxygen documentation.
 """
-from __future__ import print_function
+
-from __future__ import unicode_literals
-from devtools import tarball
-from contextlib import contextmanager
-import subprocess
-import traceback
 import re
 import os
+import os.path
 import sys
 import shutil
-
+from devtools import tarball
-@contextmanager
-def cd(newdir):
-    """
-    http://stackoverflow.com/questions/431684/how-do-i-cd-in-python
-    """
-    prevdir = os.getcwd()
-    os.chdir(newdir)
-    try:
-        yield
-    finally:
-        os.chdir(prevdir)
 
 def find_program(*filenames):
     """find a program in folders path_lst, and sets env[var]
@@ -29,9 +14,9 @@ def find_program(*filenames):
     @return: the full path of the filename if found, or '' if filename could not be found
 """
     paths = os.environ.get('PATH', '').split(os.pathsep)
-    suffixes = ('win32' in sys.platform) and '.exe .com .bat .cmd' or ''
+    suffixes = ('win32' in sys.platform ) and '.exe .com .bat .cmd' or ''
     for filename in filenames:
-        for name in [filename+ext for ext in suffixes.split(' ')]:
+        for name in [filename+ext for ext in suffixes.split()]:
             for directory in paths:
                 full_path = os.path.join(directory, name)
                 if os.path.isfile(full_path):
@@ -43,56 +28,53 @@ def do_subst_in_file(targetfile, sourcefile, dict):
     For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'},
     then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
     """
-    with open(sourcefile, 'r') as f:
+    try:
+        f = open(sourcefile, 'rb')
         contents = f.read()
-    for (k,v) in list(dict.items()):
+        f.close()
+    except:
+        print "Can't read source file %s"%sourcefile
+        raise
+    for (k,v) in dict.items():
         v = v.replace('\\','\\\\') 
         contents = re.sub(k, v, contents)
-    with open(targetfile, 'w') as f:
-        f.write(contents)
-
-def getstatusoutput(cmd):
-    """cmd is a list.
-    """
     try:
-        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        f = open(targetfile, 'wb')
-        output, _ = process.communicate()
+        f.write(contents)
-        status = process.returncode
+        f.close()
     except:
-        status = -1
+        print "Can't write target file %s"%targetfile
-        output = traceback.format_exc()
+        raise
-    return status, output
-
-def run_cmd(cmd, silent=False):
-    """Raise exception on failure.
-    """
-    info = 'Running: %r in %r' %(' '.join(cmd), os.getcwd())
-    print(info)
-    sys.stdout.flush()
-    if silent:
-        status, output = getstatusoutput(cmd)
-    else:
-        status, output = subprocess.call(cmd), ''
-    if status:
-        msg = 'Error while %s ...\n\terror=%d, output="""%s"""' %(info, status, output)
-        raise Exception(msg)
-
-def assert_is_exe(path):
-    if not path:
-        raise Exception('path is empty.')
-    if not os.path.isfile(path):
-        raise Exception('%r is not a file.' %path)
-    if not os.access(path, os.X_OK):
-        raise Exception('%r is not executable by this user.' %path)
 
 def run_doxygen(doxygen_path, config_file, working_dir, is_silent):
-    assert_is_exe(doxygen_path)
+    config_file = os.path.abspath( config_file )
-    config_file = os.path.abspath(config_file)
+    doxygen_path = doxygen_path
-    with cd(working_dir):
+    old_cwd = os.getcwd()
+    try:
+        os.chdir( working_dir )
         cmd = [doxygen_path, config_file]
-        run_cmd(cmd, is_silent)
+        print 'Running:', ' '.join( cmd )
+        try:
+            import subprocess
+        except:
+            if os.system( ' '.join( cmd ) ) != 0:
+                print 'Documentation generation failed'
+                return False
+        else:
+            if is_silent:
+                process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
+            else:
+                process = subprocess.Popen( cmd )
+            stdout, _ = process.communicate()
+            if process.returncode:
+                print 'Documentation generation failed:'
+                print stdout
+                return False
+        return True
+    finally:
+        os.chdir( old_cwd )
 
-def build_doc(options,  make_release=False):
+def build_doc( options,  make_release=False ):
     if make_release:
         options.make_tarball = True
         options.with_dot = True
@@ -101,62 +83,60 @@ def build_doc(options,  make_release=False):
         options.open = False
         options.silent = True
 
-    version = open('version', 'rt').read().strip()
+    version = open('version','rt').read().strip()
     output_dir = 'dist/doxygen' # relative to doc/doxyfile location.
-    if not os.path.isdir(output_dir):
+    if not os.path.isdir( output_dir ):
-        os.makedirs(output_dir)
+        os.makedirs( output_dir )
-    top_dir = os.path.abspath('.')
+    top_dir = os.path.abspath( '.' )
     html_output_dirname = 'jsoncpp-api-html-' + version
-    tarball_path = os.path.join('dist', html_output_dirname + '.tar.gz')
+    tarball_path = os.path.join( 'dist', html_output_dirname + '.tar.gz' )
-    warning_log_path = os.path.join(output_dir, '../jsoncpp-doxygen-warning.log')
+    warning_log_path = os.path.join( output_dir, '../jsoncpp-doxygen-warning.log' )
-    html_output_path = os.path.join(output_dir, html_output_dirname)
+    html_output_path = os.path.join( output_dir, html_output_dirname )
-    def yesno(bool):
+    def yesno( bool ):
         return bool and 'YES' or 'NO'
     subst_keys = {
         '%JSONCPP_VERSION%': version,
         '%DOC_TOPDIR%': '',
         '%TOPDIR%': top_dir,
-        '%HTML_OUTPUT%': os.path.join('..', output_dir, html_output_dirname),
+        '%HTML_OUTPUT%': os.path.join( '..', output_dir, html_output_dirname ),
         '%HAVE_DOT%': yesno(options.with_dot),
         '%DOT_PATH%': os.path.split(options.dot_path)[0],
         '%HTML_HELP%': yesno(options.with_html_help),
         '%UML_LOOK%': yesno(options.with_uml_look),
-        '%WARNING_LOG_PATH%': os.path.join('..', warning_log_path)
+        '%WARNING_LOG_PATH%': os.path.join( '..', warning_log_path )
         }
 
-    if os.path.isdir(output_dir):
+    if os.path.isdir( output_dir ):
-        print('Deleting directory:', output_dir)
+        print 'Deleting directory:', output_dir
-        shutil.rmtree(output_dir)
+        shutil.rmtree( output_dir )
-    if not os.path.isdir(output_dir):
+    if not os.path.isdir( output_dir ):
-        os.makedirs(output_dir)
+        os.makedirs( output_dir )
 
-    do_subst_in_file('doc/doxyfile', options.doxyfile_input_path, subst_keys)
+    do_subst_in_file( 'doc/doxyfile', 'doc/doxyfile.in', subst_keys )
-    run_doxygen(options.doxygen_path, 'doc/doxyfile', 'doc', is_silent=options.silent)
+    ok = run_doxygen( options.doxygen_path, 'doc/doxyfile', 'doc', is_silent=options.silent )
     if not options.silent:
-        print(open(warning_log_path, 'r').read())
+        print open(warning_log_path, 'rb').read()
-    index_path = os.path.abspath(os.path.join('doc', subst_keys['%HTML_OUTPUT%'], 'index.html'))
+    index_path = os.path.abspath(os.path.join(subst_keys['%HTML_OUTPUT%'], 'index.html'))
-    print('Generated documentation can be found in:')
+    print 'Generated documentation can be found in:'
-    print(index_path)
+    print index_path
     if options.open:
         import webbrowser
-        webbrowser.open('file://' + index_path)
+        webbrowser.open( 'file://' + index_path )
     if options.make_tarball:
-        print('Generating doc tarball to', tarball_path)
+        print 'Generating doc tarball to', tarball_path
         tarball_sources = [
             output_dir,
-            'README.md',
+            'README.txt',
-            'LICENSE',
-            'NEWS.txt',
             'version'
             ]
-        tarball_basedir = os.path.join(output_dir, html_output_dirname)
+        tarball_basedir = os.path.join( output_dir, html_output_dirname )
-        tarball.make_tarball(tarball_path, tarball_sources, tarball_basedir, html_output_dirname)
+        tarball.make_tarball( tarball_path, tarball_sources, tarball_basedir, html_output_dirname )
     return tarball_path, html_output_dirname
 
 def main():
     usage = """%prog
     Generates doxygen documentation in build/doxygen.
-    Optionally makes a tarball of the documentation to dist/.
+    Optionaly makes a tarball of the documentation to dist/.
 
     Must be started in the project top directory.    
     """
@@ -169,8 +149,6 @@ def main():
         help="""Path to GraphViz dot tool. Must be full qualified path. [Default: %default]""")
     parser.add_option('--doxygen', dest="doxygen_path", action='store', default=find_program('doxygen'),
         help="""Path to Doxygen tool. [Default: %default]""")
-    parser.add_option('--in', dest="doxyfile_input_path", action='store', default='doc/doxyfile.in',
-        help="""Path to doxygen inputs. [Default: %default]""")
     parser.add_option('--with-html-help', dest="with_html_help", action='store_true', default=False,
         help="""Enable generation of Microsoft HTML HELP""")
     parser.add_option('--no-uml-look', dest="with_uml_look", action='store_false', default=True,
@@ -183,7 +161,7 @@ def main():
         help="""Hides doxygen output""")
     parser.enable_interspersed_args()
     options, args = parser.parse_args()
-    build_doc(options)
+    build_doc( options )
 
 if __name__ == '__main__':
     main()

example/BUILD.bazel

@@ -1,33 +0,0 @@
-cc_binary(
-    name = "readFromStream_ok",
-    srcs = ["readFromStream/readFromStream.cpp"],
-    deps = ["//:jsoncpp"],
-    args = ["$(location :readFromStream/withComment.json)"],
-    data = ["readFromStream/withComment.json"],
-)
-
-cc_binary(
-    name = "readFromStream_err",
-    srcs = ["readFromStream/readFromStream.cpp"],
-    deps = ["//:jsoncpp"],
-    args = ["$(location :readFromStream/errorFormat.json)"],
-    data = ["readFromStream/errorFormat.json"],
-)
-
-cc_binary(
-    name = "readFromString",
-    srcs = ["readFromString/readFromString.cpp"],
-    deps = ["//:jsoncpp"],
-)
-
-cc_binary(
-    name = "streamWrite",
-    srcs = ["streamWrite/streamWrite.cpp"],
-    deps = ["//:jsoncpp"],
-)
-
-cc_binary(
-    name = "stringWrite",
-    srcs = ["stringWrite/stringWrite.cpp"],
-    deps = ["//:jsoncpp"],
-)

example/CMakeLists.txt

@@ -1,27 +0,0 @@
-#vim: et ts =4 sts = 4 sw = 4 tw = 0
-set(EXAMPLES
-    readFromString
-    readFromStream
-    stringWrite
-    streamWrite
-)
-add_definitions(-D_GLIBCXX_USE_CXX11_ABI)
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_compile_options(-Wall -Wextra)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_definitions(
-        -D_SCL_SECURE_NO_WARNINGS
-        -D_CRT_SECURE_NO_WARNINGS
-        -D_WIN32_WINNT=0x601
-        -D_WINSOCK_DEPRECATED_NO_WARNINGS
-    )
-endif()
-
-foreach(example ${EXAMPLES})
-    add_executable(${example} ${example}/${example}.cpp)
-    target_include_directories(${example} PUBLIC ${CMAKE_SOURCE_DIR}/include)
-    target_link_libraries(${example} jsoncpp_lib)
-endforeach()
-
-add_custom_target(examples ALL DEPENDS ${EXAMPLES})

example/README.md

@@ -1,13 +0,0 @@
-***NOTE***
-
-If you get linker errors about undefined references to symbols that involve types in the `std::__cxx11` namespace or the tag
-`[abi:cxx11]` then it probably indicates that you are trying to link together object files that were compiled with different
-values for the _GLIBCXX_USE_CXX11_ABI marco. This commonly happens when linking to a third-party library that was compiled with
-an older version of GCC. If the third-party library cannot be rebuilt with the new ABI, then you need to recompile your code with
-the old ABI,just like:
-**g++ stringWrite.cpp -ljsoncpp -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0 -o stringWrite**
-
-Not all of uses of the new ABI will cause changes in symbol names, for example a class with a `std::string` member variable will
-have the same mangled name whether compiled with the older or new ABI. In order to detect such problems, the new types and functions
-are annotated with the abi_tag attribute, allowing the compiler to warn about potential ABI incompatibilities in code using them.
-Those warnings can be enabled with the `-Wabi-tag` option.

example/readFromStream/errorFormat.json

@@ -1,3 +0,0 @@
-{
-    1: "value"
-}

example/readFromStream/readFromStream.cpp

@@ -1,30 +0,0 @@
-#include "json/json.h"
-#include <fstream>
-#include <iostream>
-/** \brief Parse from stream, collect comments and capture error info.
- * Example Usage:
- * $g++ readFromStream.cpp -ljsoncpp -std=c++11 -o readFromStream
- * $./readFromStream
- * // comment head
- * {
- *    // comment before
- *    "key" : "value"
- * }
- * // comment after
- * // comment tail
- */
-int main(int argc, char* argv[]) {
-  Json::Value root;
-  std::ifstream ifs;
-  ifs.open(argv[1]);
-
-  Json::CharReaderBuilder builder;
-  builder["collectComments"] = true;
-  JSONCPP_STRING errs;
-  if (!parseFromStream(builder, ifs, &root, &errs)) {
-    std::cout << errs << std::endl;
-    return EXIT_FAILURE;
-  }
-  std::cout << root << std::endl;
-  return EXIT_SUCCESS;
-}

example/readFromStream/withComment.json

@@ -1,6 +0,0 @@
-// comment head
-{
-    // comment before
-    "key" : "value"
-    // comment after
-}// comment tail

example/readFromString/readFromString.cpp

@@ -1,38 +0,0 @@
-#include "json/json.h"
-#include <iostream>
-#include <memory>
-/**
- * \brief Parse a raw string into Value object using the CharReaderBuilder
- * class, or the legacy Reader class.
- * Example Usage:
- * $g++ readFromString.cpp -ljsoncpp -std=c++11 -o readFromString
- * $./readFromString
- * colin
- * 20
- */
-int main() {
-  const std::string rawJson = R"({"Age": 20, "Name": "colin"})";
-  const auto rawJsonLength = static_cast<int>(rawJson.length());
-  constexpr bool shouldUseOldWay = false;
-  JSONCPP_STRING err;
-  Json::Value root;
-
-  if (shouldUseOldWay) {
-    Json::Reader reader;
-    reader.parse(rawJson, root);
-  } else {
-    Json::CharReaderBuilder builder;
-    const std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
-    if (!reader->parse(rawJson.c_str(), rawJson.c_str() + rawJsonLength, &root,
-                       &err)) {
-      std::cout << "error: " << err << std::endl;
-      return EXIT_FAILURE;
-    }
-  }
-  const std::string name = root["Name"].asString();
-  const int age = root["Age"].asInt();
-
-  std::cout << name << std::endl;
-  std::cout << age << std::endl;
-  return EXIT_SUCCESS;
-}

example/streamWrite/streamWrite.cpp

@@ -1,23 +0,0 @@
-#include "json/json.h"
-#include <iostream>
-#include <memory>
-/** \brief Write the Value object to a stream.
- * Example Usage:
- * $g++ streamWrite.cpp -ljsoncpp -std=c++11 -o streamWrite
- * $./streamWrite
- * {
- *     "Age" : 20,
- *     "Name" : "robin"
- * }
- */
-int main() {
-  Json::Value root;
-  Json::StreamWriterBuilder builder;
-  const std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());
-
-  root["Name"] = "robin";
-  root["Age"] = 20;
-  writer->write(root, &std::cout);
-
-  return EXIT_SUCCESS;
-}

example/stringWrite/stringWrite.cpp

@@ -1,33 +0,0 @@
-#include "json/json.h"
-#include <iostream>
-/** \brief Write a Value object to a string.
- * Example Usage:
- * $g++ stringWrite.cpp -ljsoncpp -std=c++11 -o stringWrite
- * $./stringWrite
- * {
- *     "action" : "run",
- *     "data" :
- *     {
- *         "number" : 1
- *     }
- * }
- */
-int main() {
-  Json::Value root;
-  Json::Value data;
-  constexpr bool shouldUseOldWay = false;
-  root["action"] = "run";
-  data["number"] = 1;
-  root["data"] = data;
-
-  if (shouldUseOldWay) {
-    Json::FastWriter writer;
-    const std::string json_file = writer.write(root);
-    std::cout << json_file << std::endl;
-  } else {
-    Json::StreamWriterBuilder builder;
-    const std::string json_file = Json::writeString(builder, root);
-    std::cout << json_file << std::endl;
-  }
-  return EXIT_SUCCESS;
-}

get_version.pl

@@ -1,5 +0,0 @@
-while (<>) {
-	if (/version : '(.+)',/) {
-		print "$1";
-	}
-}

include/CMakeLists.txt

@@ -1,5 +0,0 @@
-file(GLOB INCLUDE_FILES "json/*.h")
-install(FILES
-    ${INCLUDE_FILES}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json)
-

include/PreventInBuildInstalls.cmake

@@ -1,9 +0,0 @@
-string(TOLOWER "${CMAKE_INSTALL_PREFIX}" _PREFIX)
-string(TOLOWER "${ITK_BINARY_DIR}" _BUILD)
-if("${_PREFIX}" STREQUAL "${_BUILD}")
-  message(FATAL_ERROR
-    "The current CMAKE_INSTALL_PREFIX points at the build tree:\n"
-    "  ${CMAKE_INSTALL_PREFIX}\n"
-    "This is not supported."
-    )
-endif()

include/PreventInSourceBuilds.cmake

@@ -1,45 +0,0 @@
-#
-# This function will prevent in-source builds
-function(AssureOutOfSourceBuilds)
-  # make sure the user doesn't play dirty with symlinks
-  get_filename_component(srcdir "${CMAKE_CURRENT_SOURCE_DIR}" REALPATH)
-  get_filename_component(bindir "${CMAKE_CURRENT_BINARY_DIR}" REALPATH)
-
-  # disallow in-source builds
-  if("${srcdir}" STREQUAL "${bindir}")
-    message("######################################################")
-    message("# jsoncpp should not be configured & built in the jsoncpp source directory")
-    message("# You must run cmake in a build directory.")
-    message("# For example:")
-    message("# mkdir jsoncpp-Sandbox ; cd jsoncpp-sandbox")
-    message("# git clone https://github.com/open-source-parsers/jsoncpp.git # or download & unpack the source tarball")
-    message("# mkdir jsoncpp-build")
-    message("# this will create the following directory structure")
-    message("#")
-    message("# jsoncpp-Sandbox")
-    message("#  +--jsoncpp")
-    message("#  +--jsoncpp-build")
-    message("#")
-    message("# Then you can proceed to configure and build")
-    message("# by using the following commands")
-    message("#")
-    message("# cd jsoncpp-build")
-    message("# cmake ../jsoncpp # or ccmake, or cmake-gui ")
-    message("# make")
-    message("#")
-    message("# NOTE: Given that you already tried to make an in-source build")
-    message("#       CMake have already created several files & directories")
-    message("#       in your source tree. run 'git status' to find them and")
-    message("#       remove them by doing:")
-    message("#")
-    message("#       cd jsoncpp-Sandbox/jsoncpp")
-    message("#       git clean -n -d")
-    message("#       git clean -f -d")
-    message("#       git checkout --")
-    message("#")
-    message("######################################################")
-    message(FATAL_ERROR "Quitting configuration")
-  endif()
-endfunction()
-
-AssureOutOfSourceBuilds()

include/json/allocator.h

@@ -1,100 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_ALLOCATOR_H_INCLUDED
-#define JSON_ALLOCATOR_H_INCLUDED
-
-#include <algorithm>
-#include <cstring>
-#include <memory>
-
-#pragma pack(push)
-#pragma pack()
-
-namespace Json {
-template <typename T> class SecureAllocator {
-public:
-  // Type definitions
-  using value_type = T;
-  using pointer = T*;
-  using const_pointer = const T*;
-  using reference = T&;
-  using const_reference = const T&;
-  using size_type = std::size_t;
-  using difference_type = std::ptrdiff_t;
-
-  /**
-   * Allocate memory for N items using the standard allocator.
-   */
-  pointer allocate(size_type n) {
-    // allocate using "global operator new"
-    return static_cast<pointer>(::operator new(n * sizeof(T)));
-  }
-
-  /**
-   * Release memory which was allocated for N items at pointer P.
-   *
-   * The memory block is filled with zeroes before being released.
-   */
-  void deallocate(pointer p, size_type n) {
-    // These constructs will not be removed by the compiler during optimization,
-    // unlike memset.
-#if defined(HAVE_MEMSET_S)
-    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
-#elif defined(_WIN32)
-    RtlSecureZeroMemory(p, n * sizeof(T));
-#else
-    std::fill_n(reinterpret_cast<volatile unsigned char*>(p), n, 0);
-#endif
-
-    // free using "global operator delete"
-    ::operator delete(p);
-  }
-
-  /**
-   * Construct an item in-place at pointer P.
-   */
-  template <typename... Args> void construct(pointer p, Args&&... args) {
-    // construct using "placement new" and "perfect forwarding"
-    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
-  }
-
-  size_type max_size() const { return size_t(-1) / sizeof(T); }
-
-  pointer address(reference x) const { return std::addressof(x); }
-
-  const_pointer address(const_reference x) const { return std::addressof(x); }
-
-  /**
-   * Destroy an item in-place at pointer P.
-   */
-  void destroy(pointer p) {
-    // destroy using "explicit destructor"
-    p->~T();
-  }
-
-  // Boilerplate
-  SecureAllocator() {}
-  template <typename U> SecureAllocator(const SecureAllocator<U>&) {}
-  template <typename U> struct rebind {
-    using other = SecureAllocator<U>;
-  };
-};
-
-template <typename T, typename U>
-bool operator==(const SecureAllocator<T>&, const SecureAllocator<U>&) {
-  return true;
-}
-
-template <typename T, typename U>
-bool operator!=(const SecureAllocator<T>&, const SecureAllocator<U>&) {
-  return false;
-}
-
-} // namespace Json
-
-#pragma pack(pop)
-
-#endif // JSON_ALLOCATOR_H_INCLUDED

include/json/assertions.h

@@ -1,61 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_ASSERTIONS_H_INCLUDED
-#define JSON_ASSERTIONS_H_INCLUDED
-
-#include <cstdlib>
-#include <sstream>
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-/** It should not be possible for a maliciously designed file to
- *  cause an abort() or seg-fault, so these macros are used only
- *  for pre-condition violations and internal logic errors.
- */
-#if JSON_USE_EXCEPTION
-
-// @todo <= add detail about condition in exception
-#define JSON_ASSERT(condition)                                                 \
-  do {                                                                         \
-    if (!(condition)) {                                                        \
-      Json::throwLogicError("assert json failed");                             \
-    }                                                                          \
-  } while (0)
-
-#define JSON_FAIL_MESSAGE(message)                                             \
-  do {                                                                         \
-    OStringStream oss;                                                         \
-    oss << message;                                                            \
-    Json::throwLogicError(oss.str());                                          \
-    abort();                                                                   \
-  } while (0)
-
-#else // JSON_USE_EXCEPTION
-
-#define JSON_ASSERT(condition) assert(condition)
-
-// The call to assert() will show the failure message in debug builds. In
-// release builds we abort, for a core-dump or debugger.
-#define JSON_FAIL_MESSAGE(message)                                             \
-  {                                                                            \
-    OStringStream oss;                                                         \
-    oss << message;                                                            \
-    assert(false && oss.str().c_str());                                        \
-    abort();                                                                   \
-  }
-
-#endif
-
-#define JSON_ASSERT_MESSAGE(condition, message)                                \
-  do {                                                                         \
-    if (!(condition)) {                                                        \
-      JSON_FAIL_MESSAGE(message);                                              \
-    }                                                                          \
-  } while (0)
-
-#endif // JSON_ASSERTIONS_H_INCLUDED

include/json/autolink.h

@@ -0,0 +1,19 @@
+#ifndef JSON_AUTOLINK_H_INCLUDED
+# define JSON_AUTOLINK_H_INCLUDED
+
+# include "config.h"
+
+# ifdef JSON_IN_CPPTL
+#  include <cpptl/cpptl_autolink.h>
+# endif
+
+# if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)  &&  !defined(JSON_IN_CPPTL)
+#  define CPPTL_AUTOLINK_NAME "json"
+#  undef CPPTL_AUTOLINK_DLL
+#  ifdef JSON_DLL
+#   define CPPTL_AUTOLINK_DLL
+#  endif
+#  include "autolink.h"
+# endif
+
+#endif // JSON_AUTOLINK_H_INCLUDED

include/json/config.h

@@ -1,150 +1,43 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 #ifndef JSON_CONFIG_H_INCLUDED
-#define JSON_CONFIG_H_INCLUDED
+# define JSON_CONFIG_H_INCLUDED
-#include <cstddef>
-#include <cstdint>
-#include <istream>
-#include <memory>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <type_traits>
 
-// If non-zero, the library uses exceptions to report bad input instead of C
+/// If defined, indicates that json library is embedded in CppTL library.
-// assertion macros. The default is to use exceptions.
+//# define JSON_IN_CPPTL 1
-#ifndef JSON_USE_EXCEPTION
-#define JSON_USE_EXCEPTION 1
-#endif
 
-// Temporary, tracked for removal with issue #982.
+/// If defined, indicates that json may leverage CppTL library
-#ifndef JSON_USE_NULLREF
+//#  define JSON_USE_CPPTL 1
-#define JSON_USE_NULLREF 1
+/// If defined, indicates that cpptl vector based map should be used instead of std::map
-#endif
+/// as Value container.
+//#  define JSON_USE_CPPTL_SMALLMAP 1
+/// If defined, indicates that Json specific container should be used
+/// (hash table & simple deque container with customizable allocator).
+/// THIS FEATURE IS STILL EXPERIMENTAL!
+//#  define JSON_VALUE_USE_INTERNAL_MAP 1
+/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
+/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
+/// as if it was a POD) that may cause some validation tool to report errors.
+/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
+//#  define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
 
-/// If defined, indicates that the source file is amalgamated
+/// If defined, indicates that Json use exception to report invalid type manipulation
-/// to prevent private header inclusion.
+/// instead of C assert macro.
-/// Remarks: it is automatically defined in the generated amalgamated header.
+# define JSON_USE_EXCEPTION 1
-// #define JSON_IS_AMALGAMATION
 
-// Export macros for DLL visibility
+# ifdef JSON_IN_CPPTL
-#if defined(JSON_DLL_BUILD)
+#  include <cpptl/config.h>
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#  ifndef JSON_USE_CPPTL
-#define JSON_API __declspec(dllexport)
+#   define JSON_USE_CPPTL 1
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#  endif
-#elif defined(__GNUC__) || defined(__clang__)
+# endif
-#define JSON_API __attribute__((visibility("default")))
-#endif // if defined(_MSC_VER)
 
-#elif defined(JSON_DLL)
+# ifdef JSON_IN_CPPTL
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#  define JSON_API CPPTL_API
-#define JSON_API __declspec(dllimport)
+# elif defined(JSON_DLL_BUILD)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#  define JSON_API __declspec(dllexport)
-#endif // if defined(_MSC_VER)
+# elif defined(JSON_DLL)
-#endif // ifdef JSON_DLL_BUILD
+#  define JSON_API __declspec(dllimport)
-
+# else
-#if !defined(JSON_API)
+#  define JSON_API
-#define JSON_API
+# endif
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#error                                                                         \
-    "ERROR:  Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities"
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-// As recommended at
-// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
-extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
-                                              const char* format, ...);
-#define jsoncpp_snprintf msvc_pre1900_c99_snprintf
-#else
-#define jsoncpp_snprintf std::snprintf
-#endif
-
-// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
-// integer
-// Storages, and 64 bits integer support is disabled.
-// #define JSON_NO_INT64 1
-
-// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools.
-// C++11 should be used directly in JSONCPP.
-#define JSONCPP_OVERRIDE override
-
-#ifdef __clang__
-#if __has_extension(attribute_deprecated_with_message)
-#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
-#elif defined(__GNUC__) // not clang (gcc comes later since clang emulates gcc)
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
-#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
-#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
-#endif                  // GNUC version
-#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates
-                        // MSVC)
-#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
-#endif // __clang__ || __GNUC__ || _MSC_VER
-
-#if !defined(JSONCPP_DEPRECATED)
-#define JSONCPP_DEPRECATED(message)
-#endif // if !defined(JSONCPP_DEPRECATED)
-
-#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6))
-#define JSON_USE_INT64_DOUBLE_CONVERSION 1
-#endif
-
-#if !defined(JSON_IS_AMALGAMATION)
-
-#include "allocator.h"
-#include "version.h"
-
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-using Int = int;
-using UInt = unsigned int;
-#if defined(JSON_NO_INT64)
-using LargestInt = int;
-using LargestUInt = unsigned int;
-#undef JSON_HAS_INT64
-#else                 // if defined(JSON_NO_INT64)
-// For Microsoft Visual use specific types as long long is not supported
-#if defined(_MSC_VER) // Microsoft Visual Studio
-using Int64 = __int64;
-using UInt64 = unsigned __int64;
-#else                 // if defined(_MSC_VER) // Other platforms, use long long
-using Int64 = int64_t;
-using UInt64 = uint64_t;
-#endif                // if defined(_MSC_VER)
-using LargestInt = Int64;
-using LargestUInt = UInt64;
-#define JSON_HAS_INT64
-#endif // if defined(JSON_NO_INT64)
-
-template <typename T>
-using Allocator =
-    typename std::conditional<JSONCPP_USE_SECURE_MEMORY, SecureAllocator<T>,
-                              std::allocator<T>>::type;
-using String = std::basic_string<char, std::char_traits<char>, Allocator<char>>;
-using IStringStream =
-    std::basic_istringstream<String::value_type, String::traits_type,
-                             String::allocator_type>;
-using OStringStream =
-    std::basic_ostringstream<String::value_type, String::traits_type,
-                             String::allocator_type>;
-using IStream = std::istream;
-using OStream = std::ostream;
-} // namespace Json
-
-// Legacy names (formerly macros).
-using JSONCPP_STRING = Json::String;
-using JSONCPP_ISTRINGSTREAM = Json::IStringStream;
-using JSONCPP_OSTRINGSTREAM = Json::OStringStream;
-using JSONCPP_ISTREAM = Json::IStream;
-using JSONCPP_OSTREAM = Json::OStream;
 
 #endif // JSON_CONFIG_H_INCLUDED

include/json/features.h

@@ -0,0 +1,42 @@
+#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
+# define CPPTL_JSON_FEATURES_H_INCLUDED
+
+# include "forwards.h"
+
+namespace Json {
+
+   /** \brief Configuration passed to reader and writer.
+    * This configuration object can be used to force the Reader or Writer
+    * to behave in a standard conforming way.
+    */
+   class JSON_API Features
+   {
+   public:
+      /** \brief A configuration that allows all features and assumes all strings are UTF-8.
+       * - C & C++ comments are allowed
+       * - Root object can be any JSON value
+       * - Assumes Value strings are encoded in UTF-8
+       */
+      static Features all();
+
+      /** \brief A configuration that is strictly compatible with the JSON specification.
+       * - Comments are forbidden.
+       * - Root object must be either an array or an object value.
+       * - Assumes Value strings are encoded in UTF-8
+       */
+      static Features strictMode();
+
+      /** \brief Initialize the configuration like JsonConfig::allFeatures;
+       */
+      Features();
+
+      /// \c true if comments are allowed. Default: \c true.
+      bool allowComments_;
+
+      /// \c true if root must be either an array or an object value. Default: \c false.
+      bool strictRoot_;
+   };
+
+} // namespace Json
+
+#endif // CPPTL_JSON_FEATURES_H_INCLUDED

include/json/forwards.h

@@ -1,43 +1,39 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 #ifndef JSON_FORWARDS_H_INCLUDED
-#define JSON_FORWARDS_H_INCLUDED
+# define JSON_FORWARDS_H_INCLUDED
 
-#if !defined(JSON_IS_AMALGAMATION)
+# include "config.h"
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
 
 namespace Json {
 
-// writer.h
+   // writer.h
-class StreamWriter;
+   class FastWriter;
-class StreamWriterBuilder;
+   class StyledWriter;
-class Writer;
-class FastWriter;
-class StyledWriter;
-class StyledStreamWriter;
 
-// reader.h
+   // reader.h
-class Reader;
+   class Reader;
-class CharReader;
-class CharReaderBuilder;
 
-// json_features.h
+   // features.h
-class Features;
+   class Features;
 
-// value.h
+   // value.h
-using ArrayIndex = unsigned int;
+   typedef int Int;
-class StaticString;
+   typedef unsigned int UInt;
-class Path;
+   class StaticString;
-class PathArgument;
+   class Path;
-class Value;
+   class PathArgument;
-class ValueIteratorBase;
+   class Value;
-class ValueIterator;
+   class ValueIteratorBase;
-class ValueConstIterator;
+   class ValueIterator;
+   class ValueConstIterator;
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+   class ValueAllocator;
+   class ValueMapAllocator;
+   class ValueInternalLink;
+   class ValueInternalArray;
+   class ValueInternalMap;
+#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
 
 } // namespace Json
 
+
 #endif // JSON_FORWARDS_H_INCLUDED

include/json/json.h

@@ -1,15 +1,10 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 #ifndef JSON_JSON_H_INCLUDED
-#define JSON_JSON_H_INCLUDED
+# define JSON_JSON_H_INCLUDED
 
-#include "config.h"
+# include "autolink.h"
-#include "json_features.h"
+# include "value.h"
-#include "reader.h"
+# include "reader.h"
-#include "value.h"
+# include "writer.h"
-#include "writer.h"
+# include "features.h"
 
 #endif // JSON_JSON_H_INCLUDED

include/json/json_features.h

@@ -1,62 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_FEATURES_H_INCLUDED
-#define JSON_FEATURES_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-#pragma pack(push)
-#pragma pack()
-
-namespace Json {
-
-/** \brief Configuration passed to reader and writer.
- * This configuration object can be used to force the Reader or Writer
- * to behave in a standard conforming way.
- */
-class JSON_API Features {
-public:
-  /** \brief A configuration that allows all features and assumes all strings
-   * are UTF-8.
-   * - C & C++ comments are allowed
-   * - Root object can be any JSON value
-   * - Assumes Value strings are encoded in UTF-8
-   */
-  static Features all();
-
-  /** \brief A configuration that is strictly compatible with the JSON
-   * specification.
-   * - Comments are forbidden.
-   * - Root object must be either an array or an object value.
-   * - Assumes Value strings are encoded in UTF-8
-   */
-  static Features strictMode();
-
-  /** \brief Initialize the configuration like JsonConfig::allFeatures;
-   */
-  Features();
-
-  /// \c true if comments are allowed. Default: \c true.
-  bool allowComments_{true};
-
-  /// \c true if root must be either an array or an object value. Default: \c
-  /// false.
-  bool strictRoot_{false};
-
-  /// \c true if dropped null placeholders are allowed. Default: \c false.
-  bool allowDroppedNullPlaceholders_{false};
-
-  /// \c true if numeric object key are allowed. Default: \c false.
-  bool allowNumericKeys_{false};
-};
-
-} // namespace Json
-
-#pragma pack(pop)
-
-#endif // JSON_FEATURES_H_INCLUDED

include/json/reader.h

@@ -1,162 +1,78 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+#ifndef CPPTL_JSON_READER_H_INCLUDED
-// Distributed under MIT license, or public domain if desired and
+# define CPPTL_JSON_READER_H_INCLUDED
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#ifndef JSON_READER_H_INCLUDED
+# include "features.h"
-#define JSON_READER_H_INCLUDED
+# include "value.h"
-
+# include <deque>
-#if !defined(JSON_IS_AMALGAMATION)
+# include <stack>
-#include "json_features.h"
+# include <string>
-#include "value.h"
+# include <iostream>
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <deque>
-#include <iosfwd>
-#include <istream>
-#include <stack>
-#include <string>
-
-// Disable warning C4251: <data member>: <type> needs to have dll-interface to
-// be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(push)
-#pragma warning(disable : 4251)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#pragma pack(push)
-#pragma pack()
 
 namespace Json {
 
-/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a
+   /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
- * Value.
     *
- * \deprecated Use CharReader and CharReaderBuilder.
     */
+   class JSON_API Reader
+   {
+   public:
+      typedef char Char;
+      typedef const Char *Location;
 
-class JSON_API Reader {
+      /** \brief Constructs a Reader allowing all features
-public:
+       * for parsing.
-  using Char = char;
-  using Location = const Char*;
-
-  /** \brief An error tagged with where in the JSON text it was encountered.
-   *
-   * The offsets give the [start, limit) range of bytes within the text. Note
-   * that this is bytes, not codepoints.
-   */
-  struct StructuredError {
-    ptrdiff_t offset_start;
-    ptrdiff_t offset_limit;
-    String message;
-  };
-
-  /** \brief Constructs a Reader allowing all features for parsing.
-   * \deprecated Use CharReader and CharReaderBuilder.
        */
       Reader();
 
-  /** \brief Constructs a Reader allowing the specified feature set for parsing.
+      /** \brief Constructs a Reader allowing the specified feature set
-   * \deprecated Use CharReader and CharReaderBuilder.
+       * for parsing.
        */
-  Reader(const Features& features);
+      Reader( const Features &features );
 
-  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
+      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-   * document.
+       * \param document UTF-8 encoded string containing the document to read.
-   *
+       * \param root [out] Contains the root value of the document if it was
-   * \param      document        UTF-8 encoded string containing the document
+       *             successfully parsed.
-   *                             to read.
+       * \param collectComments \c true to collect comment and allow writing them back during
-   * \param[out] root            Contains the root value of the document if it
+       *                        serialization, \c false to discard comments.
-   *                             was successfully parsed.
+       *                        This parameter is ignored if Features::allowComments_
-   * \param      collectComments \c true to collect comment and allow writing
+       *                        is \c false.
-   *                             them back during serialization, \c false to
+       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-   *                             discard comments.  This parameter is ignored
-   *                             if Features::allowComments_ is \c false.
-   * \return \c true if the document was successfully parsed, \c false if an
-   * error occurred.
        */
-  bool parse(const std::string& document, Value& root,
+      bool parse( const std::string &document, 
-             bool collectComments = true);
+                  Value &root,
+                  bool collectComments = true );
 
-  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
+      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-   * document.
+       * \param document UTF-8 encoded string containing the document to read.
-   *
+       * \param root [out] Contains the root value of the document if it was
-   * \param      beginDoc        Pointer on the beginning of the UTF-8 encoded
+       *             successfully parsed.
-   *                             string of the document to read.
+       * \param collectComments \c true to collect comment and allow writing them back during
-   * \param      endDoc          Pointer on the end of the UTF-8 encoded string
+       *                        serialization, \c false to discard comments.
-   *                             of the document to read.  Must be >= beginDoc.
+       *                        This parameter is ignored if Features::allowComments_
-   * \param[out] root            Contains the root value of the document if it
+       *                        is \c false.
-   *                             was successfully parsed.
+       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-   * \param      collectComments \c true to collect comment and allow writing
-   *                             them back during serialization, \c false to
-   *                             discard comments.  This parameter is ignored
-   *                             if Features::allowComments_ is \c false.
-   * \return \c true if the document was successfully parsed, \c false if an
-   * error occurred.
        */
-  bool parse(const char* beginDoc, const char* endDoc, Value& root,
+      bool parse( const char *beginDoc, const char *endDoc, 
-             bool collectComments = true);
+                  Value &root,
+                  bool collectComments = true );
 
       /// \brief Parse from input stream.
       /// \see Json::operator>>(std::istream&, Json::Value&).
-  bool parse(IStream& is, Value& root, bool collectComments = true);
+      bool parse( std::istream &is,
+                  Value &root,
+                  bool collectComments = true );
 
-  /** \brief Returns a user friendly string that list errors in the parsed
+      /** \brief Returns a user friendly string that list errors in the parsed document.
-   * document.
+       * \return Formatted error message with the list of errors with their location in 
-   *
+       *         the parsed document. An empty string is returned if no error occurred
-   * \return Formatted error message with the list of errors with their
+       *         during parsing.
-   * location in the parsed document. An empty string is returned if no error
-   * occurred during parsing.
-   * \deprecated Use getFormattedErrorMessages() instead (typo fix).
        */
-  JSONCPP_DEPRECATED("Use getFormattedErrorMessages() instead.")
+      std::string getFormatedErrorMessages() const;
-  String getFormatedErrorMessages() const;
 
-  /** \brief Returns a user friendly string that list errors in the parsed
+   private:
-   * document.
+      enum TokenType
-   *
+      {
-   * \return Formatted error message with the list of errors with their
-   * location in the parsed document. An empty string is returned if no error
-   * occurred during parsing.
-   */
-  String getFormattedErrorMessages() const;
-
-  /** \brief Returns a vector of structured errors encountered while parsing.
-   *
-   * \return A (possibly empty) vector of StructuredError objects. Currently
-   * only one error can be returned, but the caller should tolerate multiple
-   * errors.  This can occur if the parser recovers from a non-fatal parse
-   * error and then encounters additional errors.
-   */
-  std::vector<StructuredError> getStructuredErrors() const;
-
-  /** \brief Add a semantic error message.
-   *
-   * \param value   JSON Value location associated with the error
-   * \param message The error message.
-   * \return \c true if the error was successfully added, \c false if the Value
-   * offset exceeds the document size.
-   */
-  bool pushError(const Value& value, const String& message);
-
-  /** \brief Add a semantic error message with extra context.
-   *
-   * \param value   JSON Value location associated with the error
-   * \param message The error message.
-   * \param extra   Additional JSON Value location to contextualize the error
-   * \return \c true if the error was successfully added, \c false if either
-   * Value offset exceeds the document size.
-   */
-  bool pushError(const Value& value, const String& message, const Value& extra);
-
-  /** \brief Return whether there are any errors.
-   *
-   * \return \c true if there are no errors to report \c false if errors have
-   * occurred.
-   */
-  bool good() const;
-
-private:
-  enum TokenType {
          tokenEndOfStream = 0,
          tokenObjectBegin,
          tokenObjectEnd,
@@ -173,265 +89,108 @@ private:
          tokenError
       };
 
-  class Token {
+      class Token
+      {
       public:
          TokenType type_;
          Location start_;
          Location end_;
       };
 
-  class ErrorInfo {
+      class ErrorInfo
+      {
       public:
          Token token_;
-    String message_;
+         std::string message_;
          Location extra_;
       };
 
-  using Errors = std::deque<ErrorInfo>;
+      typedef std::deque<ErrorInfo> Errors;
 
-  bool readToken(Token& token);
+      bool expectToken( TokenType type, Token &token, const char *message );
-  bool readTokenSkippingComments(Token& token);
+      bool readToken( Token &token );
       void skipSpaces();
-  bool match(const Char* pattern, int patternLength);
+      bool match( Location pattern, 
+                  int patternLength );
       bool readComment();
       bool readCStyleComment();
       bool readCppStyleComment();
       bool readString();
       void readNumber();
       bool readValue();
-  bool readObject(Token& token);
+      bool readObject( Token &token );
-  bool readArray(Token& token);
+      bool readArray( Token &token );
-  bool decodeNumber(Token& token);
+      bool decodeNumber( Token &token );
-  bool decodeNumber(Token& token, Value& decoded);
+      bool decodeString( Token &token );
-  bool decodeString(Token& token);
+      bool decodeString( Token &token, std::string &decoded );
-  bool decodeString(Token& token, String& decoded);
+      bool decodeDouble( Token &token );
-  bool decodeDouble(Token& token);
+      bool decodeUnicodeCodePoint( Token &token, 
-  bool decodeDouble(Token& token, Value& decoded);
+                                   Location &current, 
-  bool decodeUnicodeCodePoint(Token& token, Location& current, Location end,
+                                   Location end, 
-                              unsigned int& unicode);
+                                   unsigned int &unicode );
-  bool decodeUnicodeEscapeSequence(Token& token, Location& current,
+      bool decodeUnicodeEscapeSequence( Token &token, 
-                                   Location end, unsigned int& unicode);
+                                        Location &current, 
-  bool addError(const String& message, Token& token, Location extra = nullptr);
+                                        Location end, 
-  bool recoverFromError(TokenType skipUntilToken);
+                                        unsigned int &unicode );
-  bool addErrorAndRecover(const String& message, Token& token,
+      bool addError( const std::string &message, 
-                          TokenType skipUntilToken);
+                     Token &token,
+                     Location extra = 0 );
+      bool recoverFromError( TokenType skipUntilToken );
+      bool addErrorAndRecover( const std::string &message, 
+                               Token &token,
+                               TokenType skipUntilToken );
       void skipUntilSpace();
-  Value& currentValue();
+      Value &currentValue();
       Char getNextChar();
-  void getLocationLineAndColumn(Location location, int& line,
+      void getLocationLineAndColumn( Location location,
-                                int& column) const;
+                                     int &line,
-  String getLocationLineAndColumn(Location location) const;
+                                     int &column ) const;
-  void addComment(Location begin, Location end, CommentPlacement placement);
+      std::string getLocationLineAndColumn( Location location ) const;
+      void addComment( Location begin, 
+                       Location end, 
+                       CommentPlacement placement );
+      void skipCommentTokens( Token &token );
    
-  static bool containsNewLine(Location begin, Location end);
+      typedef std::stack<Value *> Nodes;
-  static String normalizeEOL(Location begin, Location end);
-
-  using Nodes = std::stack<Value*>;
       Nodes nodes_;
       Errors errors_;
-  String document_;
+      std::string document_;
-  Location begin_{};
+      Location begin_;
-  Location end_{};
+      Location end_;
-  Location current_{};
+      Location current_;
-  Location lastValueEnd_{};
+      Location lastValueEnd_;
-  Value* lastValue_{};
+      Value *lastValue_;
-  String commentsBefore_;
+      std::string commentsBefore_;
       Features features_;
-  bool collectComments_{};
+      bool collectComments_;
-}; // Reader
-
-/** Interface for reading JSON from a char array.
- */
-class JSON_API CharReader {
-public:
-  struct JSON_API StructuredError {
-    ptrdiff_t offset_start;
-    ptrdiff_t offset_limit;
-    String message;
    };
 
-  virtual ~CharReader() = default;
+   /** \brief Read from 'sin' into 'root'.
-  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
+
-   * document. The document must be a UTF-8 encoded string containing the
+    Always keep comments from the input JSON.
-   * document to read.
+
-   *
+    This can be used to read a file into a particular sub-object.
-   * \param      beginDoc Pointer on the beginning of the UTF-8 encoded string
+    For example:
-   *                      of the document to read.
+    \code
-   * \param      endDoc   Pointer on the end of the UTF-8 encoded string of the
+    Json::Value root;
-   *                      document to read. Must be >= beginDoc.
+    cin >> root["dir"]["file"];
-   * \param[out] root     Contains the root value of the document if it was
+    cout << root;
-   *                      successfully parsed.
+    \endcode
-   * \param[out] errs     Formatted error messages (if not NULL) a user
+    Result:
-   *                      friendly string that lists errors in the parsed
+    \verbatim
-   *                      document.
+    {
-   * \return \c true if the document was successfully parsed, \c false if an
+	"dir": {
-   * error occurred.
+	    "file": {
+		// The input stream JSON would be nested here.
+	    }
+	}
+    }
+    \endverbatim
+    \throw std::exception on parse error.
+    \see Json::operator<<()
    */
-  virtual bool parse(char const* beginDoc, char const* endDoc, Value* root,
+   std::istream& operator>>( std::istream&, Value& );
-                     String* errs);
-
-  /** \brief Returns a vector of structured errors encountered while parsing.
-   * Each parse call resets the stored list of errors.
-   */
-  std::vector<StructuredError> getStructuredErrors() const;
-
-  class JSON_API Factory {
-  public:
-    virtual ~Factory() = default;
-    /** \brief Allocate a CharReader via operator new().
-     * \throw std::exception if something goes wrong (e.g. invalid settings)
-     */
-    virtual CharReader* newCharReader() const = 0;
-  }; // Factory
-
-protected:
-  class Impl {
-  public:
-    virtual ~Impl() = default;
-    virtual bool parse(char const* beginDoc, char const* endDoc, Value* root,
-                       String* errs) = 0;
-    virtual std::vector<StructuredError> getStructuredErrors() const = 0;
-  };
-
-  explicit CharReader(std::unique_ptr<Impl> impl) : _impl(std::move(impl)) {}
-
-private:
-  std::unique_ptr<Impl> _impl;
-}; // CharReader
-
-/** \brief Build a CharReader implementation.
- *
- * Usage:
- *   \code
- *   using namespace Json;
- *   CharReaderBuilder builder;
- *   builder["collectComments"] = false;
- *   Value value;
- *   String errs;
- *   bool ok = parseFromStream(builder, std::cin, &value, &errs);
- *   \endcode
- */
-class JSON_API CharReaderBuilder : public CharReader::Factory {
-public:
-  // Note: We use a Json::Value so that we can add data-members to this class
-  // without a major version bump.
-  /** Configuration of this builder.
-   * These are case-sensitive.
-   * Available settings (case-sensitive):
-   * - `"collectComments": false or true`
-   *   - true to collect comment and allow writing them back during
-   *     serialization, false to discard comments.  This parameter is ignored
-   *     if allowComments is false.
-   * - `"allowComments": false or true`
-   *   - true if comments are allowed.
-   * - `"allowTrailingCommas": false or true`
-   *   - true if trailing commas in objects and arrays are allowed.
-   * - `"strictRoot": false or true`
-   *   - true if root must be either an array or an object value
-   * - `"allowDroppedNullPlaceholders": false or true`
-   *   - true if dropped null placeholders are allowed. (See
-   *     StreamWriterBuilder.)
-   * - `"allowNumericKeys": false or true`
-   *   - true if numeric object keys are allowed.
-   * - `"allowSingleQuotes": false or true`
-   *   - true if '' are allowed for strings (both keys and values)
-   * - `"stackLimit": integer`
-   *   - Exceeding stackLimit (recursive depth of `readValue()`) will cause an
-   *     exception.
-   *   - This is a security issue (seg-faults caused by deeply nested JSON), so
-   *     the default is low.
-   * - `"failIfExtra": false or true`
-   *   - If true, `parse()` returns false when extra non-whitespace trails the
-   *     JSON value in the input string.
-   * - `"rejectDupKeys": false or true`
-   *   - If true, `parse()` returns false when a key is duplicated within an
-   *     object.
-   * - `"allowSpecialFloats": false or true`
-   *   - If true, special float values (NaNs and infinities) are allowed and
-   *     their values are lossfree restorable.
-   * - `"skipBom": false or true`
-   *   - If true, if the input starts with the Unicode byte order mark (BOM),
-   *     it is skipped.
-   *
-   * You can examine 'settings_` yourself to see the defaults. You can also
-   * write and read them just like any JSON Value.
-   * \sa setDefaults()
-   */
-  Json::Value settings_;
-
-  CharReaderBuilder();
-  ~CharReaderBuilder() override;
-
-  CharReader* newCharReader() const override;
-
-  /** \return true if 'settings' are legal and consistent;
-   *   otherwise, indicate bad settings via 'invalid'.
-   */
-  bool validate(Json::Value* invalid) const;
-
-  /** A simple way to update a specific setting.
-   */
-  Value& operator[](const String& key);
-
-  /** Called by ctor, but you can use this to reset settings_.
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults
-   */
-  static void setDefaults(Json::Value* settings);
-  /** Same as old Features::strictMode().
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode
-   */
-  static void strictMode(Json::Value* settings);
-  /** ECMA-404 mode.
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderECMA404Mode
-   */
-  static void ecma404Mode(Json::Value* settings);
-};
-
-/** Consume entire stream and use its begin/end.
- * Someday we might have a real StreamReader, but for now this
- * is convenient.
- */
-bool JSON_API parseFromStream(CharReader::Factory const&, IStream&, Value* root,
-                              String* errs);
-
-/** \brief Read from 'sin' into 'root'.
- *
- * Always keep comments from the input JSON.
- *
- * This can be used to read a file into a particular sub-object.
- * For example:
- *   \code
- *   Json::Value root;
- *   cin >> root["dir"]["file"];
- *   cout << root;
- *   \endcode
- * Result:
- * \verbatim
- * {
- * "dir": {
- *    "file": {
- *    // The input stream JSON would be nested here.
- *    }
- * }
- * }
- * \endverbatim
- * \throw std::exception on parse error.
- * \see Json::operator<<()
- */
-JSON_API IStream& operator>>(IStream&, Value&);
 
 } // namespace Json
 
-#pragma pack(pop)
+#endif // CPPTL_JSON_READER_H_INCLUDED
-
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(pop)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#endif // JSON_READER_H_INCLUDED

include/json/version.h

@@ -1,28 +0,0 @@
-#ifndef JSON_VERSION_H_INCLUDED
-#define JSON_VERSION_H_INCLUDED
-
-// Note: version must be updated in four places when doing a release. This
-// annoying process ensures that amalgamate, CMake, and meson all report the
-// correct version.
-// 1. /meson.build
-// 2. /include/json/version.h
-// 3. /CMakeLists.txt
-// 4. /MODULE.bazel
-// IMPORTANT: also update the SOVERSION!!
-
-#define JSONCPP_VERSION_STRING "1.9.7"
-#define JSONCPP_VERSION_MAJOR 1
-#define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 7
-#define JSONCPP_VERSION_QUALIFIER
-#define JSONCPP_VERSION_HEXA                                                   \
-  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
-   (JSONCPP_VERSION_PATCH << 8))
-
-#if !defined(JSONCPP_USE_SECURE_MEMORY)
-#define JSONCPP_USE_SECURE_MEMORY 0
-#endif
-// If non-zero, the library zeroes any memory that it has allocated before
-// it frees its memory.
-
-#endif // JSON_VERSION_H_INCLUDED

include/json/writer.h

@@ -1,368 +1,174 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 #ifndef JSON_WRITER_H_INCLUDED
-#define JSON_WRITER_H_INCLUDED
+# define JSON_WRITER_H_INCLUDED
 
-#if !defined(JSON_IS_AMALGAMATION)
+# include "value.h"
-#include "value.h"
+# include <vector>
-#endif // if !defined(JSON_IS_AMALGAMATION)
+# include <string>
-#include <ostream>
+# include <iostream>
-#include <string>
-#include <vector>
-
-// Disable warning C4251: <data member>: <type> needs to have dll-interface to
-// be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) && defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4251)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#pragma pack(push)
-#pragma pack()
 
 namespace Json {
 
-class Value;
+   class Value;
 
-/**
+   /** \brief Abstract class for writers.
- *
- * Usage:
- *  \code
- *  using namespace Json;
- *  void writeToStdout(StreamWriter::Factory const& factory, Value const& value)
- * { std::unique_ptr<StreamWriter> const writer( factory.newStreamWriter());
- *    writer->write(value, &std::cout);
- *    std::cout << std::endl;  // add lf and flush
- *  }
- *  \endcode
     */
-class JSON_API StreamWriter {
+   class JSON_API Writer
-protected:
+   {
-  OStream* sout_; // not owned; will not delete
-public:
-  StreamWriter();
-  virtual ~StreamWriter();
-  /** Write Value into document as configured in sub-class.
-   *   Do not take ownership of sout, but maintain a reference during function.
-   *   \pre sout != NULL
-   *   \return zero on success (For now, we always return zero, so check the
-   *   stream instead.) \throw std::exception possibly, depending on
-   * configuration
-   */
-  virtual int write(Value const& root, OStream* sout) = 0;
-
-  /** \brief A simple abstract factory.
-   */
-  class JSON_API Factory {
    public:
-    virtual ~Factory();
-    /** \brief Allocate a CharReader via operator new().
-     * \throw std::exception if something goes wrong (e.g. invalid settings)
-     */
-    virtual StreamWriter* newStreamWriter() const = 0;
-  }; // Factory
-}; // StreamWriter
-
-/** \brief Write into stringstream, then return string, for convenience.
- * A StreamWriter will be created from the factory, used, and then deleted.
- */
-String JSON_API writeString(StreamWriter::Factory const& factory,
-                            Value const& root);
-
-/** \brief Build a StreamWriter implementation.
-
-* Usage:
-*   \code
-*   using namespace Json;
-*   Value value = ...;
-*   StreamWriterBuilder builder;
-*   builder["commentStyle"] = "None";
-*   builder["indentation"] = "   ";  // or whatever you like
-*   std::unique_ptr<Json::StreamWriter> writer(
-*      builder.newStreamWriter());
-*   writer->write(value, &std::cout);
-*   std::cout << std::endl;  // add lf and flush
-*   \endcode
-*/
-class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
-public:
-  // Note: We use a Json::Value so that we can add data-members to this class
-  // without a major version bump.
-  /** Configuration of this builder.
-   *  Available settings (case-sensitive):
-   *  - "commentStyle": "None" or "All"
-   *  - "indentation":  "<anything>".
-   *  - Setting this to an empty string also omits newline characters.
-   *  - "enableYAMLCompatibility": false or true
-   *  - slightly change the whitespace around colons
-   *  - "dropNullPlaceholders": false or true
-   *  - Drop the "null" string from the writer's output for nullValues.
-   *    Strictly speaking, this is not valid JSON. But when the output is being
-   *    fed to a browser's JavaScript, it makes for smaller output and the
-   *    browser can handle the output just fine.
-   *  - "useSpecialFloats": false or true
-   *  - If true, outputs non-finite floating point values in the following way:
-   *    NaN values as "NaN", positive infinity as "Infinity", and negative
-   *  infinity as "-Infinity".
-   *  - "precision": int
-   *  - Number of precision digits for formatting of real values.
-   *  - "precisionType": "significant"(default) or "decimal"
-   *  - Type of precision for formatting of real values.
-   *  - "emitUTF8": false or true
-   *  - If true, outputs raw UTF8 strings instead of escaping them.
-
-   *  You can examine 'settings_` yourself
-   *  to see the defaults. You can also write and read them just like any
-   *  JSON Value.
-   *  \sa setDefaults()
-   */
-  Json::Value settings_;
-
-  StreamWriterBuilder();
-  ~StreamWriterBuilder() override;
-
-  /**
-   * \throw std::exception if something goes wrong (e.g. invalid settings)
-   */
-  StreamWriter* newStreamWriter() const override;
-
-  /** \return true if 'settings' are legal and consistent;
-   *   otherwise, indicate bad settings via 'invalid'.
-   */
-  bool validate(Json::Value* invalid) const;
-  /** A simple way to update a specific setting.
-   */
-  Value& operator[](const String& key);
-
-  /** Called by ctor, but you can use this to reset settings_.
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_writer.cpp StreamWriterBuilderDefaults
-   */
-  static void setDefaults(Json::Value* settings);
-};
-
-/** \brief Abstract class for writers.
- * \deprecated Use StreamWriter. (And really, this is an implementation detail.)
- */
-class JSON_API Writer {
-public:
       virtual ~Writer();
 
-  virtual String write(const Value& root) = 0;
+      virtual std::string write( const Value &root ) = 0;
-};
+   };
 
-/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format
+   /** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
- *without formatting (not human friendly).
     *
- * The JSON document is written in a single line. It is not intended for 'human'
+    * The JSON document is written in a single line. It is not intended for 'human' consumption,
- *consumption,
+    * but may be usefull to support feature such as RPC where bandwith is limited.
- * but may be useful to support feature such as RPC where bandwidth is limited.
     * \sa Reader, Value
- * \deprecated Use StreamWriterBuilder.
     */
-#if defined(_MSC_VER)
+   class JSON_API FastWriter : public Writer
-#pragma warning(push)
+   {
-#pragma warning(disable : 4996) // Deriving from deprecated class
+   public:
-#endif
-class JSON_API FastWriter : public Writer {
-public:
       FastWriter();
-  ~FastWriter() override = default;
+      virtual ~FastWriter(){}
 
       void enableYAMLCompatibility();
 
-  /** \brief Drop the "null" string from the writer's output for nullValues.
+   public: // overridden from Writer
-   * Strictly speaking, this is not valid JSON. But when the output is being
+      virtual std::string write( const Value &root );
-   * fed to a browser's JavaScript, it makes for smaller output and the
-   * browser can handle the output just fine.
-   */
-  void dropNullPlaceholders();
 
-  void omitEndingLineFeed();
+   private:
+      void writeValue( const Value &value );
 
-public: // overridden from Writer
+      std::string document_;
-  String write(const Value& root) override;
+      bool yamlCompatiblityEnabled_;
+   };
 
-private:
+   /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
-  void writeValue(const Value& value);
-
-  String document_;
-  bool yamlCompatibilityEnabled_{false};
-  bool dropNullPlaceholders_{false};
-  bool omitEndingLineFeed_{false};
-};
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
- *human friendly way.
     *
     * The rules for line break and indent are as follow:
     * - Object value:
     *     - if empty then print {} without indent and line break
- *     - if not empty the print '{', line break & indent, print one value per
+    *     - if not empty the print '{', line break & indent, print one value per line
- *line
     *       and then unindent and line break and print '}'.
     * - Array value:
     *     - if empty then print [] without indent and line break
- *     - if the array contains no object value, empty array or some other value
+    *     - if the array contains no object value, empty array or some other value types,
- *types,
+    *       and all the values fit on one lines, then print the array on a single line.
- *       and all the values fit on one lines, then print the array on a single
- *line.
     *     - otherwise, it the values do not fit on one line, or the array contains
     *       object or non empty array, then print one value per line.
     *
- * If the Value have comments then they are outputted according to their
+    * If the Value have comments then they are outputed according to their #CommentPlacement.
- *#CommentPlacement.
     *
     * \sa Reader, Value, Value::setComment()
- * \deprecated Use StreamWriterBuilder.
     */
-#if defined(_MSC_VER)
+   class JSON_API StyledWriter: public Writer
-#pragma warning(push)
+   {
-#pragma warning(disable : 4996) // Deriving from deprecated class
+   public:
-#endif
-class JSON_API StyledWriter : public Writer {
-public:
       StyledWriter();
-  ~StyledWriter() override = default;
+      virtual ~StyledWriter(){}
 
-public: // overridden from Writer
+   public: // overridden from Writer
       /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
        * \param root Value to serialize.
        * \return String containing the JSON document that represents the root value.
        */
-  String write(const Value& root) override;
+      virtual std::string write( const Value &root );
 
-private:
+   private:
-  void writeValue(const Value& value);
+      void writeValue( const Value &value );
-  void writeArrayValue(const Value& value);
+      void writeArrayValue( const Value &value );
-  bool isMultilineArray(const Value& value);
+      bool isMultineArray( const Value &value );
-  void pushValue(const String& value);
+      void pushValue( const std::string &value );
       void writeIndent();
-  void writeWithIndent(const String& value);
+      void writeWithIndent( const std::string &value );
       void indent();
       void unindent();
-  void writeCommentBeforeValue(const Value& root);
+      void writeCommentBeforeValue( const Value &root );
-  void writeCommentAfterValueOnSameLine(const Value& root);
+      void writeCommentAfterValueOnSameLine( const Value &root );
-  static bool hasCommentForValue(const Value& value);
+      bool hasCommentForValue( const Value &value );
-  static String normalizeEOL(const String& text);
+      static std::string normalizeEOL( const std::string &text );
 
-  using ChildValues = std::vector<String>;
+      typedef std::vector<std::string> ChildValues;
 
       ChildValues childValues_;
-  String document_;
+      std::string document_;
-  String indentString_;
+      std::string indentString_;
-  unsigned int rightMargin_{74};
+      int rightMargin_;
-  unsigned int indentSize_{3};
+      int indentSize_;
-  bool addChildValues_{false};
+      bool addChildValues_;
-};
+   };
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
 
-/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
+   /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
- human friendly way,
         to a stream rather than to a string.
     *
     * The rules for line break and indent are as follow:
     * - Object value:
     *     - if empty then print {} without indent and line break
- *     - if not empty the print '{', line break & indent, print one value per
+    *     - if not empty the print '{', line break & indent, print one value per line
- line
     *       and then unindent and line break and print '}'.
     * - Array value:
     *     - if empty then print [] without indent and line break
- *     - if the array contains no object value, empty array or some other value
+    *     - if the array contains no object value, empty array or some other value types,
- types,
+    *       and all the values fit on one lines, then print the array on a single line.
- *       and all the values fit on one lines, then print the array on a single
- line.
     *     - otherwise, it the values do not fit on one line, or the array contains
     *       object or non empty array, then print one value per line.
     *
- * If the Value have comments then they are outputted according to their
+    * If the Value have comments then they are outputed according to their #CommentPlacement.
- #CommentPlacement.
     *
- * \sa Reader, Value, Value::setComment()
- * \deprecated Use StreamWriterBuilder.
- */
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996) // Deriving from deprecated class
-#endif
-class JSON_API StyledStreamWriter {
-public:
-  /**
     * \param indentation Each level will be indented by this amount extra.
+    * \sa Reader, Value, Value::setComment()
     */
-  StyledStreamWriter(String indentation = "\t");
+   class JSON_API StyledStreamWriter
-  ~StyledStreamWriter() = default;
+   {
+   public:
+      StyledStreamWriter( std::string indentation="\t" );
+      ~StyledStreamWriter(){}
 
-public:
+   public:
       /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
        * \param out Stream to write to. (Can be ostringstream, e.g.)
        * \param root Value to serialize.
-   * \note There is no point in deriving from Writer, since write() should not
+       * \note There is no point in deriving from Writer, since write() should not return a value.
-   * return a value.
        */
-  void write(OStream& out, const Value& root);
+      void write( std::ostream &out, const Value &root );
 
-private:
+   private:
-  void writeValue(const Value& value);
+      void writeValue( const Value &value );
-  void writeArrayValue(const Value& value);
+      void writeArrayValue( const Value &value );
-  bool isMultilineArray(const Value& value);
+      bool isMultineArray( const Value &value );
-  void pushValue(const String& value);
+      void pushValue( const std::string &value );
       void writeIndent();
-  void writeWithIndent(const String& value);
+      void writeWithIndent( const std::string &value );
       void indent();
       void unindent();
-  void writeCommentBeforeValue(const Value& root);
+      void writeCommentBeforeValue( const Value &root );
-  void writeCommentAfterValueOnSameLine(const Value& root);
+      void writeCommentAfterValueOnSameLine( const Value &root );
-  static bool hasCommentForValue(const Value& value);
+      bool hasCommentForValue( const Value &value );
-  static String normalizeEOL(const String& text);
+      static std::string normalizeEOL( const std::string &text );
 
-  using ChildValues = std::vector<String>;
+      typedef std::vector<std::string> ChildValues;
 
       ChildValues childValues_;
-  OStream* document_;
+      std::ostream* document_;
-  String indentString_;
+      std::string indentString_;
-  unsigned int rightMargin_{74};
+      int rightMargin_;
-  String indentation_;
+      std::string indentation_;
-  bool addChildValues_ : 1;
+      bool addChildValues_;
-  bool indented_ : 1;
+   };
-};
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
 
-#if defined(JSON_HAS_INT64)
+   std::string JSON_API valueToString( Int value );
-String JSON_API valueToString(Int value);
+   std::string JSON_API valueToString( UInt value );
-String JSON_API valueToString(UInt value);
+   std::string JSON_API valueToString( double value );
-#endif // if defined(JSON_HAS_INT64)
+   std::string JSON_API valueToString( bool value );
-String JSON_API valueToString(LargestInt value);
+   std::string JSON_API valueToQuotedString( const char *value );
-String JSON_API valueToString(LargestUInt value);
-String JSON_API valueToString(
-    double value, unsigned int precision = Value::defaultRealPrecision,
-    PrecisionType precisionType = PrecisionType::significantDigits);
-String JSON_API valueToString(bool value);
-String JSON_API valueToQuotedString(const char* value);
-String JSON_API valueToQuotedString(const char* value, size_t length);
 
-/// \brief Output using the StyledStreamWriter.
+   /// \brief Output using the StyledStreamWriter.
-/// \see Json::operator>>()
+   /// \see Json::operator>>()
-JSON_API OStream& operator<<(OStream&, const Value& root);
+   std::ostream& operator<<( std::ostream&, const Value &root );
 
 } // namespace Json
 
-#pragma pack(pop)
 
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(pop)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 
 #endif // JSON_WRITER_H_INCLUDED

jsoncpp-namespaced-targets.cmake

@@ -1,9 +0,0 @@
-if (NOT TARGET JsonCpp::JsonCpp)
-    if (TARGET jsoncpp_static)
-        add_library(JsonCpp::JsonCpp INTERFACE IMPORTED)
-        set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static")
-    elseif (TARGET jsoncpp_lib)
-        add_library(JsonCpp::JsonCpp INTERFACE IMPORTED)
-        set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib")
-    endif ()
-endif ()

jsoncppConfig.cmake.in

@@ -1,11 +0,0 @@
-cmake_policy(PUSH)
-cmake_policy(VERSION 3.0...3.26)
-
-@PACKAGE_INIT@
-
-include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-targets.cmake" )
-include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
-
-check_required_components(JsonCpp)
-
-cmake_policy(POP)

jsoncppConfig.cmake.meson.in

@@ -1,6 +0,0 @@
-@PACKAGE_INIT@
-
-@MESON_SHARED_TARGET@
-@MESON_STATIC_TARGET@
-
-include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )

makefiles/vs71/jsoncpp.sln

@@ -0,0 +1,46 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		dummy = dummy
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

makefiles/vs71/jsontest.vcproj

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="jsontest"
+	ProjectGUID="{25AF2DD2-D396-4668-B188-488C33B8E620}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/vs71/debug/jsontest"
+			IntermediateDirectory="../../build/vs71/debug/jsontest"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/jsontest.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/jsontest.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/vs71/release/jsontest"
+			IntermediateDirectory="../../build/vs71/release/jsontest"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/jsontest.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\jsontestrunner\main.cpp">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

makefiles/vs71/lib_json.vcproj

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="lib_json"
+	ProjectGUID="{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/vs71/debug/lib_json"
+			IntermediateDirectory="../../build/vs71/debug/lib_json"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				StringPooling="TRUE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/json_vc71_libmtd.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/vs71/release/lib_json"
+			IntermediateDirectory="../../build/vs71/release/lib_json"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				EnableIntrinsicFunctions="TRUE"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="4"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/json_vc71_libmt.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="dummy|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				EnableIntrinsicFunctions="TRUE"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="4"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\include\json\autolink.h">
+		</File>
+		<File
+			RelativePath="..\..\include\json\config.h">
+		</File>
+		<File
+			RelativePath="..\..\include\json\features.h">
+		</File>
+		<File
+			RelativePath="..\..\include\json\forwards.h">
+		</File>
+		<File
+			RelativePath="..\..\include\json\json.h">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_batchallocator.h">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_internalarray.inl">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_internalmap.inl">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_reader.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_value.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_valueiterator.inl">
+		</File>
+		<File
+			RelativePath="..\..\src\lib_json\json_writer.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\json\reader.h">
+		</File>
+		<File
+			RelativePath="..\..\include\json\value.h">
+		</File>
+		<File
+			RelativePath="..\..\include\json\writer.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

makefiles/vs71/test_lib_json.vcproj

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_lib_json"
+	ProjectGUID="{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
+	RootNamespace="test_lib_json"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/vs71/debug/test_lib_json"
+			IntermediateDirectory="../../build/vs71/debug/test_lib_json"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/test_lib_json.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/test_lib_json.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Running all unit tests"
+				CommandLine="$(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/vs71/release/test_lib_json"
+			IntermediateDirectory="../../build/vs71/release/test_lib_json"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/test_lib_json.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Running all unit tests"
+				CommandLine="$(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\test_lib_json\jsontest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\test_lib_json\jsontest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\test_lib_json\main.cpp">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

makerelease.py

@@ -0,0 +1,368 @@
+"""Tag the sandbox for release, make source and doc tarballs.
+
+Requires Python 2.6
+
+Example of invocation (use to test the script):
+python makerelease.py --force --retag --platform=msvc6,msvc71,msvc80,mingw -ublep 0.5.0 0.6.0-dev
+
+Example of invocation when doing a release:
+python makerelease.py 0.5.0 0.6.0-dev
+"""
+import os.path
+import subprocess
+import sys
+import doxybuild
+import subprocess
+import xml.etree.ElementTree as ElementTree
+import shutil
+import urllib2
+import tempfile
+import os
+import time
+from devtools import antglob, fixeol, tarball
+
+SVN_ROOT = 'https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/'
+SVN_TAG_ROOT = SVN_ROOT + 'tags/jsoncpp'
+SCONS_LOCAL_URL = 'http://sourceforge.net/projects/scons/files/scons-local/1.2.0/scons-local-1.2.0.tar.gz/download'
+SOURCEFORGE_PROJECT = 'jsoncpp'
+
+def set_version( version ):
+    with open('version','wb') as f:
+        f.write( version.strip() )
+
+def rmdir_if_exist( dir_path ):
+    if os.path.isdir( dir_path ):
+        shutil.rmtree( dir_path )
+
+class SVNError(Exception):
+    pass
+
+def svn_command( command, *args ):
+    cmd = ['svn', '--non-interactive', command] + list(args)
+    print 'Running:', ' '.join( cmd )
+    process = subprocess.Popen( cmd,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.STDOUT )
+    stdout = process.communicate()[0]
+    if process.returncode:
+        error = SVNError( 'SVN command failed:\n' + stdout )
+        error.returncode = process.returncode
+        raise error
+    return stdout
+
+def check_no_pending_commit():
+    """Checks that there is no pending commit in the sandbox."""
+    stdout = svn_command( 'status', '--xml' )
+    etree = ElementTree.fromstring( stdout )
+    msg = []
+    for entry in etree.getiterator( 'entry' ):
+        path = entry.get('path')
+        status = entry.find('wc-status').get('item')
+        if status != 'unversioned' and path != 'version':
+            msg.append( 'File "%s" has pending change (status="%s")' % (path, status) )
+    if msg:
+        msg.insert(0, 'Pending change to commit found in sandbox. Commit them first!' )
+    return '\n'.join( msg )
+
+def svn_join_url( base_url, suffix ):
+    if not base_url.endswith('/'):
+        base_url += '/'
+    if suffix.startswith('/'):
+        suffix = suffix[1:]
+    return base_url + suffix
+
+def svn_check_if_tag_exist( tag_url ):
+    """Checks if a tag exist.
+    Returns: True if the tag exist, False otherwise.
+    """
+    try:
+        list_stdout = svn_command( 'list', tag_url )
+    except SVNError, e:
+        if e.returncode != 1 or not str(e).find('tag_url'):
+            raise e
+        # otherwise ignore error, meaning tag does not exist
+        return False
+    return True
+
+def svn_commit( message ):
+    """Commit the sandbox, providing the specified comment.
+    """
+    svn_command( 'ci', '-m', message )
+
+def svn_tag_sandbox( tag_url, message ):
+    """Makes a tag based on the sandbox revisions.
+    """
+    svn_command( 'copy', '-m', message, '.', tag_url )
+
+def svn_remove_tag( tag_url, message ):
+    """Removes an existing tag.
+    """
+    svn_command( 'delete', '-m', message, tag_url )
+
+def svn_export( tag_url, export_dir ):
+    """Exports the tag_url revision to export_dir.
+       Target directory, including its parent is created if it does not exist.
+       If the directory export_dir exist, it is deleted before export proceed.
+    """
+    rmdir_if_exist( export_dir )
+    svn_command( 'export', tag_url, export_dir )
+
+def fix_sources_eol( dist_dir ):
+    """Set file EOL for tarball distribution.
+    """
+    print 'Preparing exported source file EOL for distribution...'
+    prune_dirs = antglob.prune_dirs + 'scons-local* ./build* ./libs ./dist'
+    win_sources = antglob.glob( dist_dir, 
+        includes = '**/*.sln **/*.vcproj',
+        prune_dirs = prune_dirs )
+    unix_sources = antglob.glob( dist_dir,
+        includes = '''**/*.h **/*.cpp **/*.inl **/*.txt **/*.dox **/*.py **/*.html **/*.in
+        sconscript *.json *.expected AUTHORS LICENSE''',
+        excludes = antglob.default_excludes + 'scons.py sconsign.py scons-*',
+        prune_dirs = prune_dirs )
+    for path in win_sources:
+        fixeol.fix_source_eol( path, is_dry_run = False, verbose = True, eol = '\r\n' )
+    for path in unix_sources:
+        fixeol.fix_source_eol( path, is_dry_run = False, verbose = True, eol = '\n' )
+
+def download( url, target_path ):
+    """Download file represented by url to target_path.
+    """
+    f = urllib2.urlopen( url )
+    try:
+        data = f.read()
+    finally:
+        f.close()
+    fout = open( target_path, 'wb' )
+    try:
+        fout.write( data )
+    finally:
+        fout.close()
+
+def check_compile( distcheck_top_dir, platform ):
+    cmd = [sys.executable, 'scons.py', 'platform=%s' % platform, 'check']
+    print 'Running:', ' '.join( cmd )
+    log_path = os.path.join( distcheck_top_dir, 'build-%s.log' % platform )
+    flog = open( log_path, 'wb' )
+    try:
+        process = subprocess.Popen( cmd,
+                                    stdout=flog,
+                                    stderr=subprocess.STDOUT,
+                                    cwd=distcheck_top_dir )
+        stdout = process.communicate()[0]
+        status = (process.returncode == 0)
+    finally:
+        flog.close()
+    return (status, log_path)
+
+def write_tempfile( content, **kwargs ):
+    fd, path = tempfile.mkstemp( **kwargs )
+    f = os.fdopen( fd, 'wt' )
+    try:
+        f.write( content )
+    finally:
+        f.close()
+    return path
+
+class SFTPError(Exception):
+    pass
+
+def run_sftp_batch( userhost, sftp, batch, retry=0 ):
+    path = write_tempfile( batch, suffix='.sftp', text=True )
+    # psftp -agent -C blep,jsoncpp@web.sourceforge.net -batch -b batch.sftp -bc
+    cmd = [sftp, '-agent', '-C', '-batch', '-b', path, '-bc', userhost]
+    error = None
+    for retry_index in xrange(0, max(1,retry)):
+        heading = retry_index == 0 and 'Running:' or 'Retrying:'
+        print heading, ' '.join( cmd )
+        process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
+        stdout = process.communicate()[0]
+        if process.returncode != 0:
+            error = SFTPError( 'SFTP batch failed:\n' + stdout )
+        else:
+            break
+    if error:
+        raise error
+    return stdout
+
+def sourceforge_web_synchro( sourceforge_project, doc_dir,
+                             user=None, sftp='sftp' ):
+    """Notes: does not synchronize sub-directory of doc-dir.
+    """
+    userhost = '%s,%s@web.sourceforge.net' % (user, sourceforge_project)
+    stdout = run_sftp_batch( userhost, sftp, """
+cd htdocs
+dir
+exit
+""" )
+    existing_paths = set()
+    collect = 0
+    for line in stdout.split('\n'):
+        line = line.strip()
+        if not collect and line.endswith('> dir'):
+            collect = True
+        elif collect and line.endswith('> exit'):
+            break
+        elif collect == 1:
+            collect = 2
+        elif collect == 2:
+            path = line.strip().split()[-1:]
+            if path and path[0] not in ('.', '..'):
+                existing_paths.add( path[0] )
+    upload_paths = set( [os.path.basename(p) for p in antglob.glob( doc_dir )] )
+    paths_to_remove = existing_paths - upload_paths
+    if paths_to_remove:
+        print 'Removing the following file from web:'
+        print '\n'.join( paths_to_remove )
+        stdout = run_sftp_batch( userhost, sftp, """cd htdocs
+rm %s
+exit""" % ' '.join(paths_to_remove) )
+    print 'Uploading %d files:' % len(upload_paths)
+    batch_size = 10
+    upload_paths = list(upload_paths)
+    start_time = time.time()
+    for index in xrange(0,len(upload_paths),batch_size):
+        paths = upload_paths[index:index+batch_size]
+        file_per_sec = (time.time() - start_time) / (index+1)
+        remaining_files = len(upload_paths) - index
+        remaining_sec = file_per_sec * remaining_files
+        print '%d/%d, ETA=%.1fs' % (index+1, len(upload_paths), remaining_sec)
+        run_sftp_batch( userhost, sftp, """cd htdocs
+lcd %s
+mput %s
+exit""" % (doc_dir, ' '.join(paths) ), retry=3 )
+
+def sourceforge_release_tarball( sourceforge_project, paths, user=None, sftp='sftp' ):
+    userhost = '%s,%s@frs.sourceforge.net' % (user, sourceforge_project)
+    run_sftp_batch( userhost, sftp, """
+mput %s
+exit
+""" % (' '.join(paths),) )
+
+
+def main():
+    usage = """%prog release_version next_dev_version
+Update 'version' file to release_version and commit.
+Generates the document tarball.
+Tags the sandbox revision with release_version.
+Update 'version' file to next_dev_version and commit.
+
+Performs an svn export of tag release version, and build a source tarball.    
+
+Must be started in the project top directory.
+
+Warning: --force should only be used when developping/testing the release script.
+"""
+    from optparse import OptionParser
+    parser = OptionParser(usage=usage)
+    parser.allow_interspersed_args = False
+    parser.add_option('--dot', dest="dot_path", action='store', default=doxybuild.find_program('dot'),
+        help="""Path to GraphViz dot tool. Must be full qualified path. [Default: %default]""")
+    parser.add_option('--doxygen', dest="doxygen_path", action='store', default=doxybuild.find_program('doxygen'),
+        help="""Path to Doxygen tool. [Default: %default]""")
+    parser.add_option('--force', dest="ignore_pending_commit", action='store_true', default=False,
+        help="""Ignore pending commit. [Default: %default]""")
+    parser.add_option('--retag', dest="retag_release", action='store_true', default=False,
+        help="""Overwrite release existing tag if it exist. [Default: %default]""")
+    parser.add_option('-p', '--platforms', dest="platforms", action='store', default='',
+        help="""Comma separated list of platform passed to scons for build check.""")
+    parser.add_option('--no-test', dest="no_test", action='store_true', default=False,
+        help="""Skips build check.""")
+    parser.add_option('--no-web', dest="no_web", action='store_true', default=False,
+        help="""Do not update web site.""")
+    parser.add_option('-u', '--upload-user', dest="user", action='store',
+                      help="""Sourceforge user for SFTP documentation upload.""")
+    parser.add_option('--sftp', dest='sftp', action='store', default=doxybuild.find_program('psftp', 'sftp'),
+                      help="""Path of the SFTP compatible binary used to upload the documentation.""")
+    parser.enable_interspersed_args()
+    options, args = parser.parse_args()
+
+    if len(args) != 2:
+        parser.error( 'release_version missing on command-line.' )
+    release_version = args[0]
+    next_version = args[1]
+
+    if not options.platforms and not options.no_test:
+        parser.error( 'You must specify either --platform or --no-test option.' )
+
+    if options.ignore_pending_commit:
+        msg = ''
+    else:
+        msg = check_no_pending_commit()
+    if not msg:
+        print 'Setting version to', release_version
+        set_version( release_version )
+        svn_commit( 'Release ' + release_version )
+        tag_url = svn_join_url( SVN_TAG_ROOT, release_version )
+        if svn_check_if_tag_exist( tag_url ):
+            if options.retag_release:
+                svn_remove_tag( tag_url, 'Overwriting previous tag' )
+            else:
+                print 'Aborting, tag %s already exist. Use --retag to overwrite it!' % tag_url
+                sys.exit( 1 )
+        svn_tag_sandbox( tag_url, 'Release ' + release_version )
+
+        print 'Generated doxygen document...'
+##        doc_dirname = r'jsoncpp-api-html-0.5.0'
+##        doc_tarball_path = r'e:\prg\vc\Lib\jsoncpp-trunk\dist\jsoncpp-api-html-0.5.0.tar.gz'
+        doc_tarball_path, doc_dirname = doxybuild.build_doc( options, make_release=True )
+        doc_distcheck_dir = 'dist/doccheck'
+        tarball.decompress( doc_tarball_path, doc_distcheck_dir )
+        doc_distcheck_top_dir = os.path.join( doc_distcheck_dir, doc_dirname )
+        
+        export_dir = 'dist/export'
+        svn_export( tag_url, export_dir )
+        fix_sources_eol( export_dir )
+        
+        source_dir = 'jsoncpp-src-' + release_version
+        source_tarball_path = 'dist/%s.tar.gz' % source_dir
+        print 'Generating source tarball to', source_tarball_path
+        tarball.make_tarball( source_tarball_path, [export_dir], export_dir, prefix_dir=source_dir )
+
+        # Decompress source tarball, download and install scons-local
+        distcheck_dir = 'dist/distcheck'
+        distcheck_top_dir = distcheck_dir + '/' + source_dir
+        print 'Decompressing source tarball to', distcheck_dir
+        rmdir_if_exist( distcheck_dir )
+        tarball.decompress( source_tarball_path, distcheck_dir )
+        scons_local_path = 'dist/scons-local.tar.gz'
+        print 'Downloading scons-local to', scons_local_path
+        download( SCONS_LOCAL_URL, scons_local_path )
+        print 'Decompressing scons-local to', distcheck_top_dir
+        tarball.decompress( scons_local_path, distcheck_top_dir )
+
+        # Run compilation
+        print 'Compiling decompressed tarball'
+        all_build_status = True
+        for platform in options.platforms.split(','):
+            print 'Testing platform:', platform
+            build_status, log_path = check_compile( distcheck_top_dir, platform )
+            print 'see build log:', log_path
+            print build_status and '=> ok' or '=> FAILED'
+            all_build_status = all_build_status and build_status
+        if not build_status:
+            print 'Testing failed on at least one platform, aborting...'
+            svn_remove_tag( tag_url, 'Removing tag due to failed testing' )
+            sys.exit(1)
+        if options.user:
+            if not options.no_web:
+                print 'Uploading documentation using user', options.user
+                sourceforge_web_synchro( SOURCEFORGE_PROJECT, doc_distcheck_top_dir, user=options.user, sftp=options.sftp )
+                print 'Completed documentation upload'
+            print 'Uploading source and documentation tarballs for release using user', options.user
+            sourceforge_release_tarball( SOURCEFORGE_PROJECT,
+                                         [source_tarball_path, doc_tarball_path],
+                                         user=options.user, sftp=options.sftp )
+            print 'Source and doc release tarballs uploaded'
+        else:
+            print 'No upload user specified. Web site and download tarbal were not uploaded.'
+            print 'Tarball can be found at:', doc_tarball_path
+
+        # Set next version number and commit            
+        set_version( next_version )
+        svn_commit( 'Released ' + release_version )
+    else:
+        sys.stderr.write( msg + '\n' )
+ 
+if __name__ == '__main__':
+    main()

meson.build

@@ -1,157 +0,0 @@
-project(
-  'jsoncpp',
-  'cpp',
-
-  # Note: version must be updated in four places when doing a release. This
-  # annoying process ensures that amalgamate, CMake, and meson all report the
-  # correct version.
-  # 1. /meson.build
-  # 2. /include/json/version.h
-  # 3. /CMakeLists.txt
-  # 4. /MODULE.bazel
-  # IMPORTANT: also update the SOVERSION!!
-  version : '1.9.7',
-  default_options : [
-    'buildtype=release',
-    'cpp_std=c++11',
-    'warning_level=1'],
-  license : 'Public Domain',
-  meson_version : '>= 0.54.0')
-
-
-jsoncpp_headers = files([
-  'include/json/allocator.h',
-  'include/json/assertions.h',
-  'include/json/config.h',
-  'include/json/json_features.h',
-  'include/json/forwards.h',
-  'include/json/json.h',
-  'include/json/reader.h',
-  'include/json/value.h',
-  'include/json/version.h',
-  'include/json/writer.h',
-])
-jsoncpp_include_directories = include_directories('include')
-
-install_headers(
-  jsoncpp_headers,
-  subdir : 'json')
-
-if get_option('default_library') == 'shared' and meson.get_compiler('cpp').get_id() == 'msvc'
-  dll_export_flag = '-DJSON_DLL_BUILD'
-  dll_import_flag = '-DJSON_DLL'
-else
-  dll_export_flag = []
-  dll_import_flag = []
-endif
-
-jsoncpp_lib = library(
-  'jsoncpp', files([
-    'src/lib_json/json_reader.cpp',
-    'src/lib_json/json_value.cpp',
-    'src/lib_json/json_writer.cpp',
-  ]),
-  soversion : 27,
-  install : true,
-  include_directories : jsoncpp_include_directories,
-  cpp_args: dll_export_flag)
-
-import('pkgconfig').generate(
-  libraries : jsoncpp_lib,
-  version : meson.project_version(),
-  name : 'jsoncpp',
-  filebase : 'jsoncpp',
-  description : 'A C++ library for interacting with JSON')
-
-cmakeconf = configuration_data()
-cmakeconf.set('MESON_LIB_DIR', get_option('libdir'))
-cmakeconf.set('MESON_INCLUDE_DIR', get_option('includedir'))
-
-fs = import('fs')
-if get_option('default_library') == 'shared'
-  shared_name = fs.name(jsoncpp_lib.full_path())
-endif
-if get_option('default_library') == 'static'
-  static_name = fs.name(jsoncpp_lib.full_path())
-endif
-if get_option('default_library') == 'both'
-  shared_name = fs.name(jsoncpp_lib.get_shared_lib().full_path())
-  static_name = fs.name(jsoncpp_lib.get_static_lib().full_path())
-endif
-
-if get_option('default_library') == 'shared' or get_option('default_library') == 'both'
-   cmakeconf.set('MESON_SHARED_TARGET', '''
-add_library(jsoncpp_lib IMPORTED SHARED)
-set_target_properties(jsoncpp_lib PROPERTIES
-  IMPORTED_LOCATION "''' + join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir'), shared_name) + '''"
-  INTERFACE_INCLUDE_DIRECTORIES "''' + join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')) + '")')
-endif
-if get_option('default_library') == 'static' or get_option('default_library') == 'both'
-   cmakeconf.set('MESON_STATIC_TARGET', '''
-add_library(jsoncpp_static IMPORTED STATIC)
-set_target_properties(jsoncpp_static PROPERTIES
-  IMPORTED_LOCATION "''' + join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir'), static_name) + '''"
-  INTERFACE_INCLUDE_DIRECTORIES "''' + join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')) + '")')
-endif
-
-import('cmake').configure_package_config_file(
-  name: 'jsoncpp',
-  input: 'jsoncppConfig.cmake.meson.in',
-  configuration: cmakeconf)
-install_data('jsoncpp-namespaced-targets.cmake', install_dir : join_paths(get_option('libdir'), 'cmake', jsoncpp_lib.name()))
-
-# for libraries bundling jsoncpp
-jsoncpp_dep = declare_dependency(
-  include_directories : jsoncpp_include_directories,
-  link_with : jsoncpp_lib,
-  version : meson.project_version())
-
-# tests
-if meson.is_subproject() or not get_option('tests')
-  subdir_done()
-endif
-
-python = find_program('python3')
-
-jsoncpp_test = executable(
-  'jsoncpp_test', files([
-    'src/test_lib_json/jsontest.cpp',
-    'src/test_lib_json/main.cpp',
-    'src/test_lib_json/fuzz.cpp',
-  ]),
-  include_directories : jsoncpp_include_directories,
-  link_with : jsoncpp_lib,
-  install : false,
-  cpp_args: dll_import_flag)
-test(
-  'unittest_jsoncpp_test',
-  jsoncpp_test)
-
-jsontestrunner = executable(
-  'jsontestrunner',
-  'src/jsontestrunner/main.cpp',
-  include_directories : jsoncpp_include_directories,
-  link_with : jsoncpp_lib,
-  install : false,
-  cpp_args: dll_import_flag)
-test(
-  'unittest_jsontestrunner',
-  python,
-  args : [
-    '-B',
-    join_paths(meson.current_source_dir(), 'test/runjsontests.py'),
-    jsontestrunner,
-    join_paths(meson.current_source_dir(), 'test/data')],
-  )
-test(
-  'jsonchecker_jsontestrunner',
-  python,
-  is_parallel : false,
-  args : [
-    '-B',
-    join_paths(meson.current_source_dir(), 'test/runjsontests.py'),
-    '--with-json-checker',
-    jsontestrunner,
-    join_paths(meson.current_source_dir(), 'test/data')],
-    workdir : join_paths(meson.current_source_dir(), 'test/data'),
-  )

meson_options.txt

@@ -1,5 +0,0 @@
-option(
-  'tests',
-  type : 'boolean',
-  value : true,
-  description : 'Enable building tests')

pkg-config/jsoncpp.pc.in

@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@libdir_for_pc_file@
-includedir=@includedir_for_pc_file@
-
-Name: jsoncpp
-Description: A C++ library for interacting with JSON
-Version: @PROJECT_VERSION@
-URL: https://github.com/open-source-parsers/jsoncpp
-Libs: -L${libdir} -ljsoncpp
-Cflags: -I${includedir}

reformat.sh

@@ -1 +0,0 @@
-find src -name '*.cpp' -or -name '*.h' | xargs clang-format -i

scons-tools/globtool.py

@@ -0,0 +1,53 @@
+import fnmatch
+import os
+
+def generate( env ): 
+   def Glob( env, includes = None, excludes = None, dir = '.' ):
+      """Adds Glob( includes = Split( '*' ), excludes = None, dir = '.')
+       helper function to environment.
+
+       Glob both the file-system files.
+
+       includes: list of file name pattern included in the return list when matched.
+       excludes: list of file name pattern exluced from the return list.
+
+       Example:
+       sources = env.Glob( ("*.cpp", '*.h'), "~*.cpp", "#src" )
+      """
+      def filterFilename(path):
+         abs_path = os.path.join( dir, path )
+         if not os.path.isfile(abs_path):
+            return 0
+         fn = os.path.basename(path)
+         match = 0
+         for include in includes:
+            if fnmatch.fnmatchcase( fn, include ):
+               match = 1
+               break
+         if match == 1 and not excludes is None:
+            for exclude in excludes:
+               if fnmatch.fnmatchcase( fn, exclude ):
+                  match = 0
+                  break
+         return match
+      if includes is None:
+         includes = ('*',)
+      elif type(includes) in ( type(''), type(u'') ):
+         includes = (includes,)
+      if type(excludes) in ( type(''), type(u'') ):
+         excludes = (excludes,)
+      dir = env.Dir(dir).abspath
+      paths = os.listdir( dir )
+      def makeAbsFileNode( path ):
+         return env.File( os.path.join( dir, path ) )
+      nodes = filter( filterFilename, paths )
+      return map( makeAbsFileNode, nodes )
+
+   from SCons.Script import Environment
+   Environment.Glob = Glob
+
+def exists(env):
+    """
+    Tool always exists.
+    """
+    return True

scons-tools/srcdist.py

@@ -0,0 +1,179 @@
+import os
+import os.path
+from fnmatch import fnmatch
+import targz
+
+##def DoxyfileParse(file_contents):
+##   """
+##   Parse a Doxygen source file and return a dictionary of all the values.
+##   Values will be strings and lists of strings.
+##   """
+##   data = {}
+##
+##   import shlex
+##   lex = shlex.shlex(instream = file_contents, posix = True)
+##   lex.wordchars += "*+./-:"
+##   lex.whitespace = lex.whitespace.replace("\n", "")
+##   lex.escape = ""
+##
+##   lineno = lex.lineno
+##   last_backslash_lineno = lineno
+##   token = lex.get_token()
+##   key = token   # the first token should be a key
+##   last_token = ""
+##   key_token = False
+##   next_key = False
+##   new_data = True
+##
+##   def append_data(data, key, new_data, token):
+##      if new_data or len(data[key]) == 0:
+##         data[key].append(token)
+##      else:
+##         data[key][-1] += token
+##
+##   while token:
+##      if token in ['\n']:
+##         if last_token not in ['\\']:
+##            key_token = True
+##      elif token in ['\\']:
+##         pass
+##      elif key_token:
+##         key = token
+##         key_token = False
+##      else:
+##         if token == "+=":
+##            if not data.has_key(key):
+##               data[key] = list()
+##         elif token == "=":
+##            data[key] = list()
+##         else:
+##            append_data( data, key, new_data, token )
+##            new_data = True
+##
+##      last_token = token
+##      token = lex.get_token()
+##      
+##      if last_token == '\\' and token != '\n':
+##         new_data = False
+##         append_data( data, key, new_data, '\\' )
+##
+##   # compress lists of len 1 into single strings
+##   for (k, v) in data.items():
+##      if len(v) == 0:
+##         data.pop(k)
+##
+##      # items in the following list will be kept as lists and not converted to strings
+##      if k in ["INPUT", "FILE_PATTERNS", "EXCLUDE_PATTERNS"]:
+##         continue
+##
+##      if len(v) == 1:
+##         data[k] = v[0]
+##
+##   return data
+##
+##def DoxySourceScan(node, env, path):
+##   """
+##   Doxygen Doxyfile source scanner.  This should scan the Doxygen file and add
+##   any files used to generate docs to the list of source files.
+##   """
+##   default_file_patterns = [
+##      '*.c', '*.cc', '*.cxx', '*.cpp', '*.c++', '*.java', '*.ii', '*.ixx',
+##      '*.ipp', '*.i++', '*.inl', '*.h', '*.hh ', '*.hxx', '*.hpp', '*.h++',
+##      '*.idl', '*.odl', '*.cs', '*.php', '*.php3', '*.inc', '*.m', '*.mm',
+##      '*.py',
+##   ]
+##
+##   default_exclude_patterns = [
+##      '*~',
+##   ]
+##
+##   sources = []
+##
+##   data = DoxyfileParse(node.get_contents())
+##
+##   if data.get("RECURSIVE", "NO") == "YES":
+##      recursive = True
+##   else:
+##      recursive = False
+##
+##   file_patterns = data.get("FILE_PATTERNS", default_file_patterns)
+##   exclude_patterns = data.get("EXCLUDE_PATTERNS", default_exclude_patterns)
+##
+##   for node in data.get("INPUT", []):
+##      if os.path.isfile(node):
+##         sources.add(node)
+##      elif os.path.isdir(node):
+##         if recursive:
+##            for root, dirs, files in os.walk(node):
+##               for f in files:
+##                  filename = os.path.join(root, f)
+##
+##                  pattern_check = reduce(lambda x, y: x or bool(fnmatch(filename, y)), file_patterns, False)
+##                  exclude_check = reduce(lambda x, y: x and fnmatch(filename, y), exclude_patterns, True)
+##
+##                  if pattern_check and not exclude_check:
+##                     sources.append(filename)
+##         else:
+##            for pattern in file_patterns:
+##               sources.extend(glob.glob("/".join([node, pattern])))
+##   sources = map( lambda path: env.File(path), sources )
+##   return sources
+##
+##
+##def DoxySourceScanCheck(node, env):
+##   """Check if we should scan this file"""
+##   return os.path.isfile(node.path)
+
+def srcDistEmitter(source, target, env):
+##   """Doxygen Doxyfile emitter"""
+##   # possible output formats and their default values and output locations
+##   output_formats = {
+##      "HTML": ("YES", "html"),
+##      "LATEX": ("YES", "latex"),
+##      "RTF": ("NO", "rtf"),
+##      "MAN": ("YES", "man"),
+##      "XML": ("NO", "xml"),
+##   }
+##
+##   data = DoxyfileParse(source[0].get_contents())
+##
+##   targets = []
+##   out_dir = data.get("OUTPUT_DIRECTORY", ".")
+##
+##   # add our output locations
+##   for (k, v) in output_formats.items():
+##      if data.get("GENERATE_" + k, v[0]) == "YES":
+##         targets.append(env.Dir( os.path.join(out_dir, data.get(k + "_OUTPUT", v[1]))) )
+##
+##   # don't clobber targets
+##   for node in targets:
+##      env.Precious(node)
+##
+##   # set up cleaning stuff
+##   for node in targets:
+##      env.Clean(node, node)
+##
+##   return (targets, source)
+   return (target,source)
+
+def generate(env):
+   """
+   Add builders and construction variables for the
+   SrcDist tool.
+   """
+##   doxyfile_scanner = env.Scanner(
+##      DoxySourceScan,
+##      "DoxySourceScan",
+##      scan_check = DoxySourceScanCheck,
+##   )
+
+   if targz.exists(env):
+      srcdist_builder = targz.makeBuilder( srcDistEmitter )
+
+      env['BUILDERS']['SrcDist'] = srcdist_builder
+
+def exists(env):
+   """
+   Make sure srcdist exists.
+   """
+   return targz.exists(env)

scons-tools/substinfile.py

@@ -0,0 +1,79 @@
+import re
+from SCons.Script import *  # the usual scons stuff you get in a SConscript
+
+def generate(env):
+    """
+    Add builders and construction variables for the
+    SubstInFile tool.
+
+    Adds SubstInFile builder, which substitutes the keys->values of SUBST_DICT
+    from the source to the target.
+    The values of SUBST_DICT first have any construction variables expanded
+    (its keys are not expanded).
+    If a value of SUBST_DICT is a python callable function, it is called and
+    the result is expanded as the value.
+    If there's more than one source and more than one target, each target gets
+    substituted from the corresponding source.
+    """
+    def do_subst_in_file(targetfile, sourcefile, dict):
+        """Replace all instances of the keys of dict with their values.
+        For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'},
+        then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
+        """
+        try:
+            f = open(sourcefile, 'rb')
+            contents = f.read()
+            f.close()
+        except:
+            raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile
+        for (k,v) in dict.items():
+            contents = re.sub(k, v, contents)
+        try:
+            f = open(targetfile, 'wb')
+            f.write(contents)
+            f.close()
+        except:
+            raise SCons.Errors.UserError, "Can't write target file %s"%targetfile
+        return 0 # success
+
+    def subst_in_file(target, source, env):
+        if not env.has_key('SUBST_DICT'):
+            raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set."
+        d = dict(env['SUBST_DICT']) # copy it
+        for (k,v) in d.items():
+            if callable(v):
+                d[k] = env.subst(v()).replace('\\','\\\\')
+            elif SCons.Util.is_String(v):
+                d[k] = env.subst(v).replace('\\','\\\\')
+            else:
+                raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v))
+        for (t,s) in zip(target, source):
+            return do_subst_in_file(str(t), str(s), d)
+
+    def subst_in_file_string(target, source, env):
+        """This is what gets printed on the console."""
+        return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t))
+                          for (t,s) in zip(target, source)])
+
+    def subst_emitter(target, source, env):
+        """Add dependency from substituted SUBST_DICT to target.
+        Returns original target, source tuple unchanged.
+        """
+        d = env['SUBST_DICT'].copy() # copy it
+        for (k,v) in d.items():
+            if callable(v):
+                d[k] = env.subst(v())
+            elif SCons.Util.is_String(v):
+                d[k]=env.subst(v)
+        Depends(target, SCons.Node.Python.Value(d))
+        return target, source
+
+##    env.Append(TOOLS = 'substinfile')       # this should be automaticaly done by Scons ?!?
+    subst_action = SCons.Action.Action( subst_in_file, subst_in_file_string )
+    env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emitter)
+
+def exists(env):
+    """
+    Make sure tool exists.
+    """
+    return True

scons-tools/targz.py

@@ -0,0 +1,82 @@
+"""tarball
+
+Tool-specific initialization for tarball.
+
+"""
+
+## Commands to tackle a command based implementation:
+##to unpack on the fly...
+##gunzip < FILE.tar.gz | tar xvf -
+##to pack on the fly...
+##tar cvf - FILE-LIST | gzip -c > FILE.tar.gz 
+
+import os.path
+
+import SCons.Builder
+import SCons.Node.FS
+import SCons.Util
+
+try:
+    import gzip
+    import tarfile
+    internal_targz = 1
+except ImportError:
+    internal_targz = 0
+
+TARGZ_DEFAULT_COMPRESSION_LEVEL = 9
+
+if internal_targz:
+    def targz(target, source, env):
+        def archive_name( path ):
+            path = os.path.normpath( os.path.abspath( path ) )
+            common_path = os.path.commonprefix( (base_dir, path) )
+            archive_name = path[len(common_path):]
+            return archive_name
+            
+        def visit(tar, dirname, names):
+            for name in names:
+                path = os.path.join(dirname, name)
+                if os.path.isfile(path):
+                    tar.add(path, archive_name(path) )
+        compression = env.get('TARGZ_COMPRESSION_LEVEL',TARGZ_DEFAULT_COMPRESSION_LEVEL)
+        base_dir = os.path.normpath( env.get('TARGZ_BASEDIR', env.Dir('.')).abspath )
+        target_path = str(target[0])
+        fileobj = gzip.GzipFile( target_path, 'wb', compression )
+        tar = tarfile.TarFile(os.path.splitext(target_path)[0], 'w', fileobj)
+        for source in source:
+            source_path = str(source)
+            if source.isdir():
+                os.path.walk(source_path, visit, tar)
+            else:
+                tar.add(source_path, archive_name(source_path) )      # filename, arcname
+        tar.close()
+
+    targzAction = SCons.Action.Action(targz, varlist=['TARGZ_COMPRESSION_LEVEL','TARGZ_BASEDIR'])
+
+    def makeBuilder( emitter = None ):
+        return SCons.Builder.Builder(action = SCons.Action.Action('$TARGZ_COM', '$TARGZ_COMSTR'),
+                                     source_factory = SCons.Node.FS.Entry,
+                                     source_scanner = SCons.Defaults.DirScanner,
+                                     suffix = '$TARGZ_SUFFIX',
+                                     multi = 1)
+    TarGzBuilder = makeBuilder()
+
+    def generate(env):
+        """Add Builders and construction variables for zip to an Environment.
+           The following environnement variables may be set:
+           TARGZ_COMPRESSION_LEVEL: integer, [0-9]. 0: no compression, 9: best compression (same as gzip compression level).
+           TARGZ_BASEDIR: base-directory used to determine archive name (this allow archive name to be relative
+                          to something other than top-dir).
+        """
+        env['BUILDERS']['TarGz'] = TarGzBuilder
+        env['TARGZ_COM'] = targzAction
+        env['TARGZ_COMPRESSION_LEVEL'] = TARGZ_DEFAULT_COMPRESSION_LEVEL # range 0-9
+        env['TARGZ_SUFFIX']  = '.tar.gz'
+        env['TARGZ_BASEDIR'] = env.Dir('.')     # Sources archive name are made relative to that directory.
+else:
+    def generate(env):
+        pass
+
+
+def exists(env):
+    return internal_targz

src/CMakeLists.txt

@@ -1,5 +0,0 @@
-add_subdirectory(lib_json)
-if(JSONCPP_WITH_TESTS)
-    add_subdirectory(jsontestrunner)
-    add_subdirectory(test_lib_json)
-endif()

src/jsontestrunner/CMakeLists.txt

@@ -1,51 +0,0 @@
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
-    # The new Python3 module is much more robust than the previous PythonInterp
-    find_package(Python3 COMPONENTS Interpreter)
-    # Set variables for backwards compatibility with cmake < 3.12.0
-    set(PYTHONINTERP_FOUND ${Python3_Interpreter_FOUND})
-    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
-else()
-    set(Python_ADDITIONAL_VERSIONS 3.8)
-    find_package(PythonInterp 3)
-endif()
-
-add_executable(jsontestrunner_exe
-    main.cpp
-)
-
-if(BUILD_SHARED_LIBS)
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
-        add_compile_definitions( JSON_DLL )
-    else()
-        add_definitions(-DJSON_DLL)
-    endif()
-    target_link_libraries(jsontestrunner_exe jsoncpp_lib)
-else()
-    target_link_libraries(jsontestrunner_exe jsoncpp_static)
-endif()
-
-set_target_properties(jsontestrunner_exe PROPERTIES OUTPUT_NAME jsontestrunner_exe)
-
-if(PYTHONINTERP_FOUND)
-    # Run end to end parser/writer tests
-    set(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../test)
-    set(RUNJSONTESTS_PATH ${TEST_DIR}/runjsontests.py)
-
-    # Run unit tests in post-build
-    # (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?)
-    add_custom_target(jsoncpp_readerwriter_tests
-        "${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" $<TARGET_FILE:jsontestrunner_exe> "${TEST_DIR}/data"
-        DEPENDS jsontestrunner_exe jsoncpp_test
-    )
-    add_custom_target(jsoncpp_check DEPENDS jsoncpp_readerwriter_tests)
-
-    ## Create tests for dashboard submission, allows easy review of CI results https://my.cdash.org/index.php?project=jsoncpp
-    add_test(NAME jsoncpp_readerwriter
-        COMMAND "${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" $<TARGET_FILE:jsontestrunner_exe> "${TEST_DIR}/data"
-        WORKING_DIRECTORY "${TEST_DIR}/data"
-    )
-    add_test(NAME jsoncpp_readerwriter_json_checker
-        COMMAND "${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" --with-json-checker  $<TARGET_FILE:jsontestrunner_exe> "${TEST_DIR}/data"
-        WORKING_DIRECTORY "${TEST_DIR}/data"
-    )
-endif()

src/jsontestrunner/main.cpp

@@ -1,346 +1,233 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+#include <json/json.h>
-// Distributed under MIT license, or public domain if desired and
+#include <algorithm> // sort
-// recognized in your jurisdiction.
+#include <stdio.h>
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#if defined(__GNUC__)
+#if defined(_MSC_VER)  &&  _MSC_VER >= 1310
-#pragma GCC diagnostic push
+# pragma warning( disable: 4996 )     // disable fopen deprecation warning
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(_MSC_VER)
-#pragma warning(disable : 4996)
 #endif
 
-/* This executable is used for testing parser/writer using real JSON files.
+static std::string
- */
+readInputTestFile( const char *path )
-
+{
-#include <algorithm> // sort
+   FILE *file = fopen( path, "rb" );
-#include <cstdio>
+   if ( !file )
-#include <iostream>
+      return std::string("");
-#include <json/json.h>
+   fseek( file, 0, SEEK_END );
-#include <memory>
+   long size = ftell( file );
-#include <sstream>
+   fseek( file, 0, SEEK_SET );
-
+   std::string text;
-struct Options {
+   char *buffer = new char[size+1];
-  Json::String path;
-  Json::Features features;
-  bool parseOnly;
-  using writeFuncType = Json::String (*)(Json::Value const&);
-  writeFuncType write;
-};
-
-static Json::String normalizeFloatingPointStr(double value) {
-  char buffer[32];
-  jsoncpp_snprintf(buffer, sizeof(buffer), "%.16g", value);
-  buffer[sizeof(buffer) - 1] = 0;
-  Json::String s(buffer);
-  Json::String::size_type index = s.find_last_of("eE");
-  if (index != Json::String::npos) {
-    Json::String::size_type hasSign =
-        (s[index + 1] == '+' || s[index + 1] == '-') ? 1 : 0;
-    Json::String::size_type exponentStartIndex = index + 1 + hasSign;
-    Json::String normalized = s.substr(0, exponentStartIndex);
-    Json::String::size_type indexDigit =
-        s.find_first_not_of('0', exponentStartIndex);
-    Json::String exponent = "0";
-    if (indexDigit != Json::String::npos) // There is an exponent different
-                                          // from 0
-    {
-      exponent = s.substr(indexDigit);
-    }
-    return normalized + exponent;
-  }
-  return s;
-}
-
-static Json::String readInputTestFile(const char* path) {
-  FILE* file = fopen(path, "rb");
-  if (!file)
-    return "";
-  fseek(file, 0, SEEK_END);
-  auto const size = ftell(file);
-  auto const usize = static_cast<size_t>(size);
-  fseek(file, 0, SEEK_SET);
-  auto buffer = new char[size + 1];
    buffer[size] = 0;
-  Json::String text;
+   if ( fread( buffer, 1, size, file ) == (unsigned long)size )
-  if (fread(buffer, 1, usize, file) == usize)
       text = buffer;
-  fclose(file);
+   fclose( file );
    delete[] buffer;
    return text;
 }
 
-static void printValueTree(FILE* fout, Json::Value& value,
+
-                           const Json::String& path = ".") {
+static void
-  if (value.hasComment(Json::commentBefore)) {
+printValueTree( FILE *fout, Json::Value &value, const std::string &path = "." )
-    fprintf(fout, "%s\n", value.getComment(Json::commentBefore).c_str());
+{
-  }
+   switch ( value.type() )
-  switch (value.type()) {
+   {
    case Json::nullValue:
-    fprintf(fout, "%s=null\n", path.c_str());
+      fprintf( fout, "%s=null\n", path.c_str() );
       break;
    case Json::intValue:
-    fprintf(fout, "%s=%s\n", path.c_str(),
+      fprintf( fout, "%s=%d\n", path.c_str(), value.asInt() );
-            Json::valueToString(value.asLargestInt()).c_str());
       break;
    case Json::uintValue:
-    fprintf(fout, "%s=%s\n", path.c_str(),
+      fprintf( fout, "%s=%u\n", path.c_str(), value.asUInt() );
-            Json::valueToString(value.asLargestUInt()).c_str());
       break;
    case Json::realValue:
-    fprintf(fout, "%s=%s\n", path.c_str(),
+      fprintf( fout, "%s=%.16g\n", path.c_str(), value.asDouble() );
-            normalizeFloatingPointStr(value.asDouble()).c_str());
       break;
    case Json::stringValue:
-    fprintf(fout, "%s=\"%s\"\n", path.c_str(), value.asString().c_str());
+      fprintf( fout, "%s=\"%s\"\n", path.c_str(), value.asString().c_str() );
       break;
    case Json::booleanValue:
-    fprintf(fout, "%s=%s\n", path.c_str(), value.asBool() ? "true" : "false");
+      fprintf( fout, "%s=%s\n", path.c_str(), value.asBool() ? "true" : "false" );
       break;
-  case Json::arrayValue: {
+   case Json::arrayValue:
-    fprintf(fout, "%s=[]\n", path.c_str());
+      {
-    Json::ArrayIndex size = value.size();
+         fprintf( fout, "%s=[]\n", path.c_str() );
-    for (Json::ArrayIndex index = 0; index < size; ++index) {
+         int size = value.size();
+         for ( int index =0; index < size; ++index )
+         {
             static char buffer[16];
-      jsoncpp_snprintf(buffer, sizeof(buffer), "[%u]", index);
+            sprintf( buffer, "[%d]", index );
-      printValueTree(fout, value[index], path + buffer);
+            printValueTree( fout, value[index], path + buffer );
          }
-  } break;
-  case Json::objectValue: {
-    fprintf(fout, "%s={}\n", path.c_str());
-    Json::Value::Members members(value.getMemberNames());
-    std::sort(members.begin(), members.end());
-    Json::String suffix = *(path.end() - 1) == '.' ? "" : ".";
-    for (const auto& name : members) {
-      printValueTree(fout, value[name], path + suffix + name);
       }
-  } break;
+      break;
+   case Json::objectValue:
+      {
+         fprintf( fout, "%s={}\n", path.c_str() );
+         Json::Value::Members members( value.getMemberNames() );
+         std::sort( members.begin(), members.end() );
+         std::string suffix = *(path.end()-1) == '.' ? "" : ".";
+         for ( Json::Value::Members::iterator it = members.begin(); 
+               it != members.end(); 
+               ++it )
+         {
+            const std::string &name = *it;
+            printValueTree( fout, value[name], path + suffix + name );
+         }
+      }
+      break;
    default:
       break;
    }
-
-  if (value.hasComment(Json::commentAfter)) {
-    fprintf(fout, "%s\n", value.getComment(Json::commentAfter).c_str());
-  }
 }
 
-static int parseAndSaveValueTree(const Json::String& input,
-                                 const Json::String& actual,
-                                 const Json::String& kind,
-                                 const Json::Features& features, bool parseOnly,
-                                 Json::Value* root, bool use_legacy) {
-  if (!use_legacy) {
-    Json::CharReaderBuilder builder;
 
-    builder.settings_["allowComments"] = features.allowComments_;
+static int
-    builder.settings_["strictRoot"] = features.strictRoot_;
+parseAndSaveValueTree( const std::string &input, 
-    builder.settings_["allowDroppedNullPlaceholders"] =
+                       const std::string &actual,
-        features.allowDroppedNullPlaceholders_;
+                       const std::string &kind,
-    builder.settings_["allowNumericKeys"] = features.allowNumericKeys_;
+                       Json::Value &root,
-
+                       const Json::Features &features,
-    std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
+                       bool parseOnly )
-    Json::String errors;
+{
-    const bool parsingSuccessful =
+   Json::Reader reader( features );
-        reader->parse(input.data(), input.data() + input.size(), root, &errors);
+   bool parsingSuccessful = reader.parse( input, root );
-
+   if ( !parsingSuccessful )
-    if (!parsingSuccessful) {
+   {
-      std::cerr << "Failed to parse " << kind << " file: " << std::endl
+      printf( "Failed to parse %s file: \n%s\n", 
-                << errors << std::endl;
+              kind.c_str(),
+              reader.getFormatedErrorMessages().c_str() );
       return 1;
    }
 
-    // We may instead check the legacy implementation (to ensure it doesn't
+   if ( !parseOnly )
-    // randomly get broken).
+   {
-  } else {
+      FILE *factual = fopen( actual.c_str(), "wt" );
-    Json::Reader reader(features);
+      if ( !factual )
-    const bool parsingSuccessful =
+      {
-        reader.parse(input.data(), input.data() + input.size(), *root);
+         printf( "Failed to create %s actual file.\n", kind.c_str() );
-    if (!parsingSuccessful) {
-      std::cerr << "Failed to parse " << kind << " file: " << std::endl
-                << reader.getFormatedErrorMessages() << std::endl;
-      return 1;
-    }
-  }
-
-  if (!parseOnly) {
-    FILE* factual = fopen(actual.c_str(), "wt");
-    if (!factual) {
-      std::cerr << "Failed to create '" << kind << "' actual file."
-                << std::endl;
          return 2;
       }
-    printValueTree(factual, *root);
+      printValueTree( factual, root );
-    fclose(factual);
+      fclose( factual );
    }
    return 0;
 }
-// static Json::String useFastWriter(Json::Value const& root) {
+
-//   Json::FastWriter writer;
+
-//   writer.enableYAMLCompatibility();
+static int
-//   return writer.write(root);
+rewriteValueTree( const std::string &rewritePath, 
-// }
+                  const Json::Value &root, 
-static Json::String useStyledWriter(Json::Value const& root) {
+                  std::string &rewrite )
+{
+   //Json::FastWriter writer;
+   //writer.enableYAMLCompatibility();
    Json::StyledWriter writer;
-  return writer.write(root);
+   rewrite = writer.write( root );
-}
+   FILE *fout = fopen( rewritePath.c_str(), "wt" );
-static Json::String useStyledStreamWriter(Json::Value const& root) {
+   if ( !fout )
-  Json::StyledStreamWriter writer;
+   {
-  Json::OStringStream sout;
+      printf( "Failed to create rewrite file: %s\n", rewritePath.c_str() );
-  writer.write(sout, root);
-  return sout.str();
-}
-static Json::String useBuiltStyledStreamWriter(Json::Value const& root) {
-  Json::StreamWriterBuilder builder;
-  return Json::writeString(builder, root);
-}
-static int rewriteValueTree(const Json::String& rewritePath,
-                            const Json::Value& root,
-                            Options::writeFuncType write,
-                            Json::String* rewrite) {
-  *rewrite = write(root);
-  FILE* fout = fopen(rewritePath.c_str(), "wt");
-  if (!fout) {
-    std::cerr << "Failed to create rewrite file: " << rewritePath << std::endl;
       return 2;
    }
-  fprintf(fout, "%s\n", rewrite->c_str());
+   fprintf( fout, "%s\n", rewrite.c_str() );
-  fclose(fout);
+   fclose( fout );
    return 0;
 }
 
-static Json::String removeSuffix(const Json::String& path,
+
-                                 const Json::String& extension) {
+static std::string
-  if (extension.length() >= path.length())
+removeSuffix( const std::string &path, 
-    return Json::String("");
+              const std::string &extension )
-  Json::String suffix = path.substr(path.length() - extension.length());
+{
-  if (suffix != extension)
+   if ( extension.length() >= path.length() )
-    return Json::String("");
+      return std::string("");
-  return path.substr(0, path.length() - extension.length());
+   std::string suffix = path.substr( path.length() - extension.length() );
+   if ( suffix != extension )
+      return std::string("");
+   return path.substr( 0, path.length() - extension.length() );
 }
 
-static void printConfig() {
+static int 
-// Print the configuration used to compile JsonCpp
+printUsage( const char *argv[] )
-#if defined(JSON_NO_INT64)
+{
-  std::cout << "JSON_NO_INT64=1" << std::endl;
+   printf( "Usage: %s [--strict] input-json-file", argv[0] );
-#else
-  std::cout << "JSON_NO_INT64=0" << std::endl;
-#endif
-}
-
-static int printUsage(const char* argv[]) {
-  std::cout << "Usage: " << argv[0] << " [--strict] input-json-file"
-            << std::endl;
    return 3;
 }
 
-static int parseCommandLine(int argc, const char* argv[], Options* opts) {
+
-  opts->parseOnly = false;
+int
-  opts->write = &useStyledWriter;
+parseCommandLine( int argc, const char *argv[], 
-  if (argc < 2) {
+                  Json::Features &features, std::string &path,
-    return printUsage(argv);
+                  bool &parseOnly )
+{
+   parseOnly = false;
+   if ( argc < 2 )
+   {
+      return printUsage( argv );
    }
+
    int index = 1;
-  if (Json::String(argv[index]) == "--parse-only") {
+   if ( std::string(argv[1]) == "--json-checker" )
-    opts->parseOnly = true;
+   {
+      features = Json::Features::strictMode();
+      parseOnly = true;
       ++index;
    }
-  if (Json::String(argv[index]) == "--strict") {
+
-    opts->features = Json::Features::strictMode();
+   if ( index == argc  ||  index + 1 < argc )
-    ++index;
+   {
+      return printUsage( argv );
    }
-  if (Json::String(argv[index]) == "--json-config") {
+
-    printConfig();
+   path = argv[index];
-    return 3;
-  }
-  if (Json::String(argv[index]) == "--json-writer") {
-    ++index;
-    Json::String const writerName(argv[index++]);
-    if (writerName == "StyledWriter") {
-      opts->write = &useStyledWriter;
-    } else if (writerName == "StyledStreamWriter") {
-      opts->write = &useStyledStreamWriter;
-    } else if (writerName == "BuiltStyledStreamWriter") {
-      opts->write = &useBuiltStyledStreamWriter;
-    } else {
-      std::cerr << "Unknown '--json-writer' " << writerName << std::endl;
-      return 4;
-    }
-  }
-  if (index == argc || index + 1 < argc) {
-    return printUsage(argv);
-  }
-  opts->path = argv[index];
    return 0;
 }
 
-static int runTest(Options const& opts, bool use_legacy) {
-  int exitCode = 0;
 
-  Json::String input = readInputTestFile(opts.path.c_str());
+int main( int argc, const char *argv[] )
-  if (input.empty()) {
+{
-    std::cerr << "Invalid input file: " << opts.path << std::endl;
+   std::string path;
+   Json::Features features;
+   bool parseOnly;
+   int exitCode = parseCommandLine( argc, argv, features, path, parseOnly );
+   if ( exitCode != 0 )
+   {
+      return exitCode;
+   }
+
+   std::string input = readInputTestFile( path.c_str() );
+   if ( input.empty() )
+   {
+      printf( "Failed to read input or empty input: %s\n", path.c_str() );
       return 3;
    }
 
-  Json::String basePath = removeSuffix(opts.path, ".json");
+   std::string basePath = removeSuffix( argv[1], ".json" );
-  if (!opts.parseOnly && basePath.empty()) {
+   if ( !parseOnly  &&  basePath.empty() )
-    std::cerr << "Bad input path '" << opts.path
+   {
-              << "'. Must end with '.expected'" << std::endl;
+      printf( "Bad input path. Path does not end with '.expected':\n%s\n", path.c_str() );
       return 3;
    }
 
-  Json::String const actualPath = basePath + ".actual";
+   std::string actualPath = basePath + ".actual";
-  Json::String const rewritePath = basePath + ".rewrite";
+   std::string rewritePath = basePath + ".rewrite";
-  Json::String const rewriteActualPath = basePath + ".actual-rewrite";
+   std::string rewriteActualPath = basePath + ".actual-rewrite";
 
    Json::Value root;
-  exitCode = parseAndSaveValueTree(input, actualPath, "input", opts.features,
+   exitCode = parseAndSaveValueTree( input, actualPath, "input", root, features, parseOnly );
-                                   opts.parseOnly, &root, use_legacy);
+   if ( exitCode == 0  &&  !parseOnly )
-  if (exitCode || opts.parseOnly) {
+   {
-    return exitCode;
+      std::string rewrite;
-  }
+      exitCode = rewriteValueTree( rewritePath, root, rewrite );
-
+      if ( exitCode == 0 )
-  Json::String rewrite;
+      {
-  exitCode = rewriteValueTree(rewritePath, root, opts.write, &rewrite);
-  if (exitCode) {
-    return exitCode;
-  }
-
          Json::Value rewriteRoot;
-  exitCode = parseAndSaveValueTree(rewrite, rewriteActualPath, "rewrite",
+         exitCode = parseAndSaveValueTree( rewrite, rewriteActualPath, 
-                                   opts.features, opts.parseOnly, &rewriteRoot,
+            "rewrite", rewriteRoot, features, parseOnly );
-                                   use_legacy);
+      }
+   }
 
    return exitCode;
 }
 
-int main(int argc, const char* argv[]) {
-  Options opts;
-  try {
-    int exitCode = parseCommandLine(argc, argv, &opts);
-    if (exitCode != 0) {
-      std::cerr << "Failed to parse command-line." << std::endl;
-      return exitCode;
-    }
-
-    const int modern_return_code = runTest(opts, false);
-    if (modern_return_code) {
-      return modern_return_code;
-    }
-
-    const std::string filename =
-        opts.path.substr(opts.path.find_last_of("\\/") + 1);
-    const bool should_run_legacy = (filename.rfind("legacy_", 0) == 0);
-    if (should_run_legacy) {
-      return runTest(opts, true);
-    }
-  } catch (const std::exception& e) {
-    std::cerr << "Unhandled exception:" << std::endl << e.what() << std::endl;
-    return 1;
-  }
-  return 0;
-}
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif

src/jsontestrunner/sconscript

@@ -0,0 +1,9 @@
+Import( 'env_testing buildJSONTests' )
+
+buildJSONTests( env_testing, Split( """
+    main.cpp
+     """ ),
+    'jsontestrunner' )
+
+# For 'check' to work, 'libs' must be built first.
+env_testing.Depends('jsontestrunner', '#libs')

src/lib_json/CMakeLists.txt

@@ -1,205 +0,0 @@
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.1.2)
-    #-Werror=* was introduced -after- GCC 4.1.2
-    add_compile_options("-Werror=strict-aliasing")
-endif()
-
-include(CheckIncludeFileCXX)
-include(CheckTypeSize)
-include(CheckStructHasMember)
-include(CheckCXXSymbolExists)
-
-check_include_file_cxx(clocale HAVE_CLOCALE)
-check_cxx_symbol_exists(localeconv clocale HAVE_LOCALECONV)
-
-set(CMAKE_EXTRA_INCLUDE_FILES clocale)
-check_type_size(lconv LCONV_SIZE LANGUAGE CXX)
-unset(CMAKE_EXTRA_INCLUDE_FILES)
-check_struct_has_member(lconv decimal_point clocale HAVE_DECIMAL_POINT LANGUAGE CXX)
-
-if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV))
-    message(WARNING "Locale functionality is not supported")
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
-        add_compile_definitions(JSONCPP_NO_LOCALE_SUPPORT)
-    else()
-        add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT)
-    endif()
-endif()
-
-set(JSONCPP_INCLUDE_DIR ../../include)
-
-set(PUBLIC_HEADERS
-    ${JSONCPP_INCLUDE_DIR}/json/config.h
-    ${JSONCPP_INCLUDE_DIR}/json/forwards.h
-    ${JSONCPP_INCLUDE_DIR}/json/json_features.h
-    ${JSONCPP_INCLUDE_DIR}/json/value.h
-    ${JSONCPP_INCLUDE_DIR}/json/reader.h
-    ${JSONCPP_INCLUDE_DIR}/json/version.h
-    ${JSONCPP_INCLUDE_DIR}/json/writer.h
-    ${JSONCPP_INCLUDE_DIR}/json/assertions.h
-)
-
-source_group("Public API" FILES ${PUBLIC_HEADERS})
-
-set(JSONCPP_SOURCES
-    json_tool.h
-    json_reader.cpp
-    json_valueiterator.inl
-    json_value.cpp
-    json_writer.cpp
-)
-
-# Install instructions for this target
-if(JSONCPP_WITH_CMAKE_PACKAGE)
-    set(INSTALL_EXPORT EXPORT jsoncpp)
-else()
-    set(INSTALL_EXPORT)
-endif()
-
-# Specify compiler features required when compiling a given target.
-# See https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html#prop_gbl:CMAKE_CXX_KNOWN_FEATURES
-# for complete list of features available
-list(APPEND REQUIRED_FEATURES
-        cxx_std_11 # Compiler mode is aware of C++ 11.
-        #MSVC 1900 cxx_alignas # Alignment control alignas, as defined in N2341.
-        #MSVC 1900 cxx_alignof # Alignment control alignof, as defined in N2341.
-        #MSVC 1900 cxx_attributes # Generic attributes, as defined in N2761.
-        cxx_auto_type # Automatic type deduction, as defined in N1984.
-        #MSVC 1900 cxx_constexpr # Constant expressions, as defined in N2235.
-        cxx_decltype # Decltype, as defined in N2343.
-        cxx_default_function_template_args # Default template arguments for function templates, as defined in DR226
-        cxx_defaulted_functions # Defaulted functions, as defined in N2346.
-        #MSVC 1900 cxx_defaulted_move_initializers # Defaulted move initializers, as defined in N3053.
-        cxx_delegating_constructors # Delegating constructors, as defined in N1986.
-        #MSVC 1900 cxx_deleted_functions # Deleted functions, as defined in N2346.
-        cxx_enum_forward_declarations # Enum forward declarations, as defined in N2764.
-        cxx_explicit_conversions # Explicit conversion operators, as defined in N2437.
-        cxx_extended_friend_declarations # Extended friend declarations, as defined in N1791.
-        cxx_extern_templates # Extern templates, as defined in N1987.
-        cxx_final # Override control final keyword, as defined in N2928, N3206 and N3272.
-        #MSVC 1900 cxx_func_identifier # Predefined __func__ identifier, as defined in N2340.
-        #MSVC 1900 cxx_generalized_initializers # Initializer lists, as defined in N2672.
-        #MSVC 1900 cxx_inheriting_constructors # Inheriting constructors, as defined in N2540.
-        #MSVC 1900 cxx_inline_namespaces # Inline namespaces, as defined in N2535.
-        cxx_lambdas # Lambda functions, as defined in N2927.
-        #MSVC 1900 cxx_local_type_template_args # Local and unnamed types as template arguments, as defined in N2657.
-        cxx_long_long_type # long long type, as defined in N1811.
-        #MSVC 1900 cxx_noexcept # Exception specifications, as defined in N3050.
-        #MSVC 1900 cxx_nonstatic_member_init # Non-static data member initialization, as defined in N2756.
-        cxx_nullptr # Null pointer, as defined in N2431.
-        cxx_override # Override control override keyword, as defined in N2928, N3206 and N3272.
-        cxx_range_for # Range-based for, as defined in N2930.
-        cxx_raw_string_literals # Raw string literals, as defined in N2442.
-        #MSVC 1900 cxx_reference_qualified_functions # Reference qualified functions, as defined in N2439.
-        cxx_right_angle_brackets # Right angle bracket parsing, as defined in N1757.
-        cxx_rvalue_references # R-value references, as defined in N2118.
-        #MSVC 1900 cxx_sizeof_member # Size of non-static data members, as defined in N2253.
-        cxx_static_assert # Static assert, as defined in N1720.
-        cxx_strong_enums # Strongly typed enums, as defined in N2347.
-        #MSVC 1900 cxx_thread_local # Thread-local variables, as defined in N2659.
-        cxx_trailing_return_types # Automatic function return type, as defined in N2541.
-        #MSVC 1900 cxx_unicode_literals # Unicode string literals, as defined in N2442.
-        cxx_uniform_initialization # Uniform initialization, as defined in N2640.
-        #MSVC 1900 cxx_unrestricted_unions # Unrestricted unions, as defined in N2544.
-        #MSVC 1900 cxx_user_literals # User-defined literals, as defined in N2765.
-        cxx_variadic_macros # Variadic macros, as defined in N1653.
-        cxx_variadic_templates # Variadic templates, as defined in N2242.
-)
-
-
-if(BUILD_SHARED_LIBS)
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
-        add_compile_definitions(JSON_DLL_BUILD)
-    else()
-        add_definitions(-DJSON_DLL_BUILD)
-    endif()
-
-    set(SHARED_LIB ${PROJECT_NAME}_lib)
-    add_library(${SHARED_LIB} SHARED ${PUBLIC_HEADERS} ${JSONCPP_SOURCES})
-    set_target_properties(${SHARED_LIB} PROPERTIES
-        OUTPUT_NAME jsoncpp
-        VERSION ${PROJECT_VERSION}
-        SOVERSION ${PROJECT_SOVERSION}
-        POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}
-    )
-
-    # Set library's runtime search path on OSX
-    if(APPLE)
-        set_target_properties(${SHARED_LIB} PROPERTIES INSTALL_RPATH "@loader_path/.")
-    endif()
-
-    target_compile_features(${SHARED_LIB} PUBLIC ${REQUIRED_FEATURES})
-
-    target_include_directories(${SHARED_LIB} PUBLIC
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>
-    )
-
-    list(APPEND CMAKE_TARGETS ${SHARED_LIB})
-endif()
-
-if(BUILD_STATIC_LIBS)
-    set(STATIC_LIB ${PROJECT_NAME}_static)
-    add_library(${STATIC_LIB} STATIC ${PUBLIC_HEADERS} ${JSONCPP_SOURCES})
-
-    # avoid name clashes on windows as the shared import lib is also named jsoncpp.lib
-    if(NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
-        if (MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"))
-            set(STATIC_SUFFIX "_static")
-        else()
-            set(STATIC_SUFFIX "")
-        endif()
-    endif()
-
-    set_target_properties(${STATIC_LIB} PROPERTIES
-        OUTPUT_NAME jsoncpp${STATIC_SUFFIX}
-        VERSION ${PROJECT_VERSION}
-    )
-
-    # Set library's runtime search path on OSX
-    if(APPLE)
-        set_target_properties(${STATIC_LIB} PROPERTIES INSTALL_RPATH "@loader_path/.")
-    endif()
-
-    target_compile_features(${STATIC_LIB} PUBLIC ${REQUIRED_FEATURES})
-
-    target_include_directories(${STATIC_LIB} PUBLIC
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>
-    )
-
-    list(APPEND CMAKE_TARGETS ${STATIC_LIB})
-endif()
-
-if(BUILD_OBJECT_LIBS)
-    set(OBJECT_LIB ${PROJECT_NAME}_object)
-    add_library(${OBJECT_LIB} OBJECT ${PUBLIC_HEADERS} ${JSONCPP_SOURCES})
-
-    set_target_properties(${OBJECT_LIB} PROPERTIES
-        OUTPUT_NAME jsoncpp
-        VERSION ${PROJECT_VERSION}
-        SOVERSION ${PROJECT_SOVERSION}
-        POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}
-    )
-
-    # Set library's runtime search path on OSX
-    if(APPLE)
-        set_target_properties(${OBJECT_LIB} PROPERTIES INSTALL_RPATH "@loader_path/.")
-    endif()
-
-    target_compile_features(${OBJECT_LIB} PUBLIC ${REQUIRED_FEATURES})
-
-    target_include_directories(${OBJECT_LIB} PUBLIC
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>
-    )
-
-    list(APPEND CMAKE_TARGETS ${OBJECT_LIB})
-endif()
-
-install(TARGETS ${CMAKE_TARGETS} ${INSTALL_EXPORT}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-

src/lib_json/json_batchallocator.h

@@ -0,0 +1,125 @@
+#ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
+# define JSONCPP_BATCHALLOCATOR_H_INCLUDED
+
+# include <stdlib.h>
+# include <assert.h>
+
+# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
+
+namespace Json {
+
+/* Fast memory allocator.
+ *
+ * This memory allocator allocates memory for a batch of object (specified by
+ * the page size, the number of object in each page).
+ *
+ * It does not allow the destruction of a single object. All the allocated objects
+ * can be destroyed at once. The memory can be either released or reused for future
+ * allocation.
+ * 
+ * The in-place new operator must be used to construct the object using the pointer
+ * returned by allocate.
+ */
+template<typename AllocatedType
+        ,const unsigned int objectPerAllocation>
+class BatchAllocator
+{
+public:
+   typedef AllocatedType Type;
+
+   BatchAllocator( unsigned int objectsPerPage = 255 )
+      : freeHead_( 0 )
+      , objectsPerPage_( objectsPerPage )
+   {
+//      printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
+      assert( sizeof(AllocatedType) * objectPerAllocation >= sizeof(AllocatedType *) ); // We must be able to store a slist in the object free space.
+      assert( objectsPerPage >= 16 );
+      batches_ = allocateBatch( 0 );   // allocated a dummy page
+      currentBatch_ = batches_;
+   }
+
+   ~BatchAllocator()
+   {
+      for ( BatchInfo *batch = batches_; batch;  )
+      {
+         BatchInfo *nextBatch = batch->next_;
+         free( batch );
+         batch = nextBatch;
+      }
+   }
+
+   /// allocate space for an array of objectPerAllocation object.
+   /// @warning it is the responsability of the caller to call objects constructors.
+   AllocatedType *allocate()
+   {
+      if ( freeHead_ ) // returns node from free list.
+      {
+         AllocatedType *object = freeHead_;
+         freeHead_ = *(AllocatedType **)object;
+         return object;
+      }
+      if ( currentBatch_->used_ == currentBatch_->end_ )
+      {
+         currentBatch_ = currentBatch_->next_;
+         while ( currentBatch_  &&  currentBatch_->used_ == currentBatch_->end_ )
+            currentBatch_ = currentBatch_->next_;
+
+         if ( !currentBatch_  ) // no free batch found, allocate a new one
+         { 
+            currentBatch_ = allocateBatch( objectsPerPage_ );
+            currentBatch_->next_ = batches_; // insert at the head of the list
+            batches_ = currentBatch_;
+         }
+      }
+      AllocatedType *allocated = currentBatch_->used_;
+      currentBatch_->used_ += objectPerAllocation;
+      return allocated;
+   }
+
+   /// Release the object.
+   /// @warning it is the responsability of the caller to actually destruct the object.
+   void release( AllocatedType *object )
+   {
+      assert( object != 0 );
+      *(AllocatedType **)object = freeHead_;
+      freeHead_ = object;
+   }
+
+private:
+   struct BatchInfo
+   {
+      BatchInfo *next_;
+      AllocatedType *used_;
+      AllocatedType *end_;
+      AllocatedType buffer_[objectPerAllocation];
+   };
+
+   // disabled copy constructor and assignement operator.
+   BatchAllocator( const BatchAllocator & );
+   void operator =( const BatchAllocator &);
+
+   static BatchInfo *allocateBatch( unsigned int objectsPerPage )
+   {
+      const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType)* objectPerAllocation
+                                + sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
+      BatchInfo *batch = static_cast<BatchInfo*>( malloc( mallocSize ) );
+      batch->next_ = 0;
+      batch->used_ = batch->buffer_;
+      batch->end_ = batch->buffer_ + objectsPerPage;
+      return batch;
+   }
+
+   BatchInfo *batches_;
+   BatchInfo *currentBatch_;
+   /// Head of a single linked list within the allocated space of freeed object
+   AllocatedType *freeHead_;
+   unsigned int objectsPerPage_;
+};
+
+
+} // namespace Json
+
+# endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
+
+#endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
+

src/lib_json/json_internalarray.inl

@@ -0,0 +1,448 @@
+// included by json_value.cpp
+// everything is within Json namespace
+
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// class ValueInternalArray
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+
+ValueArrayAllocator::~ValueArrayAllocator()
+{
+}
+
+// //////////////////////////////////////////////////////////////////
+// class DefaultValueArrayAllocator
+// //////////////////////////////////////////////////////////////////
+#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
+class DefaultValueArrayAllocator : public ValueArrayAllocator
+{
+public: // overridden from ValueArrayAllocator
+   virtual ~DefaultValueArrayAllocator()
+   {
+   }
+
+   virtual ValueInternalArray *newArray()
+   {
+      return new ValueInternalArray();
+   }
+
+   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
+   {
+      return new ValueInternalArray( other );
+   }
+
+   virtual void destructArray( ValueInternalArray *array )
+   {
+      delete array;
+   }
+
+   virtual void reallocateArrayPageIndex( Value **&indexes, 
+                                          ValueInternalArray::PageIndex &indexCount,
+                                          ValueInternalArray::PageIndex minNewIndexCount )
+   {
+      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
+      if ( minNewIndexCount > newIndexCount )
+         newIndexCount = minNewIndexCount;
+      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
+      if ( !newIndexes )
+         throw std::bad_alloc();
+      indexCount = newIndexCount;
+      indexes = static_cast<Value **>( newIndexes );
+   }
+   virtual void releaseArrayPageIndex( Value **indexes, 
+                                       ValueInternalArray::PageIndex indexCount )
+   {
+      if ( indexes )
+         free( indexes );
+   }
+
+   virtual Value *allocateArrayPage()
+   {
+      return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
+   }
+
+   virtual void releaseArrayPage( Value *value )
+   {
+      if ( value )
+         free( value );
+   }
+};
+
+#else // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
+/// @todo make this thread-safe (lock when accessign batch allocator)
+class DefaultValueArrayAllocator : public ValueArrayAllocator
+{
+public: // overridden from ValueArrayAllocator
+   virtual ~DefaultValueArrayAllocator()
+   {
+   }
+
+   virtual ValueInternalArray *newArray()
+   {
+      ValueInternalArray *array = arraysAllocator_.allocate();
+      new (array) ValueInternalArray(); // placement new
+      return array;
+   }
+
+   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
+   {
+      ValueInternalArray *array = arraysAllocator_.allocate();
+      new (array) ValueInternalArray( other ); // placement new
+      return array;
+   }
+
+   virtual void destructArray( ValueInternalArray *array )
+   {
+      if ( array )
+      {
+         array->~ValueInternalArray();
+         arraysAllocator_.release( array );
+      }
+   }
+
+   virtual void reallocateArrayPageIndex( Value **&indexes, 
+                                          ValueInternalArray::PageIndex &indexCount,
+                                          ValueInternalArray::PageIndex minNewIndexCount )
+   {
+      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
+      if ( minNewIndexCount > newIndexCount )
+         newIndexCount = minNewIndexCount;
+      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
+      if ( !newIndexes )
+         throw std::bad_alloc();
+      indexCount = newIndexCount;
+      indexes = static_cast<Value **>( newIndexes );
+   }
+   virtual void releaseArrayPageIndex( Value **indexes, 
+                                       ValueInternalArray::PageIndex indexCount )
+   {
+      if ( indexes )
+         free( indexes );
+   }
+
+   virtual Value *allocateArrayPage()
+   {
+      return static_cast<Value *>( pagesAllocator_.allocate() );
+   }
+
+   virtual void releaseArrayPage( Value *value )
+   {
+      if ( value )
+         pagesAllocator_.release( value );
+   }
+private:
+   BatchAllocator<ValueInternalArray,1> arraysAllocator_;
+   BatchAllocator<Value,ValueInternalArray::itemsPerPage> pagesAllocator_;
+};
+#endif // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
+
+static ValueArrayAllocator *&arrayAllocator()
+{
+   static DefaultValueArrayAllocator defaultAllocator;
+   static ValueArrayAllocator *arrayAllocator = &defaultAllocator;
+   return arrayAllocator;
+}
+
+static struct DummyArrayAllocatorInitializer {
+   DummyArrayAllocatorInitializer() 
+   {
+      arrayAllocator();      // ensure arrayAllocator() statics are initialized before main().
+   }
+} dummyArrayAllocatorInitializer;
+
+// //////////////////////////////////////////////////////////////////
+// class ValueInternalArray
+// //////////////////////////////////////////////////////////////////
+bool 
+ValueInternalArray::equals( const IteratorState &x, 
+                            const IteratorState &other )
+{
+   return x.array_ == other.array_  
+          &&  x.currentItemIndex_ == other.currentItemIndex_  
+          &&  x.currentPageIndex_ == other.currentPageIndex_;
+}
+
+
+void 
+ValueInternalArray::increment( IteratorState &it )
+{
+   JSON_ASSERT_MESSAGE( it.array_  &&
+      (it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
+      != it.array_->size_,
+      "ValueInternalArray::increment(): moving iterator beyond end" );
+   ++(it.currentItemIndex_);
+   if ( it.currentItemIndex_ == itemsPerPage )
+   {
+      it.currentItemIndex_ = 0;
+      ++(it.currentPageIndex_);
+   }
+}
+
+
+void 
+ValueInternalArray::decrement( IteratorState &it )
+{
+   JSON_ASSERT_MESSAGE( it.array_  &&  it.currentPageIndex_ == it.array_->pages_ 
+                        &&  it.currentItemIndex_ == 0,
+      "ValueInternalArray::decrement(): moving iterator beyond end" );
+   if ( it.currentItemIndex_ == 0 )
+   {
+      it.currentItemIndex_ = itemsPerPage-1;
+      --(it.currentPageIndex_);
+   }
+   else
+   {
+      --(it.currentItemIndex_);
+   }
+}
+
+
+Value &
+ValueInternalArray::unsafeDereference( const IteratorState &it )
+{
+   return (*(it.currentPageIndex_))[it.currentItemIndex_];
+}
+
+
+Value &
+ValueInternalArray::dereference( const IteratorState &it )
+{
+   JSON_ASSERT_MESSAGE( it.array_  &&
+      (it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
+      < it.array_->size_,
+      "ValueInternalArray::dereference(): dereferencing invalid iterator" );
+   return unsafeDereference( it );
+}
+
+void 
+ValueInternalArray::makeBeginIterator( IteratorState &it ) const
+{
+   it.array_ = const_cast<ValueInternalArray *>( this );
+   it.currentItemIndex_ = 0;
+   it.currentPageIndex_ = pages_;
+}
+
+
+void 
+ValueInternalArray::makeIterator( IteratorState &it, ArrayIndex index ) const
+{
+   it.array_ = const_cast<ValueInternalArray *>( this );
+   it.currentItemIndex_ = index % itemsPerPage;
+   it.currentPageIndex_ = pages_ + index / itemsPerPage;
+}
+
+
+void 
+ValueInternalArray::makeEndIterator( IteratorState &it ) const
+{
+   makeIterator( it, size_ );
+}
+
+
+ValueInternalArray::ValueInternalArray()
+   : pages_( 0 )
+   , size_( 0 )
+   , pageCount_( 0 )
+{
+}
+
+
+ValueInternalArray::ValueInternalArray( const ValueInternalArray &other )
+   : pages_( 0 )
+   , pageCount_( 0 )
+   , size_( other.size_ )
+{
+   PageIndex minNewPages = other.size_ / itemsPerPage;
+   arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
+   JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, 
+                        "ValueInternalArray::reserve(): bad reallocation" );
+   IteratorState itOther;
+   other.makeBeginIterator( itOther );
+   Value *value;
+   for ( ArrayIndex index = 0; index < size_; ++index, increment(itOther) )
+   {
+      if ( index % itemsPerPage == 0 )
+      {
+         PageIndex pageIndex = index / itemsPerPage;
+         value = arrayAllocator()->allocateArrayPage();
+         pages_[pageIndex] = value;
+      }
+      new (value) Value( dereference( itOther ) );
+   }
+}
+
+
+ValueInternalArray &
+ValueInternalArray::operator =( const ValueInternalArray &other )
+{
+   ValueInternalArray temp( other );
+   swap( temp );
+   return *this;
+}
+
+
+ValueInternalArray::~ValueInternalArray()
+{
+   // destroy all constructed items
+   IteratorState it;
+   IteratorState itEnd;
+   makeBeginIterator( it);
+   makeEndIterator( itEnd );
+   for ( ; !equals(it,itEnd); increment(it) )
+   {
+      Value *value = &dereference(it);
+      value->~Value();
+   }
+   // release all pages
+   PageIndex lastPageIndex = size_ / itemsPerPage;
+   for ( PageIndex pageIndex = 0; pageIndex < lastPageIndex; ++pageIndex )
+      arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
+   // release pages index
+   arrayAllocator()->releaseArrayPageIndex( pages_, pageCount_ );
+}
+
+
+void 
+ValueInternalArray::swap( ValueInternalArray &other )
+{
+   Value **tempPages = pages_;
+   pages_ = other.pages_;
+   other.pages_ = tempPages;
+   ArrayIndex tempSize = size_;
+   size_ = other.size_;
+   other.size_ = tempSize;
+   PageIndex tempPageCount = pageCount_;
+   pageCount_ = other.pageCount_;
+   other.pageCount_ = tempPageCount;
+}
+
+void 
+ValueInternalArray::clear()
+{
+   ValueInternalArray dummy;
+   swap( dummy );
+}
+
+
+void 
+ValueInternalArray::resize( ArrayIndex newSize )
+{
+   if ( newSize == 0 )
+      clear();
+   else if ( newSize < size_ )
+   {
+      IteratorState it;
+      IteratorState itEnd;
+      makeIterator( it, newSize );
+      makeIterator( itEnd, size_ );
+      for ( ; !equals(it,itEnd); increment(it) )
+      {
+         Value *value = &dereference(it);
+         value->~Value();
+      }
+      PageIndex pageIndex = (newSize + itemsPerPage - 1) / itemsPerPage;
+      PageIndex lastPageIndex = size_ / itemsPerPage;
+      for ( ; pageIndex < lastPageIndex; ++pageIndex )
+         arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
+      size_ = newSize;
+   }
+   else if ( newSize > size_ )
+      resolveReference( newSize );
+}
+
+
+void 
+ValueInternalArray::makeIndexValid( ArrayIndex index )
+{
+   // Need to enlarge page index ?
+   if ( index >= pageCount_ * itemsPerPage )
+   {
+      PageIndex minNewPages = (index + 1) / itemsPerPage;
+      arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
+      JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, "ValueInternalArray::reserve(): bad reallocation" );
+   }
+
+   // Need to allocate new pages ?
+   ArrayIndex nextPageIndex = 
+      (size_ % itemsPerPage) != 0 ? size_ - (size_%itemsPerPage) + itemsPerPage
+                                  : size_;
+   if ( nextPageIndex <= index )
+   {
+      PageIndex pageIndex = nextPageIndex / itemsPerPage;
+      PageIndex pageToAllocate = (index - nextPageIndex) / itemsPerPage + 1;
+      for ( ; pageToAllocate-- > 0; ++pageIndex )
+         pages_[pageIndex] = arrayAllocator()->allocateArrayPage();
+   }
+
+   // Initialize all new entries
+   IteratorState it;
+   IteratorState itEnd;
+   makeIterator( it, size_ );
+   size_ = index + 1;
+   makeIterator( itEnd, size_ );
+   for ( ; !equals(it,itEnd); increment(it) )
+   {
+      Value *value = &dereference(it);
+      new (value) Value(); // Construct a default value using placement new
+   }
+}
+
+Value &
+ValueInternalArray::resolveReference( ArrayIndex index )
+{
+   if ( index >= size_ )
+      makeIndexValid( index );
+   return pages_[index/itemsPerPage][index%itemsPerPage];
+}
+
+Value *
+ValueInternalArray::find( ArrayIndex index ) const
+{
+   if ( index >= size_ )
+      return 0;
+   return &(pages_[index/itemsPerPage][index%itemsPerPage]);
+}
+
+ValueInternalArray::ArrayIndex 
+ValueInternalArray::size() const
+{
+   return size_;
+}
+
+int 
+ValueInternalArray::distance( const IteratorState &x, const IteratorState &y )
+{
+   return indexOf(y) - indexOf(x);
+}
+
+
+ValueInternalArray::ArrayIndex 
+ValueInternalArray::indexOf( const IteratorState &iterator )
+{
+   if ( !iterator.array_ )
+      return ArrayIndex(-1);
+   return ArrayIndex(
+      (iterator.currentPageIndex_ - iterator.array_->pages_) * itemsPerPage 
+      + iterator.currentItemIndex_ );
+}
+
+
+int 
+ValueInternalArray::compare( const ValueInternalArray &other ) const
+{
+   int sizeDiff( size_ - other.size_ );
+   if ( sizeDiff != 0 )
+      return sizeDiff;
+   
+   for ( ArrayIndex index =0; index < size_; ++index )
+   {
+      int diff = pages_[index/itemsPerPage][index%itemsPerPage].compare( 
+         other.pages_[index/itemsPerPage][index%itemsPerPage] );
+      if ( diff != 0 )
+         return diff;
+   }
+   return 0;
+}

src/lib_json/json_internalmap.inl

@@ -0,0 +1,607 @@
+// included by json_value.cpp
+// everything is within Json namespace
+
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// class ValueInternalMap
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+
+/** \internal MUST be safely initialized using memset( this, 0, sizeof(ValueInternalLink) );
+   * This optimization is used by the fast allocator.
+   */
+ValueInternalLink::ValueInternalLink()
+   : previous_( 0 )
+   , next_( 0 )
+{
+}
+
+ValueInternalLink::~ValueInternalLink()
+{ 
+   for ( int index =0; index < itemPerLink; ++index )
+   {
+      if ( !items_[index].isItemAvailable() )
+      {
+         if ( !items_[index].isMemberNameStatic() )
+            free( keys_[index] );
+      }
+      else
+         break;
+   }
+}
+
+
+
+ValueMapAllocator::~ValueMapAllocator()
+{
+}
+
+#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
+class DefaultValueMapAllocator : public ValueMapAllocator
+{
+public: // overridden from ValueMapAllocator
+   virtual ValueInternalMap *newMap()
+   {
+      return new ValueInternalMap();
+   }
+
+   virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
+   {
+      return new ValueInternalMap( other );
+   }
+
+   virtual void destructMap( ValueInternalMap *map )
+   {
+      delete map;
+   }
+
+   virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
+   {
+      return new ValueInternalLink[size];
+   }
+
+   virtual void releaseMapBuckets( ValueInternalLink *links )
+   {
+      delete [] links;
+   }
+
+   virtual ValueInternalLink *allocateMapLink()
+   {
+      return new ValueInternalLink();
+   }
+
+   virtual void releaseMapLink( ValueInternalLink *link )
+   {
+      delete link;
+   }
+};
+#else
+/// @todo make this thread-safe (lock when accessign batch allocator)
+class DefaultValueMapAllocator : public ValueMapAllocator
+{
+public: // overridden from ValueMapAllocator
+   virtual ValueInternalMap *newMap()
+   {
+      ValueInternalMap *map = mapsAllocator_.allocate();
+      new (map) ValueInternalMap(); // placement new
+      return map;
+   }
+
+   virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
+   {
+      ValueInternalMap *map = mapsAllocator_.allocate();
+      new (map) ValueInternalMap( other ); // placement new
+      return map;
+   }
+
+   virtual void destructMap( ValueInternalMap *map )
+   {
+      if ( map )
+      {
+         map->~ValueInternalMap();
+         mapsAllocator_.release( map );
+      }
+   }
+
+   virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
+   {
+      return new ValueInternalLink[size];
+   }
+
+   virtual void releaseMapBuckets( ValueInternalLink *links )
+   {
+      delete [] links;
+   }
+
+   virtual ValueInternalLink *allocateMapLink()
+   {
+      ValueInternalLink *link = linksAllocator_.allocate();
+      memset( link, 0, sizeof(ValueInternalLink) );
+      return link;
+   }
+
+   virtual void releaseMapLink( ValueInternalLink *link )
+   {
+      link->~ValueInternalLink();
+      linksAllocator_.release( link );
+   }
+private:
+   BatchAllocator<ValueInternalMap,1> mapsAllocator_;
+   BatchAllocator<ValueInternalLink,1> linksAllocator_;
+};
+#endif
+
+static ValueMapAllocator *&mapAllocator()
+{
+   static DefaultValueMapAllocator defaultAllocator;
+   static ValueMapAllocator *mapAllocator = &defaultAllocator;
+   return mapAllocator;
+}
+
+static struct DummyMapAllocatorInitializer {
+   DummyMapAllocatorInitializer() 
+   {
+      mapAllocator();      // ensure mapAllocator() statics are initialized before main().
+   }
+} dummyMapAllocatorInitializer;
+
+
+
+// h(K) = value * K >> w ; with w = 32 & K prime w.r.t. 2^32.
+
+/*
+use linked list hash map. 
+buckets array is a container.
+linked list element contains 6 key/values. (memory = (16+4) * 6 + 4 = 124)
+value have extra state: valid, available, deleted
+*/
+
+
+ValueInternalMap::ValueInternalMap()
+   : buckets_( 0 )
+   , tailLink_( 0 )
+   , bucketsSize_( 0 )
+   , itemCount_( 0 )
+{
+}
+
+
+ValueInternalMap::ValueInternalMap( const ValueInternalMap &other )
+   : buckets_( 0 )
+   , tailLink_( 0 )
+   , bucketsSize_( 0 )
+   , itemCount_( 0 )
+{
+   reserve( other.itemCount_ );
+   IteratorState it;
+   IteratorState itEnd;
+   other.makeBeginIterator( it );
+   other.makeEndIterator( itEnd );
+   for ( ; !equals(it,itEnd); increment(it) )
+   {
+      bool isStatic;
+      const char *memberName = key( it, isStatic );
+      const Value &aValue = value( it );
+      resolveReference(memberName, isStatic) = aValue;
+   }
+}
+
+
+ValueInternalMap &
+ValueInternalMap::operator =( const ValueInternalMap &other )
+{
+   ValueInternalMap dummy( other );
+   swap( dummy );
+   return *this;
+}
+
+
+ValueInternalMap::~ValueInternalMap()
+{
+   if ( buckets_ )
+   {
+      for ( BucketIndex bucketIndex =0; bucketIndex < bucketsSize_; ++bucketIndex )
+      {
+         ValueInternalLink *link = buckets_[bucketIndex].next_;
+         while ( link )
+         {
+            ValueInternalLink *linkToRelease = link;
+            link = link->next_;
+            mapAllocator()->releaseMapLink( linkToRelease );
+         }
+      }
+      mapAllocator()->releaseMapBuckets( buckets_ );
+   }
+}
+
+
+void 
+ValueInternalMap::swap( ValueInternalMap &other )
+{
+   ValueInternalLink *tempBuckets = buckets_;
+   buckets_ = other.buckets_;
+   other.buckets_ = tempBuckets;
+   ValueInternalLink *tempTailLink = tailLink_;
+   tailLink_ = other.tailLink_;
+   other.tailLink_ = tempTailLink;
+   BucketIndex tempBucketsSize = bucketsSize_;
+   bucketsSize_ = other.bucketsSize_;
+   other.bucketsSize_ = tempBucketsSize;
+   BucketIndex tempItemCount = itemCount_;
+   itemCount_ = other.itemCount_;
+   other.itemCount_ = tempItemCount;
+}
+
+
+void 
+ValueInternalMap::clear()
+{
+   ValueInternalMap dummy;
+   swap( dummy );
+}
+
+
+ValueInternalMap::BucketIndex 
+ValueInternalMap::size() const
+{
+   return itemCount_;
+}
+
+bool 
+ValueInternalMap::reserveDelta( BucketIndex growth )
+{
+   return reserve( itemCount_ + growth );
+}
+
+bool 
+ValueInternalMap::reserve( BucketIndex newItemCount )
+{
+   if ( !buckets_  &&  newItemCount > 0 )
+   {
+      buckets_ = mapAllocator()->allocateMapBuckets( 1 );
+      bucketsSize_ = 1;
+      tailLink_ = &buckets_[0];
+   }
+//   BucketIndex idealBucketCount = (newItemCount + ValueInternalLink::itemPerLink) / ValueInternalLink::itemPerLink;
+   return true;
+}
+
+
+const Value *
+ValueInternalMap::find( const char *key ) const
+{
+   if ( !bucketsSize_ )
+      return 0;
+   HashKey hashedKey = hash( key );
+   BucketIndex bucketIndex = hashedKey % bucketsSize_;
+   for ( const ValueInternalLink *current = &buckets_[bucketIndex]; 
+         current != 0; 
+         current = current->next_ )
+   {
+      for ( BucketIndex index=0; index < ValueInternalLink::itemPerLink; ++index )
+      {
+         if ( current->items_[index].isItemAvailable() )
+            return 0;
+         if ( strcmp( key, current->keys_[index] ) == 0 )
+            return &current->items_[index];
+      }
+   }
+   return 0;
+}
+
+
+Value *
+ValueInternalMap::find( const char *key )
+{
+   const ValueInternalMap *constThis = this;
+   return const_cast<Value *>( constThis->find( key ) );
+}
+
+
+Value &
+ValueInternalMap::resolveReference( const char *key,
+                                    bool isStatic )
+{
+   HashKey hashedKey = hash( key );
+   if ( bucketsSize_ )
+   {
+      BucketIndex bucketIndex = hashedKey % bucketsSize_;
+      ValueInternalLink **previous = 0;
+      BucketIndex index;
+      for ( ValueInternalLink *current = &buckets_[bucketIndex]; 
+            current != 0; 
+            previous = &current->next_, current = current->next_ )
+      {
+         for ( index=0; index < ValueInternalLink::itemPerLink; ++index )
+         {
+            if ( current->items_[index].isItemAvailable() )
+               return setNewItem( key, isStatic, current, index );
+            if ( strcmp( key, current->keys_[index] ) == 0 )
+               return current->items_[index];
+         }
+      }
+   }
+
+   reserveDelta( 1 );
+   return unsafeAdd( key, isStatic, hashedKey );
+}
+
+
+void 
+ValueInternalMap::remove( const char *key )
+{
+   HashKey hashedKey = hash( key );
+   if ( !bucketsSize_ )
+      return;
+   BucketIndex bucketIndex = hashedKey % bucketsSize_;
+   for ( ValueInternalLink *link = &buckets_[bucketIndex]; 
+         link != 0; 
+         link = link->next_ )
+   {
+      BucketIndex index;
+      for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
+      {
+         if ( link->items_[index].isItemAvailable() )
+            return;
+         if ( strcmp( key, link->keys_[index] ) == 0 )
+         {
+            doActualRemove( link, index, bucketIndex );
+            return;
+         }
+      }
+   }
+}
+
+void 
+ValueInternalMap::doActualRemove( ValueInternalLink *link, 
+                                  BucketIndex index,
+                                  BucketIndex bucketIndex )
+{
+   // find last item of the bucket and swap it with the 'removed' one.
+   // set removed items flags to 'available'.
+   // if last page only contains 'available' items, then desallocate it (it's empty)
+   ValueInternalLink *&lastLink = getLastLinkInBucket( index );
+   BucketIndex lastItemIndex = 1; // a link can never be empty, so start at 1
+   for ( ;   
+         lastItemIndex < ValueInternalLink::itemPerLink; 
+         ++lastItemIndex ) // may be optimized with dicotomic search
+   {
+      if ( lastLink->items_[lastItemIndex].isItemAvailable() )
+         break;
+   }
+   
+   BucketIndex lastUsedIndex = lastItemIndex - 1;
+   Value *valueToDelete = &link->items_[index];
+   Value *valueToPreserve = &lastLink->items_[lastUsedIndex];
+   if ( valueToDelete != valueToPreserve )
+      valueToDelete->swap( *valueToPreserve );
+   if ( lastUsedIndex == 0 )  // page is now empty
+   {  // remove it from bucket linked list and delete it.
+      ValueInternalLink *linkPreviousToLast = lastLink->previous_;
+      if ( linkPreviousToLast != 0 )   // can not deleted bucket link.
+      {
+         mapAllocator()->releaseMapLink( lastLink );
+         linkPreviousToLast->next_ = 0;
+         lastLink = linkPreviousToLast;
+      }
+   }
+   else
+   {
+      Value dummy;
+      valueToPreserve->swap( dummy ); // restore deleted to default Value.
+      valueToPreserve->setItemUsed( false );
+   }
+   --itemCount_;
+}
+
+
+ValueInternalLink *&
+ValueInternalMap::getLastLinkInBucket( BucketIndex bucketIndex )
+{
+   if ( bucketIndex == bucketsSize_ - 1 )
+      return tailLink_;
+   ValueInternalLink *&previous = buckets_[bucketIndex+1].previous_;
+   if ( !previous )
+      previous = &buckets_[bucketIndex];
+   return previous;
+}
+
+
+Value &
+ValueInternalMap::setNewItem( const char *key, 
+                              bool isStatic,
+                              ValueInternalLink *link, 
+                              BucketIndex index )
+{
+   char *duplicatedKey = valueAllocator()->makeMemberName( key );
+   ++itemCount_;
+   link->keys_[index] = duplicatedKey;
+   link->items_[index].setItemUsed();
+   link->items_[index].setMemberNameIsStatic( isStatic );
+   return link->items_[index]; // items already default constructed.
+}
+
+
+Value &
+ValueInternalMap::unsafeAdd( const char *key, 
+                             bool isStatic, 
+                             HashKey hashedKey )
+{
+   JSON_ASSERT_MESSAGE( bucketsSize_ > 0, "ValueInternalMap::unsafeAdd(): internal logic error." );
+   BucketIndex bucketIndex = hashedKey % bucketsSize_;
+   ValueInternalLink *&previousLink = getLastLinkInBucket( bucketIndex );
+   ValueInternalLink *link = previousLink;
+   BucketIndex index;
+   for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
+   {
+      if ( link->items_[index].isItemAvailable() )
+         break;
+   }
+   if ( index == ValueInternalLink::itemPerLink ) // need to add a new page
+   {
+      ValueInternalLink *newLink = mapAllocator()->allocateMapLink();
+      index = 0;
+      link->next_ = newLink;
+      previousLink = newLink;
+      link = newLink;
+   }
+   return setNewItem( key, isStatic, link, index );
+}
+
+
+ValueInternalMap::HashKey 
+ValueInternalMap::hash( const char *key ) const
+{
+   HashKey hash = 0;
+   while ( *key )
+      hash += *key++ * 37;
+   return hash;
+}
+
+
+int 
+ValueInternalMap::compare( const ValueInternalMap &other ) const
+{
+   int sizeDiff( itemCount_ - other.itemCount_ );
+   if ( sizeDiff != 0 )
+      return sizeDiff;
+   // Strict order guaranty is required. Compare all keys FIRST, then compare values.
+   IteratorState it;
+   IteratorState itEnd;
+   makeBeginIterator( it );
+   makeEndIterator( itEnd );
+   for ( ; !equals(it,itEnd); increment(it) )
+   {
+      if ( !other.find( key( it ) ) )
+         return 1;
+   }
+
+   // All keys are equals, let's compare values
+   makeBeginIterator( it );
+   for ( ; !equals(it,itEnd); increment(it) )
+   {
+      const Value *otherValue = other.find( key( it ) );
+      int valueDiff = value(it).compare( *otherValue );
+      if ( valueDiff != 0 )
+         return valueDiff;
+   }
+   return 0;
+}
+
+
+void 
+ValueInternalMap::makeBeginIterator( IteratorState &it ) const
+{
+   it.map_ = const_cast<ValueInternalMap *>( this );
+   it.bucketIndex_ = 0;
+   it.itemIndex_ = 0;
+   it.link_ = buckets_;
+}
+
+
+void 
+ValueInternalMap::makeEndIterator( IteratorState &it ) const
+{
+   it.map_ = const_cast<ValueInternalMap *>( this );
+   it.bucketIndex_ = bucketsSize_;
+   it.itemIndex_ = 0;
+   it.link_ = 0;
+}
+
+
+bool 
+ValueInternalMap::equals( const IteratorState &x, const IteratorState &other )
+{
+   return x.map_ == other.map_  
+          &&  x.bucketIndex_ == other.bucketIndex_  
+          &&  x.link_ == other.link_
+          &&  x.itemIndex_ == other.itemIndex_;
+}
+
+
+void 
+ValueInternalMap::incrementBucket( IteratorState &iterator )
+{
+   ++iterator.bucketIndex_;
+   JSON_ASSERT_MESSAGE( iterator.bucketIndex_ <= iterator.map_->bucketsSize_,
+      "ValueInternalMap::increment(): attempting to iterate beyond end." );
+   if ( iterator.bucketIndex_ == iterator.map_->bucketsSize_ )
+      iterator.link_ = 0;
+   else
+      iterator.link_ = &(iterator.map_->buckets_[iterator.bucketIndex_]);
+   iterator.itemIndex_ = 0;
+}
+
+
+void 
+ValueInternalMap::increment( IteratorState &iterator )
+{
+   JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterator using invalid iterator." );
+   ++iterator.itemIndex_;
+   if ( iterator.itemIndex_ == ValueInternalLink::itemPerLink )
+   {
+      JSON_ASSERT_MESSAGE( iterator.link_ != 0,
+         "ValueInternalMap::increment(): attempting to iterate beyond end." );
+      iterator.link_ = iterator.link_->next_;
+      if ( iterator.link_ == 0 )
+         incrementBucket( iterator );
+   }
+   else if ( iterator.link_->items_[iterator.itemIndex_].isItemAvailable() )
+   {
+      incrementBucket( iterator );
+   }
+}
+
+
+void 
+ValueInternalMap::decrement( IteratorState &iterator )
+{
+   if ( iterator.itemIndex_ == 0 )
+   {
+      JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterate using invalid iterator." );
+      if ( iterator.link_ == &iterator.map_->buckets_[iterator.bucketIndex_] )
+      {
+         JSON_ASSERT_MESSAGE( iterator.bucketIndex_ > 0, "Attempting to iterate beyond beginning." );
+         --(iterator.bucketIndex_);
+      }
+      iterator.link_ = iterator.link_->previous_;
+      iterator.itemIndex_ = ValueInternalLink::itemPerLink - 1;
+   }
+}
+
+
+const char *
+ValueInternalMap::key( const IteratorState &iterator )
+{
+   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
+   return iterator.link_->keys_[iterator.itemIndex_];
+}
+
+const char *
+ValueInternalMap::key( const IteratorState &iterator, bool &isStatic )
+{
+   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
+   isStatic = iterator.link_->items_[iterator.itemIndex_].isMemberNameStatic();
+   return iterator.link_->keys_[iterator.itemIndex_];
+}
+
+
+Value &
+ValueInternalMap::value( const IteratorState &iterator )
+{
+   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
+   return iterator.link_->items_[iterator.itemIndex_];
+}
+
+
+int 
+ValueInternalMap::distance( const IteratorState &x, const IteratorState &y )
+{
+   int offset = 0;
+   IteratorState it = x;
+   while ( !equals( it, y ) )
+      increment( it );
+   return offset;
+}

src/lib_json/json_tool.h

@@ -1,138 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-#define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include <json/config.h>
-#endif
-
-// Also support old flag NO_LOCALE_SUPPORT
-#ifdef NO_LOCALE_SUPPORT
-#define JSONCPP_NO_LOCALE_SUPPORT
-#endif
-
-#ifndef JSONCPP_NO_LOCALE_SUPPORT
-#include <clocale>
-#endif
-
-/* This header provides common string manipulation support, such as UTF-8,
- * portable conversion from/to string...
- *
- * It is an internal header that must not be exposed.
- */
-
-namespace Json {
-static inline char getDecimalPoint() {
-#ifdef JSONCPP_NO_LOCALE_SUPPORT
-  return '\0';
-#else
-  struct lconv* lc = localeconv();
-  return lc ? *(lc->decimal_point) : '\0';
-#endif
-}
-
-/// Converts a unicode code-point to UTF-8.
-static inline String codePointToUTF8(unsigned int cp) {
-  String result;
-
-  // based on description from http://en.wikipedia.org/wiki/UTF-8
-
-  if (cp <= 0x7f) {
-    result.resize(1);
-    result[0] = static_cast<char>(cp);
-  } else if (cp <= 0x7FF) {
-    result.resize(2);
-    result[1] = static_cast<char>(0x80 | (0x3f & cp));
-    result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
-  } else if (cp <= 0xFFFF) {
-    result.resize(3);
-    result[2] = static_cast<char>(0x80 | (0x3f & cp));
-    result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-    result[0] = static_cast<char>(0xE0 | (0xf & (cp >> 12)));
-  } else if (cp <= 0x10FFFF) {
-    result.resize(4);
-    result[3] = static_cast<char>(0x80 | (0x3f & cp));
-    result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-    result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
-    result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
-  }
-
-  return result;
-}
-
-enum {
-  /// Constant that specify the size of the buffer that must be passed to
-  /// uintToString.
-  uintToStringBufferSize = 3 * sizeof(LargestUInt) + 1
-};
-
-// Defines a char buffer for use with uintToString().
-using UIntToStringBuffer = char[uintToStringBufferSize];
-
-/** Converts an unsigned integer to string.
- * @param value Unsigned integer to convert to string
- * @param current Input/Output string buffer.
- *        Must have at least uintToStringBufferSize chars free.
- */
-static inline void uintToString(LargestUInt value, char*& current) {
-  *--current = 0;
-  do {
-    *--current = static_cast<char>(value % 10U + static_cast<unsigned>('0'));
-    value /= 10;
-  } while (value != 0);
-}
-
-/** Change ',' to '.' everywhere in buffer.
- *
- * We had a sophisticated way, but it did not work in WinCE.
- * @see https://github.com/open-source-parsers/jsoncpp/pull/9
- */
-template <typename Iter> Iter fixNumericLocale(Iter begin, Iter end) {
-  for (; begin != end; ++begin) {
-    if (*begin == ',') {
-      *begin = '.';
-    }
-  }
-  return begin;
-}
-
-template <typename Iter> void fixNumericLocaleInput(Iter begin, Iter end) {
-  char decimalPoint = getDecimalPoint();
-  if (decimalPoint == '\0' || decimalPoint == '.') {
-    return;
-  }
-  for (; begin != end; ++begin) {
-    if (*begin == '.') {
-      *begin = decimalPoint;
-    }
-  }
-}
-
-/**
- * Return iterator that would be the new end of the range [begin,end), if we
- * were to delete zeros in the end of string, but not the last zero before '.'.
- */
-template <typename Iter>
-Iter fixZerosInTheEnd(Iter begin, Iter end, unsigned int precision) {
-  for (; begin != end; --end) {
-    if (*(end - 1) != '0') {
-      return end;
-    }
-    // Don't delete the last zero before the decimal point.
-    if (begin != (end - 1) && begin != (end - 2) && *(end - 2) == '.') {
-      if (precision) {
-        return end;
-      }
-      return end - 2;
-    }
-  }
-  return end;
-}
-
-} // namespace Json
-
-#endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED

src/lib_json/json_valueiterator.inl

@@ -1,11 +1,6 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 // included by json_value.cpp
+// everything is within Json namespace
 
-namespace Json {
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -15,95 +10,201 @@ namespace Json {
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-ValueIteratorBase::ValueIteratorBase() : current_() {}
+ValueIteratorBase::ValueIteratorBase()
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+   : current_()
+   , isNull_( true )
+{
+}
+#else
+   : isArray_( true )
+   , isNull_( true )
+{
+   iterator_.array_ = ValueInternalArray::IteratorState();
+}
+#endif
 
-ValueIteratorBase::ValueIteratorBase(
-    const Value::ObjectValues::iterator& current)
-    : current_(current), isNull_(false) {}
 
-Value& ValueIteratorBase::deref() { return current_->second; }
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
-const Value& ValueIteratorBase::deref() const { return current_->second; }
+ValueIteratorBase::ValueIteratorBase( const Value::ObjectValues::iterator &current )
+   : current_( current )
+   , isNull_( false )
+{
+}
+#else
+ValueIteratorBase::ValueIteratorBase( const ValueInternalArray::IteratorState &state )
+   : isArray_( true )
+{
+   iterator_.array_ = state;
+}
 
-void ValueIteratorBase::increment() { ++current_; }
 
-void ValueIteratorBase::decrement() { --current_; }
+ValueIteratorBase::ValueIteratorBase( const ValueInternalMap::IteratorState &state )
+   : isArray_( false )
+{
+   iterator_.map_ = state;
+}
+#endif
+
+Value &
+ValueIteratorBase::deref() const
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+   return current_->second;
+#else
+   if ( isArray_ )
+      return ValueInternalArray::dereference( iterator_.array_ );
+   return ValueInternalMap::value( iterator_.map_ );
+#endif
+}
+
+
+void 
+ValueIteratorBase::increment()
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+   ++current_;
+#else
+   if ( isArray_ )
+      ValueInternalArray::increment( iterator_.array_ );
+   ValueInternalMap::increment( iterator_.map_ );
+#endif
+}
+
+
+void 
+ValueIteratorBase::decrement()
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+   --current_;
+#else
+   if ( isArray_ )
+      ValueInternalArray::decrement( iterator_.array_ );
+   ValueInternalMap::decrement( iterator_.map_ );
+#endif
+}
+
 
 ValueIteratorBase::difference_type 
-ValueIteratorBase::computeDistance(const SelfType& other) const {
+ValueIteratorBase::computeDistance( const SelfType &other ) const
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+# ifdef JSON_USE_CPPTL_SMALLMAP
+   return current_ - other.current_;
+# else
    // Iterator for null value are initialized using the default
    // constructor, which initialize current_ to the default
    // std::map::iterator. As begin() and end() are two instance 
    // of the default std::map::iterator, they can not be compared.
    // To allow this, we handle this comparison specifically.
-  if (isNull_ && other.isNull_) {
+   if ( isNull_  &&  other.isNull_ )
+   {
       return 0;
    }
 
-  // Usage of std::distance is not portable (does not compile with Sun Studio 12
+
-  // RogueWave STL,
+   // Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
    // which is the one used by default).
    // Using a portable hand-made version for non random iterator instead:
    //   return difference_type( std::distance( current_, other.current_ ) );
    difference_type myDistance = 0;
-  for (Value::ObjectValues::iterator it = current_; it != other.current_;
+   for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
-       ++it) {
+   {
       ++myDistance;
    }
    return myDistance;
+# endif
+#else
+   if ( isArray_ )
+      return ValueInternalArray::distance( iterator_.array_, other.iterator_.array_ );
+   return ValueInternalMap::distance( iterator_.map_, other.iterator_.map_ );
+#endif
 }
 
-bool ValueIteratorBase::isEqual(const SelfType& other) const {
+
-  if (isNull_) {
+bool 
+ValueIteratorBase::isEqual( const SelfType &other ) const
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+   if ( isNull_ )
+   {
       return other.isNull_;
    }
    return current_ == other.current_;
+#else
+   if ( isArray_ )
+      return ValueInternalArray::equals( iterator_.array_, other.iterator_.array_ );
+   return ValueInternalMap::equals( iterator_.map_, other.iterator_.map_ );
+#endif
 }
 
-void ValueIteratorBase::copy(const SelfType& other) {
+
+void 
+ValueIteratorBase::copy( const SelfType &other )
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
    current_ = other.current_;
-  isNull_ = other.isNull_;
+#else
+   if ( isArray_ )
+      iterator_.array_ = other.iterator_.array_;
+   iterator_.map_ = other.iterator_.map_;
+#endif
 }
 
-Value ValueIteratorBase::key() const {
+
+Value 
+ValueIteratorBase::key() const
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
    const Value::CZString czstring = (*current_).first;
-  if (czstring.data()) {
+   if ( czstring.c_str() )
-    if (czstring.isStaticString())
+   {
-      return Value(StaticString(czstring.data()));
+      if ( czstring.isStaticString() )
-    return Value(czstring.data(), czstring.data() + czstring.length());
+         return Value( StaticString( czstring.c_str() ) );
+      return Value( czstring.c_str() );
    }
-  return Value(czstring.index());
+   return Value( czstring.index() );
+#else
+   if ( isArray_ )
+      return Value( ValueInternalArray::indexOf( iterator_.array_ ) );
+   bool isStatic;
+   const char *memberName = ValueInternalMap::key( iterator_.map_, isStatic );
+   if ( isStatic )
+      return Value( StaticString( memberName ) );
+   return Value( memberName );
+#endif
 }
 
-UInt ValueIteratorBase::index() const {
+
+UInt 
+ValueIteratorBase::index() const
+{
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
    const Value::CZString czstring = (*current_).first;
-  if (!czstring.data())
+   if ( !czstring.c_str() )
       return czstring.index();
-  return Value::UInt(-1);
+   return Value::UInt( -1 );
+#else
+   if ( isArray_ )
+      return Value::UInt( ValueInternalArray::indexOf( iterator_.array_ ) );
+   return Value::UInt( -1 );
+#endif
 }
 
-String ValueIteratorBase::name() const {
+
-  char const* keey;
+const char *
-  char const* end;
+ValueIteratorBase::memberName() const
-  keey = memberName(&end);
+{
-  if (!keey)
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    return String();
+   const char *name = (*current_).first.c_str();
-  return String(keey, end);
+   return name ? name : "";
+#else
+   if ( !isArray_ )
+      return ValueInternalMap::key( iterator_.map_ );
+   return "";
+#endif
 }
 
-char const* ValueIteratorBase::memberName() const {
-  const char* cname = (*current_).first.data();
-  return cname ? cname : "";
-}
-
-char const* ValueIteratorBase::memberName(char const** end) const {
-  const char* cname = (*current_).first.data();
-  if (!cname) {
-    *end = nullptr;
-    return nullptr;
-  }
-  *end = cname + (*current_).first.length();
-  return cname;
-}
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -113,21 +214,36 @@ char const* ValueIteratorBase::memberName(char const** end) const {
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-ValueConstIterator::ValueConstIterator() = default;
+ValueConstIterator::ValueConstIterator()
+{
+}
 
-ValueConstIterator::ValueConstIterator(
-    const Value::ObjectValues::iterator& current)
-    : ValueIteratorBase(current) {}
 
-ValueConstIterator::ValueConstIterator(ValueIterator const& other)
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    : ValueIteratorBase(other) {}
+ValueConstIterator::ValueConstIterator( const Value::ObjectValues::iterator &current )
+   : ValueIteratorBase( current )
+{
+}
+#else
+ValueConstIterator::ValueConstIterator( const ValueInternalArray::IteratorState &state )
+   : ValueIteratorBase( state )
+{
+}
 
-ValueConstIterator& ValueConstIterator::
+ValueConstIterator::ValueConstIterator( const ValueInternalMap::IteratorState &state )
-operator=(const ValueIteratorBase& other) {
+   : ValueIteratorBase( state )
-  copy(other);
+{
+}
+#endif
+
+ValueConstIterator &
+ValueConstIterator::operator =( const ValueIteratorBase &other )
+{
+   copy( other );
    return *this;
 }
 
+
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -136,21 +252,41 @@ operator=(const ValueIteratorBase& other) {
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-ValueIterator::ValueIterator() = default;
+ValueIterator::ValueIterator()
-
+{
-ValueIterator::ValueIterator(const Value::ObjectValues::iterator& current)
-    : ValueIteratorBase(current) {}
-
-ValueIterator::ValueIterator(const ValueConstIterator& other)
-    : ValueIteratorBase(other) {
-  throwRuntimeError("ConstIterator to Iterator should never be allowed.");
 }
 
-ValueIterator::ValueIterator(const ValueIterator& other) = default;
 
-ValueIterator& ValueIterator::operator=(const SelfType& other) {
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
-  copy(other);
+ValueIterator::ValueIterator( const Value::ObjectValues::iterator &current )
+   : ValueIteratorBase( current )
+{
+}
+#else
+ValueIterator::ValueIterator( const ValueInternalArray::IteratorState &state )
+   : ValueIteratorBase( state )
+{
+}
+
+ValueIterator::ValueIterator( const ValueInternalMap::IteratorState &state )
+   : ValueIteratorBase( state )
+{
+}
+#endif
+
+ValueIterator::ValueIterator( const ValueConstIterator &other )
+   : ValueIteratorBase( other )
+{
+}
+
+ValueIterator::ValueIterator( const ValueIterator &other )
+   : ValueIteratorBase( other )
+{
+}
+
+ValueIterator &
+ValueIterator::operator =( const SelfType &other )
+{
+   copy( other );
    return *this;
 }
-
-} // namespace Json

src/lib_json/sconscript

@@ -0,0 +1,8 @@
+Import( 'env buildLibrary' )
+
+buildLibrary( env, Split( """
+    json_reader.cpp 
+    json_value.cpp 
+    json_writer.cpp
+     """ ),
+    'json' )

src/test_lib_json/CMakeLists.txt

@@ -1,39 +0,0 @@
-# vim: et ts=4 sts=4 sw=4 tw=0
-
-add_executable(jsoncpp_test
-    jsontest.cpp
-    jsontest.h
-    fuzz.cpp
-    fuzz.h
-    main.cpp
-)
-
-
-if(BUILD_SHARED_LIBS)
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
-        add_compile_definitions( JSON_DLL )
-    else()
-        add_definitions( -DJSON_DLL )
-    endif()
-    target_link_libraries(jsoncpp_test jsoncpp_lib)
-else()
-    target_link_libraries(jsoncpp_test jsoncpp_static)
-endif()
-
-# another way to solve issue #90
-#set_target_properties(jsoncpp_test PROPERTIES COMPILE_FLAGS -ffloat-store)
-
-## Create tests for dashboard submission, allows easy review of CI results https://my.cdash.org/index.php?project=jsoncpp
-add_test(NAME jsoncpp_test
-    COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:jsoncpp_test>
-)
-set_target_properties(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test)
-
-# Run unit tests in post-build
-# (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?)
-if(JSONCPP_WITH_POST_BUILD_UNITTEST)
-    add_custom_command(TARGET jsoncpp_test
-        POST_BUILD
-        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:jsoncpp_test>
-    )
-endif()

src/test_lib_json/fuzz.cpp

@@ -1,54 +0,0 @@
-// Copyright 2007-2019 The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#include "fuzz.h"
-
-#include <cstdint>
-#include <json/config.h>
-#include <json/json.h>
-#include <memory>
-#include <string>
-
-namespace Json {
-class Exception;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  Json::CharReaderBuilder builder;
-
-  if (size < sizeof(uint32_t)) {
-    return 0;
-  }
-
-  const uint32_t hash_settings = static_cast<uint32_t>(data[0]) |
-                                 (static_cast<uint32_t>(data[1]) << 8) |
-                                 (static_cast<uint32_t>(data[2]) << 16) |
-                                 (static_cast<uint32_t>(data[3]) << 24);
-  data += sizeof(uint32_t);
-  size -= sizeof(uint32_t);
-
-  builder.settings_["failIfExtra"] = hash_settings & (1 << 0);
-  builder.settings_["allowComments_"] = hash_settings & (1 << 1);
-  builder.settings_["strictRoot_"] = hash_settings & (1 << 2);
-  builder.settings_["allowDroppedNullPlaceholders_"] = hash_settings & (1 << 3);
-  builder.settings_["allowNumericKeys_"] = hash_settings & (1 << 4);
-  builder.settings_["allowSingleQuotes_"] = hash_settings & (1 << 5);
-  builder.settings_["failIfExtra_"] = hash_settings & (1 << 6);
-  builder.settings_["rejectDupKeys_"] = hash_settings & (1 << 7);
-  builder.settings_["allowSpecialFloats_"] = hash_settings & (1 << 8);
-  builder.settings_["collectComments"] = hash_settings & (1 << 9);
-  builder.settings_["allowTrailingCommas_"] = hash_settings & (1 << 10);
-
-  std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
-
-  Json::Value root;
-  const auto data_str = reinterpret_cast<const char*>(data);
-  try {
-    reader->parse(data_str, data_str + size, &root, nullptr);
-  } catch (Json::Exception const&) {
-  }
-  // Whether it succeeded or not doesn't matter.
-  return 0;
-}

src/test_lib_json/fuzz.dict

@@ -1,54 +0,0 @@
-#
-# AFL dictionary for JSON
-# -----------------------
-#
-# Just the very basics.
-#
-# Inspired by a dictionary by Jakub Wilk <jwilk@jwilk.net>
-#
-# https://github.com/rc0r/afl-fuzz/blob/master/dictionaries/json.dict
-#
-
-"0"
-",0"
-":0"
-"0:"
-"-1.2e+3"
-
-"true"
-"false"
-"null"
-
-"\"\""
-",\"\""
-":\"\""
-"\"\":"
-
-"{}"
-",{}"
-":{}"
-"{\"\":0}"
-"{{}}"
-
-"[]"
-",[]"
-":[]"
-"[0]"
-"[[]]"
-
-"''"
-"\\"
-"\\b"
-"\\f"
-"\\n"
-"\\r"
-"\\t"
-"\\u0000"
-"\\x00"
-"\\0"
-"\\uD800\\uDC00"
-"\\uDBFF\\uDFFF"
-
-"\"\":0"
-"//"
-"/**/"

src/test_lib_json/fuzz.h

@@ -1,14 +0,0 @@
-// Copyright 2007-2010 The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef FUZZ_H_INCLUDED
-#define FUZZ_H_INCLUDED
-
-#include <cstddef>
-#include <stdint.h>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
-
-#endif // ifndef FUZZ_H_INCLUDED

src/test_lib_json/jsontest.cpp

@@ -1,290 +1,435 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 #define _CRT_SECURE_NO_WARNINGS 1 // Prevents deprecation warning with MSVC
 #include "jsontest.h"
-#include <cstdio>
+#include <stdio.h>
 #include <string>
 
 #if defined(_MSC_VER)
 // Used to install a report hook that prevent dialog on assertion and error.
-#include <crtdbg.h>
+# include <crtdbg.h>
 #endif // if defined(_MSC_VER)
 
 #if defined(_WIN32)
 // Used to prevent dialog on memory fault.
 // Limits headers included by Windows.h
-#define WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
-#define NOSERVICE
+# define NOSERVICE
-#define NOMCX
+# define NOMCX
-#define NOIME
+# define NOIME
-#define NOSOUND
+# define NOSOUND
-#define NOCOMM
+# define NOCOMM
-#define NORPC
+# define NORPC
-#define NOGDI
+# define NOGDI
-#define NOUSER
+# define NOUSER
-#define NODRIVERS
+# define NODRIVERS
-#define NOLOGERROR
+# define NOLOGERROR
-#define NOPROFILER
+# define NOPROFILER
-#define NOMEMMGR
+# define NOMEMMGR
-#define NOLFILEIO
+# define NOLFILEIO
-#define NOOPENFILE
+# define NOOPENFILE
-#define NORESOURCE
+# define NORESOURCE
-#define NOATOM
+# define NOATOM
-#define NOLANGUAGE
+# define NOLANGUAGE
-#define NOLSTRING
+# define NOLSTRING
-#define NODBCS
+# define NODBCS
-#define NOKEYBOARDINFO
+# define NOKEYBOARDINFO
-#define NOGDICAPMASKS
+# define NOGDICAPMASKS
-#define NOCOLOR
+# define NOCOLOR
-#define NOGDIOBJ
+# define NOGDIOBJ
-#define NODRAWTEXT
+# define NODRAWTEXT
-#define NOTEXTMETRIC
+# define NOTEXTMETRIC
-#define NOSCALABLEFONT
+# define NOSCALABLEFONT
-#define NOBITMAP
+# define NOBITMAP
-#define NORASTEROPS
+# define NORASTEROPS
-#define NOMETAFILE
+# define NOMETAFILE
-#define NOSYSMETRICS
+# define NOSYSMETRICS
-#define NOSYSTEMPARAMSINFO
+# define NOSYSTEMPARAMSINFO
-#define NOMSG
+# define NOMSG
-#define NOWINSTYLES
+# define NOWINSTYLES
-#define NOWINOFFSETS
+# define NOWINOFFSETS
-#define NOSHOWWINDOW
+# define NOSHOWWINDOW
-#define NODEFERWINDOWPOS
+# define NODEFERWINDOWPOS
-#define NOVIRTUALKEYCODES
+# define NOVIRTUALKEYCODES
-#define NOKEYSTATES
+# define NOKEYSTATES
-#define NOWH
+# define NOWH
-#define NOMENUS
+# define NOMENUS
-#define NOSCROLL
+# define NOSCROLL
-#define NOCLIPBOARD
+# define NOCLIPBOARD
-#define NOICONS
+# define NOICONS
-#define NOMB
+# define NOMB
-#define NOSYSCOMMANDS
+# define NOSYSCOMMANDS
-#define NOMDI
+# define NOMDI
-#define NOCTLMGR
+# define NOCTLMGR
-#define NOWINMESSAGES
+# define NOWINMESSAGES
-#include <windows.h>
+# include <windows.h>
 #endif // if defined(_WIN32)
 
 namespace JsonTest {
 
+
 // class TestResult
 // //////////////////////////////////////////////////////////////////
 
-TestResult::TestResult() {
+TestResult::TestResult()
+   : predicateId_( 1 )
+   , lastUsedPredicateId_( 0 )
+   , messageTarget_( 0 )
+{
    // The root predicate has id 0
    rootPredicateNode_.id_ = 0;
-  rootPredicateNode_.next_ = nullptr;
+   rootPredicateNode_.next_ = 0;
    predicateStackTail_ = &rootPredicateNode_;
 }
 
-void TestResult::setTestName(const Json::String& name) { name_ = name; }
 
-TestResult& TestResult::addFailure(const char* file, unsigned int line,
+void 
-                                   const char* expr) {
+TestResult::setTestName( const std::string &name )
-  /// Walks the PredicateContext stack adding them to failures_ if not already
+{
-  /// added.
+   name_ = name;
+}
+
+TestResult &
+TestResult::addFailure( const char *file, unsigned int line,
+                        const char *expr )
+{
+   /// Walks the PredicateContext stack adding them to failures_ if not already added.
    unsigned int nestingLevel = 0;
-  PredicateContext* lastNode = rootPredicateNode_.next_;
+   PredicateContext *lastNode = rootPredicateNode_.next_;
-  for (; lastNode != nullptr; lastNode = lastNode->next_) {
+   for ( ; lastNode != 0; lastNode = lastNode->next_ )
-    if (lastNode->id_ > lastUsedPredicateId_) // new PredicateContext
+   {
+      if ( lastNode->id_ > lastUsedPredicateId_ ) // new PredicateContext
       {
          lastUsedPredicateId_ = lastNode->id_;
-      addFailureInfo(lastNode->file_, lastNode->line_, lastNode->expr_,
+         addFailureInfo( lastNode->file_, lastNode->line_, lastNode->expr_,
-                     nestingLevel);
+                         nestingLevel );
          // Link the PredicateContext to the failure for message target when 
          // popping the PredicateContext.
-      lastNode->failure_ = &(failures_.back());
+         lastNode->failure_ = &( failures_.back() );
       }
       ++nestingLevel;
    }
 
    // Adds the failed assertion
-  addFailureInfo(file, line, expr, nestingLevel);
+   addFailureInfo( file, line, expr, nestingLevel );
-  messageTarget_ = &(failures_.back());
+   messageTarget_ = &( failures_.back() );
    return *this;
 }
 
-void TestResult::addFailureInfo(const char* file, unsigned int line,
+
-                                const char* expr, unsigned int nestingLevel) {
+void 
+TestResult::addFailureInfo( const char *file, unsigned int line,
+                            const char *expr, unsigned int nestingLevel )
+{
    Failure failure;
    failure.file_ = file;
    failure.line_ = line;
-  if (expr) {
+   if ( expr )
+   {
       failure.expr_ = expr;
    }
    failure.nestingLevel_ = nestingLevel;
-  failures_.push_back(failure);
+   failures_.push_back( failure );
 }
 
-TestResult& TestResult::popPredicateContext() {
+
-  PredicateContext* lastNode = &rootPredicateNode_;
+TestResult &
-  while (lastNode->next_ != nullptr && lastNode->next_->next_ != nullptr) {
+TestResult::popPredicateContext()
+{
+   PredicateContext *lastNode = &rootPredicateNode_;
+   while ( lastNode->next_ != 0  &&  lastNode->next_->next_ != 0 )
+   {
       lastNode = lastNode->next_;
    }
    // Set message target to popped failure
-  PredicateContext* tail = lastNode->next_;
+   PredicateContext *tail = lastNode->next_;
-  if (tail != nullptr && tail->failure_ != nullptr) {
+   if ( tail != 0  &&  tail->failure_ != 0 )
+   {
       messageTarget_ = tail->failure_;
    }
    // Remove tail from list
    predicateStackTail_ = lastNode;
-  lastNode->next_ = nullptr;
+   lastNode->next_ = 0;
    return *this;
 }
 
-bool TestResult::failed() const { return !failures_.empty(); }
 
-void TestResult::printFailure(bool printTestName) const {
+bool 
-  if (failures_.empty()) {
+TestResult::failed() const
+{
+   return !failures_.empty();
+}
+
+
+unsigned int 
+TestResult::getAssertionNestingLevel() const
+{
+   unsigned int level = 0;
+   const PredicateContext *lastNode = &rootPredicateNode_;
+   while ( lastNode->next_ != 0 )
+   {
+      lastNode = lastNode->next_;
+      ++level;
+   }
+   return level;
+}
+
+
+void 
+TestResult::printFailure( bool printTestName ) const
+{
+   if ( failures_.empty() )
+   {
       return;
    }
 
-  if (printTestName) {
+   if ( printTestName )
-    printf("* Detail of %s test failure:\n", name_.c_str());
+   {
+      printf( "* Detail of %s test failure:\n", name_.c_str() );
    }
 
    // Print in reverse to display the callstack in the right order
-  for (const auto& failure : failures_) {
+   Failures::const_iterator itEnd = failures_.end();
-    Json::String indent(failure.nestingLevel_ * 2, ' ');
+   for ( Failures::const_iterator it = failures_.begin(); it != itEnd; ++it )
-    if (failure.file_) {
+   {
-      printf("%s%s(%u): ", indent.c_str(), failure.file_, failure.line_);
+      const Failure &failure = *it;
+      std::string indent( failure.nestingLevel_ * 2, ' ' );
+      if ( failure.file_ )
+      {
+         printf( "%s%s(%d): ", indent.c_str(), failure.file_, failure.line_ );
       }
-    if (!failure.expr_.empty()) {
+      if ( !failure.expr_.empty() )
-      printf("%s\n", failure.expr_.c_str());
+      {
-    } else if (failure.file_) {
+         printf( "%s\n", failure.expr_.c_str() );
-      printf("\n");
       }
-    if (!failure.message_.empty()) {
+      else if ( failure.file_ )
-      Json::String reindented = indentText(failure.message_, indent + "  ");
+      {
-      printf("%s\n", reindented.c_str());
+         printf( "\n" );
+      }
+      if ( !failure.message_.empty() )
+      {
+         std::string reindented = indentText( failure.message_, indent + "  " );
+         printf( "%s\n", reindented.c_str() );
       }
    }
 }
 
-Json::String TestResult::indentText(const Json::String& text,
+
-                                    const Json::String& indent) {
+std::string 
-  Json::String reindented;
+TestResult::indentText( const std::string &text, 
-  Json::String::size_type lastIndex = 0;
+                        const std::string &indent )
-  while (lastIndex < text.size()) {
+{
-    Json::String::size_type nextIndex = text.find('\n', lastIndex);
+   std::string reindented;
-    if (nextIndex == Json::String::npos) {
+   std::string::size_type lastIndex = 0;
+   while ( lastIndex < text.size() )
+   {
+      std::string::size_type nextIndex = text.find( '\n', lastIndex );
+      if ( nextIndex == std::string::npos )
+      {
          nextIndex = text.size() - 1;
       }
       reindented += indent;
-    reindented += text.substr(lastIndex, nextIndex - lastIndex + 1);
+      reindented += text.substr( lastIndex, nextIndex - lastIndex + 1 );
       lastIndex = nextIndex + 1;
    }
    return reindented;
 }
 
-TestResult& TestResult::addToLastFailure(const Json::String& message) {
+
-  if (messageTarget_ != nullptr) {
+TestResult &
+TestResult::addToLastFailure( const std::string &message )
+{
+   if ( messageTarget_ != 0 )
+   {
       messageTarget_->message_ += message;
    }
    return *this;
 }
 
-TestResult& TestResult::operator<<(Json::Int64 value) {
+
-  return addToLastFailure(Json::valueToString(value));
+TestResult &
+TestResult::operator << ( bool value )
+{
+   return addToLastFailure( value ? "true" : "false" );
 }
 
-TestResult& TestResult::operator<<(Json::UInt64 value) {
+
-  return addToLastFailure(Json::valueToString(value));
+TestResult &
+TestResult::operator << ( int value )
+{
+   char buffer[32];
+   sprintf( buffer, "%d", value );
+   return addToLastFailure( buffer );
 }
 
-TestResult& TestResult::operator<<(bool value) {
+
-  return addToLastFailure(value ? "true" : "false");
+TestResult &
+TestResult::operator << ( unsigned int value )
+{
+   char buffer[32];
+   sprintf( buffer, "%u", value );
+   return addToLastFailure( buffer );
 }
 
+
+TestResult &
+TestResult::operator << ( double value )
+{
+   char buffer[32];
+   sprintf( buffer, "%16g", value );
+   return addToLastFailure( buffer );
+}
+
+
+TestResult &
+TestResult::operator << ( const char *value )
+{
+   return addToLastFailure( value ? value 
+                                  : "<NULL>" );
+}
+
+
+TestResult &
+TestResult::operator << ( const std::string &value )
+{
+   return addToLastFailure( value );
+}
+
+
+
 // class TestCase
 // //////////////////////////////////////////////////////////////////
 
-TestCase::TestCase() = default;
+TestCase::TestCase()
+   : result_( 0 )
+{
+}
 
-TestCase::~TestCase() = default;
 
-void TestCase::run(TestResult& result) {
+TestCase::~TestCase()
+{
+}
+
+
+void 
+TestCase::run( TestResult &result )
+{
    result_ = &result;
    runTestCase();
 }
 
+
+
 // class Runner
 // //////////////////////////////////////////////////////////////////
 
-Runner::Runner() = default;
+Runner::Runner()
+{
+}
 
-Runner& Runner::add(TestCaseFactory factory) {
+
-  tests_.push_back(factory);
+Runner &
+Runner::add( TestCaseFactory factory )
+{
+   tests_.push_back( factory );
    return *this;
 }
 
-size_t Runner::testCount() const { return tests_.size(); }
 
-Json::String Runner::testNameAt(size_t index) const {
+unsigned int 
-  TestCase* test = tests_[index]();
+Runner::testCount() const
-  Json::String name = test->testName();
+{
+   return static_cast<unsigned int>( tests_.size() );
+}
+
+
+std::string 
+Runner::testNameAt( unsigned int index ) const
+{
+   TestCase *test = tests_[index]();
+   std::string name = test->testName();
    delete test;
    return name;
 }
 
-void Runner::runTestAt(size_t index, TestResult& result) const {
+
-  TestCase* test = tests_[index]();
+void 
-  result.setTestName(test->testName());
+Runner::runTestAt( unsigned int index, TestResult &result ) const
-  printf("Testing %s: ", test->testName());
+{
-  fflush(stdout);
+   TestCase *test = tests_[index]();
+   result.setTestName( test->testName() );
+   printf( "Testing %s: ", test->testName() );
+   fflush( stdout );
 #if JSON_USE_EXCEPTION
-  try {
+   try 
+   {
 #endif // if JSON_USE_EXCEPTION
-    test->run(result);
+      test->run( result );
 #if JSON_USE_EXCEPTION
-  } catch (const std::exception& e) {
+   } 
-    result.addFailure(__FILE__, __LINE__, "Unexpected exception caught:")
+   catch ( const std::exception &e ) 
-        << e.what();
+   {
+      result.addFailure( __FILE__, __LINE__, 
+         "Unexpected exception caugth:" ) << e.what();
    }
 #endif // if JSON_USE_EXCEPTION
    delete test;
-  const char* status = result.failed() ? "FAILED" : "OK";
+   const char *status = result.failed() ? "FAILED" 
-  printf("%s\n", status);
+                                        : "OK";
-  fflush(stdout);
+   printf( "%s\n", status );
+   fflush( stdout );
 }
 
-bool Runner::runAllTest(bool printSummary) const {
+
-  size_t const count = testCount();
+bool 
+Runner::runAllTest( bool printSummary ) const
+{
+   unsigned int count = testCount();
    std::deque<TestResult> failures;
-  for (size_t index = 0; index < count; ++index) {
+   for ( unsigned int index = 0; index < count; ++index )
+   {
       TestResult result;
-    runTestAt(index, result);
+      runTestAt( index, result );
-    if (result.failed()) {
+      if ( result.failed() )
-      failures.push_back(result);
+      {
+         failures.push_back( result );
       }
    }
 
-  if (failures.empty()) {
+   if ( failures.empty() )
-    if (printSummary) {
+   {
-      printf("All %zu tests passed\n", count);
+      if ( printSummary )
+      {
+         printf( "All %d tests passed\n", count );
       }
       return true;
    }
-  for (auto& result : failures) {
+   else
-    result.printFailure(count > 1);
+   {
+      for ( unsigned int index = 0; index < failures.size(); ++index )
+      {
+         TestResult &result = failures[index];
+         result.printFailure( count > 1 );
       }
 
-  if (printSummary) {
+      if ( printSummary )
-    size_t const failedCount = failures.size();
+      {
-    size_t const passedCount = count - failedCount;
+         unsigned int failedCount = static_cast<unsigned int>( failures.size() );
-    printf("%zu/%zu tests passed (%zu failure(s))\n", passedCount, count,
+         unsigned int passedCount = count - failedCount;
-           failedCount);
+         printf( "%d/%d tests passed (%d failure(s))\n", passedCount, count, failedCount );
       }
       return false;
+   }
 }
 
-bool Runner::testIndex(const Json::String& testName, size_t& indexOut) const {
+
-  const size_t count = testCount();
+bool 
-  for (size_t index = 0; index < count; ++index) {
+Runner::testIndex( const std::string &testName, 
-    if (testNameAt(index) == testName) {
+                   unsigned int &indexOut ) const
+{
+   unsigned int count = testCount();
+   for ( unsigned int index = 0; index < count; ++index )
+   {
+      if ( testNameAt(index) == testName )
+      {
          indexOut = index;
          return true;
       }
@@ -292,74 +437,103 @@ bool Runner::testIndex(const Json::String& testName, size_t& indexOut) const {
    return false;
 }
 
-void Runner::listTests() const {
+
-  const size_t count = testCount();
+void 
-  for (size_t index = 0; index < count; ++index) {
+Runner::listTests() const
-    printf("%s\n", testNameAt(index).c_str());
+{
+   unsigned int count = testCount();
+   for ( unsigned int index = 0; index < count; ++index )
+   {
+      printf( "%s\n", testNameAt( index ).c_str() );
    }
 }
 
-int Runner::runCommandLine(int argc, const char* argv[]) const {
+
-  // typedef std::deque<String> TestNames;
+int 
+Runner::runCommandLine( int argc, const char *argv[] ) const
+{
+   typedef std::deque<std::string> TestNames;
    Runner subrunner;
-  for (int index = 1; index < argc; ++index) {
+   for ( int index = 1; index < argc; ++index )
-    Json::String opt = argv[index];
+   {
-    if (opt == "--list-tests") {
+      std::string opt = argv[index];
+      if ( opt == "--list-tests" )
+      {
          listTests();
          return 0;
       }
-    if (opt == "--test-auto") {
+      else if ( opt == "--test-auto" )
+      {
          preventDialogOnCrash();
-    } else if (opt == "--test") {
+      }
+      else if ( opt == "--test" )
+      {
          ++index;
-      if (index < argc) {
+         if ( index < argc )
-        size_t testNameIndex;
+         {
-        if (testIndex(argv[index], testNameIndex)) {
+            unsigned int testNameIndex;
-          subrunner.add(tests_[testNameIndex]);
+            if ( testIndex( argv[index], testNameIndex ) )
-        } else {
+            {
-          fprintf(stderr, "Test '%s' does not exist!\n", argv[index]);
+               subrunner.add( tests_[testNameIndex] );
+            }
+            else
+            {
+               fprintf( stderr, "Test '%s' does not exist!\n", argv[index] );
                return 2;
             }
-      } else {
+         }
-        printUsage(argv[0]);
+         else
+         {
+            printUsage( argv[0] );
             return 2;
          }
-    } else {
+      }
-      printUsage(argv[0]);
+      else
+      {
+         printUsage( argv[0] );
          return 2;
       }
    }
    bool succeeded;
-  if (subrunner.testCount() > 0) {
+   if ( subrunner.testCount() > 0 )
-    succeeded = subrunner.runAllTest(subrunner.testCount() > 1);
+   {
-  } else {
+      succeeded = subrunner.runAllTest( subrunner.testCount() > 1 );
-    succeeded = runAllTest(true);
    }
-  return succeeded ? 0 : 1;
+   else
+   {
+      succeeded = runAllTest( true );
+   }
+   return succeeded ? 0 
+                    : 1;
 }
 
-#if defined(_MSC_VER) && defined(_DEBUG)
+
+#if defined(_MSC_VER)
 // Hook MSVCRT assertions to prevent dialog from appearing
-static int msvcrtSilentReportHook(int reportType, char* message,
+static int 
-                                  int* /*returnValue*/) {
+msvcrtSilentReportHook( int reportType, char *message, int *returnValue )
+{
    // The default CRT handling of error and assertion is to display
    // an error dialog to the user.
    // Instead, when an error or an assertion occurs, we force the 
    // application to terminate using abort() after display
    // the message on stderr. 
-  if (reportType == _CRT_ERROR || reportType == _CRT_ASSERT) {
+   if ( reportType == _CRT_ERROR  ||  
+        reportType == _CRT_ASSERT )
+   {
       // calling abort() cause the ReportHook to be called
       // The following is used to detect this case and let's the
       // error handler fallback on its default behaviour (
       // display a warning message)
       static volatile bool isAborting = false;
-    if (isAborting) {
+      if ( isAborting ) 
+      {
          return TRUE;
       }
       isAborting = true;
 
-    fprintf(stderr, "CRT Error/Assert:\n%s\n", message);
+      fprintf( stderr, "CRT Error/Assert:\n%s\n", message );
-    fflush(stderr);
+      fflush( stderr );
       abort();
    }
    // Let's other reportType (_CRT_WARNING) be handled as they would by default
@@ -367,28 +541,33 @@ static int msvcrtSilentReportHook(int reportType, char* message,
 }
 #endif // if defined(_MSC_VER)
 
-void Runner::preventDialogOnCrash() {
+
-#if defined(_MSC_VER) && defined(_DEBUG)
+void 
+Runner::preventDialogOnCrash()
+{
+#if defined(_MSC_VER)
    // Install a hook to prevent MSVCRT error and assertion from
-  // popping a dialog
+   // popping a dialog.
-  // This function a NO-OP in release configuration
+   _CrtSetReportHook( &msvcrtSilentReportHook );
-  // (which cause warning since msvcrtSilentReportHook is not referenced)
-  _CrtSetReportHook(&msvcrtSilentReportHook);
 #endif // if defined(_MSC_VER)
 
-  // @todo investigate this handler (for buffer overflow)
+   // @todo investiguate this handler (for buffer overflow)
    // _set_security_error_handler
 
 #if defined(_WIN32)
    // Prevents the system from popping a dialog for debugging if the
    // application fails due to invalid memory access.
-  SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX |
+   SetErrorMode( SEM_FAILCRITICALERRORS 
-               SEM_NOOPENFILEERRORBOX);
+                 | SEM_NOGPFAULTERRORBOX 
+                 | SEM_NOOPENFILEERRORBOX );
 #endif // if defined(_WIN32)
 }
 
-void Runner::printUsage(const char* appName) {
+void 
-  printf("Usage: %s [options]\n"
+Runner::printUsage( const char *appName )
+{
+   printf( 
+      "Usage: %s [options]\n"
       "\n"
       "If --test is not specified, then all the test cases be run.\n"
       "\n"
@@ -397,34 +576,28 @@ void Runner::printUsage(const char* appName) {
       "              output and exit.\n"
       "--test TESTNAME: executes the test case with the specified name.\n"
       "                 May be repeated.\n"
-         "--test-auto: prevent dialog prompting for debugging on crash.\n",
+      "--test-auto: prevent dialog prompting for debugging on crash.\n"
-         appName);
+      , appName );
 }
 
+
+
 // Assertion functions
 // //////////////////////////////////////////////////////////////////
 
-Json::String ToJsonString(const char* toConvert) {
+TestResult &
-  return Json::String(toConvert);
+checkStringEqual( TestResult &result, 
-}
+                  const std::string &expected, const std::string &actual,
-
+                  const char *file, unsigned int line, const char *expr )
-Json::String ToJsonString(Json::String in) { return in; }
+{
-
+   if ( expected != actual )
-#if JSONCPP_USE_SECURE_MEMORY
+   {
-Json::String ToJsonString(std::string in) {
+      result.addFailure( file, line, expr );
-  return Json::String(in.data(), in.data() + in.length());
-}
-#endif
-
-TestResult& checkStringEqual(TestResult& result, const Json::String& expected,
-                             const Json::String& actual, const char* file,
-                             unsigned int line, const char* expr) {
-  if (expected != actual) {
-    result.addFailure(file, line, expr);
       result << "Expected: '" << expected << "'\n";
       result << "Actual  : '" << actual << "'";
    }
    return result;
 }
 
+
 } // namespace JsonTest

src/test_lib_json/jsontest.h

@@ -1,19 +1,10 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
 #ifndef JSONTEST_H_INCLUDED
-#define JSONTEST_H_INCLUDED
+# define JSONTEST_H_INCLUDED
 
-#include <cstdio>
+# include <json/config.h>
-#include <deque>
+# include <stdio.h>
-#include <iomanip>
+# include <deque>
-#include <json/config.h>
+# include <string>
-#include <json/value.h>
-#include <json/writer.h>
-#include <sstream>
-#include <string>
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -21,6 +12,8 @@
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
+
+
 /** \brief Unit testing framework.
  * \warning: all assertions are non-aborting, test case execution will continue
  *           even if an assertion namespace.
@@ -29,260 +22,233 @@
  */
 namespace JsonTest {
 
-class Failure {
-public:
-  const char* file_;
-  unsigned int line_;
-  Json::String expr_;
-  Json::String message_;
-  unsigned int nestingLevel_;
-};
 
-/// Context used to create the assertion callstack on failure.
+   class Failure
-/// Must be a POD to allow inline initialisation without stepping
+   {
-/// into the debugger.
+   public:
-struct PredicateContext {
+      const char *file_;
-  using Id = unsigned int;
-  Id id_;
-  const char* file_;
       unsigned int line_;
-  const char* expr_;
+      std::string expr_;
-  PredicateContext* next_;
+      std::string message_;
+      unsigned int nestingLevel_;
+   };
+
+
+   /// Context used to create the assertion callstack on failure.
+   /// Must be a POD to allow inline initialisation without stepping 
+   /// into the debugger.
+   struct PredicateContext
+   {
+      typedef unsigned int Id;
+      Id id_;
+      const char *file_;
+      unsigned int line_;
+      const char *expr_;
+      PredicateContext *next_;
       /// Related Failure, set when the PredicateContext is converted
       /// into a Failure.
-  Failure* failure_;
+      Failure *failure_;
-};
+   };
 
-class TestResult {
+   class TestResult
-public:
+   {
+   public:
       TestResult();
 
       /// \internal Implementation detail for assertion macros
       /// Not encapsulated to prevent step into when debugging failed assertions
       /// Incremented by one on assertion predicate entry, decreased by one
       /// by addPredicateContext().
-  PredicateContext::Id predicateId_{1};
+      PredicateContext::Id predicateId_;
 
       /// \internal Implementation detail for predicate macros
-  PredicateContext* predicateStackTail_;
+      PredicateContext *predicateStackTail_;
 
-  void setTestName(const Json::String& name);
+      void setTestName( const std::string &name );
 
       /// Adds an assertion failure.
-  TestResult& addFailure(const char* file, unsigned int line,
+      TestResult &addFailure( const char *file, unsigned int line,
-                         const char* expr = nullptr);
+                              const char *expr = 0 );
 
       /// Removes the last PredicateContext added to the predicate stack
       /// chained list.
-  /// Next messages will be targeted at the PredicateContext that was removed.
+      /// Next messages will be targed at the PredicateContext that was removed.
-  TestResult& popPredicateContext();
+      TestResult &popPredicateContext();
 
       bool failed() const;
 
-  void printFailure(bool printTestName) const;
+      void printFailure( bool printTestName ) const;
 
-  // Generic operator that will work with anything ostream can deal with.
+      TestResult &operator << ( bool value );
-  template <typename T> TestResult& operator<<(const T& value) {
+      TestResult &operator << ( int value );
-    Json::OStringStream oss;
+      TestResult &operator << ( unsigned int value );
-    oss << std::setprecision(16) << std::hexfloat << value;
+      TestResult &operator << ( double value );
-    return addToLastFailure(oss.str());
+      TestResult &operator << ( const char *value );
-  }
+      TestResult &operator << ( const std::string &value );
 
-  // Specialized versions.
+   private:
-  TestResult& operator<<(bool value);
+      TestResult &addToLastFailure( const std::string &message );
-  // std:ostream does not support 64bits integers on all STL implementation
+      unsigned int getAssertionNestingLevel() const;
-  TestResult& operator<<(Json::Int64 value);
-  TestResult& operator<<(Json::UInt64 value);
-
-private:
-  TestResult& addToLastFailure(const Json::String& message);
       /// Adds a failure or a predicate context
-  void addFailureInfo(const char* file, unsigned int line, const char* expr,
+      void addFailureInfo( const char *file, unsigned int line,
-                      unsigned int nestingLevel);
+                           const char *expr, unsigned int nestingLevel  );
-  static Json::String indentText(const Json::String& text,
+      static std::string indentText( const std::string &text, 
-                                 const Json::String& indent);
+                                     const std::string &indent );
 
-  using Failures = std::deque<Failure>;
+      typedef std::deque<Failure> Failures;
       Failures failures_;
-  Json::String name_;
+      std::string name_;
       PredicateContext rootPredicateNode_;
-  PredicateContext::Id lastUsedPredicateId_{0};
+      PredicateContext::Id lastUsedPredicateId_;
       /// Failure which is the target of the messages added using operator <<
-  Failure* messageTarget_{nullptr};
+      Failure *messageTarget_;
-};
+   };
 
-class TestCase {
+
-public:
+   class TestCase
+   {
+   public:
       TestCase();
 
       virtual ~TestCase();
 
-  void run(TestResult& result);
+      void run( TestResult &result );
 
-  virtual const char* testName() const = 0;
+      virtual const char *testName() const = 0;
 
-protected:
+   protected:
-  TestResult* result_{nullptr};
+      TestResult *result_;
 
-private:
+   private:
       virtual void runTestCase() = 0;
-};
+   };
 
-/// Function pointer type for TestCase factory
+   /// Function pointer type for TestCase factory
-using TestCaseFactory = TestCase* (*)();
+   typedef TestCase *(*TestCaseFactory)();
 
-class Runner {
+   class Runner
-public:
+   {
+   public:
       Runner();
 
       /// Adds a test to the suite
-  Runner& add(TestCaseFactory factory);
+      Runner &add( TestCaseFactory factory );
 
       /// Runs test as specified on the command-line
       /// If no command-line arguments are provided, run all tests.
       /// If --list-tests is provided, then print the list of all test cases
       /// If --test <testname> is provided, then run test testname.
-  int runCommandLine(int argc, const char* argv[]) const;
+      int runCommandLine( int argc, const char *argv[] ) const;
 
       /// Runs all the test cases
-  bool runAllTest(bool printSummary) const;
+      bool runAllTest( bool printSummary ) const;
 
       /// Returns the number of test case in the suite
-  size_t testCount() const;
+      unsigned int testCount() const;
 
       /// Returns the name of the test case at the specified index
-  Json::String testNameAt(size_t index) const;
+      std::string testNameAt( unsigned int index ) const;
 
       /// Runs the test case at the specified index using the specified TestResult
-  void runTestAt(size_t index, TestResult& result) const;
+      void runTestAt( unsigned int index, TestResult &result ) const;
 
-  static void printUsage(const char* appName);
+      static void printUsage( const char *appName );
 
-private: // prevents copy construction and assignment
+   private: // prevents copy construction and assignment
-  Runner(const Runner& other) = delete;
+      Runner( const Runner &other );
-  Runner& operator=(const Runner& other) = delete;
+      Runner &operator =( const Runner &other );
 
-private:
+   private:
       void listTests() const;
-  bool testIndex(const Json::String& testName, size_t& indexOut) const;
+      bool testIndex( const std::string &testName, unsigned int &index ) const;
       static void preventDialogOnCrash();
 
-private:
+   private:
-  using Factories = std::deque<TestCaseFactory>;
+      typedef std::deque<TestCaseFactory> Factories;
       Factories tests_;
-};
+   };
 
-template <typename T, typename U>
+   template<typename T>
-TestResult& checkEqual(TestResult& result, T expected, U actual,
+   TestResult &
-                       const char* file, unsigned int line, const char* expr) {
+   checkEqual( TestResult &result, const T &expected, const T &actual, 
-  if (static_cast<U>(expected) != actual) {
+               const char *file, unsigned int line, const char *expr )
-    result.addFailure(file, line, expr);
+   {
-    result << "Expected: " << static_cast<U>(expected) << "\n";
+      if ( expected != actual )
+      {
+         result.addFailure( file, line, expr );
+         result << "Expected: " << expected << "\n";
          result << "Actual  : " << actual;
       }
       return result;
-}
+   }
 
-Json::String ToJsonString(const char* toConvert);
+   TestResult &
-Json::String ToJsonString(Json::String in);
+   checkStringEqual( TestResult &result, 
-#if JSONCPP_USE_SECURE_MEMORY
+                     const std::string &expected, const std::string &actual,
-Json::String ToJsonString(std::string in);
+                     const char *file, unsigned int line, const char *expr );
-#endif
-
-TestResult& checkStringEqual(TestResult& result, const Json::String& expected,
-                             const Json::String& actual, const char* file,
-                             unsigned int line, const char* expr);
 
 } // namespace JsonTest
 
+
 /// \brief Asserts that the given expression is true.
 /// JSONTEST_ASSERT( x == y ) << "x=" << x << ", y=" << y;
 /// JSONTEST_ASSERT( x == y );
-#define JSONTEST_ASSERT(expr)                                                  \
+#define JSONTEST_ASSERT( expr )                                               \
-  if (expr) {                                                                  \
+   if ( condition )                                                           \
-  } else                                                                       \
+   {                                                                          \
-    result_->addFailure(__FILE__, __LINE__, #expr)
+   }                                                                          \
+   else                                                                       \
+      result_->addFailure( __FILE__, __LINE__, #expr )
 
 /// \brief Asserts that the given predicate is true.
-/// The predicate may do other assertions and be a member function of the
+/// The predicate may do other assertions and be a member function of the fixture.
-/// fixture.
+#define JSONTEST_ASSERT_PRED( expr )                                    \
-#define JSONTEST_ASSERT_PRED(expr)                                             \
+   {                                                                    \
-  do {                                                                         \
       JsonTest::PredicateContext _minitest_Context = {                  \
-        result_->predicateId_, __FILE__, __LINE__, #expr, NULL, NULL};         \
+         result_->predicateId_, __FILE__, __LINE__, #expr };            \
       result_->predicateStackTail_->next_ = &_minitest_Context;         \
       result_->predicateId_ += 1;                                       \
       result_->predicateStackTail_ = &_minitest_Context;                \
       (expr);                                                           \
       result_->popPredicateContext();                                   \
-  } while (0)
-
-/// \brief Asserts that two values are equals.
-#define JSONTEST_ASSERT_EQUAL(expected, actual)                                \
-  JsonTest::checkEqual(*result_, expected, actual, __FILE__, __LINE__,         \
-                       #expected " == " #actual)
-
-/// \brief Asserts that two values are equals.
-#define JSONTEST_ASSERT_STRING_EQUAL(expected, actual)                         \
-  JsonTest::checkStringEqual(*result_, JsonTest::ToJsonString(expected),       \
-                             JsonTest::ToJsonString(actual), __FILE__,         \
-                             __LINE__, #expected " == " #actual)
-
-/// \brief Asserts that a given expression throws an exception
-#define JSONTEST_ASSERT_THROWS(expr)                                           \
-  do {                                                                         \
-    bool _threw = false;                                                       \
-    try {                                                                      \
-      expr;                                                                    \
-    } catch (...) {                                                            \
-      _threw = true;                                                           \
    }                                                                    \
-    if (!_threw)                                                               \
+   *result_
-      result_->addFailure(__FILE__, __LINE__,                                  \
+
-                          "expected exception thrown: " #expr);                \
+/// \brief Asserts that two values are equals.
-  } while (0)
+#define JSONTEST_ASSERT_EQUAL( expected, actual )          \
+   JsonTest::checkEqual( *result_, expected, actual,       \
+                         __FILE__, __LINE__,               \
+                         #expected " == " #actual )
+
+/// \brief Asserts that two values are equals.
+#define JSONTEST_ASSERT_STRING_EQUAL( expected, actual ) \
+   JsonTest::checkStringEqual( *result_,                 \
+      std::string(expected), std::string(actual),        \
+      #expected " == " #actual )
 
 /// \brief Begin a fixture test case.
-#define JSONTEST_FIXTURE(FixtureType, name)                                    \
+#define JSONTEST_FIXTURE( FixtureType, name )                  \
-  class Test##FixtureType##name : public FixtureType {                         \
+   class Test##FixtureType##name : public FixtureType          \
+   {                                                           \
    public:                                                     \
-    static JsonTest::TestCase* factory() {                                     \
+      static JsonTest::TestCase *factory()                     \
+      {                                                        \
          return new Test##FixtureType##name();                 \
       }                                                        \
-                                                                               \
+   public: /* overidden from TestCase */                       \
-  public: /* overridden from TestCase */                                       \
+      virtual const char *testName() const                     \
-    const char* testName() const override { return #FixtureType "/" #name; }   \
+      {                                                        \
-    void runTestCase() override;                                               \
+         return #FixtureType "/" #name;                        \
+      }                                                        \
+      virtual void runTestCase();                              \
    };                                                          \
                                                                \
    void Test##FixtureType##name::runTestCase()
 
-#define JSONTEST_FIXTURE_FACTORY(FixtureType, name)                            \
+#define JSONTEST_FIXTURE_FACTORY( FixtureType, name ) \
    &Test##FixtureType##name::factory
 
-#define JSONTEST_REGISTER_FIXTURE(runner, FixtureType, name)                   \
+#define JSONTEST_REGISTER_FIXTURE( runner, FixtureType, name ) \
-  (runner).add(JSONTEST_FIXTURE_FACTORY(FixtureType, name))
+   (runner).add( JSONTEST_FIXTURE_FACTORY( FixtureType, name ) )
-
-/// \brief Begin a fixture test case.
-#define JSONTEST_FIXTURE_V2(FixtureType, name, collections)                    \
-  class Test##FixtureType##name : public FixtureType {                         \
-  public:                                                                      \
-    static JsonTest::TestCase* factory() {                                     \
-      return new Test##FixtureType##name();                                    \
-    }                                                                          \
-    static bool collect() {                                                    \
-      (collections).push_back(JSONTEST_FIXTURE_FACTORY(FixtureType, name));    \
-      return true;                                                             \
-    }                                                                          \
-                                                                               \
-  public: /* overridden from TestCase */                                       \
-    const char* testName() const override { return #FixtureType "/" #name; }   \
-    void runTestCase() override;                                               \
-  };                                                                           \
-                                                                               \
-  static bool test##FixtureType##name##collect =                               \
-      Test##FixtureType##name::collect();                                      \
-                                                                               \
-  void Test##FixtureType##name::runTestCase()
 
 #endif // ifndef JSONTEST_H_INCLUDED