haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 03:15:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
1394 commits 12 branches 56 tags 226 MiB
Commit graph

518 commits

Author SHA1 Message Date
Niels 94c16b2c31 fixed coverage 2016-11-01 17:01:04 +01:00
Niels 8d1e65f297 evaluated i-tests (#344) 2016-10-30 16:07:17 +01:00
Niels a8136c578a fixed BOM handling #344 2016-10-29 21:08:30 +02:00
Niels b820bb3b1f fixed a lot of unicode errors (#344) 
BOMs currently yield an error.
 2016-10-29 19:35:17 +02:00
Niels 42ea4fb751 fixed a bug for short input files (#344) 
For input files with less than 5 bytes, the parser had a bug so that
refilling the input buffer led to erasing it.
 2016-10-29 13:32:36 +02:00
Niels 79d9fdc016 user-defined string literals exploit string length (#340) 2016-10-22 18:57:58 +02:00
Niels 606098f45d release 2.0.6 2016-10-15 16:47:45 +02:00
Niels d91067220f added missing overflow check for #329 2016-10-13 21:00:48 +02:00
Niels 67b9f1936d cleanup after closing #324 2016-10-12 22:05:45 +02:00
Niels Lohmann bb9d87ad55 Merge pull request #324 from vpetrigo/has_mapped_improve 
make has_mapped_type struct friendly
 2016-10-12 21:59:56 +02:00
Niels d3e7f9da67 code cleanup for #323 2016-10-10 20:38:50 +02:00
Niels 97280bbcfc added missing header 2016-10-09 16:32:01 +02:00
Vladimir Petrigo e9fde3e116 make has_mapped_type struct friendly 2016-10-08 16:50:23 +03:00
Niels 2fa8ea0f74 started fixing #323 2016-10-08 14:27:28 +02:00
Niels b6550b35c3 fix after #313 2016-10-04 18:20:36 +02:00
Niels 3d104f1d43 version bump 2016-09-14 23:06:39 +02:00
Niels 6bbcdc1ec5 fixes #310 2016-09-14 22:48:12 +02:00
Niels 768d66560e version bump 2016-09-11 23:36:59 +02:00
Niels f922426ec3 fixed #304 2016-09-11 22:40:51 +02:00
Niels 2daab5a4c2 fixed #306 2016-09-11 22:30:08 +02:00
Niels df9fd6237e release 2.0.3 2016-08-31 21:27:23 +02:00
Niels ae7aaed4ac Merge branch 'develop' into feature/iterator_range_parsing 2016-08-31 18:07:18 +02:00
Niels 442058f8ed interface cleanup 2016-08-31 17:07:35 +02:00
Niels afba1d3fcb forgot to run re2c 2016-08-30 23:51:14 +02:00
Niels a485aa8d27 cleanup and improvement of branch coverage 2016-08-30 23:44:15 +02:00
Niels 6e6e1c9b1f implemented idea from #290 2016-08-30 18:26:07 +02:00
Niels f76f9efe58 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-30 18:20:13 +02:00
Niels 29c5f32d42 fixed performance degradation (#272) 2016-08-29 22:36:33 +02:00
Niels 04c6c886eb another experiment 2016-08-24 21:02:33 +02:00
Niels Lohmann 8b833c452a experiment: changed order of parse functions 2016-08-24 07:12:56 +02:00
Niels 1d66ab9f7a fixed lexer issue which required null byte at the end of contiguous storage containers #290 2016-08-23 22:38:05 +02:00
Niels a79d634ccb integrated proposals for #290 2016-08-22 21:40:07 +02:00
Niels cda84ba323 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-21 23:15:27 +02:00
Niels 94331a355d removed LCOV_EXCL_LINE 2016-08-21 21:50:13 +02:00
Niels b4571360df more on #290 2016-08-21 12:35:40 +02:00
Niels eef8059003 allowing parsing from contiguous containers 2016-08-20 20:29:33 +02:00
Niels 6f3554f040 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-20 18:51:11 +02:00
Niels 039cedaf8e changes to address #295 2016-08-17 23:14:28 +02:00
Niels 5e67f7af01 added a first version of a parser for #290 2016-08-15 22:44:14 +02:00
Niels f791c5fd2e Merge branch 'develop' into feature/iterator_range_parsing 2016-08-15 21:46:02 +02:00
Niels ca80a71c28 added notes from the CII Best Practices badge 2016-08-15 21:45:49 +02:00
Niels dfc2c1abe5 added assertion for contiguous memory 2016-08-14 23:38:20 +02:00
Niels 92ee1d56eb cleanup 2016-08-14 21:59:41 +02:00
Niels 4871e39415 spell fix 2016-08-14 17:52:21 +02:00
Niels 01386b3977 cleanup 2016-08-14 17:23:15 +02:00
Niels b76f5506d7 added a parser for continguous containers 2016-08-14 14:18:25 +02:00
Niels 03de590372 improved documentation for #289 2016-08-11 20:52:48 +02:00
Niels a05df038cd prepared release 2016-07-31 13:37:04 +02:00
Niels 9e51c9041e replaced individual assertions by a class invariant function 2016-07-30 18:02:41 +02:00
Niels 891918a30f cleanup and documentation 2016-07-30 16:12:10 +02:00
Niels 5405ae8601 added default value 2016-07-30 10:50:53 +02:00
Niels b145e0c404 more cleanup 2016-07-29 23:47:16 +02:00
Niels b2b68a0fa1 header + cleanup 2016-07-29 22:24:47 +02:00
Niels 161c74a92e some cleanup 2016-07-28 21:19:56 +02:00
Niels 6297631e22 reverted breaking changes 2016-07-27 21:40:15 +02:00
Niels a7f8c47f68 cleaned up code 
- removed unnecessary assertions
- simplified simple if/return patterns
 2016-07-27 21:29:55 +02:00
Niels a01ec918ac minor changes 2016-07-25 16:21:15 +02:00
Niels d08e013dd0 improved documentation 2016-07-25 16:06:13 +02:00
Niels 75dbbc55cf started to implement #283 2016-07-23 09:59:09 +02:00
Niels ddfe86cc49 fixed a bug that was found in the discussion of #274 2016-07-22 21:40:58 +02:00
Niels 51a3829680 reverted change to constexpr get_ref (does not work with GCC and MSVC) 2016-07-22 15:53:38 +02:00
Niels 4e7501e59a minor changes 
- fixed a bug that did not discard strings with control characters
between 0x10 and 0x1f
- added termination proofs for two important loops
- made get_ref() constexpr
 2016-07-22 15:34:45 +02:00
Niels 1286d35767 make sure precision is reset on output streams during serialization 2016-07-20 20:07:45 +02:00
Niels 0f834056bb removed unused header 2016-07-19 22:17:43 +02:00
Niels 2478be807c avoid recursion in the scanner 2016-07-19 22:10:27 +02:00
Niels 7f4dd5d608 added header for int64_t and uint64_t (fixes #282) 2016-07-15 19:44:19 +02:00
Niels 71d20db4fc Merge branch 'feature/improved_documentation' into develop 
- improved documentation
 2016-07-01 18:02:37 +02:00
Niels c6d45c30d5 Merge branch 'feature/parser_performance' into develop 
- improved parser performance by avoiding a copy of the result value
 2016-07-01 17:44:27 +02:00
Niels 8f9f561742 Merge branch 'feature/detect_unsupported_compilers' into develop 
- added error macros to exclude unsupported compilers
 2016-07-01 17:42:36 +02:00
Niels 513fac589b Merge branch 'feature/algorithm_loops' into develop 
- replaces some raw loops by std algorithms
- used std::advance where possible
 2016-07-01 17:39:25 +02:00
Niels bd7cd330cd fixed type_name() signature 2016-07-01 17:26:09 +02:00
Niels 05ddfaf5cf Merge branch 'develop' into feature/improved_documentation 2016-07-01 17:01:02 +02:00
Niels 6e1347e68c fixes #270 2016-07-01 16:58:50 +02:00
Niels 26cab42c38 some minor improvements 2016-07-01 16:52:05 +02:00
Niels a5262c18e2 replaced a copy by a move to increase performance by 16-25% 2016-06-30 12:43:06 +02:00
Niels 52cbda8048 using std::advance where possible 2016-06-29 12:47:29 +02:00
Niels a0609b2da3 fixed coverage bug 2016-06-29 09:53:48 +02:00
Niels 924f78119b math... 2016-06-29 09:34:14 +02:00
Niels 7cb8ee42d5 wrong GCC version 2016-06-29 09:22:28 +02:00
Niels d456dec320 overlapping defines 2016-06-29 09:16:18 +02:00
Niels fc7f4b8fba replace some raw loops with algorithms 2016-06-28 22:49:05 +02:00
Niels dc479b3f9d check for unsupported compilers 2016-06-28 22:09:22 +02:00
Niels d2475f9010 bumped version number 2016-06-28 21:44:03 +02:00
Niels 7214243d89 reset locale (for #272) 2016-06-28 19:18:23 +02:00
Niels 420659f187 addressing #272 2016-06-28 10:42:17 +02:00
Niels 04a80a8f60 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-23 05:57:41 +02:00
Niels 59e67e768f fix for previous commit 2016-06-22 20:09:06 +02:00
Niels 3f97a5d5ad a conceptual quick fix for #269 2016-06-22 20:05:44 +02:00
Niels ad7a419a03 removed roundtripping of floats (#230) 2016-06-19 17:13:13 +02:00
Niels 4e31a0e852 minor doc changes 2016-06-19 16:17:53 +02:00
Tom Needham fb90388af5 Fix Issue #265 2016-06-14 09:59:50 +01:00
Niels 494cc15650 Merge branch 'develop' into feature/issue260 2016-06-07 12:13:03 +02:00
Niels 9e2dfd19e8 minor cleanup 2016-06-07 00:20:53 +02:00
Niels b508d1f1c4 fix proposal for #260 2016-06-06 18:50:39 +02:00
Niels 0a393b8374 indentation cleanup 2016-05-12 07:34:36 +02:00
Niels 0e0ecb2c14 fixed a warning and update ChangeLog 2016-05-12 00:32:18 +02:00
Niels f1e61896fb fixed a shadow error 2016-05-11 18:43:12 +02:00
Niels 91aa4c9def Merge branch 'develop' into feature/issue239 2016-05-11 17:23:01 +02:00
Niels 9ecf83f630 working on #235 2016-05-08 20:28:20 +02:00
Niels 6d8e00ade8 another try to remove a warning 2016-05-08 17:17:17 +02:00
Niels ac3036dc0f Merge branch 'develop' into feature/issue239 2016-05-08 17:07:08 +02:00
Niels 85a30813c8 removed unnecessary code (numbers must not begin with "+") 2016-05-07 20:22:58 +02:00
Niels c04275966f improved test coverage 2016-05-07 18:33:43 +02:00
Niels 9073b2ca39 hopefully removed some warnings 2016-04-30 16:22:27 +02:00
Niels 1d3b4dd158 added test cases 2016-04-30 00:03:47 +02:00
Niels 62f81a60d7 hopefully fixed a warning 2016-04-29 21:23:13 +02:00
Niels 5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00
Niels 96cfe7463f fixed some warnings 2016-04-24 19:09:12 +02:00
Niels 8d4cf5ef8d oops 2016-04-24 19:04:10 +02:00
Niels fb54e212b6 clean up and added tests 2016-04-24 19:03:33 +02:00
Niels 09e9f6dcd4 implemented "move" 2016-04-24 17:43:27 +02:00
Niels 855cf2307b extended "add" to cope with arrays 2016-04-24 16:51:06 +02:00
Niels 397ada22d3 implemented remove 2016-04-20 16:52:00 +02:00
Niels fa03cf0c63 replace and copy 2016-04-20 15:41:33 +02:00
Niels 70fc5835cb started implementing JSON Patch (RFC 6902) 2016-04-18 22:41:36 +02:00
Niels 3ca1bfdd9d made a function static 2016-04-17 23:41:52 +02:00
Niels 08c97df420 added examples 2016-04-17 23:18:07 +02:00
Niels 1dee40a969 fixed test case 2016-04-17 22:34:39 +02:00
Niels 6268287940 improved documentation and test coverage 2016-04-17 22:08:21 +02:00
Niels 0835eb293f improved RFC compliance and code coverage 2016-04-17 18:54:54 +02:00
Niels f883a04c87 more documentation 2016-04-17 18:18:49 +02:00
Niels 40e899a819 cleanup and documentation 2016-04-17 17:39:35 +02:00
Niels f834965b44 implemented deflatten function 2016-04-16 20:45:40 +02:00
Niels 007359675b added a flatten function 2016-04-16 16:39:20 +02:00
Niels 3401954f5b cleaned up API 2016-04-16 14:02:14 +02:00
Niels 3a3e064287 Merge branch 'develop' into feature/json-pointer 2016-04-16 12:19:31 +02:00
Niels 76a5a776eb cleanup after #234 2016-04-16 12:19:10 +02:00
Niels 94af8abdff overworked reference token parsing 2016-04-13 23:23:54 +02:00
Niels 2cb925c186 adding support for escaped reference tokens 2016-04-13 17:41:19 +02:00
Robert Marki 2197f5f0a6 Make the indirection and dereference operators of iterator const 
fixes #233
 2016-04-13 13:49:53 +02:00
Niels 726051e9b7 very first draft of a JSON pointer API 2016-04-11 23:17:03 +02:00
Niels 0b60d970e9 make code independent of concrete locale 2016-04-05 22:12:12 +02:00
Niels 31bccc83b9 fixed locale problems 2016-04-05 21:55:51 +02:00
Niels 43ee70cef8 revert changes to master 2016-04-05 20:47:47 +02:00
Niels 44a8e9bf35 locale-independent dump 2016-04-03 16:33:30 +02:00
Niels 9c233be567 merged #201 2016-04-03 14:08:38 +02:00
Niels 1baa5a7350 fixed #225 2016-03-30 20:18:34 +02:00
Niels 0951a1f94c Merge pull request #222 from Teemperor/fixAndroid 
Added missing cerrno header to fix ERANGE compile error on android
 2016-03-30 20:12:55 +02:00
Niels 54d3cab568 Merge pull request #226 from lv-zheng/fix_int64 
Use namespace std for int64_t and uint64_t
 2016-03-29 10:35:24 +02:00
Lv Zheng 3e76e61b9c Use namespace std for int64_t and uint64_t 
According to the c++11 standard, the declarations are within namespace
scope of the namespace `std'. Add `std::' to avoid unnecessary
requirement of implementations.
 2016-03-28 18:11:12 +08:00
Niels 2f63e5fb45 added copyright information to files to make release more self-contained 2016-03-25 17:41:36 +01:00
Raphael Isemann fbc25b080b Added missing cerrno header to fix ERANGE c-error on android 2016-03-10 08:46:26 +01:00
Niels 49dc2dff68 fixed error when compiled with Clang 2016-02-14 16:58:24 +01:00
Niels 836fdfedf2 fixed an error in MSVC 2016-02-14 16:53:32 +01:00
Niels a69b1a6f0b added noexcept and constexpr 2016-02-14 16:42:48 +01:00
Niels a831c787df try to replace std::ptrdiff_t with auto (for #204) 2016-02-10 21:19:31 +01:00
Niels 4cc4b26dd2 try to replace ssize_t occurrences with std::ptrdiff_t (for #204) 2016-02-10 21:09:52 +01:00
Niels fdfb39d949 improved documentation 2016-02-07 14:55:29 +01:00
Niels 3b776c08c7 clarified documentation 2016-02-07 10:45:52 +01:00
Niels ae5bd307a2 improved documentation 2016-02-05 22:30:25 +01:00