mirror of
https://github.com/bolero-MURAKAMI/Sprout
synced 2025-08-03 12:49:50 +00:00
rename reduct_iterator -> reduce_iterator
This commit is contained in:
bolero-MURAKAMI
parent
64ca12a984
commit
fc0a1817d5
46 changed files with 1413 additions and 1413 deletions
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
namespace testspr {
|
||||
//
|
||||
// reduct_iterator
|
||||
// reduce_iterator
|
||||
//
|
||||
template<typename Iterator, typename Category = typename std::iterator_traits<Iterator>::iterator_category>
|
||||
class reduct_iterator
|
||||
class reduce_iterator
|
||||
: public std::iterator<
|
||||
Category,
|
||||
typename std::iterator_traits<Iterator>::value_type,
|
||||
|
|
@ -42,20 +42,20 @@ namespace testspr {
|
|||
protected:
|
||||
iterator_type current;
|
||||
public:
|
||||
SPROUT_CONSTEXPR reduct_iterator()
|
||||
SPROUT_CONSTEXPR reduce_iterator()
|
||||
: current()
|
||||
{}
|
||||
reduct_iterator(reduct_iterator const& other) = default;
|
||||
explicit SPROUT_CONSTEXPR reduct_iterator(iterator_type it)
|
||||
reduce_iterator(reduce_iterator const& other) = default;
|
||||
explicit SPROUT_CONSTEXPR reduce_iterator(iterator_type it)
|
||||
: current(it)
|
||||
{}
|
||||
template<typename U, typename V, typename sprout::enabler_if<sprout::is_convert_constructible<Iterator, U>::value>::type = sprout::enabler>
|
||||
SPROUT_CONSTEXPR reduct_iterator(reduct_iterator<U, V> const& it)
|
||||
SPROUT_CONSTEXPR reduce_iterator(reduce_iterator<U, V> const& it)
|
||||
: current(it.base())
|
||||
{}
|
||||
template<typename U, typename V, typename sprout::enabler_if<sprout::is_convert_constructible<Iterator, U>::value>::type = sprout::enabler>
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator& operator=(reduct_iterator<U, V> const& it) {
|
||||
reduct_iterator temp(it);
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator& operator=(reduce_iterator<U, V> const& it) {
|
||||
reduce_iterator temp(it);
|
||||
temp.swap(*this);
|
||||
return *this;
|
||||
}
|
||||
|
|
@ -68,50 +68,50 @@ namespace testspr {
|
|||
SPROUT_CONSTEXPR pointer operator->() const {
|
||||
return &*current;
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator& operator++() {
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator& operator++() {
|
||||
++current;
|
||||
return *this;
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator operator++(int) {
|
||||
reduct_iterator result(*this);
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator operator++(int) {
|
||||
reduce_iterator result(*this);
|
||||
++current;
|
||||
return result;
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator& operator--() {
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator& operator--() {
|
||||
--current;
|
||||
return *this;
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator operator--(int) {
|
||||
reduct_iterator temp(*this);
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator operator--(int) {
|
||||
reduce_iterator temp(*this);
|
||||
--current;
|
||||
return temp;
|
||||
}
|
||||
SPROUT_CONSTEXPR reduct_iterator operator+(difference_type n) const {
|
||||
return reduct_iterator(current + n);
|
||||
SPROUT_CONSTEXPR reduce_iterator operator+(difference_type n) const {
|
||||
return reduce_iterator(current + n);
|
||||
}
|
||||
SPROUT_CONSTEXPR reduct_iterator operator-(difference_type n) const {
|
||||
return reduct_iterator(current - n);
|
||||
SPROUT_CONSTEXPR reduce_iterator operator-(difference_type n) const {
|
||||
return reduce_iterator(current - n);
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator& operator+=(difference_type n) {
|
||||
reduct_iterator temp(current + n);
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator& operator+=(difference_type n) {
|
||||
reduce_iterator temp(current + n);
|
||||
temp.swap(*this);
|
||||
return *this;
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR reduct_iterator& operator-=(difference_type n) {
|
||||
reduct_iterator temp(current - n);
|
||||
SPROUT_CXX14_CONSTEXPR reduce_iterator& operator-=(difference_type n) {
|
||||
reduce_iterator temp(current - n);
|
||||
temp.swap(*this);
|
||||
return *this;
|
||||
}
|
||||
SPROUT_CONSTEXPR reference operator[](difference_type n) const {
|
||||
return current[n];
|
||||
}
|
||||
SPROUT_CONSTEXPR reduct_iterator next() const {
|
||||
return reduct_iterator(sprout::next(current));
|
||||
SPROUT_CONSTEXPR reduce_iterator next() const {
|
||||
return reduce_iterator(sprout::next(current));
|
||||
}
|
||||
SPROUT_CONSTEXPR reduct_iterator prev() const {
|
||||
return reduct_iterator(sprout::prev(current));
|
||||
SPROUT_CONSTEXPR reduce_iterator prev() const {
|
||||
return reduce_iterator(sprout::prev(current));
|
||||
}
|
||||
SPROUT_CXX14_CONSTEXPR void swap(reduct_iterator& other)
|
||||
SPROUT_CXX14_CONSTEXPR void swap(reduce_iterator& other)
|
||||
SPROUT_NOEXCEPT_IF(
|
||||
SPROUT_NOEXCEPT_EXPR(swap(current, other.current))
|
||||
)
|
||||
|
|
@ -123,88 +123,88 @@ namespace testspr {
|
|||
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
operator==(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator==(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return lhs.base() == rhs.base();
|
||||
}
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
operator!=(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator!=(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return !(lhs == rhs);
|
||||
}
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
operator<(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator<(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return lhs.base() < rhs.base();
|
||||
}
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
operator>(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator>(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return rhs < lhs;
|
||||
}
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
operator<=(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator<=(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return !(rhs < lhs);
|
||||
}
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
operator>=(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator>=(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return !(lhs < rhs);
|
||||
}
|
||||
template<typename Iterator1, typename Category1, typename Iterator2, typename Category2>
|
||||
inline SPROUT_CONSTEXPR decltype(std::declval<Iterator1>() - std::declval<Iterator2>())
|
||||
operator-(testspr::reduct_iterator<Iterator1, Category1> const& lhs, testspr::reduct_iterator<Iterator2, Category2> const& rhs) {
|
||||
operator-(testspr::reduce_iterator<Iterator1, Category1> const& lhs, testspr::reduce_iterator<Iterator2, Category2> const& rhs) {
|
||||
return lhs.base() - rhs.base();
|
||||
}
|
||||
template<typename Iterator, typename Category>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, Category>
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, Category>
|
||||
operator+(
|
||||
typename testspr::reduct_iterator<Iterator, Category>::difference_type n,
|
||||
testspr::reduct_iterator<Iterator, Category> const& it
|
||||
typename testspr::reduce_iterator<Iterator, Category>::difference_type n,
|
||||
testspr::reduce_iterator<Iterator, Category> const& it
|
||||
)
|
||||
{
|
||||
return it + n;
|
||||
}
|
||||
|
||||
//
|
||||
// make_reduct_iterator
|
||||
// make_reduce_iterator
|
||||
//
|
||||
template<typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator>
|
||||
make_reduct_iterator(Iterator it) {
|
||||
return testspr::reduct_iterator<Iterator>(it);
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator>
|
||||
make_reduce_iterator(Iterator it) {
|
||||
return testspr::reduce_iterator<Iterator>(it);
|
||||
}
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, Category>
|
||||
make_reduct_iterator(Iterator it) {
|
||||
return testspr::reduct_iterator<Iterator, Category>(it);
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, Category>
|
||||
make_reduce_iterator(Iterator it) {
|
||||
return testspr::reduce_iterator<Iterator, Category>(it);
|
||||
}
|
||||
|
||||
//
|
||||
// reduct_input
|
||||
// reduct_forward
|
||||
// reduct_bidirectional
|
||||
// reduct_random_access
|
||||
// reduce_input
|
||||
// reduce_forward
|
||||
// reduce_bidirectional
|
||||
// reduce_random_access
|
||||
//
|
||||
template<typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, std::input_iterator_tag>
|
||||
reduct_input(Iterator it) {
|
||||
return testspr::reduct_iterator<Iterator, std::input_iterator_tag>(it);
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, std::input_iterator_tag>
|
||||
reduce_input(Iterator it) {
|
||||
return testspr::reduce_iterator<Iterator, std::input_iterator_tag>(it);
|
||||
}
|
||||
template<typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, std::forward_iterator_tag>
|
||||
reduct_forward(Iterator it) {
|
||||
return testspr::reduct_iterator<Iterator, std::forward_iterator_tag>(it);
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, std::forward_iterator_tag>
|
||||
reduce_forward(Iterator it) {
|
||||
return testspr::reduce_iterator<Iterator, std::forward_iterator_tag>(it);
|
||||
}
|
||||
template<typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, std::bidirectional_iterator_tag>
|
||||
reduct_bidirectional(Iterator it) {
|
||||
return testspr::reduct_iterator<Iterator, std::bidirectional_iterator_tag>(it);
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, std::bidirectional_iterator_tag>
|
||||
reduce_bidirectional(Iterator it) {
|
||||
return testspr::reduce_iterator<Iterator, std::bidirectional_iterator_tag>(it);
|
||||
}
|
||||
template<typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, std::random_access_iterator_tag>
|
||||
reduct_random_access(Iterator it) {
|
||||
return testspr::reduct_iterator<Iterator, std::random_access_iterator_tag>(it);
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, std::random_access_iterator_tag>
|
||||
reduce_random_access(Iterator it) {
|
||||
return testspr::reduce_iterator<Iterator, std::random_access_iterator_tag>(it);
|
||||
}
|
||||
|
||||
//
|
||||
|
|
@ -212,7 +212,7 @@ namespace testspr {
|
|||
//
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CXX14_CONSTEXPR void
|
||||
swap(testspr::reduct_iterator<Iterator, Category>& lhs, testspr::reduct_iterator<Iterator, Category>& rhs)
|
||||
swap(testspr::reduce_iterator<Iterator, Category>& lhs, testspr::reduce_iterator<Iterator, Category>& rhs)
|
||||
SPROUT_NOEXCEPT_IF_EXPR(lhs.swap(rhs))
|
||||
{
|
||||
lhs.swap(rhs);
|
||||
|
|
@ -222,8 +222,8 @@ namespace testspr {
|
|||
// iterator_distance
|
||||
//
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR typename std::iterator_traits<testspr::reduct_iterator<Iterator, Category> >::difference_type
|
||||
iterator_distance(testspr::reduct_iterator<Iterator, Category> first, testspr::reduct_iterator<Iterator, Category> last) {
|
||||
inline SPROUT_CONSTEXPR typename std::iterator_traits<testspr::reduce_iterator<Iterator, Category> >::difference_type
|
||||
iterator_distance(testspr::reduce_iterator<Iterator, Category> first, testspr::reduce_iterator<Iterator, Category> last) {
|
||||
return sprout::distance(first.base(), last.base());
|
||||
}
|
||||
|
||||
|
|
@ -231,36 +231,36 @@ namespace testspr {
|
|||
// iterator_next
|
||||
//
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, Category>
|
||||
iterator_next(testspr::reduct_iterator<Iterator, Category> const& it) {
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, Category>
|
||||
iterator_next(testspr::reduce_iterator<Iterator, Category> const& it) {
|
||||
return it.next();
|
||||
}
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, Category>
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, Category>
|
||||
iterator_next(
|
||||
testspr::reduct_iterator<Iterator, Category> const& it,
|
||||
typename testspr::reduct_iterator<Iterator, Category>::difference_type n
|
||||
testspr::reduce_iterator<Iterator, Category> const& it,
|
||||
typename testspr::reduce_iterator<Iterator, Category>::difference_type n
|
||||
)
|
||||
{
|
||||
return testspr::reduct_iterator<Iterator, Category>(sprout::next(it.base(), n));
|
||||
return testspr::reduce_iterator<Iterator, Category>(sprout::next(it.base(), n));
|
||||
}
|
||||
|
||||
//
|
||||
// iterator_prev
|
||||
//
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, Category>
|
||||
iterator_prev(testspr::reduct_iterator<Iterator, Category> const& it) {
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, Category>
|
||||
iterator_prev(testspr::reduce_iterator<Iterator, Category> const& it) {
|
||||
return it.prev();
|
||||
}
|
||||
template<typename Category, typename Iterator>
|
||||
inline SPROUT_CONSTEXPR testspr::reduct_iterator<Iterator, Category>
|
||||
inline SPROUT_CONSTEXPR testspr::reduce_iterator<Iterator, Category>
|
||||
iterator_prev(
|
||||
testspr::reduct_iterator<Iterator, Category> const& it,
|
||||
typename testspr::reduct_iterator<Iterator, Category>::difference_type n
|
||||
testspr::reduce_iterator<Iterator, Category> const& it,
|
||||
typename testspr::reduce_iterator<Iterator, Category>::difference_type n
|
||||
)
|
||||
{
|
||||
return testspr::reduct_iterator<Iterator, Category>(sprout::next(it.base(), n));
|
||||
return testspr::reduce_iterator<Iterator, Category>(sprout::next(it.base(), n));
|
||||
}
|
||||
} // namespace testspr
|
||||
|
||||
|
|
|
|||
|
|
@ -25,17 +25,17 @@ namespace testspr {
|
|||
//
|
||||
// reducted_range
|
||||
//
|
||||
template<typename Range, typename Category = typename testspr::reduct_iterator<typename sprout::container_traits<Range>::iterator>::iterator_category>
|
||||
template<typename Range, typename Category = typename testspr::reduce_iterator<typename sprout::container_traits<Range>::iterator>::iterator_category>
|
||||
class reducted_range
|
||||
: public sprout::adaptors::detail::adapted_range_default<
|
||||
Range,
|
||||
testspr::reduct_iterator<typename sprout::container_traits<Range>::iterator, Category>
|
||||
testspr::reduce_iterator<typename sprout::container_traits<Range>::iterator, Category>
|
||||
>
|
||||
{
|
||||
public:
|
||||
typedef sprout::adaptors::detail::adapted_range_default<
|
||||
Range,
|
||||
testspr::reduct_iterator<typename sprout::container_traits<Range>::iterator, Category>
|
||||
testspr::reduce_iterator<typename sprout::container_traits<Range>::iterator, Category>
|
||||
> base_type;
|
||||
typedef typename base_type::range_type range_type;
|
||||
typedef typename base_type::iterator iterator;
|
||||
|
|
@ -51,13 +51,13 @@ namespace testspr {
|
|||
};
|
||||
|
||||
//
|
||||
// make_reduct_range
|
||||
// make_reduce_range
|
||||
//
|
||||
template<typename Range>
|
||||
inline SPROUT_CONSTEXPR testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type
|
||||
>
|
||||
make_reduct_range(Range&& rng) {
|
||||
make_reduce_range(Range&& rng) {
|
||||
return testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type
|
||||
>(
|
||||
|
|
@ -69,7 +69,7 @@ namespace testspr {
|
|||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type,
|
||||
Category
|
||||
>
|
||||
make_reduct_range(Range&& rng) {
|
||||
make_reduce_range(Range&& rng) {
|
||||
return testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type,
|
||||
Category
|
||||
|
|
@ -79,42 +79,42 @@ namespace testspr {
|
|||
}
|
||||
|
||||
//
|
||||
// reduct_input
|
||||
// reduct_forward
|
||||
// reduct_bidirectional
|
||||
// reduct_random_access
|
||||
// reduce_input
|
||||
// reduce_forward
|
||||
// reduce_bidirectional
|
||||
// reduce_random_access
|
||||
//
|
||||
template<typename Range>
|
||||
inline SPROUT_CONSTEXPR testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type,
|
||||
std::input_iterator_tag
|
||||
>
|
||||
reduct_input(Range&& rng) {
|
||||
return testspr::range::make_reduct_range<std::input_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
reduce_input(Range&& rng) {
|
||||
return testspr::range::make_reduce_range<std::input_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
}
|
||||
template<typename Range>
|
||||
inline SPROUT_CONSTEXPR testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type,
|
||||
std::forward_iterator_tag
|
||||
>
|
||||
reduct_forward(Range&& rng) {
|
||||
return testspr::range::make_reduct_range<std::forward_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
reduce_forward(Range&& rng) {
|
||||
return testspr::range::make_reduce_range<std::forward_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
}
|
||||
template<typename Range>
|
||||
inline SPROUT_CONSTEXPR testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type,
|
||||
std::bidirectional_iterator_tag
|
||||
>
|
||||
reduct_bidirectional(Range&& rng) {
|
||||
return testspr::range::make_reduct_range<std::bidirectional_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
reduce_bidirectional(Range&& rng) {
|
||||
return testspr::range::make_reduce_range<std::bidirectional_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
}
|
||||
template<typename Range>
|
||||
inline SPROUT_CONSTEXPR testspr::range::reducted_range<
|
||||
typename std::remove_reference<typename sprout::lvalue_reference<Range>::type>::type,
|
||||
std::random_access_iterator_tag
|
||||
>
|
||||
reduct_random_access(Range&& rng) {
|
||||
return testspr::range::make_reduct_range<std::random_access_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
reduce_random_access(Range&& rng) {
|
||||
return testspr::range::make_reduce_range<std::random_access_iterator_tag>(SPROUT_FORWARD(Range, rng));
|
||||
}
|
||||
} // namespace range
|
||||
} // namespace testspr
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue