354 Commits

Author	SHA1	Message	Date
chirsz	4b17f90f65	Add ignore_trailing_commas option (#4609) ... Added examples and modified the corresponding documents and unit tests. Signed-off-by: chirsz-ever <chirsz-ever@outlook.com> Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>	2025-05-22 08:01:46 +02:00
Niels Lohmann	828c891427	Extend type_name() to invalid type (#4786) ... * ✅ add regression test Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 💚 fix build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 📝 add comment Signed-off-by: Niels Lohmann <mail@nlohmann.me> --------- Signed-off-by: Niels Lohmann <mail@nlohmann.me>	2025-05-16 18:16:47 +02:00
Niels Lohmann	9110918cf8	Fix typos (#4748) ... * ✏️ fix typos Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ✏️ address review comments Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ✏️ address review comments Signed-off-by: Niels Lohmann <mail@nlohmann.me> --------- Signed-off-by: Niels Lohmann <mail@nlohmann.me>	2025-05-04 10:28:24 +02:00
Niels Lohmann	1705bfe914	🔖 set version to 3.12.0 (#4727) ... Signed-off-by: Niels Lohmann <mail@nlohmann.me>	2025-04-11 10:41:14 +02:00
Niels Lohmann	f06604fce0	Bump the copyright years (#4606) ... * 📄 bump the copyright years Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 📄 bump the copyright years Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 📄 bump the copyright years Signed-off-by: Niels Lohmann <niels.lohmann@gmail.com> --------- Signed-off-by: Niels Lohmann <mail@nlohmann.me> Signed-off-by: Niels Lohmann <niels.lohmann@gmail.com>	2025-01-19 17:04:17 +01:00
Nebojša Cvetković	2e50d5b2f3	BJData optimized binary array type (#4513)	2025-01-07 18:09:19 +01:00
Michael Valladolid	4f64d8d0b4	Modernize integer comparison (#4577) ... Replace static_cast<size_t>(-1) with std::numeric_limits<std::size_t>::max() via the detail::unknown_size() function	2025-01-01 17:01:38 +01:00
Niels Lohmann	6057b31df7	Overwork astyle call (#4573) ... * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * Use ubuntu-latest image to run Valgrind (#4575) * 🔧 use Clang image to run valgrind * 🔧 use Clang image to run valgrind * 🔧 use Clang image to run valgrind * 🔧 use Ubuntu image to run valgrind * Use Clang image to run iwyu (#4574) * 🔧 use Clang image to run iwyu * 🔧 use Clang image to run iwyu * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🔧 overwork astyle call * 🎨 format code * 🔨 clean up	2024-12-29 17:06:03 +01:00
Harinath Nampally	5ff90d9e02	fix diagnostic positions related compilation errors (#4570)	2024-12-28 16:22:45 +01:00
Sushrut Shringarputale	58f5f25968	json start/end position implementation (#4517) ... * Add implementation to retrieve start and end positions of json during parse * Add more unit tests and add start/stop parsing for arrays * Add raw value for all types * Add more tests and fix compiler warning * Amalgamate * Fix CLang GCC warnings * Fix error in build * Style using astyle 3.1 * Fix whitespace changes * revert * more whitespace reverts * Address PR comments * Fix failing issues * More whitespace reverts * Address remaining PR comments * Address comments * Switch to using custom base class instead of default basic_json * Adding a basic using for a json using the new base class. Also address PR comments and fix CI failures * Address decltype comments * Diagnostic positions macro (#4) Co-authored-by: Sush Shringarputale <sushring@linux.microsoft.com> * Fix missed include deletion * Add docs and address other PR comments (#5) * Add docs and address other PR comments --------- Co-authored-by: Sush Shringarputale <sushring@linux.microsoft.com> * Address new PR comments and fix CI tests for documentation * Update documentation based on feedback (#6) --------- Co-authored-by: Sush Shringarputale <sushring@linux.microsoft.com> * Address std::size_t and other comments * Fix new CI issues * Fix lcov * Improve lcov case with update to handle_diagnostic_positions call for discarded values * Fix indentation of LCOV_EXCL_STOP comments * fix amalgamation astyle issue --------- Co-authored-by: Sush Shringarputale <sushring@linux.microsoft.com>	2024-12-18 22:46:14 +01:00
Niels Lohmann	094bd2651b	Set parents after insert call (#4537) ... * 🐛 set parents after insert call * 🚨 fix warning	2024-12-18 09:44:09 +01:00
Niels Lohmann	30cd44df95	Clean up CI (#4553) ... * 💚 overwork cppcheck * 🔒 adjust permissions * 💚 fixes * 💚 fixes	2024-12-17 18:58:05 +01:00
Niels Lohmann	620034ecec	♻️ allow patch and diff to be used with arbitrary string types (#4536)	2024-12-13 07:24:50 +01:00
Niels Lohmann	9f60e85557	Fix return value of get_ptr for unsigned integers (#4525) ... * 🐛 fix return value of get_ptr for unsigned integers * 📝 update documentation	2024-12-06 18:38:25 +01:00
Niels Lohmann	1b9a9d1f21	Update licenses (#4521) ... * 📄 update licenses * 📄 update licenses	2024-11-29 17:38:42 +01:00
Niels Lohmann	1825117e63	Another desperate try to fix the CI (#4489) ... * 🚨 fix warning * 💚 update actions * 🚨 fix warning * 🚨 fix warning * 🚨 fix warning * 💚 update actions * 💚 update actions * 🚨 fix warning * 🚨 fix warning * 💚 update actions * 🚨 fix warning * 💚 update actions * 💚 update actions * 💚 update actions * 🚨 fix warning * 🚨 fix warning * 🚨 fix warning * 🚨 fix warning * 💚 update actions * 💚 update actions * 🚨 fix warning * 💚 update actions * 💚 update actions * 💚 update actions * 💚 update actions * 💚 update actions	2024-11-13 10:21:26 +01:00
Niels Lohmann	c35d260c2f	Suppress Clang-Tidy warnings (#4276)	2024-01-28 14:04:07 +01:00
Niels Lohmann	9cca280a4d	JSON for Modern C++ 3.11.3 (#4222)	2023-11-28 22:36:31 +01:00
Niels Lohmann	f56c6e2e30	Update documentation for the next release (#4216)	2023-11-26 15:51:19 +01:00
alferov	6d4b72d3c3	Fix compile error with _HAS_STATIC_RTTI=0 (#4046)	2023-09-24 11:23:41 +02:00
Niels Lohmann	bbd2e1636d	Fix deprecation warning (#4161)	2023-09-23 20:16:37 +02:00
tomalakgeretkal	6e36c721f0	Fixed init-list construction when size_type is not int (#4140)	2023-09-23 17:21:40 +02:00
Niels Lohmann	836b7beca4	Fix CI, again (#4083)	2023-09-07 20:41:12 +02:00
Niels Lohmann	a0c1318830	Fix CI + new Doctest (#3985)	2023-05-21 17:23:18 +02:00
Raphael Grimm	bbe337c3a3	Prevent memory leak when exception is thrown in adl_serializer::to_json (#3901) ... Co-authored-by: barcode <barcode@example.com>	2023-03-08 13:43:45 +01:00
Niels Lohmann	58bd97e2b1	Add clang-tools to required tools for ci_static_analysis_clang (#3724) ... * 💚 add clang-tools to required tools for ci_static_analysis_clang * 🚨 update Clang-Tidy warning selection * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings (#3738) * ⏪ revert fix * ⏪ revert fix * 🚨 fix Clang-Tidy warnings (#3739) Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>	2022-09-13 12:58:26 +02:00
Florian Albrechtskirchinger	307c053b9b	Add missing <numeric> include (#3719)	2022-08-30 20:55:47 +02:00
Raphael Grimm	bed648ca55	Allow custom base class as node customization point (#3110) ... Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com> Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com> Co-authored-by: barcode <barcode@example.com>	2022-08-28 13:59:07 +02:00
Niels Lohmann	f7973f46d6	Use official Clang/GCC containers (#3703)	2022-08-27 17:28:50 +02:00
Niels Lohmann	9d69186291	🔖 set version to 3.11.2	2022-08-12 15:04:06 +02:00
Florian Albrechtskirchinger	dae5412268	Properly constrain non-string json_pointer overloads (#3681) ... Thanks, @alex-700, for reminding me.	2022-08-07 13:55:09 +02:00
Florian Albrechtskirchinger	0c7a18374c	Reimplement value() access functions (#3663) ... * Reimplement value() access functions * Merges the 'const char *' with the 'ValueType &&' overloads. * Fixes ambiguities when default value is 0. * Fixes 'no matching function' error when specifying ValueType template parameter. * Fixes incorrect template parameter order in previous overloads. * Add additional value() tests * Make JSON_MultipleHeaders visible to unit tests Define the macro JSON_TEST_USING_MULTIPLE_HEADERS to 0/1 depending on JSON_MultipleHeaders. * Add type_traits unit test * Update documentation	2022-08-07 13:54:55 +02:00
Niels Lohmann	f2020da0dd	🔖 set version to 3.11.1	2022-08-01 23:27:58 +02:00
Florian Albrechtskirchinger	cbaf1033be	Fix global UDLs (#3646) ... * Add ci_test_noglobaludls to CI * Really default JSON_GLOBAL_UDLS to 1 * Test global UDLs * Suppress warnings * Clarify documentation	2022-08-01 22:42:35 +02:00
Niels Lohmann	ce0e13ccea	🔖 set version to 3.11.0	2022-07-31 23:19:06 +02:00
Florian Albrechtskirchinger	9aafcbe965	Move UDLs out of the global namespace (#3605) ... * Move UDLs into nlohmann::literals::json_literals namespace * Add 'using namespace' to unit tests * Add 'using namespace' to examples * Add 'using namespace' to README * Move UDL mkdocs pages out of basic_json/ * Update documentation * Update docset index * Add JSON_GlobalUDLs CMake option * Add unit test * Build examples without global UDLs * Add CI target	2022-07-31 17:38:52 +02:00
Florian Albrechtskirchinger	d909f80960	Add versioned, ABI-tagged inline namespace and namespace macros (#3590) ... * Add versioned inline namespace Add a versioned inline namespace to prevent ABI issues when linking code using multiple library versions. * Add namespace macros * Encode ABI information in inline namespace Add _diag suffix to inline namespace if JSON_DIAGNOSTICS is enabled, and _ldvcmp suffix if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON is enabled. * Move ABI-affecting macros into abi_macros.hpp * Move std_fs namespace definition into std_fs.hpp * Remove std_fs namespace from unit test * Format more files in tests directory * Add unit tests * Update documentation * Fix GDB pretty printer * fixup! Add namespace macros * Derive ABI prefix from NLOHMANN_JSON_VERSION_*	2022-07-30 21:59:13 +02:00
Florian Albrechtskirchinger	fca1ddda96	Fix patch::add creating nonexistent parents (#3628) ... * Fix patch::add creating nonexistent parents The previous behavior was not in accordance with RFC6902. Add unit test. Fixes #3134. * Fix incorrect JSON patch unit test Co-authored-by: Hudson00 <yagdhscdasg@gmail.com>	2022-07-30 21:23:55 +02:00
Florian Albrechtskirchinger	a714381a5f	Use swap() by ADL (#3609) ... * Use swap() by ADL * Add type to swap() exception messages	2022-07-28 21:51:45 +02:00
Wolf Vollprecht	09fb4819ff	add patch_inplace function (#3581) ... * add patch_inplace function to json class * add documentation * fix up docs	2022-07-21 16:27:59 +02:00
Niels Lohmann	527da54dcb	Use REUSE framework (#3546) ... * 📄 add licenses * 👷 add REUSE compliance check * 📝 add badge for REUSE Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>	2022-07-20 12:38:07 +02:00
Florian Albrechtskirchinger	7d361ec8ef	Add overloads for more key types to ordered_map and fix ordered_map::erase(first, last) with first == last (#3564) ... * Add overloads for more key types to ordered_map Add overloads to accept additional key types defined by type trait detail::is_usable_as_key_type to ordered_map. The same key types that can be used with json can now also be used with ordered_json. * Fix ordered_map::erase(first, last) with first == last * Modify element access unit test to also test ordered_json	2022-07-04 19:58:19 +02:00
ivanovmp	7c65b5cdbd	Update json.hpp (#3499) ... * Update json.hpp * Remove a space	2022-06-06 13:01:46 +02:00
Florian Albrechtskirchinger	7a6e28acfa	Add assertion to converting constructor (#3517) ... The converting basic_json constructor can inadvertently change the value type of its parameter. Assert that both basic_json values are of the same value type after conversion.	2022-06-03 21:05:44 +02:00
Florian Albrechtskirchinger	6b97599a27	Fix C++20/gcc-12 issues (Part 2) (#3446) ... * Add C++20 3-way comparison operator and fix broken comparisons Fixes #3207. Fixes #3409. * Fix iterators to meet (more) std::ranges requirements Fixes #3130. Related discussion: #3408 * Add note about CMake standard version selection to unit tests Document how CMake chooses which C++ standard version to use when building tests. * Update documentation * CI: add legacy discarded value comparison * Fix internal linkage errors when building a module	2022-05-29 13:08:06 +02:00
Niels Lohmann	6a7392058e	Complete documentation for 3.11.0 (#3464) ... * 👥 update contributor and sponsor list * 🚧 document BJData format * 🚧 document BJData format * 📝 clarified documentation of [json.exception.parse_error.112] * ✏️ adjust titles * 📝 add more examples * 🚨 adjust warnings for index.md files * 📝 add more examples * 🔥 remove example for deprecated code * 📝 add missing enum entry * 📝 overwork table for binary formats * ✅ add test to create table for binary formats * 📝 fix wording in example * 📝 add more examples * Update iterators.md (#3481) * ✨ add check for overloads to linter #3455 * 👥 update contributor list * 📝 add more examples * 📝 fix documentation * 📝 add more examples * 🎨 fix indentation * 🔥 remove example for destructor * 📝 overwork documentation * Updated BJData documentation, #3464 (#3493) * update bjdata.md for #3464 * Minor edit * Fix URL typo * Add info on demoting ND array to a 1-D optimized array when singleton dimension Co-authored-by: Chaoqi Zhang <prncoprs@163.com> Co-authored-by: Qianqian Fang <fangqq@gmail.com>	2022-05-17 13:08:56 +02:00
Niels Lohmann	b21c345179	Reorganize directories (#3462) ... * 🚚 move files * 🚚 rename doc folder to docs * 🚚 rename test folder to tests	2022-05-01 09:41:50 +02:00
Florian Albrechtskirchinger	5352856f04	Implement support for string_view (attempt no. 3) (#3423) ... * Add key_compare member to ordered_map * Replace == with key_compare in ordered_map * Expose the actual comparison function used by object_t nlohmann::ordered_map uses a different comparison function than the one provided via template parameter. * Introduce a type trait to detect if object_t has a key_compare member. * Rename object_comparator_t to default_object_comparator_t. * Add object_comparator_t to be conditionally defined as object_t::key_compare, if available, or default_object_comparator_t otherwise. * Update the documentation accordingly. Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com> * Add type traits to check if a type is usable as object key Add type trait to check: * if a type is a specialization of a template. * if a type is a json_pointer. * if a type is a basic_json::{const_,}iterator. * if two types are comparable using a given comparison functor. * if a type is comparable to basic_json::object_t::key_type. * if a type has a member type is_transparent. * if a type is usable as object key. * if a type has an erase() function accepting a given KeyType. Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com> * Rework basic_json element access to accept more key types Rework basic_json element access member functions and operators to accept any type that meets the requirements defined by type trait detail::is_usable_as_key_type. Member functions and operators: * at() * operator[] * value() * erase() * find() * count() * contains() Update documentation to reflect these changes. Add unit tests to excercise the new functions using std::string_view. Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com> Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>	2022-04-29 21:40:02 +02:00
Qianqian Fang	ee51661481	Support UBJSON-derived Binary JData (BJData) format (#3336) ... * support UBJSON-derived Binary JData (BJData) format * fix Codacy warning * partially fix VS compilation errors * fix additional VS errors * fix more VS compilation errors * fix additional warnings and errors for clang and msvc * add more tests to cover the new bjdata types * add tests for optimized ndarray, improve coverage, fix clang/gcc warnings * gcc warn useless conversion but msvc gives an error * fix ci_test errors * complete test coverage, fix ci_test errors * add half precision error test * fix No newline at end of file error by clang * simplify endian condition, format unit-bjdata * remove broken test due to alloc limit * full coverage, I hope * move bjdata new markers from default to the same level as ubjson markers * fix ci errors, add tests for new bjdata switch structure * make is_bjdata const after using initializer list * remove the unwanted assert * move is_bjdata to an optional param to write_ubjson * pass use_bjdata via output adapter * revert order to avoid msvc 2015 unreferenced formal param error * update BJData Spect V1 Draft-2 URL after spec release * amalgamate code * code polishing following @gregmarr's feedback * make use_bjdata a non-default parameter * fix ci error, remove unwanted param comment * encode and decode bjdata ndarray in jdata annotations, enable roundtrip tests * partially fix ci errors, add tests to improve coverage * polish patch to remove ci errors * fix a ndarray dim vector condition * fix clang tidy error * add sax test cases for ndarray * add additional sax event tests * adjust sax event numbering * fix sax tests * ndarray can only be used with array containers, discard if used in object * complete test coverage * disable [{SHTFNZ in optimized type due to security risks in #2793 and hampered readability * fix ci error * move OutputIsLittleEndian from tparam to param to replace use_bjdata * fix ci clang gcc error * fix ci static analysis error * update json_test_data to 3.1.0, enable file-based bjdata unit tests * fix stack overflow error on msvc 2019 and 2022 * use https link, update sax_parse_error after rebase * make input_format const and use initializer * return bool for write_bjdata_ndarray * test write_bjdata_ndarray return value as boolean * fix ci error	2022-04-29 21:17:30 +02:00
Florian Albrechtskirchinger	616caea27a	Re-template json_pointer on string type (#3415) ... * Make exception context optional Change exception context parameter to pointer and replace context with nullptr where appropriate. * Support escaping other string types * Add string concatenation function Add variadic concat() function for concatenating char *, char, and string types. * Replace string concatenations using + with concat() * Template json_pointer on string type Change json_pointer from being templated on basic_json to being templated on string type. * Add unit test for #3388 Closes #3388. * Fix regression test for #2958 * Add backwards compatibility with json_pointer<basic_json> * Update json_pointer docs * Allow comparing different json_pointers * Update version numbers	2022-04-12 14:18:16 +02:00