]> gcc.gnu.org Git - gcc.git/blobdiff - libstdc++-v3/include/std/ranges
libstdc++: Some minor <ranges> cleanups
[gcc.git] / libstdc++-v3 / include / std / ranges
index adbc6d7b274ef4e9528e10c5a75235bc9f534f20..fb815c48f993c02d54e4c3716e1bfb9621db08b0 100644 (file)
@@ -1,6 +1,6 @@
 // <ranges> -*- C++ -*-
 
-// Copyright (C) 2019-2021 Free Software Foundation, Inc.
+// Copyright (C) 2019-2022 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -42,6 +42,7 @@
 #include <initializer_list>
 #include <iterator>
 #include <optional>
+#include <span>
 #include <tuple>
 #include <bits/ranges_util.h>
 #include <bits/refwrap.h>
@@ -108,54 +109,63 @@ namespace ranges
 
        // _GLIBCXX_RESOLVE_LIB_DEFECTS
        // 3477. Simplify constraints for semiregular-box
-       __box&
+       // 3572. copyable-box should be fully constexpr
+       constexpr __box&
        operator=(const __box& __that)
        noexcept(is_nothrow_copy_constructible_v<_Tp>)
        requires (!copyable<_Tp>)
        {
-         if ((bool)__that)
-           this->emplace(*__that);
-         else
-           this->reset();
+         if (this != std::__addressof(__that))
+           {
+             if ((bool)__that)
+               this->emplace(*__that);
+             else
+               this->reset();
+           }
          return *this;
        }
 
-       __box&
+       constexpr __box&
        operator=(__box&& __that)
        noexcept(is_nothrow_move_constructible_v<_Tp>)
        requires (!movable<_Tp>)
        {
-         if ((bool)__that)
-           this->emplace(std::move(*__that));
-         else
-           this->reset();
+         if (this != std::__addressof(__that))
+           {
+             if ((bool)__that)
+               this->emplace(std::move(*__that));
+             else
+               this->reset();
+           }
          return *this;
        }
       };
 
-    // For types which are already semiregular, this specialization of the
-    // semiregular wrapper stores the object directly without going through
+    // For types which are already copyable, this specialization of the
+    // copyable wrapper stores the object directly without going through
     // std::optional.  It provides just the subset of the primary template's
     // API that we currently use.
-    template<__boxable _Tp> requires semiregular<_Tp>
+    template<__boxable _Tp>
+      requires copyable<_Tp> || (is_nothrow_move_constructible_v<_Tp>
+                                && is_nothrow_copy_constructible_v<_Tp>)
       struct __box<_Tp>
       {
       private:
        [[no_unique_address]] _Tp _M_value = _Tp();
 
       public:
-       __box() = default;
+       __box() requires default_initializable<_Tp> = default;
 
        constexpr explicit
        __box(const _Tp& __t)
        noexcept(is_nothrow_copy_constructible_v<_Tp>)
-       : _M_value{__t}
+       : _M_value(__t)
        { }
 
        constexpr explicit
        __box(_Tp&& __t)
        noexcept(is_nothrow_move_constructible_v<_Tp>)
-       : _M_value{std::move(__t)}
+       : _M_value(std::move(__t))
        { }
 
        template<typename... _Args>
@@ -163,9 +173,41 @@ namespace ranges
          constexpr explicit
          __box(in_place_t, _Args&&... __args)
          noexcept(is_nothrow_constructible_v<_Tp, _Args...>)
-         : _M_value{std::forward<_Args>(__args)...}
+         : _M_value(std::forward<_Args>(__args)...)
          { }
 
+       __box(const __box&) = default;
+       __box(__box&&) = default;
+       __box& operator=(const __box&) requires copyable<_Tp> = default;
+       __box& operator=(__box&&) requires copyable<_Tp> = default;
+
+       // When _Tp is nothrow_copy_constructible but not copy_assignable,
+       // copy assignment is implemented via destroy-then-copy-construct.
+       constexpr __box&
+       operator=(const __box& __that) noexcept
+       {
+         static_assert(is_nothrow_copy_constructible_v<_Tp>);
+         if (this != std::__addressof(__that))
+           {
+             _M_value.~_Tp();
+             std::construct_at(std::__addressof(_M_value), *__that);
+           }
+         return *this;
+       }
+
+       // Likewise for move assignment.
+       constexpr __box&
+       operator=(__box&& __that) noexcept
+       {
+         static_assert(is_nothrow_move_constructible_v<_Tp>);
+         if (this != std::__addressof(__that))
+           {
+             _M_value.~_Tp();
+             std::construct_at(std::__addressof(_M_value), std::move(*__that));
+           }
+         return *this;
+       }
+
        constexpr bool
        has_value() const noexcept
        { return true; };
@@ -180,11 +222,11 @@ namespace ranges
 
        constexpr _Tp*
        operator->() noexcept
-       { return &_M_value; }
+       { return std::__addressof(_M_value); }
 
        constexpr const _Tp*
        operator->() const noexcept
-       { return &_M_value; }
+       { return std::__addressof(_M_value); }
       };
   } // namespace __detail
 
@@ -193,15 +235,17 @@ namespace ranges
     class single_view : public view_interface<single_view<_Tp>>
     {
     public:
-      single_view() = default;
+      single_view() requires default_initializable<_Tp> = default;
 
       constexpr explicit
       single_view(const _Tp& __t)
+      noexcept(is_nothrow_copy_constructible_v<_Tp>)
       : _M_value(__t)
       { }
 
       constexpr explicit
       single_view(_Tp&& __t)
+      noexcept(is_nothrow_move_constructible_v<_Tp>)
       : _M_value(std::move(__t))
       { }
 
@@ -211,6 +255,7 @@ namespace ranges
        requires constructible_from<_Tp, _Args...>
        constexpr explicit
        single_view(in_place_t, _Args&&... __args)
+       noexcept(is_nothrow_constructible_v<_Tp, _Args...>)
        : _M_value{in_place, std::forward<_Args>(__args)...}
        { }
 
@@ -246,6 +291,9 @@ namespace ranges
       [[no_unique_address]] __detail::__box<_Tp> _M_value;
     };
 
+  template<typename _Tp>
+    single_view(_Tp) -> single_view<_Tp>;
+
   namespace __detail
   {
     template<typename _Wp>
@@ -290,22 +338,29 @@ namespace ranges
          { __j - __j } -> convertible_to<__iota_diff_t<_It>>;
        };
 
+    template<typename _Winc>
+      struct __iota_view_iter_cat
+      { };
+
+    template<incrementable _Winc>
+      struct __iota_view_iter_cat<_Winc>
+      { using iterator_category = input_iterator_tag; };
   } // namespace __detail
 
   template<weakly_incrementable _Winc,
           semiregular _Bound = unreachable_sentinel_t>
     requires std::__detail::__weakly_eq_cmp_with<_Winc, _Bound>
-      && semiregular<_Winc>
+      && copyable<_Winc>
     class iota_view : public view_interface<iota_view<_Winc, _Bound>>
     {
     private:
       struct _Sentinel;
 
-      struct _Iterator
+      struct _Iterator : __detail::__iota_view_iter_cat<_Winc>
       {
       private:
        static auto
-       _S_iter_cat()
+       _S_iter_concept()
        {
          using namespace __detail;
          if constexpr (__advanceable<_Winc>)
@@ -319,11 +374,12 @@ namespace ranges
        }
 
       public:
-       using iterator_category = decltype(_S_iter_cat());
+       using iterator_concept = decltype(_S_iter_concept());
+       // iterator_category defined in __iota_view_iter_cat
        using value_type = _Winc;
        using difference_type = __detail::__iota_diff_t<_Winc>;
 
-       _Iterator() = default;
+       _Iterator() requires default_initializable<_Winc> = default;
 
        constexpr explicit
        _Iterator(_Winc __value)
@@ -443,7 +499,10 @@ namespace ranges
        friend constexpr _Iterator
        operator+(_Iterator __i, difference_type __n)
          requires __detail::__advanceable<_Winc>
-       { return __i += __n; }
+       {
+         __i += __n;
+         return __i;
+       }
 
        friend constexpr _Iterator
        operator+(difference_type __n, _Iterator __i)
@@ -453,7 +512,10 @@ namespace ranges
        friend constexpr _Iterator
        operator-(_Iterator __i, difference_type __n)
          requires __detail::__advanceable<_Winc>
-       { return __i -= __n; }
+       {
+         __i -= __n;
+         return __i;
+       }
 
        friend constexpr difference_type
        operator-(const _Iterator& __x, const _Iterator& __y)
@@ -478,6 +540,7 @@ namespace ranges
       private:
        _Winc _M_value = _Winc();
 
+       friend iota_view;
         friend _Sentinel;
       };
 
@@ -488,6 +551,10 @@ namespace ranges
        _M_equal(const _Iterator& __x) const
        { return __x._M_value == _M_bound; }
 
+       constexpr auto
+       _M_distance_from(const _Iterator& __x) const
+       { return _M_bound - __x._M_value; }
+
        _Bound _M_bound = _Bound();
 
       public:
@@ -504,19 +571,21 @@ namespace ranges
        friend constexpr iter_difference_t<_Winc>
        operator-(const _Iterator& __x, const _Sentinel& __y)
          requires sized_sentinel_for<_Bound, _Winc>
-       { return __x._M_value - __y._M_bound; }
+       { return -__y._M_distance_from(__x); }
 
        friend constexpr iter_difference_t<_Winc>
        operator-(const _Sentinel& __x, const _Iterator& __y)
          requires sized_sentinel_for<_Bound, _Winc>
-       { return -(__y - __x); }
+       { return __x._M_distance_from(__y); }
+
+       friend iota_view;
       };
 
       _Winc _M_value = _Winc();
       [[no_unique_address]] _Bound _M_bound = _Bound();
 
     public:
-      iota_view() = default;
+      iota_view() requires default_initializable<_Winc> = default;
 
       constexpr explicit
       iota_view(_Winc __value)
@@ -532,6 +601,24 @@ namespace ranges
          __glibcxx_assert( bool(__value <= __bound) );
       }
 
+      constexpr
+      iota_view(_Iterator __first, _Iterator __last)
+       requires same_as<_Winc, _Bound>
+       : iota_view(__first._M_value, __last._M_value)
+      { }
+
+      constexpr
+      iota_view(_Iterator __first, unreachable_sentinel_t __last)
+       requires same_as<_Bound, unreachable_sentinel_t>
+       : iota_view(__first._M_value, __last)
+      { }
+
+      constexpr
+      iota_view(_Iterator __first, _Sentinel __last)
+       requires (!same_as<_Winc, _Bound>) && (!same_as<_Bound, unreachable_sentinel_t>)
+       : iota_view(__first._M_value, __last._M_bound)
+      { }
+
       constexpr _Iterator
       begin() const { return _Iterator{_M_value}; }
 
@@ -575,7 +662,7 @@ namespace ranges
            == __detail::__is_signed_integer_like<_Bound>))
     iota_view(_Winc, _Bound) -> iota_view<_Winc, _Bound>;
 
-  template<weakly_incrementable _Winc, semiregular _Bound>
+  template<typename _Winc, typename _Bound>
     inline constexpr bool
       enable_borrowed_range<iota_view<_Winc, _Bound>> = true;
 
@@ -587,9 +674,11 @@ namespace views
   struct _Single
   {
     template<typename _Tp>
+      [[nodiscard]]
       constexpr auto
       operator()(_Tp&& __e) const
-      { return single_view{std::forward<_Tp>(__e)}; }
+      noexcept(noexcept(single_view<decay_t<_Tp>>(std::forward<_Tp>(__e))))
+      { return single_view<decay_t<_Tp>>(std::forward<_Tp>(__e)); }
   };
 
   inline constexpr _Single single{};
@@ -597,14 +686,16 @@ namespace views
   struct _Iota
   {
     template<typename _Tp>
+      [[nodiscard]]
       constexpr auto
       operator()(_Tp&& __e) const
-      { return iota_view{std::forward<_Tp>(__e)}; }
+      { return iota_view(std::forward<_Tp>(__e)); }
 
     template<typename _Tp, typename _Up>
+      [[nodiscard]]
       constexpr auto
       operator()(_Tp&& __e, _Up&& __f) const
-      { return iota_view{std::forward<_Tp>(__e), std::forward<_Up>(__f)}; }
+      { return iota_view(std::forward<_Tp>(__e), std::forward<_Up>(__f)); }
   };
 
   inline constexpr _Iota iota{};
@@ -617,15 +708,14 @@ namespace views
        = requires(basic_istream<_CharT, _Traits>& is, _Val& t) { is >> t; };
   } // namespace __detail
 
-  template<movable _Val, typename _CharT, typename _Traits>
+  template<movable _Val, typename _CharT,
+          typename _Traits = char_traits<_CharT>>
     requires default_initializable<_Val>
       && __detail::__stream_extractable<_Val, _CharT, _Traits>
     class basic_istream_view
     : public view_interface<basic_istream_view<_Val, _CharT, _Traits>>
     {
     public:
-      basic_istream_view() = default;
-
       constexpr explicit
       basic_istream_view(basic_istream<_CharT, _Traits>& __stream)
        : _M_stream(std::__addressof(__stream))
@@ -634,8 +724,7 @@ namespace views
       constexpr auto
       begin()
       {
-       if (_M_stream != nullptr)
-         *_M_stream >> _M_object;
+       *_M_stream >> _M_object;
        return _Iterator{this};
       }
 
@@ -644,7 +733,7 @@ namespace views
       { return default_sentinel; }
 
     private:
-      basic_istream<_CharT, _Traits>* _M_stream = nullptr;
+      basic_istream<_CharT, _Traits>* _M_stream;
       _Val _M_object = _Val();
 
       struct _Iterator
@@ -654,8 +743,6 @@ namespace views
        using difference_type = ptrdiff_t;
        using value_type = _Val;
 
-       _Iterator() = default;
-
        constexpr explicit
        _Iterator(basic_istream_view* __parent) noexcept
          : _M_parent(__parent)
@@ -669,7 +756,6 @@ namespace views
        _Iterator&
        operator++()
        {
-         __glibcxx_assert(_M_parent->_M_stream != nullptr);
          *_M_parent->_M_stream >> _M_parent->_M_object;
          return *this;
        }
@@ -680,30 +766,44 @@ namespace views
 
        _Val&
        operator*() const
-       {
-         __glibcxx_assert(_M_parent->_M_stream != nullptr);
-         return _M_parent->_M_object;
-       }
+       { return _M_parent->_M_object; }
 
        friend bool
        operator==(const _Iterator& __x, default_sentinel_t)
        { return __x._M_at_end(); }
 
       private:
-       basic_istream_view* _M_parent = nullptr;
+       basic_istream_view* _M_parent;
 
        bool
        _M_at_end() const
-       { return _M_parent == nullptr || !*_M_parent->_M_stream; }
+       { return !*_M_parent->_M_stream; }
       };
 
       friend _Iterator;
     };
 
-  template<typename _Val, typename _CharT, typename _Traits>
-    basic_istream_view<_Val, _CharT, _Traits>
-    istream_view(basic_istream<_CharT, _Traits>& __s)
-    { return basic_istream_view<_Val, _CharT, _Traits>{__s}; }
+  template<typename _Val>
+    using istream_view = basic_istream_view<_Val, char>;
+
+  template<typename _Val>
+    using wistream_view = basic_istream_view<_Val, wchar_t>;
+
+namespace views
+{
+  template<typename _Tp>
+    struct _Istream
+    {
+      template<typename _CharT, typename _Traits>
+       [[nodiscard]]
+       constexpr auto
+       operator()(basic_istream<_CharT, _Traits>& __e) const
+       { return basic_istream_view<_Tp, _CharT, _Traits>(__e); }
+    };
+
+  template<typename _Tp>
+    inline constexpr _Istream<_Tp> istream;
+}
 
   // C++20 24.7 [range.adaptors] Range adaptors
 
@@ -716,195 +816,300 @@ namespace __detail
   // Data members using this alias should use [[no_unique_address]] so that
   // they take no space when not needed.
   template<bool _Present, typename _Tp>
