amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-05 06:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review: switch in array_index, drop redundant inline

Browse Source 
- json_pointer::array_index() dispatches on array_index_status with a
  switch, matching the other parse_array_index() caller
- drop `inline` from the function templates this PR adds or moves in
  from_json.hpp
- reword a comment that described the change rather than the code

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-10-01 17:09:36 +02:00
parent 855155d1ab
commit 6d2ee1361b
3 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/conversions/from_json.hpp
+4 -4
View File
@@ -263,7 +263,7 @@ auto from_json_array_reserve(ConstructibleArrayType& arr, typename Constructible
} }
template<typename ConstructibleArrayType> template<typename ConstructibleArrayType>
inline void from_json_array_reserve(ConstructibleArrayType& /*arr*/, std::size_t /*size*/, priority_tag<0> /*unused*/) void from_json_array_reserve(ConstructibleArrayType& /*arr*/, std::size_t /*size*/, priority_tag<0> /*unused*/)
{} {}
template<typename BasicJsonType, typename ConstructibleArrayType, template<typename BasicJsonType, typename ConstructibleArrayType,
@@ -513,7 +513,7 @@ auto from_json(BasicJsonType&& j, TupleRelated&& t)
// shared body for std::map/std::unordered_map with a non-string Key: both // shared body for std::map/std::unordered_map with a non-string Key: both
// containers are read from an array of [key, value] pairs the same way // containers are read from an array of [key, value] pairs the same way
template<typename BasicJsonType, typename MapType> template<typename BasicJsonType, typename MapType>
inline void from_json_pair_array_to_map(const BasicJsonType& j, MapType& m) void from_json_pair_array_to_map(const BasicJsonType& j, MapType& m)
{ {
if (JSON_HEDLEY_UNLIKELY(!j.is_array())) if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
{ {
@@ -533,7 +533,7 @@ inline void from_json_pair_array_to_map(const BasicJsonType& j, MapType& m)
template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator, template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
typename = enable_if_t < !std::is_constructible < typename = enable_if_t < !std::is_constructible <
typename BasicJsonType::string_t, Key >::value >> typename BasicJsonType::string_t, Key >::value >>
inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m) void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
{ {
from_json_pair_array_to_map(j, m); from_json_pair_array_to_map(j, m);
} }
@@ -541,7 +541,7 @@ inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allo
template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator, template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
typename = enable_if_t < !std::is_constructible < typename = enable_if_t < !std::is_constructible <
typename BasicJsonType::string_t, Key >::value >> typename BasicJsonType::string_t, Key >::value >>
inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m) void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
{ {
from_json_pair_array_to_map(j, m); from_json_pair_array_to_map(j, m);
} }
include/nlohmann/detail/json_pointer.hpp
+13 -20
View File
@@ -320,26 +320,19 @@ class json_pointer
static typename BasicJsonType::size_type array_index(const string_t& s) static typename BasicJsonType::size_type array_index(const string_t& s)
{ {
typename BasicJsonType::size_type idx{}; typename BasicJsonType::size_type idx{};
const auto status = parse_array_index<BasicJsonType>(s, idx); switch (parse_array_index<BasicJsonType>(s, idx))
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::leading_zero))
{ {
JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr)); case array_index_status::leading_zero:
} JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
case array_index_status::not_a_number:
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::not_a_number)) JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
{ case array_index_status::unresolved:
JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr)); JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
} case array_index_status::exceeds_size_type:
JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr)); // LCOV_EXCL_LINE
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::unresolved)) case array_index_status::ok:
{ default:
JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr)); break;
}
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::exceeds_size_type))
{
JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr)); // LCOV_EXCL_LINE
} }
return idx; return idx;
@@ -679,7 +672,7 @@ class json_pointer
return nullptr; return nullptr;
} }
// a malformed index still throws parse_error.106/109; an // a malformed index throws parse_error.106/109; an
// index that is syntactically valid but cannot be // index that is syntactically valid but cannot be
// represented (out_of_range.404/410) is treated like an // represented (out_of_range.404/410) is treated like an
// out-of-range index below // out-of-range index below
single_include/nlohmann/json.hpp
+17 -24
View File
@@ -5681,7 +5681,7 @@ auto from_json_array_reserve(ConstructibleArrayType& arr, typename Constructible
} }
template<typename ConstructibleArrayType> template<typename ConstructibleArrayType>
inline void from_json_array_reserve(ConstructibleArrayType& /*arr*/, std::size_t /*size*/, priority_tag<0> /*unused*/) void from_json_array_reserve(ConstructibleArrayType& /*arr*/, std::size_t /*size*/, priority_tag<0> /*unused*/)
{} {}
template<typename BasicJsonType, typename ConstructibleArrayType, template<typename BasicJsonType, typename ConstructibleArrayType,
@@ -5931,7 +5931,7 @@ auto from_json(BasicJsonType&& j, TupleRelated&& t)
// shared body for std::map/std::unordered_map with a non-string Key: both // shared body for std::map/std::unordered_map with a non-string Key: both
// containers are read from an array of [key, value] pairs the same way // containers are read from an array of [key, value] pairs the same way
template<typename BasicJsonType, typename MapType> template<typename BasicJsonType, typename MapType>
inline void from_json_pair_array_to_map(const BasicJsonType& j, MapType& m) void from_json_pair_array_to_map(const BasicJsonType& j, MapType& m)
{ {
if (JSON_HEDLEY_UNLIKELY(!j.is_array())) if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
{ {
@@ -5951,7 +5951,7 @@ inline void from_json_pair_array_to_map(const BasicJsonType& j, MapType& m)
template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator, template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
typename = enable_if_t < !std::is_constructible < typename = enable_if_t < !std::is_constructible <
typename BasicJsonType::string_t, Key >::value >> typename BasicJsonType::string_t, Key >::value >>
inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m) void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
{ {
from_json_pair_array_to_map(j, m); from_json_pair_array_to_map(j, m);
} }
@@ -5959,7 +5959,7 @@ inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allo
template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator, template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
typename = enable_if_t < !std::is_constructible < typename = enable_if_t < !std::is_constructible <
typename BasicJsonType::string_t, Key >::value >> typename BasicJsonType::string_t, Key >::value >>
inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m) void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
{ {
from_json_pair_array_to_map(j, m); from_json_pair_array_to_map(j, m);
} }
@@ -19774,26 +19774,19 @@ class json_pointer
static typename BasicJsonType::size_type array_index(const string_t& s) static typename BasicJsonType::size_type array_index(const string_t& s)
{ {
typename BasicJsonType::size_type idx{}; typename BasicJsonType::size_type idx{};
const auto status = parse_array_index<BasicJsonType>(s, idx); switch (parse_array_index<BasicJsonType>(s, idx))
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::leading_zero))
{ {
JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr)); case array_index_status::leading_zero:
} JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
case array_index_status::not_a_number:
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::not_a_number)) JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
{ case array_index_status::unresolved:
JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr)); JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
} case array_index_status::exceeds_size_type:
JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr)); // LCOV_EXCL_LINE
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::unresolved)) case array_index_status::ok:
{ default:
JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr)); break;
}
if (JSON_HEDLEY_UNLIKELY(status == array_index_status::exceeds_size_type))
{
JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr)); // LCOV_EXCL_LINE
} }
return idx; return idx;
@@ -20133,7 +20126,7 @@ class json_pointer
return nullptr; return nullptr;
} }
// a malformed index still throws parse_error.106/109; an // a malformed index throws parse_error.106/109; an
// index that is syntactically valid but cannot be // index that is syntactically valid but cannot be
// represented (out_of_range.404/410) is treated like an // represented (out_of_range.404/410) is treated like an
// out-of-range index below // out-of-range index below