1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-09 11:01:47 +03:00
Commit Graph

116 Commits

Author SHA1 Message Date
5ed80d308d some parsing performance improvements 2015-05-09 22:49:21 +02:00
9cdd278f45 overworked code for pull request #71 2015-05-09 15:29:20 +02:00
aca3f65bbe Merge pull request #71 from likebeta/master
support enum
2015-05-09 15:23:51 +02:00
2b4e461702 fixed string definition 2015-05-09 15:09:52 +02:00
1f381d496d overworked coverage 2015-05-09 14:54:33 +02:00
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
a8e92a6bfb fixed #68 2015-05-06 20:18:16 +02:00
17609f244d fixed #70 2015-05-06 19:52:12 +02:00
1580eee4ed applied #69 to header 2015-05-04 23:31:34 +02:00
1ac4d673b6 fixed test case 2015-05-03 18:46:26 +02:00
952cbbc795 manually merged pull request #41 2015-05-03 17:52:13 +02:00
faae8bb843 some typename fix 2015-04-27 23:09:51 +02:00
81d3973151 undid changes that broke the build 2015-04-26 21:51:35 +02:00
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
f09df96742 updated README 2015-04-26 15:16:07 +02:00
7a32bd22e9 Merge pull request #63 from Florianjw/master
Improve the implementations of the comparission-operators
2015-04-26 15:10:32 +02:00
c7f95cc636 minor change to the parsing of objects/arrays 2015-04-26 15:10:04 +02:00
4fbff7d140 simplify value_t::operator< by using a lookup-table 2015-04-26 14:55:06 +02:00
f5e95522aa remove braces around single-return-statement switch-cases 2015-04-26 14:44:56 +02:00
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
306695dd25 fix typos and improve operator== 2015-04-26 14:31:31 +02:00
28f64c22a9 simplify operator< 2015-04-26 14:19:56 +02:00
a372937424 fixed some small issues 2015-04-26 13:37:01 +02:00
e3ab0bc74a addressing issue #62 2015-04-25 23:10:23 +02:00
89a8491914 minor changes 2015-04-25 01:25:42 +02:00
fc58a73523 fix #60 (double escaping) 2015-04-24 22:06:57 +02:00
2dd94dd943 some simplifications 2015-04-12 17:26:54 +02:00
f03c6ce458 added missing test cases 2015-04-12 16:57:51 +02:00
dda8a5c473 adjusted code to documentation; some cleanup 2015-04-12 16:19:21 +02:00
139ef0e750 implemented front() and back() 2015-04-12 14:14:00 +02:00
ade49f8b2a constructor for an integer range 2015-04-12 13:15:26 +02:00
b801adca76 started to implement sequence container 2015-04-12 12:02:30 +02:00
02f617f083 adjusted code to documentation 2015-04-11 19:26:12 +02:00
6dceab583c implemented issue #57: erase with iterators 2015-04-11 15:30:19 +02:00
84195daf28 added erase function for arrays 2015-04-09 18:55:57 +02:00
1bdb6acb1f overworked type conversion 2015-04-08 22:23:40 +02:00
0a96116b0c more SFINAE 2015-04-03 16:34:39 +02:00
ea1046110d using "key_type" where possible 2015-04-03 14:43:44 +02:00
b747881466 subtle fix for get() function 2015-04-03 14:20:15 +02:00
5e89cb0acb implemented key()/value() for reverse iterators 2015-03-26 17:06:33 +01:00
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
0707030bc5 minor changes to pull request #40 2015-03-24 18:05:58 +01:00
e3188897f8 more on #48: allowing non-std begin/end functions 2015-03-24 17:39:00 +01:00
6fc52f3302 fixed #47 (added erase function to remove key form object) 2015-03-24 16:50:55 +01:00
43417c350b fixed #42 (removed equality comparisons for floats) 2015-03-23 23:03:48 +01:00
53e3da8071 minor adjustments to pull request #38 2015-03-23 20:27:30 +01:00
a382a93a8e Merge pull request #38 from wtsi-hgi/feature/small-float-serialization
Feature/small float serialization
2015-03-23 20:15:50 +01:00
bb2671df11 fixed #43 (adding friendship to allow iterator change) 2015-03-22 19:18:21 +01:00
f2957dc3bf fixed #45 (added count function for keys in objects) 2015-03-22 19:07:43 +01:00