-    using __maybe_present_t = conditional_t<_Present, _Tp, _Empty>;
+    using __maybe_present_t = __conditional_t<_Present, _Tp, _Empty>;
 
   // Alias for a type that is conditionally const.
   template<bool _Const, typename _Tp>
-    using __maybe_const_t = conditional_t<_Const, const _Tp, _Tp>;
+    using __maybe_const_t = __conditional_t<_Const, const _Tp, _Tp>;
 
 } // namespace __detail
 
-namespace views
+namespace views::__adaptor
 {
-  namespace __adaptor
+  // True if the range adaptor _Adaptor can be applied with _Args.
+  template<typename _Adaptor, typename... _Args>
+    concept __adaptor_invocable
+      = requires { std::declval<_Adaptor>()(declval<_Args>()...); };
+
+  // True if the range adaptor non-closure _Adaptor can be partially applied
+  // with _Args.
+  template<typename _Adaptor, typename... _Args>
+    concept __adaptor_partial_app_viable = (_Adaptor::_S_arity > 1)
+      && (sizeof...(_Args) == _Adaptor::_S_arity - 1)
+      && (constructible_from<decay_t<_Args>, _Args> && ...);
+
+  template<typename _Adaptor, typename... _Args>
+    struct _Partial;
+
+  template<typename _Lhs, typename _Rhs>
+    struct _Pipe;
+
+  // The base class of every range adaptor closure.
+  //
+  // The derived class should define the optional static data member
+  // _S_has_simple_call_op to true if the behavior of this adaptor is
+  // independent of the constness/value category of the adaptor object.
+  struct _RangeAdaptorClosure
   {
-    template<typename _Tp>
-      inline constexpr auto
-      __maybe_refwrap(_Tp& __arg)
-      { return reference_wrapper<_Tp>{__arg}; }
+    // range | adaptor is equivalent to adaptor(range).
+    template<typename _Self, typename _Range>
+      requires derived_from<remove_cvref_t<_Self>, _RangeAdaptorClosure>
+       && __adaptor_invocable<_Self, _Range>
+      friend constexpr auto
+      operator|(_Range&& __r, _Self&& __self)
+      { return std::forward<_Self>(__self)(std::forward<_Range>(__r)); }
+
+    // Compose the adaptors __lhs and __rhs into a pipeline, returning
+    // another range adaptor closure object.
+    template<typename _Lhs, typename _Rhs>
+      requires derived_from<_Lhs, _RangeAdaptorClosure>
+       && derived_from<_Rhs, _RangeAdaptorClosure>
+      friend constexpr auto
+      operator|(_Lhs __lhs, _Rhs __rhs)
+      { return _Pipe<_Lhs, _Rhs>{std::move(__lhs), std::move(__rhs)}; }
+  };
 
-    template<typename _Tp>
-      inline constexpr auto
-      __maybe_refwrap(const _Tp& __arg)
-      { return reference_wrapper<const _Tp>{__arg}; }
+  // The base class of every range adaptor non-closure.
+  //
+  // The static data member _Derived::_S_arity must contain the total number of
+  // arguments that the adaptor takes, and the class _Derived must introduce
+  // _RangeAdaptor::operator() into the class scope via a using-declaration.
+  //
+  // The optional static data member _Derived::_S_has_simple_extra_args should
+  // be defined to true if the behavior of this adaptor is independent of the
+  // constness/value category of the extra arguments.  This data member could
+  // also be defined as a variable template parameterized by the types of the
+  // extra arguments.
+  template<typename _Derived>
+    struct _RangeAdaptor
+    {
+      // Partially apply the arguments __args to the range adaptor _Derived,
+      // returning a range adaptor closure object.
+      template<typename... _Args>
+       requires __adaptor_partial_app_viable<_Derived, _Args...>
+       constexpr auto
+       operator()(_Args&&... __args) const
+       {
+         return _Partial<_Derived, decay_t<_Args>...>{std::forward<_Args>(__args)...};
+       }
+    };
 
-    template<typename _Tp>
-      inline constexpr decltype(auto)
-      __maybe_refwrap(_Tp&& __arg)
-      { return std::forward<_Tp>(__arg); }
+  // True if the range adaptor closure _Adaptor has a simple operator(), i.e.
+  // one that's not overloaded according to constness or value category of the
+  // _Adaptor object.
+  template<typename _Adaptor>
+    concept __closure_has_simple_call_op = _Adaptor::_S_has_simple_call_op;
+
+  // True if the behavior of the range adaptor non-closure _Adaptor is
+  // independent of the value category of its extra arguments _Args.
+  template<typename _Adaptor, typename... _Args>
+    concept __adaptor_has_simple_extra_args = _Adaptor::_S_has_simple_extra_args
+      || _Adaptor::template _S_has_simple_extra_args<_Args...>;
+
+  // A range adaptor closure that represents partial application of
+  // the range adaptor _Adaptor with arguments _Args.
+  template<typename _Adaptor, typename... _Args>
+    struct _Partial : _RangeAdaptorClosure
+    {
+      tuple<_Args...> _M_args;
 
-    template<typename _Callable>
-      struct _RangeAdaptorClosure;
+      constexpr
+      _Partial(_Args... __args)
+       : _M_args(std::move(__args)...)
+      { }
 
-    template<typename _Callable>
-      struct _RangeAdaptor
-      {
-      protected:
-       [[no_unique_address]]
-         __detail::__maybe_present_t<!is_default_constructible_v<_Callable>,
-                                     _Callable> _M_callable;
+      // Invoke _Adaptor with arguments __r, _M_args... according to the
+      // value category of this _Partial object.
+      template<typename _Range>
+       requires __adaptor_invocable<_Adaptor, _Range, const _Args&...>
+       constexpr auto
+       operator()(_Range&& __r) const &
+       {
+         auto __forwarder = [&__r] (const auto&... __args) {
+           return _Adaptor{}(std::forward<_Range>(__r), __args...);
+         };
+         return std::apply(__forwarder, _M_args);
+       }
 
-      public:
-       constexpr
-       _RangeAdaptor(const _Callable& = {})
-         requires is_default_constructible_v<_Callable>
-       { }
+      template<typename _Range>
+       requires __adaptor_invocable<_Adaptor, _Range, _Args...>
+       constexpr auto
+       operator()(_Range&& __r) &&
+       {
+         auto __forwarder = [&__r] (auto&... __args) {
+           return _Adaptor{}(std::forward<_Range>(__r), std::move(__args)...);
+         };
+         return std::apply(__forwarder, _M_args);
+       }
 
-       constexpr
-       _RangeAdaptor(_Callable __callable)
-         requires (!is_default_constructible_v<_Callable>)
-         : _M_callable(std::move(__callable))
-       { }
+      template<typename _Range>
+       constexpr auto
+       operator()(_Range&& __r) const && = delete;
+    };
 
-       template<typename... _Args>
-         requires (sizeof...(_Args) >= 1)
-         constexpr auto
-         operator()(_Args&&... __args) const
-         {
-           // [range.adaptor.object]: If a range adaptor object accepts more
-           // than one argument, then the following expressions are equivalent:
-           //
-           //   (1) adaptor(range, args...)
-           //   (2) adaptor(args...)(range)
-           //   (3) range | adaptor(args...)
-           //
-           // In this case, adaptor(args...) is a range adaptor closure object.
-           //
-           // We handle (1) and (2) here, and (3) is just a special case of a
-           // more general case already handled by _RangeAdaptorClosure.
-           if constexpr (is_invocable_v<_Callable, _Args...>)
-             {
-               static_assert(sizeof...(_Args) != 1,
-                             "a _RangeAdaptor that accepts only one argument "
-                             "should be defined as a _RangeAdaptorClosure");
-               // Here we handle adaptor(range, args...) -- just forward all
-               // arguments to the underlying adaptor routine.
-               return _Callable{}(std::forward<_Args>(__args)...);
-             }
-           else
-             {
-               // Here we handle adaptor(args...)(range).
-               // Given args..., we return a _RangeAdaptorClosure that takes a
-               // range argument, such that (2) is equivalent to (1).
-               //
-               // We need to be careful about how we capture args... in this
-               // closure.  By using __maybe_refwrap, we capture lvalue
-               // references by reference (through a reference_wrapper) and
-               // otherwise capture by value.
-               auto __closure
-                 = [...__args(__maybe_refwrap(std::forward<_Args>(__args)))]
-                   <typename _Range> (_Range&& __r) {
-                     // This static_cast has two purposes: it forwards a
-                     // reference_wrapper<T> capture as a T&, and otherwise
-                     // forwards the captured argument as an rvalue.
-                     return _Callable{}(std::forward<_Range>(__r),
-                              (static_cast<unwrap_reference_t
-                                           <remove_const_t<decltype(__args)>>>
-                               (__args))...);
-                   };
-               using _ClosureType = decltype(__closure);
-               return _RangeAdaptorClosure<_ClosureType>(std::move(__closure));
-             }
-         }
-      };
+  // A lightweight specialization of the above primary template for
+  // the common case where _Adaptor accepts a single extra argument.
+  template<typename _Adaptor, typename _Arg>
+    struct _Partial<_Adaptor, _Arg> : _RangeAdaptorClosure
+    {
+      _Arg _M_arg;
 
-    template<typename _Callable>
-      _RangeAdaptor(_Callable) -> _RangeAdaptor<_Callable>;
+      constexpr
+      _Partial(_Arg __arg)
+       : _M_arg(std::move(__arg))
+      { }
 
-    template<typename _Callable>
-      struct _RangeAdaptorClosure : public _RangeAdaptor<_Callable>
-      {
-       using _RangeAdaptor<_Callable>::_RangeAdaptor;
+      template<typename _Range>
+       requires __adaptor_invocable<_Adaptor, _Range, const _Arg&>
+       constexpr auto
+       operator()(_Range&& __r) const &
+       { return _Adaptor{}(std::forward<_Range>(__r), _M_arg); }
+
+      template<typename _Range>
+       requires __adaptor_invocable<_Adaptor, _Range, _Arg>
+       constexpr auto
+       operator()(_Range&& __r) &&
+       { return _Adaptor{}(std::forward<_Range>(__r), std::move(_M_arg)); }
+
+      template<typename _Range>
+       constexpr auto
+       operator()(_Range&& __r) const && = delete;
+    };
 
-       template<viewable_range _Range>
-         requires requires { declval<_Callable>()(declval<_Range>()); }
-         constexpr auto
-         operator()(_Range&& __r) const
-         {
-           if constexpr (is_default_constructible_v<_Callable>)
-             return _Callable{}(std::forward<_Range>(__r));
-           else
-             return this->_M_callable(std::forward<_Range>(__r));
-         }
+  // Partial specialization of the primary template for the case where the extra
+  // arguments of the adaptor can always be safely and efficiently forwarded by
+  // const reference.  This lets us get away with a single operator() overload,
+  // which makes overload resolution failure diagnostics more concise.
+  template<typename _Adaptor, typename... _Args>
+    requires __adaptor_has_simple_extra_args<_Adaptor, _Args...>
+      && (is_trivially_copyable_v<_Args> && ...)
+    struct _Partial<_Adaptor, _Args...> : _RangeAdaptorClosure
+    {
+      tuple<_Args...> _M_args;
 
-       template<viewable_range _Range>
-         requires requires { declval<_Callable>()(declval<_Range>()); }
-         friend constexpr auto
-         operator|(_Range&& __r, const _RangeAdaptorClosure& __o)
-         { return __o(std::forward<_Range>(__r)); }
+      constexpr
+      _Partial(_Args... __args)
+       : _M_args(std::move(__args)...)
+      { }
 
-       template<typename _Tp>
-         friend constexpr auto
-         operator|(const _RangeAdaptorClosure<_Tp>& __x,
-                   const _RangeAdaptorClosure& __y)
-         {
-           if constexpr (is_default_constructible_v<_Tp>
-                         && is_default_constructible_v<_Callable>)
-             {
-               auto __closure = [] <typename _Up> (_Up&& __e) {
-                 return std::forward<_Up>(__e) | decltype(__x){} | decltype(__y){};
-               };
-               return _RangeAdaptorClosure<decltype(__closure)>(__closure);
-             }
-           else if constexpr (is_default_constructible_v<_Tp>
-                              && !is_default_constructible_v<_Callable>)
-             {
-               auto __closure = [__y] <typename _Up> (_Up&& __e) {
-                 return std::forward<_Up>(__e) | decltype(__x){} | __y;
-               };
-               return _RangeAdaptorClosure<decltype(__closure)>(__closure);
-             }
-           else if constexpr (!is_default_constructible_v<_Tp>
-                              && is_default_constructible_v<_Callable>)
-             {
-               auto __closure = [__x] <typename _Up> (_Up&& __e) {
-                 return std::forward<_Up>(__e) | __x | decltype(__y){};
-               };
-               return _RangeAdaptorClosure<decltype(__closure)>(__closure);
-             }
-           else
-             {
-               auto __closure = [__x, __y] <typename _Up> (_Up&& __e) {
-                 return std::forward<_Up>(__e) | __x | __y;
-               };
-               return _RangeAdaptorClosure<decltype(__closure)>(__closure);
-             }
-         }
-      };
+      // Invoke _Adaptor with arguments __r, const _M_args&... regardless
+      // of the value category of this _Partial object.
+      template<typename _Range>
+       requires __adaptor_invocable<_Adaptor, _Range, const _Args&...>
+       constexpr auto
+       operator()(_Range&& __r) const
+       {
+         auto __forwarder = [&__r] (const auto&... __args) {
+           return _Adaptor{}(std::forward<_Range>(__r), __args...);
+         };
+         return std::apply(__forwarder, _M_args);
+       }
 
-    template<typename _Callable>
-      _RangeAdaptorClosure(_Callable) -> _RangeAdaptorClosure<_Callable>;
-  } // namespace __adaptor
-} // namespace views
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+
+  // A lightweight specialization of the above template for the common case
+  // where _Adaptor accepts a single extra argument.
+  template<typename _Adaptor, typename _Arg>
+    requires __adaptor_has_simple_extra_args<_Adaptor, _Arg>
+      && is_trivially_copyable_v<_Arg>
+    struct _Partial<_Adaptor, _Arg> : _RangeAdaptorClosure
+    {
+      _Arg _M_arg;
+
+      constexpr
+      _Partial(_Arg __arg)
+       : _M_arg(std::move(__arg))
+      { }
+
+      template<typename _Range>
+       requires __adaptor_invocable<_Adaptor, _Range, const _Arg&>
+       constexpr auto
+       operator()(_Range&& __r) const
+       { return _Adaptor{}(std::forward<_Range>(__r), _M_arg); }
+
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+
+  template<typename _Lhs, typename _Rhs, typename _Range>
+    concept __pipe_invocable
+      = requires { std::declval<_Rhs>()(std::declval<_Lhs>()(std::declval<_Range>())); };
+
+  // A range adaptor closure that represents composition of the range
+  // adaptor closures _Lhs and _Rhs.
+  template<typename _Lhs, typename _Rhs>
+    struct _Pipe : _RangeAdaptorClosure
+    {
+      [[no_unique_address]] _Lhs _M_lhs;
+      [[no_unique_address]] _Rhs _M_rhs;
+
+      constexpr
+      _Pipe(_Lhs __lhs, _Rhs __rhs)
+       : _M_lhs(std::move(__lhs)), _M_rhs(std::move(__rhs))
+      { }
+
+      // Invoke _M_rhs(_M_lhs(__r)) according to the value category of this
+      // range adaptor closure object.
+      template<typename _Range>
+       requires __pipe_invocable<const _Lhs&, const _Rhs&, _Range>
+       constexpr auto
+       operator()(_Range&& __r) const &
+       { return _M_rhs(_M_lhs(std::forward<_Range>(__r))); }
+
+      template<typename _Range>
+       requires __pipe_invocable<_Lhs, _Rhs, _Range>
+       constexpr auto
+       operator()(_Range&& __r) &&
+       { return std::move(_M_rhs)(std::move(_M_lhs)(std::forward<_Range>(__r))); }
+
+      template<typename _Range>
+       constexpr auto
+       operator()(_Range&& __r) const && = delete;
+    };
+
+  // A partial specialization of the above primary template for the case where
+  // both adaptor operands have a simple operator().  This in turn lets us
+  // implement composition using a single simple operator(), which makes
+  // overload resolution failure diagnostics more concise.
+  template<typename _Lhs, typename _Rhs>
+    requires __closure_has_simple_call_op<_Lhs>
+      && __closure_has_simple_call_op<_Rhs>
+    struct _Pipe<_Lhs, _Rhs> : _RangeAdaptorClosure
+    {
+      [[no_unique_address]] _Lhs _M_lhs;
+      [[no_unique_address]] _Rhs _M_rhs;
+
+      constexpr
+      _Pipe(_Lhs __lhs, _Rhs __rhs)
+       : _M_lhs(std::move(__lhs)), _M_rhs(std::move(__rhs))
+      { }
+
+      template<typename _Range>
+       requires __pipe_invocable<const _Lhs&, const _Rhs&, _Range>
+       constexpr auto
+       operator()(_Range&& __r) const
+       { return _M_rhs(_M_lhs(std::forward<_Range>(__r))); }
+
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+} // namespace views::__adaptor
 
   template<range _Range> requires is_object_v<_Range>
     class ref_view : public view_interface<ref_view<_Range>>
     {
     private:
-      _Range* _M_r = nullptr;
+      _Range* _M_r;
 
       static void _S_fun(_Range&); // not defined
       static void _S_fun(_Range&&) = delete;
 
     public:
-      constexpr
-      ref_view() noexcept = default;
-
-      template<__detail::__not_same_as<ref_view> _Tp>
+      template<__detail::__different_from<ref_view> _Tp>
        requires convertible_to<_Tp, _Range&>
          && requires { _S_fun(declval<_Tp>()); }
        constexpr
        ref_view(_Tp&& __t)
+       noexcept(noexcept(static_cast<_Range&>(std::declval<_Tp>())))
          : _M_r(std::__addressof(static_cast<_Range&>(std::forward<_Tp>(__t))))
        { }
 
@@ -939,89 +1144,210 @@ namespace views
   template<typename _Tp>
     inline constexpr bool enable_borrowed_range<ref_view<_Tp>> = true;
 
+  template<range _Range>
+    requires movable<_Range>
+      && (!__detail::__is_initializer_list<remove_cv_t<_Range>>)
+    class owning_view : public view_interface<owning_view<_Range>>
+    {
+    private:
+      _Range _M_r = _Range();
+
+    public:
+      owning_view() requires default_initializable<_Range> = default;
+
+      constexpr
+      owning_view(_Range&& __t)
+      noexcept(is_nothrow_move_constructible_v<_Range>)
+       : _M_r(std::move(__t))
+      { }
+
+      owning_view(owning_view&&) = default;
+      owning_view& operator=(owning_view&&) = default;
+
+      constexpr _Range&
+      base() & noexcept
+      { return _M_r; }
+
+      constexpr const _Range&
+      base() const& noexcept
+      { return _M_r; }
+
+      constexpr _Range&&
+      base() && noexcept
+      { return std::move(_M_r); }
+
+      constexpr const _Range&&
+      base() const&& noexcept
+      { return std::move(_M_r); }
+
+      constexpr iterator_t<_Range>
+      begin()
+      { return ranges::begin(_M_r); }
+
+      constexpr sentinel_t<_Range>
+      end()
+      { return ranges::end(_M_r); }
+
+      constexpr auto
+      begin() const requires range<const _Range>
+      { return ranges::begin(_M_r); }
+
+      constexpr auto
+      end() const requires range<const _Range>
+      { return ranges::end(_M_r); }
+
+      constexpr bool
+      empty() requires requires { ranges::empty(_M_r); }
+      { return ranges::empty(_M_r); }
+
+      constexpr bool
+      empty() const requires requires { ranges::empty(_M_r); }
+      { return ranges::empty(_M_r); }
+
+      constexpr auto
+      size() requires sized_range<_Range>
+      { return ranges::size(_M_r); }
+
+      constexpr auto
+      size() const requires sized_range<const _Range>
+      { return ranges::size(_M_r); }
+
+      constexpr auto
+      data() requires contiguous_range<_Range>
+      { return ranges::data(_M_r); }
+
+      constexpr auto
+      data() const requires contiguous_range<const _Range>
+      { return ranges::data(_M_r); }
+    };
+
+  template<typename _Tp>
+    inline constexpr bool enable_borrowed_range<owning_view<_Tp>>
+      = enable_borrowed_range<_Tp>;
+
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptorClosure all
-      = [] <viewable_range _Range> (_Range&& __r)
-      {
-       if constexpr (view<decay_t<_Range>>)
-         return std::forward<_Range>(__r);
-       else if constexpr (requires { ref_view{std::forward<_Range>(__r)}; })
-         return ref_view{std::forward<_Range>(__r)};
-       else
-         return subrange{std::forward<_Range>(__r)};
-      };
+    namespace __detail
+    {
+      template<typename _Range>
+       concept __can_ref_view = requires { ref_view{std::declval<_Range>()}; };
+
+      template<typename _Range>
+       concept __can_owning_view = requires { owning_view{std::declval<_Range>()}; };
+    } // namespace __detail
+
+    struct _All : __adaptor::_RangeAdaptorClosure
+    {
+      template<typename _Range>
+       static constexpr bool
+       _S_noexcept()
+       {
+         if constexpr (view<decay_t<_Range>>)
+           return is_nothrow_constructible_v<decay_t<_Range>, _Range>;
+         else if constexpr (__detail::__can_ref_view<_Range>)
+           return true;
+         else
+           return noexcept(owning_view{std::declval<_Range>()});
+       }
+
+      template<viewable_range _Range>
+       requires view<decay_t<_Range>>
+         || __detail::__can_ref_view<_Range>
+         || __detail::__can_owning_view<_Range>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r) const
+       noexcept(_S_noexcept<_Range>())
+       {
+         if constexpr (view<decay_t<_Range>>)
+           return std::forward<_Range>(__r);
+         else if constexpr (__detail::__can_ref_view<_Range>)
+           return ref_view{std::forward<_Range>(__r)};
+         else
+           return owning_view{std::forward<_Range>(__r)};
+       }
+
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+
+    inline constexpr _All all;
 
     template<viewable_range _Range>
       using all_t = decltype(all(std::declval<_Range>()));
-
   } // namespace views
 
-  // XXX: the following algos are copied from ranges_algo.h to avoid a circular
-  // dependency with that header.
   namespace __detail
   {
-    template<input_iterator _Iter, sentinel_for<_Iter> _Sent,
-            typename _Proj = identity,
-            indirect_unary_predicate<projected<_Iter, _Proj>> _Pred>
-      constexpr _Iter
-      find_if(_Iter __first, _Sent __last, _Pred __pred, _Proj __proj = {})
+    template<typename _Tp>
+      struct __non_propagating_cache
       {
-       while (__first != __last
-           && !(bool)std::__invoke(__pred, std::__invoke(__proj, *__first)))
-         ++__first;
-       return __first;
-      }
+       // When _Tp is not an object type (e.g. is a reference type), we make
+       // __non_propagating_cache<_Tp> empty rather than ill-formed so that
+       // users can easily conditionally declare data members with this type
+       // (such as join_view::_M_inner).
+      };
 
-    template<input_iterator _Iter, sentinel_for<_Iter> _Sent,
-            typename _Proj = identity,
-            indirect_unary_predicate<projected<_Iter, _Proj>> _Pred>
-      constexpr _Iter
-      find_if_not(_Iter __first, _Sent __last, _Pred __pred, _Proj __proj = {})
+    template<typename _Tp>
+      requires is_object_v<_Tp>
+      struct __non_propagating_cache<_Tp>
+      : protected _Optional_base<_Tp>
       {
-       while (__first != __last
-           && (bool)std::__invoke(__pred, std::__invoke(__proj, *__first)))
-         ++__first;
-       return __first;
-      }
+       __non_propagating_cache() = default;
 
-    template<typename _Tp, typename _Proj = identity,
-            indirect_strict_weak_order<projected<const _Tp*, _Proj>>
-              _Comp = ranges::less>
-      constexpr const _Tp&
-      min(const _Tp& __a, const _Tp& __b, _Comp __comp = {}, _Proj __proj = {})
-      {
-       if (std::__invoke(std::move(__comp),
-                         std::__invoke(__proj, __b),
-                         std::__invoke(__proj, __a)))
-         return __b;
-       else
-         return __a;
-      }
+       constexpr
+       __non_propagating_cache(const __non_propagating_cache&) noexcept
+       { }
 
-    template<input_iterator _Iter1, sentinel_for<_Iter1> _Sent1,
-            input_iterator _Iter2, sentinel_for<_Iter2> _Sent2,
-            typename _Pred = ranges::equal_to,
-            typename _Proj1 = identity, typename _Proj2 = identity>
-      requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
-      constexpr pair<_Iter1, _Iter2>
-      mismatch(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
-              _Pred __pred = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {})
-      {
-       while (__first1 != __last1 && __first2 != __last2
-              && (bool)std::__invoke(__pred,
-                                     std::__invoke(__proj1, *__first1),
-                                     std::__invoke(__proj2, *__first2)))
+       constexpr
+       __non_propagating_cache(__non_propagating_cache&& __other) noexcept
+       { __other._M_reset(); }
+
+       constexpr __non_propagating_cache&
+       operator=(const __non_propagating_cache& __other) noexcept
        {
-         ++__first1;
-         ++__first2;
+         if (std::__addressof(__other) != this)
+           this->_M_reset();
+         return *this;
        }
-       return { std::move(__first1), std::move(__first2) };
-      }
-  } // namespace __detail
 
