1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-27 00:41:05 +03:00
Commit Graph

851 Commits

Author SHA1 Message Date
bb752fd30c move json_reverse_iterator outside of basic_json 2017-07-09 21:30:33 +02:00
0ba98b6fe0 move internal_iterator/iter_impl/iteration_proxy outside of basic_json 2017-07-09 21:30:31 +02:00
00d6e27194 move primitive_iterator outside of basic_json 2017-07-09 21:22:16 +02:00
8e681d1e57 move lexer/parser outside of basic_json 2017-07-09 21:22:15 +02:00
15625ca4a7 move input adapters outside of basic_json 2017-07-09 21:21:12 +02:00
a332142194 move json_pointer outside of basic_json 2017-07-09 21:21:09 +02:00
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
e3bb156f82 fix typo 2017-07-09 15:20:28 +09:00
b753cb6ee7 use std::make_shared 2017-07-09 15:19:08 +09:00
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
7b05e1a687 🔨 improved performance in dump for deeply nested values 2017-07-08 22:59:04 +02:00
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
b38ecb5ca9 🔨 simplified binary write
Also added some comments and improved the documentation.
2017-07-08 20:31:13 +02:00
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
e67df7c385 Merge branch 'feature/undo_171' into develop 2017-07-08 16:34:00 +02:00
552622343e 📝 fixed typos 2017-07-08 16:18:27 +02:00
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
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
8b123107c0 🔨 fixed some pedantic GCC warnings 2017-07-07 22:41:22 +02:00
32065c8045 📝 fix for #639
Removed deprecated documentation of the comparison operator.
2017-07-07 21:16:33 +02:00
e99b783def 🔨 simplifying scanner 2017-06-22 16:40:15 +02:00
dad6051f37 Merge pull request #629 from Chocobo1/c4819
Fix MSVC warning C4819
2017-06-21 18:54:03 +02:00
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
66ffac9e8a Fix MSVC warning C4819
Replace unicode whitespaces by ASCII whitespace 0x20
2017-06-21 16:17:10 +08:00
6f3bebff5c 🔨 removed unexpect function 2017-06-21 07:26:50 +02:00
9add24ff10 🔨 fixed a warning 2017-06-20 22:20:41 +02:00
2f007ca092 improved coverage 2017-06-20 22:03:36 +02:00
a5c27ede32 🔨 fixed a warning 2017-06-20 21:39:36 +02:00
e191dd833f 🔨 fixed warning about pointer members 2017-06-20 21:09:05 +02:00
82b95ca664 🔨 simplified error handling in parser 2017-06-20 20:14:18 +02:00
70b7455a13 🔨 minor change 2017-06-19 21:50:36 +02:00
4e6f548c0b Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions
add pair/tuple conversions
2017-06-19 17:31:10 +02:00
08d781058c add from_json support for std::array 2017-06-19 12:03:38 +02:00
6e4910d5c5 add pair/tuple conversions 2017-06-19 10:16:37 +02:00
112a6f4e53 🔨 replaced lexer's error message by const char* 2017-06-18 13:03:14 +02:00
04a1666ef2 Add parentheses around std::min so it bypasses the macro introduced by windows.h. 2017-06-17 22:01:18 +02:00
1fbb82de89 🔨 using std::array to buffer input 2017-06-17 20:47:53 +02:00
b27d2adcbe accept functions to check if input is valid JSON #458 2017-06-16 19:23:55 +02:00
c98364834f remove std::pair support 2017-06-13 11:11:29 +02:00
88dc7c11fa 🔨 fixed a warning 2017-06-12 19:58:44 +02:00
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
e12c2ee6a8 Merge branch 'develop' into iterator_arithmetic 2017-06-09 20:47:42 +10:00
52f934cbbf Merge pull request #609 from theodelrieu/develop
Add pair support, fix CompatibleObject conversions (fixes #600)
2017-06-07 16:38:23 +02:00
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
6661ec755b Merge branch 'develop' into iterator_arithmetic 2017-06-07 18:01:46 +10:00
0f065edff6 Revert a change in reverse iterator to pass the test cases 2017-06-07 18:01:01 +10:00
85de93ba93 add std::pair<CompatibleStringType, T> support 2017-06-06 13:56:16 +02:00
c98169d0d5 Revert "Change iterator category to random access"
This reverts commit c4ab8f827e.
2017-06-05 21:59:17 +10:00
fb91aa81da Merge branch 'develop' into iterator_arithmetic 2017-06-05 20:24:21 +10:00
2ba554e442 Merge branch 'develop' into issue550 2017-06-05 20:24:08 +10:00