mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-06-11 07:12:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove <algorithm> dependency from from_json.hpp

Browse Source
This commit is contained in:
vittorioromeo 2025-04-11 17:15:10 +02:00
parent 7ddea2686f
commit 8bf6d54c82
2 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -8,7 +8,6 @@
#pragma once #pragma once
#include <algorithm> // transform
#include <array> // array #include <array> // array
#include <forward_list> // forward_list #include <forward_list> // forward_list
#include <iterator> // inserter, front_inserter, end #include <iterator> // inserter, front_inserter, end
@ -177,11 +176,11 @@ inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l
JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j)); JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
} }
l.clear(); l.clear();
std::transform(j.rbegin(), j.rend(),
std::front_inserter(l), [](const BasicJsonType & i) for (auto it = j.rbegin(); it != j.rend(); ++it)
{ {
return i.template get<T>(); l.push_front(it->template get<T>());
}); }
} }
// valarray doesn't have an insert method // valarray doesn't have an insert method
@ -194,11 +193,12 @@ inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j)); JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
} }
l.resize(j.size()); l.resize(j.size());
std::transform(j.begin(), j.end(), std::begin(l),
[](const BasicJsonType & elem) auto outIt = std::begin(l);
for (auto it = j.begin(); it != j.end(); ++it)
{ {
return elem.template get<T>(); *outIt++ = it->template get<T>();
}); }
} }
template<typename BasicJsonType, typename T, std::size_t N> template<typename BasicJsonType, typename T, std::size_t N>
@ -290,13 +290,16 @@ auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, p
ConstructibleArrayType ret; ConstructibleArrayType ret;
ret.reserve(j.size()); ret.reserve(j.size());
std::transform(j.begin(), j.end(),
std::inserter(ret, end(ret)), [](const BasicJsonType & i) auto outIt = end(ret);
for (auto it = j.begin(); it != j.end(); ++it)
{ {
// get<BasicJsonType>() returns *this, this won't call a from_json // get<BasicJsonType>() returns *this, this won't call a from_json
// method when value_type is BasicJsonType // method when value_type is BasicJsonType
return i.template get<typename ConstructibleArrayType::value_type>(); outIt = ret.insert(outIt, it->template get<typename ConstructibleArrayType::value_type>());
}); ++outIt;
}
arr = std::move(ret); arr = std::move(ret);
} }
@ -310,14 +313,16 @@ inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType&
using std::end; using std::end;
ConstructibleArrayType ret; ConstructibleArrayType ret;
std::transform(
j.begin(), j.end(), std::inserter(ret, end(ret)), auto outIt = end(ret);
[](const BasicJsonType & i) for (auto it = j.begin(); it != j.end(); ++it)
{ {
// get<BasicJsonType>() returns *this, this won't call a from_json // get<BasicJsonType>() returns *this, this won't call a from_json
// method when value_type is BasicJsonType // method when value_type is BasicJsonType
return i.template get<typename ConstructibleArrayType::value_type>(); outIt = ret.insert(outIt, it->template get<typename ConstructibleArrayType::value_type>());
}); ++outIt;
}
arr = std::move(ret); arr = std::move(ret);
} }
@ -384,13 +389,16 @@ inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
ConstructibleObjectType ret; ConstructibleObjectType ret;
const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>(); const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
using value_type = typename ConstructibleObjectType::value_type; using value_type = typename ConstructibleObjectType::value_type;
std::transform(
inner_object->begin(), inner_object->end(), auto outIt = end(ret);
std::inserter(ret, ret.begin()), for (auto it = inner_object->begin(); it != inner_object->end(); ++it)
[](typename BasicJsonType::object_t::value_type const & p)
{ {
return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>()); // get<BasicJsonType>() returns *this, this won't call a from_json
}); // method when value_type is BasicJsonType
outIt = ret.insert(outIt, value_type(it->first, it->second.template get<typename ConstructibleObjectType::mapped_type>()));
++outIt;
}
obj = std::move(ret); obj = std::move(ret);
} }

56
single_include/nlohmann/json.hpp
View File

@ -168,7 +168,6 @@
#include <algorithm> // transform
#include <array> // array #include <array> // array
#include <forward_list> // forward_list #include <forward_list> // forward_list
#include <iterator> // inserter, front_inserter, end #include <iterator> // inserter, front_inserter, end
@ -4962,11 +4961,11 @@ inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l
JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j)); JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
} }
l.clear(); l.clear();
std::transform(j.rbegin(), j.rend(),
std::front_inserter(l), [](const BasicJsonType & i) for (auto it = j.rbegin(); it != j.rend(); ++it)
{ {
return i.template get<T>(); l.push_front(it->template get<T>());
}); }
} }
// valarray doesn't have an insert method // valarray doesn't have an insert method
@ -4979,11 +4978,12 @@ inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j)); JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
} }
l.resize(j.size()); l.resize(j.size());
std::transform(j.begin(), j.end(), std::begin(l),
[](const BasicJsonType & elem) auto outIt = std::begin(l);
for (auto it = j.begin(); it != j.end(); ++it)
{ {
return elem.template get<T>(); *outIt++ = it->template get<T>();
}); }
} }
template<typename BasicJsonType, typename T, std::size_t N> template<typename BasicJsonType, typename T, std::size_t N>
@ -5075,13 +5075,16 @@ auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, p
ConstructibleArrayType ret; ConstructibleArrayType ret;
ret.reserve(j.size()); ret.reserve(j.size());
std::transform(j.begin(), j.end(),
std::inserter(ret, end(ret)), [](const BasicJsonType & i) auto outIt = end(ret);
for (auto it = j.begin(); it != j.end(); ++it)
{ {
// get<BasicJsonType>() returns *this, this won't call a from_json // get<BasicJsonType>() returns *this, this won't call a from_json
// method when value_type is BasicJsonType // method when value_type is BasicJsonType
return i.template get<typename ConstructibleArrayType::value_type>(); outIt = ret.insert(outIt, it->template get<typename ConstructibleArrayType::value_type>());
}); ++outIt;
}
arr = std::move(ret); arr = std::move(ret);
} }
@ -5095,14 +5098,16 @@ inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType&
using std::end; using std::end;
ConstructibleArrayType ret; ConstructibleArrayType ret;
std::transform(
j.begin(), j.end(), std::inserter(ret, end(ret)), auto outIt = end(ret);
[](const BasicJsonType & i) for (auto it = j.begin(); it != j.end(); ++it)
{ {
// get<BasicJsonType>() returns *this, this won't call a from_json // get<BasicJsonType>() returns *this, this won't call a from_json
// method when value_type is BasicJsonType // method when value_type is BasicJsonType
return i.template get<typename ConstructibleArrayType::value_type>(); outIt = ret.insert(outIt, it->template get<typename ConstructibleArrayType::value_type>());
}); ++outIt;
}
arr = std::move(ret); arr = std::move(ret);
} }
@ -5169,13 +5174,16 @@ inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
ConstructibleObjectType ret; ConstructibleObjectType ret;
const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>(); const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
using value_type = typename ConstructibleObjectType::value_type; using value_type = typename ConstructibleObjectType::value_type;
std::transform(
inner_object->begin(), inner_object->end(), auto outIt = end(ret);
std::inserter(ret, ret.begin()), for (auto it = inner_object->begin(); it != inner_object->end(); ++it)
[](typename BasicJsonType::object_t::value_type const & p)
{ {
return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>()); // get<BasicJsonType>() returns *this, this won't call a from_json
}); // method when value_type is BasicJsonType
outIt = ret.insert(outIt, value_type(it->first, it->second.template get<typename ConstructibleObjectType::mapped_type>()));
++outIt;
}
obj = std::move(ret); obj = std::move(ret);
} }