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

1050 commits

Author SHA1 Message Date
Niels Lohmann 1e360bb32b
🔨 preparation for #505 
Added a parameter to control whether parsing CBOR and MessagePack must completely consume the input.
 2017-08-16 07:39:11 +02:00
Niels Lohmann 72afe53fa0
📝 updated documentation for update() function #661 2017-08-15 21:42:50 +02:00
Niels Lohmann 039e2f03bc
Merge branch 'develop' into feature/update 2017-08-15 19:54:22 +02:00
Niels Lohmann 08805f7f14
🔨 cleanup 2017-08-13 20:57:27 +02:00
Niels Lohmann 7d19aed567
🔨 cleanup 2017-08-13 19:02:58 +02:00
Niels Lohmann 6151b056eb
🔨 cleanup 2017-08-10 23:40:30 +02:00
Niels Lohmann a46afd4008 Merge pull request #679 from traits/patch-1 
Digraph warning
 2017-08-10 11:39:13 +02:00
traits 54c67dcfec Update json.hpp 2017-08-10 09:05:00 +02:00
WebProdPP c9509ccf97 Update json.hpp 
mistake
 2017-08-09 16:13:43 +03:00
Kyle Thompson 4b55f0ebd6 To fix compilation issue for intel OSX compiler 
o To prevent the compilation issue on OSX with the intel compiler suite.  The
error was found with icpc version 15.0.3.187 where the "__clang_version__" was
not defined correctly, while "__clang__" was.
 2017-08-08 18:43:03 -04:00
traits ab44a50d98 Digraph warning 
The original version can trigger a digraph-related warning in VS2015. Is this namespace construct a typo or something deliberate?
 2017-08-07 14:23:48 +02:00
DmitryKuk 19437c15de massage -> message 2017-08-05 10:43:08 +03:00
Niels Lohmann d2c3592908
✅ added test cases for update #661 2017-08-02 22:44:58 +02:00
Niels Lohmann d1e13d5128
🎉 first draft for #661 2017-08-02 22:12:41 +02:00
Niels Lohmann 0ea0d7d860 Merge pull request #674 from wincent/patch-1 
Fix "not constraint" grammar in docs
 2017-08-01 20:21:04 +02:00
Niels Lohmann efdfd3aa5b
⚡ replaced by-value call #673 2017-08-01 19:37:25 +02:00
Greg Hurrell 391303521a Fix "not constraint" grammar in docs 2017-08-01 08:56:28 -07:00
Niels Lohmann e60002a1b3
🔨 fixed GCC warnings in #663 
https://github.com/nlohmann/json/pull/663#issuecomment-318931884
 2017-07-31 23:17:14 +02:00
Niels Lohmann 850d856aae
🔨 cleanup after #663 2017-07-30 20:30:05 +02:00
Niels Lohmann 3d67ec40a6
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-07-30 20:01:35 +02:00
Niels Lohmann 85c768084b
🔨 using emplace 2017-07-30 20:01:31 +02:00
Niels Lohmann aad55219f8 Merge branch 'develop' into move-construction 2017-07-30 19:49:24 +02:00
Niels Lohmann 96dd4ffa19
🔨 simplified a call 2017-07-30 18:30:34 +02:00
Niels Lohmann 7737a29518
🔨 small parser performance improvements 
- replaced list of pairs by flat list in next_byte_in_range
- implemented early exit in case of parse errors
- reused memory for object keys
- direct calls to embedded objects/arrays for insertions
 2017-07-30 13:25:36 +02:00
Niels Lohmann c819a2d732
🔨 refactored some scanner internals 2017-07-28 19:18:50 +02:00
Niels Lohmann 5851daa576
✨ binary formats can be stored in std::string, std::ofstreams or std::ostringstream #477 2017-07-28 00:21:55 +02:00
Niels Lohmann 7d51214045
✨ implemented exception-free parser #458 #582 
You can now pass a boolean "allow_exceptions" to the parse functions. If it is false, no exceptions are thrown in case of a parse error. Instead, parsing is stopped at the first error and a JSON value of type "discarded" (check with is_discarded()) is returned.
 2017-07-27 20:33:11 +02:00
