Commit Graph

76 Commits (a4da043b17f02face92c88e24e61b03f7434c205)

Author SHA1 Message Date
Zhijiang TAO a4da043b17 update readme 2016-08-16 11:56:09 +08:00
Zhijiang TAO f4ffe052d9 ADDING INT64 UINT64 test cases 2016-08-16 11:10:14 +08:00
Zhijiang TAO eb4d67a68e using longlong for internel storage 2016-08-16 11:00:25 +08:00
Zhijiang TAO f6b4188933 添加int64类型,但是还是会溢出 2016-08-16 00:14:02 +08:00
Andrew Twyman 787809178d Merge pull request #71 from admsyn/fix-cmake-c++11-flag
Use CXX_STANDARD to specify c++11 compile flags
2016-08-12 17:10:09 -07:00
Adam Carlucci 580fd44b5f Use CXX_STANDARD to specify c++11 compile flags 2016-08-10 18:16:59 -07:00
Andrew Twyman fb6cc808e0 Merge pull request #69 from dropbox/atwyman/pre-processor-customization
Allow json11 tests to be customized with pre-processor defines
2016-07-28 22:54:22 -07:00
Andrew Twyman 7a947c1e2f Remove extraneous parentheses 2016-07-28 22:42:01 -07:00
Andrew Twyman 200c98aede Allow json11 tests to be customized with pre-processor defines 2016-07-28 22:27:43 -07:00
Andrew Twyman 78e43a9ea7 Merge pull request #68 from AustinBrunkhorst/master
[MSVC 14] int to bool conversion performance warning
2016-07-25 17:30:21 -07:00
Austin Brunkhorst 40f10bd28d Use `false` instead of `0` + conversion. 2016-07-25 17:28:15 -07:00
Andrew Twyman d9867d8ab3 Merge pull request #66 from 4brunu/master
Add option to disable unit tests
2016-07-25 17:00:35 -07:00
Austin Brunkhorst 467dc6ae05 Fixes warning C4800: 'int': forcing value to bool 'true' or 'false' on MSVC 14 2016-07-24 11:34:17 -07:00
Bruno Coelho 3704671508 Add option to disable unit tests 2016-07-05 15:37:44 +01:00
Andrew Twyman 913269c7a4 Merge pull request #64 from shrikant-dropbox/master
MSVS 2013 compatibility changes.
2016-06-20 17:58:44 -07:00
Shrikant Kelkar f6c0f68737 MSVS 2013 compatibility changes. 2016-06-20 17:36:17 -07:00
Andrew Twyman a20878aaa5 Make the DR1467 canary test code optional 2016-05-18 18:36:58 -07:00
Andrew Twyman 4597f98abe Fix sign comparison warnings, and parser confusion 2016-05-18 18:31:52 -07:00
j4cbo df1fdbfd79 Merge pull request #57 from ChrisKitching/fixpkgconfigInstall
Don't assume in-tree builds when installing json11.pc
2016-05-14 10:52:20 -07:00
Chris Kitching 05b5514400
Don't assume in-tree builds when installing json11.pc 2016-05-05 02:43:43 +01:00
j4cbo 8452587160 Merge pull request #55 from Dushistov/parse_not_full_json
Parse half ready json
2016-05-03 07:22:59 -07:00
j4cbo a1409a9a1a Merge pull request #56 from Dushistov/json_parser_anonymous
make JsonParser invisible from outside
2016-05-03 07:13:45 -07:00
Evgeniy A. Dushistov 0e4ace7e40 make parser invisible from outside 2016-04-28 01:28:42 +03:00
Evgeniy A. Dushistov 33bca8e178 implement parsing of chunked json
Update: add more tests + use parser.failed
2016-04-27 23:37:17 +03:00
Andrew Twyman eefbd630ec Merge pull request #53 from njwhite/master
Generate pkg-config File & Add Install Target
2016-04-18 20:04:30 -07:00
Nick White 8076ba74e0 Generate pkg-config File & Add Install
...to the CMake build script. The pkg-config file needs a version number (which
it takes from the CMakeLists.txt variable), which I've set to 1.0.0. The cmake
project declaration needs to be after the minimum-requirement declaration to
avoid errors from the cmake's change in VERSION semantics.
2016-04-16 18:43:09 +01:00
Andrew Twyman 3ae180068d Merge pull request #52 from kirisetsz/master
Update CMakeLists to 3.x style
2016-04-09 01:06:18 -07:00
kirisetsz 5e664c99d8 Update CMakeLists to 3.x style 2016-04-08 01:16:21 +08:00
j4cbo afcc8d0d82 Merge pull request #47 from PSPDFKit-labs/fix-warnings
This fixes a “No previous prototype for function” warning.
2016-01-06 12:05:00 -08:00
Peter Steinberger e1d5bcc94d This fixes a “No previous prototype for function” warning. 2015-12-29 18:55:48 +01:00
Andrew Twyman a6a661e924 Merge pull request #42 from capitalaslash/detect_comments
Detect and ignore comments
2015-12-03 14:26:10 -08:00
Antonio Cervone ebc3a6b038 watch out for i+1 to overflow the buffer 2015-12-02 10:01:29 +01:00
Antonio Cervone 988a8fc249 make JsonParser::strategy const 2015-12-02 09:57:25 +01:00
Antonio Cervone 49a6197d08 use an enum to select strategy on comment parsing 2015-12-01 11:08:37 +01:00
Antonio Cervone f9833b1e7d add test for unfinished multi-line comment 2015-12-01 11:01:47 +01:00
Antonio Cervone c6c6fcfeff add test for inline comment without trailing newline 2015-12-01 11:01:27 +01:00
Antonio Cervone aa270ad5b7 fix test where the trailing / was not reached due to a previous error 2015-12-01 11:00:58 +01:00
Antonio Cervone 982b2d8885 improve testing for bad inline comments 2015-12-01 11:00:11 +01:00
Antonio Cervone 4b0f5cfd77 check for end of input on every increment of the cursor 2015-12-01 10:59:22 +01:00
Antonio Cervone f21b8c360e add malformed comment tests.
add 3 testes for:
- unended multi-line comment,
- malformed single-line comment,
- trailing slash
2015-11-30 12:43:40 +01:00
Antonio Cervone d292fce9f2 improve comment test.
test also for nested and mixed comments.
whitespaces/newlines are already intermixed between comments.
2015-11-30 12:42:24 +01:00
Antonio Cervone 2f5c64225d detect malformed comments 2015-11-30 12:40:20 +01:00
Antonio Cervone b05e655c0a detect multiple comments with a loop instead of using recursion 2015-11-30 12:28:45 +01:00
Antonio Cervone 882feb56ac add bool to detect comments as run-time option. 2015-11-30 12:27:35 +01:00
Antonio Cervone de098c4d52 add testing for comment functionality 2015-11-27 16:46:18 +01:00
Antonio Cervone 08c391f89a introduce consume_garbage()
new routine that consumes whitespaces and comments.
activated by JSON11_COMMENTS pre-processor flag.
2015-11-27 16:41:05 +01:00
Antonio Cervone 2d1d176a55 add routine to detect c-style comments 2015-11-27 16:31:43 +01:00
j4cbo 765cee3ed1 Merge pull request #39 from PollRobots/use-cmake
Add cmake support
2015-10-19 16:30:01 -07:00
j4cbo b1e78cb1e4 Merge pull request #40 from PollRobots/fix-stdin-test
Fixes bug in parse_from_stdin
2015-08-24 11:24:01 -07:00
Paul C Roberts a021c3fbe2 Fixes bug in parse_from_stdin
Handles end of file correctly
2015-08-19 15:00:12 -07:00