Commit Graph

  • fd37016cf8 Allow trailing comma master Vitaliy Filippov 2023-02-23 01:15:28 +0300
  • 2273bdd966 Mutable v4 mutable-v4 Vitaliy Filippov 2022-03-13 13:09:55 +0300
  • f88fdab2ab Add json object and array mutation methods mutable Vitaliy Filippov 2020-04-14 01:50:49 +0300
  • dcb1e476c3 Mutable v3 mutable-v3 Vitaliy Filippov 2022-03-13 12:36:46 +0300
  • 3e0040d737 Mutable v2 mutable-v2 Vitaliy Filippov 2022-03-13 12:18:34 +0300
  • 52a3af664f Fix compilation under clang Vitaliy Filippov 2022-01-15 23:38:58 +0300
  • 55363fc265 Use strto* instead of std::sto* Vitaliy Filippov 2021-11-16 12:48:28 +0300
  • 34781ed7ee Add as_string() casting numbers to strings Vitaliy Filippov 2021-11-10 02:17:33 +0300
  • 3a5b4477bc Add string,number->bool conversions Vitaliy Filippov 2021-11-06 14:25:23 +0300
  • 97f06cb20c Add string->number conversions Vitaliy Filippov 2020-04-24 02:56:05 +0300
  • 88de39206d ull Vitaliy Filippov 2019-12-23 14:14:36 +0300
  • a4da043b17 update readme Zhijiang TAO 2016-08-16 11:56:09 +0800
  • f4ffe052d9 ADDING INT64 UINT64 test cases Zhijiang TAO 2016-08-16 11:10:14 +0800
  • eb4d67a68e using longlong for internel storage Zhijiang TAO 2016-08-16 11:00:25 +0800
  • f6b4188933 添加int64类型,但是还是会溢出 Zhijiang TAO 2016-08-16 00:14:02 +0800
  • 787809178d Merge pull request #71 from admsyn/fix-cmake-c++11-flag Andrew Twyman 2016-08-12 17:10:09 -0700
  • 580fd44b5f Use CXX_STANDARD to specify c++11 compile flags Adam Carlucci 2016-08-10 18:16:59 -0700
  • fb6cc808e0 Merge pull request #69 from dropbox/atwyman/pre-processor-customization Andrew Twyman 2016-07-28 22:54:22 -0700
  • 7a947c1e2f Remove extraneous parentheses Andrew Twyman 2016-07-28 22:42:01 -0700
  • 200c98aede Allow json11 tests to be customized with pre-processor defines Andrew Twyman 2016-07-28 22:27:43 -0700
  • 78e43a9ea7 Merge pull request #68 from AustinBrunkhorst/master Andrew Twyman 2016-07-25 17:30:21 -0700
  • 40f10bd28d Use `false` instead of `0` + conversion. Austin Brunkhorst 2016-07-25 17:28:15 -0700
  • d9867d8ab3 Merge pull request #66 from 4brunu/master Andrew Twyman 2016-07-25 17:00:35 -0700
  • 467dc6ae05 Fixes warning C4800: 'int': forcing value to bool 'true' or 'false' on MSVC 14 Austin Brunkhorst 2016-07-24 11:34:17 -0700
  • 3704671508 Add option to disable unit tests Bruno Coelho 2016-07-05 15:37:44 +0100
  • 913269c7a4 Merge pull request #64 from shrikant-dropbox/master Andrew Twyman 2016-06-20 17:58:44 -0700
  • f6c0f68737 MSVS 2013 compatibility changes. Shrikant Kelkar 2016-06-20 17:36:17 -0700
  • a20878aaa5 Make the DR1467 canary test code optional Andrew Twyman 2016-05-18 18:36:58 -0700
  • 4597f98abe Fix sign comparison warnings, and parser confusion Andrew Twyman 2016-05-18 18:31:52 -0700
  • df1fdbfd79 Merge pull request #57 from ChrisKitching/fixpkgconfigInstall j4cbo 2016-05-14 10:52:20 -0700
  • 05b5514400
    Don't assume in-tree builds when installing json11.pc Chris Kitching 2016-05-05 02:43:43 +0100
  • 8452587160 Merge pull request #55 from Dushistov/parse_not_full_json j4cbo 2016-05-03 07:22:59 -0700
  • a1409a9a1a Merge pull request #56 from Dushistov/json_parser_anonymous j4cbo 2016-05-03 07:13:45 -0700
  • 0e4ace7e40 make parser invisible from outside Evgeniy A. Dushistov 2016-04-28 01:28:42 +0300
  • 33bca8e178 implement parsing of chunked json Evgeniy A. Dushistov 2016-04-27 12:47:30 +0300
  • eefbd630ec Merge pull request #53 from njwhite/master Andrew Twyman 2016-04-18 20:04:30 -0700
  • 8076ba74e0 Generate pkg-config File & Add Install Nick White 2016-04-16 18:41:25 +0100
  • 3ae180068d Merge pull request #52 from kirisetsz/master Andrew Twyman 2016-04-09 01:06:18 -0700
  • 5e664c99d8 Update CMakeLists to 3.x style kirisetsz 2016-04-08 01:16:21 +0800
  • afcc8d0d82 Merge pull request #47 from PSPDFKit-labs/fix-warnings j4cbo 2016-01-06 12:05:00 -0800
  • e1d5bcc94d This fixes a “No previous prototype for function” warning. Peter Steinberger 2015-12-29 18:55:48 +0100
  • a6a661e924 Merge pull request #42 from capitalaslash/detect_comments Andrew Twyman 2015-12-03 14:26:10 -0800
  • ebc3a6b038 watch out for i+1 to overflow the buffer Antonio Cervone 2015-12-02 10:01:29 +0100
  • 988a8fc249 make JsonParser::strategy const Antonio Cervone 2015-12-02 09:57:25 +0100
  • 49a6197d08 use an enum to select strategy on comment parsing Antonio Cervone 2015-12-01 11:08:37 +0100
  • f9833b1e7d add test for unfinished multi-line comment Antonio Cervone 2015-12-01 11:01:47 +0100
  • c6c6fcfeff add test for inline comment without trailing newline Antonio Cervone 2015-12-01 11:01:27 +0100
  • aa270ad5b7 fix test where the trailing / was not reached due to a previous error Antonio Cervone 2015-12-01 11:00:58 +0100
  • 982b2d8885 improve testing for bad inline comments Antonio Cervone 2015-12-01 11:00:11 +0100
  • 4b0f5cfd77 check for end of input on every increment of the cursor Antonio Cervone 2015-12-01 10:59:22 +0100
  • f21b8c360e add malformed comment tests. Antonio Cervone 2015-11-30 12:43:40 +0100
  • d292fce9f2 improve comment test. Antonio Cervone 2015-11-30 12:42:24 +0100
  • 2f5c64225d detect malformed comments Antonio Cervone 2015-11-30 12:40:20 +0100
  • b05e655c0a detect multiple comments with a loop instead of using recursion Antonio Cervone 2015-11-30 12:28:45 +0100
  • 882feb56ac add bool to detect comments as run-time option. Antonio Cervone 2015-11-30 12:27:35 +0100
  • de098c4d52 add testing for comment functionality Antonio Cervone 2015-11-27 16:46:18 +0100
  • 08c391f89a introduce consume_garbage() Antonio Cervone 2015-11-27 16:41:05 +0100
  • 2d1d176a55 add routine to detect c-style comments Antonio Cervone 2015-11-27 16:31:43 +0100
  • 765cee3ed1 Merge pull request #39 from PollRobots/use-cmake j4cbo 2015-10-19 16:30:01 -0700
  • b1e78cb1e4 Merge pull request #40 from PollRobots/fix-stdin-test j4cbo 2015-08-24 11:24:01 -0700
  • a021c3fbe2 Fixes bug in parse_from_stdin Paul C Roberts 2015-08-19 15:00:12 -0700
  • 0c6e9d77a4 Add cmake support Paul C Roberts 2015-08-19 14:53:28 -0700
  • 61ba0a1dd2 Make test.cpp compilable with GCC. Add clean rule to Makefile. Andrew Twyman 2015-06-17 18:02:34 -0700
  • 50ed8c90e5 Test to demonstrate compiler behavior change in Xcode 7 / clang 3.7. Andrew Twyman 2015-06-17 15:02:22 -0700
  • 2aa22aab4b Merge pull request #36 from jcmonnin/master j4cbo 2015-06-12 09:10:26 -0700
  • 0e8c5ba68f When dumping non-finite floating point values, output 'null'. Jean-Claude Monnin 2015-06-04 10:35:12 +0200
  • 0193642bf8 Merge pull request #35 from akrieger/working j4cbo 2015-04-22 16:36:27 -0700
  • e15ff418dd For extra safety, add an explicit bounds check in utf8 parsing. Andrew Krieger 2015-04-22 14:00:47 -0700
  • cfdd67577c Use strtod not atof Steven Kabbes 2014-11-18 15:57:04 +0100
  • ae9542cc35 in encode_utf8, there is an implicit truncating cast that VS2015CTP6 is warning about. I've added static_cast<char> to silence the warning and express the intent. Steve Carroll 2015-03-03 17:47:56 -0800
  • 51166ddca6 Merge pull request #27 from k0zmo/const-pair j4cbo 2015-01-08 13:41:49 -0800
  • 7fd738ae42 iterate over pair of const string and Json k0zmo 2014-12-30 10:28:51 +0100
  • be631169db Merge pull request #24 from masamitsu-murase/use_compare j4cbo 2014-12-04 10:14:07 -0800
  • e31ac4ebb4 Merge pull request #23 from masamitsu-murase/use_static_cast_for_hierarchy_navigation j4cbo 2014-12-03 16:29:28 -0800
  • 37ca641d82 Use static_cast instead of reinterpret_cast for hierarchy navigation. Masamitsu MURASE 2014-11-30 03:49:23 +0900
  • c6a8736171 Use string::compare to improve performance. Masamitsu MURASE 2014-11-30 03:36:23 +0900
  • 6de4c29e76 fix int->double->int conversion in JsonInt Jacob Potter 2014-09-22 11:59:58 -0700
  • 73baf7e677 Style fixes Jacob Potter 2014-09-15 11:33:11 -0700
  • 679e4b83d2 Another VS14 fix Jacob Potter 2014-08-14 12:14:21 -0700
  • 7103522344 Identify map- and vector-like objects in a VS14-compatible way Jacob Potter 2014-08-13 14:58:20 -0700
  • d9bdd84c76 Limit maximum nesting depth (issue reported by Jeff Larson) Jacob Potter 2014-06-04 12:22:06 -0700
  • 80578664de Merge pull request #1 from CodeFridge/feature/const j4cbo 2014-03-27 08:42:43 -0700
  • 731322c2b8 Add const to comparisons Steven Kabbes 2014-03-27 03:55:52 -0700
  • 277e1b166f Make Json safe to use during static initialization. Jacob Potter 2014-01-29 13:30:18 -0800
  • d2e5485973 Spacing fix Jacob Potter 2014-01-27 10:59:17 -0800
  • 979cb4ca76 Add LICENSE.txt; some minor cleanups Jacob Potter 2013-10-01 19:04:32 -0700
  • fe5e2167a5 Initial commit Jacob Potter 2013-09-03 14:45:11 -0700