diff --git a/libcxx/docs/FeatureTestMacroTable.rst b/libcxx/docs/FeatureTestMacroTable.rst --- a/libcxx/docs/FeatureTestMacroTable.rst +++ b/libcxx/docs/FeatureTestMacroTable.rst @@ -358,6 +358,8 @@ --------------------------------------------------- ----------------- ``__cpp_lib_ranges_starts_ends_with`` *unimplemented* --------------------------------------------------- ----------------- + ``__cpp_lib_ranges_stride`` ``202207L`` + --------------------------------------------------- ----------------- ``__cpp_lib_ranges_to_container`` ``202202L`` --------------------------------------------------- ----------------- ``__cpp_lib_ranges_zip`` *unimplemented* diff --git a/libcxx/docs/Status/Cxx23Issues.csv b/libcxx/docs/Status/Cxx23Issues.csv --- a/libcxx/docs/Status/Cxx23Issues.csv +++ b/libcxx/docs/Status/Cxx23Issues.csv @@ -304,5 +304,5 @@ "`3877 `__","Incorrect constraints on ``const``-qualified monadic overloads for ``std::expected``","February 2023","|Complete|","17.0","" "`3878 `__","import ``std;`` should guarantee initialization of standard iostreams objects","February 2023","","","" "`3879 `__","``erase_if`` for ``flat_{,multi}set`` is incorrectly specified","February 2023","","","" -"`3880 `__","Clarify ``operator+=`` complexity for ``{chunk,stride}_view::iterator``","February 2023","","","|ranges|" +"`3880 `__","Clarify ``operator+=`` complexity for ``{chunk,stride}_view::iterator``","February 2023","|Partial|","","|ranges|" "`3881 `__","Incorrect formatting of container adapters backed by ``std::string``","February 2023","|Complete|","17.0","|format|" diff --git a/libcxx/docs/Status/Cxx23Papers.csv b/libcxx/docs/Status/Cxx23Papers.csv --- a/libcxx/docs/Status/Cxx23Papers.csv +++ b/libcxx/docs/Status/Cxx23Papers.csv @@ -58,7 +58,7 @@ "`P1223R5 `__","LWG","``ranges::find_last()``, ``ranges::find_last_if()``, and ``ranges::find_last_if_not()``","July 2022","","","|ranges|" "`P1467R9 `__","LWG","Extended ``floating-point`` types and standard names","July 2022","","" "`P1642R11 `__","LWG","Freestanding ``[utilities]``, ``[ranges]``, and ``[iterators]``","July 2022","","" -"`P1899R3 `__","LWG","``stride_view``","July 2022","","","|ranges|" +"`P1899R3 `__","LWG","``stride_view``","July 2022","|Complete|","18.0","|ranges|" "`P2093R14 `__","LWG","Formatted output","July 2022","","|In Progress|" "`P2165R4 `__","LWG","Compatibility between ``tuple``, ``pair`` and ``tuple-like`` objects","July 2022","","" "`P2278R4 `__","LWG","``cbegin`` should always return a constant iterator","July 2022","","","|ranges|" diff --git a/libcxx/docs/Status/RangesViews.csv b/libcxx/docs/Status/RangesViews.csv --- a/libcxx/docs/Status/RangesViews.csv +++ b/libcxx/docs/Status/RangesViews.csv @@ -34,5 +34,5 @@ C++23,`chunk_by `_,Unassigned,No patch yet,Not started C++23,`as_const `_,Unassigned,No patch yet,Not started C++23,`as_rvalue `_,Nikolas Klauser,`D137637 `_,✅ -C++23,`stride `_,Hristo Hristov,No patch yet,In Progress +C++23,`stride `_,Hristo Hristov,No patch yet,✅ C++23,`enumerate `_,Hristo Hristov,No patch yet,In Progress diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -640,6 +640,7 @@ __ranges/counted.h __ranges/dangling.h __ranges/data.h + __ranges/div_ceil.h __ranges/drop_view.h __ranges/drop_while_view.h __ranges/elements_view.h @@ -665,6 +666,7 @@ __ranges/single_view.h __ranges/size.h __ranges/split_view.h + __ranges/stride_view.h __ranges/subrange.h __ranges/take_view.h __ranges/take_while_view.h diff --git a/libcxx/include/__ranges/div_ceil.h b/libcxx/include/__ranges/div_ceil.h new file mode 100644 --- /dev/null +++ b/libcxx/include/__ranges/div_ceil.h @@ -0,0 +1,40 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___RANGES_DIV_CEIL_H +#define _LIBCPP___RANGES_DIV_CEIL_H + +#include <__config> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +#if _LIBCPP_STD_VER >= 23 + +namespace ranges { + +template +constexpr _Ip __div_ceil(_Ip __num, _Ip __denom) // exposition only +{ + _Ip r = __num / __denom; + if (__num % __denom) + ++r; + return r; +} + +} // namespace ranges + +#endif // _LIBCPP_STD_VER >= 23 + +_LIBCPP_END_NAMESPACE_STD + +#endif _LIBCPP___RANGES_DIV_CEIL_H diff --git a/libcxx/include/__ranges/stride_view.h b/libcxx/include/__ranges/stride_view.h new file mode 100644 --- /dev/null +++ b/libcxx/include/__ranges/stride_view.h @@ -0,0 +1,370 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___RANGES_STRIDE_VIEW_H +#define _LIBCPP___RANGES_STRIDE_VIEW_H + +#include <__config> +#include <__iterator/concepts.h> +#include <__ranges/concepts.h> +#include <__ranges/div_ceil.h> +#include <__ranges/enable_borrowed_range.h> +#include <__type_traits/maybe_const.h> +#include <__utility/forward.h> +#include <__utility/move.h> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +#if _LIBCPP_STD_VER >= 23 + +namespace ranges { + +// [range.stride.view] + +template + requires view<_View> +class stride_view : public view_interface> { + _View __base_; // exposition only + range_difference_t<_View> __stride_; // exposition only + // [range.stride.iterator], class template stride_view​::​iterator + template + class __iterator; // exposition only + +public: + _LIBCPP_HIDE_FROM_ABI constexpr explicit stride_view(_View __base, range_difference_t<_View> __stride) + : __base_(std::move(__base)), __stride_(std::move(__stride)) { + _LIBCPP_ASSERT(__stride > 0, "The stride value must be a positive number."); + } + + _LIBCPP_HIDE_FROM_ABI constexpr _View base() const& + requires copy_constructible<_View> + { + return __base_; + } + _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); } + + _LIBCPP_HIDE_FROM_ABI constexpr range_difference_t<_View> stride() const noexcept { return __stride_; } + + _LIBCPP_HIDE_FROM_ABI constexpr auto begin() + requires(!__simple_view<_View>) + { + return __iterator(this, ranges::begin(__base_)); + } + + _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const + requires range + { + return __iterator(this, ranges::begin(__base_)); + } + + _LIBCPP_HIDE_FROM_ABI constexpr auto end() + requires(!__simple_view<_View>) + { + if constexpr (common_range<_View> && sized_range<_View> && forward_range<_View>) { + auto missing = (__stride_ - ranges::distance(__base_) % __stride_) % __stride_; + return __iterator(this, ranges::end(__base_), missing); + } else if constexpr (common_range<_View> && !bidirectional_range<_View>) { + return __iterator(this, ranges::end(__base_)); + } else { + return default_sentinel; + } + } + + _LIBCPP_HIDE_FROM_ABI constexpr auto end() const + requires range + { + if constexpr (common_range && sized_range && forward_range) { + auto missing = (__stride_ - ranges::distance(__base_) % __stride_) % __stride_; + return __iterator(this, ranges::end(__base_), missing); + } else if constexpr (common_range && !bidirectional_range) { + return __iterator(this, ranges::end(__base_)); + } else { + return default_sentinel; + } + } + + _LIBCPP_HIDE_FROM_ABI constexpr auto size() + requires sized_range<_View> + { + return __to_unsigned_like(__div_ceil(ranges::distance(__base_), __stride_)); + } + _LIBCPP_HIDE_FROM_ABI constexpr auto size() const + requires sized_range + { + return __to_unsigned_like(__div_ceil(ranges::distance(__base_), __stride_)); + } +}; + +template +stride_view(_Range&&, range_difference_t<_Range>) -> stride_view>; + +// [range.stride.iterator] + +template +struct __stride_view_iterator_category_base {}; + +template +struct __stride_view_iterator_category_base<_Base> { + static consteval auto __get_iterator_category() { + using _Cat = typename iterator_traits>::iterator_category; + + if constexpr (derived_from<_Cat, random_access_iterator_tag>) { + return random_access_iterator_tag{}; + } else { + return _Cat{}; + } + } + + using iterator_category = decltype(__get_iterator_category()); // not always present +}; + +template + requires view<_View> +template +class stride_view<_View>::__iterator : __stride_view_iterator_category_base<_View> { + using _Parent = __maybe_const; // exposition only + using _Base = __maybe_const; // exposition only + + iterator_t<_Base> __current_ = iterator_t<_Base>(); // exposition only + sentinel_t<_Base> __end_ = sentinel_t<_Base>(); // exposition only + range_difference_t<_Base> __stride_ = 0; // exposition only + range_difference_t<_Base> __missing_ = 0; // exposition only + + _LIBCPP_HIDE_FROM_ABI constexpr __iterator( + _Parent* __parent, iterator_t<_Base> __current, range_difference_t<_Base> __missing = 0) + : __current_(std::move(__current)), + __end_(ranges::end(__parent->__base_)), + __stride_(__parent->__stride_), + __missing_(__missing) {} // exposition only + + static consteval auto __get_iterator_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 class stride_view<_View>; + +public: + using difference_type = range_difference_t<_Base>; + using value_type = range_value_t<_Base>; + using iterator_concept = decltype(__get_iterator_concept()); + // using iterator_category - not always present + + _LIBCPP_HIDE_FROM_ABI __iterator() + requires default_initializable> + = default; + + _LIBCPP_HIDE_FROM_ABI constexpr __iterator(__iterator __other) + requires Const && convertible_to, iterator_t<_Base>> && + convertible_to, sentinel_t<_Base>> + : __current_(std::move(__other.__current_)), + __end_(std::move(__other.__end_)), + __stride_(__other.__stride_), + __missing_(__other.__missing_) {} + + _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() && { return std::move(__current_); } + _LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept { return __current_; } + + _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const { return *__current_; } + + _LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() { + _LIBCPP_ASSERT(__current_ != __end_, "Out of bound iteration."); + __missing_ = ranges::advance(__current_, __stride_, __end_); + return *this; + } + _LIBCPP_HIDE_FROM_ABI constexpr void operator++(int) { return ++*this; } + _LIBCPP_HIDE_FROM_ABI constexpr __iterator operator++(int) + requires forward_range<_Base> + { + auto __temp = *this; + ++*this; + return __temp; + } + + _LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator--() + requires bidirectional_range<_Base> + { + ranges::advance(__current_, __missing_ - __stride_); + __missing_ = 0; + return *this; + } + _LIBCPP_HIDE_FROM_ABI constexpr __iterator operator--(int) + requires bidirectional_range<_Base> + { + auto __temp = *this; + --*this; + return __temp; + } + + _LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator+=(difference_type __n) + requires random_access_range<_Base> + { + if (__n > 0) { + _LIBCPP_ASSERT(ranges::distance(__current_, __end_) > __stride_ * (__n - 1), "Out of bound iteration."); + ranges::advance(__current_, __stride_ * (__n - 1)); + __missing_ = ranges::advance(__current_, __stride_, __end_); + } else if (__n < 0) { + ranges::advance(__current_, __stride_ * __n + __missing_); + __missing_ = 0; + } + return *this; + } + _LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator-=(difference_type __n) + requires random_access_range<_Base> + { + return *this += -__n; + } + + _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const + requires random_access_range<_Base> + { + return *(*this + __n); + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __i, default_sentinel_t) { + return __i.__current_ == __i.__end; + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y) + requires equality_comparable> + { + return __x.__current_ == __y.__current_; + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return __x.__current_ < __y._current_; + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return __y.__current_ < __x.__current_; + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<=(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return !(__y < __x); + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>=(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return !(__x < __y); + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<=>(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> && three_way_comparable> + { + return __x.__current_ <=> __y.__current_; + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n) + requires random_access_range<_Base> + { + auto __r = __i; + __r += __n; + return __r; + } + _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i) + requires random_access_range<_Base> + { + auto __r = __i; + __r += __n; + return __r; + } + _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n) + requires random_access_range<_Base> + { + auto __r = __i; + __r -= __n; + return __r; + } + _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y) + requires sized_sentinel_for, iterator_t<_Base>> + { + constexpr auto __n = (__x.__current_ - __y.__current_); + if constexpr (forward_range<_Base>) { + return (__n + __x.__missing_ - __y.__missing_) / __x.__stride_; + } else if constexpr (__n < 0) { + return __div_ceil(-__n, __x.__stride_); + } else { + return __div_ceil(__n, __x.__stride_); + } + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(default_sentinel_t __y, const __iterator& __x) + requires sized_sentinel_for, iterator_t<_Base>> + { + return __div_ceil(__x.__end_ - __x.__current_, __x.__stride_); + } + _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, default_sentinel_t __y) + requires sized_sentinel_for, iterator_t<_Base>> + { + return -(__y - __x); + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr range_rvalue_reference_t<_Base> + iter_move(const __iterator& __i) noexcept(noexcept(ranges::iter_move(__i.__current_))) { + return ranges::iter_move(__i.__current_); + } + + _LIBCPP_HIDE_FROM_ABI friend constexpr void + iter_swap(const __iterator& __x, + const __iterator& __y) noexcept(noexcept(ranges::iter_swap(__x.__current_, __y.__current_))) + requires indirectly_swappable> + { + return ranges::iter_swap(__x.__current_, __y.__current_); + } +}; + +template +_LIBCPP_HIDE_FROM_ABI constexpr bool enable_borrowed_range> = enable_borrowed_range<_View>; + +namespace views { +namespace __stride { + +struct __fn : __range_adaptor_closure<__fn> { + template + [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto + operator()(_Range&& __range, range_difference_t<_Range> __stride) const + noexcept(noexcept(stride_view>(std::forward<_Range>(__range), __stride))) + -> decltype(stride_view>(std::forward<_Range>(__range), __stride)) { + return stride_view>(std::forward<_Range>(__range), __stride); + } +}; + +} // namespace __stride + +inline namespace __cpo { + +inline constexpr auto stride = __stride::__fn{}; + +} // namespace __cpo +} // namespace views +} // namespace ranges + +#endif // _LIBCPP_STD_VER >= 23 + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___RANGES_STRIDE_VIEW_H diff --git a/libcxx/include/ranges b/libcxx/include/ranges --- a/libcxx/include/ranges +++ b/libcxx/include/ranges @@ -331,6 +331,17 @@ class as_rvalue_view; // since C++23 namespace views { inline constexpr unspecified as_rvalue ) unspecified; } // since C++23 + + // [range.stride], stride view + template + requires view + class stride_view; // freestanding, C++23 + + template + constexpr bool enable_borrowed_range> = // freestanding, C++23 + enable_borrowed_range; + + namespace views { inline constexpr unspecified stride = unspecified; } // C++23 } namespace std { @@ -398,6 +409,7 @@ #include <__ranges/single_view.h> #include <__ranges/size.h> #include <__ranges/split_view.h> +#include <__ranges/stride_view.h> #include <__ranges/subrange.h> #include <__ranges/take_view.h> #include <__ranges/take_while_view.h> diff --git a/libcxx/include/version b/libcxx/include/version --- a/libcxx/include/version +++ b/libcxx/include/version @@ -161,6 +161,7 @@ __cpp_lib_ranges_repeat 202207L __cpp_lib_ranges_slide 202202L __cpp_lib_ranges_starts_ends_with 202106L +__cpp_lib_ranges_stride 202207L __cpp_lib_ranges_to_container 202202L @@ -440,6 +441,7 @@ # define __cpp_lib_ranges_repeat 202207L // # define __cpp_lib_ranges_slide 202202L // # define __cpp_lib_ranges_starts_ends_with 202106L +# define __cpp_lib_ranges_stride 202207L # define __cpp_lib_ranges_to_container 202202L // # define __cpp_lib_ranges_zip 202110L // # define __cpp_lib_reference_from_temporary 202202L diff --git a/libcxx/modules/std/ranges.cppm b/libcxx/modules/std/ranges.cppm --- a/libcxx/modules/std/ranges.cppm +++ b/libcxx/modules/std/ranges.cppm @@ -312,14 +312,14 @@ namespace views { using std::ranges::views::chunk_by; } - +#endif // [range.stride], stride view using std::ranges::stride_view; namespace views { using std::ranges::views::stride; } - +#if 0 using std::ranges::cartesian_product_view; namespace views { diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.compile.pass.cpp --- a/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.compile.pass.cpp @@ -23,6 +23,7 @@ __cpp_lib_ranges_join_with 202202L [C++23] __cpp_lib_ranges_repeat 202207L [C++23] __cpp_lib_ranges_slide 202202L [C++23] + __cpp_lib_ranges_stride 202207L [C++23] __cpp_lib_ranges_to_container 202202L [C++23] __cpp_lib_ranges_zip 202110L [C++23] */ @@ -60,6 +61,10 @@ # error "__cpp_lib_ranges_slide should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -98,6 +103,10 @@ # error "__cpp_lib_ranges_slide should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -136,6 +145,10 @@ # error "__cpp_lib_ranges_slide should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -177,6 +190,10 @@ # error "__cpp_lib_ranges_slide should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -260,6 +277,13 @@ # endif # endif +# ifndef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should be defined in c++23" +# endif +# if __cpp_lib_ranges_stride != 202207L +# error "__cpp_lib_ranges_stride should have the value 202207L in c++23" +# endif + # ifndef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should be defined in c++23" # endif @@ -355,6 +379,13 @@ # endif # endif +# ifndef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should be defined in c++26" +# endif +# if __cpp_lib_ranges_stride != 202207L +# error "__cpp_lib_ranges_stride should have the value 202207L in c++26" +# endif + # ifndef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should be defined in c++26" # endif diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp --- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp @@ -149,6 +149,7 @@ __cpp_lib_ranges_repeat 202207L [C++23] __cpp_lib_ranges_slide 202202L [C++23] __cpp_lib_ranges_starts_ends_with 202106L [C++23] + __cpp_lib_ranges_stride 202207L [C++23] __cpp_lib_ranges_to_container 202202L [C++23] __cpp_lib_ranges_zip 202110L [C++23] __cpp_lib_ratio 202306L [C++26] @@ -720,6 +721,10 @@ # error "__cpp_lib_ranges_starts_ends_with should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -1478,6 +1483,10 @@ # error "__cpp_lib_ranges_starts_ends_with should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -2407,6 +2416,10 @@ # error "__cpp_lib_ranges_starts_ends_with should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -3606,6 +3619,10 @@ # error "__cpp_lib_ranges_starts_ends_with should not be defined before c++23" # endif +# ifdef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should not be defined before c++23" +# endif + # ifdef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should not be defined before c++23" # endif @@ -5042,6 +5059,13 @@ # endif # endif +# ifndef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should be defined in c++23" +# endif +# if __cpp_lib_ranges_stride != 202207L +# error "__cpp_lib_ranges_stride should have the value 202207L in c++23" +# endif + # ifndef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should be defined in c++23" # endif @@ -6595,6 +6619,13 @@ # endif # endif +# ifndef __cpp_lib_ranges_stride +# error "__cpp_lib_ranges_stride should be defined in c++26" +# endif +# if __cpp_lib_ranges_stride != 202207L +# error "__cpp_lib_ranges_stride should have the value 202207L in c++26" +# endif + # ifndef __cpp_lib_ranges_to_container # error "__cpp_lib_ranges_to_container should be defined in c++26" # endif diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/adaptor.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/adaptor.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/adaptor.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/base.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/base.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/begin.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/begin.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/ctad.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/ctad.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/ctad.compile.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/enable_borrowed_range.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/enable_borrowed_range.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/enable_borrowed_range.compile.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/end.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/end.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/iterator/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/iterator/ctor.default.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/iterator/ctor.default.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/iterator/equal.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/iterator/equal.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/iterator/equal.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/sentinel/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/sentinel/ctor.default.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/sentinel/ctor.default.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/sentinel/equal.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/sentinel/equal.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/sentinel/equal.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.stride/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.stride/size.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.stride/size.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// ranges + +// std::views::enumerate + +#include +#include + +#include "test_iterators.h" + +constexpr bool test() { return true; } + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py --- a/libcxx/utils/generate_feature_test_macro_components.py +++ b/libcxx/utils/generate_feature_test_macro_components.py @@ -833,6 +833,11 @@ "headers": ["algorithm"], "unimplemented": True, }, + { + "name": "__cpp_lib_ranges_stride", + "values": {"c++23": 202207}, + "headers": ["ranges"], + }, { "name": "__cpp_lib_ranges_to_container", "values": {"c++23": 202202},