-  namespace __detail
-  {
+       constexpr __non_propagating_cache&
+       operator=(__non_propagating_cache&& __other) noexcept
+       {
+         this->_M_reset();
+         __other._M_reset();
+         return *this;
+       }
+
+       constexpr __non_propagating_cache&
+       operator=(_Tp __val)
+       {
+         this->_M_reset();
+         this->_M_payload._M_construct(std::move(__val));
+         return *this;
+       }
+
+       constexpr explicit
+       operator bool() const noexcept
+       { return this->_M_is_engaged(); }
+
+       constexpr _Tp&
+       operator*() noexcept
+       { return this->_M_get(); }
+
+       constexpr const _Tp&
+       operator*() const noexcept
+       { return this->_M_get(); }
+
+       template<typename _Iter>
+         constexpr _Tp&
+         _M_emplace_deref(const _Iter& __i)
+         {
+           this->_M_reset();
+           auto __f = [] (auto& __x) { return *__x; };
+           this->_M_payload._M_apply(_Optional_func{__f}, __i);
+           return this->_M_get();
+         }
+      };
+
     template<range _Range>
       struct _CachedPosition
       {
@@ -1033,7 +1359,7 @@ namespace views
        _M_get(const _Range&) const
        {
          __glibcxx_assert(false);
-         return {};
+         __builtin_unreachable();
        }
 
        constexpr void
@@ -1043,27 +1369,26 @@ namespace views
 
     template<forward_range _Range>
       struct _CachedPosition<_Range>
+       : protected __non_propagating_cache<iterator_t<_Range>>
       {
-      private:
-       iterator_t<_Range> _M_iter{};
-
-      public:
        constexpr bool
        _M_has_value() const
-       { return _M_iter != iterator_t<_Range>{}; }
+       { return this->_M_is_engaged(); }
 
        constexpr iterator_t<_Range>
        _M_get(const _Range&) const
        {
          __glibcxx_assert(_M_has_value());
-         return _M_iter;
+         return **this;
        }
 
        constexpr void
        _M_set(const _Range&, const iterator_t<_Range>& __it)
        {
          __glibcxx_assert(!_M_has_value());
-         _M_iter = __it;
+         std::construct_at(std::__addressof(this->_M_payload._M_payload),
+                           in_place, __it);
+         this->_M_payload._M_engaged = true;
        }
       };
 
@@ -1076,6 +1401,27 @@ namespace views
        range_difference_t<_Range> _M_offset = -1;
 
       public:
+       _CachedPosition() = default;
+
+       constexpr
+       _CachedPosition(const _CachedPosition&) = default;
+
+       constexpr
+       _CachedPosition(_CachedPosition&& __other) noexcept
+       { *this = std::move(__other); }
+
+       constexpr _CachedPosition&
+       operator=(const _CachedPosition&) = default;
+
+       constexpr _CachedPosition&
+       operator=(_CachedPosition&& __other) noexcept
+       {
+         // Propagate the cached offset, but invalidate the source.
+         _M_offset = __other._M_offset;
+         __other._M_offset = -1;
+         return *this;
+       }
+
        constexpr bool
        _M_has_value() const
        { return _M_offset >= 0; }
@@ -1094,7 +1440,32 @@ namespace views
          _M_offset = __it - ranges::begin(__r);
        }
       };
+  } // namespace __detail
+
+  namespace __detail
+  {
+    template<typename _Base>
+      struct __filter_view_iter_cat
+      { };
 
+    template<forward_range _Base>
+      struct __filter_view_iter_cat<_Base>
+      {
+      private:
+       static auto
+       _S_iter_cat()
+       {
+         using _Cat = typename iterator_traits<iterator_t<_Base>>::iterator_category;
+         if constexpr (derived_from<_Cat, bidirectional_iterator_tag>)
+           return bidirectional_iterator_tag{};
+         else if constexpr (derived_from<_Cat, forward_iterator_tag>)
+           return forward_iterator_tag{};
+         else
+           return _Cat{};
+       }
+      public:
+       using iterator_category = decltype(_S_iter_cat());
+      };
   } // namespace __detail
 
   template<input_range _Vp,
@@ -1105,7 +1476,7 @@ namespace views
     private:
       struct _Sentinel;
 
-      struct _Iterator
+      struct _Iterator : __detail::__filter_view_iter_cat<_Vp>
       {
       private:
        static constexpr auto
@@ -1119,18 +1490,6 @@ namespace views
            return input_iterator_tag{};
        }
 
-       static constexpr auto
-       _S_iter_cat()
-       {
-         using _Cat = typename iterator_traits<_Vp_iter>::iterator_category;
-         if constexpr (derived_from<_Cat, bidirectional_iterator_tag>)
-           return bidirectional_iterator_tag{};
-         else if constexpr (derived_from<_Cat, forward_iterator_tag>)
-           return forward_iterator_tag{};
-         else
-           return _Cat{};
-       }
-
        friend filter_view;
 
        using _Vp_iter = iterator_t<_Vp>;
@@ -1140,11 +1499,11 @@ namespace views
 
       public:
        using iterator_concept = decltype(_S_iter_concept());
-       using iterator_category = decltype(_S_iter_cat());
+       // iterator_category defined in __filter_view_iter_cat
        using value_type = range_value_t<_Vp>;
        using difference_type = range_difference_t<_Vp>;
 
-       _Iterator() = default;
+       _Iterator() requires default_initializable<_Vp_iter> = default;
 
        constexpr
        _Iterator(filter_view* __parent, _Vp_iter __current)
@@ -1152,9 +1511,8 @@ namespace views
            _M_parent(__parent)
        { }
 
-       constexpr _Vp_iter
-       base() const &
-         requires copyable<_Vp_iter>
+       constexpr const _Vp_iter&
+       base() const & noexcept
        { return _M_current; }
 
        constexpr _Vp_iter
@@ -1174,9 +1532,9 @@ namespace views
        constexpr _Iterator&
        operator++()
        {
-         _M_current = __detail::find_if(std::move(++_M_current),
-                                        ranges::end(_M_parent->_M_base),
-                                        std::ref(*_M_parent->_M_pred));
+         _M_current = ranges::find_if(std::move(++_M_current),
+                                      ranges::end(_M_parent->_M_base),
+                                      std::ref(*_M_parent->_M_pred));
          return *this;
        }
 
@@ -1252,16 +1610,18 @@ namespace views
        { return __y.__equal(__x); }
       };
 
+      _Vp _M_base = _Vp();
       [[no_unique_address]] __detail::__box<_Pred> _M_pred;
       [[no_unique_address]] __detail::_CachedPosition<_Vp> _M_cached_begin;
-      _Vp _M_base = _Vp();
 
     public:
-      filter_view() = default;
+      filter_view() requires (default_initializable<_Vp>
+                             && default_initializable<_Pred>)
+       = default;
 
       constexpr
       filter_view(_Vp __base, _Pred __pred)
-       : _M_pred(std::move(__pred)), _M_base(std::move(__base))
+       : _M_base(std::move(__base)), _M_pred(std::move(__pred))
       { }
 
       constexpr _Vp
@@ -1283,9 +1643,9 @@ namespace views
          return {this, _M_cached_begin._M_get(_M_base)};
 
        __glibcxx_assert(_M_pred.has_value());
-       auto __it = __detail::find_if(ranges::begin(_M_base),
-                                     ranges::end(_M_base),
-                                     std::ref(*_M_pred));
+       auto __it = ranges::find_if(ranges::begin(_M_base),
+                                   ranges::end(_M_base),
+                                   std::ref(*_M_pred));
        _M_cached_begin._M_set(_M_base, __it);
        return {this, std::move(__it)};
       }
@@ -1305,11 +1665,29 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor filter
-      = [] <viewable_range _Range, typename _Pred> (_Range&& __r, _Pred&& __p)
-      {
-       return filter_view{std::forward<_Range>(__r), std::forward<_Pred>(__p)};
-      };
+    namespace __detail
+    {
+      template<typename _Range, typename _Pred>
+       concept __can_filter_view
+         = requires { filter_view(std::declval<_Range>(), std::declval<_Pred>()); };
+    } // namespace __detail
+
+    struct _Filter : __adaptor::_RangeAdaptor<_Filter>
+    {
+      template<viewable_range _Range, typename _Pred>
+       requires __detail::__can_filter_view<_Range, _Pred>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, _Pred&& __p) const
+       {
+         return filter_view(std::forward<_Range>(__r), std::forward<_Pred>(__p));
+       }
+
+      using _RangeAdaptor<_Filter>::operator();
+      static constexpr int _S_arity = 2;
+      static constexpr bool _S_has_simple_extra_args = true;
+    };
+
+    inline constexpr _Filter filter;
   } // namespace views
 
   template<input_range _Vp, copy_constructible _Fp>
@@ -1321,36 +1699,26 @@ namespace views
     {
     private:
       template<bool _Const>
-       struct _Sentinel;
+       using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+
+      template<bool _Const>
+       struct __iter_cat
+       { };
 
       template<bool _Const>
-       struct _Iterator
+       requires forward_range<_Base<_Const>>
+       struct __iter_cat<_Const>
        {
        private:
-         using _Parent = __detail::__maybe_const_t<_Const, transform_view>;
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
-
-         static constexpr auto
-         _S_iter_concept()
-         {
-           if constexpr (random_access_range<_Vp>)
-             return random_access_iterator_tag{};
-           else if constexpr (bidirectional_range<_Vp>)
-             return bidirectional_iterator_tag{};
-           else if constexpr (forward_range<_Vp>)
-             return forward_iterator_tag{};
-           else
-             return input_iterator_tag{};
-         }
-
-         static constexpr auto
+         static auto
          _S_iter_cat()
          {
+           using _Base = transform_view::_Base<_Const>;
            using _Res = invoke_result_t<_Fp&, range_reference_t<_Base>>;
            if constexpr (is_lvalue_reference_v<_Res>)
              {
                using _Cat
-                 = typename iterator_traits<_Base_iter>::iterator_category;
+                 = typename iterator_traits<iterator_t<_Base>>::iterator_category;
                if constexpr (derived_from<_Cat, contiguous_iterator_tag>)
                  return random_access_iterator_tag{};
                else
@@ -1359,6 +1727,32 @@ namespace views
            else
              return input_iterator_tag{};
          }
+       public:
+         using iterator_category = decltype(_S_iter_cat());
+       };
+
+      template<bool _Const>
+       struct _Sentinel;
+
+      template<bool _Const>
+       struct _Iterator : __iter_cat<_Const>
+       {
+       private:
+         using _Parent = __detail::__maybe_const_t<_Const, transform_view>;
+         using _Base = transform_view::_Base<_Const>;
+
+         static auto
+         _S_iter_concept()
+         {
+           if constexpr (random_access_range<_Base>)
+             return random_access_iterator_tag{};
+           else if constexpr (bidirectional_range<_Base>)
+             return bidirectional_iterator_tag{};
+           else if constexpr (forward_range<_Base>)
+             return forward_iterator_tag{};
+           else
+             return input_iterator_tag{};
+         }
 
          using _Base_iter = iterator_t<_Base>;
 
@@ -1367,12 +1761,12 @@ namespace views
 
        public:
          using iterator_concept = decltype(_S_iter_concept());
-         using iterator_category = decltype(_S_iter_cat());
+         // iterator_category defined in __transform_view_iter_cat
          using value_type
            = remove_cvref_t<invoke_result_t<_Fp&, range_reference_t<_Base>>>;
          using difference_type = range_difference_t<_Base>;
 
-         _Iterator() = default;
+         _Iterator() requires default_initializable<_Base_iter> = default;
 
          constexpr
          _Iterator(_Parent* __parent, _Base_iter __current)
@@ -1387,9 +1781,8 @@ namespace views
            : _M_current(std::move(__i._M_current)), _M_parent(__i._M_parent)
          { }
 
-         constexpr _Base_iter
-         base() const &
-           requires copyable<_Base_iter>
+         constexpr const _Base_iter&
+         base() const & noexcept
          { return _M_current; }
 
          constexpr _Base_iter
@@ -1518,12 +1911,6 @@ namespace views
              return *__i;
          }
 
-         friend constexpr void
-         iter_swap(const _Iterator& __x, const _Iterator& __y)
-           noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current)))
-           requires indirectly_swappable<_Base_iter>
-         { return ranges::iter_swap(__x._M_current, __y._M_current); }
-
          friend _Iterator<!_Const>;
          template<bool> friend struct _Sentinel;
        };
@@ -1533,7 +1920,7 @@ namespace views
        {
        private:
          using _Parent = __detail::__maybe_const_t<_Const, transform_view>;
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+         using _Base = transform_view::_Base<_Const>;
 
          template<bool _Const2>
            constexpr auto
@@ -1590,15 +1977,17 @@ namespace views
          friend _Sentinel<!_Const>;
        };
 
-      [[no_unique_address]] __detail::__box<_Fp> _M_fun;
       _Vp _M_base = _Vp();
+      [[no_unique_address]] __detail::__box<_Fp> _M_fun;
 
     public:
-      transform_view() = default;
+      transform_view() requires (default_initializable<_Vp>
+                                && default_initializable<_Fp>)
+       = default;
 
       constexpr
       transform_view(_Vp __base, _Fp __fun)
-       : _M_fun(std::move(__fun)), _M_base(std::move(__base))
+       : _M_base(std::move(__base)), _M_fun(std::move(__fun))
       { }
 
       constexpr _Vp
@@ -1653,11 +2042,29 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor transform
-      = [] <viewable_range _Range, typename _Fp> (_Range&& __r, _Fp&& __f)
-      {
-       return transform_view{std::forward<_Range>(__r), std::forward<_Fp>(__f)};
-      };
+    namespace __detail
+    {
+      template<typename _Range, typename _Fp>
+       concept __can_transform_view
+         = requires { transform_view(std::declval<_Range>(), std::declval<_Fp>()); };
+    } // namespace __detail
+
+    struct _Transform : __adaptor::_RangeAdaptor<_Transform>
+    {
+      template<viewable_range _Range, typename _Fp>
+       requires __detail::__can_transform_view<_Range, _Fp>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, _Fp&& __f) const
+       {
+         return transform_view(std::forward<_Range>(__r), std::forward<_Fp>(__f));
+       }
+
+      using _RangeAdaptor<_Transform>::operator();
+      static constexpr int _S_arity = 2;
+      static constexpr bool _S_has_simple_extra_args = true;
+    };
+
+    inline constexpr _Transform transform;
   } // namespace views
 
   template<view _Vp>
@@ -1707,15 +2114,15 @@ namespace views
          friend _Sentinel<!_Const>;
        };
 
-      range_difference_t<_Vp> _M_count = 0;
       _Vp _M_base = _Vp();
+      range_difference_t<_Vp> _M_count = 0;
 
     public:
-      take_view() = default;
+      take_view() requires default_initializable<_Vp> = default;
 
       constexpr
       take_view(_Vp base, range_difference_t<_Vp> __count)
-       : _M_count(std::move(__count)), _M_base(std::move(base))
+       : _M_base(std::move(base)), _M_count(std::move(__count))
       { }
 
       constexpr _Vp
@@ -1736,11 +2143,11 @@ namespace views
            else
              {
                auto __sz = size();
-               return counted_iterator{ranges::begin(_M_base), __sz};
+               return counted_iterator(ranges::begin(_M_base), __sz);
              }
          }
        else
-         return counted_iterator{ranges::begin(_M_base), _M_count};
+         return counted_iterator(ranges::begin(_M_base), _M_count);
       }
 
       constexpr auto
@@ -1753,11 +2160,11 @@ namespace views
            else
              {
                auto __sz = size();
-               return counted_iterator{ranges::begin(_M_base), __sz};
+               return counted_iterator(ranges::begin(_M_base), __sz);
              }
          }
        else
-         return counted_iterator{ranges::begin(_M_base), _M_count};
+         return counted_iterator(ranges::begin(_M_base), _M_count);
       }
 
       constexpr auto
@@ -1792,14 +2199,14 @@ namespace views
       size() requires sized_range<_Vp>
       {
        auto __n = ranges::size(_M_base);
-       return __detail::min(__n, static_cast<decltype(__n)>(_M_count));
+       return std::min(__n, static_cast<decltype(__n)>(_M_count));
       }
 
       constexpr auto
       size() const requires sized_range<const _Vp>
       {
        auto __n = ranges::size(_M_base);
-       return __detail::min(__n, static_cast<decltype(__n)>(_M_count));
+       return std::min(__n, static_cast<decltype(__n)>(_M_count));
       }
     };
 
@@ -1816,11 +2223,82 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor take
-      = [] <viewable_range _Range, typename _Tp> (_Range&& __r, _Tp&& __n)
-      {
-       return take_view{std::forward<_Range>(__r), std::forward<_Tp>(__n)};
-      };
+    namespace __detail
+    {
+      template<typename _Range>
+       inline constexpr bool __is_empty_view = false;
+
+      template<typename _Tp>
+       inline constexpr bool __is_empty_view<empty_view<_Tp>> = true;
+
+      template<typename _Range>
+       inline constexpr bool __is_basic_string_view = false;
+
+      template<typename _CharT, typename _Traits>
+       inline constexpr bool __is_basic_string_view<basic_string_view<_CharT, _Traits>>
+         = true;
+
+      template<typename _Range>
+       inline constexpr bool __is_subrange = false;
+
+      template<typename _Iter, typename _Sent, subrange_kind _Kind>
+       inline constexpr bool __is_subrange<subrange<_Iter, _Sent, _Kind>> = true;
+
+      template<typename _Range>
+       inline constexpr bool __is_iota_view = false;
+
+      template<typename _Winc, typename _Bound>
+       inline constexpr bool __is_iota_view<iota_view<_Winc, _Bound>> = true;
+
+      template<typename _Range, typename _Dp>
+       concept __can_take_view
+         = requires { take_view(std::declval<_Range>(), std::declval<_Dp>()); };
+    } // namespace __detail
+
+    struct _Take : __adaptor::_RangeAdaptor<_Take>
+    {
+      template<viewable_range _Range, typename _Dp = range_difference_t<_Range>>
+       requires __detail::__can_take_view<_Range, _Dp>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, type_identity_t<_Dp> __n) const
+       {
+         using _Tp = remove_cvref_t<_Range>;
+         if constexpr (__detail::__is_empty_view<_Tp>)
+           return _Tp();
+         else if constexpr (random_access_range<_Tp>
+                            && sized_range<_Tp>
+                            && (std::__detail::__is_span<_Tp>
+                                || __detail::__is_basic_string_view<_Tp>
+                                || __detail::__is_subrange<_Tp>
+                                || __detail::__is_iota_view<_Tp>))
+           {
+             __n = std::min<_Dp>(ranges::distance(__r), __n);
+             auto __begin = ranges::begin(__r);
+             auto __end = __begin + __n;
+             if constexpr (std::__detail::__is_span<_Tp>)
+               return span<typename _Tp::element_type>(__begin, __end);
+             else if constexpr (__detail::__is_basic_string_view<_Tp>)
+               return _Tp(__begin, __end);
+             else if constexpr (__detail::__is_subrange<_Tp>)
+               return subrange<iterator_t<_Tp>>(__begin, __end);
+             else
+               return iota_view(*__begin, *__end);
+           }
+         else
+           return take_view(std::forward<_Range>(__r), __n);
+       }
+
+      using _RangeAdaptor<_Take>::operator();
+      static constexpr int _S_arity = 2;
+      // The count argument of views::take is not always simple -- it can be
+      // e.g. a move-only class that's implicitly convertible to the difference
+      // type.  But an integer-like count argument is surely simple.
+      template<typename _Tp>
+       static constexpr bool _S_has_simple_extra_args
+         = ranges::__detail::__is_integer_like<_Tp>;
+    };
+
+    inline constexpr _Take take;
   } // namespace views
 
   template<view _Vp, typename _Pred>
@@ -1868,15 +2346,17 @@ namespace views
          friend _Sentinel<!_Const>;
        };
 
-      [[no_unique_address]] __detail::__box<_Pred> _M_pred;
       _Vp _M_base = _Vp();
+      [[no_unique_address]] __detail::__box<_Pred> _M_pred;
 
     public:
-      take_while_view() = default;
+      take_while_view() requires (default_initializable<_Vp>
+                                 && default_initializable<_Pred>)
+       = default;
 
       constexpr
       take_while_view(_Vp base, _Pred __pred)
-       : _M_pred(std::move(__pred)), _M_base(std::move(base))
+       : _M_base(std::move(base)), _M_pred(std::move(__pred))
       { }
 
       constexpr _Vp
