[libcxx-commits] [libcxx] c02782f - [libc++] Move filter_view::iterator and sentinel out of filter_view

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2022-12-08T22:29:42+01:00
New Revision: c02782fc22653fbf0f170a5acbdbe871b23e8677

URL: https://github.com/llvm/llvm-project/commit/c02782fc22653fbf0f170a5acbdbe871b23e8677
DIFF: https://github.com/llvm/llvm-project/commit/c02782fc22653fbf0f170a5acbdbe871b23e8677.diff

LOG: [libc++] Move filter_view::iterator and sentinel out of filter_view

Reviewed By: ldionne, #libc

Spies: libcxx-commits

Differential Revision: https://reviews.llvm.org/D139273

Added: 
    

Modified: 
    libcxx/include/__ranges/filter_view.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__ranges/filter_view.h b/libcxx/include/__ranges/filter_view.h
index 0622da54ef5e6..f8633a3fee843 100644
--- a/libcxx/include/__ranges/filter_view.h
+++ b/libcxx/include/__ranges/filter_view.h
@@ -46,6 +46,15 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER > 17
 
 namespace ranges {
+
+  template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
+    requires view<_View> && is_object_v<_Pred>
+  class __filter_view_iterator;
+
+  template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
+    requires view<_View> && is_object_v<_Pred>
+  class __filter_view_sentinel;
+
   template<input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
     requires view<_View> && is_object_v<_Pred>
   class filter_view : public view_interface<filter_view<_View, _Pred>> {
@@ -58,8 +67,11 @@ namespace ranges {
     using _Cache = _If<_UseCache, __non_propagating_cache<iterator_t<_View>>, __empty_cache>;
     _LIBCPP_NO_UNIQUE_ADDRESS _Cache __cached_begin_ = _Cache();
 
-    class __iterator;
-    class __sentinel;
+    using __iterator = __filter_view_iterator<_View, _Pred>;
+    using __sentinel = __filter_view_sentinel<_View, _Pred>;
+
+    friend __iterator;
+    friend __sentinel;
 
   public:
     _LIBCPP_HIDE_FROM_ABI
@@ -119,10 +131,13 @@ namespace ranges {
 
   template<input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
     requires view<_View> && is_object_v<_Pred>
-  class filter_view<_View, _Pred>::__iterator : public __filter_iterator_category<_View> {
+  class __filter_view_iterator : public __filter_iterator_category<_View> {
+
+    using __filter_view = filter_view<_View, _Pred>;
+
   public:
     _LIBCPP_NO_UNIQUE_ADDRESS iterator_t<_View> __current_ = iterator_t<_View>();
-    _LIBCPP_NO_UNIQUE_ADDRESS filter_view* __parent_ = nullptr;
+    _LIBCPP_NO_UNIQUE_ADDRESS __filter_view* __parent_ = nullptr;
 
     using iterator_concept =
       _If<bidirectional_range<_View>, bidirectional_iterator_tag,
@@ -134,10 +149,10 @@ namespace ranges {
     using 
diff erence_type = range_
diff erence_t<_View>;
 
     _LIBCPP_HIDE_FROM_ABI
-    __iterator() requires default_initializable<iterator_t<_View>> = default;
+    __filter_view_iterator() requires default_initializable<iterator_t<_View>> = default;
 
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator(filter_view& __parent, iterator_t<_View> __current)
+    constexpr __filter_view_iterator(__filter_view& __parent, iterator_t<_View> __current)
       : __current_(std::move(__current)), __parent_(std::addressof(__parent))
     { }
 
@@ -156,7 +171,7 @@ namespace ranges {
     }
 
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator& operator++() {
+    constexpr __filter_view_iterator& operator++() {
       __current_ = ranges::find_if(std::move(++__current_), ranges::end(__parent_->__base_),
                                    std::ref(*__parent_->__pred_));
       return *this;
@@ -164,42 +179,42 @@ namespace ranges {
     _LIBCPP_HIDE_FROM_ABI
     constexpr void operator++(int) { ++*this; }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator operator++(int) requires forward_range<_View> {
+    constexpr __filter_view_iterator operator++(int) requires forward_range<_View> {
       auto __tmp = *this;
       ++*this;
       return __tmp;
     }
 
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator& operator--() requires bidirectional_range<_View> {
+    constexpr __filter_view_iterator& operator--() requires bidirectional_range<_View> {
       do {
         --__current_;
       } while (!std::invoke(*__parent_->__pred_, *__current_));
       return *this;
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator operator--(int) requires bidirectional_range<_View> {
+    constexpr __filter_view_iterator operator--(int) requires bidirectional_range<_View> {
       auto tmp = *this;
       --*this;
       return tmp;
     }
 
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr bool operator==(__iterator const& __x, __iterator const& __y)
+    friend constexpr bool operator==(__filter_view_iterator const& __x, __filter_view_iterator const& __y)
       requires equality_comparable<iterator_t<_View>>
     {
       return __x.__current_ == __y.__current_;
     }
 
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr range_rvalue_reference_t<_View> iter_move(__iterator const& __it)
+    friend constexpr range_rvalue_reference_t<_View> iter_move(__filter_view_iterator const& __it)
       noexcept(noexcept(ranges::iter_move(__it.__current_)))
     {
       return ranges::iter_move(__it.__current_);
     }
 
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr void iter_swap(__iterator const& __x, __iterator const& __y)
+    friend constexpr void iter_swap(__filter_view_iterator const& __x, __filter_view_iterator const& __y)
       noexcept(noexcept(ranges::iter_swap(__x.__current_, __y.__current_)))
       requires indirectly_swappable<iterator_t<_View>>
     {
@@ -209,23 +224,25 @@ namespace ranges {
 
   template<input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
     requires view<_View> && is_object_v<_Pred>
-  class filter_view<_View, _Pred>::__sentinel {
+  class __filter_view_sentinel {
+    using __filter_view = filter_view<_View, _Pred>;
+
   public:
     sentinel_t<_View> __end_ = sentinel_t<_View>();
 
     _LIBCPP_HIDE_FROM_ABI
-    __sentinel() = default;
+    __filter_view_sentinel() = default;
 
     _LIBCPP_HIDE_FROM_ABI
-    constexpr explicit __sentinel(filter_view& __parent)
+    constexpr explicit __filter_view_sentinel(__filter_view& __parent)
       : __end_(ranges::end(__parent.__base_))
     { }
 
     _LIBCPP_HIDE_FROM_ABI
     constexpr sentinel_t<_View> base() const { return __end_; }
 
-    _LIBCPP_HIDE_FROM_ABI
-    friend constexpr bool operator==(__iterator const& __x, __sentinel const& __y) {
+    _LIBCPP_HIDE_FROM_ABI friend constexpr bool
+    operator==(__filter_view_iterator<_View, _Pred> const& __x, __filter_view_sentinel const& __y) {
       return __x.__current_ == __y.__end_;
     }
   };