Niels Lohmann 669ebf51bc
🔨 fixed an error in MSVC 2017-07-27 06:04:35 +02:00
Niels Lohmann 3d589fd032
🔨 fixed compilation error 2017-07-26 23:59:56 +02:00
Niels Lohmann e6aa700360
🔨 cleanup 2017-07-26 23:44:55 +02:00
Nikita Ofitserov 93bb71232d Move from rvalues eagerly to work around MSVC problem 
On MSVC compiler, temporaries that are constructed during a
list initialization, are sometimes destroyed even before calling
the initializing constructor, instead of at the end of the
containing full-expression. This is clearly non-conforming to
[class.temporary].
As the impact of this bug is silently producing incorrect
JSON values, move eagerly from rvalues to be safe.

See https://stackoverflow.com/questions/24586411
 2017-07-25 12:17:32 +03:00
Nikita Ofitserov 897879bccb Make detail::json_ref do less work by deferring moves/copies 2017-07-24 12:29:06 +03:00
Niels Lohmann 4414f94cd5
🔨 using input/output adapters for CBOR and MessagePack 
- You can now pass a reference to a vector to the to_cbor and to_msgpack functions. The output will be written (appended) to the vector. #476

- You can now pass an output stream with uint8_t character type to the to_cbor and to_msgpack functions. #477

- You can now read from uint8_t */size in the to_cbor and to_msgpack functions. An input adapter will be created from this pair, so you need to use braces. #478
 2017-07-23 23:02:24 +02:00
Nikita Ofitserov 09cda57309 Support moving from rvalues in an std::initializer_list 
This commit works around an issue in std::initializer_list design.
By using a detail::json_ref proxy with a mutable value inside,
rvalue-ness of an input to list initializer is remembered and
used later to move from the proxy instead of copying.
 2017-07-23 23:57:17 +03:00
Nikita Ofitserov cf3ca3b78c Optimize json construction from rvalue string_t/array_t/object_t 2017-07-23 23:50:59 +03:00
Niels Lohmann 9b1c058810
🔨 reorganized interfaces for parse/accept functions #623 
We now rely on implicit conversions to an input_adapter object in the parse/accept functions.
 2017-07-23 18:11:34 +02:00
Niels Lohmann 18e0430bfe
🔨 adding destroy function to discard values 2017-07-22 22:57:22 +02:00
Niels Lohmann 5b5f0090a1
🔨 trying to fix the sanitizer error 
Travis found an error with Clang 3.8's sanitizers, see https://travis-ci.org/nlohmann/json/jobs/256366699. Unfortunately, I cannot reproduce this error with clang version 6.0.0 (trunk 308825) locally. However, this seems to be an issue, because so far, we did not reset a value after moving from it.
 2017-07-22 16:41:42 +02:00
Niels Lohmann d53ef95067
🔨 fixed some warnings 2017-07-22 15:33:31 +02:00
Niels Lohmann c7a69ae03e
⚡ started working on parser with provded result reference #418 
Internally, the parser now writes its result into a JSON value provided as a reference. To be usable, the public interfaces need to be extended.
 2017-07-22 15:18:38 +02:00
Niels Lohmann f513c46749
🔨 further cleanup 2017-07-22 13:35:04 +02:00
Niels Lohmann 024fec8a9b
🔨 more cleanup using clang-tidy 2017-07-21 18:26:07 +02:00
Niels Lohmann a09193e967
🔨 cleanup 
- Replaced codepoint calculation by bit operations.
- Fixed several clang-tidy warnings.
 2017-07-20 23:01:16 +02:00
Niels Lohmann 21d23982ca
🐛 fix for #656 
A complete rewrite of the string escape function. It now provides codepoint-to-\uxxxx escaping. Invalid UTF-8 byte sequences are not escaped, but copied as-is. I haven’t spent much time optimizing the code - but the library now agrees with Python on every single Unicode character’s escaping (see file test/data/json_nlohmann_tests/all_unicode_ascii.json).

Other minor changes: replaced "size_t" by "std::size_t"
 2017-07-17 07:53:02 +02:00
Ryan Mulder 486f3a2d16 restore necessary comman in documentation of dump 2017-07-11 14:18:02 -04:00
Ryan Mulder 40461c6c55 update comment on dump to not indicate that ensure_ascii is true by default 2017-07-11 13:59:07 -04:00
Ryan Mulder 71597be294 add ensure_ascii parameter to dump. #330 2017-07-11 13:48:08 -04:00
Théo DELRIEU 8585d35c92
move serializer outside of basic_json 2017-07-09 21:30:34 +02:00
Théo DELRIEU acff23efb2
move binary_{reader,writer} outside of basic_json 2017-07-09 21:30:33 +02:00
Théo DELRIEU bb752fd30c
move json_reverse_iterator outside of basic_json 2017-07-09 21:30:33 +02:00
Théo DELRIEU 0ba98b6fe0
move internal_iterator/iter_impl/iteration_proxy outside of basic_json 2017-07-09 21:30:31 +02:00
Théo DELRIEU 00d6e27194
move primitive_iterator outside of basic_json 2017-07-09 21:22:16 +02:00
Théo DELRIEU 8e681d1e57
move lexer/parser outside of basic_json 2017-07-09 21:22:15 +02:00
Théo DELRIEU 15625ca4a7
move input adapters outside of basic_json 2017-07-09 21:21:12 +02:00
Théo DELRIEU a332142194
move json_pointer outside of basic_json 2017-07-09 21:21:09 +02:00
Théo DELRIEU fe086d7432
forward declare basic_json, add two macros 
Those macros are used to reduce template argument boilerplate
 2017-07-09 16:16:42 +02:00
Oleg Endo e3bb156f82 fix typo 2017-07-09 15:20:28 +09:00
Oleg Endo b753cb6ee7 use std::make_shared 2017-07-09 15:19:08 +09:00
Oleg Endo f0ca96d462 include <iosfwd> instead of <iostream> 
avoid bloat caused by <iostream> and std::cout and friends in apps where
iostream are not used.
 2017-07-09 15:04:49 +09:00
Niels Lohmann 7b05e1a687
🔨 improved performance in dump for deeply nested values 2017-07-08 22:59:04 +02:00
Niels Lohmann 87bccbc335
🔨 removed exception parse_error.111 
It makes no sense to have this special exception. Instead of throwing when an input adapter is created, it is better to detect a parse error in later usage when an EOF is "read" unexpectedly.
 2017-07-08 21:35:13 +02:00
Niels Lohmann b38ecb5ca9
🔨 simplified binary write 
Also added some comments and improved the documentation.
 2017-07-08 20:31:13 +02:00
Niels Lohmann b3ac36db93
🔨 excluded uncovered lines 
These breaks were just added to silence a GCC warning - the GCC is right about warning as it cannot know that the expect function will not return in these two scenarios.
 2017-07-08 18:34:08 +02:00
Niels Lohmann e67df7c385
Merge branch 'feature/undo_171' into develop 2017-07-08 16:34:00 +02:00
Niels Lohmann 552622343e
📝 fixed typos 2017-07-08 16:18:27 +02:00
Niels Lohmann 566f6dcf30
🔥 removing usused functions #645 
It seems these functions are not required any more. The code was added in commit 7e32457 to fix issue #171. There are still regression tests for #171, so when this commit passes the CI, the functions may be removed for good.
 2017-07-08 13:33:13 +02:00
Niels Lohmann 07b78c993c
🐛 fixed undefined behavior bug 
When an empty vector was passed to the parse function, an empty iterator range was used to construct an input iterator. Unfortunately, we then cannot use the start iterator to derive a pointer from.

Found with Xcode's undefined behavior sanitizer.
 2017-07-07 23:37:16 +02:00
Niels Lohmann 8b123107c0
🔨 fixed some pedantic GCC warnings 2017-07-07 22:41:22 +02:00
Niels Lohmann 32065c8045
📝 fix for #639 
Removed deprecated documentation of the comparison operator.
 2017-07-07 21:16:33 +02:00
Niels Lohmann e99b783def
🔨 simplifying scanner 2017-06-22 16:40:15 +02:00
Niels Lohmann dad6051f37 Merge pull request #629 from Chocobo1/c4819 
Fix MSVC warning C4819
 2017-06-21 18:54:03 +02:00
Niels Lohmann 4b5433578a
✅ added progress output for Unicode tests 
Travis aborts tests if they do not produce output for 10 minutes. This commit shall fix this.
 2017-06-21 18:50:11 +02:00
Chocobo1 66ffac9e8a Fix MSVC warning C4819 
Replace unicode whitespaces by ASCII whitespace 0x20
 2017-06-21 16:17:10 +08:00
Niels Lohmann 6f3bebff5c
🔨 removed unexpect function 2017-06-21 07:26:50 +02:00
Niels Lohmann 9add24ff10
🔨 fixed a warning 2017-06-20 22:20:41 +02:00
Niels Lohmann 2f007ca092
✅ improved coverage 2017-06-20 22:03:36 +02:00
Niels Lohmann a5c27ede32
🔨 fixed a warning 2017-06-20 21:39:36 +02:00
Niels Lohmann e191dd833f
🔨 fixed warning about pointer members 2017-06-20 21:09:05 +02:00
Niels Lohmann 82b95ca664
🔨 simplified error handling in parser 2017-06-20 20:14:18 +02:00
Niels Lohmann 70b7455a13
🔨 minor change 2017-06-19 21:50:36 +02:00
Niels Lohmann 4e6f548c0b Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions 
add pair/tuple conversions
 2017-06-19 17:31:10 +02:00
Théo DELRIEU 08d781058c
add from_json support for std::array 2017-06-19 12:03:38 +02:00
Théo DELRIEU 6e4910d5c5
add pair/tuple conversions 2017-06-19 10:16:37 +02:00
Niels Lohmann 112a6f4e53
🔨 replaced lexer's error message by const char* 2017-06-18 13:03:14 +02:00
Steffen Brem 04a1666ef2 Add parentheses around std::min so it bypasses the macro introduced by windows.h. 2017-06-17 22:01:18 +02:00
Niels Lohmann 1fbb82de89
🔨 using std::array to buffer input 2017-06-17 20:47:53 +02:00
Niels Lohmann b27d2adcbe
✨ accept functions to check if input is valid JSON #458 2017-06-16 19:23:55 +02:00
Théo DELRIEU c98364834f
remove std::pair support 2017-06-13 11:11:29 +02:00
Niels Lohmann 88dc7c11fa
🔨 fixed a warning 2017-06-12 19:58:44 +02:00
Niels Lohmann ac793e957f
🔨 trying to fix #367 
Code from https://stackoverflow.com/a/44503794/266378 which is hopefully working with MSVC.
 2017-06-12 18:58:58 +02:00