@@ -1918,19 +2398,37 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor take_while
-      = [] <viewable_range _Range, typename _Pred> (_Range&& __r, _Pred&& __p)
-      {
-       return take_while_view{std::forward<_Range>(__r), std::forward<_Pred>(__p)};
-      };
+    namespace __detail
+    {
+      template<typename _Range, typename _Pred>
+       concept __can_take_while_view
+         = requires { take_while_view(std::declval<_Range>(), std::declval<_Pred>()); };
+    } // namespace __detail
+
+    struct _TakeWhile : __adaptor::_RangeAdaptor<_TakeWhile>
+    {
+      template<viewable_range _Range, typename _Pred>
+       requires __detail::__can_take_while_view<_Range, _Pred>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, _Pred&& __p) const
+       {
+         return take_while_view(std::forward<_Range>(__r), std::forward<_Pred>(__p));
+       }
+
+      using _RangeAdaptor<_TakeWhile>::operator();
+      static constexpr int _S_arity = 2;
+      static constexpr bool _S_has_simple_extra_args = true;
+    };
+
+    inline constexpr _TakeWhile take_while;
   } // namespace views
 
   template<view _Vp>
     class drop_view : public view_interface<drop_view<_Vp>>
     {
     private:
-      range_difference_t<_Vp> _M_count = 0;
       _Vp _M_base = _Vp();
+      range_difference_t<_Vp> _M_count = 0;
 
       // ranges::next(begin(base), count, end(base)) is O(1) if _Vp satisfies
       // both random_access_range and sized_range. Otherwise, cache its result.
@@ -1942,11 +2440,11 @@ namespace views
                                      _M_cached_begin;
 
     public:
-      drop_view() = default;
+      drop_view() requires default_initializable<_Vp> = default;
 
       constexpr
       drop_view(_Vp __base, range_difference_t<_Vp> __count)
-       : _M_count(__count), _M_base(std::move(__base))
+       : _M_base(std::move(__base)), _M_count(__count)
       { __glibcxx_assert(__count >= 0); }
 
       constexpr _Vp
@@ -2020,11 +2518,61 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor drop
-      = [] <viewable_range _Range, typename _Tp> (_Range&& __r, _Tp&& __n)
-      {
-       return drop_view{std::forward<_Range>(__r), std::forward<_Tp>(__n)};
-      };
+    namespace __detail
+    {
+      template<typename _Range, typename _Dp>
+       concept __can_drop_view
+         = requires { drop_view(std::declval<_Range>(), std::declval<_Dp>()); };
+    } // namespace __detail
+
+    struct _Drop : __adaptor::_RangeAdaptor<_Drop>
+    {
+      template<viewable_range _Range, typename _Dp = range_difference_t<_Range>>
+       requires __detail::__can_drop_view<_Range, _Dp>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, type_identity_t<_Dp> __n) const
+       {
+         using _Tp = remove_cvref_t<_Range>;
+         if constexpr (__detail::__is_empty_view<_Tp>)
+           return _Tp();
+         else if constexpr (random_access_range<_Tp>
+                            && sized_range<_Tp>
+                            && (std::__detail::__is_span<_Tp>
+                                || __detail::__is_basic_string_view<_Tp>
+                                || __detail::__is_iota_view<_Tp>
+                                || __detail::__is_subrange<_Tp>))
+           {
+             __n = std::min<_Dp>(ranges::distance(__r), __n);
+             auto __begin = ranges::begin(__r) + __n;
+             auto __end = ranges::end(__r);
+             if constexpr (std::__detail::__is_span<_Tp>)
+               return span<typename _Tp::element_type>(__begin, __end);
+             else if constexpr (__detail::__is_subrange<_Tp>)
+               {
+                 if constexpr (_Tp::_S_store_size)
+                   {
+                     using ranges::__detail::__to_unsigned_like;
+                     auto __m = ranges::distance(__r) - __n;
+                     return _Tp(__begin, __end, __to_unsigned_like(__m));
+                   }
+                 else
+                   return _Tp(__begin, __end);
+               }
+             else
+               return _Tp(__begin, __end);
+           }
+         else
+           return drop_view(std::forward<_Range>(__r), __n);
+       }
+
+      using _RangeAdaptor<_Drop>::operator();
+      static constexpr int _S_arity = 2;
+      template<typename _Tp>
+       static constexpr bool _S_has_simple_extra_args
+         = _Take::_S_has_simple_extra_args<_Tp>;
+    };
+
+    inline constexpr _Drop drop;
   } // namespace views
 
   template<view _Vp, typename _Pred>
@@ -2033,16 +2581,18 @@ namespace views
     class drop_while_view : public view_interface<drop_while_view<_Vp, _Pred>>
     {
     private:
+      _Vp _M_base = _Vp();
       [[no_unique_address]] __detail::__box<_Pred> _M_pred;
       [[no_unique_address]] __detail::_CachedPosition<_Vp> _M_cached_begin;
-      _Vp _M_base = _Vp();
 
     public:
-      drop_while_view() = default;
+      drop_while_view() requires (default_initializable<_Vp>
+                                 && default_initializable<_Pred>)
+       = default;
 
       constexpr
       drop_while_view(_Vp __base, _Pred __pred)
-       : _M_pred(std::move(__pred)), _M_base(std::move(__base))
+       : _M_base(std::move(__base)), _M_pred(std::move(__pred))
       { }
 
       constexpr _Vp
@@ -2063,9 +2613,10 @@ namespace views
        if (_M_cached_begin._M_has_value())
          return _M_cached_begin._M_get(_M_base);
 
-       auto __it = __detail::find_if_not(ranges::begin(_M_base),
-                                         ranges::end(_M_base),
-                                         std::cref(*_M_pred));
+       __glibcxx_assert(_M_pred.has_value());
+       auto __it = ranges::find_if_not(ranges::begin(_M_base),
+                                       ranges::end(_M_base),
+                                       std::cref(*_M_pred));
        _M_cached_begin._M_set(_M_base, __it);
        return __it;
       }
@@ -2085,50 +2636,110 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor drop_while
-      = [] <viewable_range _Range, typename _Pred> (_Range&& __r, _Pred&& __p)
-      {
-       return drop_while_view{std::forward<_Range>(__r),
-                              std::forward<_Pred>(__p)};
-      };
+    namespace __detail
+    {
+      template<typename _Range, typename _Pred>
+       concept __can_drop_while_view
+         = requires { drop_while_view(std::declval<_Range>(), std::declval<_Pred>()); };
+    } // namespace __detail
+
+    struct _DropWhile : __adaptor::_RangeAdaptor<_DropWhile>
+    {
+      template<viewable_range _Range, typename _Pred>
+       requires __detail::__can_drop_while_view<_Range, _Pred>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, _Pred&& __p) const
+       {
+         return drop_while_view(std::forward<_Range>(__r),
+                                std::forward<_Pred>(__p));
+       }
+
+      using _RangeAdaptor<_DropWhile>::operator();
+      static constexpr int _S_arity = 2;
+      static constexpr bool _S_has_simple_extra_args = true;
+    };
+
+    inline constexpr _DropWhile drop_while;
   } // namespace views
 
   template<input_range _Vp>
     requires view<_Vp> && input_range<range_reference_t<_Vp>>
