mirror of
https://github.com/bolero-MURAKAMI/Sprout
synced 2025-08-03 12:49:50 +00:00
add range adaptors adjacent_filtered, uniqued
This commit is contained in:
parent
9aa2a7c9b2
commit
1cfec16e52
40 changed files with 571 additions and 58 deletions
|
@ -9,17 +9,19 @@
|
|||
#include <sprout/iterator/filter_iterator.hpp>
|
||||
#include <sprout/iterator/remove_iterator.hpp>
|
||||
#include <sprout/iterator/remove_if_iterator.hpp>
|
||||
#include <sprout/iterator/adjacent_filter_iterator.hpp>
|
||||
#include <sprout/iterator/unique_iterator.hpp>
|
||||
#include <sprout/iterator/merge_iterator.hpp>
|
||||
#include <sprout/iterator/set_union_iterator.hpp>
|
||||
#include <sprout/iterator/set_intersection_iterator.hpp>
|
||||
#include <sprout/iterator/set_difference_iterator.hpp>
|
||||
#include <sprout/iterator/set_symmetric_difference_iterator.hpp>
|
||||
#include <sprout/iterator/while_iterator.hpp>
|
||||
#include <sprout/iterator/step_iterator.hpp>
|
||||
#include <sprout/iterator/indexed_iterator.hpp>
|
||||
#include <sprout/iterator/valued_iterator.hpp>
|
||||
#include <sprout/iterator/joint_iterator.hpp>
|
||||
#include <sprout/iterator/alternate_iterator.hpp>
|
||||
#include <sprout/iterator/merge_iterator.hpp>
|
||||
#include <sprout/iterator/set_union_iterator.hpp>
|
||||
#include <sprout/iterator/set_intersection_iterator.hpp>
|
||||
#include <sprout/iterator/set_difference_iterator.hpp>
|
||||
#include <sprout/iterator/set_symmetric_difference_iterator.hpp>
|
||||
#include <sprout/iterator/size_enum_iterator.hpp>
|
||||
#include <sprout/iterator/bytes_iterator.hpp>
|
||||
#include <sprout/iterator/remake_iterator.hpp>
|
||||
|
|
177
sprout/iterator/adjacent_filter_iterator.hpp
Normal file
177
sprout/iterator/adjacent_filter_iterator.hpp
Normal file
|
@ -0,0 +1,177 @@
|
|||
#ifndef SPROUT_ITERATOR_ADJACENT_FILTER_ITERATOR_HPP
|
||||
#define SPROUT_ITERATOR_ADJACENT_FILTER_ITERATOR_HPP
|
||||
|
||||
#include <iterator>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/iterator/next.hpp>
|
||||
#include <sprout/iterator/type_traits/common.hpp>
|
||||
#include <sprout/algorithm/adjacent_find.hpp>
|
||||
#include <sprout/utility/swap.hpp>
|
||||
|
||||
namespace sprout {
|
||||
//
|
||||
// adjacent_filter_iterator
|
||||
//
|
||||
template<typename Predicate, typename Iterator>
|
||||
class adjacent_filter_iterator
|
||||
: public std::iterator<
|
||||
typename sprout::min_iterator_category<
|
||||
typename std::iterator_traits<Iterator>::iterator_category,
|
||||
std::forward_iterator_tag
|
||||
>::type,
|
||||
typename std::iterator_traits<Iterator>::value_type,
|
||||
typename std::iterator_traits<Iterator>::difference_type,
|
||||
typename std::iterator_traits<Iterator>::pointer,
|
||||
typename std::iterator_traits<Iterator>::reference
|
||||
>
|
||||
{
|
||||
public:
|
||||
typedef Predicate predicate_type;
|
||||
typedef Iterator iterator_type;
|
||||
typedef typename sprout::min_iterator_category<
|
||||
typename std::iterator_traits<Iterator>::iterator_category,
|
||||
std::forward_iterator_tag
|
||||
>::type iterator_category;
|
||||
typedef typename std::iterator_traits<Iterator>::value_type value_type;
|
||||
typedef typename std::iterator_traits<Iterator>::difference_type difference_type;
|
||||
typedef typename std::iterator_traits<Iterator>::pointer pointer;
|
||||
typedef typename std::iterator_traits<Iterator>::reference reference;
|
||||
private:
|
||||
struct private_constructor_tag {};
|
||||
private:
|
||||
static SPROUT_CONSTEXPR iterator_type find_next(iterator_type first, iterator_type last, Predicate pred) {
|
||||
return sprout::adjacent_find(first, last, pred);
|
||||
}
|
||||
static SPROUT_CONSTEXPR iterator_type checked_next(iterator_type found, iterator_type last) {
|
||||
return found == last ? last
|
||||
: sprout::next(found)
|
||||
;
|
||||
}
|
||||
protected:
|
||||
iterator_type current;
|
||||
iterator_type last;
|
||||
Predicate pred;
|
||||
private:
|
||||
void satisfy_predicate() {
|
||||
current = sprout::adjacent_find(current, last, pred);
|
||||
}
|
||||
SPROUT_CONSTEXPR adjacent_filter_iterator(Predicate pred, iterator_type it, iterator_type last, private_constructor_tag)
|
||||
: current(it)
|
||||
, last(last)
|
||||
, pred(pred)
|
||||
{}
|
||||
public:
|
||||
adjacent_filter_iterator() = default;
|
||||
adjacent_filter_iterator(adjacent_filter_iterator const&) = default;
|
||||
SPROUT_CONSTEXPR adjacent_filter_iterator(Predicate pred, iterator_type it, iterator_type last = iterator_type())
|
||||
: current(find_next(it, last, pred))
|
||||
, last(last)
|
||||
, pred(pred)
|
||||
{}
|
||||
template<typename U>
|
||||
SPROUT_CONSTEXPR adjacent_filter_iterator(adjacent_filter_iterator<Predicate, U> const& it)
|
||||
: current(it.current)
|
||||
, last(it.last)
|
||||
, pred(it.pred)
|
||||
{}
|
||||
template<typename U>
|
||||
adjacent_filter_iterator& operator=(adjacent_filter_iterator<Predicate, U> const& it) {
|
||||
adjacent_filter_iterator temp(it);
|
||||
temp.swap(*this);
|
||||
return *this;
|
||||
}
|
||||
SPROUT_CONSTEXPR iterator_type base() const {
|
||||
return current;
|
||||
}
|
||||
SPROUT_CONSTEXPR iterator_type end() const {
|
||||
return last;
|
||||
}
|
||||
SPROUT_CONSTEXPR Predicate predicate() const {
|
||||
return pred;
|
||||
}
|
||||
SPROUT_CONSTEXPR reference operator*() const {
|
||||
return *current;
|
||||
}
|
||||
SPROUT_CONSTEXPR pointer operator->() const {
|
||||
return &*current;
|
||||
}
|
||||
|
||||
adjacent_filter_iterator& operator++() {
|
||||
satisfy_predicate();
|
||||
if (current != last) {
|
||||
++current;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
adjacent_filter_iterator operator++(int) {
|
||||
adjacent_filter_iterator result(*this);
|
||||
satisfy_predicate();
|
||||
if (current != last) {
|
||||
++current;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
SPROUT_CONSTEXPR adjacent_filter_iterator next() const {
|
||||
return adjacent_filter_iterator(pred, checked_next(find_next(current, last, pred), last), last, private_constructor_tag());
|
||||
}
|
||||
void swap(adjacent_filter_iterator& other)
|
||||
SPROUT_NOEXCEPT_EXPR(
|
||||
SPROUT_NOEXCEPT_EXPR(sprout::swap(current, other.current))
|
||||
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(last, other.last))
|
||||
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(pred, other.pred))
|
||||
)
|
||||
{
|
||||
sprout::swap(current, other.current);
|
||||
sprout::swap(last, other.last);
|
||||
sprout::swap(pred, other.pred);
|
||||
}
|
||||
};
|
||||
|
||||
template<typename Predicate, typename Iterator1, typename Iterator2>
|
||||
inline SPROUT_CONSTEXPR bool operator==(
|
||||
sprout::adjacent_filter_iterator<Predicate, Iterator1> const& lhs,
|
||||
sprout::adjacent_filter_iterator<Predicate, Iterator2> const& rhs
|
||||
)
|
||||
{
|
||||
return lhs.base() == rhs.base();
|
||||
}
|
||||
template<typename Predicate, typename Iterator1, typename Iterator2>
|
||||
inline SPROUT_CONSTEXPR bool operator!=(
|
||||
sprout::adjacent_filter_iterator<Predicate, Iterator1> const& lhs,
|
||||
sprout::adjacent_filter_iterator<Predicate, Iterator2> const& rhs
|
||||
)
|
||||
{
|
||||
return !(lhs == rhs);
|
||||
}
|
||||
|
||||
//
|
||||
// make_adjacent_filter_iterator
|
||||
//
|
||||
template<typename Predicate, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR sprout::adjacent_filter_iterator<Predicate, Iterator>
|
||||
make_adjacent_filter_iterator(Predicate pred, Iterator it, Iterator last = Iterator()) {
|
||||
return sprout::adjacent_filter_iterator<Predicate, Iterator>(pred, it, last);
|
||||
}
|
||||
|
||||
//
|
||||
// swap
|
||||
//
|
||||
template<typename Predicate, typename Iterator>
|
||||
inline void
|
||||
swap(sprout::adjacent_filter_iterator<Predicate, Iterator>& lhs, sprout::adjacent_filter_iterator<Predicate, Iterator>& rhs)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(lhs.swap(rhs)))
|
||||
{
|
||||
lhs.swap(rhs);
|
||||
}
|
||||
|
||||
//
|
||||
// iterator_next
|
||||
//
|
||||
template<typename Predicate, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR sprout::adjacent_filter_iterator<Predicate, Iterator>
|
||||
iterator_next(sprout::adjacent_filter_iterator<Predicate, Iterator> const& it) {
|
||||
return it.next();
|
||||
}
|
||||
} // namespace sprout
|
||||
|
||||
#endif // SPROUT_ITERATOR_ADJACENT_FILTER_ITERATOR_HPP
|
|
@ -2,11 +2,10 @@
|
|||
#define SPROUT_ITERATOR_FILTER_ITERATOR_HPP
|
||||
|
||||
#include <iterator>
|
||||
#include <utility>
|
||||
#include <type_traits>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/iterator/next.hpp>
|
||||
#include <sprout/iterator/prev.hpp>
|
||||
#include <sprout/iterator/type_traits/common.hpp>
|
||||
#include <sprout/algorithm/find_if.hpp>
|
||||
#include <sprout/utility/swap.hpp>
|
||||
|
||||
|
@ -17,10 +16,9 @@ namespace sprout {
|
|||
template<typename Predicate, typename Iterator>
|
||||
class filter_iterator
|
||||
: public std::iterator<
|
||||
typename std::conditional<
|
||||
std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::random_access_iterator_tag>::value,
|
||||
std::bidirectional_iterator_tag,
|
||||
typename std::iterator_traits<Iterator>::iterator_category
|
||||
typename sprout::min_iterator_category<
|
||||
typename std::iterator_traits<Iterator>::iterator_category,
|
||||
std::bidirectional_iterator_tag
|
||||
>::type,
|
||||
typename std::iterator_traits<Iterator>::value_type,
|
||||
typename std::iterator_traits<Iterator>::difference_type,
|
||||
|
@ -31,10 +29,9 @@ namespace sprout {
|
|||
public:
|
||||
typedef Predicate predicate_type;
|
||||
typedef Iterator iterator_type;
|
||||
typedef typename std::conditional<
|
||||
std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::random_access_iterator_tag>::value,
|
||||
std::bidirectional_iterator_tag,
|
||||
typename std::iterator_traits<Iterator>::iterator_category
|
||||
typedef typename sprout::min_iterator_category<
|
||||
typename std::iterator_traits<Iterator>::iterator_category,
|
||||
std::bidirectional_iterator_tag
|
||||
>::type iterator_category;
|
||||
typedef typename std::iterator_traits<Iterator>::value_type value_type;
|
||||
typedef typename std::iterator_traits<Iterator>::difference_type difference_type;
|
||||
|
@ -57,9 +54,7 @@ namespace sprout {
|
|||
Predicate pred;
|
||||
private:
|
||||
void satisfy_predicate() {
|
||||
while (current != last && !pred(*current)) {
|
||||
++current;
|
||||
}
|
||||
current = sprout::find_if(current, last, pred);
|
||||
}
|
||||
void satisfy_predicate_backward() {
|
||||
while (!pred(*current)) {
|
||||
|
|
50
sprout/iterator/unique_iterator.hpp
Normal file
50
sprout/iterator/unique_iterator.hpp
Normal file
|
@ -0,0 +1,50 @@
|
|||
#ifndef SPROUT_ITERATOR_UNIQUE_ITERATOR_HPP
|
||||
#define SPROUT_ITERATOR_UNIQUE_ITERATOR_HPP
|
||||
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/iterator/adjacent_filter_iterator.hpp>
|
||||
#include <sprout/functional/equal_to.hpp>
|
||||
|
||||
namespace sprout {
|
||||
//
|
||||
// unique_filter
|
||||
//
|
||||
template<typename Predicate = sprout::equal_to<> >
|
||||
class unique_filter {
|
||||
public:
|
||||
typedef bool result_type;
|
||||
private:
|
||||
Predicate pred_;
|
||||
public:
|
||||
SPROUT_CONSTEXPR unique_filter()
|
||||
: pred_()
|
||||
{}
|
||||
explicit SPROUT_CONSTEXPR unique_filter(Predicate pred)
|
||||
: pred_(pred)
|
||||
{}
|
||||
template<typename T, typename U>
|
||||
SPROUT_CONSTEXPR bool operator()(T const& lhs, U const& rhs) const {
|
||||
return !pred_(lhs, rhs);
|
||||
}
|
||||
};
|
||||
|
||||
//
|
||||
// make_unique_iterator
|
||||
//
|
||||
template<typename Predicate, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR sprout::adjacent_filter_iterator<sprout::unique_filter<Predicate>, Iterator>
|
||||
make_unique_iterator(Predicate pred, Iterator it, Iterator last = Iterator()) {
|
||||
return sprout::adjacent_filter_iterator<sprout::unique_filter<Predicate>, Iterator>(
|
||||
sprout::unique_filter<Predicate>(pred), it, last
|
||||
);
|
||||
}
|
||||
template<typename Iterator>
|
||||
inline SPROUT_CONSTEXPR sprout::adjacent_filter_iterator<sprout::unique_filter<>, Iterator>
|
||||
make_unique_iterator(Iterator it, Iterator last = Iterator()) {
|
||||
return sprout::adjacent_filter_iterator<sprout::unique_filter<>, Iterator>(
|
||||
sprout::unique_filter<>(), it, last
|
||||
);
|
||||
}
|
||||
} // namespace sprout
|
||||
|
||||
#endif // SPROUT_ITERATOR_UNIQUE_ITERATOR_HPP
|
Loading…
Add table
Add a link
Reference in a new issue