King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

fix adaptors alternated, taken, dropped, etc...

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-12-01 03:00:46 +09:00
parent 84e3348402
commit 86818d73cb
16 changed files with 207 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

52
sprout/range/adaptor/transformed.hpp
View file

@ -7,7 +7,7 @@
#include <sprout/container/traits.hpp>
#include <sprout/container/functions.hpp>
#include <sprout/iterator/transform_iterator.hpp>
#include <sprout/range/range_container.hpp>
#include <sprout/range/adaptor/detail/adapted_range_default.hpp>
#include <sprout/range/algorithm/copy.hpp>
#include <sprout/type_traits/lvalue_reference.hpp>
#include <sprout/utility/forward.hpp>
@ -21,21 +21,21 @@ namespace sprout {
//
template<typename BinaryFunction, typename LRange, typename RRange = void>
class transformed_range
: public sprout::range::range_container<
: public sprout::adaptors::detail::adapted_range_default<
LRange,
sprout::transform_iterator<
BinaryFunction,
typename sprout::container_traits<LRange>::iterator,
typename sprout::container_traits<RRange>::iterator
>
>
, public sprout::detail::container_nosy_static_size<LRange>
, public sprout::detail::container_nosy_fixed_size<LRange>
{
public:
typedef BinaryFunction functor_type;
typedef LRange range_type;
typedef LRange range1_type;
typedef RRange range2_type;
typedef sprout::range::range_container<
typedef sprout::adaptors::detail::adapted_range_default<
LRange,
sprout::transform_iterator<
BinaryFunction,
typename sprout::container_traits<LRange>::iterator,
@ -43,11 +43,10 @@ namespace sprout {
>
> base_type;
typedef typename base_type::iterator iterator;
typedef typename base_type::size_type size_type;
public:
transformed_range() = default;
transformed_range(transformed_range const&) = default;
SPROUT_CONSTEXPR transformed_range(functor_type func, range_type& range1, range2_type& range2)
SPROUT_CONSTEXPR transformed_range(functor_type func, range1_type& range1, range2_type& range2)
: base_type(
iterator(sprout::begin(range1), sprout::begin(range2), func),
iterator(sprout::end(range1), sprout::end(range2), func)
@ -57,19 +56,19 @@ namespace sprout {
template<typename UnaryFunction, typename Range>
class transformed_range<UnaryFunction, Range, void>
: public sprout::range::range_container<
: public sprout::adaptors::detail::adapted_range_default<
Range,
sprout::transform_iterator<
UnaryFunction,
typename sprout::container_traits<Range>::iterator
>
>
, public sprout::detail::container_nosy_static_size<Range>
, public sprout::detail::container_nosy_fixed_size<Range>
{
public:
typedef UnaryFunction functor_type;
typedef Range range_type;
typedef sprout::range::range_container<
typedef Range range1_type;
typedef sprout::adaptors::detail::adapted_range_default<
Range,
sprout::transform_iterator<
UnaryFunction,
typename sprout::container_traits<Range>::iterator
@ -79,7 +78,7 @@ namespace sprout {
public:
transformed_range() = default;
transformed_range(transformed_range const&) = default;
SPROUT_CONSTEXPR transformed_range(functor_type func, range_type& range)
SPROUT_CONSTEXPR transformed_range(functor_type func, range1_type& range)
: base_type(
iterator(sprout::begin(range), func),
iterator(sprout::end(range), func)
@ -202,28 +201,9 @@ namespace sprout {
// container_construct_traits
//
template<typename UnaryOrBinaryFunction, typename LRange, typename RRange>
struct container_construct_traits<sprout::adaptors::transformed_range<UnaryOrBinaryFunction, LRange, RRange> > {
public:
typedef typename sprout::container_construct_traits<LRange>::copied_type copied_type;
public:
template<typename Cont>
static SPROUT_CONSTEXPR copied_type deep_copy(Cont&& cont) {
return sprout::range::fixed::copy(sprout::forward<Cont>(cont), sprout::pit<copied_type>());
}
template<typename... Args>
static SPROUT_CONSTEXPR copied_type make(Args&&... args) {
return sprout::make<copied_type>(sprout::forward<Args>(args)...);
}
template<typename Cont, typename... Args>
static SPROUT_CONSTEXPR copied_type remake(
Cont&& cont,
typename sprout::container_traits<sprout::adaptors::transformed_range<UnaryOrBinaryFunction, LRange, RRange> >::difference_type size,
Args&&... args
)
{
return sprout::remake<copied_type>(sprout::forward<Cont>(cont), size, sprout::forward<Args>(args)...);
}
};
struct container_construct_traits<sprout::adaptors::transformed_range<UnaryOrBinaryFunction, LRange, RRange> >
: public sprout::container_construct_traits<typename sprout::adaptors::transformed_range<UnaryOrBinaryFunction, LRange, RRange>::base_type>
{};
} // namespace sprout
#endif // #ifndef SPROUT_RANGE_ADAPTOR_TRANSFORMD_HPP