-      && (is_reference_v<range_reference_t<_Vp>>
-         || view<range_value_t<_Vp>>)
     class join_view : public view_interface<join_view<_Vp>>
     {
     private:
       using _InnerRange = range_reference_t<_Vp>;
 
+      template<bool _Const>
+       using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+
+      template<bool _Const>
+       using _Outer_iter = iterator_t<_Base<_Const>>;
+
+      template<bool _Const>
+       using _Inner_iter = iterator_t<range_reference_t<_Base<_Const>>>;
+
+      template<bool _Const>
+       static constexpr bool _S_ref_is_glvalue
+         = is_reference_v<range_reference_t<_Base<_Const>>>;
+
+      template<bool _Const>
+       struct __iter_cat
+       { };
+
+      template<bool _Const>
+       requires _S_ref_is_glvalue<_Const>
+         && forward_range<_Base<_Const>>
+         && forward_range<range_reference_t<_Base<_Const>>>
+       struct __iter_cat<_Const>
+       {
+       private:
+         static constexpr auto
+         _S_iter_cat()
+         {
+           using _Outer_iter = join_view::_Outer_iter<_Const>;
+           using _Inner_iter = join_view::_Inner_iter<_Const>;
+           using _OuterCat = typename iterator_traits<_Outer_iter>::iterator_category;
+           using _InnerCat = typename iterator_traits<_Inner_iter>::iterator_category;
+           if constexpr (derived_from<_OuterCat, bidirectional_iterator_tag>
+                         && derived_from<_InnerCat, bidirectional_iterator_tag>
+                         && common_range<range_reference_t<_Base<_Const>>>)
+             return bidirectional_iterator_tag{};
+           else if constexpr (derived_from<_OuterCat, forward_iterator_tag>
+                              && derived_from<_InnerCat, forward_iterator_tag>)
+             return forward_iterator_tag{};
+           else
+             return input_iterator_tag{};
+         }
+       public:
+         using iterator_category = decltype(_S_iter_cat());
+       };
+
       template<bool _Const>
        struct _Sentinel;
 
       template<bool _Const>
-       struct _Iterator
+       struct _Iterator : __iter_cat<_Const>
        {
        private:
          using _Parent = __detail::__maybe_const_t<_Const, join_view>;
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+         using _Base = join_view::_Base<_Const>;
 
          static constexpr bool _S_ref_is_glvalue
-           = is_reference_v<range_reference_t<_Base>>;
+           = join_view::_S_ref_is_glvalue<_Const>;
 
          constexpr void
          _M_satisfy()
          {
-           auto __update_inner = [this] (range_reference_t<_Base> __x) -> auto&
-           {
+           auto __update_inner = [this] (const iterator_t<_Base>& __x) -> auto&& {
              if constexpr (_S_ref_is_glvalue)
-               return __x;
+               return *__x;
              else
-               return (_M_parent->_M_inner = views::all(std::move(__x)));
+               return _M_parent->_M_inner._M_emplace_deref(__x);
            };
 
            for (; _M_outer != ranges::end(_M_parent->_M_base); ++_M_outer)
              {
-               auto& __inner = __update_inner(*_M_outer);
+               auto&& __inner = __update_inner(_M_outer);
                _M_inner = ranges::begin(__inner);
                if (_M_inner != ranges::end(__inner))
                  return;
@@ -2143,7 +2754,8 @@ namespace views
          {
            if constexpr (_S_ref_is_glvalue
                          && bidirectional_range<_Base>
-                         && bidirectional_range<range_reference_t<_Base>>)
+                         && bidirectional_range<range_reference_t<_Base>>
+                         && common_range<range_reference_t<_Base>>)
              return bidirectional_iterator_tag{};
            else if constexpr (_S_ref_is_glvalue
                               && forward_range<_Base>
@@ -2153,30 +2765,8 @@ namespace views
              return input_iterator_tag{};
          }
 
-         static constexpr auto
-         _S_iter_cat()
-         {
-           using _OuterCat
-             = typename iterator_traits<_Outer_iter>::iterator_category;
-           using _InnerCat
-             = typename iterator_traits<_Inner_iter>::iterator_category;
-           if constexpr (_S_ref_is_glvalue
-                         && derived_from<_OuterCat, bidirectional_iterator_tag>
-                         && derived_from<_InnerCat, bidirectional_iterator_tag>)
-             return bidirectional_iterator_tag{};
-           else if constexpr (_S_ref_is_glvalue
-                              && derived_from<_OuterCat, forward_iterator_tag>
-                              && derived_from<_InnerCat, forward_iterator_tag>)
-             return forward_iterator_tag{};
-           else if constexpr (derived_from<_OuterCat, input_iterator_tag>
-                              && derived_from<_InnerCat, input_iterator_tag>)
-             return input_iterator_tag{};
-           else
-             return output_iterator_tag{};
-         }
-
-         using _Outer_iter = iterator_t<_Base>;
-         using _Inner_iter = iterator_t<range_reference_t<_Base>>;
+         using _Outer_iter = join_view::_Outer_iter<_Const>;
+         using _Inner_iter = join_view::_Inner_iter<_Const>;
 
          _Outer_iter _M_outer = _Outer_iter();
          _Inner_iter _M_inner = _Inner_iter();
@@ -2184,13 +2774,15 @@ namespace views
 
        public:
          using iterator_concept = decltype(_S_iter_concept());
-         using iterator_category = decltype(_S_iter_cat());
+         // iterator_category defined in __join_view_iter_cat
          using value_type = range_value_t<range_reference_t<_Base>>;
          using difference_type
            = common_type_t<range_difference_t<_Base>,
                            range_difference_t<range_reference_t<_Base>>>;
 
-         _Iterator() = default;
+         _Iterator() requires (default_initializable<_Outer_iter>
+                               && default_initializable<_Inner_iter>)
+           = default;
 
          constexpr
          _Iterator(_Parent* __parent, _Outer_iter __outer)
@@ -2203,7 +2795,7 @@ namespace views
            requires _Const
              && convertible_to<iterator_t<_Vp>, _Outer_iter>
              && convertible_to<iterator_t<_InnerRange>, _Inner_iter>
-           : _M_outer(std::move(__i._M_outer)), _M_inner(__i._M_inner),
+           : _M_outer(std::move(__i._M_outer)), _M_inner(std::move(__i._M_inner)),
              _M_parent(__i._M_parent)
          { }
 
@@ -2222,11 +2814,11 @@ namespace views
          constexpr _Iterator&
          operator++()
          {
-           auto&& __inner_range = [this] () -> decltype(auto) {
+           auto&& __inner_range = [this] () -> auto&& {
              if constexpr (_S_ref_is_glvalue)
                return *_M_outer;
              else
-               return _M_parent->_M_inner;
+               return *_M_parent->_M_inner;
            }();
            if (++_M_inner == ranges::end(__inner_range))
              {
@@ -2293,6 +2885,7 @@ namespace views
          friend constexpr void
          iter_swap(const _Iterator& __x, const _Iterator& __y)
            noexcept(noexcept(ranges::iter_swap(__x._M_inner, __y._M_inner)))
+           requires indirectly_swappable<_Inner_iter>
          { return ranges::iter_swap(__x._M_inner, __y._M_inner); }
 
          friend _Iterator<!_Const>;
@@ -2304,7 +2897,7 @@ namespace views
        {
        private:
          using _Parent = __detail::__maybe_const_t<_Const, join_view>;
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+         using _Base = join_view::_Base<_Const>;
 
          template<bool _Const2>
            constexpr bool
@@ -2337,14 +2930,12 @@ namespace views
          friend _Sentinel<!_Const>;
        };
 
-      // XXX: _M_inner is "present only when !is_reference_v<_InnerRange>"
-      [[no_unique_address]]
-       __detail::__maybe_present_t<!is_reference_v<_InnerRange>,
-                                   views::all_t<_InnerRange>> _M_inner;
       _Vp _M_base = _Vp();
+      [[no_unique_address]]
+       __detail::__non_propagating_cache<remove_cv_t<_InnerRange>> _M_inner;
 
     public:
-      join_view() = default;
+      join_view() requires default_initializable<_Vp> = default;
 
       constexpr explicit
       join_view(_Vp __base)
@@ -2409,13 +3000,29 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptorClosure join
-      = [] <viewable_range _Range> (_Range&& __r)
-      {
-       // _GLIBCXX_RESOLVE_LIB_DEFECTS
-       // 3474. Nesting join_views is broken because of CTAD
-       return join_view<views::all_t<_Range>>{std::forward<_Range>(__r)};
-      };
+    namespace __detail
+    {
+      template<typename _Range>
+       concept __can_join_view
+         = requires { join_view<all_t<_Range>>{std::declval<_Range>()}; };
+    } // namespace __detail
+
+    struct _Join : __adaptor::_RangeAdaptorClosure
+    {
+      template<viewable_range _Range>
+       requires __detail::__can_join_view<_Range>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r) const
+       {
+         // _GLIBCXX_RESOLVE_LIB_DEFECTS
+         // 3474. Nesting join_views is broken because of CTAD
+         return join_view<all_t<_Range>>{std::forward<_Range>(__r)};
+       }
+
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+
+    inline constexpr _Join join;
   } // namespace views
 
   namespace __detail
@@ -2428,31 +3035,64 @@ namespace views
        && requires
           { typename __require_constant<remove_reference_t<_Range>::size()>; }
        && (remove_reference_t<_Range>::size() <= 1);
-  }
 
-  template<input_range _Vp, forward_range _Pattern>
-    requires view<_Vp> && view<_Pattern>
-      && indirectly_comparable<iterator_t<_Vp>, iterator_t<_Pattern>,
-                              ranges::equal_to>
-      && (forward_range<_Vp> || __detail::__tiny_range<_Pattern>)
-    class split_view : public view_interface<split_view<_Vp, _Pattern>>
-    {
-    private:
-      template<bool _Const>
-       struct _InnerIter;
+    template<typename _Base>
+      struct __lazy_split_view_outer_iter_cat
+      { };
 
-      template<bool _Const>
-       struct _OuterIter
-       {
+    template<forward_range _Base>
+      struct __lazy_split_view_outer_iter_cat<_Base>
+      { using iterator_category = input_iterator_tag; };
+
+    template<typename _Base>
+      struct __lazy_split_view_inner_iter_cat
+      { };
+
+    template<forward_range _Base>
+      struct __lazy_split_view_inner_iter_cat<_Base>
+      {
+      private:
+       static constexpr auto
+       _S_iter_cat()
+       {
+         using _Cat = typename iterator_traits<iterator_t<_Base>>::iterator_category;
+         if constexpr (derived_from<_Cat, forward_iterator_tag>)
+           return forward_iterator_tag{};
+         else
+           return _Cat{};
+       }
+      public:
+       using iterator_category = decltype(_S_iter_cat());
+      };
+  }
+
+  template<input_range _Vp, forward_range _Pattern>
+    requires view<_Vp> && view<_Pattern>
+      && indirectly_comparable<iterator_t<_Vp>, iterator_t<_Pattern>,
+                              ranges::equal_to>
+      && (forward_range<_Vp> || __detail::__tiny_range<_Pattern>)
+    class lazy_split_view : public view_interface<lazy_split_view<_Vp, _Pattern>>
+    {
+    private:
+      template<bool _Const>
+       using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+
+      template<bool _Const>
+       struct _InnerIter;
+
+      template<bool _Const>
+       struct _OuterIter
+         : __detail::__lazy_split_view_outer_iter_cat<_Base<_Const>>
+       {
        private:
-         using _Parent = __detail::__maybe_const_t<_Const, split_view>;
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+         using _Parent = __detail::__maybe_const_t<_Const, lazy_split_view>;
+         using _Base = lazy_split_view::_Base<_Const>;
 
          constexpr bool
          __at_end() const
-         { return __current() == ranges::end(_M_parent->_M_base); }
+         { return __current() == ranges::end(_M_parent->_M_base) && !_M_trailing_empty; }
 
-         // [range.split.outer] p1
+         // [range.lazy.split.outer] p1
          //  Many of the following specifications refer to the notional member
          //  current of outer-iterator.  current is equivalent to current_ if
          //  V models forward_range, and parent_->current_ otherwise.
@@ -2462,7 +3102,7 @@ namespace views
            if constexpr (forward_range<_Vp>)
              return _M_current;
            else
-             return _M_parent->_M_current;
+             return *_M_parent->_M_current;
          }
 
          constexpr auto&
@@ -2471,21 +3111,21 @@ namespace views
            if constexpr (forward_range<_Vp>)
              return _M_current;
            else
-             return _M_parent->_M_current;
+             return *_M_parent->_M_current;
          }
 
          _Parent* _M_parent = nullptr;
 
-         // XXX: _M_current is present only if "V models forward_range"
          [[no_unique_address]]
            __detail::__maybe_present_t<forward_range<_Vp>,
                                        iterator_t<_Base>> _M_current;
+         bool _M_trailing_empty = false;
 
        public:
-         using iterator_concept = conditional_t<forward_range<_Base>,
-                                                forward_iterator_tag,
-                                                input_iterator_tag>;
-         using iterator_category = input_iterator_tag;
+         using iterator_concept = __conditional_t<forward_range<_Base>,
+                                                  forward_iterator_tag,
+                                                  input_iterator_tag>;
+         // iterator_category defined in __lazy_split_view_outer_iter_cat
          using difference_type = range_difference_t<_Base>;
 
          struct value_type : view_interface<value_type>
@@ -2503,16 +3143,10 @@ namespace views
 
            constexpr _InnerIter<_Const>
            begin() const
-             requires copyable<_OuterIter>
            { return _InnerIter<_Const>{_M_i}; }
 
-           constexpr _InnerIter<_Const>
-           begin()
-             requires (!copyable<_OuterIter>)
-           { return _InnerIter<_Const>{std::move(_M_i)}; }
-
            constexpr default_sentinel_t
-           end() const
+           end() const noexcept
            { return default_sentinel; }
          };
 
@@ -2544,21 +3178,40 @@ namespace views
          constexpr _OuterIter&
          operator++()
          {
+           // _GLIBCXX_RESOLVE_LIB_DEFECTS
+           // 3505. lazy_split_view::outer-iterator::operator++ misspecified
            const auto __end = ranges::end(_M_parent->_M_base);
            if (__current() == __end)
-             return *this;
+             {
+               _M_trailing_empty = false;
+               return *this;
+             }
            const auto [__pbegin, __pend] = subrange{_M_parent->_M_pattern};
            if (__pbegin == __pend)
              ++__current();
+           else if constexpr (__detail::__tiny_range<_Pattern>)
+             {
+               __current() = ranges::find(std::move(__current()), __end,
+                                          *__pbegin);
+               if (__current() != __end)
+                 {
+                   ++__current();
+                   if (__current() == __end)
+                     _M_trailing_empty = true;
+                 }
+             }
            else
              do
                {
                  auto [__b, __p]
-                   = __detail::mismatch(std::move(__current()), __end,
-                                        __pbegin, __pend);
-                 __current() = std::move(__b);
+                   = ranges::mismatch(__current(), __end, __pbegin, __pend);
                  if (__p == __pend)
-                   break;
+                   {
+                     __current() = __b;
+                     if (__current() == __end)
+                       _M_trailing_empty = true;
+                     break;
+                   }
                } while (++__current() != __end);
            return *this;
          }
@@ -2579,7 +3232,10 @@ namespace views
          friend constexpr bool
          operator==(const _OuterIter& __x, const _OuterIter& __y)
            requires forward_range<_Base>
-         { return __x._M_current == __y._M_current; }
+         {
+           return __x._M_current == __y._M_current
+             && __x._M_trailing_empty == __y._M_trailing_empty;
+         }
 
          friend constexpr bool
          operator==(const _OuterIter& __x, default_sentinel_t)
@@ -2591,9 +3247,10 @@ namespace views
 
       template<bool _Const>
        struct _InnerIter
+         : __detail::__lazy_split_view_inner_iter_cat<_Base<_Const>>
        {
        private:
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+         using _Base = lazy_split_view::_Base<_Const>;
 
          constexpr bool
          __at_end() const
@@ -2627,17 +3284,6 @@ namespace views
              }
          }
 
-         static constexpr auto
-         _S_iter_cat()
-         {
-           using _Cat
-              = typename iterator_traits<iterator_t<_Base>>::iterator_category;
-           if constexpr (derived_from<_Cat, forward_iterator_tag>)
-             return forward_iterator_tag{};
-           else
-             return _Cat{};
-         }
-
          constexpr auto&
          _M_i_current() noexcept
          { return _M_i.__current(); }
@@ -2652,7 +3298,7 @@ namespace views
        public:
          using iterator_concept
            = typename _OuterIter<_Const>::iterator_concept;
-         using iterator_category = decltype(_S_iter_cat());
+         // iterator_category defined in __lazy_split_view_inner_iter_cat
          using value_type = range_value_t<_Base>;
          using difference_type = range_difference_t<_Base>;
 
@@ -2663,6 +3309,14 @@ namespace views
            : _M_i(std::move(__i))
          { }
 
+         constexpr const iterator_t<_Base>&
+         base() const& noexcept
+         { return _M_i_current(); }
+
+         constexpr iterator_t<_Base>
+         base() && requires forward_range<_Vp>
+         { return std::move(_M_i_current()); }
+
          constexpr decltype(auto)
          operator*() const
          { return *_M_i_current(); }
@@ -2681,7 +3335,7 @@ namespace views
          constexpr decltype(auto)
          operator++(int)
          {
-           if constexpr (forward_range<_Vp>)
+           if constexpr (forward_range<_Base>)
              {
                auto __tmp = *this;
                ++*this;
@@ -2713,29 +3367,30 @@ namespace views
          { ranges::iter_swap(__x._M_i_current(), __y._M_i_current()); }
        };
 
+      _Vp _M_base = _Vp();
       _Pattern _M_pattern = _Pattern();
-      // XXX: _M_current is "present only if !forward_range<V>"
       [[no_unique_address]]
        __detail::__maybe_present_t<!forward_range<_Vp>,
-                                   iterator_t<_Vp>> _M_current;
-      _Vp _M_base = _Vp();
+         __detail::__non_propagating_cache<iterator_t<_Vp>>> _M_current;
 
 
     public:
-      split_view() = default;
+      lazy_split_view() requires (default_initializable<_Vp>
+                                 && default_initializable<_Pattern>)
+       = default;
 
       constexpr
-      split_view(_Vp __base, _Pattern __pattern)
-       : _M_pattern(std::move(__pattern)), _M_base(std::move(__base))
+      lazy_split_view(_Vp __base, _Pattern __pattern)
+       : _M_base(std::move(__base)), _M_pattern(std::move(__pattern))
       { }
 
       template<input_range _Range>
        requires constructible_from<_Vp, views::all_t<_Range>>
          && constructible_from<_Pattern, single_view<range_value_t<_Range>>>
        constexpr
-       split_view(_Range&& __r, range_value_t<_Range> __e)
-         : _M_pattern(std::move(__e)),
-           _M_base(views::all(std::forward<_Range>(__r)))
+       lazy_split_view(_Range&& __r, range_value_t<_Range> __e)
+         : _M_base(views::all(std::forward<_Range>(__r))),
+           _M_pattern(views::single(std::move(__e)))
        { }
 
       constexpr _Vp
@@ -2750,8 +3405,11 @@ namespace views
       begin()
       {
        if constexpr (forward_range<_Vp>)
-         return _OuterIter<__detail::__simple_view<_Vp>>{
-             this, ranges::begin(_M_base)};
+         {
+           constexpr bool __simple
+             = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>;
+           return _OuterIter<__simple>{this, ranges::begin(_M_base)};
+         }
        else
          {
            _M_current = ranges::begin(_M_base);
@@ -2768,8 +3426,9 @@ namespace views
       constexpr auto
       end() requires forward_range<_Vp> && common_range<_Vp>
       {
-       return _OuterIter<__detail::__simple_view<_Vp>>{
-           this, ranges::end(_M_base)};
+       constexpr bool __simple
+         = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>;
+       return _OuterIter<__simple>{this, ranges::end(_M_base)};
       }
 
       constexpr auto
@@ -2784,21 +3443,248 @@ namespace views
       }
     };
 
-  template<typename _Range, typename _Pred>
-    split_view(_Range&&, _Pred&&)
-      -> split_view<views::all_t<_Range>, views::all_t<_Pred>>;
+  template<typename _Range, typename _Pattern>
+    lazy_split_view(_Range&&, _Pattern&&)
+      -> lazy_split_view<views::all_t<_Range>, views::all_t<_Pattern>>;
 
   template<input_range _Range>
+    lazy_split_view(_Range&&, range_value_t<_Range>)
+      -> lazy_split_view<views::all_t<_Range>, single_view<range_value_t<_Range>>>;
+
+  namespace views
+  {
+    namespace __detail
+    {
+      template<typename _Range, typename _Pattern>
+       concept __can_lazy_split_view
+         = requires { lazy_split_view(std::declval<_Range>(), std::declval<_Pattern>()); };
+    } // namespace __detail
+
+    struct _LazySplit : __adaptor::_RangeAdaptor<_LazySplit>
+    {
+      template<viewable_range _Range, typename _Pattern>
+       requires __detail::__can_lazy_split_view<_Range, _Pattern>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, _Pattern&& __f) const
+       {
+         return lazy_split_view(std::forward<_Range>(__r), std::forward<_Pattern>(__f));
+       }
+
+      using _RangeAdaptor<_LazySplit>::operator();
+      static constexpr int _S_arity = 2;
+      // The pattern argument of views::lazy_split is not always simple -- it can be
+      // a non-view range, the value category of which affects whether the call
+      // is well-formed.  But a scalar or a view pattern argument is surely
+      // simple.
+      template<typename _Pattern>
+       static constexpr bool _S_has_simple_extra_args
+         = is_scalar_v<_Pattern> || (view<_Pattern>
+                                     && copy_constructible<_Pattern>);
+    };
+
+    inline constexpr _LazySplit lazy_split;
+  } // namespace views
+
+  template<forward_range _Vp, forward_range _Pattern>
+    requires view<_Vp> && view<_Pattern>
+      && indirectly_comparable<iterator_t<_Vp>, iterator_t<_Pattern>,
+                              ranges::equal_to>
+  class split_view : public view_interface<split_view<_Vp, _Pattern>>
+  {
+  private:
+    _Vp _M_base = _Vp();
+    _Pattern _M_pattern = _Pattern();
+    __detail::__non_propagating_cache<subrange<iterator_t<_Vp>>> _M_cached_begin;
+
+    struct _Iterator;
+    struct _Sentinel;
+
+  public:
+    split_view() requires (default_initializable<_Vp>
+                          && default_initializable<_Pattern>)
+      = default;
+
+    constexpr
+    split_view(_Vp __base, _Pattern __pattern)
+      : _M_base(std::move(__base)), _M_pattern(std::move(__pattern))
+    { }
+
+    template<forward_range _Range>
+      requires constructible_from<_Vp, views::all_t<_Range>>
+       && constructible_from<_Pattern, single_view<range_value_t<_Range>>>
+    constexpr
+    split_view(_Range&& __r, range_value_t<_Range> __e)
+      : _M_base(views::all(std::forward<_Range>(__r))),
+       _M_pattern(views::single(std::move(__e)))
+    { }
+
+    constexpr _Vp
+    base() const& requires copy_constructible<_Vp>
+    { return _M_base; }
+
+    constexpr _Vp
+    base() &&
+    { return std::move(_M_base); }
+
+    constexpr _Iterator
+    begin()
+    {
+      if (!_M_cached_begin)
+       _M_cached_begin = _M_find_next(ranges::begin(_M_base));
+      return {this, ranges::begin(_M_base), *_M_cached_begin};
+    }
+
+    constexpr auto
+    end()
+    {
+      if constexpr (common_range<_Vp>)
+       return _Iterator{this, ranges::end(_M_base), {}};
+      else
+       return _Sentinel{this};
+    }
+
+    constexpr subrange<iterator_t<_Vp>>
+    _M_find_next(iterator_t<_Vp> __it)
+    {
+      auto [__b, __e] = ranges::search(subrange(__it, ranges::end(_M_base)), _M_pattern);
+      if (__b != ranges::end(_M_base) && ranges::empty(_M_pattern))
+       {
+         ++__b;
+         ++__e;
+       }
+      return {__b, __e};
+    }
+
+  private:
+    struct _Iterator
+    {
+    private:
+      split_view* _M_parent = nullptr;
+      iterator_t<_Vp> _M_cur = iterator_t<_Vp>();
+      subrange<iterator_t<_Vp>> _M_next = subrange<iterator_t<_Vp>>();
+      bool _M_trailing_empty = false;
+
+      friend struct _Sentinel;
+
+    public:
+      using iterator_concept = forward_iterator_tag;
+      using iterator_category = input_iterator_tag;
+      using value_type = subrange<iterator_t<_Vp>>;
+      using difference_type = range_difference_t<_Vp>;
+
+      _Iterator() = default;
+
+      constexpr
+      _Iterator(split_view* __parent,
+               iterator_t<_Vp> __current,
+               subrange<iterator_t<_Vp>> __next)
+       : _M_parent(__parent),
+         _M_cur(std::move(__current)),
+         _M_next(std::move(__next))
+      { }
+
+      constexpr iterator_t<_Vp>
+      base() const
+      { return _M_cur; }
+
+      constexpr value_type
+      operator*() const
+      { return {_M_cur, _M_next.begin()}; }
+
+      constexpr _Iterator&
+      operator++()
+      {
+       _M_cur = _M_next.begin();
+       if (_M_cur != ranges::end(_M_parent->_M_base))
+         {
+           _M_cur = _M_next.end();
+           if (_M_cur == ranges::end(_M_parent->_M_base))
+             {
+               _M_trailing_empty = true;
+               _M_next = {_M_cur, _M_cur};
+             }
+           else
+             _M_next = _M_parent->_M_find_next(_M_cur);
+         }
+       else
+         _M_trailing_empty = false;
+       return *this;
+      }
+
+      constexpr _Iterator
+      operator++(int)
+      {
+       auto __tmp = *this;
+       ++*this;
+       return __tmp;
+      }
+
+      friend constexpr bool
+      operator==(const _Iterator& __x, const _Iterator& __y)
+      {
+       return __x._M_cur == __y._M_cur
+         && __x._M_trailing_empty == __y._M_trailing_empty;
+      }
+    };
+
+    struct _Sentinel
+    {
+    private:
+      sentinel_t<_Vp> _M_end = sentinel_t<_Vp>();
+
+      constexpr bool
+      _M_equal(const _Iterator& __x) const
+      { return __x._M_cur == _M_end && !__x._M_trailing_empty; }
+
+    public:
+      _Sentinel() = default;
+
+      constexpr explicit
+      _Sentinel(split_view* __parent)
+       : _M_end(ranges::end(__parent->_M_base))
+      { }
+
+      friend constexpr bool
+      operator==(const _Iterator& __x, const _Sentinel& __y)
+      { return __y._M_equal(__x); }
+    };
+  };
+
+  template<typename _Range, typename _Pattern>
+    split_view(_Range&&, _Pattern&&)
+      -> split_view<views::all_t<_Range>, views::all_t<_Pattern>>;
+
+  template<forward_range _Range>
     split_view(_Range&&, range_value_t<_Range>)
       -> split_view<views::all_t<_Range>, single_view<range_value_t<_Range>>>;
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptor split
-      = [] <viewable_range _Range, typename _Fp> (_Range&& __r, _Fp&& __f)
-      {
-       return split_view{std::forward<_Range>(__r), std::forward<_Fp>(__f)};
-      };
+    namespace __detail
+    {
+      template<typename _Range, typename _Pattern>
+       concept __can_split_view
+         = requires { split_view(std::declval<_Range>(), std::declval<_Pattern>()); };
+    } // namespace __detail
+
+    struct _Split : __adaptor::_RangeAdaptor<_Split>
+    {
+      template<viewable_range _Range, typename _Pattern>
+       requires __detail::__can_split_view<_Range, _Pattern>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r, _Pattern&& __f) const
+       {
+         return split_view(std::forward<_Range>(__r), std::forward<_Pattern>(__f));
+       }
+
+      using _RangeAdaptor<_Split>::operator();
+      static constexpr int _S_arity = 2;
+      template<typename _Pattern>
+       static constexpr bool _S_has_simple_extra_args
+         = _LazySplit::_S_has_simple_extra_args<_Pattern>;
+    };
+
+    inline constexpr _Split split;
   } // namespace views
 
   namespace views
@@ -2807,13 +3693,15 @@ namespace views
     {
       template<input_or_output_iterator _Iter>
       constexpr auto
-      operator()(_Iter __i, iter_difference_t<_Iter> __n) const
+      operator() [[nodiscard]] (_Iter __i, iter_difference_t<_Iter> __n) const
       {
-       if constexpr (random_access_iterator<_Iter>)
-         return subrange{__i, __i + __n};
+       if constexpr (contiguous_iterator<_Iter>)
+         return span(std::__to_address(__i), __n);
+       else if constexpr (random_access_iterator<_Iter>)
+         return subrange(__i, __i + __n);
        else
-         return subrange{counted_iterator{std::move(__i), __n},
-                         default_sentinel};
+         return subrange(counted_iterator(std::move(__i), __n),
+                         default_sentinel);
       }
     };
 
@@ -2828,23 +3716,13 @@ namespace views
       _Vp _M_base = _Vp();
 
     public:
-      common_view() = default;
+      common_view() requires default_initializable<_Vp> = default;
 
       constexpr explicit
       common_view(_Vp __r)
        : _M_base(std::move(__r))
       { }
 
-      /* XXX: LWG 3280 didn't remove this constructor, but I think it should?
-      template<viewable_range _Range>
-       requires (!common_range<_Range>)
-         && constructible_from<_Vp, views::all_t<_Range>>
-       constexpr explicit
-       common_view(_Range&& __r)
-         : _M_base(views::all(std::forward<_Range>(__r)))
-       { }
-      */
-
       constexpr _Vp
       base() const& requires copy_constructible<_Vp>
       { return _M_base; }
@@ -2911,16 +3789,35 @@ namespace views
 
   namespace views
   {
-    inline constexpr __adaptor::_RangeAdaptorClosure common
-      = [] <viewable_range _Range> (_Range&& __r)
-      {
-       if constexpr (common_range<_Range>
-                     && requires { views::all(std::forward<_Range>(__r)); })
-         return views::all(std::forward<_Range>(__r));
-       else
-         return common_view{std::forward<_Range>(__r)};
-      };
+    namespace __detail
+    {
+      template<typename _Range>
+       concept __already_common = common_range<_Range>
+         && requires { views::all(std::declval<_Range>()); };
+
+      template<typename _Range>
+       concept __can_common_view
+         = requires { common_view{std::declval<_Range>()}; };
+    } // namespace __detail
 
+    struct _Common : __adaptor::_RangeAdaptorClosure
+    {
+      template<viewable_range _Range>
+       requires __detail::__already_common<_Range>
+         || __detail::__can_common_view<_Range>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r) const
+       {
+         if constexpr (__detail::__already_common<_Range>)
+           return views::all(std::forward<_Range>(__r));
+         else
+           return common_view{std::forward<_Range>(__r)};
+       }
+
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+
+    inline constexpr _Common common;
   } // namespace views
 
   template<view _Vp>
@@ -2929,16 +3826,18 @@ namespace views
     {
     private:
       static constexpr bool _S_needs_cached_begin
-       = !common_range<_Vp> && !random_access_range<_Vp>;
+       = !common_range<_Vp> && !(random_access_range<_Vp>
+                                 && sized_sentinel_for<sentinel_t<_Vp>,
+                                                       iterator_t<_Vp>>);
 
+      _Vp _M_base = _Vp();
       [[no_unique_address]]
        __detail::__maybe_present_t<_S_needs_cached_begin,
                                    __detail::_CachedPosition<_Vp>>
                                      _M_cached_begin;
-      _Vp _M_base = _Vp();
 
     public:
-      reverse_view() = default;
+      reverse_view() requires default_initializable<_Vp> = default;
 
       constexpr explicit
       reverse_view(_Vp __r)
@@ -3016,27 +3915,42 @@ namespace views
 
       template<typename _Vp>
        inline constexpr bool __is_reverse_view<reverse_view<_Vp>> = true;
-    }
 
-    inline constexpr __adaptor::_RangeAdaptorClosure reverse
-      = [] <viewable_range _Range> (_Range&& __r)
-      {
-       using _Tp = remove_cvref_t<_Range>;
-       if constexpr (__detail::__is_reverse_view<_Tp>)
-         return std::forward<_Range>(__r).base();
-       else if constexpr (__detail::__is_reversible_subrange<_Tp>)
-         {
-           using _Iter = decltype(ranges::begin(__r).base());
-           if constexpr (sized_range<_Tp>)
-             return subrange<_Iter, _Iter, subrange_kind::sized>
-                     (__r.end().base(), __r.begin().base(), __r.size());
-           else
-             return subrange<_Iter, _Iter, subrange_kind::unsized>
-                     (__r.end().base(), __r.begin().base());
-         }
-       else
-         return reverse_view{std::forward<_Range>(__r)};
-      };
+      template<typename _Range>
+       concept __can_reverse_view
+         = requires { reverse_view{std::declval<_Range>()}; };
+    } // namespace __detail
+
+    struct _Reverse : __adaptor::_RangeAdaptorClosure
+    {
+      template<viewable_range _Range>
+       requires __detail::__is_reverse_view<remove_cvref_t<_Range>>
+         || __detail::__is_reversible_subrange<remove_cvref_t<_Range>>
+         || __detail::__can_reverse_view<_Range>
+       constexpr auto
+       operator() [[nodiscard]] (_Range&& __r) const
+       {
+         using _Tp = remove_cvref_t<_Range>;
+         if constexpr (__detail::__is_reverse_view<_Tp>)
+           return std::forward<_Range>(__r).base();
+         else if constexpr (__detail::__is_reversible_subrange<_Tp>)
+           {
+             using _Iter = decltype(ranges::begin(__r).base());
+             if constexpr (sized_range<_Tp>)
+               return subrange<_Iter, _Iter, subrange_kind::sized>
+                       {__r.end().base(), __r.begin().base(), __r.size()};
+             else
+               return subrange<_Iter, _Iter, subrange_kind::unsized>
+                       {__r.end().base(), __r.begin().base()};
+           }
+         else
+           return reverse_view{std::forward<_Range>(__r)};
+       }
+
+      static constexpr bool _S_has_simple_call_op = true;
+    };
+
+    inline constexpr _Reverse reverse;
   } // namespace views
 
   namespace __detail
@@ -3050,6 +3964,10 @@ namespace views
        { std::get<_Nm>(__t) }
          -> convertible_to<const tuple_element_t<_Nm, _Tp>&>;
       };
