Skip to content

J
json
Commit 4a452f11 by Niels
Options

added assertions (#168)

parent d27c8a8e
Showing with 318 additions and 4 deletions
src/json.hpp
...@@ -40,6 +40,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation. ...@@ -40,6 +40,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cassert>
#include <ciso646> #include <ciso646>
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
...@@ -1417,6 +1418,8 @@ class basic_json ...@@ -1417,6 +1418,8 @@ class basic_json
m_type = value_t::object; m_type = value_t::object;
m_value = value_t::object; m_value = value_t::object;
assert(m_value.object != nullptr);
for (auto& element : init) for (auto& element : init)
{ {
m_value.object->emplace(std::move(*(element[0].m_value.string)), std::move(element[1])); m_value.object->emplace(std::move(*(element[0].m_value.string)), std::move(element[1]));
...@@ -1607,24 +1610,28 @@ class basic_json ...@@ -1607,24 +1610,28 @@ class basic_json
{ {
case value_t::number_integer: case value_t::number_integer:
{ {
assert(first.m_object != nullptr);
m_value.number_integer = first.m_object->m_value.number_integer; m_value.number_integer = first.m_object->m_value.number_integer;
break; break;
} }
case value_t::number_float: case value_t::number_float:
{ {
assert(first.m_object != nullptr);
m_value.number_float = first.m_object->m_value.number_float; m_value.number_float = first.m_object->m_value.number_float;
break; break;
} }
case value_t::boolean: case value_t::boolean:
{ {
assert(first.m_object != nullptr);
m_value.boolean = first.m_object->m_value.boolean; m_value.boolean = first.m_object->m_value.boolean;
break; break;
} }
case value_t::string: case value_t::string:
{ {
assert(first.m_object != nullptr);
m_value = *first.m_object->m_value.string; m_value = *first.m_object->m_value.string;
break; break;
} }
...@@ -1643,6 +1650,7 @@ class basic_json ...@@ -1643,6 +1650,7 @@ class basic_json
default: default:
{ {
assert(first.m_object != nullptr);
throw std::domain_error("cannot use construct with iterators from " + first.m_object->type_name()); throw std::domain_error("cannot use construct with iterators from " + first.m_object->type_name());
} }
} }
...@@ -1679,18 +1687,21 @@ class basic_json ...@@ -1679,18 +1687,21 @@ class basic_json
{ {
case value_t::object: case value_t::object:
{ {
assert(other.m_value.object != nullptr);
m_value = *other.m_value.object; m_value = *other.m_value.object;
break; break;
} }
case value_t::array: case value_t::array:
{ {
assert(other.m_value.array != nullptr);
m_value = *other.m_value.array; m_value = *other.m_value.array;
break; break;
} }
case value_t::string: case value_t::string:
{ {
assert(other.m_value.string != nullptr);
m_value = *other.m_value.string; m_value = *other.m_value.string;
break; break;
} }
...@@ -2166,6 +2177,7 @@ class basic_json ...@@ -2166,6 +2177,7 @@ class basic_json
{ {
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return T(m_value.object->begin(), m_value.object->end()); return T(m_value.object->begin(), m_value.object->end());
} }
else else
...@@ -2179,6 +2191,7 @@ class basic_json ...@@ -2179,6 +2191,7 @@ class basic_json
{ {
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return *(m_value.object); return *(m_value.object);
} }
else else
...@@ -2201,6 +2214,7 @@ class basic_json ...@@ -2201,6 +2214,7 @@ class basic_json
if (is_array()) if (is_array())
{ {
T to_vector; T to_vector;
assert(m_value.array != nullptr);
std::transform(m_value.array->begin(), m_value.array->end(), std::transform(m_value.array->begin(), m_value.array->end(),
std::inserter(to_vector, to_vector.end()), [](basic_json i) std::inserter(to_vector, to_vector.end()), [](basic_json i)
{ {
...@@ -2225,6 +2239,7 @@ class basic_json ...@@ -2225,6 +2239,7 @@ class basic_json
if (is_array()) if (is_array())
{ {
std::vector<T> to_vector; std::vector<T> to_vector;
assert(m_value.array != nullptr);
to_vector.reserve(m_value.array->size()); to_vector.reserve(m_value.array->size());
std::transform(m_value.array->begin(), m_value.array->end(), std::transform(m_value.array->begin(), m_value.array->end(),
std::inserter(to_vector, to_vector.end()), [](basic_json i) std::inserter(to_vector, to_vector.end()), [](basic_json i)
...@@ -2249,6 +2264,7 @@ class basic_json ...@@ -2249,6 +2264,7 @@ class basic_json
{ {
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
return T(m_value.array->begin(), m_value.array->end()); return T(m_value.array->begin(), m_value.array->end());
} }
else else
...@@ -2262,6 +2278,7 @@ class basic_json ...@@ -2262,6 +2278,7 @@ class basic_json
{ {
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
return *(m_value.array); return *(m_value.array);
} }
else else
...@@ -2279,6 +2296,7 @@ class basic_json ...@@ -2279,6 +2296,7 @@ class basic_json
{ {
if (is_string()) if (is_string())
{ {
assert(m_value.string != nullptr);
return *m_value.string; return *m_value.string;
} }
else else
...@@ -2624,6 +2642,7 @@ class basic_json ...@@ -2624,6 +2642,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.array != nullptr);
return m_value.array->at(idx); return m_value.array->at(idx);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2667,6 +2686,7 @@ class basic_json ...@@ -2667,6 +2686,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.array != nullptr);
return m_value.array->at(idx); return m_value.array->at(idx);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2714,6 +2734,7 @@ class basic_json ...@@ -2714,6 +2734,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.object != nullptr);
return m_value.object->at(key); return m_value.object->at(key);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2761,6 +2782,7 @@ class basic_json ...@@ -2761,6 +2782,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.object != nullptr);
return m_value.object->at(key); return m_value.object->at(key);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2812,6 +2834,7 @@ class basic_json ...@@ -2812,6 +2834,7 @@ class basic_json
// [] only works for arrays // [] only works for arrays
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
for (size_t i = m_value.array->size(); i <= idx; ++i) for (size_t i = m_value.array->size(); i <= idx; ++i)
{ {
m_value.array->push_back(basic_json()); m_value.array->push_back(basic_json());
...@@ -2849,6 +2872,7 @@ class basic_json ...@@ -2849,6 +2872,7 @@ class basic_json
// at only works for arrays // at only works for arrays
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
return m_value.array->operator[](idx); return m_value.array->operator[](idx);
} }
else else
...@@ -2896,6 +2920,7 @@ class basic_json ...@@ -2896,6 +2920,7 @@ class basic_json
// [] only works for objects // [] only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return m_value.object->operator[](key); return m_value.object->operator[](key);
} }
else else
...@@ -2936,6 +2961,8 @@ class basic_json ...@@ -2936,6 +2961,8 @@ class basic_json
// [] only works for objects // [] only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
assert(m_value.object->find(key) != m_value.object->end());
return m_value.object->find(key)->second; return m_value.object->find(key)->second;
} }
else else
...@@ -2986,6 +3013,7 @@ class basic_json ...@@ -2986,6 +3013,7 @@ class basic_json
// at only works for objects // at only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return m_value.object->operator[](key); return m_value.object->operator[](key);
} }
else else
...@@ -3029,6 +3057,8 @@ class basic_json ...@@ -3029,6 +3057,8 @@ class basic_json
// at only works for objects // at only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
assert(m_value.object->find(key) != m_value.object->end());
return m_value.object->find(key)->second; return m_value.object->find(key)->second;
} }
else else
...@@ -3275,12 +3305,14 @@ class basic_json ...@@ -3275,12 +3305,14 @@ class basic_json
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator); result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
break; break;
} }
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator); result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
break; break;
} }
...@@ -3378,6 +3410,7 @@ class basic_json ...@@ -3378,6 +3410,7 @@ class basic_json
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator, result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
last.m_it.object_iterator); last.m_it.object_iterator);
break; break;
...@@ -3385,6 +3418,7 @@ class basic_json ...@@ -3385,6 +3418,7 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator, result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
last.m_it.array_iterator); last.m_it.array_iterator);
break; break;
...@@ -3430,6 +3464,7 @@ class basic_json ...@@ -3430,6 +3464,7 @@ class basic_json
// this erase only works for objects // this erase only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return m_value.object->erase(key); return m_value.object->erase(key);
} }
else else
...@@ -3472,6 +3507,7 @@ class basic_json ...@@ -3472,6 +3507,7 @@ class basic_json
throw std::out_of_range("index out of range"); throw std::out_of_range("index out of range");
} }
assert(m_value.array != nullptr);
m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx)); m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
} }
else else
...@@ -3503,6 +3539,7 @@ class basic_json ...@@ -3503,6 +3539,7 @@ class basic_json
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->find(key); result.m_it.object_iterator = m_value.object->find(key);
} }
...@@ -3519,6 +3556,7 @@ class basic_json ...@@ -3519,6 +3556,7 @@ class basic_json
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->find(key); result.m_it.object_iterator = m_value.object->find(key);
} }
...@@ -3546,6 +3584,7 @@ class basic_json ...@@ -3546,6 +3584,7 @@ class basic_json
size_type count(typename object_t::key_type key) const size_type count(typename object_t::key_type key) const
{ {
// return 0 for all nonobject types // return 0 for all nonobject types
assert(not is_object() or m_value.object != nullptr);
return is_object() ? m_value.object->count(key) : 0; return is_object() ? m_value.object->count(key) : 0;
} }
...@@ -3864,11 +3903,13 @@ class basic_json ...@@ -3864,11 +3903,13 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
return m_value.array->empty(); return m_value.array->empty();
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
return m_value.object->empty(); return m_value.object->empty();
} }
...@@ -3920,11 +3961,13 @@ class basic_json ...@@ -3920,11 +3961,13 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
return m_value.array->size(); return m_value.array->size();
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
return m_value.object->size(); return m_value.object->size();
} }
...@@ -3974,11 +4017,13 @@ class basic_json ...@@ -3974,11 +4017,13 @@ class basic_json
{ {
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
return m_value.array->max_size(); return m_value.array->max_size();
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
return m_value.object->max_size(); return m_value.object->max_size();
} }
...@@ -4049,18 +4094,21 @@ class basic_json ...@@ -4049,18 +4094,21 @@ class basic_json
case value_t::string: case value_t::string:
{ {
assert(m_value.string != nullptr);
m_value.string->clear(); m_value.string->clear();
break; break;
} }
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
m_value.array->clear(); m_value.array->clear();
break; break;
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
m_value.object->clear(); m_value.object->clear();
break; break;
} }
...@@ -4108,6 +4156,7 @@ class basic_json ...@@ -4108,6 +4156,7 @@ class basic_json
} }
// add element to array (move semantics) // add element to array (move semantics)
assert(m_value.array != nullptr);
m_value.array->push_back(std::move(val)); m_value.array->push_back(std::move(val));
// invalidate object // invalidate object
val.m_type = value_t::null; val.m_type = value_t::null;
...@@ -4143,6 +4192,7 @@ class basic_json ...@@ -4143,6 +4192,7 @@ class basic_json
} }
// add element to array // add element to array
assert(m_value.array != nullptr);
m_value.array->push_back(val); m_value.array->push_back(val);
} }
...@@ -4192,6 +4242,7 @@ class basic_json ...@@ -4192,6 +4242,7 @@ class basic_json
} }
// add element to array // add element to array
assert(m_value.object != nullptr);
m_value.object->insert(val); m_value.object->insert(val);
} }
...@@ -4240,6 +4291,7 @@ class basic_json ...@@ -4240,6 +4291,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val); result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
return result; return result;
} }
...@@ -4295,6 +4347,7 @@ class basic_json ...@@ -4295,6 +4347,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val); result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
return result; return result;
} }
...@@ -4360,6 +4413,7 @@ class basic_json ...@@ -4360,6 +4413,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert( result.m_it.array_iterator = m_value.array->insert(
pos.m_it.array_iterator, pos.m_it.array_iterator,
first.m_it.array_iterator, first.m_it.array_iterator,
...@@ -4407,6 +4461,7 @@ class basic_json ...@@ -4407,6 +4461,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist); result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist);
return result; return result;
} }
...@@ -4464,6 +4519,7 @@ class basic_json ...@@ -4464,6 +4519,7 @@ class basic_json
// swap only works for arrays // swap only works for arrays
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
std::swap(*(m_value.array), other); std::swap(*(m_value.array), other);
} }
else else
...@@ -4497,6 +4553,7 @@ class basic_json ...@@ -4497,6 +4553,7 @@ class basic_json
// swap only works for objects // swap only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
std::swap(*(m_value.object), other); std::swap(*(m_value.object), other);
} }
else else
...@@ -4530,6 +4587,7 @@ class basic_json ...@@ -4530,6 +4587,7 @@ class basic_json
// swap only works for strings // swap only works for strings
if (is_string()) if (is_string())
{ {
assert(m_value.string != nullptr);
std::swap(*(m_value.string), other); std::swap(*(m_value.string), other);
} }
else else
...@@ -4614,21 +4672,43 @@ class basic_json ...@@ -4614,21 +4672,43 @@ class basic_json
switch (lhs_type) switch (lhs_type)
{ {
case value_t::array: case value_t::array:
{
assert(lhs.m_value.array != nullptr);
assert(rhs.m_value.array != nullptr);
return *lhs.m_value.array == *rhs.m_value.array; return *lhs.m_value.array == *rhs.m_value.array;
}
case value_t::object: case value_t::object:
{
assert(lhs.m_value.object != nullptr);
assert(rhs.m_value.object != nullptr);
return *lhs.m_value.object == *rhs.m_value.object; return *lhs.m_value.object == *rhs.m_value.object;
}
case value_t::null: case value_t::null:
{
return true; return true;
}
case value_t::string: case value_t::string:
{
assert(lhs.m_value.string != nullptr);
assert(rhs.m_value.string != nullptr);
return *lhs.m_value.string == *rhs.m_value.string; return *lhs.m_value.string == *rhs.m_value.string;
}
case value_t::boolean: case value_t::boolean:
{
return lhs.m_value.boolean == rhs.m_value.boolean; return lhs.m_value.boolean == rhs.m_value.boolean;
}
case value_t::number_integer: case value_t::number_integer:
{
return lhs.m_value.number_integer == rhs.m_value.number_integer; return lhs.m_value.number_integer == rhs.m_value.number_integer;
}
case value_t::number_float: case value_t::number_float:
{
return approx(lhs.m_value.number_float, rhs.m_value.number_float); return approx(lhs.m_value.number_float, rhs.m_value.number_float);
}
default: default:
{
return false; return false;
}
} }
} }
else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float) else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
...@@ -4763,21 +4843,43 @@ class basic_json ...@@ -4763,21 +4843,43 @@ class basic_json
switch (lhs_type) switch (lhs_type)
{ {
case value_t::array: case value_t::array:
{
assert(lhs.m_value.array != nullptr);
assert(rhs.m_value.array != nullptr);
return *lhs.m_value.array < *rhs.m_value.array; return *lhs.m_value.array < *rhs.m_value.array;
}
case value_t::object: case value_t::object:
{
assert(lhs.m_value.object != nullptr);
assert(rhs.m_value.object != nullptr);
return *lhs.m_value.object < *rhs.m_value.object; return *lhs.m_value.object < *rhs.m_value.object;
}
case value_t::null: case value_t::null:
{
return false; return false;
}
case value_t::string: case value_t::string:
{
assert(lhs.m_value.string != nullptr);
assert(rhs.m_value.string != nullptr);
return *lhs.m_value.string < *rhs.m_value.string; return *lhs.m_value.string < *rhs.m_value.string;
}
case value_t::boolean: case value_t::boolean:
{
return lhs.m_value.boolean < rhs.m_value.boolean; return lhs.m_value.boolean < rhs.m_value.boolean;
}
case value_t::number_integer: case value_t::number_integer:
{
return lhs.m_value.number_integer < rhs.m_value.number_integer; return lhs.m_value.number_integer < rhs.m_value.number_integer;
}
case value_t::number_float: case value_t::number_float:
{
return lhs.m_value.number_float < rhs.m_value.number_float; return lhs.m_value.number_float < rhs.m_value.number_float;
}
default: default:
{
return false; return false;
}
} }
} }
else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float) else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
...@@ -5254,6 +5356,8 @@ class basic_json ...@@ -5254,6 +5356,8 @@ class basic_json
{ {
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
if (m_value.object->empty()) if (m_value.object->empty())
{ {
o << "{}"; o << "{}";
...@@ -5294,6 +5398,8 @@ class basic_json ...@@ -5294,6 +5398,8 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
if (m_value.array->empty()) if (m_value.array->empty())
{ {
o << "[]"; o << "[]";
...@@ -5332,6 +5438,7 @@ class basic_json ...@@ -5332,6 +5438,7 @@ class basic_json
case value_t::string: case value_t::string:
{ {
assert(m_value.string != nullptr);
o << string_t("\"") << escape_string(*m_value.string) << "\""; o << string_t("\"") << escape_string(*m_value.string) << "\"";
return; return;
} }
...@@ -5509,6 +5616,8 @@ class basic_json ...@@ -5509,6 +5616,8 @@ class basic_json
/// return key of the iterator /// return key of the iterator
typename basic_json::string_t key() const typename basic_json::string_t key() const
{ {
assert(anchor.m_object != nullptr);
switch (anchor.m_object->type()) switch (anchor.m_object->type())
{ {
// use integer array index as key // use integer array index as key
...@@ -5597,6 +5706,8 @@ class basic_json ...@@ -5597,6 +5706,8 @@ class basic_json
/// constructor for a given JSON instance /// constructor for a given JSON instance
const_iterator(pointer object) : m_object(object) const_iterator(pointer object) : m_object(object)
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5622,6 +5733,8 @@ class basic_json ...@@ -5622,6 +5733,8 @@ class basic_json
/// copy constructor given a nonconst iterator /// copy constructor given a nonconst iterator
const_iterator(const iterator& other) : m_object(other.m_object) const_iterator(const iterator& other) : m_object(other.m_object)
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5666,16 +5779,20 @@ class basic_json ...@@ -5666,16 +5779,20 @@ class basic_json
/// set the iterator to the first value /// set the iterator to the first value
void set_begin() void set_begin()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object != nullptr);
m_it.object_iterator = m_object->m_value.object->begin(); m_it.object_iterator = m_object->m_value.object->begin();
break; break;
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array != nullptr);
m_it.array_iterator = m_object->m_value.array->begin(); m_it.array_iterator = m_object->m_value.array->begin();
break; break;
} }
...@@ -5698,16 +5815,20 @@ class basic_json ...@@ -5698,16 +5815,20 @@ class basic_json
/// set the iterator past the last value /// set the iterator past the last value
void set_end() void set_end()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object != nullptr);
m_it.object_iterator = m_object->m_value.object->end(); m_it.object_iterator = m_object->m_value.object->end();
break; break;
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array != nullptr);
m_it.array_iterator = m_object->m_value.array->end(); m_it.array_iterator = m_object->m_value.array->end();
break; break;
} }
...@@ -5724,15 +5845,21 @@ class basic_json ...@@ -5724,15 +5845,21 @@ class basic_json
/// return a reference to the value pointed to by the iterator /// return a reference to the value pointed to by the iterator
reference operator*() const reference operator*() const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object);
assert(m_it.object_iterator != m_object->m_value.object->end());
return m_it.object_iterator->second; return m_it.object_iterator->second;
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array);
assert(m_it.array_iterator != m_object->m_value.array->end());
return *m_it.array_iterator; return *m_it.array_iterator;
} }
...@@ -5758,15 +5885,21 @@ class basic_json ...@@ -5758,15 +5885,21 @@ class basic_json
/// dereference the iterator /// dereference the iterator
pointer operator->() const pointer operator->() const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object);
assert(m_it.object_iterator != m_object->m_value.object->end());
return &(m_it.object_iterator->second); return &(m_it.object_iterator->second);
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array);
assert(m_it.array_iterator != m_object->m_value.array->end());
return &*m_it.array_iterator; return &*m_it.array_iterator;
} }
...@@ -5795,6 +5928,8 @@ class basic_json ...@@ -5795,6 +5928,8 @@ class basic_json
/// pre-increment (++it) /// pre-increment (++it)
const_iterator& operator++() const_iterator& operator++()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5830,6 +5965,8 @@ class basic_json ...@@ -5830,6 +5965,8 @@ class basic_json
/// pre-decrement (--it) /// pre-decrement (--it)
const_iterator& operator--() const_iterator& operator--()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5863,6 +6000,8 @@ class basic_json ...@@ -5863,6 +6000,8 @@ class basic_json
throw std::domain_error("cannot compare iterators of different containers"); throw std::domain_error("cannot compare iterators of different containers");
} }
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5897,6 +6036,8 @@ class basic_json ...@@ -5897,6 +6036,8 @@ class basic_json
throw std::domain_error("cannot compare iterators of different containers"); throw std::domain_error("cannot compare iterators of different containers");
} }
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5937,6 +6078,8 @@ class basic_json ...@@ -5937,6 +6078,8 @@ class basic_json
/// add to iterator /// add to iterator
const_iterator& operator+=(difference_type i) const_iterator& operator+=(difference_type i)
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5985,6 +6128,8 @@ class basic_json ...@@ -5985,6 +6128,8 @@ class basic_json
/// return difference /// return difference
difference_type operator-(const const_iterator& other) const difference_type operator-(const const_iterator& other) const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -6007,6 +6152,8 @@ class basic_json ...@@ -6007,6 +6152,8 @@ class basic_json
/// access to successor /// access to successor
reference operator[](difference_type n) const reference operator[](difference_type n) const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -6041,6 +6188,8 @@ class basic_json ...@@ -6041,6 +6188,8 @@ class basic_json
/// return the key of an object iterator /// return the key of an object iterator
typename object_t::key_type key() const typename object_t::key_type key() const
{ {
assert(m_object != nullptr);
if (m_object->is_object()) if (m_object->is_object())
{ {
return m_it.object_iterator->first; return m_it.object_iterator->first;
...@@ -6353,6 +6502,7 @@ class basic_json ...@@ -6353,6 +6502,7 @@ class basic_json
: m_stream(nullptr), m_buffer(s) : m_stream(nullptr), m_buffer(s)
{ {
m_content = reinterpret_cast<const lexer_char_t*>(s.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(s.c_str());
assert(m_content != nullptr);
m_start = m_cursor = m_content; m_start = m_cursor = m_content;
m_limit = m_content + s.size(); m_limit = m_content + s.size();
} }
...@@ -6361,8 +6511,10 @@ class basic_json ...@@ -6361,8 +6511,10 @@ class basic_json
explicit lexer(std::istream* s) noexcept explicit lexer(std::istream* s) noexcept
: m_stream(s), m_buffer() : m_stream(s), m_buffer()
{ {
assert(m_stream != nullptr);
getline(*m_stream, m_buffer); getline(*m_stream, m_buffer);
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
assert(m_content != nullptr);
m_start = m_cursor = m_content; m_start = m_cursor = m_content;
m_limit = m_content + m_buffer.size(); m_limit = m_content + m_buffer.size();
} }
...@@ -6511,6 +6663,7 @@ class basic_json ...@@ -6511,6 +6663,7 @@ class basic_json
// remember the begin of the token // remember the begin of the token
m_start = m_cursor; m_start = m_cursor;
assert(m_start != nullptr);
{ {
...@@ -7302,7 +7455,7 @@ basic_json_parser_64: ...@@ -7302,7 +7455,7 @@ basic_json_parser_64:
/// append data from the stream to the internal buffer /// append data from the stream to the internal buffer
void yyfill() noexcept void yyfill() noexcept
{ {
if (not m_stream or not * m_stream) if (m_stream == nullptr or not * m_stream)
{ {
return; return;
} }
...@@ -7313,10 +7466,12 @@ basic_json_parser_64: ...@@ -7313,10 +7466,12 @@ basic_json_parser_64:
m_buffer.erase(0, static_cast<size_t>(offset_start)); m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line; std::string line;
assert(m_stream != nullptr);
std::getline(*m_stream, line); std::getline(*m_stream, line);
m_buffer += "\n" + line; // add line with newline symbol m_buffer += "\n" + line; // add line with newline symbol
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
assert(m_content != nullptr);
m_start = m_content; m_start = m_content;
m_marker = m_start + offset_marker; m_marker = m_start + offset_marker;
m_cursor = m_start + offset_cursor; m_cursor = m_start + offset_cursor;
...@@ -7326,6 +7481,7 @@ basic_json_parser_64: ...@@ -7326,6 +7481,7 @@ basic_json_parser_64:
/// return string representation of last read token /// return string representation of last read token
string_t get_token() const noexcept string_t get_token() const noexcept
{ {
assert(m_start != nullptr);
return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start), return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start),
static_cast<size_t>(m_cursor - m_start)); static_cast<size_t>(m_cursor - m_start));
} }
...@@ -7475,6 +7631,7 @@ basic_json_parser_64: ...@@ -7475,6 +7631,7 @@ basic_json_parser_64:
{ {
// conversion // conversion
typename string_t::value_type* endptr; typename string_t::value_type* endptr;
assert(m_start != nullptr);
const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start),
&endptr); &endptr);
...@@ -7485,7 +7642,7 @@ basic_json_parser_64: ...@@ -7485,7 +7642,7 @@ basic_json_parser_64:
private: private:
/// optional input stream /// optional input stream
std::istream* m_stream; std::istream* m_stream = nullptr;
/// the buffer /// the buffer
string_t m_buffer; string_t m_buffer;
/// the buffer pointer /// the buffer pointer
......
src/json.hpp.re2c
...@@ -40,6 +40,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation. ...@@ -40,6 +40,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cassert>
#include <ciso646> #include <ciso646>
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
...@@ -1417,6 +1418,8 @@ class basic_json ...@@ -1417,6 +1418,8 @@ class basic_json
m_type = value_t::object; m_type = value_t::object;
m_value = value_t::object; m_value = value_t::object;
assert(m_value.object != nullptr);
for (auto& element : init) for (auto& element : init)
{ {
m_value.object->emplace(std::move(*(element[0].m_value.string)), std::move(element[1])); m_value.object->emplace(std::move(*(element[0].m_value.string)), std::move(element[1]));
...@@ -1607,24 +1610,28 @@ class basic_json ...@@ -1607,24 +1610,28 @@ class basic_json
{ {
case value_t::number_integer: case value_t::number_integer:
{ {
assert(first.m_object != nullptr);
m_value.number_integer = first.m_object->m_value.number_integer; m_value.number_integer = first.m_object->m_value.number_integer;
break; break;
} }
case value_t::number_float: case value_t::number_float:
{ {
assert(first.m_object != nullptr);
m_value.number_float = first.m_object->m_value.number_float; m_value.number_float = first.m_object->m_value.number_float;
break; break;
} }
case value_t::boolean: case value_t::boolean:
{ {
assert(first.m_object != nullptr);
m_value.boolean = first.m_object->m_value.boolean; m_value.boolean = first.m_object->m_value.boolean;
break; break;
} }
case value_t::string: case value_t::string:
{ {
assert(first.m_object != nullptr);
m_value = *first.m_object->m_value.string; m_value = *first.m_object->m_value.string;
break; break;
} }
...@@ -1643,6 +1650,7 @@ class basic_json ...@@ -1643,6 +1650,7 @@ class basic_json
default: default:
{ {
assert(first.m_object != nullptr);
throw std::domain_error("cannot use construct with iterators from " + first.m_object->type_name()); throw std::domain_error("cannot use construct with iterators from " + first.m_object->type_name());
} }
} }
...@@ -1679,18 +1687,21 @@ class basic_json ...@@ -1679,18 +1687,21 @@ class basic_json
{ {
case value_t::object: case value_t::object:
{ {
assert(other.m_value.object != nullptr);
m_value = *other.m_value.object; m_value = *other.m_value.object;
break; break;
} }
case value_t::array: case value_t::array:
{ {
assert(other.m_value.array != nullptr);
m_value = *other.m_value.array; m_value = *other.m_value.array;
break; break;
} }
case value_t::string: case value_t::string:
{ {
assert(other.m_value.string != nullptr);
m_value = *other.m_value.string; m_value = *other.m_value.string;
break; break;
} }
...@@ -2166,6 +2177,7 @@ class basic_json ...@@ -2166,6 +2177,7 @@ class basic_json
{ {
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return T(m_value.object->begin(), m_value.object->end()); return T(m_value.object->begin(), m_value.object->end());
} }
else else
...@@ -2179,6 +2191,7 @@ class basic_json ...@@ -2179,6 +2191,7 @@ class basic_json
{ {
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return *(m_value.object); return *(m_value.object);
} }
else else
...@@ -2201,6 +2214,7 @@ class basic_json ...@@ -2201,6 +2214,7 @@ class basic_json
if (is_array()) if (is_array())
{ {
T to_vector; T to_vector;
assert(m_value.array != nullptr);
std::transform(m_value.array->begin(), m_value.array->end(), std::transform(m_value.array->begin(), m_value.array->end(),
std::inserter(to_vector, to_vector.end()), [](basic_json i) std::inserter(to_vector, to_vector.end()), [](basic_json i)
{ {
...@@ -2225,6 +2239,7 @@ class basic_json ...@@ -2225,6 +2239,7 @@ class basic_json
if (is_array()) if (is_array())
{ {
std::vector<T> to_vector; std::vector<T> to_vector;
assert(m_value.array != nullptr);
to_vector.reserve(m_value.array->size()); to_vector.reserve(m_value.array->size());
std::transform(m_value.array->begin(), m_value.array->end(), std::transform(m_value.array->begin(), m_value.array->end(),
std::inserter(to_vector, to_vector.end()), [](basic_json i) std::inserter(to_vector, to_vector.end()), [](basic_json i)
...@@ -2249,6 +2264,7 @@ class basic_json ...@@ -2249,6 +2264,7 @@ class basic_json
{ {
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
return T(m_value.array->begin(), m_value.array->end()); return T(m_value.array->begin(), m_value.array->end());
} }
else else
...@@ -2262,6 +2278,7 @@ class basic_json ...@@ -2262,6 +2278,7 @@ class basic_json
{ {
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
return *(m_value.array); return *(m_value.array);
} }
else else
...@@ -2279,6 +2296,7 @@ class basic_json ...@@ -2279,6 +2296,7 @@ class basic_json
{ {
if (is_string()) if (is_string())
{ {
assert(m_value.string != nullptr);
return *m_value.string; return *m_value.string;
} }
else else
...@@ -2624,6 +2642,7 @@ class basic_json ...@@ -2624,6 +2642,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.array != nullptr);
return m_value.array->at(idx); return m_value.array->at(idx);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2667,6 +2686,7 @@ class basic_json ...@@ -2667,6 +2686,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.array != nullptr);
return m_value.array->at(idx); return m_value.array->at(idx);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2714,6 +2734,7 @@ class basic_json ...@@ -2714,6 +2734,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.object != nullptr);
return m_value.object->at(key); return m_value.object->at(key);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2761,6 +2782,7 @@ class basic_json ...@@ -2761,6 +2782,7 @@ class basic_json
{ {
try try
{ {
assert(m_value.object != nullptr);
return m_value.object->at(key); return m_value.object->at(key);
} }
catch (std::out_of_range& e) catch (std::out_of_range& e)
...@@ -2812,6 +2834,7 @@ class basic_json ...@@ -2812,6 +2834,7 @@ class basic_json
// [] only works for arrays // [] only works for arrays
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
for (size_t i = m_value.array->size(); i <= idx; ++i) for (size_t i = m_value.array->size(); i <= idx; ++i)
{ {
m_value.array->push_back(basic_json()); m_value.array->push_back(basic_json());
...@@ -2849,6 +2872,7 @@ class basic_json ...@@ -2849,6 +2872,7 @@ class basic_json
// at only works for arrays // at only works for arrays
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
return m_value.array->operator[](idx); return m_value.array->operator[](idx);
} }
else else
...@@ -2896,6 +2920,7 @@ class basic_json ...@@ -2896,6 +2920,7 @@ class basic_json
// [] only works for objects // [] only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return m_value.object->operator[](key); return m_value.object->operator[](key);
} }
else else
...@@ -2936,6 +2961,8 @@ class basic_json ...@@ -2936,6 +2961,8 @@ class basic_json
// [] only works for objects // [] only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
assert(m_value.object->find(key) != m_value.object->end());
return m_value.object->find(key)->second; return m_value.object->find(key)->second;
} }
else else
...@@ -2986,6 +3013,7 @@ class basic_json ...@@ -2986,6 +3013,7 @@ class basic_json
// at only works for objects // at only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return m_value.object->operator[](key); return m_value.object->operator[](key);
} }
else else
...@@ -3029,6 +3057,8 @@ class basic_json ...@@ -3029,6 +3057,8 @@ class basic_json
// at only works for objects // at only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
assert(m_value.object->find(key) != m_value.object->end());
return m_value.object->find(key)->second; return m_value.object->find(key)->second;
} }
else else
...@@ -3275,12 +3305,14 @@ class basic_json ...@@ -3275,12 +3305,14 @@ class basic_json
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator); result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
break; break;
} }
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator); result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
break; break;
} }
...@@ -3378,6 +3410,7 @@ class basic_json ...@@ -3378,6 +3410,7 @@ class basic_json
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator, result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
last.m_it.object_iterator); last.m_it.object_iterator);
break; break;
...@@ -3385,6 +3418,7 @@ class basic_json ...@@ -3385,6 +3418,7 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator, result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
last.m_it.array_iterator); last.m_it.array_iterator);
break; break;
...@@ -3430,6 +3464,7 @@ class basic_json ...@@ -3430,6 +3464,7 @@ class basic_json
// this erase only works for objects // this erase only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
return m_value.object->erase(key); return m_value.object->erase(key);
} }
else else
...@@ -3472,6 +3507,7 @@ class basic_json ...@@ -3472,6 +3507,7 @@ class basic_json
throw std::out_of_range("index out of range"); throw std::out_of_range("index out of range");
} }
assert(m_value.array != nullptr);
m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx)); m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
} }
else else
...@@ -3503,6 +3539,7 @@ class basic_json ...@@ -3503,6 +3539,7 @@ class basic_json
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->find(key); result.m_it.object_iterator = m_value.object->find(key);
} }
...@@ -3519,6 +3556,7 @@ class basic_json ...@@ -3519,6 +3556,7 @@ class basic_json
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
result.m_it.object_iterator = m_value.object->find(key); result.m_it.object_iterator = m_value.object->find(key);
} }
...@@ -3546,6 +3584,7 @@ class basic_json ...@@ -3546,6 +3584,7 @@ class basic_json
size_type count(typename object_t::key_type key) const size_type count(typename object_t::key_type key) const
{ {
// return 0 for all nonobject types // return 0 for all nonobject types
assert(not is_object() or m_value.object != nullptr);
return is_object() ? m_value.object->count(key) : 0; return is_object() ? m_value.object->count(key) : 0;
} }
...@@ -3864,11 +3903,13 @@ class basic_json ...@@ -3864,11 +3903,13 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
return m_value.array->empty(); return m_value.array->empty();
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
return m_value.object->empty(); return m_value.object->empty();
} }
...@@ -3920,11 +3961,13 @@ class basic_json ...@@ -3920,11 +3961,13 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
return m_value.array->size(); return m_value.array->size();
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
return m_value.object->size(); return m_value.object->size();
} }
...@@ -3974,11 +4017,13 @@ class basic_json ...@@ -3974,11 +4017,13 @@ class basic_json
{ {
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
return m_value.array->max_size(); return m_value.array->max_size();
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
return m_value.object->max_size(); return m_value.object->max_size();
} }
...@@ -4049,18 +4094,21 @@ class basic_json ...@@ -4049,18 +4094,21 @@ class basic_json
case value_t::string: case value_t::string:
{ {
assert(m_value.string != nullptr);
m_value.string->clear(); m_value.string->clear();
break; break;
} }
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
m_value.array->clear(); m_value.array->clear();
break; break;
} }
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
m_value.object->clear(); m_value.object->clear();
break; break;
} }
...@@ -4108,6 +4156,7 @@ class basic_json ...@@ -4108,6 +4156,7 @@ class basic_json
} }
// add element to array (move semantics) // add element to array (move semantics)
assert(m_value.array != nullptr);
m_value.array->push_back(std::move(val)); m_value.array->push_back(std::move(val));
// invalidate object // invalidate object
val.m_type = value_t::null; val.m_type = value_t::null;
...@@ -4143,6 +4192,7 @@ class basic_json ...@@ -4143,6 +4192,7 @@ class basic_json
} }
// add element to array // add element to array
assert(m_value.array != nullptr);
m_value.array->push_back(val); m_value.array->push_back(val);
} }
...@@ -4192,6 +4242,7 @@ class basic_json ...@@ -4192,6 +4242,7 @@ class basic_json
} }
// add element to array // add element to array
assert(m_value.object != nullptr);
m_value.object->insert(val); m_value.object->insert(val);
} }
...@@ -4240,6 +4291,7 @@ class basic_json ...@@ -4240,6 +4291,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val); result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
return result; return result;
} }
...@@ -4295,6 +4347,7 @@ class basic_json ...@@ -4295,6 +4347,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val); result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
return result; return result;
} }
...@@ -4360,6 +4413,7 @@ class basic_json ...@@ -4360,6 +4413,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert( result.m_it.array_iterator = m_value.array->insert(
pos.m_it.array_iterator, pos.m_it.array_iterator,
first.m_it.array_iterator, first.m_it.array_iterator,
...@@ -4407,6 +4461,7 @@ class basic_json ...@@ -4407,6 +4461,7 @@ class basic_json
// insert to array and return iterator // insert to array and return iterator
iterator result(this); iterator result(this);
assert(m_value.array != nullptr);
result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist); result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist);
return result; return result;
} }
...@@ -4464,6 +4519,7 @@ class basic_json ...@@ -4464,6 +4519,7 @@ class basic_json
// swap only works for arrays // swap only works for arrays
if (is_array()) if (is_array())
{ {
assert(m_value.array != nullptr);
std::swap(*(m_value.array), other); std::swap(*(m_value.array), other);
} }
else else
...@@ -4497,6 +4553,7 @@ class basic_json ...@@ -4497,6 +4553,7 @@ class basic_json
// swap only works for objects // swap only works for objects
if (is_object()) if (is_object())
{ {
assert(m_value.object != nullptr);
std::swap(*(m_value.object), other); std::swap(*(m_value.object), other);
} }
else else
...@@ -4530,6 +4587,7 @@ class basic_json ...@@ -4530,6 +4587,7 @@ class basic_json
// swap only works for strings // swap only works for strings
if (is_string()) if (is_string())
{ {
assert(m_value.string != nullptr);
std::swap(*(m_value.string), other); std::swap(*(m_value.string), other);
} }
else else
...@@ -4614,21 +4672,43 @@ class basic_json ...@@ -4614,21 +4672,43 @@ class basic_json
switch (lhs_type) switch (lhs_type)
{ {
case value_t::array: case value_t::array:
{
assert(lhs.m_value.array != nullptr);
assert(rhs.m_value.array != nullptr);
return *lhs.m_value.array == *rhs.m_value.array; return *lhs.m_value.array == *rhs.m_value.array;
}
case value_t::object: case value_t::object:
{
assert(lhs.m_value.object != nullptr);
assert(rhs.m_value.object != nullptr);
return *lhs.m_value.object == *rhs.m_value.object; return *lhs.m_value.object == *rhs.m_value.object;
}
case value_t::null: case value_t::null:
{
return true; return true;
}
case value_t::string: case value_t::string:
{
assert(lhs.m_value.string != nullptr);
assert(rhs.m_value.string != nullptr);
return *lhs.m_value.string == *rhs.m_value.string; return *lhs.m_value.string == *rhs.m_value.string;
}
case value_t::boolean: case value_t::boolean:
{
return lhs.m_value.boolean == rhs.m_value.boolean; return lhs.m_value.boolean == rhs.m_value.boolean;
}
case value_t::number_integer: case value_t::number_integer:
{
return lhs.m_value.number_integer == rhs.m_value.number_integer; return lhs.m_value.number_integer == rhs.m_value.number_integer;
}
case value_t::number_float: case value_t::number_float:
{
return approx(lhs.m_value.number_float, rhs.m_value.number_float); return approx(lhs.m_value.number_float, rhs.m_value.number_float);
}
default: default:
{
return false; return false;
}
} }
} }
else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float) else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
...@@ -4763,21 +4843,43 @@ class basic_json ...@@ -4763,21 +4843,43 @@ class basic_json
switch (lhs_type) switch (lhs_type)
{ {
case value_t::array: case value_t::array:
{
assert(lhs.m_value.array != nullptr);
assert(rhs.m_value.array != nullptr);
return *lhs.m_value.array < *rhs.m_value.array; return *lhs.m_value.array < *rhs.m_value.array;
}
case value_t::object: case value_t::object:
{
assert(lhs.m_value.object != nullptr);
assert(rhs.m_value.object != nullptr);
return *lhs.m_value.object < *rhs.m_value.object; return *lhs.m_value.object < *rhs.m_value.object;
}
case value_t::null: case value_t::null:
{
return false; return false;
}
case value_t::string: case value_t::string:
{
assert(lhs.m_value.string != nullptr);
assert(rhs.m_value.string != nullptr);
return *lhs.m_value.string < *rhs.m_value.string; return *lhs.m_value.string < *rhs.m_value.string;
}
case value_t::boolean: case value_t::boolean:
{
return lhs.m_value.boolean < rhs.m_value.boolean; return lhs.m_value.boolean < rhs.m_value.boolean;
}
case value_t::number_integer: case value_t::number_integer:
{
return lhs.m_value.number_integer < rhs.m_value.number_integer; return lhs.m_value.number_integer < rhs.m_value.number_integer;
}
case value_t::number_float: case value_t::number_float:
{
return lhs.m_value.number_float < rhs.m_value.number_float; return lhs.m_value.number_float < rhs.m_value.number_float;
}
default: default:
{
return false; return false;
}
} }
} }
else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float) else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
...@@ -5254,6 +5356,8 @@ class basic_json ...@@ -5254,6 +5356,8 @@ class basic_json
{ {
case value_t::object: case value_t::object:
{ {
assert(m_value.object != nullptr);
if (m_value.object->empty()) if (m_value.object->empty())
{ {
o << "{}"; o << "{}";
...@@ -5294,6 +5398,8 @@ class basic_json ...@@ -5294,6 +5398,8 @@ class basic_json
case value_t::array: case value_t::array:
{ {
assert(m_value.array != nullptr);
if (m_value.array->empty()) if (m_value.array->empty())
{ {
o << "[]"; o << "[]";
...@@ -5332,6 +5438,7 @@ class basic_json ...@@ -5332,6 +5438,7 @@ class basic_json
case value_t::string: case value_t::string:
{ {
assert(m_value.string != nullptr);
o << string_t("\"") << escape_string(*m_value.string) << "\""; o << string_t("\"") << escape_string(*m_value.string) << "\"";
return; return;
} }
...@@ -5509,6 +5616,8 @@ class basic_json ...@@ -5509,6 +5616,8 @@ class basic_json
/// return key of the iterator /// return key of the iterator
typename basic_json::string_t key() const typename basic_json::string_t key() const
{ {
assert(anchor.m_object != nullptr);
switch (anchor.m_object->type()) switch (anchor.m_object->type())
{ {
// use integer array index as key // use integer array index as key
...@@ -5597,6 +5706,8 @@ class basic_json ...@@ -5597,6 +5706,8 @@ class basic_json
/// constructor for a given JSON instance /// constructor for a given JSON instance
const_iterator(pointer object) : m_object(object) const_iterator(pointer object) : m_object(object)
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5622,6 +5733,8 @@ class basic_json ...@@ -5622,6 +5733,8 @@ class basic_json
/// copy constructor given a nonconst iterator /// copy constructor given a nonconst iterator
const_iterator(const iterator& other) : m_object(other.m_object) const_iterator(const iterator& other) : m_object(other.m_object)
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5666,16 +5779,20 @@ class basic_json ...@@ -5666,16 +5779,20 @@ class basic_json
/// set the iterator to the first value /// set the iterator to the first value
void set_begin() void set_begin()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object != nullptr);
m_it.object_iterator = m_object->m_value.object->begin(); m_it.object_iterator = m_object->m_value.object->begin();
break; break;
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array != nullptr);
m_it.array_iterator = m_object->m_value.array->begin(); m_it.array_iterator = m_object->m_value.array->begin();
break; break;
} }
...@@ -5698,16 +5815,20 @@ class basic_json ...@@ -5698,16 +5815,20 @@ class basic_json
/// set the iterator past the last value /// set the iterator past the last value
void set_end() void set_end()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object != nullptr);
m_it.object_iterator = m_object->m_value.object->end(); m_it.object_iterator = m_object->m_value.object->end();
break; break;
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array != nullptr);
m_it.array_iterator = m_object->m_value.array->end(); m_it.array_iterator = m_object->m_value.array->end();
break; break;
} }
...@@ -5724,15 +5845,21 @@ class basic_json ...@@ -5724,15 +5845,21 @@ class basic_json
/// return a reference to the value pointed to by the iterator /// return a reference to the value pointed to by the iterator
reference operator*() const reference operator*() const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object);
assert(m_it.object_iterator != m_object->m_value.object->end());
return m_it.object_iterator->second; return m_it.object_iterator->second;
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array);
assert(m_it.array_iterator != m_object->m_value.array->end());
return *m_it.array_iterator; return *m_it.array_iterator;
} }
...@@ -5758,15 +5885,21 @@ class basic_json ...@@ -5758,15 +5885,21 @@ class basic_json
/// dereference the iterator /// dereference the iterator
pointer operator->() const pointer operator->() const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
{ {
assert(m_object->m_value.object);
assert(m_it.object_iterator != m_object->m_value.object->end());
return &(m_it.object_iterator->second); return &(m_it.object_iterator->second);
} }
case basic_json::value_t::array: case basic_json::value_t::array:
{ {
assert(m_object->m_value.array);
assert(m_it.array_iterator != m_object->m_value.array->end());
return &*m_it.array_iterator; return &*m_it.array_iterator;
} }
...@@ -5795,6 +5928,8 @@ class basic_json ...@@ -5795,6 +5928,8 @@ class basic_json
/// pre-increment (++it) /// pre-increment (++it)
const_iterator& operator++() const_iterator& operator++()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5830,6 +5965,8 @@ class basic_json ...@@ -5830,6 +5965,8 @@ class basic_json
/// pre-decrement (--it) /// pre-decrement (--it)
const_iterator& operator--() const_iterator& operator--()
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5863,6 +6000,8 @@ class basic_json ...@@ -5863,6 +6000,8 @@ class basic_json
throw std::domain_error("cannot compare iterators of different containers"); throw std::domain_error("cannot compare iterators of different containers");
} }
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5897,6 +6036,8 @@ class basic_json ...@@ -5897,6 +6036,8 @@ class basic_json
throw std::domain_error("cannot compare iterators of different containers"); throw std::domain_error("cannot compare iterators of different containers");
} }
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5937,6 +6078,8 @@ class basic_json ...@@ -5937,6 +6078,8 @@ class basic_json
/// add to iterator /// add to iterator
const_iterator& operator+=(difference_type i) const_iterator& operator+=(difference_type i)
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -5985,6 +6128,8 @@ class basic_json ...@@ -5985,6 +6128,8 @@ class basic_json
/// return difference /// return difference
difference_type operator-(const const_iterator& other) const difference_type operator-(const const_iterator& other) const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -6007,6 +6152,8 @@ class basic_json ...@@ -6007,6 +6152,8 @@ class basic_json
/// access to successor /// access to successor
reference operator[](difference_type n) const reference operator[](difference_type n) const
{ {
assert(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case basic_json::value_t::object: case basic_json::value_t::object:
...@@ -6041,6 +6188,8 @@ class basic_json ...@@ -6041,6 +6188,8 @@ class basic_json
/// return the key of an object iterator /// return the key of an object iterator
typename object_t::key_type key() const typename object_t::key_type key() const
{ {
assert(m_object != nullptr);
if (m_object->is_object()) if (m_object->is_object())
{ {
return m_it.object_iterator->first; return m_it.object_iterator->first;
...@@ -6353,6 +6502,7 @@ class basic_json ...@@ -6353,6 +6502,7 @@ class basic_json
: m_stream(nullptr), m_buffer(s) : m_stream(nullptr), m_buffer(s)
{ {
m_content = reinterpret_cast<const lexer_char_t*>(s.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(s.c_str());
assert(m_content != nullptr);
m_start = m_cursor = m_content; m_start = m_cursor = m_content;
m_limit = m_content + s.size(); m_limit = m_content + s.size();
} }
...@@ -6361,8 +6511,10 @@ class basic_json ...@@ -6361,8 +6511,10 @@ class basic_json
explicit lexer(std::istream* s) noexcept explicit lexer(std::istream* s) noexcept
: m_stream(s), m_buffer() : m_stream(s), m_buffer()
{ {
assert(m_stream != nullptr);
getline(*m_stream, m_buffer); getline(*m_stream, m_buffer);
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
assert(m_content != nullptr);
m_start = m_cursor = m_content; m_start = m_cursor = m_content;
m_limit = m_content + m_buffer.size(); m_limit = m_content + m_buffer.size();
} }
...@@ -6511,6 +6663,7 @@ class basic_json ...@@ -6511,6 +6663,7 @@ class basic_json
// remember the begin of the token // remember the begin of the token
m_start = m_cursor; m_start = m_cursor;
assert(m_start != nullptr);
/*!re2c /*!re2c
re2c:define:YYCTYPE = lexer_char_t; re2c:define:YYCTYPE = lexer_char_t;
...@@ -6581,7 +6734,7 @@ class basic_json ...@@ -6581,7 +6734,7 @@ class basic_json
/// append data from the stream to the internal buffer /// append data from the stream to the internal buffer
void yyfill() noexcept void yyfill() noexcept
{ {
if (not m_stream or not * m_stream) if (m_stream == nullptr or not * m_stream)
{ {
return; return;
} }
...@@ -6592,10 +6745,12 @@ class basic_json ...@@ -6592,10 +6745,12 @@ class basic_json
m_buffer.erase(0, static_cast<size_t>(offset_start)); m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line; std::string line;
assert(m_stream != nullptr);
std::getline(*m_stream, line); std::getline(*m_stream, line);
m_buffer += "\n" + line; // add line with newline symbol m_buffer += "\n" + line; // add line with newline symbol
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
assert(m_content != nullptr);
m_start = m_content; m_start = m_content;
m_marker = m_start + offset_marker; m_marker = m_start + offset_marker;
m_cursor = m_start + offset_cursor; m_cursor = m_start + offset_cursor;
...@@ -6605,6 +6760,7 @@ class basic_json ...@@ -6605,6 +6760,7 @@ class basic_json
/// return string representation of last read token /// return string representation of last read token
string_t get_token() const noexcept string_t get_token() const noexcept
{ {
assert(m_start != nullptr);
return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start), return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start),
static_cast<size_t>(m_cursor - m_start)); static_cast<size_t>(m_cursor - m_start));
} }
...@@ -6754,6 +6910,7 @@ class basic_json ...@@ -6754,6 +6910,7 @@ class basic_json
{ {
// conversion // conversion
typename string_t::value_type* endptr; typename string_t::value_type* endptr;
assert(m_start != nullptr);
const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start),
&endptr); &endptr);
...@@ -6764,7 +6921,7 @@ class basic_json ...@@ -6764,7 +6921,7 @@ class basic_json
private: private:
/// optional input stream /// optional input stream
std::istream* m_stream; std::istream* m_stream = nullptr;
/// the buffer /// the buffer
string_t m_buffer; string_t m_buffer;
/// the buffer pointer /// the buffer pointer
......
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