Skip to content

J
json
Commit bed47db1 by Niels
Options

+ that could be it!

parent 776611c2
Showing with 12 additions and 55 deletions
src/JSON.cc
...@@ -1367,22 +1367,14 @@ JSON::iterator::iterator(JSON* j) : _object(j) ...@@ -1367,22 +1367,14 @@ JSON::iterator::iterator(JSON* j) : _object(j)
JSON::iterator::iterator(const JSON::iterator& o) : _object(o._object) JSON::iterator::iterator(const JSON::iterator& o) : _object(o._object)
{ {
if (_object != nullptr) if (_object != nullptr)
switch (_object->_type)
{ {
case (value_type::array): if (_object->_type == value_type::array)
{ {
_vi = new array_t::iterator(*(o._vi)); _vi = new array_t::iterator(*(o._vi));
break;
} }
case (value_type::object): if (_object->_type == value_type::object)
{ {
_oi = new object_t::iterator(*(o._oi)); _oi = new object_t::iterator(*(o._oi));
break;
}
default:
{
// not sure if used
break;
} }
} }
} }
...@@ -1409,28 +1401,14 @@ bool JSON::iterator::operator==(const JSON::iterator& o) const ...@@ -1409,28 +1401,14 @@ bool JSON::iterator::operator==(const JSON::iterator& o) const
} }
if (_object != nullptr) if (_object != nullptr)
switch (_object->_type)
{
case (value_type::array):
{ {
if (_vi != o._vi) if (_object->_type == value_type::array)
{ {
return false; return (_vi == o._vi);
}
break;
}
case (value_type::object):
{
if (_oi != o._oi)
{
return false;
}
break;
} }
default: if (_object->_type == value_type::object)
{ {
// not sure if used return (_oi == o._oi);
break;
} }
} }
...@@ -1589,21 +1567,14 @@ JSON::const_iterator::const_iterator(const JSON* j) : _object(j) ...@@ -1589,21 +1567,14 @@ JSON::const_iterator::const_iterator(const JSON* j) : _object(j)
JSON::const_iterator::const_iterator(const JSON::const_iterator& o) : _object(o._object) JSON::const_iterator::const_iterator(const JSON::const_iterator& o) : _object(o._object)
{ {
if (_object != nullptr) if (_object != nullptr)
switch (_object->_type)
{ {
case (value_type::array): if (_object->_type == value_type::array)
{ {
_vi = new array_t::const_iterator(*(o._vi)); _vi = new array_t::const_iterator(*(o._vi));
break;
} }
case (value_type::object): if (_object->_type == value_type::object)
{ {
_oi = new object_t::const_iterator(*(o._oi)); _oi = new object_t::const_iterator(*(o._oi));
break;
}
default:
{
break;
} }
} }
} }
...@@ -1652,28 +1623,14 @@ bool JSON::const_iterator::operator==(const JSON::const_iterator& o) const ...@@ -1652,28 +1623,14 @@ bool JSON::const_iterator::operator==(const JSON::const_iterator& o) const
} }
if (_object != nullptr) if (_object != nullptr)
switch (_object->_type)
{
case (value_type::array):
{ {
if (_vi != o._vi) if (_object->_type == value_type::array)
{ {
return false; return (_vi == o._vi);
}
break;
}
case (value_type::object):
{
if (_oi != o._oi)
{
return false;
}
break;
} }
default: if (_object->_type == value_type::object)
{ {
// not sure if used return (_oi == o._oi);
break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment