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

243 commits

Author SHA1 Message Date
Niels 67c2d90a21 working on #160 2015-12-22 13:27:40 +01:00
Niels 4351698c83 re-adding const version operator[] (#135, #159) 
It was a good idea to implement a const version of operator[] it in the
first place. I was a pity that this implementation was flawed. It was a
mistake to remove the const version completely. This commit
re-introduces the const version. My apologies for all the inconvenience.
 2015-12-21 08:42:42 +01:00
Niels 9def0186be upgraded Catch to v1.3.1 2015-12-20 15:42:01 +01:00
Niels 457bfc2401 work on #144 2015-12-20 15:30:07 +01:00
Niels cd04a7d3e9 fix for #133 
added value() function to get object value at given key or a default
value if key does not exist
 2015-12-15 08:38:54 +01:00
Niels 258f04c561 fixed #154 (no more warnings for incomplete switches) 2015-12-14 16:32:37 +01:00
Niels a70a7a8001 fixed #135: operator[] now only works on nonconst JSON objects 2015-12-13 11:26:55 +01:00
Niels 9da8770f3a ignore UTF-8 byte order mark (fixes #152) 2015-12-07 22:27:53 +01:00
Robert Marki ec7a1d8347 Fix character skipping after a surrogate pair 
In a string the first character following a surrogate pair is skipped by the
lexer, but the rest of the string is parsed as usual.
 2015-11-13 13:13:46 +01:00
Niels 746c1a7142 cleanup 2015-10-17 12:51:59 +02:00
dariomt 04cc7d5a05 doh! disable test correctly only for MSVC 2015-10-16 16:36:34 +02:00
dariomt 9d45aafc2c disabled "CopyAssignable" test for MSVC in Debug mode, see #125 
STL iterators used by json::iterator don't pass this test in Debug mode.
The test does pass in Release mode, so I felt the best thing to do was selectively disable that test.
 2015-10-07 18:31:08 +02:00
Niels b58a93b8dd merged #111 2015-08-14 14:45:13 +02:00
Niels fadccc34eb fixed iterator_wrapper 2015-08-13 10:08:55 +02:00
Niels 66ec58639b removed failing tests 2015-08-06 23:02:52 +02:00
Niels b0eb34394c added test cases for #83 2015-08-06 22:36:08 +02:00
Niels c910853304 fixed build 2015-08-02 21:49:42 +02:00
Niels b00e627c30 fixed build 2015-08-02 21:47:11 +02:00
Niels 9355dce063 fixed build 2015-08-02 21:40:25 +02:00
Niels e64dc532ab fixed build 2015-08-02 21:35:07 +02:00
Niels b5a05e1121 add a test for the iterator_wrapper 2015-08-02 21:27:02 +02:00
Niels 359cf7993f closed #75 
minor changes, but the core idea remains the same
 2015-07-26 18:41:58 +02:00
Niels 5993ff9976 updated catch 2015-07-26 10:41:38 +02:00
Niels 5084159048 added changes from #105: MSVC fixes 
- additionally, switch off optimization flags to maybe allow build to
complete on AppVeyor
 2015-07-16 18:45:19 +02:00
Niels 1c8d5dc211 added another insert function 2015-07-12 22:47:08 +02:00
Niels 092bf39f53 added test case 2015-07-12 20:40:46 +02:00
Niels 186aefb8f2 added first insert functions 2015-07-12 18:28:23 +02:00
Niels b2efd50a03 more documentation 2015-07-12 17:08:51 +02:00
Niels 19d550c044 new implementation for (const_)reverse_iterator to cope with issue #93 2015-07-07 23:31:43 +02:00
Niels 12d174d424 fixed #100 2015-07-06 23:21:54 +02:00
Niels 2bc5d893c8 refactored generic iterator into a new class primitive_iterator_t 2015-07-05 22:22:15 +02:00
Niels 82a6995306 fixed #101 2015-07-01 23:08:54 +02:00
Niels abd741708d more tests 2015-06-30 00:12:18 +02:00
Niels 3f6b10733b addressed static analysis warnings #94 2015-06-28 14:02:47 +02:00
Niels c58c5aa8c9 fixed #97 
- added functions is_structured() and is_primitive()
- updated documentation
- updated test cases
 2015-06-27 18:43:11 +02:00
Niels 3ffedea5c4 minor changes 2015-06-25 00:40:16 +02:00
Niels 6e6dd5f45d added test cases for the last uncovered lines 2015-06-24 15:46:50 +02:00
Niels 40312fb07b worked on #91 
- implemented `get_ptr` function to return pointer to value member
- overworked `get` function to support pointer types
- added test cases
- added documentation (see
http://nlohmann.github.io/json/classnlohmann_1_1basic__json.html) with
examples
 2015-06-24 15:16:32 +02:00
Niels 457572184c more documentation 
In this commit, also the semantics for values skipped via the parser
callback has changed. Now, the top-level value is returned as “null”
instead of “discarded”.
 2015-06-24 12:15:51 +02:00
Niels bd8150c58e updated Catch 2015-06-20 15:47:26 +02:00
Niels 64c467e940 fix warnings possible loss of data (from #88) 2015-06-20 14:15:15 +02:00
Niels 51edad3962 fixed #89 without breaking #71 2015-06-15 19:45:25 +02:00
Niels 8e9a711996 closes #90 2015-06-15 16:37:49 +02:00
Niels 1375162562 exclude Unicode tests from Valgrind to avoid timeout 2015-06-15 05:46:12 +02:00
Niels 2e9a13bd88 added extensive Unicode tests 2015-06-14 23:17:49 +02:00
Niels 6fb829062c some maintenance 
- unified used exception types
- removed any camel case names
 2015-06-14 19:35:20 +02:00
Niels bc55e496de test suite is not portable :-( 2015-06-13 13:01:10 +02:00
Niels bd0cb65b7a fixed more float parsing cases 2015-06-13 12:42:18 +02:00
Niels 29512ae989 added test case for #82 2015-06-04 20:07:33 +02:00
Niels 9dbb4402fb improved performance for dump() 2015-06-03 23:34:10 +02:00