j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

a more forgiving array behavior

Browse source
This commit is contained in:
Niels 2015-02-21 13:24:07 +01:00
parent 1cd256a95e
commit bc2e3a798d
4 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/json.hpp
View file

@ -712,12 +712,26 @@ class basic_json
/// access specified element
inline reference operator[](size_type pos)
{
// at only works for arrays
// implicitly convert null to object
if (m_type == value_t::null)
{
m_type = value_t::array;
Allocator<array_t> alloc;
m_value.array = alloc.allocate(1);
alloc.construct(m_value.array);
}
// [] only works for arrays
if (m_type != value_t::array)
{
throw std::runtime_error("cannot use [] with " + type_name());
}
for (size_t i = m_value.array->size(); i <= pos; ++i)
{
m_value.array->push_back(basic_json());
}
return m_value.array->operator[](pos);
}
@ -769,7 +783,7 @@ class basic_json
alloc.construct(m_value.object);
}
// at only works for objects
// [] only works for objects
if (m_type != value_t::object)
{
throw std::runtime_error("cannot use [] with " + type_name());

18
src/json.hpp.re2c
View file

@ -712,12 +712,26 @@ class basic_json
/// access specified element
inline reference operator[](size_type pos)
{
// at only works for arrays
// implicitly convert null to object
if (m_type == value_t::null)
{
m_type = value_t::array;
Allocator<array_t> alloc;
m_value.array = alloc.allocate(1);
alloc.construct(m_value.array);
}
// [] only works for arrays
if (m_type != value_t::array)
{
throw std::runtime_error("cannot use [] with " + type_name());
}
for (size_t i = m_value.array->size(); i <= pos; ++i)
{
m_value.array->push_back(basic_json());
}
return m_value.array->operator[](pos);
}
@ -769,7 +783,7 @@ class basic_json
alloc.construct(m_value.object);
}
// at only works for objects
// [] only works for objects
if (m_type != value_t::object)
{
throw std::runtime_error("cannot use [] with " + type_name());