haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,571 Commits
16 Branches
56 Tags
222 MiB
Commit Graph

849 Commits (c35d260c2fb91b8a53e585d480607a0f088cbbbb)

Author SHA1 Message Date
Niels Lohmann 25f56ff207
📝 updated documentation 2018-03-20 19:22:18 +01:00
Niels Lohmann 99ecca55c4
✅ improved test coverage 2018-03-20 18:49:10 +01:00
Niels Lohmann 9e07e9b4ec
✨ implemented non-throwing binary reader 2018-03-19 22:48:13 +01:00
Niels Lohmann a271ee5f16
♻️ proper use of SAX parser for binary formats 2018-03-18 23:00:45 +01:00
Niels Lohmann 943d641054
🔨 some refactoring 2018-03-18 16:07:21 +01:00
Niels Lohmann 22929fe189
🚧 started a SAX/DOM/callback parser 2018-03-18 15:13:53 +01:00
Niels Lohmann 375b05a17d
🔨 cleanup 2018-03-17 23:31:18 +01:00
Niels Lohmann 606a25195f
✅ improved test coverage 2018-03-17 19:15:59 +01:00
Niels Lohmann c87ffad45c
♻️ implemented a non-recursive parser 2018-03-17 14:46:50 +01:00
Guillaume Racicot 8165707990 basic_json now supports getting many type of strings 2018-03-15 15:35:00 -04:00
Niels Lohmann 27cf05af8d
Merge branch 'develop' into feature/sax2 2018-03-14 22:02:19 +01:00
Niels Lohmann afef474c0d
🔖 set version to 3.1.2 2018-03-14 21:09:27 +01:00
Niels Lohmann 282bafae4f
🔨 fixed compilation error 2018-03-14 07:18:42 +01:00
Niels Lohmann abac6a0e84
Merge branch 'develop' into feature/sax2 2018-03-13 23:58:17 +01:00
Niels Lohmann 8557151d90
♻️ adjusting lexer/parser in symmetry to #1006 2018-03-12 19:15:11 +01:00
Niels Lohmann 3d4f6a2940
🔨 cleaner exception interface 2018-03-11 22:47:25 +01:00
Niels Lohmann ad47b0fbde
♻️ refactored binary readers to use a SAX parser 2018-03-11 18:47:38 +01:00
Vitaliy Manushkin 830f3e5290 forward alternative string class from output_adapter to output_string_adapter 2018-03-10 23:58:16 +03:00
Vitaliy Manushkin faccc37d0d dump to alternate implementation of string, as defined in basic_json template 2018-03-10 17:19:28 +03:00
Niels Lohmann 149d2fd09c
💚 improved test coverage 2018-03-10 11:24:00 +01:00
Niels Lohmann 6399cd3039
Merge branch 'develop' into feature/sax2 2018-03-10 11:07:36 +01:00
Niels Lohmann 6151dfaed7
👌 made changes proposed in #1001 2018-03-10 11:02:58 +01:00
Niels Lohmann 35e43df625
Merge branch 'develop' into feature/sax2 2018-03-09 21:56:30 +01:00
Niels Lohmann aa8fc2a41c
🚑 hopefully fixed the memory leak 2018-03-08 17:11:15 +01:00
Niels Lohmann 97559bb1b2
🔨 trying to fix the leak 
Part 1: properly use forwarding
 2018-03-08 07:36:56 +01:00
Niels Lohmann 8b379948d0
🔥 replaced acceptor with SAX parser 2018-03-07 22:40:48 +01:00
Niels Lohmann 303a0c5843
Merge branch 'develop' into feature/sax2 2018-03-07 22:26:01 +01:00
Niels Lohmann d2d65bb25b
♻️ refined SFINAE to fix some warnings 2018-03-07 22:01:44 +01:00
Niels Lohmann 476b2e09be
💚 added regression tests for #972 and #977 2018-03-06 20:13:31 +01:00
Niels Lohmann 62030615a0
Merge pull request #986 from theodelrieu/fix/basic_json_conversion 
Fix/basic json conversion
 2018-03-06 19:27:39 +01:00
Niels Lohmann 5beab80553
🔨 using the SAX-DOM parser 2018-03-06 18:17:07 +01:00
Niels Lohmann faf2546a15
🔨 simplified SAX-DOM parser 2018-03-06 07:19:05 +01:00
Niels Lohmann 5b9d03cfdb
🔨 added SAX-DOM-Parser 2018-03-05 21:06:00 +01:00
Niels Lohmann 9d27429527
🔨 added error messages to SAX interface 2018-03-05 16:46:35 +01:00
Niels Lohmann 86991d5204
Merge branch 'develop' into feature/sax2 2018-03-05 16:16:43 +01:00
Mike Bogdanov 2a2ed799b1 pvs_studio fix. misprinted condition 2018-03-02 11:12:44 +03:00
Théo DELRIEU 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
Niels Lohmann 3ff9455332
🔨 added a SAX-DOM-Parser 2018-02-26 23:39:23 +01:00
Niels Lohmann 21352c4d8e
♻️ refactored SAX parser 2018-02-26 20:08:12 +01:00
Niels Lohmann 8d6b3d44d6
👌 fixed some compiler warnings 2018-02-25 18:35:16 +01:00
Niels Lohmann 8c7f46f7d0
🔨 removed a logic error and improved coverage 2018-02-25 17:10:30 +01:00
Niels Lohmann 374ebacc51
✨ added a SAX parser #971 2018-02-24 18:04:07 +01:00
Niels Lohmann 938c861a09
🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
Théo DELRIEU 01d6118828
Fix constraints on from_json(CompatibleArrayType) 
Fixes #924
 2018-02-12 15:37:33 +01:00
Niels Lohmann 865ff00de0
📝 updated documentation wrt. objects #963 2018-02-09 23:37:20 +01:00
Niels Lohmann 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
Niels Lohmann 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
Niels Lohmann 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
Théo DELRIEU 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