Commit graph

200 commits

Author SHA1 Message Date
Niels
63c70fa07e minor changes 2015-02-24 23:19:19 +01:00
Niels
d524e23204 overworked iterators 2015-02-22 17:52:27 +01:00
Niels
bc2e3a798d a more forgiving array behavior 2015-02-21 13:24:07 +01:00
Niels
afd02eee44 fixed [] operator; added README 2015-02-18 22:28:56 +01:00
Niels
9e7941b6ba more type adjustments 2015-02-17 00:22:12 +01:00
Niels
432a54e570 some type fixes 2015-02-16 23:17:28 +01:00
Niels
a3f52a5a04 minor change to make code more portable 2015-02-16 22:54:07 +01:00
Niels
5ca84052a7 removed unused code and fixed includes 2015-02-16 22:47:30 +01:00
Niels
db91140156 clean up 2015-02-15 23:27:35 +01:00
Niels
429d2099ab more allocators 2015-02-15 23:13:46 +01:00
Niels
b387761e12 forgot to destroy object 2015-02-15 22:58:35 +01:00
Niels
568d75954e experiment with user-defined allocator 2015-02-15 22:49:26 +01:00
Niels
b1be1b45ee minor change 2015-02-15 18:43:17 +01:00
Niels
d31d1ca664 fix of the fix 2015-02-15 17:40:46 +01:00
Niels
9f87fd464a fixed Valgrind error 2015-02-15 17:07:19 +01:00
Niels
f1f72403cd some unicode magic 2015-02-15 16:56:54 +01:00
Niels
b80ca376f9 added some missing features from 2.0 version 2015-02-15 15:16:11 +01:00
Niels
2d8b362849 further cleanup 2015-02-15 14:52:00 +01:00
Niels
2fc82358ce clean up 2015-02-15 13:35:51 +01:00
Niels
bb558d8e6f added Unicode support 2015-02-15 11:44:49 +01:00
Niels
6ef3cb51a4 some reorganization 2015-02-14 17:34:06 +01:00
Niels
cc4a8319a1 reverse iterators 2015-02-14 16:47:14 +01:00
Niels
005a5c2858 some fixes and cleanup 2015-02-13 21:46:33 +01:00
Niels
4361c4d03f more test cases 2015-02-12 22:54:42 +01:00
Niels
89a1b0247b fixed a major bug in the parser 2015-02-11 17:24:14 +01:00
Niels
3f8dc632e2 test cases for iterator classes 2015-02-11 15:29:41 +01:00
Niels
53c9564c51 bug fix and test cases 2015-02-11 14:58:52 +01:00
Niels
7b7a54aca5 fixed a bug 2015-02-11 13:15:22 +01:00
Niels
f1bd206994 number test cases 2015-02-11 11:36:45 +01:00
Niels
463c38df60 fix test case 2015-02-11 10:57:17 +01:00
Niels
c816fd12a0 cleanup 2015-02-11 10:16:43 +01:00
Niels
d609790fff added whitespace handling 2015-02-11 09:51:24 +01:00
Niels
5d280143b7 fixes 2015-02-11 09:41:23 +01:00
Niels
8a4e127a57 + moved lexer to class 2015-02-11 09:10:28 +01:00
Niels
e845cd1db8 still errors... 2015-02-10 23:55:44 +01:00
Niels
0433e71fc3 rename member variables; add whitespace tests 2015-02-10 23:20:30 +01:00
Niels
f9797f8eb2 try 2015-02-10 23:05:45 +01:00
Niels
1aebb6e6ed removing failing (?) test cases 2015-02-10 22:48:16 +01:00
Niels
6232c78f88 possible fix 2015-02-10 22:37:07 +01:00
Niels
1bbde4597b more test cases 2015-02-10 22:09:21 +01:00
Niels
cd89a88b4a fix build error 2015-02-10 21:03:32 +01:00
Niels
963ec13b4a testing the parser 2015-02-10 20:52:39 +01:00
Niels
3589837071 more test cases 2015-02-10 20:28:16 +01:00
Niels
8c6bb04d10 added width feature / more test cases 2015-02-10 19:50:26 +01:00
Niels
4cd341d4db more unit tests 2015-02-10 18:51:09 +01:00
Niels
29a8d43d5a fixed tests for copy assignment 2015-02-10 17:40:47 +01:00
Niels
2ec0c79e0f test cases and clean up 2015-02-09 21:10:19 +01:00
Niels
0cfd0f5d68 added test cases and fixed some warnings 2015-02-09 20:21:26 +01:00
Niels
e53e84e1cc more test cases 2015-02-09 18:45:32 +01:00
Niels
48392cfa79 some bug fixing 2015-02-09 18:02:31 +01:00
Niels
330ffd952b removed reverse_iterators and fixed some bugs 2015-02-08 19:18:39 +01:00
Niels
441a6f267f more test cases 2015-02-08 16:08:48 +01:00
Niels
16b91d491e more test cases 2015-02-08 15:47:40 +01:00
Niels
7cd9067ea2 more test cases 2015-02-08 14:38:52 +01:00
Niels
caf82be2c7 added reverse iterators 2015-02-08 12:53:10 +01:00
Niels
87c250d843 another commit to trigger coverage 2015-02-07 19:14:23 +01:00
Niels
cc274f8145 small changes with default values 2015-02-07 19:04:08 +01:00
Niels
cf498ca4f2 added more features from master branch 2015-02-07 15:57:47 +01:00
Niels
ac274dee2a Zwischenstand 2015-02-05 22:45:33 +01:00
Niels
16fa85e9f2 Zwischenstand 2015-02-05 22:45:21 +01:00
Niels
a5188b08df strings are escaped 2015-02-04 22:49:46 +01:00
Niels
5ec433604a more test cases 2015-01-31 21:25:38 +01:00
Niels
385865c4ec remove checks in iterator 2015-01-31 20:46:23 +01:00
Niels
befd90dead cleanup 2015-01-31 20:13:11 +01:00
Niels
5199382c91 worked on issue #8 and #27 2015-01-24 20:33:06 +01:00
Niels
807de40463 implemented missing operator[] 2015-01-23 18:27:58 +01:00
Niels
6ee46ed519 cleanup 2015-01-21 17:42:45 +01:00
Niels
d66743b9c2 fixed a memory leak 2015-01-21 15:59:52 +01:00
Niels
bbc45eb4d8 overworked iterators 2015-01-21 15:43:24 +01:00
Niels
76be1ae1f6 + more adjustments toward a real container 2015-01-21 11:47:03 +01:00
Niels
3c780f0f57 + generic constructors for arrays and objects 2015-01-21 09:40:46 +01:00
Niels
a7a946bd18 added missing header 2015-01-20 21:15:14 +01:00
Niels
54fc97d434 + set number type to int64_t
+ replaced several functions by template magic
2015-01-20 20:43:54 +01:00
Niels
a144800774 + implemented member and non-member swap 2015-01-19 19:51:07 +01:00
Niels
7724d34741 fixed #31: only use spaces in pretty print 2015-01-18 10:58:48 +01:00
Niels
19043d2003 this should fix #28 2015-01-13 19:07:53 +01:00
WanCW
36f6199898 Fix string conversion under Clang 2015-01-12 20:03:41 +08:00
Niels
bd05c7a18a small tidy up after pull request #22
- removed IDE leftovers
- adjusted const’ness of some functions
- style guide
2015-01-11 15:16:14 +01:00
Niels
6533b33387 Merge pull request #22 from Teemperor/unicode_escaping
Unicode escaping
2015-01-11 15:08:13 +01:00
Niels
8d9c2bea4e + applied style guide 2015-01-11 15:05:04 +01:00
Raphael Isemann
7b97ec884e Fixed dumping of strings 2015-01-10 22:04:57 +01:00
Raphael Isemann
a866a9d980 Reapplied code style fixes 2015-01-10 19:53:13 +01:00
Raphael Isemann
a409ba9488 Fixed build 2015-01-10 18:46:01 +01:00
Raphael Isemann
6105ce5484 Allowed automerge 2015-01-10 17:33:18 +01:00
Raphael Isemann
1287f03084 Code point are two words, and so the "P" should be capital 2015-01-10 16:50:39 +01:00
Raphael Isemann
5a54e46709 Fully implemented the JSON spec 2015-01-10 16:49:10 +01:00
Raphael Isemann
222aacc213 Quick and dirty implementation for basic multilingual plane in the unicode escape mechanism 2015-01-10 10:36:30 +01:00
Niels
0cd2ecf48f minor style adjustments 2015-01-09 20:48:16 +01:00
Raphael Isemann
7f4fcc51f6 Implemented the JSON spec for string parsing for everything but the \uXXXX escaping for unicode 2015-01-09 20:03:18 +01:00
Niels
33f5236687 added missing header 2015-01-09 17:40:14 +01:00
Niels
535aef5ad0 Merge pull request #19 from kirkshoop/stditerator
add the std iterator typedefs to iterator and const_iterator
2015-01-09 17:37:42 +01:00
Niels
33f5e74905 minor syntax adjustments 2015-01-09 16:38:34 +01:00
Kirk Shoop
3486a5d9bb add the std iterator typedefs to iterator and const_iterator 2015-01-09 07:33:57 -08:00
Raphael Isemann
4a39bfb17e Fixed typo in comments 2015-01-09 11:57:39 +01:00
Raphael Isemann
fa0ee9c927 Fixed escaped quotes 2015-01-08 22:35:48 +01:00
Niels
4647401030 fixed #15 2015-01-06 22:05:32 +01:00
Niels
bd9f49efb9 implemented pretty printing (issue #13)
- to_string() method is now called dump()
- syntax borrowed from Python’s json.dumps()
2015-01-06 21:44:07 +01:00
Niels
5f05d02c6a Merge pull request #14 from elliotgoodrich/master
Fix double delete on std::bad_alloc exception
2015-01-06 18:43:21 +01:00
Niels
a53c878c81 moved class into "nlohmann" namespace
- fixed issue #9
- also removed std::mutex member variable
- also added “std::” prefix to size_t variables
2015-01-06 18:41:24 +01:00
Elliot Goodrich
0773f40a8e Fix double delete on std::bad_alloc exception
If the new operator throws in the json::find methods then result.oi_ is
deleted again in the destructor of json::iterator/json::const_iterator,
which is a double delete and undefined behaviour.
2015-01-06 09:12:55 +00:00