+
+    template<typename _Tp, size_t _Nm>
+      concept __returnable_element
+       = is_reference_v<_Tp> || move_constructible<tuple_element_t<_Nm, _Tp>>;
   }
 
   template<input_range _Vp, size_t _Nm>
@@ -3057,10 +3975,11 @@ namespace views
       && __detail::__has_tuple_element<range_value_t<_Vp>, _Nm>
       && __detail::__has_tuple_element<remove_reference_t<range_reference_t<_Vp>>,
                                       _Nm>
+      && __detail::__returnable_element<range_reference_t<_Vp>, _Nm>
     class elements_view : public view_interface<elements_view<_Vp, _Nm>>
     {
     public:
-      elements_view() = default;
+      elements_view() requires default_initializable<_Vp> = default;
 
       constexpr explicit
       elements_view(_Vp base)
@@ -3108,41 +4027,94 @@ namespace views
       { return ranges::size(_M_base); }
 
     private:
+      template<bool _Const>
+       using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+
+      template<bool _Const>
+       struct __iter_cat
+       { };
+
+      template<bool _Const>
+       requires forward_range<_Base<_Const>>
+       struct __iter_cat<_Const>
+       {
+       private:
+         static auto _S_iter_cat()
+         {
+           using _Base = elements_view::_Base<_Const>;
+           using _Cat = typename iterator_traits<iterator_t<_Base>>::iterator_category;
+           using _Res = decltype((std::get<_Nm>(*std::declval<iterator_t<_Base>>())));
+           if constexpr (!is_lvalue_reference_v<_Res>)
+             return input_iterator_tag{};
+           else if constexpr (derived_from<_Cat, random_access_iterator_tag>)
+             return random_access_iterator_tag{};
+           else
+             return _Cat{};
+         }
+       public:
+         using iterator_category = decltype(_S_iter_cat());
+       };
+
       template<bool _Const>
        struct _Sentinel;
 
       template<bool _Const>
-       struct _Iterator
+       struct _Iterator : __iter_cat<_Const>
        {
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+       private:
+         using _Base = elements_view::_Base<_Const>;
 
          iterator_t<_Base> _M_current = iterator_t<_Base>();
 
+         static constexpr decltype(auto)
+         _S_get_element(const iterator_t<_Base>& __i)
+         {
+           if constexpr (is_reference_v<range_reference_t<_Base>>)
+             return std::get<_Nm>(*__i);
+           else
+             {
+               using _Et = remove_cv_t<tuple_element_t<_Nm, range_reference_t<_Base>>>;
+               return static_cast<_Et>(std::get<_Nm>(*__i));
+             }
+         }
+
+         static auto
+         _S_iter_concept()
+         {
+           if constexpr (random_access_range<_Base>)
+             return random_access_iterator_tag{};
+           else if constexpr (bidirectional_range<_Base>)
+             return bidirectional_iterator_tag{};
+           else if constexpr (forward_range<_Base>)
+             return forward_iterator_tag{};
+           else
+             return input_iterator_tag{};
+         }
+
          friend _Iterator<!_Const>;
 
        public:
-         using iterator_category
-           = typename iterator_traits<iterator_t<_Base>>::iterator_category;
+         using iterator_concept = decltype(_S_iter_concept());
+         // iterator_category defined in elements_view::__iter_cat
          using value_type
            = remove_cvref_t<tuple_element_t<_Nm, range_value_t<_Base>>>;
          using difference_type = range_difference_t<_Base>;
 
-         _Iterator() = default;
+         _Iterator() requires default_initializable<iterator_t<_Base>> = default;
 
          constexpr explicit
-         _Iterator(iterator_t<_Base> current)
-           : _M_current(std::move(current))
+         _Iterator(iterator_t<_Base> __current)
+           : _M_current(std::move(__current))
          { }
 
          constexpr
-         _Iterator(_Iterator<!_Const> i)
+         _Iterator(_Iterator<!_Const> __i)
            requires _Const && convertible_to<iterator_t<_Vp>, iterator_t<_Base>>
-           : _M_current(std::move(i._M_current))
+           : _M_current(std::move(__i._M_current))
          { }
 
-         constexpr iterator_t<_Base>
-         base() const&
-           requires copyable<iterator_t<_Base>>
+         constexpr const iterator_t<_Base>&
+         base() const& noexcept
          { return _M_current; }
 
          constexpr iterator_t<_Base>
@@ -3150,8 +4122,8 @@ namespace views
          { return std::move(_M_current); }
 
          constexpr decltype(auto)
-           operator*() const
-         { return std::get<_Nm>(*_M_current); }
+         operator*() const
+         { return _S_get_element(_M_current); }
 
          constexpr _Iterator&
          operator++()
@@ -3161,7 +4133,7 @@ namespace views
          }
 
          constexpr void
-         operator++(int) requires (!forward_range<_Base>)
+         operator++(int)
          { ++_M_current; }
 
          constexpr _Iterator
@@ -3206,7 +4178,7 @@ namespace views
          constexpr decltype(auto)
          operator[](difference_type __n) const
            requires random_access_range<_Base>
-         { return std::get<_Nm>(*(_M_current + __n)); }
+         { return _S_get_element(_M_current + __n); }
 
          friend constexpr bool
          operator==(const _Iterator& __x, const _Iterator& __y)
@@ -3263,18 +4235,24 @@ namespace views
            requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
          { return __x._M_current - __y._M_current; }
 
-         friend _Sentinel<_Const>;
+         template <bool> friend struct _Sentinel;
        };
 
       template<bool _Const>
        struct _Sentinel
        {
        private:
-         constexpr bool
-         _M_equal(const _Iterator<_Const>& __x) const
-         { return __x._M_current == _M_end; }
+         template<bool _Const2>
+           constexpr bool
+           _M_equal(const _Iterator<_Const2>& __x) const
+           { return __x._M_current == _M_end; }
 
-         using _Base = __detail::__maybe_const_t<_Const, _Vp>;
+         template<bool _Const2>
+           constexpr auto
+           _M_distance_from(const _Iterator<_Const2>& __i) const
+           { return _M_end - __i._M_current; }
+
+         using _Base = elements_view::_Base<_Const>;
          sentinel_t<_Base> _M_end = sentinel_t<_Base>();
 
        public:
@@ -3308,14 +4286,14 @@ namespace views
            requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<_Base2>>
            friend constexpr range_difference_t<_Base2>
            operator-(const _Iterator<_Const2>& __x, const _Sentinel& __y)
-           { return __x._M_current - __y._M_end; }
+           { return -__y._M_distance_from(__x); }
 
          template<bool _Const2,
                   typename _Base2 = __detail::__maybe_const_t<_Const2, _Vp>>
            requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<_Base2>>
-           friend constexpr range_difference_t<_Base>
+           friend constexpr range_difference_t<_Base2>
            operator-(const _Sentinel& __x, const _Iterator<_Const2>& __y)
-           { return __x._M_end - __y._M_current; }
+           { return __x._M_distance_from(__y); }
 
          friend _Sentinel<!_Const>;
        };
@@ -3335,18 +4313,475 @@ namespace views
 
   namespace views
   {
+    namespace __detail
+    {
+      template<size_t _Nm, typename _Range>
+       concept __can_elements_view
+         = requires { elements_view<all_t<_Range>, _Nm>{std::declval<_Range>()}; };
+    } // namespace __detail
+
     template<size_t _Nm>
-    inline constexpr __adaptor::_RangeAdaptorClosure elements
-      = [] <viewable_range _Range> (_Range&& __r)
+      struct _Elements : __adaptor::_RangeAdaptorClosure
       {
-       using _El = elements_view<views::all_t<_Range>, _Nm>;
-       return _El{std::forward<_Range>(__r)};
+       template<viewable_range _Range>
+         requires __detail::__can_elements_view<_Nm, _Range>
+         constexpr auto
+         operator() [[nodiscard]] (_Range&& __r) const
+         {
+           return elements_view<all_t<_Range>, _Nm>{std::forward<_Range>(__r)};
+         }
+
+       static constexpr bool _S_has_simple_call_op = true;
       };
 
-    inline constexpr __adaptor::_RangeAdaptorClosure keys = elements<0>;
-    inline constexpr __adaptor::_RangeAdaptorClosure values = elements<1>;
+    template<size_t _Nm>
+      inline constexpr _Elements<_Nm> elements;
+    inline constexpr auto keys = elements<0>;
+    inline constexpr auto values = elements<1>;
   } // namespace views
 
