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
108 Commits 1 Branch 1 Tag 269 KiB
d68527c539
Commit Graph

108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul C Roberts
0c6e9d77a4 Add cmake support 
This uses cmake to allow building as a static library and to build the tests

To use `cmake`

```
$ mkdir build
$ cd build
$ cmake ..
 .
 .
-- Build files have been written to: ~/json11/build
$ make
Scanning dependencies of target json11
[ 20%] Building CXX object CMakeFiles/json11.dir/json11.cpp.o
[ 40%] Linking CXX static library libjson11.a
[ 40%] Built target json11
Scanning dependencies of target json11_test
[ 60%] Building CXX object CMakeFiles/json11_test.dir/json11.cpp.o
[ 80%] Building CXX object CMakeFiles/json11_test.dir/test.cpp.o
[100%] Linking CXX executable json11_test
[100%] Built target json11_test
$ make test
running tests...
Test project /Users/paul/dev/json11/build
    Start 1: json11_test
    1/1 Test #1: json11_test ......................   Passed    0.00 sec

    100% tests passed, 0 tests failed out of 1

    Total Test time (real) =   0.01 sec
$
```
 2015-08-19 14:53:28 -07:00
Andrew Twyman
61ba0a1dd2 Make test.cpp compilable with GCC. 
Add clean rule to Makefile.
 2015-06-17 18:02:34 -07:00
Andrew Twyman
50ed8c90e5 Test to demonstrate compiler behavior change in Xcode 7 / clang 3.7. 2015-06-17 15:02:22 -07:00
j4cbo
2aa22aab4b Merge pull request #36 from jcmonnin/master 
When dumping non-finite floating point values, output 'null'.
 2015-06-12 09:10:26 -07:00
Jean-Claude Monnin
0e8c5ba68f When dumping non-finite floating point values, output 'null'. 
In JSON the float point special values NaN and Infinity should serialised to 'null'.
Previously, 'snprintf' in 'dump' was giving a string that isn't compliant to the JSON standard.
 2015-06-04 10:35:12 +02:00
j4cbo
0193642bf8 Merge pull request #35 from akrieger/working 
For extra safety, add an explicit bounds check in utf8 parsing.
 2015-04-22 16:36:27 -07:00
Andrew Krieger
e15ff418dd For extra safety, add an explicit bounds check in utf8 parsing. 2015-04-22 16:09:18 -07:00
Steven Kabbes
cfdd67577c Use strtod not atof 2015-04-08 11:37:06 -07:00
Steve Carroll
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.
 2015-04-08 10:24:36 -07:00
j4cbo
51166ddca6 Merge pull request #27 from k0zmo/const-pair 
iterate over pair of const string and Json
 2015-01-08 13:41:49 -08:00
k0zmo
7fd738ae42 iterate over pair of const string and Json 2014-12-30 10:31:43 +01:00
j4cbo
be631169db Merge pull request #24 from masamitsu-murase/use_compare 
Use string::compare to improve performance.
 2014-12-04 10:14:07 -08:00
j4cbo
e31ac4ebb4 Merge pull request #23 from masamitsu-murase/use_static_cast_for_hierarchy_navigation 
Use static_cast instead of reinterpret_cast for hierarchy navigation.
 2014-12-03 16:29:28 -08:00
Masamitsu MURASE
37ca641d82 Use static_cast instead of reinterpret_cast for hierarchy navigation. 2014-11-30 03:49:23 +09:00
Masamitsu MURASE
c6a8736171 Use string::compare to improve performance. 2014-11-30 03:36:23 +09:00
Jacob Potter
6de4c29e76 fix int->double->int conversion in JsonInt 2014-09-22 12:07:43 -07:00
Jacob Potter
73baf7e677 Style fixes 2014-09-22 10:19:33 -07:00
Jacob Potter
679e4b83d2 Another VS14 fix 2014-08-14 12:14:21 -07:00