1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-24 02:21:01 +03:00
Commit Graph

300 Commits

Author SHA1 Message Date
9e1abb4842 improved coverage 2018-03-20 22:39:08 +01:00
25f56ff207 📝 updated documentation 2018-03-20 19:22:18 +01:00
99ecca55c4 improved test coverage 2018-03-20 18:49:10 +01:00
9e07e9b4ec implemented non-throwing binary reader 2018-03-19 22:48:13 +01:00
a271ee5f16 ♻️ proper use of SAX parser for binary formats 2018-03-18 23:00:45 +01:00
943d641054 🔨 some refactoring 2018-03-18 16:07:21 +01:00
22929fe189 🚧 started a SAX/DOM/callback parser 2018-03-18 15:13:53 +01:00
375b05a17d 🔨 cleanup 2018-03-17 23:31:18 +01:00
606a25195f improved test coverage 2018-03-17 19:15:59 +01:00
c87ffad45c ♻️ implemented a non-recursive parser 2018-03-17 14:46:50 +01:00
2a5506ed98 Amalgamated headers 2018-03-16 13:16:10 -04:00
27cf05af8d Merge branch 'develop' into feature/sax2 2018-03-14 22:02:19 +01:00
afef474c0d 🔖 set version to 3.1.2 2018-03-14 21:09:27 +01:00
282bafae4f 🔨 fixed compilation error 2018-03-14 07:18:42 +01:00
abac6a0e84 Merge branch 'develop' into feature/sax2 2018-03-13 23:58:17 +01:00
8557151d90 ♻️ adjusting lexer/parser in symmetry to #1006 2018-03-12 19:15:11 +01:00
3d4f6a2940 🔨 cleaner exception interface 2018-03-11 22:47:25 +01:00
ad47b0fbde ♻️ refactored binary readers to use a SAX parser 2018-03-11 18:47:38 +01:00
830f3e5290 forward alternative string class from output_adapter to output_string_adapter 2018-03-10 23:58:16 +03:00
ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code) 2018-03-10 17:36:51 +03:00
149d2fd09c 💚 improved test coverage 2018-03-10 11:24:00 +01:00
6399cd3039 Merge branch 'develop' into feature/sax2 2018-03-10 11:07:36 +01:00
6151dfaed7 👌 made changes proposed in #1001 2018-03-10 11:02:58 +01:00
35e43df625 Merge branch 'develop' into feature/sax2 2018-03-09 21:56:30 +01:00
aa8fc2a41c 🚑 hopefully fixed the memory leak 2018-03-08 17:11:15 +01:00
97559bb1b2 🔨 trying to fix the leak
Part 1: properly use forwarding
2018-03-08 07:36:56 +01:00
8b379948d0 🔥 replaced acceptor with SAX parser 2018-03-07 22:40:48 +01:00
303a0c5843 Merge branch 'develop' into feature/sax2 2018-03-07 22:26:01 +01:00
d2d65bb25b ♻️ refined SFINAE to fix some warnings 2018-03-07 22:01:44 +01:00
476b2e09be 💚 added regression tests for #972 and #977 2018-03-06 20:13:31 +01:00
62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion
Fix/basic json conversion
2018-03-06 19:27:39 +01:00
5beab80553 🔨 using the SAX-DOM parser 2018-03-06 18:17:07 +01:00
faf2546a15 🔨 simplified SAX-DOM parser 2018-03-06 07:19:05 +01:00
5b9d03cfdb 🔨 added SAX-DOM-Parser 2018-03-05 21:06:00 +01:00
9d27429527 🔨 added error messages to SAX interface 2018-03-05 16:46:35 +01:00
86991d5204 Merge branch 'develop' into feature/sax2 2018-03-05 16:16:43 +01:00
fd30ad8a14 did make amalgamate 2018-03-02 11:47:35 +03:00
8711ec6034 support construction from other basic_json types
Before this patch, `basic_json` types with different template arguments
were treated as `CompatibleArrayType`. Which sometimes leads to recursive
calls and stack overflows.

This patch adds a constructor and a `get` overload to deal with
different `basic_json` types.
2018-02-27 16:48:09 +01:00
3ff9455332 🔨 added a SAX-DOM-Parser 2018-02-26 23:39:23 +01:00
21352c4d8e ♻️ refactored SAX parser 2018-02-26 20:08:12 +01:00
8d6b3d44d6 👌 fixed some compiler warnings 2018-02-25 18:35:16 +01:00
8c7f46f7d0 🔨 removed a logic error and improved coverage 2018-02-25 17:10:30 +01:00
374ebacc51 added a SAX parser #971 2018-02-24 18:04:07 +01:00
938c861a09 🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
01d6118828 Fix constraints on from_json(CompatibleArrayType)
Fixes #924
2018-02-12 15:37:33 +01:00
865ff00de0 📝 updated documentation wrt. objects #963 2018-02-09 23:37:20 +01:00
33a9b00ce6 🐛 fix for #962
Added out_of_range exception for UBJSON containers with sizes that exceed the target container's max_size.
2018-02-06 22:38:53 +01:00
8b457ace25 🐛 fixing CBOR's indefinity length strings #961
Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...
2018-02-06 20:43:03 +01:00
0258484626 🔖 set version to 3.1.0
- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018
2018-02-01 22:20:26 +01:00
14cd019861 fix cmake install directory (for real this time)
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
2018-02-01 11:06:51 +01:00