HenryLee e12c2ee6a8 Merge branch 'develop' into iterator_arithmetic 2017-06-09 20:47:42 +10:00
Niels Lohmann 52f934cbbf Merge pull request #609 from theodelrieu/develop 
Add pair support, fix CompatibleObject conversions (fixes #600)
 2017-06-07 16:38:23 +02:00
Théo DELRIEU cea39dfaa8
fix #600 
Instead of calling CompatibleObjectType iterator-range constructor,
first convert json::value_type to CompatibleObjectType::value_type
 2017-06-07 10:24:59 +02:00
HenryLee 6661ec755b Merge branch 'develop' into iterator_arithmetic 2017-06-07 18:01:46 +10:00
HenryLee 0f065edff6 Revert a change in reverse iterator to pass the test cases 2017-06-07 18:01:01 +10:00
Théo DELRIEU 85de93ba93
add std::pair<CompatibleStringType, T> support 2017-06-06 13:56:16 +02:00
HenryLee c98169d0d5 Revert "Change iterator category to random access" 
This reverts commit c4ab8f827e.
 2017-06-05 21:59:17 +10:00
HenryLee fb91aa81da Merge branch 'develop' into iterator_arithmetic 2017-06-05 20:24:21 +10:00
HenryLee 2ba554e442 Merge branch 'develop' into issue550 2017-06-05 20:24:08 +10:00
Niels Lohmann 1a9d76679a
🐛 fixed the issue with GCC7 #590 2017-06-04 18:40:32 +02:00
Niels Lohmann d19c5ced4b
🐛 skipping BOM for iterators #602 
I totally forgot about byte order marks in this scenario.
 2017-06-02 12:38:32 +02:00
HenryLee 2d5f0c0549 Redefine the converting assignment in iterator 2017-05-31 00:50:14 +10:00
HenryLee 0a51fb22ed Fix indentation 2017-05-30 23:37:24 +10:00
HenryLee 881cd3f420 Remove the iter_impl<const basic_json> copy constructor and copy assignment 2017-05-30 20:57:22 +10:00
HenryLee 790e7ca9e9 Add struct keyword in front of internal_iterator 2017-05-30 20:27:05 +10:00
HenryLee ce39330ff8 Add converting constructors for iterator 2017-05-30 20:23:25 +10:00
HenryLee c4ab8f827e Change iterator category to random access 2017-05-30 19:44:55 +10:00
HenryLee daea213b44 Use static cast in the implementation of the operators of reverse iterator 2017-05-29 23:56:21 +10:00
HenryLee e42db27d6d Fix the indentation from the latest commit 2017-05-29 20:02:58 +10:00
HenryLee 3aef1a582e Change the definition of the operator override of reverse iterator to using the result of the base class directly 2017-05-29 19:45:34 +10:00
HenryLee adc73d6d5f Fix the arithmetic mistakes in reverse iterator 2017-05-29 18:52:53 +10:00
HenryLee ed62129f8e Override n + iterator operator in the iterator 2017-05-27 13:44:14 +10:00
Niels Lohmann c7bd01edf2
🔨 trying something #367 2017-05-22 17:06:46 +02:00
Niels Lohmann 9e507dfad5
✅ tests and fix for #367 
operator>> now works as expected.
 2017-05-21 16:36:51 +02:00
Niels Lohmann 16b63d3197
🔨 working toward #367 2017-05-20 12:44:13 +02:00
Niels Lohmann 8a35fdd8f5
🔨 overworked accept() function 
Fixed to make sure no token is "overlooked".
 2017-05-20 12:24:13 +02:00
Niels Lohmann 9ddc69f3a9
🐛 adjusting fix for future versions #586 2017-05-20 10:49:06 +02:00
Niels Lohmann 99cb095e89
🐛 fix for #586 
Also added a Travis builder with -std=c++1z
 2017-05-20 10:34:49 +02:00
Niels Lohmann 0f4131d138 Merge pull request #583 from zhaohuaxishi/doxygen_error 
fix doxygen error of basic_json::get()
 2017-05-15 21:09:43 +02:00
Niels Lohmann 0c3ffe12cd
⏪ reverting first/second experiment #350 2017-05-15 21:07:58 +02:00
郭荣飞 b8dff3bc16 remove the redundant @ref command 2017-05-14 07:59:07 +08:00
Niels Lohmann 723c875604
💬 replaced "backspace" with "backslash" #509 2017-05-13 19:56:38 +02:00
郭荣飞 dfa371c436 fix doxygen error of basic_json::get() 2017-05-13 23:13:04 +08:00
Niels Lohmann 9b764ee5d6
🏁 fix for #581 2017-05-13 12:27:37 +02:00
Jay Sistar b78457b792 Making comparison operators const. 2017-05-11 13:22:47 -04:00
Jay Sistar 00d841bfda Adding equal and not equal operators to proxys. 2017-05-11 14:51:06 +00:00
Jay Sistar d6c78dacd8 Fixing assignement for iterator wrapper second, and adding unit test 2017-05-10 17:53:27 +00:00
Jay Sistar 6a656ed375 Adding first and second properties to iteration_proxy_internal 2017-05-10 13:20:52 +00:00
Niels Lohmann 2afbd33472
🔨 working on #367 
Test cases succeed as expected, but the example in #367 is not fully
realized yet.
 2017-05-10 12:06:24 +02:00
Niels Lohmann 962da00171
✨ implemented an indentation character #520 
An optional parameter for dump() allows to set the character to use for
indentation (default: space). In case a JSON value is serialized to an
output stream, its fill character is used (and can be set with
std::setfill).
 2017-05-07 19:27:40 +02:00
Niels Lohmann fba1bcdd0b
🐛 fixing #575 
I forgot to consider the offset.
 2017-05-07 13:41:48 +02:00
Niels Lohmann dbcb032f22
Merge branch 'develop' into feature/manual_lexer 2017-05-05 16:48:47 +02:00
Niels Lohmann 8b9f51179e
✨ started working on #458 
a simple acceptor function
 2017-04-24 17:46:21 +02:00
Niels Lohmann 2df8f12c09
🏁 another fix for MSVC #464 
needed for VS2015.3 with /std:c++latest
 2017-04-23 20:51:29 +02:00
Niels Lohmann e24df7eca9
📝 improved documentation 2017-04-23 15:10:40 +02:00
Niels Lohmann 2a21146160
Merge branch 'develop' into feature/manual_lexer 2017-04-22 11:35:58 +02:00
Niels Lohmann db9bf953f3
🔨 improved diagnostic output 2017-04-15 10:40:10 +02:00
Niels Lohmann 717106eced
🔨 templated output_adapter and used in class serializer 2017-04-14 19:49:05 +02:00
Niels Lohmann 2d2b98a50a
Merge branch 'develop' into feature/manual_lexer 2017-04-12 18:07:25 +02:00
Niels Lohmann d4469233ac
Merge branch 'develop' into feature/insert 2017-04-12 18:01:06 +02:00
Niels Lohmann d7e57e3b73
🔨 added an output adapter for the binary writer 2017-04-09 22:13:26 +02:00
Niels Lohmann f3e43d7c6f
🔨 some cleanup 2017-04-09 21:14:51 +02:00
Niels Lohmann 186a9fd44d
🔨 simplified interface for parser, lexer, and binary_reader 
These classes are now constructed with an interface adapter. This moves
complexity from various places into the interface adapter class, or to
some factories which now implement the different flavors of input.

Furthermore, input adapters are kept in std::shared_ptr to avoid the
need of manual deletion.
 2017-04-09 19:28:15 +02:00
Niels Lohmann e48114bbd6
🔨 check for value of _HAS_CXX17 2017-04-09 14:02:04 +02:00
Niels Lohmann 628be157a2
🐛 added fix for #464 2017-04-09 13:52:04 +02:00
Niels Lohmann 97a25de938
✨ proposal for #428 
This implementation forwards the iterators to std::map::insert.
 2017-04-07 18:29:09 +02:00
Niels Lohmann d62d48fc48
🔀 merge branch 'develop' into feature/manual_lexer 2017-04-07 17:19:52 +02:00
Niels Lohmann 90273e930c
🐛 fix for #512 
We totally forgot to implement the comparison operators other than ==
and != for scalar types. Consequently, comparing a JSON value with a
scalar type led to compile errors.
 2017-04-07 15:44:41 +02:00
Niels Lohmann ff72f38863
🔨 fixed another warning 
Do not store eof() in a char buffer…
 2017-04-06 19:54:08 +02:00
Niels Lohmann b992acc2e7
🔨 fixed a compiler warning 2017-04-05 20:39:27 +02:00
Niels Lohmann 08fdfcca9a
🔨 implemented a binary writer 2017-04-04 23:17:43 +02:00
Niels Lohmann c28bf823bc
🔨 added endianess check 2017-04-04 17:30:43 +02:00
Niels Lohmann b15fc13dd1
🔨 implemented MessagePack in binary_reader 2017-04-04 16:59:19 +02:00
Niels Lohmann 3a34f2d82c
Merge branch 'develop' into feature/manual_lexer 2017-04-04 15:55:40 +02:00
Niels Lohmann 782570d46f
🔨 cleanup 2017-04-03 22:58:46 +02:00
Niels Lohmann ea667db446
🔨 fixed compilation errors 
TIL about C++:

executing m[key()]=val(); for a std::map executes

First key() then val() with Clang

First val() then key() with GCC

#wat
 2017-04-03 21:53:23 +02:00
Niels Lohmann 89efe627fe
🔨 a lot of restructuring 
- removed uncached input stream adapter; it was too slow anyway
- implemented a class binary_read which parses CBOR based on input
adapters
- in the CBOR parser, numbers are created via memcpy to avoid undefined
behavior
 2017-04-02 18:46:21 +02:00
Théo DELRIEU af9b21151c add enum class default conversions 2017-04-02 13:10:15 +02:00
Niels Lohmann 3a5cf9bd0a
🔨 improved code coverage 2017-04-01 08:34:58 +02:00
Niels Lohmann c32d2e5b3c
🔨 removed unget() function 2017-04-01 00:36:05 +02:00
Niels Lohmann 8d393b5eff
Merge branch 'develop' into feature/manual_lexer 2017-03-31 23:58:45 +02:00
Niels Lohmann 50ee0a62f5
🔨 replaced lookup-tables by switches 2017-03-31 23:24:33 +02:00
Niels Lohmann 4c821c9e9c
🔨 moved buffer size to interface 2017-03-31 17:11:51 +02:00
Lukas Barth 40aff4182f Pop for every push 2017-03-30 16:10:03 +02:00
Niels Lohmann 60057a4728
🔨 fixed bugs introduced by merging from develop 2017-03-29 07:54:26 +02:00
Niels Lohmann a690a9f2d2
Merge branch 'develop' into feature/manual_lexer 2017-03-29 00:57:09 +02:00
Niels Lohmann c2e80a72d7
🔨 deprecated j << istream / j >> ostream functions #367 
The implementation is non-standard. Deprecation allows a simpler API in
the future without removing any features.
 2017-03-29 00:39:47 +02:00
Niels Lohmann 9578c0f700
Merge branch 'develop' into feature/manual_lexer 2017-03-28 23:47:17 +02:00
Niels Lohmann 62dfdf3f5d
📝 addressed #514 
NaN values never compare equal to themselves or to other NaN values.
 2017-03-28 23:24:59 +02:00
Niels Lohmann 5d586b0192
🔨 cleanup 2017-03-28 23:20:45 +02:00
Niels Lohmann 19d119e18c
🔨 fixed a warning in MSVC 2017-03-28 22:10:24 +02:00
Niels Lohmann 6b12e40478
🏁 removed __builtin_expect for MSVC 2017-03-28 21:55:26 +02:00
Niels Lohmann 6a6fbea62c
🔨 some cleanup 2017-03-28 20:08:08 +02:00
Niels Lohmann 1e495945f1
🔨 fixed buffer overflow 2017-03-28 18:06:43 +02:00
Niels Lohmann bbb6bd9de5
🔨 fixing last failing test cases 2017-03-28 17:00:03 +02:00
Niels Lohmann b0c47abd88
🔨 rewrote string parser to cope with UTF-8 2017-03-27 22:58:44 +02:00
Niels Lohmann f75e195db3
🔨 added code for user-defined number types 2017-03-26 18:45:04 +02:00
Niels Lohmann 3425527970
🔨 added code for locale-independent number parsing 2017-03-26 18:12:58 +02:00
Niels Lohmann 06e2a291b1
🔨 fixed number parsing 2017-03-26 17:26:41 +02:00
Niels Lohmann 99e0d8b339
🔨 fixed \uxxxx parsing 2017-03-26 15:29:08 +02:00
Niels Lohmann f47cf152a8
Merge branch 'develop' into feature/manual_lexer 2017-03-26 13:14:14 +02:00
Niels Lohmann 3336194306
🔨 reverted changes that led to Travis failures 2017-03-26 12:23:10 +02:00
Niels Lohmann 53b501a785
🔨 cleanup 2017-03-25 23:31:03 +01:00
Niels Lohmann c333679a96
🔨 small refactoring 
The solution with a std::runtime_error member is more elegant. It
allows to have std::exception as base class again. However, I still
have no idea why GCC thinks the copy constructor may throw...
 2017-03-25 17:25:39 +01:00
Niels Lohmann cc36c65a89
🚑 made exceptions nothrow-copy-constructible #531 
To have nothrow-copy-constructible exceptions, we inherit from
std::runtime_error which can cope with arbitrary-length error messages.
Intermediate strings are built with static functions and then passed to
the actual constructor.
 2017-03-25 16:22:52 +01:00
Niels Lohmann a58ed3cd17
💄 cleanup 2017-03-25 14:47:23 +01:00
Niels Lohmann 40160f482a
🚧 manual lexer 
This commit removed the re2c lexer and replaced it by a manual version.
Its integration is not yet complete: number parsing does not respect
locales or overflows. Furthermore, parsing does not need to end with
EOF. Therefore, a lot of test cases fail. The idea is to push this
branch forward so we can conduct performance comparisons. So far, a
nice side effect are better diagnosis messages in case of parse errors.
 2017-03-24 19:49:02 +01:00
Ted Lyngmo cea2426731 UTF8 encoding enhancement 2017-03-24 14:56:48 +01:00
Niels Lohmann d60851168e
🚨 fixed a compiler warning #527 
The result of snprintf is later used in situations where a long may
overflow.
 2017-03-22 08:10:02 +01:00
Krzysztof Woś 86579209c8 Make exception base class visible in basic_json 2017-03-20 16:00:58 +09:00
Niels Lohmann cd43600e6f
💄 cleanup after #508 2017-03-16 19:02:05 +01:00
Niels Lohmann 773b33e016 Merge pull request #508 from theodelrieu/feature/c_array_conversion 
add to_json method for C arrays
 2017-03-16 19:00:58 +01:00
Niels Lohmann c5711f3072
🚧 a lot of minor changes 
- Removed unused headers.
- Added override where needed.
- Added description for parse_error.113 exception.
- Fixed some conversion warnings.
- Integrated cbor_expect_string function for CBOR maps.
- Added documentation on the supported CBOR/MessagePack features.
- Added test to check all initial bytes for CBOR input.
 2017-03-16 18:39:33 +01:00
Théo DELRIEU dbebf8de47
add to_json method for C arrays 
If the array can be converted to basic_json::string_t, the overload
in this commit is not chosen.
 2017-03-16 15:20:39 +01:00
Niels Lohmann 710f8a2686
📝 improved documentation for to-CBOR and to-msgpack functions 2017-03-14 23:08:05 +01:00
Niels Lohmann 1de80e8af4
🔨 added user-defined exception #493 
Replaced old std::invalid_argument exception by parse_error.111 to have
unified exceptions in case of input stream errors.
 2017-03-14 21:31:36 +01:00
Niels Lohmann 63c2c62f19
🔨 changed call from "not good()" to "fail()" #493 
Also merged develop into this feature branch.
 2017-03-14 21:24:53 +01:00
Niels Lohmann 95474e420d
🏁 added parentheses around max/min calls #506 
When <Windows.h> is included with MSVC, a macro NOMINMAX is defined
that yields compilation errors when max/min calls are encountered. This
can be fixed by un-defining NOMINMAX, or by placing parentheses around
all min/max calls. We chose the latter.
 2017-03-14 21:11:20 +01:00
Niels Lohmann b026591e9e
🚑 added special case to fuzzers to fix #504 
Since #329, NaN and inf numbers do not yield an exception, but are
stored internally and are dumped as “null”. This commit adjusts the
fuzz testers to deal with this special case.
 2017-03-14 21:05:38 +01:00
Niels Lohmann c5cf32e34d
🔨 added user-defined exception 406 2017-03-12 20:59:33 +01:00