mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-27 16:49:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

- fixes from Harro

Browse Source
This commit is contained in:
Niels 2013-07-05 11:23:49 +02:00
parent 23ada516aa
commit 61461ec456
3 changed files with 96 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/JSON.cc
View File

@ -643,6 +643,7 @@ std::string JSON::parser::parseString() {
const size_t length = p - _buffer - _pos;
char* tmp = new char[length + 1];
std::strncpy(tmp, _buffer + _pos, length);
tmp[length] = 0;
std::string result(tmp);
delete [] tmp;
@ -838,11 +839,11 @@ JSON::iterator::iterator(JSON* j) : _object(j), _vi(nullptr), _oi(nullptr) {
JSON::iterator::iterator(const JSON::iterator& o) : _object(o._object), _vi(nullptr), _oi(nullptr) {
switch (_object->_type) {
case (array): {
_vi = new std::vector<JSON>::iterator(static_cast<std::vector<JSON>*>(_object->_payload)->begin());
_vi = new std::vector<JSON>::iterator(*(o._vi));
break;
}
case (object): {
_oi = new std::map<std::string, JSON>::iterator(static_cast<std::map<std::string, JSON>*>(_object->_payload)->begin());
_oi = new std::map<std::string, JSON>::iterator(*(o._oi));
break;
}
default:
@ -857,6 +858,18 @@ JSON::iterator::~iterator() {
JSON::iterator& JSON::iterator::operator=(const JSON::iterator& o) {
_object = o._object;
switch (_object->_type) {
case (array): {
_vi = new std::vector<JSON>::iterator(*(o._vi));
break;
}
case (object): {
_oi = new std::map<std::string, JSON>::iterator(*(o._oi));
break;
}
default:
break;
}
return *this;
}
@ -985,11 +998,11 @@ JSON::const_iterator::const_iterator(const JSON* j) : _object(j), _vi(nullptr),
JSON::const_iterator::const_iterator(const JSON::const_iterator& o) : _object(o._object), _vi(nullptr), _oi(nullptr) {
switch (_object->_type) {
case (array): {
_vi = new std::vector<JSON>::const_iterator(static_cast<std::vector<JSON>*>(_object->_payload)->begin());
_vi = new std::vector<JSON>::const_iterator(*(o._vi));
break;
}
case (object): {
_oi = new std::map<std::string, JSON>::const_iterator(static_cast<std::map<std::string, JSON>*>(_object->_payload)->begin());
_oi = new std::map<std::string, JSON>::const_iterator(*(o._oi));
break;
}
default:
@ -1000,11 +1013,11 @@ JSON::const_iterator::const_iterator(const JSON::const_iterator& o) : _object(o.
JSON::const_iterator::const_iterator(const JSON::iterator& o) : _object(o._object), _vi(nullptr), _oi(nullptr) {
switch (_object->_type) {
case (array): {
_vi = new std::vector<JSON>::const_iterator(static_cast<std::vector<JSON>*>(_object->_payload)->begin());
_vi = new std::vector<JSON>::const_iterator(*(o._vi));
break;
}
case (object): {
_oi = new std::map<std::string, JSON>::const_iterator(static_cast<std::map<std::string, JSON>*>(_object->_payload)->begin());
_oi = new std::map<std::string, JSON>::const_iterator(*(o._oi));
break;
}
default:
@ -1019,6 +1032,18 @@ JSON::const_iterator::~const_iterator() {
JSON::const_iterator& JSON::const_iterator::operator=(const JSON::const_iterator& o) {
_object = o._object;
switch (_object->_type) {
case (array): {
_vi = new std::vector<JSON>::const_iterator(*(o._vi));
break;
}
case (object): {
_oi = new std::map<std::string, JSON>::const_iterator(*(o._oi));
break;
}
default:
break;
}
return *this;
}

2
src/JSON.h
View File

@ -6,8 +6,8 @@
#endif
// allow us to use "nullptr" everywhere
#ifndef nullptr
#include <cstddef>
#ifndef nullptr
#define nullptr NULL
#endif

70
test/JSON_test.cc
View File

@ -202,20 +202,78 @@ void test_array() {
#endif
// iterators
for (JSON::iterator i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
{
size_t count = 0;
for (JSON::iterator i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
for (JSON::const_iterator i = a.cbegin(); i != a.cend(); ++i) {
std::cerr << *i << '\n';
{
/*
size_t count = 0;
for (JSON::const_iterator i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
*/
}
{
size_t count = 0;
for (JSON::const_iterator i = a.cbegin(); i != a.cend(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
#ifdef __cplusplus11
for (auto element : a) {
std::cerr << element << '\n';
{
size_t count = 0;
for (auto element : a) {
std::cerr << element << '\n';
count++;
}
assert(count == a.size());
}
#endif
{
JSON::iterator i;
size_t count = 0;
for (i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
{
/*
JSON::const_iterator i;
size_t count = 0;
for (i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
*/
}
{
JSON::const_iterator i;
size_t count = 0;
for (i = a.cbegin(); i != a.cend(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
{
// get payload
std::vector<JSON>* array = static_cast<std::vector<JSON>*>(a.data());