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

fix adaptors

This commit is contained in:
bolero-MURAKAMI 2012-12-01 14:34:54 +09:00
parent 86818d73cb
commit d57b6e2b18
20 changed files with 489 additions and 556 deletions

View file

@ -8,7 +8,7 @@
#include <sprout/container/functions.hpp>
#include <sprout/iterator/next.hpp>
#include <sprout/iterator/alternate_iterator.hpp>
#include <sprout/range/range_container.hpp>
#include <sprout/range/adaptor/detail/jointed_range_default.hpp>
#include <sprout/range/algorithm/copy.hpp>
#include <sprout/type_traits/lvalue_reference.hpp>
#include <sprout/utility/forward.hpp>
@ -23,29 +23,29 @@ namespace sprout {
//
template<typename LRange, typename RRange>
class alternated_range
: public sprout::range::range_container<
: public sprout::adaptors::detail::jointed_range_default<
LRange, RRange,
sprout::alternate_iterator<
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 LRange range_type;
typedef RRange range2_type;
typedef sprout::range::range_container<
typedef sprout::adaptors::detail::jointed_range_default<
LRange, RRange,
sprout::alternate_iterator<
typename sprout::container_traits<LRange>::iterator,
typename sprout::container_traits<RRange>::iterator
>
> base_type;
typedef typename base_type::range1_type range1_type;
typedef typename base_type::range2_type range2_type;
typedef typename base_type::iterator iterator;
public:
alternated_range() = default;
alternated_range(alternated_range const&) = default;
SPROUT_CONSTEXPR alternated_range(range_type& range1, range2_type& range2)
SPROUT_CONSTEXPR alternated_range(range1_type& range1, range2_type& range2)
: base_type(
iterator(sprout::begin(range1), sprout::begin(range2)),
iterator(
@ -124,28 +124,9 @@ namespace sprout {
// container_construct_traits
//
template<typename LRange, typename RRange>
struct container_construct_traits<sprout::adaptors::alternated_range<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::alternated_range<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::alternated_range<LRange, RRange> >
: public sprout::container_construct_traits<typename sprout::adaptors::alternated_range<LRange, RRange>::base_type>
{};
} // namespace sprout
#endif // #ifndef SPROUT_RANGE_ADAPTOR_ALTERNATED_HPP