External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,393 Commits 10 Branches 56 Tags 212 MiB
f7f1cd82d0
Commit Graph

274 Commits

Author SHA1 Message Date
Qianqian Fang
f7f1cd82d0 use https link, update sax_parse_error after rebase 2022-04-23 09:01:18 -04:00
Qianqian Fang
35936717c8 fix ci error 2022-04-23 09:00:59 -04:00
Qianqian Fang
2dc8f97ef5 disable [{SHTFNZ in optimized type due to security risks in #2793 and hampered readability 2022-04-23 09:00:59 -04:00
Qianqian Fang
e7ae719b9a ndarray can only be used with array containers, discard if used in object 2022-04-23 09:00:59 -04:00
Qianqian Fang
b54f058dcb fix a ndarray dim vector condition 2022-04-23 09:00:59 -04:00
Qianqian Fang
5786991973 polish patch to remove ci errors 2022-04-23 09:00:59 -04:00
Qianqian Fang
4c9dd311bd partially fix ci errors, add tests to improve coverage 2022-04-23 09:00:59 -04:00
Qianqian Fang
069b4d68f1 encode and decode bjdata ndarray in jdata annotations, enable roundtrip tests 2022-04-23 09:00:59 -04:00
Qianqian Fang
be6cdaa4b9 fix ci error, remove unwanted param comment 2022-04-23 09:00:59 -04:00
Qianqian Fang
6b9da3bf0a code polishing following @gregmarr's feedback 2022-04-23 09:00:59 -04:00
Qianqian Fang
d5e590efe3 fix ci errors, add tests for new bjdata switch structure 2022-04-23 09:00:12 -04:00
Qianqian Fang
ed8c4c681d move bjdata new markers from default to the same level as ubjson markers 2022-04-23 09:00:12 -04:00
Qianqian Fang
408144ae73 simplify endian condition, format unit-bjdata 2022-04-23 08:59:47 -04:00
Qianqian Fang
3d211b883d complete test coverage, fix ci_test errors 2022-04-23 08:59:47 -04:00
Qianqian Fang
6fc779005c fix ci_test errors 2022-04-23 08:59:47 -04:00
Qianqian Fang
42701cc2fc gcc warn useless conversion but msvc gives an error 2022-04-23 08:59:29 -04:00
Qianqian Fang
c8752b349f add tests for optimized ndarray, improve coverage, fix clang/gcc warnings 2022-04-23 08:59:29 -04:00
Qianqian Fang
55682ffb5a add more tests to cover the new bjdata types 2022-04-23 08:59:29 -04:00
Qianqian Fang
4985323bb7 fix additional warnings and errors for clang and msvc 2022-04-23 08:59:29 -04:00
Qianqian Fang
76ee885fd2 fix more VS compilation errors 2022-04-23 08:59:14 -04:00
Qianqian Fang
58efde83f0 fix additional VS errors 2022-04-23 08:59:14 -04:00
Qianqian Fang
94b0268cc2 partially fix VS compilation errors 2022-04-23 08:59:14 -04:00
Qianqian Fang
02d8f926f0 fix Codacy warning 2022-04-23 08:59:14 -04:00
Qianqian Fang
3c820dd215 support UBJSON-derived Binary JData (BJData) format 2022-04-23 08:59:14 -04: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
Niels Lohmann
29cd970b94
Consolidate documentation (#3071) 
* 🔥 consolidate documentation
* ♻️ overwork std specializations
* 🚚 move images files to mkdocs
* ♻️ fix URLs
* 🔧 tweak MkDocs configuration
* 🔧 add namespaces
* 📝 document deprecations
* 📝 document documentation generation
* 🚸 improve search
* 🚸 add examples
* 🚧 start adding documentation for macros
* 📝 add note for https://github.com/nlohmann/json/issues/874#issuecomment-1001699139
* 📝 overwork example handling
* 📝 fix Markdown tables
 2021-12-29 13:41:01 +01:00
Niels Lohmann
6d3115924c
Add C++17 copies of the test binaries (#3101) 
* ⚗️ add C++17 copies of the test binaries
* ⚗️ use proper header for filesystem
* 🚨 fix warnings
* ⚗️ do not use too old compilers with C++17
* ✅ add test
* 🔨 add more constraints #3097
* ⚗️ use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
* ⚗️ use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
* 👷 use published CI image
 2021-12-29 09:47:05 +01:00
Alex Beregszaszi
834918018e
Fix spelling (#3125) 2021-11-09 14:46:58 +01:00
Niels Lohmann
0a0eb7a850
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 
 Conflicts:
	.github/workflows/windows.yml
 2021-08-14 11:19:48 +02:00
Ferry Huberts
364a21be6b Add coverage exclusion comments, as requested 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-13 15:30:55 +02:00
Ferry Huberts
e7a69b8d31 Adjust more files after actually building like the CI 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-13 14:00:00 +02:00
Ferry Huberts
44d60f8d14 All: fix warnings when compiling with -Wswitch-enum 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-12 16:33:50 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann
176e9bf0ab
✅ add tests for CBOR 2021-08-07 13:14:08 +02:00
Niels Lohmann
89c98dfc20
✨ add option to process binary subtypes in CBOR 2021-08-06 16:41:01 +02:00
Niels Lohmann
7feb2c20cf
🚨 fix useless-cast warnings 2021-07-30 14:48:25 +02:00
Niels Lohmann
7066ab128f
🎨 reindent code 2021-07-19 16:56:28 +02:00
Niels Lohmann
b7cc47089f
⚡ avoid string in case of empty objects 2021-07-16 09:27:18 +02:00
David Pfahler
aa849a2275 Merge branch 'nlohmann:develop' into without-io 2021-06-14 08:22:49 +02:00
David Pfahler
ae9bbbc941 include io only if JSON_NO_IO is not set for #2728 2021-05-31 14:26:45 +02:00
Niels Lohmann
b08139ea4b
♻️ replace EOF with std::char_traits<char>::eof() 2021-05-04 10:22:34 +02:00
Niels Lohmann
cdfe865486
📝 add documentation for numbers 2021-04-28 20:33:05 +02:00
David Pfahler
1a1381f071 Fixes #2728 
includes some macros to be defined for using without file io.
 2021-04-21 10:24:01 +02:00
Niels Lohmann
6f551930e5
🚨 add new CI and fix warnings (#2561) 
* ⚗️ move CI targets to CMake
* ♻️ add target for cpplint
* ♻️ add target for self-contained binaries
* ♻️ add targets for iwyu and infer
* 🔊 add version output
* ♻️ add target for oclint
* 🚨 fix warnings
* ♻️ rename targets
* ♻️ use iwyu properly
* 🚨 fix warnings
* ♻️ use iwyu properly
* ♻️ add target for benchmarks
* ♻️ add target for CMake flags
* 👷 use GitHub Actions
* ⚗️ try to install Clang 11
* ⚗️ try to install GCC 11
* ⚗️ try to install Clang 11
* ⚗️ try to install GCC 11
* ⚗️ add clang analyze target
* 🔥 remove Google Benchmark
* ⬆️ Google Benchmark 1.5.2
* 🔥 use fetchcontent
* 🐧 add target to download a Linux version of CMake
* 🔨 fix dependency
* 🚨 fix includes
* 🚨 fix comment
* 🔧 adjust flags for GCC 11.0.0 20210110 (experimental)
* 🐳 user Docker image to run CI
* 🔧 add target for Valgrind
* 👷 add target for Valgrind tests
* ⚗️ add Dart
* ⏪ remove Dart
* ⚗️ do not call ctest in test subdirectory
* ⚗️ download test data explicitly
* ⚗️ only execute Valgrind tests
* ⚗️ fix labels
* 🔥 remove unneeded jobs
* 🔨 cleanup
* 🐛 fix OCLint call
* ✅ add targets for offline and git-independent tests
* ✅ add targets for C++ language versions and reproducible tests
* 🔨 clean up
* 👷 add CI steps for cppcheck and cpplint
* 🚨 fix warnings from Clang-Tidy
* 👷 add CI steps for Clang-Tidy
* 🚨 fix warnings
* 🔧 select proper binary
* 🚨 fix warnings
* 🚨 suppress some unhelpful warnings
* 🚨 fix warnings
* 🎨 fix format
* 🚨 fix warnings
* 👷 add CI steps for Sanitizers
* 🚨 fix warnings
* ⚡ add optimization to sanitizer build
* 🚨 fix warnings
* 🚨 add missing header
* 🚨 fix warnings
* 👷 add CI step for coverage
* 👷 add CI steps for disabled exceptions and implicit conversions
* 🚨 fix warnings
* 👷 add CI steps for checking indentation
* 🐛 fix variable use
* 💚 fix build
* ➖ remove CircleCI
* 👷 add CI step for diagnostics
* 🚨 fix warning
* 🔥 clean Travis
 2021-03-24 07:15:18 +01:00
Niels Lohmann
56a6dec0de
🔀 merge develop branch 2021-02-07 17:46:11 +01:00
Niels Lohmann
4917e7c259
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics 
 Conflicts:
	include/nlohmann/detail/input/parser.hpp
	single_include/nlohmann/json.hpp
 2021-02-07 17:45:09 +01:00
Niels Lohmann
ffdeb77468
🚨 fix warnings #2615 2021-01-27 12:54:46 +01:00
Niels Lohmann
74cc0ab470
♻️ remove diagnostics_t class 2021-01-25 13:47:50 +01:00
Niels Lohmann
b9d3aa4067
♻️ split set_parent function 2021-01-14 21:55:49 +01:00
Niels Lohmann
ff57bdcc8b
🐛 fix invariants 2021-01-10 22:40:50 +01:00