Compare commits

...
Author SHA1 Message Date
Niels Lohmann ac2ebe8d76 Use a unique temp file in the diagnostic positions ifstream test
Since #6139, the C++11 and C++20 builds of unit-class_parser with
JSON_DIAGNOSTIC_POSITIONS run in parallel in the same directory. Both
wrote and removed the same fixed-name temp file, so one could read an
empty file ("attempting to parse an empty input"). Add a random suffix,
as unit-file_input does.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-22 19:51:05 +01:00
Niels Lohmann b64a0a6b49 Fix the AppVeyor build of develop with VS 2015 and VS 2017
unit-bon8: VS 2015 finds no unambiguous operator== for std::fpos and int,
even outside doctest's decomposition (#6128 did not help). Compare the
position as std::streamoff.

unit-ubjson_valueless: VS 2015/2017 warn C4309 (truncation of constant
value) for static_cast<std::uint8_t>(payload) with the constexpr payload
4096, which /WX turns into an error. Mask each byte before the cast.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-22 15:04:29 +01:00
dependabot[bot] e20f6dc35d build(deps): bump jsdom in /docs/mkdocs/scripts/mermaid (#6151)
Bumps [jsdom](https://github.com/jsdom/jsdom) from 31.0.0 to 31.0.1.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Commits](https://github.com/jsdom/jsdom/compare/v31.0.0...v31.0.1)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-version: 31.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-11-21 16:13:15 +01:00
steve_cooks 7a67ccf6aa ci: add s390x big-endian test coverage (#6150)
* ci: add s390x big-endian test coverage

Signed-off-by: Jatin Chauhan <chauhanjatin0404@gmail.com>

* ci: install unzip for Ninja setup in Debian

Signed-off-by: Jatin Chauhan <chauhanjatin0404@gmail.com>

* ci: select Ninja for the outer Debian configuration

Signed-off-by: Jatin Chauhan <chauhanjatin0404@gmail.com>

* ci: address big-endian workflow review

Signed-off-by: Jatin Chauhan <chauhanjatin0404@gmail.com>

* ci: run big-endian tests on master and release pushes

Signed-off-by: Jatin Chauhan <chauhanjatin0404@gmail.com>

---------

Signed-off-by: Jatin Chauhan <chauhanjatin0404@gmail.com>
2026-11-21 16:13:08 +01:00
dependabot[bot]andNiels Lohmann 098eebd412 build(deps): bump mkdocs-git-revision-date-localized-plugin (#6142)
Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 1.6.3 to 1.7.0.
- [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases)
- [Commits](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/compare/v1.6.3...v1.7.0)

---
updated-dependencies:
- dependency-name: mkdocs-git-revision-date-localized-plugin
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 22:43:38 +01:00
Anshika Grover 555ef48fb6 Fix reverse iterator subscript exception for objects (#6125)
* Fix reverse iterator subscript exception for objects

Signed-off-by: Anshika Grover <anshikag.151107@gmail.com>

* Add reverse iterator subscript tests and comment

Signed-off-by: Anshika Grover <anshikag.151107@gmail.com>

* Add primitive reverse iterator subscript tests

Signed-off-by: Anshika Grover <anshikag.151107@gmail.com>

---------

Signed-off-by: Anshika Grover <anshikag.151107@gmail.com>
2026-11-18 22:43:28 +01:00
dependabot[bot] d732d616ba build(deps): bump semgrep from 1.184.0 to 1.185.0 in /cmake/requirements (#6146)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:57:29 +01:00
dependabot[bot] b927100ca1 build(deps): bump step-security/harden-runner from 2.22.3 to 2.22.4 (#6143)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:57:19 +01:00
dependabot[bot] ccb253baf1 build(deps): bump mkdocs-material from 9.8.0 to 9.8.1 in /docs/mkdocs (#6141)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:57:02 +01:00
Aditya Singh Bakawat 8c3335d41f docs: correct assertion conditions and remove stale diagnostic locations (#6131)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:56:51 +01:00
Shubham Shakti 0ac14610d6 docs: correct erase() empty-range and initializer-list move documentation (#6122)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:56:46 +01:00
Niels Lohmann 2951790d40 Fix three dead links in the list of customers (#6147)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:52:54 +01:00
Niels Lohmann 77611d412f Document the Nix package in the package manager list (#6145)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:52:44 +01:00
Niels Lohmann f6eb5e4fb1 Fix documentation errors and clean up repository leftovers (#6140)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:52:34 +01:00
Niels Lohmann ac0d25f51c Build the tests with C++17/C++20-only sections in those standards (#6139)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:52:24 +01:00
Niels Lohmann f91e900875 Fix stale comments in include/ (#6138)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:52:12 +01:00
Niels Lohmann 6ac411e14c Report the same error position for bulk number runs as for byte-wise input (#6137)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:52:02 +01:00
Niels Lohmann 1f7250f77f Write a binary subtype independently of number_unsigned_t in dump() (#6135)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:51:52 +01:00
Niels Lohmann 03ce377876 Pass the complete text of a UBJSON/BJData high-precision number to SAX number_float (#6134)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:51:42 +01:00
Niels Lohmann a1284028b2 json_view: fix a scalar set() through a view of an erased value (#6132)
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-11-18 08:50:36 +01:00
82 changed files with 1224 additions and 342 deletions

No files matched your search

+1 -1
View File
@@ -66,7 +66,7 @@ labels:
- "tests/src/fuzzer-(parse_json_view|json_view_image)\\.cpp" - "tests/src/fuzzer-(parse_json_view|json_view_image)\\.cpp"
- "tests/benchmarks/json_view/.*" - "tests/benchmarks/json_view/.*"
- "tools/amalgamate/config_json_view\\.json" - "tools/amalgamate/config_json_view\\.json"
- "docs/mkdocs/docs/features/json_view\\.md" - "docs/mkdocs/docs/features/json_view/.*"
- "docs/mkdocs/docs/api/basic_json_(document|view)/.*" - "docs/mkdocs/docs/api/basic_json_(document|view)/.*"
- "docs/mkdocs/docs/api/(ordered_)?json_(editable_)?(document|view)\\.md" - "docs/mkdocs/docs/api/(ordered_)?json_(editable_)?(document|view)\\.md"
- "docs/mkdocs/docs/examples/(basic_json_(document|view)__|(ordered_)?json_(editable_)?(document|view)).*" - "docs/mkdocs/docs/examples/(basic_json_(document|view)__|(ordered_)?json_(editable_)?(document|view)).*"
+46
View File
@@ -0,0 +1,46 @@
name: Big-endian
on:
push:
branches:
- develop
- master
- release/*
pull_request:
schedule:
- cron: '17 4 * * 1'
workflow_dispatch:
permissions:
contents: read
concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref || github.run_id }}
cancel-in-progress: true
jobs:
ci_test_big_endian:
# Allow manual fork validation, but avoid weekly emulation runs in forks.
if: github.event_name != 'schedule' || github.repository == 'nlohmann/json'
runs-on: ubuntu-26.04
container: debian:trixie
timeout-minutes: 90
steps:
- name: Install the s390x cross compiler and qemu-user
run: |
apt-get update
# get-cmake uses unzip to extract Ninja's zip; debian:trixie does not include it.
apt-get install -y --no-install-recommends g++ g++-s390x-linux-gnu qemu-user git ca-certificates unzip
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- name: Get latest CMake and ninja
uses: lukka/get-cmake@16e8153a8b4918849d92aad131befe67a3705daa # v4.5.0
- name: Check that the target is big-endian
run: echo | s390x-linux-gnu-g++ -dM -E - | grep -q '__BYTE_ORDER__ __ORDER_BIG_ENDIAN__'
- name: Run CMake
run: cmake -S . -B build -G Ninja -DJSON_CI=On
- name: Build and test
env:
TEST_SCOPE: ${{ github.event_name == 'pull_request' && 'focused' || 'full' }}
run: cmake --build build --target "ci_test_big_endian_${TEST_SCOPE}"
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+3 -5
View File
@@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -46,7 +46,7 @@ jobs:
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -115,9 +115,7 @@ jobs:
python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json.json -s . python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json.json -s .
python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_fwd.json -s . python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_fwd.json -s .
# the configuration of json_view.hpp comes with the pull request until python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_view.json -s .
# it is on develop; the tool itself is still develop's
python3 $TOOL_DIR/amalgamate.py -c $MAIN_DIR/tools/amalgamate/config_json_view.json -s .
# the header list of the Bazel "json" target must match the files in include/ # the header list of the Bazel "json" target must match the files in include/
cmake -P cmake/scripts/gen_bazel_build_file.cmake cmake -P cmake/scripts/gen_bazel_build_file.cmake
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
timeout-minutes: 30 timeout-minutes: 30
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -20,7 +20,7 @@ jobs:
pull-requests: write pull-requests: write
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
security-events: write security-events: write
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -54,7 +54,7 @@ jobs:
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -23,7 +23,7 @@ jobs:
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -40,7 +40,7 @@ jobs:
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+5 -5
View File
@@ -80,7 +80,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -112,7 +112,7 @@ jobs:
target: [ci_test_single_header, ci_cppcheck, ci_cpplint, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata, ci_reuse_compliance, ci_test_valgrind] target: [ci_test_single_header, ci_cppcheck, ci_cpplint, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata, ci_reuse_compliance, ci_test_valgrind]
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -178,7 +178,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -436,7 +436,7 @@ jobs:
runs-on: ubuntu-26.04 runs-on: ubuntu-26.04
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
@@ -459,7 +459,7 @@ jobs:
target: [ci_test_examples, ci_test_build_documentation, ci_test_documentation_mermaid] target: [ci_test_examples, ci_test_build_documentation, ci_test_documentation_mermaid]
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@46b06cea07f9e64621fdf066ba77ac6915163d43 # v2.22.3 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
+2 -3
View File
@@ -20,7 +20,7 @@
# fuzzers # fuzzers
/tests/corpus_* /tests/corpus_*
/tests/parse_*_fuzzer /tests/*_fuzzer
# documentation # documentation
/docs/docset/JSON_for_Modern_C++.docset/ /docs/docset/JSON_for_Modern_C++.docset/
@@ -47,11 +47,10 @@ nlohmann_json.spdx
# Bazel-related # Bazel-related
MODULE.bazel.lock MODULE.bazel.lock
# backups left by `make check-amalgamation` or the ci_test_amalgamation target if they are interrupted # backups left by `make check-amalgamation` if it is interrupted
/BUILD.bazel~ /BUILD.bazel~
/nlohmann_json.natvis~ /nlohmann_json.natvis~
/single_include/nlohmann/*.hpp~ /single_include/nlohmann/*.hpp~
/venv_astyle/
# release outputs of `make release` # release outputs of `make release`
/include.zip /include.zip
+1
View File
@@ -28,6 +28,7 @@ The [GitHub Actions](https://docs.github.com/en/actions) workflows that build, t
- `publish_documentation.yml` — build and publish the documentation on pushes to the `develop` branch that touch the documentation sources (or the files it embeds). - `publish_documentation.yml` — build and publish the documentation on pushes to the `develop` branch that touch the documentation sources (or the files it embeds).
- `check_docs_links.yml` — check the links of the documentation weekly, as external links can break without any change in this repository. - `check_docs_links.yml` — check the links of the documentation weekly, as external links can break without any change in this repository.
- `cancel_closed_pr_runs.yml` — cancel unfinished workflow runs of a pull request once it is closed or merged. - `cancel_closed_pr_runs.yml` — cancel unfinished workflow runs of a pull request once it is closed or merged.
- `json_view_benchmarks.yml` — compare the performance of `json_view` with other JSON libraries on GitHub-hosted x86-64 and AArch64 Linux runners, on demand or when a pull request gets the label "benchmark".
Further documentation: Further documentation:
+1 -1
View File
@@ -215,7 +215,7 @@ release: include.zip json.tar.xz
# clean up # clean up
clean: clean:
rm -fr *.dSYM tests/*.dSYM tests/parse_*_fuzzer rm -fr *.dSYM tests/*.dSYM tests/*_fuzzer
rm -fr cmake-build-benchmarks cmake-build-pvs-studio release_files rm -fr cmake-build-benchmarks cmake-build-pvs-studio release_files
$(MAKE) clean -Cdocs $(MAKE) clean -Cdocs
+1
View File
@@ -1383,6 +1383,7 @@ Use your favorite [**package manager**](https://json.nlohmann.me/integration/pac
- [**build2**](https://json.nlohmann.me/integration/package_managers/#build2) `nlohmann-json` - [**build2**](https://json.nlohmann.me/integration/package_managers/#build2) `nlohmann-json`
- <img src="https://raw.githubusercontent.com/nlohmann/json/refs/heads/develop/docs/mkdocs/docs/images/package_managers/CPM.png" height="20">&nbsp;[**cpm.cmake**](https://json.nlohmann.me/integration/package_managers/#cpmcmake) `gh:nlohmann/json` - <img src="https://raw.githubusercontent.com/nlohmann/json/refs/heads/develop/docs/mkdocs/docs/images/package_managers/CPM.png" height="20">&nbsp;[**cpm.cmake**](https://json.nlohmann.me/integration/package_managers/#cpmcmake) `gh:nlohmann/json`
- <img src="https://raw.githubusercontent.com/nlohmann/json/refs/heads/develop/docs/mkdocs/docs/images/package_managers/xmake.svg" height="20">&nbsp;[**xmake**](https://json.nlohmann.me/integration/package_managers/#xmake) `nlohmann_json` - <img src="https://raw.githubusercontent.com/nlohmann/json/refs/heads/develop/docs/mkdocs/docs/images/package_managers/xmake.svg" height="20">&nbsp;[**xmake**](https://json.nlohmann.me/integration/package_managers/#xmake) `nlohmann_json`
- <img src="https://raw.githubusercontent.com/nlohmann/json/refs/heads/develop/docs/mkdocs/docs/images/package_managers/nix.svg" height="20">&nbsp;[**Nix**](https://json.nlohmann.me/integration/package_managers/#nix) `nlohmann_json`
The library is part of many package managers. See the [**documentation**](https://json.nlohmann.me/integration/package_managers/) for detailed descriptions and examples. The library is part of many package managers. See the [**documentation**](https://json.nlohmann.me/integration/package_managers/) for detailed descriptions and examples.
+34 -77
View File
@@ -100,6 +100,40 @@ add_custom_target(ci_test_clang
COMMENT "Compile and test with Clang using maximal warning flags" COMMENT "Compile and test with Clang using maximal warning flags"
) )
###############################################################################
# Big-endian tests (cross-compiled for s390x, executed under qemu-user).
###############################################################################
foreach(S390X_TEST_SCOPE IN ITEMS focused full)
set(S390X_TEST_FILTER)
if(S390X_TEST_SCOPE STREQUAL "focused")
# Keep this filter in sync with new or renamed endianness-sensitive tests.
# "serialization" intentionally includes "deserialization"; the develop
# and weekly full runs cover tests outside this focused runtime subset.
set(S390X_TEST_FILTER -R "cbor|msgpack|ubjson|bjdata|bson|bon8|binary|json_view|alt-string|serialization|class_parser|fmt_formatter")
endif()
add_custom_target(ci_test_big_endian_${S390X_TEST_SCOPE}
COMMAND ${CMAKE_COMMAND}
-DCMAKE_BUILD_TYPE=Debug -GNinja
-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=s390x
-DCMAKE_CXX_COMPILER=s390x-linux-gnu-g++
"-DCMAKE_CROSSCOMPILING_EMULATOR=qemu-s390x;-L;/usr/s390x-linux-gnu"
-DJSON_BuildTests=ON -DJSON_FastTests=ON
-S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_big_endian
# Build every test binary, even when executing only the focused subset.
# Limit parallelism for memory-intensive compilation and emulated tests.
COMMAND ${CMAKE_COMMAND} -E echo "s390x build timing:"
COMMAND ${CMAKE_COMMAND} -E time ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_big_endian --parallel 2
COMMAND ${CMAKE_COMMAND} -E echo "s390x test timing:"
COMMAND ${CMAKE_COMMAND} -E time ${CMAKE_CTEST_COMMAND} --test-dir ${PROJECT_BINARY_DIR}/build_big_endian
--parallel 2 --output-on-failure --no-tests=error ${S390X_TEST_FILTER}
COMMENT "Cross-compile all tests for s390x and run the ${S390X_TEST_SCOPE} suite under qemu-user"
VERBATIM
USES_TERMINAL
)
endforeach()
############################################################################### ###############################################################################
# Different C++ Standards. # Different C++ Standards.
############################################################################### ###############################################################################
@@ -406,61 +440,6 @@ add_custom_target(ci_test_clang_sanitizer
COMMENT "Compile and test with sanitizers" COMMENT "Compile and test with sanitizers"
) )
###############################################################################
# Check if header is amalgamated and sources are properly indented.
###############################################################################
# Same file set as .github/workflows/check_amalgamation.yml, so this CMake target (which can be run locally) is held
# to the same standard as the workflow (which runs for pull requests and for pushes to develop/master/release/*).
file(GLOB_RECURSE INDENT_FILES
${PROJECT_SOURCE_DIR}/docs/mkdocs/docs/examples/*.hpp
${PROJECT_SOURCE_DIR}/docs/mkdocs/docs/examples/*.cpp
${PROJECT_SOURCE_DIR}/docs/mkdocs/docs/examples/*.cu
${PROJECT_SOURCE_DIR}/include/*.hpp
${PROJECT_SOURCE_DIR}/include/*.cpp
${PROJECT_SOURCE_DIR}/include/*.cu
${PROJECT_SOURCE_DIR}/tests/*.hpp
${PROJECT_SOURCE_DIR}/tests/*.cpp
${PROJECT_SOURCE_DIR}/tests/*.cu
)
list(FILTER INDENT_FILES EXCLUDE REGEX "/tests/thirdparty/|/tests/abi/include/nlohmann/")
set(include_dir ${PROJECT_SOURCE_DIR}/single_include/nlohmann)
set(tool_dir ${PROJECT_SOURCE_DIR}/tools/amalgamate)
add_custom_target(ci_test_amalgamation
COMMAND rm -fr ${include_dir}/json.hpp~ ${include_dir}/json_fwd.hpp~ ${include_dir}/json_literals.hpp~ ${include_dir}/json_view.hpp~
COMMAND cp ${include_dir}/json.hpp ${include_dir}/json.hpp~
COMMAND cp ${include_dir}/json_fwd.hpp ${include_dir}/json_fwd.hpp~
COMMAND cp ${include_dir}/json_literals.hpp ${include_dir}/json_literals.hpp~
COMMAND cp ${include_dir}/json_view.hpp ${include_dir}/json_view.hpp~
COMMAND cp ${PROJECT_SOURCE_DIR}/BUILD.bazel ${PROJECT_SOURCE_DIR}/BUILD.bazel~
COMMAND ${Python3_EXECUTABLE} -mvenv venv_astyle
COMMAND venv_astyle/bin/pip3 --quiet install -r ${CMAKE_SOURCE_DIR}/tools/astyle/requirements.txt
COMMAND venv_astyle/bin/astyle --version
COMMAND ${Python3_EXECUTABLE} ${tool_dir}/amalgamate.py -c ${tool_dir}/config_json.json -s .
COMMAND ${Python3_EXECUTABLE} ${tool_dir}/amalgamate.py -c ${tool_dir}/config_json_fwd.json -s .
COMMAND cp ${PROJECT_SOURCE_DIR}/include/nlohmann/json_literals.hpp ${include_dir}/json_literals.hpp
COMMAND ${Python3_EXECUTABLE} ${tool_dir}/amalgamate.py -c ${tool_dir}/config_json_view.json -s .
COMMAND venv_astyle/bin/astyle --project=tools/astyle/.astylerc --suffix=none ${include_dir}/json.hpp ${include_dir}/json_fwd.hpp ${include_dir}/json_literals.hpp ${include_dir}/json_view.hpp
COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/scripts/gen_bazel_build_file.cmake
COMMAND diff ${include_dir}/json.hpp~ ${include_dir}/json.hpp
COMMAND diff ${include_dir}/json_fwd.hpp~ ${include_dir}/json_fwd.hpp
COMMAND diff ${include_dir}/json_literals.hpp~ ${include_dir}/json_literals.hpp
COMMAND diff ${include_dir}/json_view.hpp~ ${include_dir}/json_view.hpp
COMMAND diff ${PROJECT_SOURCE_DIR}/BUILD.bazel~ ${PROJECT_SOURCE_DIR}/BUILD.bazel
COMMAND venv_astyle/bin/astyle --project=tools/astyle/.astylerc --suffix=orig ${INDENT_FILES}
COMMAND for FILE in `find . -name '*.orig'`\; do false \; done
COMMAND rm -f ${include_dir}/json.hpp~ ${include_dir}/json_fwd.hpp~ ${include_dir}/json_literals.hpp~ ${include_dir}/json_view.hpp~ ${PROJECT_SOURCE_DIR}/BUILD.bazel~
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Check amalgamation, formatting, and BUILD.bazel"
)
############################################################################### ###############################################################################
# Build and test using the amalgamated header # Build and test using the amalgamated header
############################################################################### ###############################################################################
@@ -692,19 +671,6 @@ else()
) )
endif() endif()
###############################################################################
# Benchmarks
###############################################################################
add_custom_target(ci_benchmarks
COMMAND ${CMAKE_COMMAND}
-DCMAKE_BUILD_TYPE=Release -GNinja
-S${PROJECT_SOURCE_DIR}/tests/benchmarks -B${PROJECT_BINARY_DIR}/build_benchmarks
COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_benchmarks --target json_benchmarks
COMMAND cd ${PROJECT_BINARY_DIR}/build_benchmarks && ./json_benchmarks
COMMENT "Run benchmarks"
)
############################################################################### ###############################################################################
# CMake flags # CMake flags
############################################################################### ###############################################################################
@@ -965,12 +931,3 @@ add_custom_target(ci_test_documentation_mermaid
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs/mkdocs WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs/mkdocs
COMMENT "Check the Mermaid diagrams of the documentation" COMMENT "Check the Mermaid diagrams of the documentation"
) )
###############################################################################
# Clean up all generated files.
###############################################################################
add_custom_target(ci_clean
COMMAND rm -fr ${PROJECT_BINARY_DIR}/build_* ${PROJECT_BINARY_DIR}/cmake-3.5.0 ${PROJECT_BINARY_DIR}/cmake-3.31.6 ${PROJECT_BINARY_DIR}/cmake-4.0.0 ${JSON_CMAKE_FLAG_BUILD_DIRS} ${single_binaries}
COMMENT "Clean generated directories"
)
+1 -1
View File
@@ -1 +1 @@
semgrep==1.184.0 semgrep==1.185.0
@@ -265,7 +265,9 @@ basic_json(basic_json&& other) noexcept;
4. Depends on the called constructor. For types directly supported by the library (i.e., all types for which no 4. Depends on the called constructor. For types directly supported by the library (i.e., all types for which no
`to_json()` function was provided), a strong guarantee holds: if an exception is thrown, there are no changes to any `to_json()` function was provided), a strong guarantee holds: if an exception is thrown, there are no changes to any
JSON value. JSON value.
5. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 5. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. Values that are moved into
`init` (e.g., `a` in `#!cpp json::object({std::move(a), 5})`) are moved when the initializer list is created,
before the constructor runs, and stay moved-from if it throws.
6. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 6. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
7. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 7. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
8. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 8. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+7 -5
View File
@@ -26,10 +26,12 @@ void erase(const size_type idx);
If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`. If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`.
2. Remove an element range specified by `[first; last)` from a JSON value. The iterator `first` does not need to be 2. Remove an element range specified by `[first; last)` from a JSON value. For arrays and objects, the iterator `first`
dereferenceable if `first == last`: erasing an empty range is a no-op. does not need to be dereferenceable if `first == last`: erasing an empty range is a no-op.
If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`. If called on a primitive type other than `#!json null`, the range must be `[begin(); end())`, and the resulting JSON
value will be `#!json null`. Any other range, including the empty ranges `[begin(); begin())` and
`[end(); end())`, throws [`invalid_iterator.204`](../../home/exceptions.md#jsonexceptioninvalid_iterator204).
3. Removes an element from a JSON object by key. 3. Removes an element from a JSON object by key.
@@ -93,8 +95,8 @@ Strong exception safety: if an exception occurs, the original value stays intact
- Throws [`invalid_iterator.203`](../../home/exceptions.md#jsonexceptioninvalid_iterator203) if called on iterators - Throws [`invalid_iterator.203`](../../home/exceptions.md#jsonexceptioninvalid_iterator203) if called on iterators
which does not belong to the current JSON value; example: `"iterators do not fit current value"` which does not belong to the current JSON value; example: `"iterators do not fit current value"`
- Throws [`invalid_iterator.204`](../../home/exceptions.md#jsonexceptioninvalid_iterator204) if called on a - Throws [`invalid_iterator.204`](../../home/exceptions.md#jsonexceptioninvalid_iterator204) if called on a
primitive type with invalid iterators (i.e., if `first != begin()` and `last != end()`); example: `"iterators out primitive type with invalid iterators (i.e., if `first != begin()` or `last != end()`, which includes the empty
of range"` ranges `[begin(); begin())` and `[end(); end())`); example: `"iterators out of range"`
3. The function can throw the following exceptions: 3. The function can throw the following exceptions:
- Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) when called on a type other than - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) when called on a type other than
JSON object; example: `"cannot use erase() with null"` JSON object; example: `"cannot use erase() with null"`
+3 -1
View File
@@ -18,7 +18,9 @@ JSON object value
## Exception safety ## Exception safety
Strong guarantee: if an exception is thrown, there are no changes in the JSON value. Strong guarantee: if an exception is thrown, there are no changes in the JSON value. Values that are moved into `init`
(e.g., `a` in `#!cpp json::object({std::move(a), 5})`) are moved when the initializer list is created, before this
function runs, and stay moved-from if it throws.
## Exceptions ## Exceptions
+14 -2
View File
@@ -2,12 +2,21 @@
```cpp ```cpp
namespace std { namespace std {
void swap(nlohmann::basic_json& j1, nlohmann::basic_json& j2); void swap(nlohmann::basic_json& j1, nlohmann::basic_json& j2) noexcept(
is_nothrow_move_constructible<nlohmann::basic_json>::value &&
is_nothrow_move_assignable<nlohmann::basic_json>::value
);
} }
``` ```
Exchanges the values of two JSON objects. Exchanges the values of two JSON objects.
This specialization is only provided before C++20, which no longer allows specializing function templates in
namespace `std`. With C++20 (and in generic code with any standard), use the idiom `#!cpp using std::swap; swap(j1, j2);`: it finds
the [`swap`](swap.md) friend function (overload 2) by argument-dependent lookup. A qualified `#!cpp std::swap(j1, j2)`
still compiles with C++20, but uses the generic `std::swap`, which swaps by three moves instead of exchanging the
contents.
## Parameters ## Parameters
`j1` (in, out) `j1` (in, out)
@@ -18,7 +27,9 @@ Exchanges the values of two JSON objects.
## Exception safety ## Exception safety
No-throw guarantee: this function never throws exceptions. No-throw guarantee if the `noexcept` condition above holds: it holds unless moving the
[`json_base_class_t`](json_base_class_t.md) can throw. With the default base class, this function never throws
exceptions.
## Complexity ## Complexity
@@ -57,3 +68,4 @@ void swap(nlohmann::basic_json& j1, nlohmann::basic_json& j2)
- Added in version 1.0.0. - Added in version 1.0.0.
- Extended for arbitrary basic_json types in version 3.10.5. - Extended for arbitrary basic_json types in version 3.10.5.
- Not provided with C++20 since version 3.9.0.
+8 -4
View File
@@ -75,8 +75,12 @@ void swap(typename binary_t::container_type& other);
## Exception safety ## Exception safety
1. No-throw guarantee: this function never throws exceptions. 1. No-throw guarantee if the `noexcept` condition above holds: it holds unless moving the
2. No-throw guarantee: this function never throws exceptions. [`json_base_class_t`](json_base_class_t.md) can throw (moving the type tag and the stored value never throws).
With the default base class, this function never throws exceptions.
2. No-throw guarantee if the `noexcept` condition above holds: it holds unless moving the
[`json_base_class_t`](json_base_class_t.md) can throw (moving the type tag and the stored value never throws).
With the default base class, this function never throws exceptions.
3. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 3. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
4. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 4. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
5. Strong guarantee: if an exception is thrown, there are no changes to any JSON value. 5. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
@@ -85,8 +89,8 @@ void swap(typename binary_t::container_type& other);
## Exceptions ## Exceptions
1. No-throw guarantee: this function never throws exceptions. 1. Throws only what moving the [`json_base_class_t`](json_base_class_t.md) throws; nothing with the default base class.
2. No-throw guarantee: this function never throws exceptions. 2. Throws only what moving the [`json_base_class_t`](json_base_class_t.md) throws; nothing with the default base class.
3. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than 3. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
arrays; example: `"cannot use swap(array_t&) with boolean"` arrays; example: `"cannot use swap(array_t&) with boolean"`
4. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than 4. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
+2 -1
View File
@@ -57,7 +57,8 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
## Exceptions ## Exceptions
- Throws [`other_error.502`](../../home/exceptions.md#jsonexceptionother_error502) if `use_type` is true and `use_size` - Throws [`other_error.502`](../../home/exceptions.md#jsonexceptionother_error502) if `use_type` is true and `use_size`
is false, and `j` contains a non-empty array, object, or binary value. is false, and `j` contains a non-empty array, object, or binary value. Scalars and empty arrays, objects, or binary
values do not throw.
- Throws [type_error.316](../../home/exceptions.md#jsonexceptiontype_error316) if a string or object key in `j` is - Throws [type_error.316](../../home/exceptions.md#jsonexceptiontype_error316) if a string or object key in `j` is
not valid UTF-8 and `error_handler` is `strict` (the default only if not valid UTF-8 and `error_handler` is `strict` (the default only if
[`JSON_STRICT_BINARY_UTF8`](../macros/json_strict_binary_utf8.md) is enabled) [`JSON_STRICT_BINARY_UTF8`](../macros/json_strict_binary_utf8.md) is enabled)
@@ -66,7 +66,8 @@ has `erase`; calling it on a read-only `basic_json_document` fails to compile (`
[`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) (a leading `#!cpp '0'`), [`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) (a leading `#!cpp '0'`),
[`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) (not a number), [`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) (not a number),
[`out_of_range.410`](../../home/exceptions.md#jsonexceptionout_of_range410) (too large for `size_type`), or [`out_of_range.410`](../../home/exceptions.md#jsonexceptionout_of_range410) (too large for `size_type`), or
[`out_of_range.404`](../../home/exceptions.md#jsonexceptionout_of_range404) (an empty token); otherwise (an [`out_of_range.404`](../../home/exceptions.md#jsonexceptionout_of_range404) (an empty token, or the token
`#!cpp "-"`, which never names an existing element); otherwise (an
object, or a primitive value the pointer's parent resolves to) throws what 1. throws. object, or a primitive value the pointer's parent resolves to) throws what 1. throws.
Overloads 1. and 2. also throw [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) Overloads 1. and 2. also throw [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202)
@@ -100,7 +100,8 @@ points apply to every edit:
[`root()`](root.md). New values (and the element sequences of an edited array/object) go to storage owned by the [`root()`](root.md). New values (and the element sequences of an edited array/object) go to storage owned by the
document, allocated on demand. document, allocated on demand.
- **A view keeps referring to the same value.** After [`set`](set.md) replaces the value a view refers to, that view - **A view keeps referring to the same value.** After [`set`](set.md) replaces the value a view refers to, that view
sees the new value; a view of a value that a later edit replaces or drops keeps showing what it last held. An edit sees the new value; a view of a value that a later edit replaces or drops keeps showing what it last held. Such a
view can still be edited: the edit changes only that detached value, never anything reachable from `root()`. An edit
of an array or object, however, **invalidates the iterators taken over it** (its members may now live in a of an array or object, however, **invalidates the iterators taken over it** (its members may now live in a
different sequence), and a string obtained with [`get_string()`](../basic_json_view/get_string.md) stays valid even different sequence), and a string obtained with [`get_string()`](../basic_json_view/get_string.md) stays valid even
as further edits happen (earlier buffers of edited text are kept alive, not overwritten). as further edits happen (earlier buffers of edited text are kept alive, not overwritten).
@@ -164,7 +164,9 @@ general.
The same switch happens, for the same reason, when overload 1. replaces a multi-node array/object value with a The same switch happens, for the same reason, when overload 1. replaces a multi-node array/object value with a
scalar: the *parent's* element sequence is what has to switch to links, not `target` itself, because the parent scalar: the *parent's* element sequence is what has to switch to links, not `target` itself, because the parent
originally stepped over `target`'s whole subtree by its node count, which no longer applies once `target` is a originally stepped over `target`'s whole subtree by its node count, which no longer applies once `target` is a
one-node scalar. one-node scalar. This also holds when `target` is no longer part of the document (an edit erased or replaced it, or
a value that contains it): if the container that `target` was in still uses its parsed layout, it switches to links
(otherwise nothing steps over `target` any more), and only the dropped values change.
## Examples ## Examples
@@ -62,10 +62,9 @@ view.
!!! info "Overload 2 never throws" !!! info "Overload 2 never throws"
Unlike [`BasicJsonType::contains(const json_pointer&)`](../basic_json/contains.md), which can throw for certain Like [`BasicJsonType::contains(const json_pointer&)`](../basic_json/contains.md), overload 2 never throws: a
malformed pointers (for instance an empty array-index reference token), overload 2 never throws: a missing key, missing key, an out-of-range or malformed array index, a `#!cpp "-"` index, or a reference token used on a
an out-of-range or malformed array index, a `#!cpp "-"` index, or a reference token used on a primitive all primitive all simply make it return `#!cpp false`.
simply make it return `#!cpp false`.
## Examples ## Examples
@@ -27,9 +27,10 @@ for (const auto [key, value] : v.items())
} }
``` ```
Note the `#!cpp const auto` (by value), not `#!cpp const auto&`: unlike `BasicJsonType::items()`, whose elements are Taking `item` by value (`#!cpp const auto`) is recommended: unlike `BasicJsonType::items()`, whose elements are
references into an existing object, a view's `item` is produced on the fly for each step of the iteration, so there references into an existing object, a view's `item` is produced on the fly for each step of the iteration and is
is nothing for a reference to bind to. cheap to copy. A `#!cpp const auto&` (as in the first snippet) also works, as it binds to that temporary, but a
non-const `#!cpp auto&` does not compile.
## Return value ## Return value
@@ -7,6 +7,10 @@ bool operator==(const basic_json_view& lhs, const basic_json_view& rhs);
// (2) // (2)
bool operator==(const basic_json_view& lhs, const BasicJsonType& rhs); bool operator==(const basic_json_view& lhs, const BasicJsonType& rhs);
bool operator==(const BasicJsonType& lhs, const basic_json_view& rhs); bool operator==(const BasicJsonType& lhs, const basic_json_view& rhs);
// (3)
template<view_mode M>
bool operator==(const basic_json_view& lhs, const basic_json_view<BasicJsonType, M>& rhs);
``` ```
1. Compares two views for equality: whether the values [`BasicJsonType::parse()`](../basic_json/parse.md) would 1. Compares two views for equality: whether the values [`BasicJsonType::parse()`](../basic_json/parse.md) would
@@ -14,8 +18,12 @@ bool operator==(const BasicJsonType& lhs, const basic_json_view& rhs);
2. Compares a view and a `BasicJsonType` value for equality, in either order: whether the value `parse()` would 2. Compares a view and a `BasicJsonType` value for equality, in either order: whether the value `parse()` would
produce for the view and the other operand are equal, according to `BasicJsonType`'s produce for the view and the other operand are equal, according to `BasicJsonType`'s
[`operator==`](../basic_json/operator_eq.md). [`operator==`](../basic_json/operator_eq.md).
3. Like overload 1, for two views of the same `BasicJsonType` but of different [view modes](../view_mode.md), in
either order: a view of a read-only document (such as a [`json_view`](../json_view.md)) and a view of an editable
document (such as a [`json_editable_view`](../json_editable_view.md)). This overload only takes part in overload
resolution if `M` is not the mode of `lhs`.
Neither overload builds a `BasicJsonType` value for a view to do the comparison (see [Notes](#notes) below). Numbers No overload builds a `BasicJsonType` value for a view to do the comparison (see [Notes](#notes) below). Numbers
compare by value across their types (`#!cpp 1 == 1.0`), and an object compares by its members, with duplicate keys compare by value across their types (`#!cpp 1 == 1.0`), and an object compares by its members, with duplicate keys
resolved exactly as `parse()` resolves them — the last value, at the position of the first occurrence of the key. resolved exactly as `parse()` resolves them — the last value, at the position of the first occurrence of the key.
This is not what [`operator[]`](operator[].md) and the other lookups return for a duplicate key: they find the *first* This is not what [`operator[]`](operator[].md) and the other lookups return for a duplicate key: they find the *first*
@@ -7,11 +7,17 @@ bool operator!=(const basic_json_view& lhs, const basic_json_view& rhs);
// (2) // (2)
bool operator!=(const basic_json_view& lhs, const BasicJsonType& rhs); bool operator!=(const basic_json_view& lhs, const BasicJsonType& rhs);
bool operator!=(const BasicJsonType& lhs, const basic_json_view& rhs); bool operator!=(const BasicJsonType& lhs, const basic_json_view& rhs);
// (3)
template<view_mode M>
bool operator!=(const basic_json_view& lhs, const basic_json_view<BasicJsonType, M>& rhs);
``` ```
1. Compares two views for inequality. Returns `#!cpp !(lhs == rhs)`, see [operator==](operator_eq.md). 1. Compares two views for inequality. Returns `#!cpp !(lhs == rhs)`, see [operator==](operator_eq.md).
2. Compares a view and a `BasicJsonType` value for inequality, in either order. Returns `#!cpp !(lhs == rhs)` (or, 2. Compares a view and a `BasicJsonType` value for inequality, in either order. Returns `#!cpp !(lhs == rhs)` (or,
for the reversed order, `#!cpp !(rhs == lhs)`), see [operator==](operator_eq.md). for the reversed order, `#!cpp !(rhs == lhs)`), see [operator==](operator_eq.md).
3. Compares a read-only and an editable view of the same `BasicJsonType` for inequality, in either order. Returns
`#!cpp !(lhs == rhs)`, see [operator==](operator_eq.md).
Since `operator!=` is defined as the negation of [`operator==`](operator_eq.md), it follows the same rules for Since `operator!=` is defined as the negation of [`operator==`](operator_eq.md), it follows the same rules for
special cases: for instance, since a [discarded](is_discarded.md) view is never equal to anything by default (see special cases: for instance, since a [discarded](is_discarded.md) view is never equal to anything by default (see
@@ -15,6 +15,10 @@ materializing anything.
- `#!cpp static_cast<std::size_t>(-1)` for a [discarded](is_discarded.md) view, and for a string that contains - `#!cpp static_cast<std::size_t>(-1)` for a [discarded](is_discarded.md) view, and for a string that contains
escapes — such a string was decoded once into the document's own buffer, so there is no single byte range in escapes — such a string was decoded once into the document's own buffer, so there is no single byte range in
`source()` left to point at. `source()` left to point at.
- `#!cpp static_cast<std::size_t>(-1)` in an [editable document](../json_editable_document.md) for a value written
by an edit ([`set`](../basic_json_document/set.md), [`push_back`](../basic_json_document/push_back.md),
[`insert`](../basic_json_document/insert.md)), and for an array or object whose elements an edit added or removed.
The values an edit did not touch keep their offsets.
## Exception safety ## Exception safety
@@ -8,8 +8,9 @@ using json_editable_document = basic_json_document<json, view_mode::editable>;
This type is an **editable** [`basic_json_document`](basic_json_document/index.md) of the default This type is an **editable** [`basic_json_document`](basic_json_document/index.md) of the default
[`json`](json.md) specialization: in addition to everything [`json_document`](json_document.md) offers, [`json`](json.md) specialization: in addition to everything [`json_document`](json_document.md) offers,
[`set`](basic_json_document/set.md) and [`push_back`](basic_json_document/push_back.md) change values after [`set`](basic_json_document/set.md), [`push_back`](basic_json_document/push_back.md),
parsing, without ever rewriting the source text — see [Edits](basic_json_document/index.md#edits) and [`insert`](basic_json_document/insert.md), and [`erase`](basic_json_document/erase.md) change values after parsing,
without ever rewriting the source text — see [Edits](basic_json_document/index.md#edits) and
[Editing a document](../features/json_view/editing.md). [Editing a document](../features/json_view/editing.md).
## Examples ## Examples
+2 -1
View File
@@ -9,7 +9,8 @@ using json_editable_view = basic_json_view<json, view_mode::editable>;
This type is a [`basic_json_view`](basic_json_view/index.md) of a value of a This type is a [`basic_json_view`](basic_json_view/index.md) of a value of a
[`json_editable_document`](json_editable_document.md). It offers the same read-only interface as [`json_editable_document`](json_editable_document.md). It offers the same read-only interface as
[`json_view`](json_view.md); what is different is what it can be a view *of* — a value that [`json_view`](json_view.md); what is different is what it can be a view *of* — a value that
[`set`](basic_json_document/set.md) and [`push_back`](basic_json_document/push_back.md) can change, with every view [`set`](basic_json_document/set.md), [`push_back`](basic_json_document/push_back.md),
[`insert`](basic_json_document/insert.md), and [`erase`](basic_json_document/erase.md) can change, with every view
still referring to it seeing the change, see [Edits](basic_json_document/index.md#edits). still referring to it seeing the change, see [Edits](basic_json_document/index.md#edits).
## Examples ## Examples
+3 -5
View File
@@ -47,11 +47,9 @@ Therefore, assertions can be switched off by defining `NDEBUG`.
} }
``` ```
Output: The assertion `#!cpp it != m_data.m_value.object->end()` fails in `#!cpp operator[]`.
The exact diagnostic format, source filename, and line number depend on the platform,
``` library version, and whether the single-header or multi-header version is used.
Assertion failed: (m_value.object->find(key) != m_value.object->end()), function operator[], file json.hpp, line 2144.
```
??? example "Example: user-defined behavior" ??? example "Example: user-defined behavior"
@@ -171,7 +171,7 @@ See the examples below for the concrete generated code.
The macro is equivalent to: The macro is equivalent to:
```cpp hl_lines="22 22 23 24 25 26 27 28" ```cpp hl_lines="22 23 24 25 26 27 28"
--8<-- "examples/nlohmann_define_type_intrusive_only_serialize_explicit.cpp" --8<-- "examples/nlohmann_define_type_intrusive_only_serialize_explicit.cpp"
``` ```
@@ -69,7 +69,7 @@ For further information please refer to the corresponding macros without `WITH_N
The macro is equivalent to: The macro is equivalent to:
```cpp hl_lines="16 17 18 19 20 21 22 23 24 25 26 27 28" ```cpp hl_lines="16 17 18 19 20 21 22 23 24 25 26 27 28 29 30"
--8<-- "examples/nlohmann_define_type_non_intrusive_with_names_explicit.cpp" --8<-- "examples/nlohmann_define_type_non_intrusive_with_names_explicit.cpp"
``` ```
+8 -20
View File
@@ -18,6 +18,10 @@ before including the `json.hpp` header.
## Function with runtime assertions ## Function with runtime assertions
The examples below identify the failing assertion and the function containing it.
The exact diagnostic format, source filename, and line number depend on the platform,
library version, and whether the single-header or multi-header version is used.
### Unchecked access to a const value ### Unchecked access to a const value
Function [`operator[]`](../api/basic_json/operator%5B%5D.md) implements unchecked access for arrays and objects. Whereas Function [`operator[]`](../api/basic_json/operator%5B%5D.md) implements unchecked access for arrays and objects. Whereas
@@ -46,11 +50,7 @@ See also the documentation on [element access](element_access/index.md).
} }
``` ```
Output: The assertion `#!cpp it != m_data.m_value.object->end()` fails in `#!cpp operator[]`.
```
Assertion failed: (it != m_data.m_value.object->end()), function operator[], file json.hpp, line 28795.
```
??? example "Example 2: Invalid array index in a JSON pointer" ??? example "Example 2: Invalid array index in a JSON pointer"
@@ -69,11 +69,7 @@ See also the documentation on [element access](element_access/index.md).
} }
``` ```
Output: The assertion `#!cpp idx < ptr->m_data.m_value.array->size()` fails in `#!cpp get_unchecked`.
```
Assertion failed: (idx < m_data.m_value.array->size()), function operator[], file json.hpp, line 28758.
```
### Constructing from an uninitialized iterator range ### Constructing from an uninitialized iterator range
@@ -96,11 +92,7 @@ uninitialized iterator is undefined behavior and yields a runtime assertion.
} }
``` ```
Output: The assertion `#!cpp first.m_object != nullptr` fails in `#!cpp basic_json`.
```
Assertion failed: (m_object != nullptr), function operator++, file iter_impl.hpp, line 368.
```
### Operations on uninitialized iterators ### Operations on uninitialized iterators
@@ -123,11 +115,7 @@ behavior and yields a runtime assertion.
} }
``` ```
Output: The assertion `#!cpp m_object != nullptr` fails in `#!cpp operator++`.
```
Assertion failed: (m_object != nullptr), function operator++, file iter_impl.hpp, line 368.
```
## Changes ## Changes
+1 -1
View File
@@ -98,7 +98,7 @@ serialization fails by default. The fourth argument of `dump` selects an
## Using `std::format`, `std::print`, and `fmt` ## Using `std::format`, `std::print`, and `fmt`
Since version 3.12.0, JSON values can be formatted directly with C++20's Since version 3.13.0, JSON values can be formatted directly with C++20's
[`std::format`](https://en.cppreference.com/w/cpp/utility/format/format) whenever the standard library provides the [`std::format`](https://en.cppreference.com/w/cpp/utility/format/format) whenever the standard library provides the
`<format>` header (controlled by [`JSON_HAS_STD_FORMAT`](../api/macros/json_has_std_format.md)). This is enabled by the `<format>` header (controlled by [`JSON_HAS_STD_FORMAT`](../api/macros/json_has_std_format.md)). This is enabled by the
[`std::formatter<basic_json>`](../api/basic_json/std_formatter.md) specialization, which also makes JSON values work with [`std::formatter<basic_json>`](../api/basic_json/std_formatter.md) specialization, which also makes JSON values work with
+2 -2
View File
@@ -1,7 +1,7 @@
# Recipes for Common Types # Recipes for Common Types
The library converts the standard containers, strings, numbers, tuples, `std::optional`, and `std::filesystem::path` The library converts the standard containers, strings, numbers, tuples, `std::optional` (since version 3.12.0), and
(the last two since version 3.12.0, C++17) out of the box, and your own types once you write conversion functions or use `std::filesystem::path` (since version 3.10.5), the last two with C++17, out of the box, and your own types once you write conversion functions or use
the macros (see [Arbitrary type conversions](arbitrary_types.md)). It deliberately does **not** convert smart pointers, the macros (see [Arbitrary type conversions](arbitrary_types.md)). It deliberately does **not** convert smart pointers,
`std::variant`, `std::chrono` types, or class hierarchies, because there is more than one reasonable JSON `std::variant`, `std::chrono` types, or class hierarchies, because there is more than one reasonable JSON
representation for each of them. This page shows a representation for each that you can copy and adapt. representation for each of them. This page shows a representation for each that you can copy and adapt.
+3 -3
View File
@@ -102,7 +102,7 @@ the result of an internet search. If you know further customers of the library,
- [**Apple iOS and macOS**](https://www.apple.com/macos), a family of operating systems developed by Apple, including iOS for mobile devices and macOS for desktop computers - [**Apple iOS and macOS**](https://www.apple.com/macos), a family of operating systems developed by Apple, including iOS for mobile devices and macOS for desktop computers
- [**Chromium**](https://chromium.googlesource.com/chromium/src/+/main/third_party/nlohmann_json/), the open-source browser project that Google Chrome, Microsoft Edge, and many other browsers are built on, where the library is used as data container for on-device model execution - [**Chromium**](https://chromium.googlesource.com/chromium/src/+/main/third_party/nlohmann_json/), the open-source browser project that Google Chrome, Microsoft Edge, and many other browsers are built on, where the library is used as data container for on-device model execution
- [**Google Fuchsia**](https://fuchsia.googlesource.com/third_party/json/), an open-source operating system developed by Google, designed to be secure, updatable, and adaptable across various devices - [**Google Fuchsia**](https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/scripts/prebuilts/swiftshader/build_config), an open-source operating system developed by Google, designed to be secure, updatable, and adaptable across various devices, where the library is used indirectly through bundled dependencies such as SwiftShader's debugger support and cppdap
- [**LG webOS**](https://github.com/webosose/com.webos.service.camera), a Linux-based operating system used in LG smart TVs, signage, and embedded devices - [**LG webOS**](https://github.com/webosose/com.webos.service.camera), a Linux-based operating system used in LG smart TVs, signage, and embedded devices
- [**Microsoft Azure Linux**](https://github.com/microsoft/azurelinux), a Linux distribution developed by Microsoft for Azure infrastructure and edge workloads - [**Microsoft Azure Linux**](https://github.com/microsoft/azurelinux), a Linux distribution developed by Microsoft for Azure infrastructure and edge workloads
- [**OpenHarmony**](https://github.com/openharmony/third_party_json), an open-source operating system for smart devices and the foundation of HarmonyOS - [**OpenHarmony**](https://github.com/openharmony/third_party_json), an open-source operating system for smart devices and the foundation of HarmonyOS
@@ -174,7 +174,7 @@ the result of an internet search. If you know further customers of the library,
- [**NVIDIA Instant NGP**](https://github.com/NVlabs/instant-ngp/blob/master/src/nerf_loader.cu), an implementation of instant neural graphics primitives for rapid scene reconstruction - [**NVIDIA Instant NGP**](https://github.com/NVlabs/instant-ngp/blob/master/src/nerf_loader.cu), an implementation of instant neural graphics primitives for rapid scene reconstruction
- [**NVIDIA TensorRT**](https://github.com/NVIDIA/TensorRT), an SDK for high-performance deep learning inference, including its TensorRT-LLM extension for large language models - [**NVIDIA TensorRT**](https://github.com/NVIDIA/TensorRT), an SDK for high-performance deep learning inference, including its TensorRT-LLM extension for large language models
- [**NVIDIA TensorRT-LLM**](https://github.com/NVIDIA/TensorRT-LLM/blob/main/cpp/tensorrt_llm/common/safetensors.cpp), a toolkit for optimizing and serving large language model inference on GPUs - [**NVIDIA TensorRT-LLM**](https://github.com/NVIDIA/TensorRT-LLM/blob/main/cpp/tensorrt_llm/common/safetensors.cpp), a toolkit for optimizing and serving large language model inference on GPUs
- [**ONNX Runtime**](https://github.com/microsoft/onnxruntime), a cross-platform inference and training accelerator for machine learning models - [**ONNX Runtime**](https://onnxruntime.ai), a cross-platform inference and training accelerator for machine learning models
- [**OpenVINO**](https://github.com/openvinotoolkit/openvino), Intel's toolkit for optimizing and deploying deep learning inference across CPUs, GPUs, and NPUs - [**OpenVINO**](https://github.com/openvinotoolkit/openvino), Intel's toolkit for optimizing and deploying deep learning inference across CPUs, GPUs, and NPUs
- [**PaddleOCR**](https://github.com/PaddlePaddle/PaddleOCR/blob/main/deploy/cpp_infer/src/modules/text_detection/result.cc), an optical character recognition toolkit that turns documents and images into structured data - [**PaddleOCR**](https://github.com/PaddlePaddle/PaddleOCR/blob/main/deploy/cpp_infer/src/modules/text_detection/result.cc), an optical character recognition toolkit that turns documents and images into structured data
- [**PaddlePaddle**](https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/ap/src/axpr/anf_expr.cc), a deep learning framework for distributed training and inference - [**PaddlePaddle**](https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/ap/src/axpr/anf_expr.cc), a deep learning framework for distributed training and inference
@@ -216,7 +216,7 @@ the result of an internet search. If you know further customers of the library,
- [**Check Point**](https://www.checkpoint.com/about-us/copyright-and-trademarks/), a cybersecurity company specializing in threat prevention and network security solutions, offering a range of products designed to protect enterprises from cyber threats and ensure data integrity - [**Check Point**](https://www.checkpoint.com/about-us/copyright-and-trademarks/), a cybersecurity company specializing in threat prevention and network security solutions, offering a range of products designed to protect enterprises from cyber threats and ensure data integrity
- [**EasyEffects**](https://github.com/wwmm/easyeffects/blob/master/src/presets_manager.hpp), an audio effects processor for PipeWire offering limiting, compression and equalization - [**EasyEffects**](https://github.com/wwmm/easyeffects/blob/master/src/presets_manager.hpp), an audio effects processor for PipeWire offering limiting, compression and equalization
- [**espanso**](https://github.com/espanso/espanso/blob/dev/espanso-ui/src/win32/native.cpp), a cross-platform text expander - [**espanso**](https://github.com/espanso/espanso/blob/dev/espanso-ui/src/win32/native.cpp), a cross-platform text expander
- [**Karabiner-Elements**](https://github.com/pqrs-org/Karabiner-Elements/blob/main/src/share/app_icon.hpp), a keyboard customizer for macOS - [**Karabiner-Elements**](https://github.com/pqrs-org/Karabiner-Elements/blob/main/src/share/json_utility.hpp), a keyboard customizer for macOS
- [**MacType**](https://github.com/snowie2000/mactype/blob/directwrite/settings.h), a font rendering engine for Windows - [**MacType**](https://github.com/snowie2000/mactype/blob/directwrite/settings.h), a font rendering engine for Windows
- [**magicplan**](https://help.magicplan.app/acknowledgments), a mobile application for creating floor plans and interior designs using augmented reality - [**magicplan**](https://help.magicplan.app/acknowledgments), a mobile application for creating floor plans and interior designs using augmented reality
- [**Microsoft Office for Mac**](https://officecdnmac.microsoft.com/pr/legal/mac/OfficeforMacAttributions.html), a suite of productivity applications developed by Microsoft for macOS, including tools for word processing, spreadsheets, and presentations - [**Microsoft Office for Mac**](https://officecdnmac.microsoft.com/pr/legal/mac/OfficeforMacAttributions.html), a suite of productivity applications developed by Microsoft for macOS, including tools for word processing, spreadsheets, and presentations
+6 -4
View File
@@ -987,7 +987,9 @@ contains other characters (e.g., `1a`), or `-` where it cannot be used.
The JSON Patch operations 'remove' and 'move' cannot be applied to the root element of the JSON value. The exception is The JSON Patch operations 'remove' and 'move' cannot be applied to the root element of the JSON value. The exception is
also thrown when the parent or a reference token of an empty JSON Pointer is requested, for instance by also thrown when the parent or a reference token of an empty JSON Pointer is requested, for instance by
[`back`](../api/json_pointer/back.md) or [`pop_back`](../api/json_pointer/pop_back.md). [`front`](../api/json_pointer/front.md), [`back`](../api/json_pointer/back.md),
[`pop_front`](../api/json_pointer/pop_front.md), or [`pop_back`](../api/json_pointer/pop_back.md), and when
[`basic_json_document::erase`](../api/basic_json_document/erase.md) is called with an empty JSON Pointer.
!!! failure "Example message" !!! failure "Example message"
@@ -1263,9 +1265,9 @@ A JSON Patch operation 'test' failed. The unsuccessful operation is also printed
### json.exception.other_error.502 ### json.exception.other_error.502
[`to_ubjson`](../api/basic_json/to_ubjson.md) and [`to_bjdata`](../api/basic_json/to_bjdata.md) were called with [`to_ubjson`](../api/basic_json/to_ubjson.md) and [`to_bjdata`](../api/basic_json/to_bjdata.md) were called with
`use_type = true` but `use_size = false`, and the value contains a non-empty array or object (or, with BJData Draft 3, `use_type = true` but `use_size = false`, and the value contains a non-empty array, object, or binary value (with
any binary value). UBJSON requires a size marker (`#`) after a type marker (`$`); scalars and empty arrays or objects BJData Draft 3, any binary value, including an empty one). UBJSON requires a size marker (`#`) after a type marker
do not throw. (`$`); scalars and empty arrays or objects do not throw.
!!! failure "Example message" !!! failure "Example message"
@@ -0,0 +1,187 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="535"
height="535"
viewBox="0 0 501.56251 501.56249"
id="svg2"
version="1.1"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
sodipodi:docname="nix-snowflake-colours.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient5562">
<stop
style="stop-color:#699ad7;stop-opacity:1"
offset="0"
id="stop5564" />
<stop
id="stop5566"
offset="0.24345198"
style="stop-color:#7eb1dd;stop-opacity:1" />
<stop
style="stop-color:#7ebae4;stop-opacity:1"
offset="1"
id="stop5568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient5053">
<stop
style="stop-color:#415e9a;stop-opacity:1"
offset="0"
id="stop5055" />
<stop
id="stop5057"
offset="0.23168644"
style="stop-color:#4a6baf;stop-opacity:1" />
<stop
style="stop-color:#5277c3;stop-opacity:1"
offset="1"
id="stop5059" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5562"
id="linearGradient4328"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(70.650339,-1055.1511)"
x1="200.59668"
y1="351.41116"
x2="290.08701"
y2="506.18814" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5053"
id="linearGradient4330"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(864.69589,-1491.3405)"
x1="-584.19934"
y1="782.33563"
x2="-496.29703"
y2="937.71399" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.70904368"
inkscape:cx="99.429699"
inkscape:cy="195.33352"
inkscape:document-units="px"
inkscape:current-layer="layer3"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1050"
inkscape:window-x="1920"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:snap-global="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="gradient-logo"
style="display:inline;opacity:1"
transform="translate(-156.41121,933.30685)">
<g
id="g2"
transform="matrix(0.99994059,0,0,0.99994059,-0.06321798,33.188377)"
style="stroke-width:1.00006">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="path3336-6"
d="m 309.54892,-710.38827 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8257 z"
style="opacity:1;fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00018;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<use
height="100%"
width="100%"
transform="rotate(60,407.11155,-715.78724)"
id="use3439-6"
inkscape:transform-center-y="151.59082"
inkscape:transform-center-x="124.43045"
xlink:href="#path3336-6"
y="0"
x="0"
style="stroke-width:1.00006" />
<use
height="100%"
width="100%"
transform="rotate(-60,407.31177,-715.70016)"
id="use3445-0"
inkscape:transform-center-y="75.573958"
inkscape:transform-center-x="-168.20651"
xlink:href="#path3336-6"
y="0"
x="0"
style="stroke-width:1.00006" />
<use
height="100%"
width="100%"
transform="rotate(180,407.41868,-715.7565)"
id="use3449-5"
inkscape:transform-center-y="-139.94592"
inkscape:transform-center-x="59.669705"
xlink:href="#path3336-6"
y="0"
x="0"
style="stroke-width:1.00006" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4330);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00018;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 309.54892,-710.38827 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8256 z"
id="path4260-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<use
height="100%"
width="100%"
transform="rotate(120,407.33916,-716.08356)"
id="use4354-5"
xlink:href="#path4260-0"
y="0"
x="0"
style="display:inline;stroke-width:1.00006" />
<use
height="100%"
width="100%"
transform="rotate(-120,407.28823,-715.86995)"
id="use4362-2"
xlink:href="#path4260-0"
y="0"
x="0"
style="display:inline;stroke-width:1.00006" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.4 KiB

@@ -0,0 +1,7 @@
cmake_minimum_required(VERSION 3.15)
project(json_example)
find_package(nlohmann_json CONFIG REQUIRED)
add_executable(json_example example.cpp)
target_link_libraries(json_example PRIVATE nlohmann_json::nlohmann_json)
@@ -0,0 +1,10 @@
#include <nlohmann/json.hpp>
#include <iostream>
#include <iomanip>
using nlohmann::json;
int main()
{
std::cout << std::setw(4) << json::meta() << std::endl;
}
@@ -14,7 +14,8 @@
![Conda](../images/package_managers/conda.svg){: style="height:1em"}&nbsp;[**Conda**](#conda) `nlohmann_json` &emsp; ![Conda](../images/package_managers/conda.svg){: style="height:1em"}&nbsp;[**Conda**](#conda) `nlohmann_json` &emsp;
![MacPorts](../images/package_managers/macports.svg){: style="height:1em"}&nbsp;[**MacPorts**](#macports) `nlohmann-json`<br> ![MacPorts](../images/package_managers/macports.svg){: style="height:1em"}&nbsp;[**MacPorts**](#macports) `nlohmann-json`<br>
![cpm.cmake](../images/package_managers/CPM.png){: style="height:1em"}&nbsp;[**CPM.cmake**](#cpmcmake) `gh:nlohmann/json` &emsp; ![cpm.cmake](../images/package_managers/CPM.png){: style="height:1em"}&nbsp;[**CPM.cmake**](#cpmcmake) `gh:nlohmann/json` &emsp;
![xmake](../images/package_managers/xmake.svg){: style="height:1em"}&nbsp;[**xmake**](#xmake) `nlohmann_json` ![xmake](../images/package_managers/xmake.svg){: style="height:1em"}&nbsp;[**xmake**](#xmake) `nlohmann_json` &emsp;
![Nix](../images/package_managers/nix.svg){: style="height:1em"}&nbsp;[**Nix**](#nix) `nlohmann_json`
</p> </p>
## Running example ## Running example
@@ -906,6 +907,56 @@ CPMAddPackage("gh:nlohmann/json@3.12.0")
* * * * * *
## Nix
!!! abstract "Summary"
package: [**`nlohmann_json`**](https://search.nixos.org/packages?channel=unstable&show=nlohmann_json&query=nlohmann_json)
- :octicons-tag-24: Available versions: current version of each Nixpkgs channel (may lag behind the latest release)
- :octicons-rocket-24: The package is maintained by the Nixpkgs community and updated after releases.
- :octicons-file-24: File issues at the [Nixpkgs issue tracker](https://github.com/NixOS/nixpkgs/issues)
- :octicons-question-24: [Nix website](https://nixos.org)
If you are using [Nix](https://nixos.org) or [NixOS](https://nixos.org/manual/nixos/stable/), the library is available
as the [nlohmann_json](https://search.nixos.org/packages?channel=unstable&show=nlohmann_json&query=nlohmann_json)
package in [Nixpkgs](https://github.com/NixOS/nixpkgs). To try it in a temporary shell, execute
```shell
nix-shell -p nlohmann_json
```
On NixOS, the package can be installed system-wide by adding it to `configuration.nix`:
```nix
environment.systemPackages = [ pkgs.nlohmann_json ];
```
??? example "Example: CMake"
1. Create the following files:
```cpp title="example.cpp"
--8<-- "integration/nix/example.cpp"
```
```cmake title="CMakeLists.txt"
--8<-- "integration/nix/CMakeLists.txt"
```
2. Enter a shell that provides the package, CMake, and a C++ compiler:
```sh
nix-shell -p nlohmann_json cmake
```
3. Compile the code:
```sh
cmake -S . -B build
cmake --build build
```
## Other package managers ## Other package managers
The library is also contained in many other package repositories; [Repology](https://repology.org/project/nlohmann-json/versions) tracks the packaged The library is also contained in many other package repositories; [Repology](https://repology.org/project/nlohmann-json/versions) tracks the packaged
+2 -2
View File
@@ -1,8 +1,8 @@
wheel==0.48.0 wheel==0.48.0
mkdocs==1.6.1 # documentation framework mkdocs==1.6.1 # documentation framework
mkdocs-git-revision-date-localized-plugin==1.6.3 # plugin "git-revision-date-localized" mkdocs-git-revision-date-localized-plugin==1.7.0 # plugin "git-revision-date-localized"
mkdocs-material==9.8.0 # theme for mkdocs mkdocs-material==9.8.1 # theme for mkdocs
mkdocs-material-extensions==1.3.1 # extensions mkdocs-material-extensions==1.3.1 # extensions
mkdocs-minify-plugin==0.8.0 # plugin "minify" mkdocs-minify-plugin==0.8.0 # plugin "minify"
mkdocs-redirects==1.2.3 # plugin "redirects" mkdocs-redirects==1.2.3 # plugin "redirects"
+4 -4
View File
@@ -6,7 +6,7 @@
"": { "": {
"name": "check-mermaid", "name": "check-mermaid",
"dependencies": { "dependencies": {
"jsdom": "31.0.0", "jsdom": "31.0.1",
"mermaid": "12.3.0" "mermaid": "12.3.0"
} }
}, },
@@ -1109,9 +1109,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/jsdom": { "node_modules/jsdom": {
"version": "31.0.0", "version": "31.0.1",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-31.0.0.tgz", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-31.0.1.tgz",
"integrity": "sha512-xAkhD9z1eyFC5+QUi9K24CaZJgdCQ2GOGLW1GdVDoQvkp/AxEH9TQ0pAplPOlIiV92hfcgnFOADZypbjgbBT6Q==", "integrity": "sha512-CbhJL8ZQg3eKswxSZth4QO9tW0jPIhmR0vtSXQSbKSfWbwIT6hoRc17wdHIVTQ43KI0mdV5iTJr3281IDgVZ5g==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@exodus/bytes": "^1.16.0", "@exodus/bytes": "^1.16.0",
+1 -1
View File
@@ -4,7 +4,7 @@
"description": "Validate the Mermaid diagrams of the documentation (see check_mermaid.mjs)", "description": "Validate the Mermaid diagrams of the documentation (see check_mermaid.mjs)",
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"jsdom": "31.0.0", "jsdom": "31.0.1",
"mermaid": "12.3.0" "mermaid": "12.3.0"
} }
} }
@@ -48,10 +48,11 @@ namespace detail
{ {
/*! /*!
@brief implements the Grisu2 algorithm for binary to decimal floating-point @brief implements binary to decimal floating-point conversion: the shortest
conversion. digits of Zmij (see zmij.hpp) for IEEE 754 binary64 numbers, and the Grisu2
algorithm for all other formats.
This implementation is a slightly modified version of the reference The Grisu2 implementation is a slightly modified version of the reference
implementation which may be obtained from implementation which may be obtained from
http://florian.loitsch.com/publications (bench.tar.gz). http://florian.loitsch.com/publications (bench.tar.gz).
+77 -47
View File
@@ -1927,6 +1927,21 @@ class binary_reader
return result; return result;
} }
/*!
@brief move past a value of @a size bytes, starting with @a head, that a
bulk run reads, as get() and get_number() would
Called before the value is passed on, so that an error reported while
passing it on (see @ref emit_float) has the position and the last byte
that reading the value byte by byte gives.
*/
void bulk_advance(const std::size_t size, const unsigned char head)
{
ia.bulk_skip(size);
chars_read += size;
current = head;
}
/*! /*!
@brief read the integers, floats, booleans, and nulls that follow in a @brief read the integers, floats, booleans, and nulls that follow in a
definite-length array, without the per-element bookkeeping of definite-length array, without the per-element bookkeeping of
@@ -1952,71 +1967,70 @@ class binary_reader
{ {
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data()); const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
const unsigned char head = data[0]; const unsigned char head = data[0];
std::size_t size = 0;
bool accepted = false; bool accepted = false;
switch (head) switch (head)
{ {
case 0x18: case 0x18:
size = 2; bulk_advance(2, head);
accepted = emit_unsigned(data[1]); accepted = emit_unsigned(data[1]);
break; break;
case 0x19: case 0x19:
size = 3; bulk_advance(3, head);
accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1));
break; break;
case 0x1A: case 0x1A:
size = 5; bulk_advance(5, head);
accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1));
break; break;
case 0x1B: case 0x1B:
size = 9; bulk_advance(9, head);
accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1));
break; break;
case 0x38: case 0x38:
size = 2; bulk_advance(2, head);
accepted = emit_cbor_negative_integer(data[1]); accepted = emit_cbor_negative_integer(data[1]);
break; break;
case 0x39: case 0x39:
size = 3; bulk_advance(3, head);
accepted = emit_cbor_negative_integer(load_big_endian<std::uint16_t>(data + 1)); accepted = emit_cbor_negative_integer(load_big_endian<std::uint16_t>(data + 1));
break; break;
case 0x3A: case 0x3A:
size = 5; bulk_advance(5, head);
accepted = emit_cbor_negative_integer(load_big_endian<std::uint32_t>(data + 1)); accepted = emit_cbor_negative_integer(load_big_endian<std::uint32_t>(data + 1));
break; break;
case 0x3B: case 0x3B:
size = 9; bulk_advance(9, head);
accepted = emit_cbor_negative_integer(load_big_endian<std::uint64_t>(data + 1)); accepted = emit_cbor_negative_integer(load_big_endian<std::uint64_t>(data + 1));
break; break;
case 0xF4: case 0xF4:
size = 1; bulk_advance(1, head);
accepted = sax->boolean(false); accepted = sax->boolean(false);
break; break;
case 0xF5: case 0xF5:
size = 1; bulk_advance(1, head);
accepted = sax->boolean(true); accepted = sax->boolean(true);
break; break;
case 0xF6: case 0xF6:
size = 1; bulk_advance(1, head);
accepted = sax->null(); accepted = sax->null();
break; break;
case 0xFA: case 0xFA:
size = 5; bulk_advance(5, head);
accepted = emit_float(load_big_endian<float>(data + 1)); accepted = emit_float(load_big_endian<float>(data + 1));
break; break;
case 0xFB: case 0xFB:
size = 9; bulk_advance(9, head);
accepted = emit_float(load_big_endian<double>(data + 1)); accepted = emit_float(load_big_endian<double>(data + 1));
break; break;
default: default:
if (head <= 0x17) if (head <= 0x17)
{ {
size = 1; bulk_advance(1, head);
accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head)); accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head));
} }
else if (head >= 0x20 && head <= 0x37) else if (head >= 0x20 && head <= 0x37)
{ {
size = 1; bulk_advance(1, head);
accepted = sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - head)); accepted = sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - head));
} }
else else
@@ -2026,10 +2040,6 @@ class binary_reader
} }
break; break;
} }
// as if read by get() and get_number(): current is the head byte
ia.bulk_skip(size);
chars_read += size;
current = head;
--remaining; --remaining;
if (JSON_HEDLEY_UNLIKELY(!accepted)) if (JSON_HEDLEY_UNLIKELY(!accepted))
{ {
@@ -2867,73 +2877,72 @@ class binary_reader
{ {
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data()); const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
const unsigned char head = data[0]; const unsigned char head = data[0];
std::size_t size = 0;
bool accepted = false; bool accepted = false;
switch (head) switch (head)
{ {
case 0xC0: // nil case 0xC0: // nil
size = 1; bulk_advance(1, head);
accepted = sax->null(); accepted = sax->null();
break; break;
case 0xC2: // false case 0xC2: // false
size = 1; bulk_advance(1, head);
accepted = sax->boolean(false); accepted = sax->boolean(false);
break; break;
case 0xC3: // true case 0xC3: // true
size = 1; bulk_advance(1, head);
accepted = sax->boolean(true); accepted = sax->boolean(true);
break; break;
case 0xCA: // float 32 case 0xCA: // float 32
size = 5; bulk_advance(5, head);
accepted = emit_float(load_big_endian<float>(data + 1)); accepted = emit_float(load_big_endian<float>(data + 1));
break; break;
case 0xCB: // float 64 case 0xCB: // float 64
size = 9; bulk_advance(9, head);
accepted = emit_float(load_big_endian<double>(data + 1)); accepted = emit_float(load_big_endian<double>(data + 1));
break; break;
case 0xCC: // uint 8 case 0xCC: // uint 8
size = 2; bulk_advance(2, head);
accepted = emit_unsigned(data[1]); accepted = emit_unsigned(data[1]);
break; break;
case 0xCD: // uint 16 case 0xCD: // uint 16
size = 3; bulk_advance(3, head);
accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1));
break; break;
case 0xCE: // uint 32 case 0xCE: // uint 32
size = 5; bulk_advance(5, head);
accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1));
break; break;
case 0xCF: // uint 64 case 0xCF: // uint 64
size = 9; bulk_advance(9, head);
accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1));
break; break;
case 0xD0: // int 8 case 0xD0: // int 8
size = 2; bulk_advance(2, head);
accepted = emit_signed(static_cast<std::int8_t>(data[1])); accepted = emit_signed(static_cast<std::int8_t>(data[1]));
break; break;
case 0xD1: // int 16 case 0xD1: // int 16
size = 3; bulk_advance(3, head);
accepted = emit_signed(load_big_endian<std::int16_t>(data + 1)); accepted = emit_signed(load_big_endian<std::int16_t>(data + 1));
break; break;
case 0xD2: // int 32 case 0xD2: // int 32
size = 5; bulk_advance(5, head);
accepted = emit_signed(load_big_endian<std::int32_t>(data + 1)); accepted = emit_signed(load_big_endian<std::int32_t>(data + 1));
break; break;
case 0xD3: // int 64 case 0xD3: // int 64
size = 9; bulk_advance(9, head);
accepted = emit_signed(load_big_endian<std::int64_t>(data + 1)); accepted = emit_signed(load_big_endian<std::int64_t>(data + 1));
break; break;
default: default:
if (head <= 0x7F) if (head <= 0x7F)
{ {
// positive fixint // positive fixint
size = 1; bulk_advance(1, head);
accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head)); accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head));
} }
else if (head >= 0xE0) else if (head >= 0xE0)
{ {
// negative fixint // negative fixint
size = 1; bulk_advance(1, head);
accepted = sax->number_integer(static_cast<std::int8_t>(head)); accepted = sax->number_integer(static_cast<std::int8_t>(head));
} }
else else
@@ -2943,10 +2952,6 @@ class binary_reader
} }
break; break;
} }
// as if read by get() and get_number(): current is the last byte
ia.bulk_skip(size);
chars_read += size;
current = data[size - 1];
--remaining; --remaining;
if (JSON_HEDLEY_UNLIKELY(!accepted)) if (JSON_HEDLEY_UNLIKELY(!accepted))
{ {
@@ -3850,6 +3855,7 @@ class binary_reader
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data()); const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
// UBJSON stores numbers big-endian, BJData little-endian // UBJSON stores numbers big-endian, BJData little-endian
const bool swap = is_little_endian != (input_format == input_format_t::bjdata); const bool swap = is_little_endian != (input_format == input_format_t::bjdata);
const std::size_t start = chars_read;
std::size_t read = 0; std::size_t read = 0;
bool accepted = true; bool accepted = true;
while (read < count && accepted) while (read < count && accepted)
@@ -3861,16 +3867,39 @@ class binary_reader
byte_swap(number); byte_swap(number);
} }
++read; ++read;
// where passing the value on can report an error (see
// emit_float), the position is that after the value, as if it
// was read by get_number()
set_chars_read(start + (read * size), std::integral_constant<bool, may_overflow_number_float<NumberType>()> {});
accepted = emit_ubjson_number(number); accepted = emit_ubjson_number(number);
} }
// as if read by get_number(): current is the last byte read // get_number() does not change current
ia.bulk_skip(read * size); ia.bulk_skip(read * size);
chars_read += read * size; chars_read = start + (read * size);
current = data[(read * size) - 1];
remaining -= read; remaining -= read;
return accepted; return accepted;
} }
/*!
@brief whether a value of type @a NumberType can be finite and still
overflow number_float_t, which @ref emit_float reports as an error
False for the default number types, so that the loop in @ref
parse_ubjson_typed_run need not track the position per value.
*/
template<typename NumberType>
static constexpr bool may_overflow_number_float() noexcept
{
return static_cast<long double>((std::numeric_limits<number_float_t>::max)()) < static_cast<long double>((std::numeric_limits<NumberType>::max)());
}
void set_chars_read(const std::size_t position, std::true_type /*track*/) noexcept
{
chars_read = position;
}
void set_chars_read(const std::size_t /*position*/, std::false_type /*track*/) const noexcept {}
template<typename NumberType, enable_if_t<std::is_floating_point<NumberType>::value, int> = 0> template<typename NumberType, enable_if_t<std::is_floating_point<NumberType>::value, int> = 0>
bool emit_ubjson_number(const NumberType number) bool emit_ubjson_number(const NumberType number)
{ {
@@ -4096,6 +4125,10 @@ class binary_reader
auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false); auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
const auto result_number = number_lexer.scan(); const auto result_number = number_lexer.scan();
const auto number_string = number_lexer.get_token_string(); const auto number_string = number_lexer.get_token_string();
// the number as the lexer read it, for SAX number_float(): unlike
// get_token_string(), which is meant for error messages and shortens
// long tokens, it is complete; the next scan() replaces it
const string_t number_text = number_lexer.get_string();
const auto result_remainder = number_lexer.scan(); const auto result_remainder = number_lexer.scan();
using token_type = typename detail::lexer_base<BasicJsonType>::token_type; using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
@@ -4122,10 +4155,7 @@ class binary_reader
number_string, number_string,
out_of_range::create(exception_id::number_overflow, concat("number overflow parsing '", number_string, '\''), nullptr)); out_of_range::create(exception_id::number_overflow, concat("number overflow parsing '", number_string, '\''), nullptr));
} }
// number_string is a std::string, while the SAX interface takes a return sax->number_float(parsed_float, number_text);
// string_t; convert explicitly, as the two are only implicitly
// convertible for some string types
return sax->number_float(parsed_float, string_t(number_string.data(), number_string.size()));
} }
case token_type::uninitialized: case token_type::uninitialized:
case token_type::literal_true: case token_type::literal_true:
@@ -257,7 +257,7 @@ struct ieee_binary_format<53> // binary64
These formats (float, double, and long double where it is binary64, e.g. These formats (float, double, and long double where it is binary64, e.g.
with MSVC or on Apple arm64) are converted by parse_float_native(). The with MSVC or on Apple arm64) are converted by parse_float_native(). The
predicate is the one the serializer uses to choose Grisu2. predicate is the one the serializer uses to choose to_chars() over snprintf.
*/ */
template<typename FloatType> template<typename FloatType>
struct has_native_float_format struct has_native_float_format
@@ -108,7 +108,9 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
/// access to successor /// access to successor
reference operator[](difference_type n) const reference operator[](difference_type n) const
{ {
return *(this->operator+(n)); // the element n positions after *this is the one n + 1 positions before base();
// Base::operator[] then reports invalid_iterator.208 for object iterators
return this->base()[-n - 1];
} }
/// return the key of an object iterator /// return the key of an object iterator
@@ -915,7 +915,7 @@ class binary_writer
JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j)); JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j));
} }
/// @throw other_error.407 always /// @throw other_error.502 always
JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE
static void throw_size_marker_required(const BasicJsonType& j) static void throw_size_marker_required(const BasicJsonType& j)
{ {
+46 -6
View File
@@ -636,7 +636,7 @@ class serializer
put_literal("\"subtype\": "); put_literal("\"subtype\": ");
if (binary.has_subtype()) if (binary.has_subtype())
{ {
dump_integer(binary.subtype()); dump_subtype(binary.subtype());
} }
else else
{ {
@@ -662,7 +662,7 @@ class serializer
put_literal("],\"subtype\":"); put_literal("],\"subtype\":");
if (binary.has_subtype()) if (binary.has_subtype())
{ {
dump_integer(binary.subtype()); dump_subtype(binary.subtype());
put_char('}'); put_char('}');
} }
else else
@@ -1571,7 +1571,7 @@ class serializer
{ {
return n_digits + 3; return n_digits + 3;
} }
x = x / 10000u; x = static_cast<number_magnitude_t>(x / 10000u);
n_digits += 4; n_digits += 4;
} }
} }
@@ -1883,6 +1883,40 @@ class serializer
write_buffer_pos = pos; write_buffer_pos = pos;
} }
/*!
@brief dump the subtype of a binary value
The subtype is a std::uint64_t, whatever the number types are. @ref
dump_integer converts its argument to the magnitude type of
number_unsigned_t, so it writes the subtype only if that type has at least
64 bits; otherwise (it would truncate the subtype) the digits are written
one by one.
@param[in] subtype the subtype to dump
*/
void dump_subtype(std::uint64_t subtype)
{
dump_subtype(subtype, std::integral_constant<bool, magnitude_has_at_least_64_bits> {});
}
void dump_subtype(std::uint64_t subtype, std::true_type /*magnitude has at least 64 bits*/)
{
dump_integer(subtype);
}
void dump_subtype(std::uint64_t subtype, std::false_type /*magnitude has less than 64 bits*/)
{
std::array<char, 20> digits{{}}; // 2^64 - 1 has 20 digits
std::size_t start = digits.size();
do
{
digits[--start] = static_cast<char>('0' + (subtype % 10));
subtype /= 10;
}
while (subtype != 0);
put_string(digits, start, digits.size());
}
/*! /*!
@brief dump an integer @brief dump an integer
@@ -2033,8 +2067,9 @@ class serializer
} }
// If number_float_t is an IEEE-754 single or double precision number, // If number_float_t is an IEEE-754 single or double precision number,
// use the Grisu2 algorithm to produce short numbers which are // use to_chars() to produce short numbers which are guaranteed to
// guaranteed to round-trip, using strtof and strtod, resp. // round-trip, using strtof and strtod, resp. (the shortest digits of
// Zmij for binary64, the Grisu2 algorithm for binary32).
// //
// NB: The test below works if <long double> == <double>. // NB: The test below works if <long double> == <double>.
static constexpr bool is_ieee_single_or_double static constexpr bool is_ieee_single_or_double
@@ -2136,6 +2171,11 @@ class serializer
static constexpr bool magnitude_has_at_most_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized static constexpr bool magnitude_has_at_most_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized
&& std::numeric_limits<number_magnitude_t>::digits <= 64; && std::numeric_limits<number_magnitude_t>::digits <= 64;
/// whether every std::uint64_t fits number_magnitude_t (then dump_integer
/// can write a binary subtype)
static constexpr bool magnitude_has_at_least_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized
&& std::numeric_limits<number_magnitude_t>::digits >= 64;
/// whether @a x fits 64 bits: always if number_magnitude_t has at most /// whether @a x fits 64 bits: always if number_magnitude_t has at most
/// 64 bits (selected by type, as the comparison would be reported as /// 64 bits (selected by type, as the comparison would be reported as
/// always true), else compared /// always true), else compared
@@ -2161,7 +2201,7 @@ class serializer
number_magnitude_t remove_sign(number_integer_t x) noexcept number_magnitude_t remove_sign(number_integer_t x) noexcept
{ {
JSON_ASSERT(x < 0); JSON_ASSERT(x < 0);
return static_cast<number_magnitude_t>(-(x + 1)) + 1; return static_cast<number_magnitude_t>(static_cast<number_magnitude_t>(-(x + 1)) + 1);
} }
private: private:
+15 -2
View File
@@ -384,9 +384,22 @@ class editor
// for the container is linear in the size of the document, so // for the container is linear in the size of the document, so
// links (which are marked in the slot) avoid it. // links (which are marked in the slot) avoid it.
node* const p = parent_known ? parent : find_parent(m_doc, slot); node* const p = parent_known ? parent : find_parent(m_doc, slot);
if (p != nullptr && ((p->flags & node_flags::moved) == 0 || moved_capacity(m_doc, p) == 0)) if (p != nullptr)
{ {
block_of(m_doc, p, 0); if ((p->flags & node_flags::moved) == 0 || moved_capacity(m_doc, p) == 0)
{
block_of(m_doc, p, 0);
}
}
else
{
// the slot is no longer part of the document, but the
// (dropped) container it is in may still step over it
node* const q = find_layout_parent(m_doc, slot);
if (q != nullptr)
{
block_of(m_doc, q, 0);
}
} }
} }
*slot = e.scalar; *slot = e.scalar;
+38 -1
View File
@@ -194,7 +194,9 @@ inline node* block_of(document_data& d, node* n, std::size_t extra)
h->len = n->len; h->len = n->len;
h->next = static_cast<std::uint32_t>(used); h->next = static_cast<std::uint32_t>(used);
node* o = h + 1; node* o = h + 1;
for (const node* c = d.first_child_edited(n), *e = d.child_end_edited(n); c != e;) // (the bound on o keeps the copy inside the block even if the elements
// disagreed with the element count)
for (const node* c = d.first_child_edited(n), *e = d.child_end_edited(n), *const full = h + used; c != e && o != full;)
{ {
if (object) if (object)
{ {
@@ -276,6 +278,41 @@ inline node* find_parent(const document_data& d, const node* target)
} }
} }
/// The container whose contiguous layout (in the parsed index, or in a new
/// value) steps over `target`, also when an edit dropped the container or a
/// value that encloses it; nullptr if there is none, or if the container no
/// longer walks that layout (its elements moved). An edit never gives a node a
/// larger extent than it was parsed or encoded with (a scalar is one node, an
/// assigned array/object keeps the extent of the slot), so the containers whose
/// extent covers `target` are its original ancestors: the nearest one before it
/// is its original parent. The root of a new value that is the element sequence
/// of another container is walked by that container (which find_parent() finds
/// while it still uses the sequence), not by itself.
inline node* find_layout_parent(const document_data& d, const node* target)
{
const std::less<const node*> lt{};
const node* lo = d.nodes;
if (lt(target, lo) || !lt(target, d.nodes + d.node_count))
{
auto it = d.edits->regions.upper_bound(target);
if (it == d.edits->regions.begin())
{
return nullptr; // LCOV_EXCL_LINE (an array/object with elements is in the index or a new value)
}
--it;
lo = it->second != nullptr ? it->first + 1 : it->first;
}
for (const node* c = target; c != lo;)
{
--c;
if (is_container(*c) && lt(target, c + c->next))
{
return (c->flags & node_flags::moved) == 0 ? const_cast<node*>(c) : nullptr; // NOLINT(cppcoreguidelines-pro-type-const-cast): the nodes belong to the document
}
}
return nullptr;
}
} // namespace view } // namespace view
} // namespace detail } // namespace detail
NLOHMANN_JSON_NAMESPACE_END NLOHMANN_JSON_NAMESPACE_END
+1 -1
View File
@@ -849,7 +849,7 @@ class basic_json_view
return !navigation::editable() || m_doc->edits == nullptr; return !navigation::editable() || m_doc->edits == nullptr;
} }
/// the member of this object with @a key (the last one if the key occurs more than once), or nullptr /// the member of this object with @a key (the first one if the key occurs more than once), or nullptr
NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const
{ {
return find_key(key, std::integral_constant<bool, is_editable> {}); return find_key(key, std::integral_constant<bool, is_editable> {});
+1 -1
View File
@@ -50,6 +50,7 @@
#undef JSON_HEDLEY_EMSCRIPTEN_VERSION #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
#undef JSON_HEDLEY_END_C_DECLS #undef JSON_HEDLEY_END_C_DECLS
#undef JSON_HEDLEY_FALL_THROUGH
#undef JSON_HEDLEY_FLAGS #undef JSON_HEDLEY_FLAGS
#undef JSON_HEDLEY_FLAGS_CAST #undef JSON_HEDLEY_FLAGS_CAST
#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
@@ -158,4 +159,3 @@
#undef JSON_HEDLEY_WARNING #undef JSON_HEDLEY_WARNING
#undef JSON_HEDLEY_WARN_UNUSED_RESULT #undef JSON_HEDLEY_WARN_UNUSED_RESULT
#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
#undef JSON_HEDLEY_FALL_THROUGH
+133 -60
View File
@@ -11642,7 +11642,7 @@ struct ieee_binary_format<53> // binary64
These formats (float, double, and long double where it is binary64, e.g. These formats (float, double, and long double where it is binary64, e.g.
with MSVC or on Apple arm64) are converted by parse_float_native(). The with MSVC or on Apple arm64) are converted by parse_float_native(). The
predicate is the one the serializer uses to choose Grisu2. predicate is the one the serializer uses to choose to_chars() over snprintf.
*/ */
template<typename FloatType> template<typename FloatType>
struct has_native_float_format struct has_native_float_format
@@ -20605,6 +20605,21 @@ class binary_reader
return result; return result;
} }
/*!
@brief move past a value of @a size bytes, starting with @a head, that a
bulk run reads, as get() and get_number() would
Called before the value is passed on, so that an error reported while
passing it on (see @ref emit_float) has the position and the last byte
that reading the value byte by byte gives.
*/
void bulk_advance(const std::size_t size, const unsigned char head)
{
ia.bulk_skip(size);
chars_read += size;
current = head;
}
/*! /*!
@brief read the integers, floats, booleans, and nulls that follow in a @brief read the integers, floats, booleans, and nulls that follow in a
definite-length array, without the per-element bookkeeping of definite-length array, without the per-element bookkeeping of
@@ -20630,71 +20645,70 @@ class binary_reader
{ {
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data()); const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
const unsigned char head = data[0]; const unsigned char head = data[0];
std::size_t size = 0;
bool accepted = false; bool accepted = false;
switch (head) switch (head)
{ {
case 0x18: case 0x18:
size = 2; bulk_advance(2, head);
accepted = emit_unsigned(data[1]); accepted = emit_unsigned(data[1]);
break; break;
case 0x19: case 0x19:
size = 3; bulk_advance(3, head);
accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1));
break; break;
case 0x1A: case 0x1A:
size = 5; bulk_advance(5, head);
accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1));
break; break;
case 0x1B: case 0x1B:
size = 9; bulk_advance(9, head);
accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1));
break; break;
case 0x38: case 0x38:
size = 2; bulk_advance(2, head);
accepted = emit_cbor_negative_integer(data[1]); accepted = emit_cbor_negative_integer(data[1]);
break; break;
case 0x39: case 0x39:
size = 3; bulk_advance(3, head);
accepted = emit_cbor_negative_integer(load_big_endian<std::uint16_t>(data + 1)); accepted = emit_cbor_negative_integer(load_big_endian<std::uint16_t>(data + 1));
break; break;
case 0x3A: case 0x3A:
size = 5; bulk_advance(5, head);
accepted = emit_cbor_negative_integer(load_big_endian<std::uint32_t>(data + 1)); accepted = emit_cbor_negative_integer(load_big_endian<std::uint32_t>(data + 1));
break; break;
case 0x3B: case 0x3B:
size = 9; bulk_advance(9, head);
accepted = emit_cbor_negative_integer(load_big_endian<std::uint64_t>(data + 1)); accepted = emit_cbor_negative_integer(load_big_endian<std::uint64_t>(data + 1));
break; break;
case 0xF4: case 0xF4:
size = 1; bulk_advance(1, head);
accepted = sax->boolean(false); accepted = sax->boolean(false);
break; break;
case 0xF5: case 0xF5:
size = 1; bulk_advance(1, head);
accepted = sax->boolean(true); accepted = sax->boolean(true);
break; break;
case 0xF6: case 0xF6:
size = 1; bulk_advance(1, head);
accepted = sax->null(); accepted = sax->null();
break; break;
case 0xFA: case 0xFA:
size = 5; bulk_advance(5, head);
accepted = emit_float(load_big_endian<float>(data + 1)); accepted = emit_float(load_big_endian<float>(data + 1));
break; break;
case 0xFB: case 0xFB:
size = 9; bulk_advance(9, head);
accepted = emit_float(load_big_endian<double>(data + 1)); accepted = emit_float(load_big_endian<double>(data + 1));
break; break;
default: default:
if (head <= 0x17) if (head <= 0x17)
{ {
size = 1; bulk_advance(1, head);
accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head)); accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head));
} }
else if (head >= 0x20 && head <= 0x37) else if (head >= 0x20 && head <= 0x37)
{ {
size = 1; bulk_advance(1, head);
accepted = sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - head)); accepted = sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - head));
} }
else else
@@ -20704,10 +20718,6 @@ class binary_reader
} }
break; break;
} }
// as if read by get() and get_number(): current is the head byte
ia.bulk_skip(size);
chars_read += size;
current = head;
--remaining; --remaining;
if (JSON_HEDLEY_UNLIKELY(!accepted)) if (JSON_HEDLEY_UNLIKELY(!accepted))
{ {
@@ -21545,73 +21555,72 @@ class binary_reader
{ {
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data()); const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
const unsigned char head = data[0]; const unsigned char head = data[0];
std::size_t size = 0;
bool accepted = false; bool accepted = false;
switch (head) switch (head)
{ {
case 0xC0: // nil case 0xC0: // nil
size = 1; bulk_advance(1, head);
accepted = sax->null(); accepted = sax->null();
break; break;
case 0xC2: // false case 0xC2: // false
size = 1; bulk_advance(1, head);
accepted = sax->boolean(false); accepted = sax->boolean(false);
break; break;
case 0xC3: // true case 0xC3: // true
size = 1; bulk_advance(1, head);
accepted = sax->boolean(true); accepted = sax->boolean(true);
break; break;
case 0xCA: // float 32 case 0xCA: // float 32
size = 5; bulk_advance(5, head);
accepted = emit_float(load_big_endian<float>(data + 1)); accepted = emit_float(load_big_endian<float>(data + 1));
break; break;
case 0xCB: // float 64 case 0xCB: // float 64
size = 9; bulk_advance(9, head);
accepted = emit_float(load_big_endian<double>(data + 1)); accepted = emit_float(load_big_endian<double>(data + 1));
break; break;
case 0xCC: // uint 8 case 0xCC: // uint 8
size = 2; bulk_advance(2, head);
accepted = emit_unsigned(data[1]); accepted = emit_unsigned(data[1]);
break; break;
case 0xCD: // uint 16 case 0xCD: // uint 16
size = 3; bulk_advance(3, head);
accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint16_t>(data + 1));
break; break;
case 0xCE: // uint 32 case 0xCE: // uint 32
size = 5; bulk_advance(5, head);
accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint32_t>(data + 1));
break; break;
case 0xCF: // uint 64 case 0xCF: // uint 64
size = 9; bulk_advance(9, head);
accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1)); accepted = emit_unsigned(load_big_endian<std::uint64_t>(data + 1));
break; break;
case 0xD0: // int 8 case 0xD0: // int 8
size = 2; bulk_advance(2, head);
accepted = emit_signed(static_cast<std::int8_t>(data[1])); accepted = emit_signed(static_cast<std::int8_t>(data[1]));
break; break;
case 0xD1: // int 16 case 0xD1: // int 16
size = 3; bulk_advance(3, head);
accepted = emit_signed(load_big_endian<std::int16_t>(data + 1)); accepted = emit_signed(load_big_endian<std::int16_t>(data + 1));
break; break;
case 0xD2: // int 32 case 0xD2: // int 32
size = 5; bulk_advance(5, head);
accepted = emit_signed(load_big_endian<std::int32_t>(data + 1)); accepted = emit_signed(load_big_endian<std::int32_t>(data + 1));
break; break;
case 0xD3: // int 64 case 0xD3: // int 64
size = 9; bulk_advance(9, head);
accepted = emit_signed(load_big_endian<std::int64_t>(data + 1)); accepted = emit_signed(load_big_endian<std::int64_t>(data + 1));
break; break;
default: default:
if (head <= 0x7F) if (head <= 0x7F)
{ {
// positive fixint // positive fixint
size = 1; bulk_advance(1, head);
accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head)); accepted = sax->number_unsigned(static_cast<number_unsigned_t>(head));
} }
else if (head >= 0xE0) else if (head >= 0xE0)
{ {
// negative fixint // negative fixint
size = 1; bulk_advance(1, head);
accepted = sax->number_integer(static_cast<std::int8_t>(head)); accepted = sax->number_integer(static_cast<std::int8_t>(head));
} }
else else
@@ -21621,10 +21630,6 @@ class binary_reader
} }
break; break;
} }
// as if read by get() and get_number(): current is the last byte
ia.bulk_skip(size);
chars_read += size;
current = data[size - 1];
--remaining; --remaining;
if (JSON_HEDLEY_UNLIKELY(!accepted)) if (JSON_HEDLEY_UNLIKELY(!accepted))
{ {
@@ -22528,6 +22533,7 @@ class binary_reader
const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data()); const auto* const data = reinterpret_cast<const unsigned char*>(ia.bulk_data());
// UBJSON stores numbers big-endian, BJData little-endian // UBJSON stores numbers big-endian, BJData little-endian
const bool swap = is_little_endian != (input_format == input_format_t::bjdata); const bool swap = is_little_endian != (input_format == input_format_t::bjdata);
const std::size_t start = chars_read;
std::size_t read = 0; std::size_t read = 0;
bool accepted = true; bool accepted = true;
while (read < count && accepted) while (read < count && accepted)
@@ -22539,16 +22545,39 @@ class binary_reader
byte_swap(number); byte_swap(number);
} }
++read; ++read;
// where passing the value on can report an error (see
// emit_float), the position is that after the value, as if it
// was read by get_number()
set_chars_read(start + (read * size), std::integral_constant<bool, may_overflow_number_float<NumberType>()> {});
accepted = emit_ubjson_number(number); accepted = emit_ubjson_number(number);
} }
// as if read by get_number(): current is the last byte read // get_number() does not change current
ia.bulk_skip(read * size); ia.bulk_skip(read * size);
chars_read += read * size; chars_read = start + (read * size);
current = data[(read * size) - 1];
remaining -= read; remaining -= read;
return accepted; return accepted;
} }
/*!
@brief whether a value of type @a NumberType can be finite and still
overflow number_float_t, which @ref emit_float reports as an error
False for the default number types, so that the loop in @ref
parse_ubjson_typed_run need not track the position per value.
*/
template<typename NumberType>
static constexpr bool may_overflow_number_float() noexcept
{
return static_cast<long double>((std::numeric_limits<number_float_t>::max)()) < static_cast<long double>((std::numeric_limits<NumberType>::max)());
}
void set_chars_read(const std::size_t position, std::true_type /*track*/) noexcept
{
chars_read = position;
}
void set_chars_read(const std::size_t /*position*/, std::false_type /*track*/) const noexcept {}
template<typename NumberType, enable_if_t<std::is_floating_point<NumberType>::value, int> = 0> template<typename NumberType, enable_if_t<std::is_floating_point<NumberType>::value, int> = 0>
bool emit_ubjson_number(const NumberType number) bool emit_ubjson_number(const NumberType number)
{ {
@@ -22774,6 +22803,10 @@ class binary_reader
auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false); auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
const auto result_number = number_lexer.scan(); const auto result_number = number_lexer.scan();
const auto number_string = number_lexer.get_token_string(); const auto number_string = number_lexer.get_token_string();
// the number as the lexer read it, for SAX number_float(): unlike
// get_token_string(), which is meant for error messages and shortens
// long tokens, it is complete; the next scan() replaces it
const string_t number_text = number_lexer.get_string();
const auto result_remainder = number_lexer.scan(); const auto result_remainder = number_lexer.scan();
using token_type = typename detail::lexer_base<BasicJsonType>::token_type; using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
@@ -22800,10 +22833,7 @@ class binary_reader
number_string, number_string,
out_of_range::create(exception_id::number_overflow, concat("number overflow parsing '", number_string, '\''), nullptr)); out_of_range::create(exception_id::number_overflow, concat("number overflow parsing '", number_string, '\''), nullptr));
} }
// number_string is a std::string, while the SAX interface takes a return sax->number_float(parsed_float, number_text);
// string_t; convert explicitly, as the two are only implicitly
// convertible for some string types
return sax->number_float(parsed_float, string_t(number_string.data(), number_string.size()));
} }
case token_type::uninitialized: case token_type::uninitialized:
case token_type::literal_true: case token_type::literal_true:
@@ -26765,7 +26795,9 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
/// access to successor /// access to successor
reference operator[](difference_type n) const reference operator[](difference_type n) const
{ {
return *(this->operator+(n)); // the element n positions after *this is the one n + 1 positions before base();
// Base::operator[] then reports invalid_iterator.208 for object iterators
return this->base()[-n - 1];
} }
/// return the key of an object iterator /// return the key of an object iterator
@@ -31147,7 +31179,7 @@ class binary_writer
JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j)); JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j));
} }
/// @throw other_error.407 always /// @throw other_error.502 always
JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE
static void throw_size_marker_required(const BasicJsonType& j) static void throw_size_marker_required(const BasicJsonType& j)
{ {
@@ -36006,10 +36038,11 @@ namespace detail
{ {
/*! /*!
@brief implements the Grisu2 algorithm for binary to decimal floating-point @brief implements binary to decimal floating-point conversion: the shortest
conversion. digits of Zmij (see zmij.hpp) for IEEE 754 binary64 numbers, and the Grisu2
algorithm for all other formats.
This implementation is a slightly modified version of the reference The Grisu2 implementation is a slightly modified version of the reference
implementation which may be obtained from implementation which may be obtained from
http://florian.loitsch.com/publications (bench.tar.gz). http://florian.loitsch.com/publications (bench.tar.gz).
@@ -38122,7 +38155,7 @@ class serializer
put_literal("\"subtype\": "); put_literal("\"subtype\": ");
if (binary.has_subtype()) if (binary.has_subtype())
{ {
dump_integer(binary.subtype()); dump_subtype(binary.subtype());
} }
else else
{ {
@@ -38148,7 +38181,7 @@ class serializer
put_literal("],\"subtype\":"); put_literal("],\"subtype\":");
if (binary.has_subtype()) if (binary.has_subtype())
{ {
dump_integer(binary.subtype()); dump_subtype(binary.subtype());
put_char('}'); put_char('}');
} }
else else
@@ -39057,7 +39090,7 @@ class serializer
{ {
return n_digits + 3; return n_digits + 3;
} }
x = x / 10000u; x = static_cast<number_magnitude_t>(x / 10000u);
n_digits += 4; n_digits += 4;
} }
} }
@@ -39369,6 +39402,40 @@ class serializer
write_buffer_pos = pos; write_buffer_pos = pos;
} }
/*!
@brief dump the subtype of a binary value
The subtype is a std::uint64_t, whatever the number types are. @ref
dump_integer converts its argument to the magnitude type of
number_unsigned_t, so it writes the subtype only if that type has at least
64 bits; otherwise (it would truncate the subtype) the digits are written
one by one.
@param[in] subtype the subtype to dump
*/
void dump_subtype(std::uint64_t subtype)
{
dump_subtype(subtype, std::integral_constant<bool, magnitude_has_at_least_64_bits> {});
}
void dump_subtype(std::uint64_t subtype, std::true_type /*magnitude has at least 64 bits*/)
{
dump_integer(subtype);
}
void dump_subtype(std::uint64_t subtype, std::false_type /*magnitude has less than 64 bits*/)
{
std::array<char, 20> digits{{}}; // 2^64 - 1 has 20 digits
std::size_t start = digits.size();
do
{
digits[--start] = static_cast<char>('0' + (subtype % 10));
subtype /= 10;
}
while (subtype != 0);
put_string(digits, start, digits.size());
}
/*! /*!
@brief dump an integer @brief dump an integer
@@ -39519,8 +39586,9 @@ class serializer
} }
// If number_float_t is an IEEE-754 single or double precision number, // If number_float_t is an IEEE-754 single or double precision number,
// use the Grisu2 algorithm to produce short numbers which are // use to_chars() to produce short numbers which are guaranteed to
// guaranteed to round-trip, using strtof and strtod, resp. // round-trip, using strtof and strtod, resp. (the shortest digits of
// Zmij for binary64, the Grisu2 algorithm for binary32).
// //
// NB: The test below works if <long double> == <double>. // NB: The test below works if <long double> == <double>.
static constexpr bool is_ieee_single_or_double static constexpr bool is_ieee_single_or_double
@@ -39622,6 +39690,11 @@ class serializer
static constexpr bool magnitude_has_at_most_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized static constexpr bool magnitude_has_at_most_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized
&& std::numeric_limits<number_magnitude_t>::digits <= 64; && std::numeric_limits<number_magnitude_t>::digits <= 64;
/// whether every std::uint64_t fits number_magnitude_t (then dump_integer
/// can write a binary subtype)
static constexpr bool magnitude_has_at_least_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized
&& std::numeric_limits<number_magnitude_t>::digits >= 64;
/// whether @a x fits 64 bits: always if number_magnitude_t has at most /// whether @a x fits 64 bits: always if number_magnitude_t has at most
/// 64 bits (selected by type, as the comparison would be reported as /// 64 bits (selected by type, as the comparison would be reported as
/// always true), else compared /// always true), else compared
@@ -39647,7 +39720,7 @@ class serializer
number_magnitude_t remove_sign(number_integer_t x) noexcept number_magnitude_t remove_sign(number_integer_t x) noexcept
{ {
JSON_ASSERT(x < 0); JSON_ASSERT(x < 0);
return static_cast<number_magnitude_t>(-(x + 1)) + 1; return static_cast<number_magnitude_t>(static_cast<number_magnitude_t>(-(x + 1)) + 1);
} }
private: private:
@@ -48757,6 +48830,7 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
#undef JSON_HEDLEY_EMSCRIPTEN_VERSION #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
#undef JSON_HEDLEY_END_C_DECLS #undef JSON_HEDLEY_END_C_DECLS
#undef JSON_HEDLEY_FALL_THROUGH
#undef JSON_HEDLEY_FLAGS #undef JSON_HEDLEY_FLAGS
#undef JSON_HEDLEY_FLAGS_CAST #undef JSON_HEDLEY_FLAGS_CAST
#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
@@ -48865,7 +48939,6 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
#undef JSON_HEDLEY_WARNING #undef JSON_HEDLEY_WARNING
#undef JSON_HEDLEY_WARN_UNUSED_RESULT #undef JSON_HEDLEY_WARN_UNUSED_RESULT
#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
#undef JSON_HEDLEY_FALL_THROUGH
// IWYU pragma: keep // IWYU pragma: keep
+54 -4
View File
@@ -5564,7 +5564,9 @@ inline node* block_of(document_data& d, node* n, std::size_t extra)
h->len = n->len; h->len = n->len;
h->next = static_cast<std::uint32_t>(used); h->next = static_cast<std::uint32_t>(used);
node* o = h + 1; node* o = h + 1;
for (const node* c = d.first_child_edited(n), *e = d.child_end_edited(n); c != e;) // (the bound on o keeps the copy inside the block even if the elements
// disagreed with the element count)
for (const node* c = d.first_child_edited(n), *e = d.child_end_edited(n), *const full = h + used; c != e && o != full;)
{ {
if (object) if (object)
{ {
@@ -5646,6 +5648,41 @@ inline node* find_parent(const document_data& d, const node* target)
} }
} }
/// The container whose contiguous layout (in the parsed index, or in a new
/// value) steps over `target`, also when an edit dropped the container or a
/// value that encloses it; nullptr if there is none, or if the container no
/// longer walks that layout (its elements moved). An edit never gives a node a
/// larger extent than it was parsed or encoded with (a scalar is one node, an
/// assigned array/object keeps the extent of the slot), so the containers whose
/// extent covers `target` are its original ancestors: the nearest one before it
/// is its original parent. The root of a new value that is the element sequence
/// of another container is walked by that container (which find_parent() finds
/// while it still uses the sequence), not by itself.
inline node* find_layout_parent(const document_data& d, const node* target)
{
const std::less<const node*> lt{};
const node* lo = d.nodes;
if (lt(target, lo) || !lt(target, d.nodes + d.node_count))
{
auto it = d.edits->regions.upper_bound(target);
if (it == d.edits->regions.begin())
{
return nullptr; // LCOV_EXCL_LINE (an array/object with elements is in the index or a new value)
}
--it;
lo = it->second != nullptr ? it->first + 1 : it->first;
}
for (const node* c = target; c != lo;)
{
--c;
if (is_container(*c) && lt(target, c + c->next))
{
return (c->flags & node_flags::moved) == 0 ? const_cast<node*>(c) : nullptr; // NOLINT(cppcoreguidelines-pro-type-const-cast): the nodes belong to the document
}
}
return nullptr;
}
} // namespace view } // namespace view
} // namespace detail } // namespace detail
NLOHMANN_JSON_NAMESPACE_END NLOHMANN_JSON_NAMESPACE_END
@@ -6522,9 +6559,22 @@ class editor
// for the container is linear in the size of the document, so // for the container is linear in the size of the document, so
// links (which are marked in the slot) avoid it. // links (which are marked in the slot) avoid it.
node* const p = parent_known ? parent : find_parent(m_doc, slot); node* const p = parent_known ? parent : find_parent(m_doc, slot);
if (p != nullptr && ((p->flags & node_flags::moved) == 0 || moved_capacity(m_doc, p) == 0)) if (p != nullptr)
{ {
block_of(m_doc, p, 0); if ((p->flags & node_flags::moved) == 0 || moved_capacity(m_doc, p) == 0)
{
block_of(m_doc, p, 0);
}
}
else
{
// the slot is no longer part of the document, but the
// (dropped) container it is in may still step over it
node* const q = find_layout_parent(m_doc, slot);
if (q != nullptr)
{
block_of(m_doc, q, 0);
}
} }
} }
*slot = e.scalar; *slot = e.scalar;
@@ -11016,7 +11066,7 @@ class basic_json_view
return !navigation::editable() || m_doc->edits == nullptr; return !navigation::editable() || m_doc->edits == nullptr;
} }
/// the member of this object with @a key (the last one if the key occurs more than once), or nullptr /// the member of this object with @a key (the first one if the key occurs more than once), or nullptr
NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const
{ {
return find_key(key, std::integral_constant<bool, is_editable> {}); return find_key(key, std::integral_constant<bool, is_editable> {});
+1 -2
View File
@@ -445,8 +445,7 @@ json_test_add_test_for(src/unit-stream-bulk-scan.cpp
# with other values of JSON_UBJSON_VALUELESS_ELEMENTS_PER_BYTE: 1 (the smallest), # with other values of JSON_UBJSON_VALUELESS_ELEMENTS_PER_BYTE: 1 (the smallest),
# 1000000 (so large that the budget cannot be reached), and the largest value of # 1000000 (so large that the budget cannot be reached), and the largest value of
# a 64-bit integer (which saturates the limit already at the first byte, and is # a 64-bit integer (which saturates the limit already at the first byte, and is
# clamped to the largest std::size_t where that has 32 bits). The file does not # clamped to the largest std::size_t where that has 32 bits)
# mention JSON_HAS_CPP_<n>, so only C++11 is built unless the standards are forced
json_test_set_test_options(test-ubjson_valueless_rate_1 json_test_set_test_options(test-ubjson_valueless_rate_1
COMPILE_DEFINITIONS JSON_UBJSON_VALUELESS_ELEMENTS_PER_BYTE=1 COMPILE_DEFINITIONS JSON_UBJSON_VALUELESS_ELEMENTS_PER_BYTE=1
) )
+11
View File
@@ -2,10 +2,21 @@
# properties on its (always-configured) INTERFACE_LIBRARY "fmt-header-only" target; # properties on its (always-configured) INTERFACE_LIBRARY "fmt-header-only" target;
# CMake rejected those properties on INTERFACE_LIBRARY targets before CMake 3.19 # CMake rejected those properties on INTERFACE_LIBRARY targets before CMake 3.19
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0") if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0")
# The recipe runs its executable after linking, so nested cross-builds need
# the parent system and emulator settings as well as the compiler.
set(FMT_CROSSCOMPILING_ARGS)
if(CMAKE_CROSSCOMPILING)
string(REPLACE ";" "\\;" FMT_CROSSCOMPILING_EMULATOR "${CMAKE_CROSSCOMPILING_EMULATOR}")
list(APPEND FMT_CROSSCOMPILING_ARGS
"-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}"
"-DCMAKE_CROSSCOMPILING_EMULATOR=${FMT_CROSSCOMPILING_EMULATOR}"
)
endif()
add_test(NAME fmt_formatter_configure add_test(NAME fmt_formatter_configure
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-G "${CMAKE_GENERATOR}" -G "${CMAKE_GENERATOR}"
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
${FMT_CROSSCOMPILING_ARGS}
${CMAKE_CURRENT_SOURCE_DIR}/project ${CMAKE_CURRENT_SOURCE_DIR}/project
) )
add_test(NAME fmt_formatter_build add_test(NAME fmt_formatter_build
+8
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
#include "doctest_compatibility.h" #include "doctest_compatibility.h"
#define JSON_TESTS_PRIVATE #define JSON_TESTS_PRIVATE
@@ -15,6 +22,7 @@ using nlohmann::json;
#include <functional> #include <functional>
#include <limits> #include <limits>
#include <valarray> #include <valarray>
// JSON_HAS_CPP_20 (do not remove; see note at top of file)
#if JSON_HAS_RANGES #if JSON_HAS_RANGES
#include <ranges> #include <ranges>
#endif #endif
+123
View File
@@ -14,6 +14,7 @@ using nlohmann::json;
#include <cmath> #include <cmath>
#include <fstream> #include <fstream>
#include <limits> #include <limits>
#include <list>
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -367,3 +368,125 @@ TEST_CASE("Binary formats with narrow number types")
CHECK(format.decode(format.encode(json(1e300)), false).is_discarded()); CHECK(format.decode(format.encode(json(1e300)), false).is_discarded());
} }
} }
namespace
{
// records the SAX events of narrow_json, including the arguments of parse_error
struct narrow_event_recorder
{
using number_integer_t = narrow_json::number_integer_t;
using number_unsigned_t = narrow_json::number_unsigned_t;
using number_float_t = narrow_json::number_float_t;
using string_t = narrow_json::string_t;
using binary_t = narrow_json::binary_t;
bool null()
{
events.emplace_back("null");
return true;
}
bool boolean(bool val)
{
events.emplace_back(val ? "true" : "false");
return true;
}
bool number_integer(number_integer_t val)
{
events.push_back(std::to_string(val));
return true;
}
bool number_unsigned(number_unsigned_t val)
{
events.push_back(std::to_string(val));
return true;
}
bool number_float(number_float_t val, const string_t& /*unused*/)
{
events.push_back(std::to_string(val));
return true;
}
bool string(string_t& val)
{
events.push_back(val);
return true;
}
bool binary(binary_t& /*unused*/)
{
events.emplace_back("binary");
return true;
}
bool start_object(std::size_t /*unused*/)
{
events.emplace_back("{");
return true;
}
bool key(string_t& val)
{
events.push_back(val);
return true;
}
bool end_object()
{
events.emplace_back("}");
return true;
}
bool start_array(std::size_t /*unused*/)
{
events.emplace_back("[");
return true;
}
bool end_array()
{
events.emplace_back("]");
return true;
}
bool parse_error(std::size_t position, const std::string& last_token, const nlohmann::detail::exception& ex)
{
events.push_back("parse_error(" + std::to_string(position) + ", " + last_token + ", " + ex.what() + ")");
return false;
}
std::vector<std::string> events {}; // NOLINT(readability-redundant-member-init)
};
} // namespace
TEST_CASE("Binary formats with narrow number types from contiguous and non-contiguous input")
{
// contiguous input reads runs of numbers in one loop; a number that
// overflows number_float_t must be reported with the same position and
// last byte as when the input is read byte by byte
const json values = {1, 70000, -70000, 1.5, 2.5, 1e300, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5};
const json doubles = {1.5, 2.5, 3.5, 1e300, 4.5, 5.5, 6.5, 7.5, 8.5};
struct binary_input
{
const char* name;
json::input_format_t format;
bytes data;
};
const std::vector<binary_input> inputs =
{
{"CBOR", json::input_format_t::cbor, json::to_cbor(values)},
{"CBOR doubles", json::input_format_t::cbor, json::to_cbor(doubles)},
{"MessagePack", json::input_format_t::msgpack, json::to_msgpack(values)},
{"MessagePack doubles", json::input_format_t::msgpack, json::to_msgpack(doubles)},
{"UBJSON", json::input_format_t::ubjson, json::to_ubjson(values, true)},
{"UBJSON typed doubles", json::input_format_t::ubjson, json::to_ubjson(doubles, true, true)},
{"BJData", json::input_format_t::bjdata, json::to_bjdata(values, true)},
{"BJData typed doubles", json::input_format_t::bjdata, json::to_bjdata(doubles, true, true)},
};
for (const auto& input : inputs)
{
const std::string name = input.name;
CAPTURE(name)
const std::list<std::uint8_t> bytewise(input.data.begin(), input.data.end());
narrow_event_recorder from_contiguous;
narrow_event_recorder from_bytewise;
CHECK_FALSE(narrow_json::sax_parse(input.data, &from_contiguous, input.format));
CHECK_FALSE(narrow_json::sax_parse(bytewise.begin(), bytewise.end(), &from_bytewise, input.format));
CHECK(from_contiguous.events == from_bytewise.events);
REQUIRE(!from_contiguous.events.empty());
CHECK(from_contiguous.events.back().find("out_of_range.406") != std::string::npos);
}
}
+19
View File
@@ -1278,6 +1278,25 @@ TEST_CASE("BJData")
CHECK(j.dump() == "3.141592653589793"); CHECK(j.dump() == "3.141592653589793");
} }
SECTION("long floating-point number")
{
// the SAX parser receives the number text as it is in the
// input, also when it is longer than the part of a token
// that error messages show
const std::vector<std::size_t> lengths = {8192, 8193, 10000};
for (const auto length : lengths)
{
CAPTURE(length)
const std::string number = "1." + std::string(length - 2, '3');
std::vector<std::uint8_t> vec = {'H', 'I', static_cast<std::uint8_t>(length & 0xFF), static_cast<std::uint8_t>(length >> 8)};
vec.insert(vec.end(), number.begin(), number.end());
SaxEventLogger logger;
CHECK(json::sax_parse(vec, &logger, json::input_format_t::bjdata));
CHECK(logger.events == std::vector<std::string>({"number_float(" + number + ")"}));
CHECK(json::from_bjdata(vec).is_number_float());
}
}
SECTION("errors") SECTION("errors")
{ {
// error while parsing length // error while parsing length
+1 -1
View File
@@ -622,7 +622,7 @@ TEST_CASE("BON8")
// with a terminated string, strict = false leaves the next value in the stream // with a terminated string, strict = false leaves the next value in the stream
std::istringstream terminated(std::string("\x61\xFF\x90", 3)); std::istringstream terminated(std::string("\x61\xFF\x90", 3));
CHECK(json::from_bon8(terminated, false) == "a"); CHECK(json::from_bon8(terminated, false) == "a");
CHECK((terminated.tellg() == 2)); CHECK(static_cast<std::streamoff>(terminated.tellg()) == 2);
CHECK(json::from_bon8(terminated, false) == 0); CHECK(json::from_bon8(terminated, false) == 0);
// without the terminator, the next value would be lost // without the terminator, the next value would be lost
+17 -5
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
#include "doctest_compatibility.h" #include "doctest_compatibility.h"
// capture whether JSON_STRICT_NUL_HANDLING was enabled on the command line // capture whether JSON_STRICT_NUL_HANDLING was enabled on the command line
@@ -34,6 +41,7 @@ using nlohmann::json;
#include <fstream> #include <fstream>
#include <iterator> #include <iterator>
#include <list> #include <list>
#include <random>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <utility> #include <utility>
@@ -517,6 +525,7 @@ TEST_CASE("parser class")
CHECK(json::accept(u"[1]")); CHECK(json::accept(u"[1]"));
CHECK(json::parse(U"[1]") == json({1})); CHECK(json::parse(U"[1]") == json({1}));
CHECK(json::accept(U"[1]")); CHECK(json::accept(U"[1]"));
// JSON_HAS_CPP_20 (do not remove; see note at top of file)
#if defined(__cpp_char8_t) #if defined(__cpp_char8_t)
CHECK(json::parse(u8"[1]") == json({1})); CHECK(json::parse(u8"[1]") == json({1}));
CHECK(json::accept(u8"[1]")); CHECK(json::accept(u8"[1]"));
@@ -2502,7 +2511,7 @@ TEST_CASE("text of float tokens")
std::vector<std::string> result; std::vector<std::string> result;
std::copy_if(events.begin(), events.end(), std::back_inserter(result), [](const std::string & e) std::copy_if(events.begin(), events.end(), std::back_inserter(result), [](const std::string & e)
{ {
return e.compare(0, 13, "number_float(") == 0; return e.compare(0, 13, "number_float(") == 0; // NOLINT(modernize-use-starts-ends-with): C++11
}); });
return result; return result;
}; };
@@ -2867,13 +2876,16 @@ TEST_CASE("diagnostic positions: value lifetime, input adapters, and SAX")
SECTION("std::ifstream: positions are consistent, not npos") SECTION("std::ifstream: positions are consistent, not npos")
{ {
const std::string s = R"({"a":1,"b":2})"; const std::string s = R"({"a":1,"b":2})";
// the C++11 and C++20 builds of this test run in parallel in the same directory
std::random_device rd;
const std::string temp_name = "unit-class_parser_diagnostic_positions-" + std::to_string(rd()) + ".tmp";
{ {
std::ofstream file("unit-class_parser_diagnostic_positions.tmp"); std::ofstream file(temp_name);
file << s; file << s;
} }
{ {
std::ifstream f("unit-class_parser_diagnostic_positions.tmp"); std::ifstream f(temp_name);
const json j = json::parse(f); const json j = json::parse(f);
CHECK(j.start_pos() == 0); CHECK(j.start_pos() == 0);
@@ -2881,7 +2893,7 @@ TEST_CASE("diagnostic positions: value lifetime, input adapters, and SAX")
CHECK(j["a"].start_pos() == 5); CHECK(j["a"].start_pos() == 5);
} }
static_cast<void>(std::remove("unit-class_parser_diagnostic_positions.tmp")); static_cast<void>(std::remove(temp_name.c_str()));
} }
SECTION("iterator-pair input: positions are consistent, not npos") SECTION("iterator-pair input: positions are consistent, not npos")
@@ -3103,7 +3115,7 @@ TEST_CASE("object keys are delivered decoded and validated")
std::vector<std::string> keys; std::vector<std::string> keys;
for (const auto& e : l.events) for (const auto& e : l.events)
{ {
if (e.compare(0, 4, "key(") == 0) if (e.compare(0, 4, "key(") == 0) // NOLINT(modernize-use-starts-ends-with): C++11
{ {
keys.push_back(e.substr(4, e.size() - 5)); keys.push_back(e.substr(4, e.size() - 5));
} }
+30
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
#include "doctest_compatibility.h" #include "doctest_compatibility.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@@ -17,6 +24,7 @@
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
// JSON_HAS_CPP_20 (do not remove; see note at top of file)
#if JSON_HAS_THREE_WAY_COMPARISON #if JSON_HAS_THREE_WAY_COMPARISON
#include <compare> #include <compare>
#endif #endif
@@ -483,3 +491,25 @@ TEST_CASE("custom number types: 32-bit integers in the binary formats")
CHECK(json32::to_msgpack(values) == nlohmann::json::to_msgpack(values64)); CHECK(json32::to_msgpack(values) == nlohmann::json::to_msgpack(values64));
CHECK(json32::to_ubjson(values) == nlohmann::json::to_ubjson(values64)); CHECK(json32::to_ubjson(values) == nlohmann::json::to_ubjson(values64));
} }
TEST_CASE("custom number types: binary subtypes wider than the integer types")
{
// the subtype of a binary value is a std::uint64_t, whatever the number types are
using json8 = nlohmann::json::with_integers_t<std::int8_t, std::uint8_t>;
using json16 = nlohmann::json::with_integers_t<std::int16_t, std::uint16_t>;
using json32 = nlohmann::json::with_integers_t<std::int32_t, std::uint32_t>;
const std::uint64_t max_uint64 = (std::numeric_limits<std::uint64_t>::max)();
CHECK(json8::binary({1}, 300).dump() == "{\"bytes\":[1],\"subtype\":300}");
CHECK(json8::binary({200}, 255).dump() == "{\"bytes\":[200],\"subtype\":255}");
CHECK(json16::binary({1}, 65543).dump() == "{\"bytes\":[1],\"subtype\":65543}");
CHECK(json32::binary({1}, 4294967301u).dump() == "{\"bytes\":[1],\"subtype\":4294967301}");
CHECK(json32::binary({1}, max_uint64).dump() == "{\"bytes\":[1],\"subtype\":18446744073709551615}");
CHECK(json32::binary({1}, 0).dump() == "{\"bytes\":[1],\"subtype\":0}");
CHECK(json32::binary({1}, 4294967301u).dump(1) == "{\n \"bytes\": [1],\n \"subtype\": 4294967301\n}");
CHECK(json8::binary({1}).dump() == "{\"bytes\":[1],\"subtype\":null}");
// unchanged for the default number types
CHECK(nlohmann::json::binary({1}, 4294967301u).dump() == "{\"bytes\":[1],\"subtype\":4294967301}");
CHECK(nlohmann::json::binary({1}, max_uint64).dump(1) == "{\n \"bytes\": [1],\n \"subtype\": 18446744073709551615\n}");
}
+11 -4
View File
@@ -830,13 +830,13 @@ TEST_CASE("iterators 2")
{ {
{ {
auto it = j_object.rbegin(); auto it = j_object.rbegin();
CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
} }
{ {
auto it = j_object.crbegin(); auto it = j_object.crbegin();
CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&); CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
} }
} }
@@ -850,6 +850,7 @@ TEST_CASE("iterators 2")
CHECK(it[3] == json(3)); CHECK(it[3] == json(3));
CHECK(it[4] == json(2)); CHECK(it[4] == json(2));
CHECK(it[5] == json(1)); CHECK(it[5] == json(1));
CHECK((j_array.rbegin() + 2)[1] == json(3));
} }
{ {
auto it = j_array.crbegin(); auto it = j_array.crbegin();
@@ -859,6 +860,7 @@ TEST_CASE("iterators 2")
CHECK(it[3] == json(3)); CHECK(it[3] == json(3));
CHECK(it[4] == json(2)); CHECK(it[4] == json(2));
CHECK(it[5] == json(1)); CHECK(it[5] == json(1));
CHECK((j_array.crbegin() + 2)[3] == json(1));
} }
} }
@@ -888,6 +890,11 @@ TEST_CASE("iterators 2")
CHECK(it[0] == json(42)); CHECK(it[0] == json(42));
CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&); CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
} }
CHECK(json(1).rbegin()[0] == json(1));
CHECK_THROWS_WITH_AS(json(1).rbegin()[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
CHECK(json(1).crbegin()[0] == json(1));
CHECK_THROWS_WITH_AS(json(1).crbegin()[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
} }
} }
} }
+9 -1
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
#include "doctest_compatibility.h" #include "doctest_compatibility.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@@ -272,6 +279,7 @@ struct generator
TEST_CASE("json_view string_ref") TEST_CASE("json_view string_ref")
{ {
// std::string_view in C++17, a stand-in with the same members before // std::string_view in C++17, a stand-in with the same members before
// JSON_HAS_CPP_17 (do not remove; see note at top of file)
using nlohmann::detail::view::string_ref; using nlohmann::detail::view::string_ref;
const std::string text = "abc"; const std::string text = "abc";
const string_ref r(text); const string_ref r(text);
@@ -945,7 +953,7 @@ TEST_CASE("json_view document_data::holds() (the debug check of read())")
SECTION("current edit buffer") SECTION("current edit buffer")
{ {
d->edits.reset(new document_data::edit_state()); // NOLINT(cppcoreguidelines-owning-memory) d->edits.reset(new document_data::edit_state()); // NOLINT(cppcoreguidelines-owning-memory,modernize-make-unique)
CHECK(!d->holds(other.data(), other.size())); CHECK(!d->holds(other.data(), other.size()));
d->edits->texts.emplace_back(new char[16]); // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-owning-memory) d->edits->texts.emplace_back(new char[16]); // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-owning-memory)
d->edits->text_cap = 16; d->edits->text_cap = 16;
+70
View File
@@ -589,6 +589,76 @@ TEST_CASE("json_view edits: a container that was added is replaced by a scalar")
CHECK(d.root().materialize() == json::parse(R"({"a":[1,6,{"k":"s"}]})")); CHECK(d.root().materialize() == json::parse(R"({"a":[1,6,{"k":"s"}]})"));
} }
TEST_CASE("json_view edits: a scalar replaces an array or object that is no longer part of the document")
{
// the dropped container that the array/object is in still steps over its
// parsed extent: that container switches to links first, as a live one does
SECTION("members of an erased object")
{
json_editable_document d = json_editable_document::parse(R"({"p": {"a": [1, [2]], "b": 3, "e": []}, "q": 0})");
const json_editable_view p = d.root()["p"];
const json_editable_view a = p["a"];
d.erase(d.root(), "p");
d.set(a[1], 5);
CHECK(p.dump() == R"({"a":[1,5],"b":3,"e":[]})");
d.set(a, 5);
CHECK(p.size() == 3);
CHECK(p.dump() == R"({"a":5,"b":3,"e":[]})");
d.push_back(p["e"], 6);
CHECK(p.dump() == R"({"a":5,"b":3,"e":[6]})");
CHECK(d.root().dump() == R"({"q":0})");
}
SECTION("an array whose elements moved")
{
json_editable_document d = json_editable_document::parse(R"({"p": {"a": [1, 2], "b": 3}, "q": 0})");
const json_editable_view p = d.root()["p"];
const json_editable_view a = p["a"];
d.erase(d.root(), "p");
d.push_back(a, 4); // (the extent of a stays)
d.set(a, 5);
CHECK(p.dump() == R"({"a":5,"b":3})");
CHECK(d.root().dump() == R"({"q":0})");
}
SECTION("an element of an erased array, which grows afterwards")
{
json_editable_document d = json_editable_document::parse(R"({"p": [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], "q": 0})");
const json_editable_view p = d.root()["p"];
d.erase(d.root(), "p");
d.set(p[0], 5);
d.push_back(p, 1);
CHECK(p.dump() == "[5,1]");
CHECK(d.root().dump() == R"({"q":0})");
}
SECTION("values in an erased new value")
{
json_editable_document d = json_editable_document::parse("[0]");
const json_editable_view x = d.push_back(d.root(), json::parse("[[[1, 2]], 3]"));
const json_editable_view y = x[0];
d.erase(d.root(), 1);
d.set(y[0], 5);
CHECK(x.dump() == "[[5],3]");
d.set(y, 5);
CHECK(x.dump() == "[5,3]");
CHECK(d.root().dump() == "[0]");
}
SECTION("values in the elements that an array had before it was replaced")
{
json_editable_document d = json_editable_document::parse("[0]");
d.set(d.root()[0], json::parse("[[[1, 2]]]"));
const json_editable_view y = d.root()[0][0];
d.set(d.root()[0], json::array({3}));
d.set(y[0], 5);
CHECK(y.dump() == "[5]");
d.set(y, 5);
CHECK(y.dump() == "5");
CHECK(d.root().dump() == "[[3]]");
}
}
#if !defined(JSON_NOEXCEPTION) #if !defined(JSON_NOEXCEPTION)
TEST_CASE("json_view edits: the size of a text arena") TEST_CASE("json_view edits: the size of a text arena")
{ {
+8
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
#include "doctest_compatibility.h" #include "doctest_compatibility.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@@ -348,6 +355,7 @@ static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<unsigned c
static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<wchar_t>::value, "wchar_t is refused"); static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<wchar_t>::value, "wchar_t is refused");
static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<char16_t>::value, "char16_t is refused"); static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<char16_t>::value, "char16_t is refused");
static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<char32_t>::value, "char32_t is refused"); static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<char32_t>::value, "char32_t is refused");
// JSON_HAS_CPP_20 (do not remove; see note at top of file)
#if defined(__cpp_char8_t) #if defined(__cpp_char8_t)
static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<char8_t>::value, "char8_t is refused"); static_assert(nlohmann::detail::recursion_depth_limit_is_char_or_bool<char8_t>::value, "char8_t is refused");
#endif #endif
+12 -1
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
#include "doctest_compatibility.h" #include "doctest_compatibility.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@@ -23,8 +30,11 @@ using nlohmann::json;
#include <valarray> #include <valarray>
#include <vector> #include <vector>
// JSON_HAS_CPP_17 (do not remove; see note at top of file)
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) #if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1)
#if __has_include(<filesystem>) // libstdc++ 8 needs -lstdc++fs for std::filesystem (GCC bug 90050), which clang on such a
// libstdc++ does not get from the test options
#if __has_include(<filesystem>) && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 9)
#include <filesystem> #include <filesystem>
#define TO_JSON_RVALUE_HAS_FS 1 #define TO_JSON_RVALUE_HAS_FS 1
#endif #endif
@@ -244,6 +254,7 @@ TEST_CASE("to_json from rvalue containers")
SECTION("std::filesystem::path rvalue is still a string") SECTION("std::filesystem::path rvalue is still a string")
{ {
CHECK(json(std::filesystem::path("a/b")) == json("a/b")); CHECK(json(std::filesystem::path("a/b")) == json("a/b"));
// JSON_HAS_CPP_20 (do not remove; see note at top of file)
#ifdef __cpp_lib_char8_t #ifdef __cpp_lib_char8_t
CHECK(json(std::u8string(u8"a/b")) == json("a/b")); CHECK(json(std::u8string(u8"a/b")) == json("a/b"));
#endif #endif
+19
View File
@@ -793,6 +793,25 @@ TEST_CASE("UBJSON")
CHECK(j.dump() == "3.141592653589793"); CHECK(j.dump() == "3.141592653589793");
} }
SECTION("long floating-point number")
{
// the SAX parser receives the number text as it is in the
// input, also when it is longer than the part of a token
// that error messages show
const std::vector<std::size_t> lengths = {8192, 8193, 10000};
for (const auto length : lengths)
{
CAPTURE(length)
const std::string number = "1." + std::string(length - 2, '3');
std::vector<std::uint8_t> vec = {'H', 'I', static_cast<std::uint8_t>(length >> 8), static_cast<std::uint8_t>(length & 0xFF)};
vec.insert(vec.end(), number.begin(), number.end());
SaxEventLogger logger;
CHECK(json::sax_parse(vec, &logger, json::input_format_t::ubjson));
CHECK(logger.events == std::vector<std::string>({"number_float(" + number + ")"}));
CHECK(json::from_ubjson(vec).is_number_float());
}
}
SECTION("errors") SECTION("errors")
{ {
// error while parsing length // error while parsing length
+10 -2
View File
@@ -6,6 +6,13 @@
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// cmake/test.cmake selects the C++ standard versions with which to build a
// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
// When using macros that are only defined for particular versions of the standard
// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
// version macro in a comment close by, like this:
// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
// The budget for the elements of the UBJSON containers of a valueless type // The budget for the elements of the UBJSON containers of a valueless type
// ('Z', 'T', 'F') of a whole input: 1048576 plus // ('Z', 'T', 'F') of a whole input: 1048576 plus
// JSON_UBJSON_VALUELESS_ELEMENTS_PER_BYTE for every byte read (see // JSON_UBJSON_VALUELESS_ELEMENTS_PER_BYTE for every byte read (see
@@ -92,6 +99,7 @@ static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<unsigned
static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<wchar_t>::value, "wchar_t is refused"); static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<wchar_t>::value, "wchar_t is refused");
static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<char16_t>::value, "char16_t is refused"); static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<char16_t>::value, "char16_t is refused");
static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<char32_t>::value, "char32_t is refused"); static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<char32_t>::value, "char32_t is refused");
// JSON_HAS_CPP_20 (do not remove; see note at top of file)
#if defined(__cpp_char8_t) #if defined(__cpp_char8_t)
static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<char8_t>::value, "char8_t is refused"); static_assert(nlohmann::detail::valueless_elements_rate_is_char_or_bool<char8_t>::value, "char8_t is refused");
#endif #endif
@@ -230,8 +238,8 @@ TEST_CASE("UBJSON the valueless elements of a whole input are bounded")
std::vector<std::uint8_t> input = {'['}; std::vector<std::uint8_t> input = {'['};
utils::append_valueless_array(input, 'Z', first_count); utils::append_valueless_array(input, 'Z', first_count);
input.insert(input.end(), {'[', '$', 'U', '#', 'l', input.insert(input.end(), {'[', '$', 'U', '#', 'l',
static_cast<std::uint8_t>(payload >> 24), static_cast<std::uint8_t>(payload >> 16), static_cast<std::uint8_t>((payload >> 24) & 0xFFu), static_cast<std::uint8_t>((payload >> 16) & 0xFFu),
static_cast<std::uint8_t>(payload >> 8), static_cast<std::uint8_t>(payload) static_cast<std::uint8_t>((payload >> 8) & 0xFFu), static_cast<std::uint8_t>(payload & 0xFFu)
}); });
input.insert(input.end(), payload, 0x01); input.insert(input.end(), payload, 0x01);
utils::append_valueless_array(input, 'Z', count); utils::append_valueless_array(input, 'Z', count);
+30 -19
View File
@@ -15,6 +15,7 @@ using nlohmann::json;
#include <fstream> #include <fstream>
#include <random> #include <random>
#include <string> #include <string>
#include <vector>
#include "make_test_data_available.hpp" #include "make_test_data_available.hpp"
#include "test_utils.hpp" #include "test_utils.hpp"
@@ -265,39 +266,50 @@ TEST_CASE("Unicode")
CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800\\uE000\""), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'", json::parse_error&); CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800\\uE000\""), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'", json::parse_error&);
} }
}
#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
SECTION("incorrect sequences")
{
SECTION("high surrogate without low surrogate") SECTION("high surrogate without low surrogate")
{ {
// D800..DBFF are high surrogates and must be followed by low // D800..DBFF are high surrogates and must be followed by low
// surrogates DC00..DFFF; here, nothing follows // surrogates DC00..DFFF; here, nothing follows
json _;
for (std::size_t cp = 0xD800u; cp <= 0xDBFFu; ++cp) for (std::size_t cp = 0xD800u; cp <= 0xDBFFu; ++cp)
{ {
std::string json_text = "\"" + codepoint_to_unicode(cp) + "\""; const std::string json_text = "\"" + codepoint_to_unicode(cp) + "\"";
CAPTURE(json_text) CAPTURE(json_text)
CHECK_THROWS_AS(json::parse(json_text), json::parse_error&); CHECK_THROWS_AS(_ = json::parse(json_text), json::parse_error&);
} }
} }
SECTION("high surrogate with wrong low surrogate") SECTION("high surrogate with wrong low surrogate")
{ {
// D800..DBFF are high surrogates and must be followed by low // D800..DBFF are high surrogates and must be followed by low
// surrogates DC00..DFFF; here a different sequence follows // surrogates DC00..DFFF; here a different code unit follows.
// All pairs would be 1024 * 64512 parses, so every high
// surrogate is paired with the boundaries of the ranges around
// DC00..DFFF, and one high surrogate with every code unit
// (with accept(), which does not throw and is much faster)
const auto escaped_pair = [&](std::size_t cp1, std::size_t cp2)
{
return "\"" + codepoint_to_unicode(cp1) + codepoint_to_unicode(cp2) + "\"";
};
const std::vector<std::size_t> boundaries = {0x0000u, 0x0041u, 0xD7FFu, 0xD800u, 0xDBFFu, 0xE000u, 0xFFFFu};
json _;
for (std::size_t cp1 = 0xD800u; cp1 <= 0xDBFFu; ++cp1) for (std::size_t cp1 = 0xD800u; cp1 <= 0xDBFFu; ++cp1)
{ {
for (std::size_t cp2 = 0x0000u; cp2 <= 0xFFFFu; ++cp2) for (const std::size_t cp2 : boundaries)
{ {
if (0xDC00u <= cp2 && cp2 <= 0xDFFFu) const std::string json_text = escaped_pair(cp1, cp2);
{
continue;
}
std::string json_text = "\"" + codepoint_to_unicode(cp1) + codepoint_to_unicode(cp2) + "\"";
CAPTURE(json_text) CAPTURE(json_text)
CHECK_THROWS_AS(json::parse(json_text), json::parse_error&); CHECK_THROWS_AS(_ = json::parse(json_text), json::parse_error&);
}
}
for (std::size_t cp2 = 0x0000u; cp2 <= 0xFFFFu; ++cp2)
{
if (cp2 < 0xDC00u || cp2 > 0xDFFFu)
{
const std::string json_text = escaped_pair(0xDA00u, cp2);
CAPTURE(json_text)
CHECK_FALSE(json::accept(json_text));
} }
} }
} }
@@ -306,16 +318,15 @@ TEST_CASE("Unicode")
{ {
// low surrogates DC00..DFFF must follow high surrogates; here, // low surrogates DC00..DFFF must follow high surrogates; here,
// they occur alone // they occur alone
json _;
for (std::size_t cp = 0xDC00u; cp <= 0xDFFFu; ++cp) for (std::size_t cp = 0xDC00u; cp <= 0xDFFFu; ++cp)
{ {
std::string json_text = "\"" + codepoint_to_unicode(cp) + "\""; const std::string json_text = "\"" + codepoint_to_unicode(cp) + "\"";
CAPTURE(json_text) CAPTURE(json_text)
CHECK_THROWS_AS(json::parse(json_text), json::parse_error&); CHECK_THROWS_AS(_ = json::parse(json_text), json::parse_error&);
} }
} }
} }
#endif
} }
SECTION("read all unicode characters") SECTION("read all unicode characters")