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
Niels
a9669a410d
removed "noexpect" from all functions that use new
2015-01-04 23:18:24 +01:00
Niels
540cda6118
used _-suffix for member variables
2015-01-04 23:09:30 +01:00
Niels
3bef1a5097
renamed "toString()" to "to_string()"
2015-01-04 20:50:28 +01:00
Niels
f63ff7727e
renamed class from "JSON" to "son"
2015-01-04 20:43:25 +01:00
Niels
4d00105e5c
tidy up
2015-01-04 19:05:46 +01:00
Niels
bd0be5f0af
fixed memory leak
2015-01-04 12:29:16 +01:00
Niels
481f377cfe
+ guard call to std::ios_base::sync_with_stdio
2015-01-04 12:05:28 +01:00
Niels
764ed26c41
cleanup
2015-01-03 17:18:17 +01:00
Niels
18364aac85
parser returns an object
2015-01-02 17:19:40 +01:00
Niels
16c30cff8b
removed old C fragments
2015-01-02 15:29:36 +01:00
Niels
af4aca9edd
+ better string handling
2015-01-02 12:47:32 +01:00
Niels
6995d33fb1
+ fixed documentation bugs
2014-12-30 11:57:58 +01:00
Niels
2335d3f3d5
tidy up
2014-12-30 11:47:28 +01:00
Niels
9e61092fc6
+ overworked parser
2014-12-30 10:54:01 +01:00
Niels
4e44390090
+ fixed a bug in the stream input
2014-12-29 21:13:03 +01:00
Niels
15a9d3cff6
minor changes
2014-12-29 19:54:31 +01:00
Niels
a8c4f84fb8
+ removed data() function
2014-12-29 16:45:54 +01:00
Niels
725202356b
+ fix memory issues
2014-12-29 12:51:20 +01:00
Niels
2c1b3e5108
+ small cleanup
2014-12-29 00:02:14 +01:00
Niels
bed47db168
+ that could be it!
2014-12-28 23:09:31 +01:00
Niels
776611c270
+ another check
2014-12-28 22:59:11 +01:00
Niels
0ced78bfa8
+ test
2014-12-28 22:51:27 +01:00
Niels
b573841ace
+ more test cases
2014-12-28 22:38:57 +01:00
Niels
98af0887f2
+ more test cases
2014-12-28 22:29:06 +01:00
Niels
48a349a058
+ more test cases
2014-12-28 21:53:13 +01:00
Niels
8f45d9351e
+ overworked switches
2014-12-28 20:07:56 +01:00
Niels
cd48a01b20
+ more test
2014-12-28 18:00:50 +01:00
Niels
d3216300b2
+ more test cases
2014-12-28 17:26:33 +01:00
Niels
ea94518a64
+ more test cases
2014-12-28 17:09:38 +01:00
Niels
5b1f69ce5b
+ overworked comments
2014-12-28 16:48:22 +01:00
Niels
a68b4cafa2
+ more test cases
2014-12-28 14:57:21 +01:00
Niels
8d4f675151
+ test cases for clear()
2014-12-28 12:50:52 +01:00
Niels
b57179e0fe
+ fixed a compiler warning
...
+ added coveralls
2014-12-28 09:23:49 +01:00
Niels
fbad7fac17
2.0 preview
2014-12-28 09:11:01 +01:00
Niels
278a9e7052
simplified code
2013-12-11 08:41:02 +01:00
Niels
81367a9a10
fixed a cppcheck warning
2013-12-10 12:44:23 +01:00
Niels Lohmann
a8f62ca052
+ a fix for C++98
2013-07-15 08:32:10 +02:00
Niels
9a567d9d2d
- tidied code
...
- added more documentation
2013-07-11 14:19:11 +02:00
Niels
52c2cb8ce7
- removed pointers to POD inside the union
2013-07-10 14:57:51 +02:00
Niels
4e6a400a23
- reorganized payload
2013-07-10 14:33:17 +02:00
Niels
ec6e628d4f
- minor tweaks
2013-07-05 16:45:17 +02:00
Niels
cb2da141ec
- further adjustments
2013-07-05 16:15:29 +02:00
Niels
0ee8d53a28
- a find() function
2013-07-05 14:16:47 +02:00
Niels
ac5ff65856
- bugfixing
2013-07-05 12:32:23 +02:00
Niels
abad903f31
- memory problem
2013-07-05 11:57:12 +02:00
Niels
61461ec456
- fixes from Harro
2013-07-05 11:23:49 +02:00
Niels
23ada516aa
- header for NULL
2013-07-04 18:16:24 +02:00
Niels
d035fa581d
- added missing headers
2013-07-04 18:13:17 +02:00
Niels
206e15dff7
- fixed bugs and added test cases
2013-07-04 17:06:53 +02:00
Niels
4502e7e51c
- initial commit
2013-07-04 10:49:03 +02:00
