Commit Graph

82 Commits (52a3af664f40775426b189c85b6088d436d05df3)

Author SHA1 Message Date
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
Jacob Potter 7103522344 Identify map- and vector-like objects in a VS14-compatible way 2014-08-13 15:12:44 -07:00
Jacob Potter d9bdd84c76 Limit maximum nesting depth (issue reported by Jeff Larson) 2014-06-04 16:24:02 -07:00
j4cbo 80578664de Merge pull request #1 from CodeFridge/feature/const
Add const to comparisons
2014-03-27 08:42:43 -07:00
Steven Kabbes 731322c2b8 Add const to comparisons 2014-03-27 03:55:52 -07:00
Jacob Potter 277e1b166f Make Json safe to use during static initialization. 2014-01-29 15:01:41 -08:00
Jacob Potter d2e5485973 Spacing fix 2014-01-27 10:59:17 -08:00
Jacob Potter 979cb4ca76 Add LICENSE.txt; some minor cleanups
- Add LICENSE.txt
- Add a comment about how we handle numbers
- Add more test code
- Fix a narrowing-conversion issue
- Fix a comment typo
2013-10-01 19:05:12 -07:00
Jacob Potter fe5e2167a5 Initial commit 2013-09-06 15:07:12 -07:00