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
626 commits 12 branches 56 tags 226 MiB
Commit graph

219 commits

Author SHA1 Message Date
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 5e1d0f1592 more documentation and some cleanup 2015-07-12 14:49:37 +02:00
Niels c012b29ae5 worked on #102: more documentation and examples 2015-07-08 16:55:29 +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 e070aed8a7 cleanup 2015-07-06 21:12:50 +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 540c58964d closed #91 2015-06-29 20:53:01 +02:00
Niels 48c4f4d05d more documentation 2015-06-28 19:32:09 +02:00
Niels 7d9cfb1b32 added documentation for erase functions 2015-06-28 15:49:40 +02:00
Niels 862e7000f4 fixed #94 2015-06-28 14:39:52 +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 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 48545f5b18 more documentation 2015-06-22 23:21:49 +02:00
Niels 844bfd39b5 more documentation 2015-06-22 21:44:20 +02:00
Niels 891b8f33c1 more documentation 2015-06-21 22:56:03 +02:00
Niels c85dbef98f more documentation 2015-06-21 22:42:32 +02:00
Niels 4bb5126502 more documentation 2015-06-21 18:30:08 +02:00
Niels 099030baeb added alias __basic_json 2015-06-21 13:04:03 +02:00
Niels 3e28c5ff8f commit to trigger build 2015-06-21 11:35:54 +02:00
Niels d818bec6ac more documentation 2015-06-21 11:29:32 +02:00
Niels c40e85920f more documentation 2015-06-21 09:44:12 +02:00
Niels bb13c931b3 more documentation 2015-06-21 02:14:01 +02:00
Niels e63c508172 overworked doxygen 2015-06-21 00:59:33 +02:00
Niels 4019380a8a forgot a header for MSVC 2015-06-20 17:45:52 +02:00
Niels 4fb825dbce fixed compiler warnings 2015-06-20 15:47:37 +02:00
Niels 719cc9e4d7 removed dependent to RTTI 2015-06-20 14:57:08 +02:00
Niels 18cd30d38d minor iterator refactoring (from #88) 2015-06-20 14:29:34 +02:00
Niels 23c904aca8 added fix for ssize_t for MSVC 2015-06-20 14:25:49 +02:00
Niels dd3ffc1064 fixed issue #93 2015-06-19 08:11:48 +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 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 bd0cb65b7a fixed more float parsing cases 2015-06-13 12:42:18 +02:00
Niels 7c579f11e5 some cleanup after #87 2015-06-13 10:29:43 +02:00
Niels 7f25511242 change from #86 2015-06-11 18:10:12 +02:00
Niels 2d26d85c2b some cleanup 2015-06-08 16:35:38 +02:00
Niels adc065d328 included fixes for MSVC (see #62) 
94de11e, f673c8d, 540b763
 2015-06-04 21:02:16 +02:00
Niels b8d05f72ea fixed float serialization (#81 and #80) 2015-06-04 19:43:29 +02:00
Niels 266399d8e5 fixed MinGW compilation (#81 and #80) 2015-06-04 08:31:13 +02:00
Niels 9dbb4402fb improved performance for dump() 2015-06-03 23:34:10 +02:00
Niels f5470d47ff made array static constexpr (#79) 2015-06-02 21:27:49 +02:00
Niels afc7f2388e fixed typo (#74) 2015-06-02 21:24:03 +02:00
Niels 61f0376366 more cleanup 2015-05-10 17:30:41 +02:00
Niels cb2102a2d2 some pretty-printing 2015-05-10 17:12:36 +02:00
Niels 43ededf41f more cleanup 2015-05-10 17:03:50 +02:00
Niels 76d3433e6c moved some code to json_value union 2015-05-10 16:30:33 +02:00
Niels 5ed80d308d some parsing performance improvements 2015-05-09 22:49:21 +02:00
Niels 9cdd278f45 overworked code for pull request #71 2015-05-09 15:29:20 +02:00
Niels aca3f65bbe Merge pull request #71 from likebeta/master 
support enum
 2015-05-09 15:23:51 +02:00
Niels 2b4e461702 fixed string definition 2015-05-09 15:09:52 +02:00
Niels 1f381d496d overworked coverage 2015-05-09 14:54:33 +02:00
Niels 869035a6c9 added compliance test cases 2015-05-09 13:56:51 +02:00
易思龙 91aee10579 support enum 
construct enum type to basic_json (proxy by int type)
```
    enum { t = 0 };
    json  j = json::array();
    j.push_back(t);

    j.push_back(json::object({
         {"game_type", t}
    }));
```
 2015-05-09 17:44:10 +08:00
Niels a8e92a6bfb fixed #68 2015-05-06 20:18:16 +02:00
Niels 17609f244d fixed #70 2015-05-06 19:52:12 +02:00
Niels 1580eee4ed applied #69 to header 2015-05-04 23:31:34 +02:00
Niels 1ac4d673b6 fixed test case 2015-05-03 18:46:26 +02:00
Niels 952cbbc795 manually merged pull request #41 2015-05-03 17:52:13 +02:00
Niels faae8bb843 some typename fix 2015-04-27 23:09:51 +02:00
Niels 81d3973151 undid changes that broke the build 2015-04-26 21:51:35 +02:00
Niels f874b5f0f8 clean up 
- removed m_final member
- parse_internal now takes a reference to a basic_json object to fill
with data
- header is automatically regenerated if re2c file is changed
 2015-04-26 21:43:47 +02:00
Niels f09df96742 updated README 2015-04-26 15:16:07 +02:00
Niels 7a32bd22e9 Merge pull request #63 from Florianjw/master 
Improve the implementations of the comparission-operators
 2015-04-26 15:10:32 +02:00
Niels c7f95cc636 minor change to the parsing of objects/arrays 2015-04-26 15:10:04 +02:00
Florian Weber 4fbff7d140 simplify value_t::operator< by using a lookup-table 2015-04-26 14:55:06 +02:00
Florian Weber f5e95522aa remove braces around single-return-statement switch-cases 2015-04-26 14:44:56 +02:00
Florian Weber d2771eb1bb Fix comparission between integers and floats 
Until now it depended on the parameter-order whether
integers and floats were compared as integers or floats.

Appart from being not logical, this might even have meant that
the provided “order” was in fact not that. (not sure here, but I
like to be carefull)
 2015-04-26 14:39:39 +02:00
Florian Weber 306695dd25 fix typos and improve operator== 2015-04-26 14:31:31 +02:00
Florian Weber 28f64c22a9 simplify operator< 2015-04-26 14:19:56 +02:00
Niels a372937424 fixed some small issues 2015-04-26 13:37:01 +02:00
Niels e3ab0bc74a addressing issue #62 2015-04-25 23:10:23 +02:00
Niels 89a8491914 minor changes 2015-04-25 01:25:42 +02:00
Niels fc58a73523 fix #60 (double escaping) 2015-04-24 22:06:57 +02:00
Niels 2dd94dd943 some simplifications 2015-04-12 17:26:54 +02:00
Niels f03c6ce458 added missing test cases 2015-04-12 16:57:51 +02:00
Niels dda8a5c473 adjusted code to documentation; some cleanup 2015-04-12 16:19:21 +02:00
Niels 139ef0e750 implemented front() and back() 2015-04-12 14:14:00 +02:00
Niels ade49f8b2a constructor for an integer range 2015-04-12 13:15:26 +02:00
Niels b801adca76 started to implement sequence container 2015-04-12 12:02:30 +02:00
Niels 02f617f083 adjusted code to documentation 2015-04-11 19:26:12 +02:00
Niels 6dceab583c implemented issue #57: erase with iterators 2015-04-11 15:30:19 +02:00
Niels 84195daf28 added erase function for arrays 2015-04-09 18:55:57 +02:00
Niels 1bdb6acb1f overworked type conversion 2015-04-08 22:23:40 +02:00
Niels 0a96116b0c more SFINAE 2015-04-03 16:34:39 +02:00
Niels ea1046110d using "key_type" where possible 2015-04-03 14:43:44 +02:00
Niels b747881466 subtle fix for get() function 2015-04-03 14:20:15 +02:00
Niels 5e89cb0acb implemented key()/value() for reverse iterators 2015-03-26 17:06:33 +01:00
Niels 47ea1c10d4 key/value function for iterators (#46) 
Currently only support iterator and const_iterator. reverse_iterator
and const_reverse_iterator to be implemented soon.
 2015-03-24 19:08:03 +01:00
Niels 0707030bc5 minor changes to pull request #40 2015-03-24 18:05:58 +01:00
Niels e3188897f8 more on #48: allowing non-std begin/end functions 2015-03-24 17:39:00 +01:00
Niels 6fc52f3302 fixed #47 (added erase function to remove key form object) 2015-03-24 16:50:55 +01:00
Niels 43417c350b fixed #42 (removed equality comparisons for floats) 2015-03-23 23:03:48 +01:00
Niels 53e3da8071 minor adjustments to pull request #38 2015-03-23 20:27:30 +01:00