Commit graph

281 commits

Author SHA1 Message Date
Niels
2d26d85c2b some cleanup 2015-06-08 16:35:38 +02:00
Alexandre Hamez
f17733b859 Directly return ostream 2015-06-08 11:39:32 +02:00
Alexandre Hamez
c49d83172f Avoid warning with Xcode's clang 2015-06-08 11:38:52 +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
072dc25521 Merge pull request #72 from aburgh/null-callback
Replace `default_callback` function with `nullptr` and check for null…
2015-05-10 17:10:47 +02:00
Niels
43ededf41f more cleanup 2015-05-10 17:03:50 +02:00
Aaron Burghardt
ef54ace4d2 Replace default_callback function with nullptr and check for null callback function before calling it. This is cleaner and better performing. 2015-05-10 10:32:49 -04: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
Aaron Burghardt
ea3e922a12 Fix performance regression introduced with the parsing callback feature. 2015-05-04 09:08:55 -04: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
50e06a7bd1 Merge pull request #40 from aburgh/incremental
Parse streams incrementally.
2015-03-24 17:57:40 +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
Niels
a382a93a8e Merge pull request #38 from wtsi-hgi/feature/small-float-serialization
Feature/small float serialization
2015-03-23 20:15:50 +01:00
Niels
bb2671df11 fixed #43 (adding friendship to allow iterator change) 2015-03-22 19:18:21 +01:00
Niels
f2957dc3bf fixed #45 (added count function for keys in objects) 2015-03-22 19:07:43 +01:00
Niels
cf829ac2e8 fixed deprecated warnings in issue #42 2015-03-22 17:50:43 +01:00
Niels
abc6137001 fixed #48 (using nonmember begin/end) 2015-03-22 17:30:48 +01:00
Aaron Burghardt
396f64a058 Replaced leading tabs with spaces (4 per tab). 2015-03-02 15:25:09 -05:00
Aaron Burghardt
87746280ca Added parse() for streams. 2015-03-01 06:31:33 -05:00
Aaron Burghardt
2855c70c27 Use inplace configuration for yyfill and disable the parameter to yyfill. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
268fd444e6 Added comments to new method yyfill. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
edb697293b Fixed variable adjustments in yyfill(). 2015-03-01 05:55:40 -05:00
Aaron Burghardt
ec6979bf76 Purged old commented-out code. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
b66c306d47 Removed unused member m_state. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
0d79e7c2a2 Removed duplicate m_marker updates in YYFILL macro. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
e3e18d7b85 Deleted extraneous comment. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
e4cc42cf81 Moved m_marker in lexer::scan() to be a member of lexer. 2015-03-01 05:55:40 -05:00
Aaron Burghardt
754c38e871 Moved buffer management into the lexer class and implemented YYFILL so that streams are read incrementally. 2015-03-01 05:55:40 -05:00
Joshua C. Randall
7bfcbe2825 Fixes serialization of small floats
Now uses std::snprintf() to generate a "%.15g" formatted string
for JSON values of type number_float. 15 decimals digits are
enough to round-trip an IEEE 754 double from string->double->string
and get an identical result.

std::snprintf is called twice. Once to determine the required
buffer size and then again after allocating a buffer of that
size.

Note that the buffer size *could* be hardcoded for better
performance. "%.15g" should result in strings of maximum length
23, plus one character for the terminating null for a buffer size
of 24.
2015-02-28 17:11:46 +00:00
Niels
63c70fa07e minor changes 2015-02-24 23:19:19 +01:00
Niels
d524e23204 overworked iterators 2015-02-22 17:52:27 +01:00
Niels
bc2e3a798d a more forgiving array behavior 2015-02-21 13:24:07 +01:00
Niels
afd02eee44 fixed [] operator; added README 2015-02-18 22:28:56 +01:00
Niels
9e7941b6ba more type adjustments 2015-02-17 00:22:12 +01:00
Niels
432a54e570 some type fixes 2015-02-16 23:17:28 +01:00
Niels
a3f52a5a04 minor change to make code more portable 2015-02-16 22:54:07 +01:00
Niels
5ca84052a7 removed unused code and fixed includes 2015-02-16 22:47:30 +01:00
Niels
db91140156 clean up 2015-02-15 23:27:35 +01:00
Niels
429d2099ab more allocators 2015-02-15 23:13:46 +01:00
Niels
b387761e12 forgot to destroy object 2015-02-15 22:58:35 +01:00
Niels
568d75954e experiment with user-defined allocator 2015-02-15 22:49:26 +01:00
Niels
b1be1b45ee minor change 2015-02-15 18:43:17 +01:00
Niels
d31d1ca664 fix of the fix 2015-02-15 17:40:46 +01:00
Niels
9f87fd464a fixed Valgrind error 2015-02-15 17:07:19 +01:00
Niels
f1f72403cd some unicode magic 2015-02-15 16:56:54 +01:00
Niels
b80ca376f9 added some missing features from 2.0 version 2015-02-15 15:16:11 +01:00
Niels
2d8b362849 further cleanup 2015-02-15 14:52:00 +01:00
Niels
2fc82358ce clean up 2015-02-15 13:35:51 +01:00