mirror/json11
2
0
Fork 0
mirror of https://github.com/dropbox/json11.git synced 2025-03-07 19:56:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
84 Commits 1 Branch 1 Tag 269 KiB
f6b4989d3b
Commit Graph

84 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick White
f6b4989d3b don't override CMAKE_INSTALL_PREFIX if specified 2017-01-12 18:03:09 +00:00
Andrew Twyman
a501d06b98 Merge pull request #72 from admsyn/feature-cmake-dr1467-canary 
Add cmake option for DR1467 canary tests
 2016-12-27 18:36:36 -08:00
Adam Carlucci
6de8cacf3c default to OFF for DR1467 canary test 2016-12-27 18:28:00 -08:00
Adam Carlucci
42ce09babf add cmake option for dr1467 canary tests 2016-12-27 18:28:00 -08:00
Andrew Twyman
649b54ae28 Merge pull request #76 from hhony/master 
CMakeLists: avoid LD errors, use -fPIC
 2016-12-27 14:13:49 -08:00
Andrew Twyman
d232477cfd Disable DR1467 canary by default. 
It's been long enough, an the standards committee seems unlikely enough to act that we need to consider this issue to be normal behavior.  It's more important that new users of the library have something they can compile and run successfully the first time.
See #86 for more details.
 2016-12-22 17:41:07 -08:00
Andrew Twyman
887c6b1410 Unsigned size type 2016-12-22 17:37:20 -08:00
Andrew Twyman
bb0e389ffd Merge pull request #79 from vovoid/master 
Fixed a type conversion warning
 2016-10-06 14:26:22 -07:00
Jonatan "jaw" Wallmander
330956a47d better handling of fail template in returning char 2016-10-06 09:53:49 +02:00
Jonatan "jaw" Wallmander
5d223b36ee Fixed a type conversion warning 2016-10-01 17:31:51 +02:00
hhony
f6b2731f2b CMakeLists: pkgconfig: stage for architecture specific compile/install 2016-09-07 17:33:00 -07:00
hhony
ba5c850b59 CMakeLists: avoid LD errors library should be compiled as position independent code 2016-09-07 17:22:50 -07: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