amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-10 16:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,466 Commits 55 Branches 57 Tags
ce1b1918a3def1b889112ce555a6c44e26b7ad44
Commit Graph
5466 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann ce1b1918a3 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:51:08 +02:00
Niels Lohmann 93d1886e3e Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:51:06 +02:00
Niels Lohmann 6c773bc883 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:51:03 +02:00
Niels Lohmann 6e0f054d18 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:51:01 +02:00
Niels Lohmann 72a61f0f16 Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:50:58 +02:00
Niels Lohmann d7299cc423 Merge branch 'json-view/23-zmij' into json-view/08-view-builder 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:50:56 +02:00
Niels Lohmann e83e547b71 Merge branch 'json-view/02b-float-parser' into json-view/23-zmij 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:50:45 +02:00
Niels Lohmann a8bbc365d5 Merge branch 'develop' into json-view/02b-float-parser 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:50:34 +02:00
Niels Lohmann 37f68c5779 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:15 +02:00
Niels Lohmann 3ae177da4e Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:12 +02:00
Niels Lohmann 4bc402ecc1 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:10 +02:00
Niels Lohmann f4c1211251 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:08 +02:00
Niels Lohmann a2c9c260ad Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:05 +02:00
Niels Lohmann 75472d6e40 Trigger a new mergeability check of the json_view pull requests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:03 +02:00
Niels Lohmann ad4680a7a4 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:57 +02:00
Niels Lohmann efafdd3420 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:54 +02:00
Niels Lohmann 6dd4323006 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:52 +02:00
Niels Lohmann 5be292e0ae Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:49 +02:00
Niels Lohmann fb9be5de2f Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:47 +02:00
Niels Lohmann fcdf945eee Check the steps of the deep-nesting test separately 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:37 +02:00
Niels Lohmann 07ec1a4e31 Generate the docset index and pages with Python (#5799) 
Replace the hand-maintained docs/docset/docSet.sql and the bash/sed
Makefile recipe with docs/docset/generate_docset.py:

- The search index is generated from the mkdocs.yml nav and each page's
  H1 and declaration. Pages documenting several entities (e.g.
  JSON_HAS_CPP_11..26) get one entry per name; all non-API pages become
  guides. New API pages no longer need a manual entry.
- Page titles are set from the index names.
- The docset is self-contained: the mermaid loader no longer points to
  https://json.nlohmann.me/assets/..., the repository widget no longer
  queries api.github.com, remaining remote images are downloaded, and
  the build fails if any remote resource load remains.
- The CSS that hides the site navigation now uses Material's classes;
  the element selectors lost against them, so the header was shown.

check_structure.py's docset check is replaced by running the generator
in `make style_check`.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:10:11 +02:00
Niels Lohmann 5e84bf6814 Fix the indentation of a loop in the image test 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:43:14 +02:00
Niels Lohmann 5cfafc2478 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:43:14 +02:00
Niels Lohmann 9d45c82470 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:41:00 +02:00
Niels Lohmann 743517f996 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:38:43 +02:00
Niels Lohmann fc0d39ca9d Split the dump and comparison tests off unit-json_view.cpp 
The MinGW linker of the Windows clang jobs cannot link object files with more
than 32767 sections ("relocation truncated to fit: IMAGE_REL_AMD64_REL32
against `.rdata'"). unit-json_view.cpp reaches that limit as the stack
grows, so its "json_view dump" and "json_view comparison" test cases move
into unit-json_view_dump.cpp. The test generator and has_duplicate_keys()
that both files use move into json_view_test_helpers.hpp.

The new file mentions JSON_HAS_CPP_17, so it is built for C++17 like the file
it was split from.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:34:42 +02:00
Niels Lohmann 90c6696641 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:31:33 +02:00
Niels Lohmann 25b25ece96 Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:30:00 +02:00
Niels Lohmann 2f81bec10f Merge branch 'json-view/23-zmij' into json-view/08-view-builder 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:28:29 +02:00
Niels Lohmann e26967139e Merge branch 'json-view/02b-float-parser' into json-view/23-zmij 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:25:50 +02:00
Niels Lohmann 7355b090af Keep a raw string with a backslash out of a CHECK (MSVC C2017) 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:10:48 +02:00
Niels Lohmann e6f9f6b07a Fix MSVC C4244 and C2017 in the image test 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:09:24 +02:00
Niels Lohmann 1c79a536d1 Index strings with size_t in the colliding-keys test (MSVC C4244 on Win32) 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:09:16 +02:00
Niels Lohmann 571b655357 Silence MSVC C4127 for a platform-constant check in the to_chars test 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:08:03 +02:00
Niels Lohmann 3caf0e7cdb Mark the unsigned long of the MSVC bit scans for cpplint 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:07:53 +02:00
Niels Lohmann c8ab9bf991 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:18 +02:00
Niels Lohmann 679672c9af Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:14 +02:00
Niels Lohmann a241f67eb1 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:12 +02:00
Niels Lohmann bae4148a78 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:09 +02:00
Niels Lohmann 8d3272e93b Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:06 +02:00
Niels Lohmann 7ee91c7d91 Suppress Flawfinder's read() finding on the deleted overload 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:43:48 +02:00
Niels Lohmann 98c5e8b994 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:24:42 +02:00
Niels Lohmann 5f54533da3 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:21:20 +02:00
Niels Lohmann 43624a81fa Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:17:51 +02:00
Niels Lohmann 23ade0e9f9 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:14:55 +02:00
Niels Lohmann c2810ffe3d Avoid GCC useless-cast warnings in the integer index tests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:11:49 +02:00
Niels Lohmann 14be5361ea Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:01:49 +02:00
Niels Lohmann 9144cd7bf0 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:50:10 +02:00
Niels Lohmann 525787a2f7 Avoid GCC useless-cast and strict-overflow warnings in unit-json_view.cpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:46:20 +02:00
Niels Lohmann 7de40707dd Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:41:21 +02:00