Commit Graph

  • 61cc07ff38 📝 some documentation Niels Lohmann 2017-10-27 16:07:04 +02:00
  • 734e2b73cf 🔨 cleanup Niels Lohmann 2017-10-27 11:49:24 +02:00
  • 7820b5eccb 📝 thanks for #795 Niels Lohmann 2017-10-27 11:49:17 +02:00
  • 77f8e2f987 Merge pull request #795 from jseward/develop Niels Lohmann 2017-10-27 11:47:23 +02:00
  • c215b77936 🚀 installed Stale Bot Niels Lohmann 2017-10-25 11:37:33 +02:00
  • 992c836b30 Add missing spaces Jamie Seward 2017-10-24 00:14:25 -07:00
  • 715c98b404 Remove extra spaces Jamie Seward 2017-10-24 00:06:22 -07:00
  • 6c9a401ebc Remove old non-perfect forwarding find and count Jamie Seward 2017-10-24 00:01:56 -07:00
  • 16ffdbcb20 Remove c++17 support flag in cmake Jamie Seward 2017-10-23 23:50:06 -07:00
  • 73b1629a15 Remove tabs for spaces Jamie Seward 2017-10-23 23:45:39 -07:00
  • 1b1bd0e3e6 #714 is still not fixed Niels Lohmann 2017-10-23 12:01:50 +02:00
  • 33c6511dd0 Remove JSON_HAS_STRING_VIEW Jamie Seward 2017-10-23 00:43:26 -07:00
  • 89650c99dd 🚧 checking if #714 is now fixed with MSVC Niels Lohmann 2017-10-22 11:16:33 +02:00
  • b0c380b0f8 📝 cleanup after the last PRs Niels Lohmann 2017-10-22 09:12:35 +02:00
  • be4fba7baf Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-10-22 08:53:46 +02:00
  • f193427e91 🔨 some simplifications Niels Lohmann 2017-10-22 08:53:43 +02:00
  • 24b6e028a9 improved test coverage Niels Lohmann 2017-10-22 08:53:27 +02:00
  • 3094640446 Merge pull request #764 from pjkundert/develop-simplify-istream Niels Lohmann 2017-10-22 08:52:28 +02:00
  • ef40673acb Merge branch 'develop' into develop-simplify-istream Niels Lohmann 2017-10-22 08:52:15 +02:00
  • d468f8c4e6 Use consistent logic to determine if string_view exists Jamie Seward 2017-10-21 16:36:05 -07:00
  • 59cde1ad6e Fix for _HAS_CXX17 == 0 Jamie Seward 2017-10-21 16:29:37 -07:00
  • 1a66679929 Add string_view support Jamie Seward 2017-10-21 15:20:13 -07:00
  • 33df3250c3 Merge pull request #793 from sonulohani/develop Niels Lohmann 2017-10-21 10:58:27 +02:00
  • 92da334862 Error : 'identifier "size_t" is undefined' in linux Sonu Lohani 2017-10-21 12:52:44 +05:30
  • 2e281ba64b Merge pull request #788 from jseward/develop Niels Lohmann 2017-10-18 15:04:24 +02:00
  • a99fcb4e7d Add comments and newline Jamie Seward 2017-10-17 22:53:35 -07:00
  • 917d9d8bc3 Fix Visual Studio 2017 warnings Jamie Seward 2017-10-16 23:23:55 -07:00
  • 7c8f0a4186 Merge pull request #785 from jseward/develop Niels Lohmann 2017-10-16 19:48:17 +02:00
  • b27a142ec0 Merge pull request #783 from eld00d/patch-1 Niels Lohmann 2017-10-16 17:54:28 +02:00
  • a8cc7a1bc8 Consistently use std::char_traits int_type-->char conversion intrinsics Perry Kundert 2017-10-16 08:06:10 -07:00
  • af99090742 Disable warning C4389: '==': signed/unsigned mismatch Jamie Seward 2017-10-16 01:02:48 -07:00
  • 8ba7f69ab4 Fix whitespace Jamie Seward 2017-10-16 00:49:59 -07:00
  • 8a4af820c7 Fix warning C4706 Jamie Seward 2017-10-16 00:41:58 -07:00
  • 19f8f1c075 Add missing "u8" Jamie Seward 2017-10-16 00:21:38 -07:00
  • 5ec44fe9e3 Add /W4 for MSVS Jamie Seward 2017-10-15 22:56:38 -07:00
  • 727ee7d03e Set GENERATE_TAGFILE in Doxyfile Nate Vargas 2017-10-14 19:06:38 -05:00
  • d300a8e268 🚨 fixed warnings #776 Niels Lohmann 2017-10-13 08:46:29 +02:00
  • 0b803d0a5f Simplify the json/src/benchmarks.cpp to allow more optimal code gen. o For some unknown reason, the complexity of the benchmark platform prevented some C++ compilers from generating optimal code, properly reflective of the real performance in actual deployment. o Added the json_benchmarks_simple target, which performs the same suite of tests as json_benchmarks. o Simplified the benchmark platform, and emit an "Average" TPS (Transactions Per Second) value reflective of aggregate parse/output performance. Perry Kundert 2017-10-07 15:50:19 -07:00
  • 23440eb86e Remove outdated commentary about the value of eof(), retain input type o We assume the same character int_type as the unerlying std::istream o There are no assumptions on the value of eof(), other than that it will not be a valid unsigned char value. o To retain performance, we do not allow swapping out the underlying std::streambuf during our use of the std::istream for parsing. Perry Kundert 2017-10-06 12:27:53 -07:00
  • 45e1e3d48a Revert some unnecessary member initializer changes. Perry Kundert 2017-10-06 07:53:31 -07:00
  • 5e480b56d8 Further simplify character type handling Perry Kundert 2017-10-06 07:37:49 -07:00
  • 1b43a45bec Implement correct handling of std::streambuf int_type, eof() o Make no assumptions about eof(), other than that it is somewhere outside of the valid range of char_type. Perry Kundert 2017-10-05 15:37:03 -07:00
  • 184dab60e6 Accelerate access to underlying std::istream streambuf Perry Kundert 2017-10-05 14:13:55 -07:00
  • f775922ca8 Specify initializers for yytest, token_string using initializer-lists o We can retain -Weffc++ and specify default initializers by using initializer lists. The risks are low (of additional non-conformat compilers), because there is already one other such initialization used in the code-base. Perry Kundert 2017-10-04 15:01:10 -07:00
  • 546e148b24 Further performance improvements, and corrections in get_token_string o An (-'ve valued, typically -1) EOF must never be allowed in token_string, as it be converted to 255 -- a legitimate value. o Comparing against a specific eof() (-1, typically) is more costly than detecting +'ve/-'ve. Since EOF is the only non-positive value allowed we can use the simpler test. o Removed unnecessary test for token_string size, as it is already tested in the method, and must never occur in correct code; used an assert instead. Perry Kundert 2017-10-04 11:31:10 -07:00
  • 8665e25942 Rename get_string to move_string to imply side-effect Perry Kundert 2017-10-04 10:47:52 -07:00
  • e0d890cc23 Corrected unnnecessary const restriction on returned std::string Perry Kundert 2017-10-04 10:21:55 -07:00
  • 97a388802d Improve performance by constructing yytext as a std::string o Return its contents when necessary. In many cases, this avoids construction of multiple copies of the yytext token. Exceeds performance of current develop branch. Perry Kundert 2017-10-04 08:40:32 -07:00
  • 7c523338c5 Remove unnnecessary NUL termination of yytext (as it may contain NULs) Perry Kundert 2017-10-04 08:33:35 -07:00
  • 14ca1f6f09 Restore istream performance #764 o Use std::streambuf I/O instead of std::istream; does not maintain (unused) istream flags. o Further simplify get/unget handling. o Restore original handling of NUL in input stream; ignored during token_string escaping. Perry Kundert 2017-10-03 14:38:38 -07:00
  • 12efeadc2e Further simplify istream handling; use native unget Perry Kundert 2017-10-03 08:49:39 -07:00
  • f585fe4eec Test to confirm parsing of multiple JSON records in a istream #367 Perry Kundert 2017-10-02 14:17:23 -07:00
  • 90adf6ec20 Simplify get_token_string, unnecessary buffering, handle Byte Order Mark Perry Kundert 2017-10-02 08:50:15 -07:00
  • 0c0851dbea 📝 comment how to integrate tsl::ordered_map (#546) Niels Lohmann 2017-10-05 20:36:18 +02:00
  • bab4a15748 📝 comment how to integrate fifo_map (#485) Niels Lohmann 2017-10-05 20:33:27 +02:00
  • 60439aff05 📝 different cmake call Niels Lohmann 2017-10-05 19:43:59 +02:00
  • 73d1b55aba 🔧 executing tests in parallel Niels Lohmann 2017-10-05 19:43:39 +02:00
  • 615366447a 🔧 removing -Weffc++ warnings Niels Lohmann 2017-10-05 19:43:19 +02:00
  • 73727c989c Merge branch 'feature/coveralls' into develop Niels Lohmann 2017-10-05 19:08:28 +02:00
  • 75f4678b96 🔨 added filter script for branch coverage Niels Lohmann 2017-10-05 19:08:15 +02:00
  • c204ac82e0 🔨 adjusted Coverity script to work without Makefile Niels Lohmann 2017-10-05 07:13:59 +02:00
  • 7b82e4b4c8 🔨 added Makefile target to calculate lcov coverage Niels Lohmann 2017-10-05 00:17:09 +02:00
  • 1b3df3a63f 🔨 trying to use Coveralls with CMake #698 Niels Lohmann 2017-10-04 22:18:21 +02:00
  • 99ee4c1eaf 🔨 cleaned up Makefiles and docs #698 Niels Lohmann 2017-10-04 19:27:35 +02:00
  • 5cb6d7187d 🚨 fixing last warning in #755 Niels Lohmann 2017-10-04 17:28:35 +02:00
  • 4e81c1db47 Merge pull request #765 from nlohmann/feature/issue698 Niels Lohmann 2017-10-04 10:39:56 +02:00
  • e2045eae53 🏁 and another try Niels Lohmann 2017-10-03 18:47:08 +02:00
  • a85bc358f7 🏁 another try Niels Lohmann 2017-10-03 18:21:40 +02:00
  • 3457e7bc5b 🏁 try to get MSVC 2017 running again Niels Lohmann 2017-10-03 17:57:40 +02:00
  • 54bd1b5124 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-03 17:23:05 +02:00
  • 7435d54e97 🔨 clean up Niels Lohmann 2017-10-02 23:06:41 +02:00
  • 4912231450 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-02 18:25:25 +02:00
  • b91805e1f0 🚨 removing a compiler warning #755 Niels Lohmann 2017-10-02 18:11:36 +02:00
  • f89f8b2d0b Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-02 17:47:53 +02:00
  • 8be303d4fb 🏁 fixing a min() call for MSVC #762 Niels Lohmann 2017-10-02 13:54:14 +02:00
  • 1df836ce40 removed call to std::signbit #761 Niels Lohmann 2017-10-01 15:48:29 +02:00
  • 8af49d4be5 🚨 removing compiler warnings #755 Niels Lohmann 2017-09-30 11:00:26 +02:00
  • 1a66527dca 📝 fixed documentation #745 Niels Lohmann 2017-09-30 10:18:18 +02:00
  • b05ea3de55 Merge pull request #753 from gregmarr/patch-1 Niels Lohmann 2017-09-26 22:36:36 +02:00
  • ec60ff3451 Add info for the vcpkg package. gregmarr 2017-09-26 08:39:38 -07:00
  • 647711fad1 improved test coverage Niels Lohmann 2017-09-14 17:31:28 +02:00
  • 737816d0cd 👷 another try with Travis Niels Lohmann 2017-09-14 17:31:14 +02:00
  • e75adc21a5 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-13 18:57:25 +02:00
  • b90529c36d improved test coverage Niels Lohmann 2017-09-13 18:56:54 +02:00
  • 82c93680d1 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 22:38:23 +02:00
  • e2e0ecd867 improved test coverage Niels Lohmann 2017-09-10 22:38:04 +02:00
  • 248db1e423 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 11:42:57 +02:00
  • 7410763731 improved test coverage Niels Lohmann 2017-09-10 11:42:43 +02:00
  • cafc2d057a Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 10:22:10 +02:00
  • da97cf7895 improved test coverage Niels Lohmann 2017-09-10 10:21:53 +02:00
  • 295d65ada7 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 01:13:43 +02:00
  • fcba9ec537 🔨 clean up Niels Lohmann 2017-09-10 01:12:03 +02:00
  • 41994ba028 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 16:53:37 +02:00
  • b21d7810fa improved test coverage Niels Lohmann 2017-09-09 16:53:27 +02:00
  • c1d6478584 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 13:07:40 +02:00
  • 9ae6796a38 improved test coverage Niels Lohmann 2017-09-09 13:07:10 +02:00
  • 31ce7e1e59 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 11:05:20 +02:00
  • fd250ae2b1 improved test coverage Niels Lohmann 2017-09-09 11:04:58 +02:00
  • 5c08b84dec back to previous MSVC 2017 Niels Lohmann 2017-09-06 18:26:52 +02:00
  • da14286abb 👷 try to use MSVC 2017 again Niels Lohmann 2017-09-06 18:13:35 +02:00