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

👌 implement some review comments

Browse Source
This commit is contained in:
Niels Lohmann 2021-03-31 10:42:08 +02:00
parent 02b36e928f
commit ea4891fb5c
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
4 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/mkdocs/docs/api/basic_json/erase.md
View File

@ -11,7 +11,7 @@ const_iterator erase(const_iterator first, const_iterator last);
// (3) // (3)
template<typename KeyT> template<typename KeyT>
size_type erase(KeyT && key); size_type erase(const KeyT& key);
// (4) // (4)
void erase(const size_type idx); void erase(const size_type idx);

2
doc/mkdocs/docs/api/basic_json/value.md
View File

@ -3,7 +3,7 @@
```cpp ```cpp
// (1) // (1)
template<class KeyType, class ValueType> template<class KeyType, class ValueType>
ValueType value(const KeyType& key, ValueType value(KeyType && key,
const ValueType& default_value) const; const ValueType& default_value) const;
// (2) // (2)

16
include/nlohmann/json.hpp
View File

@ -3694,13 +3694,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
// operator[] only works for objects // operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
auto it = m_value.object->find(key); auto result = m_value.object->emplace(std::forward<KeyT>(key), nullptr);
if (it != m_value.object->end())
{
return it->second;
}
auto result = m_value.object->emplace(key, nullptr);
return set_parent(result.first->second); return set_parent(result.first->second);
} }
@ -3809,13 +3803,13 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template < class KeyType, class ValueType, typename detail::enable_if_t < template < class KeyType, class ValueType, typename detail::enable_if_t <
detail::is_getable<basic_json_t, ValueType>::value detail::is_getable<basic_json_t, ValueType>::value
&& !std::is_same<value_t, ValueType>::value&& detail::is_key_type<basic_json_t, KeyType>::value > ... > && !std::is_same<value_t, ValueType>::value&& detail::is_key_type<basic_json_t, KeyType>::value > ... >
ValueType value(const KeyType& key, const ValueType& default_value) const ValueType value(KeyType&& key, const ValueType& default_value) const
{ {
// at only works for objects // at only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
// if key is found, return value and given default value otherwise // if key is found, return value and given default value otherwise
const auto it = find(key); const auto it = find(std::forward<KeyType>(key));
if (it != end()) if (it != end())
{ {
return it->template get<ValueType>(); return it->template get<ValueType>();
@ -4259,7 +4253,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
*/ */
template < class KeyT, typename detail::enable_if_t < template < class KeyT, typename detail::enable_if_t <
detail::is_key_type<basic_json_t, KeyT>::value > ... > detail::is_key_type<basic_json_t, KeyT>::value > ... >
size_type erase(KeyT&& key) size_type erase(const KeyT& key)
{ {
// this erase only works for objects // this erase only works for objects
if (JSON_HEDLEY_UNLIKELY(!is_object())) if (JSON_HEDLEY_UNLIKELY(!is_object()))
@ -4267,7 +4261,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this)); JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
} }
const auto it = m_value.object->find(std::forward<KeyT>(key)); const auto it = m_value.object->find(key);
if (it != m_value.object->end()) if (it != m_value.object->end())
{ {
m_value.object->erase(it); m_value.object->erase(it);

16
single_include/nlohmann/json.hpp
View File

@ -20597,13 +20597,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
// operator[] only works for objects // operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
auto it = m_value.object->find(key); auto result = m_value.object->emplace(std::forward<KeyT>(key), nullptr);
if (it != m_value.object->end())
{
return it->second;
}
auto result = m_value.object->emplace(key, nullptr);
return set_parent(result.first->second); return set_parent(result.first->second);
} }
@ -20712,13 +20706,13 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
template < class KeyType, class ValueType, typename detail::enable_if_t < template < class KeyType, class ValueType, typename detail::enable_if_t <
detail::is_getable<basic_json_t, ValueType>::value detail::is_getable<basic_json_t, ValueType>::value
&& !std::is_same<value_t, ValueType>::value&& detail::is_key_type<basic_json_t, KeyType>::value > ... > && !std::is_same<value_t, ValueType>::value&& detail::is_key_type<basic_json_t, KeyType>::value > ... >
ValueType value(const KeyType& key, const ValueType& default_value) const ValueType value(KeyType&& key, const ValueType& default_value) const
{ {
// at only works for objects // at only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
// if key is found, return value and given default value otherwise // if key is found, return value and given default value otherwise
const auto it = find(key); const auto it = find(std::forward<KeyType>(key));
if (it != end()) if (it != end())
{ {
return it->template get<ValueType>(); return it->template get<ValueType>();
@ -21162,7 +21156,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
*/ */
template < class KeyT, typename detail::enable_if_t < template < class KeyT, typename detail::enable_if_t <
detail::is_key_type<basic_json_t, KeyT>::value > ... > detail::is_key_type<basic_json_t, KeyT>::value > ... >
size_type erase(KeyT&& key) size_type erase(const KeyT& key)
{ {
// this erase only works for objects // this erase only works for objects
if (JSON_HEDLEY_UNLIKELY(!is_object())) if (JSON_HEDLEY_UNLIKELY(!is_object()))
@ -21170,7 +21164,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this)); JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
} }
const auto it = m_value.object->find(std::forward<KeyT>(key)); const auto it = m_value.object->find(key);
if (it != m_value.object->end()) if (it != m_value.object->end())
{ {
m_value.object->erase(it); m_value.object->erase(it);