Théo DELRIEU
|
f00898331e
|
replace constructor by from/to_json: number_integer_t
|
2017-01-21 16:14:22 +01:00 |
|
Théo DELRIEU
|
a32de3b528
|
replace constructor by from/to_json: number_unsigned_t
This commit forces a design change in custom JSONSerializer, which might
be temporary
|
2017-01-21 16:14:21 +01:00 |
|
Théo DELRIEU
|
d257149f36
|
replace constructor by from/to_json: number_float_t
|
2017-01-21 16:14:21 +01:00 |
|
Théo DELRIEU
|
bbe40641a3
|
replace constructor by from/to_json: string_t
|
2017-01-21 16:14:21 +01:00 |
|
Théo DELRIEU
|
6b89785fba
|
replace constructor by from/to_json: boolean_t
|
2017-01-21 16:14:21 +01:00 |
|
Théo DELRIEU
|
c833b22b7b
|
move type_name outside of basic_json, make it a friend
|
2017-01-21 16:14:21 +01:00 |
|
Théo DELRIEU
|
d359684f2b
|
move enum class value_t outside of basic_json
|
2017-01-21 16:14:21 +01:00 |
|
Niels Lohmann
|
034d5ed97e
|
💄 some cleanup
|
2017-01-21 16:14:21 +01:00 |
|
Niels Lohmann
|
be1d3de49b
|
💄 moved changes to re2c file and ran make pretty
|
2017-01-21 16:14:21 +01:00 |
|
Niels Lohmann
|
ce0b3fe5a3
|
🚧 made type_name() public
|
2017-01-21 16:12:17 +01:00 |
|
Niels Lohmann
|
a00149f8ee
|
🐛 fixed logic error
|
2017-01-16 22:36:58 +01:00 |
|
Niels Lohmann
|
1ab26ab367
|
✨ option to switch off exceptions
|
2017-01-16 22:11:07 +01:00 |
|
Niels Lohmann
|
dd45ba6f89
|
🚧 renamed version() to meta()
|
2017-01-08 09:19:44 +01:00 |
|
Alex Astashyn
|
c236b596c9
|
Merge upstream/develop into feature/locale_independent_str_to_num
|
2017-01-04 19:20:16 -05:00 |
|
Niels Lohmann
|
e1b89dd1d6
|
Merge branch 'develop' into feature/release_information
|
2017-01-04 20:06:23 +01:00 |
|
Niels Lohmann
|
9f6c86f233
|
🐛 fix for #417
|
2017-01-04 18:54:44 +01:00 |
|
Niels Lohmann
|
4765070318
|
📝 added documentation wrt. UTF-8 strings #406
|
2017-01-04 18:07:46 +01:00 |
|
Niels Lohmann
|
cdd3b5a68c
|
🚑 fix for #416
|
2017-01-03 23:52:01 +01:00 |
|
Niels Lohmann
|
767637877b
|
💄 cleanup
|
2017-01-03 22:37:07 +01:00 |
|
Niels Lohmann
|
245a69d554
|
💄 ran clang-tidy
|
2017-01-03 21:33:23 +01:00 |
|
Niels Lohmann
|
ea4d71ee21
|
Merge branch 'develop' into feature/release_information
|
2017-01-02 17:26:00 +01:00 |
|
Niels Lohmann
|
8b46eb8ec0
|
📄 it's 2017 already
|
2017-01-02 09:40:00 +01:00 |
|
Niels Lohmann
|
60b3703c62
|
🔖 version bump to 2.0.10
|
2017-01-02 09:35:57 +01:00 |
|
Niels Lohmann
|
d173517212
|
💄 clean up
|
2017-01-02 09:21:26 +01:00 |
|
Niels Lohmann
|
cf9bf2d913
|
🚑 fix for #411 and #412
|
2017-01-01 15:28:01 +01:00 |
|
Niels Lohmann
|
328eb55dc4
|
🚧 started working on #397
|
2016-12-30 14:02:51 +01:00 |
|
Niels Lohmann
|
f7575dee94
|
Merge branch 'develop' into feature/release_information
|
2016-12-30 12:29:01 +01:00 |
|
Niels Lohmann
|
42a8c64499
|
🔖 added version information
|
2016-12-30 12:28:52 +01:00 |
|
Niels Lohmann
|
f0edab2363
|
🚑 fix for #408
|
2016-12-29 17:00:02 +01:00 |
|
Niels Lohmann
|
383a29a924
|
🚑 fix for #407
|
2016-12-29 16:14:15 +01:00 |
|
Niels Lohmann
|
871cebaf84
|
🚑 fix for #405
|
2016-12-29 15:39:16 +01:00 |
|
Niels Lohmann
|
8381cd6020
|
🚑 removed unsafe call to strerror #403
|
2016-12-28 14:19:08 +01:00 |
|
Niels Lohmann
|
55be721615
|
Merge branch 'develop' into feature/fuzzer
|
2016-12-28 12:11:51 +01:00 |
|
Niels Lohmann
|
acb7e0558d
|
🚑 fixed bugs detected by AFL-Fuzz
|
2016-12-28 12:09:15 +01:00 |
|
Niels Lohmann
|
dbdcb3fec8
|
🐛 fixed bug in CBOR/MessagePack deserialization
|
2016-12-25 16:06:36 +01:00 |
|
Niels Lohmann
|
6e129fbfb7
|
📝 some small documentation fixes
|
2016-12-25 14:39:08 +01:00 |
|
Niels Lohmann
|
303e873ae8
|
🔖 bumped version to 2.0.9
|
2016-12-16 20:45:46 +01:00 |
|
Niels Lohmann
|
f6f7fed99a
|
🚨 removed some warnings
|
2016-12-16 18:57:19 +01:00 |
|
Niels Lohmann
|
f24e4f680e
|
🎨 cleanup after PR #395
|
2016-12-14 22:30:09 +01:00 |
|
Niels Lohmann
|
fe00b368ae
|
🔀 merge pull request #395 from Bosswestfalen/develop
Replace class iterator and const_iterator by using a single template class to reduce code.
|
2016-12-14 21:56:43 +01:00 |
|
Bosswestfalen
|
92e28c3153
|
added missing changes in json.hpp.re2c
|
2016-12-13 20:30:56 +01:00 |
|
Yixin Zhang
|
703d4baf8b
|
Fixed conversion warnings
Use static_cast on digit.
|
2016-12-12 21:12:08 -05:00 |
|
Yixin Zhang
|
1e981115c9
|
Fix issue #380: Signed integer overflow check
Instead of checking something like `x * y + z > max` where `x * y` can
overflow, check for `x > (max - z) / y` instead.
|
2016-12-12 21:12:08 -05:00 |
|
Alex Astashyn
|
6fba52b6da
|
Merged upstream/develop into feature/locale_independent_str_to_num
|
2016-12-12 20:27:15 -05:00 |
|
Alex Astashyn
|
5cad2006eb
|
Tweaked check for preserved sign; added LCOV_EXCL_LINE
|
2016-12-12 20:15:57 -05:00 |
|
Niels Lohmann
|
79fa8b2f41
|
🚑 fix to address #389
|
2016-12-12 23:19:43 +01:00 |
|
Niels Lohmann
|
447e01427d
|
🚨 fixed some warnings
|
2016-12-12 18:21:17 +01:00 |
|
Niels Lohmann
|
b8776e8613
|
🚑 fix for #393
|
2016-12-12 17:39:56 +01:00 |
|
Niels Lohmann
|
5402458ff5
|
🚑 fixed an AddressSanitizer warning
|
2016-12-12 08:13:26 +01:00 |
|
Niels Lohmann
|
a59eb4868a
|
🔀 Merge branch 'develop' into feature/messagepack
|
2016-12-11 16:11:43 +01:00 |
|
Niels Lohmann
|
dc6fc3e079
|
📝 clean up and added documentation for #358
|
2016-12-11 13:36:08 +01:00 |
|
Niels Lohmann
|
41673e8fed
|
🐛 fixed CBOR code and added test cases
|
2016-12-10 23:12:57 +01:00 |
|
Niels Lohmann
|
7e5d6af5c1
|
🔨 refactored msgpack code
|
2016-12-10 21:30:18 +01:00 |
|
Niels Lohmann
|
f1b95d78f9
|
🔨 refactored CBOR code to a switch
|
2016-12-10 19:29:45 +01:00 |
|
Niels Lohmann
|
d99c230f51
|
✨ implemented indefinite-length CBOR types (#387)
|
2016-12-10 18:32:56 +01:00 |
|
Alex Astashyn
|
38499e84fc
|
Removed unused struct; fixed comments
|
2016-12-08 21:38:14 -05:00 |
|
Niels Lohmann
|
6b84c4155c
|
🔨 refactored get_from_vector function
Snippet from http://stackoverflow.com/a/41031865/266378
|
2016-12-08 09:37:23 +01:00 |
|
Alex Astashyn
|
0a4a6a8399
|
Refactored to avoid using exceptions, as there are plans to support exceptionless mode
|
2016-12-07 19:53:27 -05:00 |
|
Niels Lohmann
|
b7e0c12966
|
✨ CBOR support for half-precision floats
|
2016-12-07 21:43:59 +01:00 |
|
Niels Lohmann
|
aab9bbbb93
|
🐛 fix for CBOR (small integers)
|
2016-12-07 21:24:42 +01:00 |
|
Niels Lohmann
|
8f6bfe5b32
|
🔨 refactored function to get numbers from byte vector
|
2016-12-07 14:47:06 +01:00 |
|
Niels Lohmann
|
a1693bfe48
|
Merge branch 'develop' into feature/messagepack
|
2016-12-07 08:39:57 +01:00 |
|
Alex Astashyn
|
d169598c6c
|
simplified code a bit based on @gregmarr's suggestions
|
2016-12-06 22:20:48 -05:00 |
|
Alex Astashyn
|
7a081244a5
|
Refactored preprocessing with a lambda instead of do{...}while(0)
|
2016-12-06 19:41:31 -05:00 |
|
Alex Astashyn
|
d643360575
|
Bugfix: when working with C formatting functions we need to query C locales (localeconv) rather than std::locale
|
2016-12-06 00:43:12 -05:00 |
|
Alex Astashyn
|
e41a956782
|
Alternative handling of integer types relying on strto[u]ll
|
2016-12-04 13:23:39 -05:00 |
|
Alex Astashyn
|
c75efedc6e
|
stylistic changes
|
2016-12-03 23:19:43 -05:00 |
|
Alex Astashyn
|
4eafaab816
|
Improved overflow detection; removed debugging output statements.
|
2016-12-03 22:54:36 -05:00 |
|
Alex Astashyn
|
6b78b5c2be
|
Added strtonum for locale-independent number parsing
|
2016-12-03 19:05:09 -05:00 |
|
Niels Lohmann
|
4adb8a81bf
|
📝 version bump
|
2016-12-02 18:39:35 +01:00 |
|
Niels Lohmann
|
5c811b91f1
|
Merge branch 'develop' into feature/emplace
|
2016-12-01 21:17:40 +01:00 |
|
Niels Lohmann
|
ba3c5e1a25
|
✅ more test cases
|
2016-11-29 09:49:05 +01:00 |
|
Niels Lohmann
|
ee0f23fdc6
|
🚧 bug fixes and more tests
|
2016-11-28 23:20:03 +01:00 |
|
Niels Lohmann
|
aeb4f87a27
|
✨ added return value for emplace (#349)
|
2016-11-28 18:33:46 +01:00 |
|
Niels Lohmann
|
6ecff31b7f
|
Merge branch 'develop' into feature/emplace
|
2016-11-28 18:00:10 +01:00 |
|
Niels Lohmann
|
bc238124ee
|
🚧 further simplifications
|
2016-11-27 21:42:21 +01:00 |
|
Niels Lohmann
|
a820d688eb
|
🔨 refactored number-to-vector calls
|
2016-11-27 19:11:32 +01:00 |
|
Niels Lohmann
|
a73f43a7a2
|
🚧 CBOR support (#358)
|
2016-11-27 00:10:04 +01:00 |
|
Niels Lohmann
|
87e088990b
|
Merge branch 'develop' into feature/messagepack
|
2016-11-26 18:17:18 +01:00 |
|
Niels Lohmann
|
a8522f391a
|
Merge branch 'develop' into feature/issue365
|
2016-11-26 12:45:50 +01:00 |
|
Niels Lohmann
|
2773038cf9
|
⚡ added improvements (#365)
|
2016-11-26 12:43:23 +01:00 |
|
Niels Lohmann
|
1ed510c232
|
Merge branch 'develop' into feature/filenotfound
|
2016-11-25 17:39:24 +01:00 |
|
Niels Lohmann
|
f194db9aa6
|
✅ added assertion for warning from #368
|
2016-11-24 22:07:35 +01:00 |
|
Niels Lohmann
|
dfc49e7afe
|
🐛 fixed a bug if parser was called with a stream at EOF (#367)
|
2016-11-24 21:45:10 +01:00 |
|
Niels Lohmann
|
4bb41d065b
|
🐛 parsing erroneous files yields an exception (#366)
|
2016-11-23 16:57:01 +01:00 |
|
Niels
|
6cc2d58d69
|
🐛 hopefully fixing the crashes on Linux (#365)
|
2016-11-22 20:13:47 +01:00 |
|
Niels
|
f620d74919
|
⚡ added performance fixes (#365)
|
2016-11-22 07:26:11 +01:00 |
|
Niels
|
abce5c25bb
|
📝 cleaned comments and updated README
|
2016-11-21 23:38:17 +01:00 |
|
Niels
|
43dbe02d5b
|
🐛 fixing #359
|
2016-11-21 21:53:10 +01:00 |
|
Niels
|
1be73b903e
|
proposal for emplace/emplace_back (#349)
|
2016-11-11 19:29:14 +01:00 |
|
Niels
|
543745a10e
|
starting to integrate MessagePack (#358)
|
2016-11-11 17:11:13 +01:00 |
|
Niels
|
9ca00e4880
|
readded missing header
|
2016-11-03 07:27:32 +01:00 |
|
Niels
|
e385417047
|
documented and cleaned up headers (#314)
|
2016-11-02 21:27:19 +01:00 |
|
Niels
|
700977d73e
|
version bump
|
2016-11-02 20:52:15 +01:00 |
|
Niels
|
3716a2fbe8
|
Merge branch 'develop' into feature/jsontestsuite
|
2016-11-02 17:03:12 +01:00 |
|
Niels
|
737d43724f
|
Merge branch 'feature/issue329' into develop
|
2016-11-02 16:59:23 +01:00 |
|
Niels
|
59c8343851
|
cleanup
|
2016-11-02 15:44:46 +01:00 |
|
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 |
|