External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/string_view' into string_view

Browse Source
This commit is contained in:
Niels Lohmann 2022-01-02 13:25:45 +01:00
commit b01293f0d1
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/nlohmann/json.hpp
View File

@ -2111,20 +2111,46 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
}
template<typename T>
using Alias = T;
/// @brief access specified object element
/// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
template<typename T, std::size_t n>
reference operator[](T * (&key)[n])
reference operator[](Alias<T[n]> const& key)
{
return operator[](static_cast<const T>(key));
// implicitly convert null value to an empty object
if (is_null())
{
m_type = value_t::object;
m_value.object = create<object_t>();
assert_invariant();
}
// operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object()))
{
auto result = m_value.object->emplace(key, nullptr);
return set_parent(result.first->second);
}
JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
}
/// @brief access specified object element
/// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
template<typename T, std::size_t n>
const_reference operator[](T * (&key)[n]) const
const_reference operator[](Alias<T[n]> const& key) const
{
return operator[](static_cast<const T>(key));
// operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object()))
{
auto it = m_value.object->find(key);
JSON_ASSERT(it != m_value.object->end());
return it->second;
}
JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
}
/// @brief access specified object element with default value

34
single_include/nlohmann/json.hpp
View File

@ -19300,20 +19300,46 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
}
template<typename T>
using Alias = T;
/// @brief access specified object element
/// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
template<typename T, std::size_t n>
reference operator[](T * (&key)[n])
reference operator[](Alias<T[n]> const& key)
{
return operator[](static_cast<const T>(key));
// implicitly convert null value to an empty object
if (is_null())
{
m_type = value_t::object;
m_value.object = create<object_t>();
assert_invariant();
}
// operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object()))
{
auto result = m_value.object->emplace(key, nullptr);
return set_parent(result.first->second);
}
JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
}
/// @brief access specified object element
/// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
template<typename T, std::size_t n>
const_reference operator[](T * (&key)[n]) const
const_reference operator[](Alias<T[n]> const& key) const
{
return operator[](static_cast<const T>(key));
// operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object()))
{
auto it = m_value.object->find(key);
JSON_ASSERT(it != m_value.object->end());
return it->second;
}
JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
}
/// @brief access specified object element with default value