+#if __cplusplus > 202002L
+  namespace __detail
+  {
+    template<typename... _Rs>
+      concept __zip_is_common = (sizeof...(_Rs) == 1 && (common_range<_Rs> && ...))
+       || (!(bidirectional_range<_Rs> && ...) && (common_range<_Rs> && ...))
+       || ((random_access_range<_Rs> && ...) && (sized_range<_Rs> && ...));
+
+    template<typename... _Ts>
+      struct __tuple_or_pair
+      { using type = std::tuple<_Ts...>; };
+
+    template<typename _Tp, typename _Up>
+      struct __tuple_or_pair<_Tp, _Up>
+      { using type = pair<_Tp, _Up>; };
+
+    template<typename... _Ts>
+      using __tuple_or_pair_t = typename __tuple_or_pair<_Ts...>::type;
+
+    template<typename _Fp, typename _Tuple>
+      constexpr auto
+      __tuple_transform(_Fp&& __f, _Tuple&& __tuple)
+      {
+       return std::apply([&]<typename... _Ts>(_Ts&&... __elts) {
+         return __tuple_or_pair_t<invoke_result_t<_Fp&, _Ts>...>
+           (std::__invoke(__f, std::forward<_Ts>(__elts))...);
+       }, std::forward<_Tuple>(__tuple));
+      }
+
+    template<typename _Fp, typename _Tuple>
+      constexpr void
+      __tuple_for_each(_Fp&& __f, _Tuple&& __tuple)
+      {
+       std::apply([&]<typename... _Ts>(_Ts&&... __elts) {
+         (std::__invoke(__f, std::forward<_Ts>(__elts)), ...);
+       }, std::forward<_Tuple>(__tuple));
+      }
+  } // namespace __detail
+
+  template<input_range... _Vs>
+    requires (view<_Vs> && ...) && (sizeof...(_Vs) > 0)
+  class zip_view : public view_interface<zip_view<_Vs...>>
+  {
+    tuple<_Vs...> _M_views;
+
+    template<bool> class _Iterator;
+    template<bool> class _Sentinel;
+
+  public:
+    zip_view() = default;
+
+    constexpr explicit
+    zip_view(_Vs... __views)
+      : _M_views(std::move(__views)...)
+    { }
+
+    constexpr auto
+    begin() requires (!(__detail::__simple_view<_Vs> && ...))
+    { return _Iterator<false>(__detail::__tuple_transform(ranges::begin, _M_views)); }
+
+    constexpr auto
+    begin() const requires (range<const _Vs> && ...)
+    { return _Iterator<true>(__detail::__tuple_transform(ranges::begin, _M_views)); }
+
+    constexpr auto
+    end() requires (!(__detail::__simple_view<_Vs> && ...))
+    {
+      if constexpr (!__detail::__zip_is_common<_Vs...>)
+        return _Sentinel<false>(__detail::__tuple_transform(ranges::end, _M_views));
+      else if constexpr ((random_access_range<_Vs> && ...))
+        return begin() + iter_difference_t<_Iterator<false>>(size());
+      else
+        return _Iterator<false>(__detail::__tuple_transform(ranges::end, _M_views));
+    }
+
+    constexpr auto
+    end() const requires (range<const _Vs> && ...)
+    {
+      if constexpr (!__detail::__zip_is_common<const _Vs...>)
+        return _Sentinel<true>(__detail::__tuple_transform(ranges::end, _M_views));
+      else if constexpr ((random_access_range<const _Vs> && ...))
+        return begin() + iter_difference_t<_Iterator<true>>(size());
+      else
+        return _Iterator<true>(__detail::__tuple_transform(ranges::end, _M_views));
+    }
+
+    constexpr auto
+    size() requires (sized_range<_Vs> && ...)
+    {
+      return std::apply([](auto... sizes) {
+       using _CT = __detail::__make_unsigned_like_t<common_type_t<decltype(sizes)...>>;
+       return ranges::min({_CT(sizes)...});
+      }, __detail::__tuple_transform(ranges::size, _M_views));
+    }
+
+    constexpr auto
+    size() const requires (sized_range<const _Vs> && ...)
+    {
+      return std::apply([](auto... sizes) {
+       using _CT = __detail::__make_unsigned_like_t<common_type_t<decltype(sizes)...>>;
+       return ranges::min({_CT(sizes)...});
+      }, __detail::__tuple_transform(ranges::size, _M_views));
+    }
+  };
+
+  template<typename... _Rs>
+    zip_view(_Rs&&...) -> zip_view<views::all_t<_Rs>...>;
+
+  template<typename... _Views>
+    inline constexpr bool enable_borrowed_range<zip_view<_Views...>>
+      = (enable_borrowed_range<_Views> && ...);
+
+  namespace __detail
+  {
+    template<bool _Const, typename... _Vs>
+      concept __all_random_access
+       = (random_access_range<__maybe_const_t<_Const, _Vs>> && ...);
+
+    template<bool _Const, typename... _Vs>
+      concept __all_bidirectional
+       = (bidirectional_range<__maybe_const_t<_Const, _Vs>> && ...);
+
+    template<bool _Const, typename... _Vs>
+      concept __all_forward
+       = (forward_range<__maybe_const_t<_Const, _Vs>> && ...);
+
+    template<bool _Const, typename... _Views>
+      struct __zip_view_iter_cat
+      { };
+
+    template<bool _Const, typename... _Views>
+      requires __all_forward<_Const, _Views...>
+      struct __zip_view_iter_cat<_Const, _Views...>
+      { using iterator_category = input_iterator_tag; };
+  } // namespace __detail
+
+  template<input_range... _Vs>
+    requires (view<_Vs> && ...) && (sizeof...(_Vs) > 0)
+  template<bool _Const>
+  class zip_view<_Vs...>::_Iterator
+    : public __detail::__zip_view_iter_cat<_Const, _Vs...>
+  {
+    __detail::__tuple_or_pair_t<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>...> _M_current;
+
+    constexpr explicit
+    _Iterator(decltype(_M_current) __current)
+      : _M_current(std::move(__current))
+    { }
+
+    static auto
+    _S_iter_concept()
+    {
+      if constexpr (__detail::__all_random_access<_Const, _Vs...>)
+       return random_access_iterator_tag{};
+      else if constexpr (__detail::__all_bidirectional<_Const, _Vs...>)
+       return bidirectional_iterator_tag{};
+      else if constexpr (__detail::__all_forward<_Const, _Vs...>)
+       return forward_iterator_tag{};
+      else
+       return input_iterator_tag{};
+    }
+
+  public:
+    // iterator_category defined in __zip_view_iter_cat
+    using iterator_concept = decltype(_S_iter_concept());
+    using value_type
+      = __detail::__tuple_or_pair_t<range_value_t<__detail::__maybe_const_t<_Const, _Vs>>...>;
+    using difference_type
+      = common_type_t<range_difference_t<__detail::__maybe_const_t<_Const, _Vs>>...>;
+
+    _Iterator() = default;
+
+    constexpr
+    _Iterator(_Iterator<!_Const> __i)
+      requires _Const
+       && (convertible_to<iterator_t<_Vs>,
+                          iterator_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
+      : _M_current(std::move(__i._M_current))
+    { }
+
+    constexpr auto
+    operator*() const
+    {
+      auto __f = [](auto& __i) -> decltype(auto) {
+       return *__i;
+      };
+      return __detail::__tuple_transform(__f, _M_current);
+    }
+
+    constexpr _Iterator&
+    operator++()
+    {
+      __detail::__tuple_for_each([](auto& __i) { ++__i; }, _M_current);
+      return *this;
+    }
+
+    constexpr void
+    operator++(int)
+    { ++*this; }
+
+    constexpr _Iterator
+    operator++(int)
+      requires __detail::__all_forward<_Const, _Vs...>
+    {
+      auto __tmp = *this;
+      ++*this;
+      return __tmp;
+    }
+
+    constexpr _Iterator&
+    operator--()
+      requires __detail::__all_bidirectional<_Const, _Vs...>
+    {
+      __detail::__tuple_for_each([](auto& __i) { --__i; }, _M_current);
+      return *this;
+    }
+
+    constexpr _Iterator
+    operator--(int)
+      requires __detail::__all_bidirectional<_Const, _Vs...>
+    {
+      auto __tmp = *this;
+      --*this;
+      return __tmp;
+    }
+
+    constexpr _Iterator&
+    operator+=(difference_type __x)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    {
+      auto __f = [&]<typename _It>(_It& __i) {
+       __i += iter_difference_t<_It>(__x);
+      };
+      __detail::__tuple_for_each(__f, _M_current);
+      return *this;
+    }
+
+    constexpr _Iterator&
+    operator-=(difference_type __x)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    {
+      auto __f = [&]<typename _It>(_It& __i) {
+       __i -= iter_difference_t<_It>(__x);
+      };
+      __detail::__tuple_for_each(__f, _M_current);
+      return *this;
+    }
+
+    constexpr auto
+    operator[](difference_type __n) const
+      requires __detail::__all_random_access<_Const, _Vs...>
+    {
+      auto __f = [&]<typename _It>(_It& __i) -> decltype(auto) {
+       return __i[iter_difference_t<_It>(__n)];
+      };
+      return __detail::__tuple_transform(__f, _M_current);
+    }
+
+    friend constexpr bool
+    operator==(const _Iterator& __x, const _Iterator& __y)
+      requires (equality_comparable<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
+    {
+      if constexpr (__detail::__all_bidirectional<_Const, _Vs...>)
+       return __x._M_current == __y._M_current;
+      else
+       return [&]<size_t... _Is>(index_sequence<_Is...>) {
+         return ((std::get<_Is>(__x._M_current) == std::get<_Is>(__y._M_current)) || ...);
+       }(make_index_sequence<sizeof...(_Vs)>{});
+    }
+
+    friend constexpr bool
+    operator<(const _Iterator& __x, const _Iterator& __y)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    { return __x._M_current < __y._M_current; }
+
+    friend constexpr bool
+    operator>(const _Iterator& __x, const _Iterator& __y)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    { return __y < __x; }
+
+    friend constexpr bool
+    operator<=(const _Iterator& __x, const _Iterator& __y)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    { return !(__y < __x); }
+
+    friend constexpr bool
+    operator>=(const _Iterator& __x, const _Iterator& __y)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    { return !(__x < __y); }
+
+    friend constexpr auto
+    operator<=>(const _Iterator& __x, const _Iterator& __y)
+      requires __detail::__all_random_access<_Const, _Vs...>
+       && (three_way_comparable<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
+    { return __x._M_current <=> __y._M_current; }
+
+    friend constexpr _Iterator
+    operator+(const _Iterator& __i, difference_type __n)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    {
+      auto __r = __i;
+      __r += __n;
+      return __r;
+    }
+
+    friend constexpr _Iterator
+    operator+(difference_type __n, const _Iterator& __i)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    {
+      auto __r = __i;
+      __r += __n;
+      return __r;
+    }
+
+    friend constexpr _Iterator
+    operator-(const _Iterator& __i, difference_type __n)
+      requires __detail::__all_random_access<_Const, _Vs...>
+    {
+      auto __r = __i;
+      __r -= __n;
+      return __r;
+    }
+
+    friend constexpr difference_type
+    operator-(const _Iterator& __x, const _Iterator& __y)
+      requires (sized_sentinel_for<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>,
+                                  iterator_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
+    {
+      return [&]<size_t... _Is>(index_sequence<_Is...>) {
+       return ranges::min({difference_type(std::get<_Is>(__x._M_current)
+                                           - std::get<_Is>(__y._M_current))...},
+                          ranges::less{},
+                          [](difference_type __i) -> make_unsigned_t<difference_type> {
+                            return __i < 0 ? -__i : __i;
+                          });
+      }(make_index_sequence<sizeof...(_Vs)>{});
+    }
+
+    friend constexpr auto
+    iter_move(const _Iterator& __i)
+    { return __detail::__tuple_transform(ranges::iter_move, __i._M_current); }
+
+    friend constexpr void
+    iter_swap(const _Iterator& __l, const _Iterator& __r)
+      requires (indirectly_swappable<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
+    {
+      [&]<size_t... _Is>(index_sequence<_Is...>) {
+       (ranges::iter_swap(std::get<_Is>(__l._M_current), std::get<_Is>(__r._M_current)), ...);
+      }(make_index_sequence<sizeof...(_Vs)>{});
+    }
+
+    friend class zip_view;
+  };
+
+  template<input_range... _Vs>
+    requires (view<_Vs> && ...) && (sizeof...(_Vs) > 0)
+  template<bool _Const>
+  class zip_view<_Vs...>::_Sentinel
+  {
+    __detail::__tuple_or_pair_t<sentinel_t<__detail::__maybe_const_t<_Const, _Vs>>...> _M_end;
+
+    constexpr explicit
+    _Sentinel(decltype(_M_end) __end)
+      : _M_end(__end)
+    { }
+
+    friend class zip_view;
+
+  public:
+    _Sentinel() = default;
+
+    constexpr
+    _Sentinel(_Sentinel<!_Const> __i)
+      requires _Const
+       && (convertible_to<sentinel_t<_Vs>,
+                          sentinel_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
+      : _M_end(std::move(__i._M_end))
+    { }
+
+    template<bool _OtherConst>
+      requires (sentinel_for<sentinel_t<__detail::__maybe_const_t<_Const, _Vs>>,
+                            iterator_t<__detail::__maybe_const_t<_OtherConst, _Vs>>> && ...)
+    friend constexpr bool
+    operator==(const _Iterator<_OtherConst>& __x, const _Sentinel& __y)
+    {
+      return [&]<size_t... _Is>(index_sequence<_Is...>) {
+       return ((std::get<_Is>(__x._M_current) == std::get<_Is>(__y._M_end)) || ...);
+      }(make_index_sequence<sizeof...(_Vs)>{});
+    }
+
+    template<bool _OtherConst>
+      requires (sized_sentinel_for<sentinel_t<__detail::__maybe_const_t<_Const, _Vs>>,
+                                  iterator_t<__detail::__maybe_const_t<_OtherConst, _Vs>>> && ...)
+    friend constexpr auto
+    operator-(const _Iterator<_OtherConst>& __x, const _Sentinel& __y)
+    {
+      using _Ret
+       = common_type_t<range_difference_t<__detail::__maybe_const_t<_OtherConst, _Vs>>...>;
+      return [&]<size_t... _Is>(index_sequence<_Is...>) {
+       return ranges::min({_Ret(std::get<_Is>(__x._M_current) - std::get<_Is>(__y._M_end))...},
+                          ranges::less{},
+                          [](_Ret __i) -> make_unsigned_t<_Ret> {
+                            return __i < 0 ? -__i : __i;
+                          });
+      }(make_index_sequence<sizeof...(_Vs)>{});
+    }
+
+    template<bool _OtherConst>
+      requires (sized_sentinel_for<sentinel_t<__detail::__maybe_const_t<_Const, _Vs>>,
+                                  iterator_t<__detail::__maybe_const_t<_OtherConst, _Vs>>> && ...)
+    friend constexpr auto
+    operator-(const _Sentinel& __y, const _Iterator<_OtherConst>& __x)
+    { return -(__x - __y); }
+  };
+
+  namespace views
+  {
+    namespace __detail
+    {
+      template<typename... _Ts>
+       concept __can_zip_view
+         = requires { zip_view<all_t<_Ts>...>(std::declval<_Ts>()...); };
+    }
+
+    struct _Zip
+    {
+      template<typename... _Ts>
+       requires (sizeof...(_Ts) == 0 || __detail::__can_zip_view<_Ts...>)
+       [[nodiscard]]
+       constexpr auto
+       operator()(_Ts&&... __ts) const
+       {
+         if constexpr (sizeof...(_Ts) == 0)
+           return views::empty<tuple<>>;
+         else
+           return zip_view<all_t<_Ts>...>(std::forward<_Ts>(__ts)...);
+       }
+    };
+
+    inline constexpr _Zip zip;
+  }
+#endif // C++23
 } // namespace ranges
 
   namespace views = ranges::views;
This page took 0.114102 seconds and 5 git commands to generate.