diff --git a/libcxx/docs/Status/RangesPaper.csv b/libcxx/docs/Status/RangesPaper.csv --- a/libcxx/docs/Status/RangesPaper.csv +++ b/libcxx/docs/Status/RangesPaper.csv @@ -137,7 +137,7 @@ `[range.all] `_,`view::all `_,"[range.subrange], [range.view.ref]",Zoe Carver,In progress `[range.view.ref] `_,`ref-view `_,[view.interface],Zoe Carver,In progress `[range.filter] `_,filter_view,[range.all],Louis Dionne,Not started -`[range.transform] `_,`transform_view `_,[range.all],Zoe Carver,In progress +`[range.transform] `_,`transform_view `_,[range.all],Zoe Carver,✅ `[range.iota] `_,iota_view,[range.all],Louis Dionne,Not started `[range.take] `_,take_view,[range.all],Zoe Carver,Not started `[range.join] `_,join_view,[range.all],Christopher Di Bella,Not started diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -196,6 +196,7 @@ __ranges/ref_view.h __ranges/size.h __ranges/subrange.h + __ranges/transform_view.h __ranges/view_interface.h __split_buffer __std_stream diff --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h --- a/libcxx/include/__ranges/drop_view.h +++ b/libcxx/include/__ranges/drop_view.h @@ -12,6 +12,7 @@ #include <__config> #include <__iterator/iterator_traits.h> #include <__iterator/concepts.h> +#include <__iterator/next.h> #include <__ranges/access.h> #include <__ranges/view_interface.h> #include <__ranges/all.h> diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h new file mode 100644 --- /dev/null +++ b/libcxx/include/__ranges/transform_view.h @@ -0,0 +1,363 @@ +// -*- 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_TRANSFORM_VIEW_H +#define _LIBCPP___RANGES_TRANSFORM_VIEW_H + +#include <__config> +#include <__iterator/iterator_traits.h> +#include <__iterator/concepts.h> +#include <__iterator/iter_swap.h> +#include <__ranges/access.h> +#include <__ranges/concepts.h> +#include <__ranges/copyable_box.h> +#include <__ranges/empty.h> +#include <__ranges/view_interface.h> +#include + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +#pragma GCC system_header +#endif + +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + +_LIBCPP_BEGIN_NAMESPACE_STD + +#if !defined(_LIBCPP_HAS_NO_RANGES) + +namespace ranges { + +template +concept __transform_view_constraints = + view<_View> && is_object_v<_Fn> && + regular_invocable<_Fn&, range_reference_t<_View>> && + __referenceable>>; + +template + requires __transform_view_constraints<_View, _Fn> +class transform_view : public view_interface> { + template class __iterator; + template class __sentinel; + + [[no_unique_address]] __copyable_box<_Fn> __func_; + [[no_unique_address]] _View __base_ = _View(); + +public: + transform_view() + requires default_initializable<_View> && default_initializable<_Fn> = default; + + constexpr transform_view(_View __base, _Fn __func) + : __func_(_VSTD::in_place, _VSTD::move(__func)), __base_(_VSTD::move(__base)) {} + + constexpr _View base() const& requires copy_constructible<_View> { return __base_; } + constexpr _View base() && { return _VSTD::move(__base_); } + + constexpr __iterator begin() { + return __iterator{*this, ranges::begin(__base_)}; + } + constexpr __iterator begin() const + requires range && + regular_invocable> + { + return __iterator(*this, ranges::begin(__base_)); + } + + constexpr __sentinel end() { + return __sentinel(ranges::end(__base_)); + } + constexpr __iterator end() + requires common_range<_View> + { + return __iterator(*this, ranges::end(__base_)); + } + constexpr __sentinel end() const + requires range && + regular_invocable> + { + return __sentinel(ranges::end(__base_)); + } + constexpr __iterator end() const + requires common_range && + regular_invocable> + { + return __iterator(*this, ranges::end(__base_)); + } + + constexpr auto size() requires sized_range<_View> { return ranges::size(__base_); } + constexpr auto size() const requires sized_range { return ranges::size(__base_); } +}; + +// TODO: replace the decltype with all_t when that's implemented. +template +transform_view(_Range&&, _Fn) + -> transform_view())), _Fn>; + +template +struct __transform_view_iterator_concept { using type = input_iterator_tag; }; + +template +struct __transform_view_iterator_concept<_View> { using type = random_access_iterator_tag; }; + +template +struct __transform_view_iterator_concept<_View> { using type = bidirectional_iterator_tag; }; + +template +struct __transform_view_iterator_concept<_View> { using type = forward_iterator_tag; }; + +template +struct __transform_view_iterator_category_base {}; + +template +struct __transform_view_iterator_category_base<_View, _Fn> { + using _Cat = typename iterator_traits>::iterator_category; + + using iterator_category = conditional_t< + is_lvalue_reference_v>>, + conditional_t< + derived_from<_Cat, contiguous_iterator_tag>, + random_access_iterator_tag, + _Cat + >, + input_iterator_tag + >; +}; + +template + requires __transform_view_constraints<_View, _Fn> +template +class transform_view<_View, _Fn>::__iterator + : public __transform_view_iterator_category_base<_View, _Fn> { + + using _Parent = __maybe_const<_Const, transform_view>; + using _Base = __maybe_const<_Const, _View>; + + _Parent *__parent_ = nullptr; + + template + friend class transform_view<_View, _Fn>::__iterator; + + template + friend class transform_view<_View, _Fn>::__sentinel; + +public: + iterator_t<_Base> __current_ = iterator_t<_Base>(); + + using iterator_concept = typename __transform_view_iterator_concept<_View>::type; + using value_type = remove_cvref_t>>; + using difference_type = range_difference_t<_Base>; + + __iterator() requires default_initializable> = default; + + constexpr __iterator(_Parent& __parent, iterator_t<_Base> __current) + : __parent_(_VSTD::addressof(__parent)), __current_(_VSTD::move(__current)) {} + + // Note: `__i` should always be `__iterator`, but directly using + // `__iterator` is ill-formed when `_Const` is false + // (see http://wg21.link/class.copy.ctor#5). + constexpr __iterator(__iterator __i) + requires _Const && convertible_to, iterator_t<_Base>> + : __parent_(__i.__parent_), __current_(_VSTD::move(__i.__current_)) {} + + constexpr iterator_t<_Base> base() const& + requires copyable> + { + return __current_; + } + + constexpr iterator_t<_Base> base() && { + return _VSTD::move(__current_); + } + + constexpr decltype(auto) operator*() const + noexcept(noexcept(_VSTD::invoke(*__parent_->__func_, *__current_))) + { + return _VSTD::invoke(*__parent_->__func_, *__current_); + } + + constexpr __iterator& operator++() { + ++__current_; + return *this; + } + + constexpr void operator++(int) { ++__current_; } + + constexpr __iterator operator++(int) + requires forward_range<_Base> + { + auto __tmp = *this; + ++*this; + return __tmp; + } + + constexpr __iterator& operator--() + requires bidirectional_range<_Base> + { + --__current_; + return *this; + } + + constexpr __iterator operator--(int) + requires bidirectional_range<_Base> + { + auto __tmp = *this; + --*this; + return __tmp; + } + + constexpr __iterator& operator+=(difference_type __n) + requires random_access_range<_Base> + { + __current_ += __n; + return *this; + } + + constexpr __iterator& operator-=(difference_type __n) + requires random_access_range<_Base> + { + __current_ -= __n; + return *this; + } + + constexpr decltype(auto) operator[](difference_type __n) const + noexcept(noexcept(_VSTD::invoke(*__parent_->__func_, __current_[__n]))) + requires random_access_range<_Base> + { + return _VSTD::invoke(*__parent_->__func_, __current_[__n]); + } + + friend constexpr bool operator==(const __iterator& __x, const __iterator& __y) + requires equality_comparable> + { + return __x.__current_ == __y.__current_; + } + + friend constexpr bool operator<(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return __x.__current_ < __y.__current_; + } + + friend constexpr bool operator>(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return __x.__current_ > __y.__current_; + } + + friend constexpr bool operator<=(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return __x.__current_ <= __y.__current_; + } + + friend constexpr bool operator>=(const __iterator& __x, const __iterator& __y) + requires random_access_range<_Base> + { + return __x.__current_ >= __y.__current_; + } + +// TODO: Fix this as soon as soon as three_way_comparable is implemented. +// friend constexpr auto operator<=>(const __iterator& __x, const __iterator& __y) +// requires random_access_range<_Base> && three_way_comparable> +// { +// return __x.__current_ <=> __y.__current_; +// } + + friend constexpr __iterator operator+(__iterator __i, difference_type __n) + requires random_access_range<_Base> + { + return __iterator{*__i.__parent_, __i.__current_ + __n}; + } + + friend constexpr __iterator operator+(difference_type __n, __iterator __i) + requires random_access_range<_Base> + { + return __iterator{*__i.__parent_, __i.__current_ + __n}; + } + + friend constexpr __iterator operator-(__iterator __i, difference_type __n) + requires random_access_range<_Base> + { + return __iterator{*__i.__parent_, __i.__current_ - __n}; + } + + friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y) + requires sized_sentinel_for, iterator_t<_Base>> + { + return __x.__current_ - __y.__current_; + } + + friend constexpr decltype(auto) iter_move(const __iterator& __i) + noexcept(noexcept(*__i)) + { + if constexpr (is_lvalue_reference_v) + return _VSTD::move(*__i); + else + return *__i; + } +}; + +template + requires __transform_view_constraints<_View, _Fn> +template +class transform_view<_View, _Fn>::__sentinel { + using _Parent = __maybe_const<_Const, transform_view>; + using _Base = __maybe_const<_Const, _View>; + + sentinel_t<_Base> __end_ = sentinel_t<_Base>(); + + template + friend class transform_view<_View, _Fn>::__iterator; + + template + friend class transform_view<_View, _Fn>::__sentinel; + +public: + __sentinel() = default; + + constexpr explicit __sentinel(sentinel_t<_Base> __end_) : __end_(__end_) {} + + // Note: `__i` should always be `__sentinel`, but directly using + // `__sentinel` is ill-formed when `_Const` is false + // (see http://wg21.link/class.copy.ctor#5). + constexpr __sentinel(__sentinel __i) + requires _Const && convertible_to, sentinel_t<_Base>> + : __end_(_VSTD::move(__i.__end_)) {} + + constexpr sentinel_t<_Base> base() const { return __end_; } + + template + requires sentinel_for, iterator_t<__maybe_const<_OtherConst, _View>>> + friend constexpr bool operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) { + return __x.__current_ == __y.__end_; + } + + template + requires sized_sentinel_for, iterator_t<__maybe_const<_OtherConst, _View>>> + friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>> + operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) { + return __x.__current_ - __y.__end_; + } + + template + requires sized_sentinel_for, iterator_t<__maybe_const<_OtherConst, _View>>> + friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>> + operator-(const __sentinel& __x, const __iterator<_OtherConst>& __y) { + return __x.__end_ - __y.__current_; + } +}; + +} // namespace ranges + +#endif // !defined(_LIBCPP_HAS_NO_RANGES) + +_LIBCPP_END_NAMESPACE_STD + +_LIBCPP_POP_MACROS + +#endif // _LIBCPP___RANGES_TRANSFORM_VIEW_H diff --git a/libcxx/include/iterator b/libcxx/include/iterator --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -604,280 +604,4 @@ #pragma GCC system_header #endif -<<<<<<< HEAD -======= -_LIBCPP_BEGIN_NAMESPACE_STD - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -_Tp* -begin(_Tp (&__array)[_Np]) -{ - return __array; -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -_Tp* -end(_Tp (&__array)[_Np]) -{ - return __array + _Np; -} - -#if !defined(_LIBCPP_CXX03_LANG) - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto -begin(_Cp& __c) -> decltype(__c.begin()) -{ - return __c.begin(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto -begin(const _Cp& __c) -> decltype(__c.begin()) -{ - return __c.begin(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto -end(_Cp& __c) -> decltype(__c.end()) -{ - return __c.end(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto -end(const _Cp& __c) -> decltype(__c.end()) -{ - return __c.end(); -} - -#if _LIBCPP_STD_VER > 11 - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np]) -{ - return reverse_iterator<_Tp*>(__array + _Np); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np]) -{ - return reverse_iterator<_Tp*>(__array); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -reverse_iterator rbegin(initializer_list<_Ep> __il) -{ - return reverse_iterator(__il.end()); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -reverse_iterator rend(initializer_list<_Ep> __il) -{ - return reverse_iterator(__il.begin()); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -auto cbegin(const _Cp& __c) -> decltype(_VSTD::begin(__c)) -{ - return _VSTD::begin(__c); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -auto cend(const _Cp& __c) -> decltype(_VSTD::end(__c)) -{ - return _VSTD::end(__c); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto rbegin(_Cp& __c) -> decltype(__c.rbegin()) -{ - return __c.rbegin(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto rbegin(const _Cp& __c) -> decltype(__c.rbegin()) -{ - return __c.rbegin(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto rend(_Cp& __c) -> decltype(__c.rend()) -{ - return __c.rend(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto rend(const _Cp& __c) -> decltype(__c.rend()) -{ - return __c.rend(); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto crbegin(const _Cp& __c) -> decltype(_VSTD::rbegin(__c)) -{ - return _VSTD::rbegin(__c); -} - -template -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 -auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c)) -{ - return _VSTD::rend(__c); -} - -#endif - - -#else // defined(_LIBCPP_CXX03_LANG) - -template -_LIBCPP_INLINE_VISIBILITY -typename _Cp::iterator -begin(_Cp& __c) -{ - return __c.begin(); -} - -template -_LIBCPP_INLINE_VISIBILITY -typename _Cp::const_iterator -begin(const _Cp& __c) -{ - return __c.begin(); -} - -template -_LIBCPP_INLINE_VISIBILITY -typename _Cp::iterator -end(_Cp& __c) -{ - return __c.end(); -} - -template -_LIBCPP_INLINE_VISIBILITY -typename _Cp::const_iterator -end(const _Cp& __c) -{ - return __c.end(); -} - -#endif // !defined(_LIBCPP_CXX03_LANG) - -#if _LIBCPP_STD_VER > 14 - -// #if _LIBCPP_STD_VER > 11 -// template <> -// struct _LIBCPP_TEMPLATE_VIS plus -// { -// template -// _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY -// auto operator()(_T1&& __t, _T2&& __u) const -// _NOEXCEPT_(noexcept(_VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u))) -// -> decltype (_VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u)) -// { return _VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u); } -// typedef void is_transparent; -// }; -// #endif - -template -_LIBCPP_INLINE_VISIBILITY -constexpr auto size(const _Cont& __c) -_NOEXCEPT_(noexcept(__c.size())) --> decltype (__c.size()) -{ return __c.size(); } - -template -_LIBCPP_INLINE_VISIBILITY -constexpr size_t size(const _Tp (&)[_Sz]) noexcept { return _Sz; } - -#if _LIBCPP_STD_VER > 17 -template -_LIBCPP_INLINE_VISIBILITY -constexpr auto ssize(const _Cont& __c) -_NOEXCEPT_(noexcept(static_cast>>(__c.size()))) --> common_type_t> -{ return static_cast>>(__c.size()); } - -template -_LIBCPP_INLINE_VISIBILITY -constexpr ptrdiff_t ssize(const _Tp (&)[_Sz]) noexcept { return _Sz; } -#endif - -template -_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY -constexpr auto empty(const _Cont& __c) -_NOEXCEPT_(noexcept(__c.empty())) --> decltype (__c.empty()) -{ return __c.empty(); } - -template -_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY -constexpr bool empty(const _Tp (&)[_Sz]) noexcept { return false; } - -template -_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY -constexpr bool empty(initializer_list<_Ep> __il) noexcept { return __il.size() == 0; } - -template constexpr -_LIBCPP_INLINE_VISIBILITY -auto data(_Cont& __c) -_NOEXCEPT_(noexcept(__c.data())) --> decltype (__c.data()) -{ return __c.data(); } - -template constexpr -_LIBCPP_INLINE_VISIBILITY -auto data(const _Cont& __c) -_NOEXCEPT_(noexcept(__c.data())) --> decltype (__c.data()) -{ return __c.data(); } - -template -_LIBCPP_INLINE_VISIBILITY -constexpr _Tp* data(_Tp (&__array)[_Sz]) noexcept { return __array; } - -template -_LIBCPP_INLINE_VISIBILITY -constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept { return __il.begin(); } -#endif - -template -typename _Container::size_type -__libcpp_erase_if_container(_Container& __c, _Predicate& __pred) { - typename _Container::size_type __old_size = __c.size(); - - const typename _Container::iterator __last = __c.end(); - for (typename _Container::iterator __iter = __c.begin(); __iter != __last;) { - if (__pred(*__iter)) - __iter = __c.erase(__iter); - else - ++__iter; - } - - return __old_size - __c.size(); -} - -_LIBCPP_END_NAMESPACE_STD - ->>>>>>> f5b21ff9574c ([libcxx][nfc] Remove 's dependence on and related changes.) #endif // _LIBCPP_ITERATOR diff --git a/libcxx/include/ranges b/libcxx/include/ranges --- a/libcxx/include/ranges +++ b/libcxx/include/ranges @@ -101,6 +101,14 @@ template inline constexpr bool enable_borrowed_range> = enable_borrowed_range; + + // [range.transform], transform view + template + requires view && is_object_v && + regular_invocable> && + can-reference>> + class transform_view; + } */ @@ -118,6 +126,7 @@ #include <__ranges/ref_view.h> #include <__ranges/size.h> #include <__ranges/subrange.h> +#include <__ranges/transform_view.h> #include <__ranges/view_interface.h> #include // Required by the standard. #include // Required by the standard. diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -4474,6 +4474,11 @@ template using __make_const_lvalue_ref = const typename remove_reference<_Tp>::type&; +#if _LIBCPP_STD_VER > 17 +template +using __maybe_const = conditional_t<_Const, const _Tp, _Tp>; +#endif // _LIBCPP_STD_VER > 17 + _LIBCPP_END_NAMESPACE_STD #if _LIBCPP_STD_VER > 14 diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp @@ -0,0 +1,59 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// constexpr V base() const& requires copy_constructible +// constexpr V base() && + +#include + +#include "test_macros.h" +#include "types.h" + +constexpr bool test() { + { + std::ranges::transform_view transformView; + ContiguousView base = std::move(transformView).base(); + ASSERT_SAME_TYPE(ContiguousView, decltype(std::move(transformView).base())); + assert(std::ranges::begin(base) == globalBuff); + } + + { + std::ranges::transform_view transformView; + CopyableView base1 = transformView.base(); + ASSERT_SAME_TYPE(CopyableView, decltype(transformView.base())); + assert(std::ranges::begin(base1) == globalBuff); + + CopyableView base2 = std::move(transformView).base(); + ASSERT_SAME_TYPE(CopyableView, decltype(std::move(transformView).base())); + assert(std::ranges::begin(base2) == globalBuff); + } + + { + const std::ranges::transform_view transformView; + const CopyableView base1 = transformView.base(); + ASSERT_SAME_TYPE(CopyableView, decltype(transformView.base())); + assert(std::ranges::begin(base1) == globalBuff); + + const CopyableView base2 = std::move(transformView).base(); + ASSERT_SAME_TYPE(CopyableView, decltype(std::move(transformView).base())); + assert(std::ranges::begin(base2) == globalBuff); + } + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp @@ -0,0 +1,62 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// constexpr iterator begin(); +// constexpr iterator begin() const +// requires range && +// regular_invocable>; + +#include + +#include "test_macros.h" +#include "types.h" + +template +concept BeginInvocable = requires(T t) { t.begin(); }; + +constexpr bool test() { + int buff[8] = {0, 1, 2, 3, 4, 5, 6, 7}; + + { + std::ranges::transform_view transformView(ContiguousView{buff}, Increment{}); + assert(transformView.begin().base() == buff); + assert(*transformView.begin() == 1); + } + + { + std::ranges::transform_view transformView(ForwardView{buff}, Increment{}); + assert(transformView.begin().base().base() == buff); + assert(*transformView.begin() == 1); + } + + { + std::ranges::transform_view transformView(InputView{buff}, Increment{}); + assert(transformView.begin().base().base() == buff); + assert(*transformView.begin() == 1); + } + + { + const std::ranges::transform_view transformView(ContiguousView{buff}, IncrementConst{}); + assert(*transformView.begin() == 1); + } + + static_assert(!BeginInvocable>); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/ctad.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/ctad.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/ctad.compile.pass.cpp @@ -0,0 +1,25 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// CTAD tests. + +#include + +#include "test_macros.h" +#include "types.h" + +static_assert(std::same_as>); +static_assert(std::same_as(), Increment())), + std::ranges::transform_view, Increment>>); +static_assert(std::same_as, Increment>>); diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp @@ -0,0 +1,74 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// constexpr sentinel end(); +// constexpr iterator end() requires common_range; +// constexpr sentinel end() const +// requires range && +// regular_invocable>; +// constexpr iterator end() const +// requires common_range && +// regular_invocable>; + +#include + +#include "test_macros.h" +#include "types.h" + +template +concept EndInvocable = requires(T t) { t.end(); }; + +template +concept EndIsIter = requires(T t) { ++t.end(); }; + +constexpr bool test() { + { + std::ranges::transform_view transformView(ContiguousView{}, Increment{}); + assert(transformView.end().base() == globalBuff + 8); + } + + { + std::ranges::transform_view transformView(ForwardView{}, Increment{}); + assert(transformView.end().base().base() == globalBuff + 8); + } + + { + std::ranges::transform_view transformView(InputView{}, Increment{}); + assert(transformView.end().base() == globalBuff + 8); + } + + { + const std::ranges::transform_view transformView(ContiguousView{}, IncrementConst{}); + assert(transformView.end().base() == globalBuff + 8); + } + + static_assert(!EndInvocable>); + static_assert( EndInvocable< std::ranges::transform_view>); + static_assert( EndInvocable>); + static_assert(!EndInvocable>); + static_assert( EndInvocable< std::ranges::transform_view>); + static_assert( EndInvocable>); + + static_assert(!EndIsIter>); + static_assert(!EndIsIter< std::ranges::transform_view>); + static_assert( EndIsIter>); + static_assert( EndIsIter< std::ranges::transform_view>); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/general.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/general.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/general.pass.cpp @@ -0,0 +1,75 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// Some basic examples of how transform_view might be used in the wild. This is a general +// collection of sample algorithms and functions that try to mock general usage of +// this view. + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include "test_macros.h" +#include "test_iterators.h" +#include "types.h" + +template +auto toUpper(R range) { + return std::ranges::transform_view(range, [](char c) { return std::toupper(c); }); +} + +unsigned badRandom() { return 42; } + +template>> +auto withRandom(R&& range, Fn func = Fn()) { + return std::ranges::transform_view(range, std::bind_front(func, badRandom())); +} + +template> +auto joinArrays(E1 (&a)[N], E2 (&b)[N], Join join = Join()) { + return std::ranges::transform_view(a, [&a, &b, join](auto& x) { + auto idx = (&x) - a; + return join(x, b[idx]); + }); +} + +int main(int, char**) { + { + std::vector vec = {1, 2, 3, 4}; + auto sortOfRandom = withRandom(vec); + std::vector check = {43, 44, 45, 46}; + assert(std::equal(sortOfRandom.begin(), sortOfRandom.end(), check.begin(), check.end())); + } + + { + int a[4] = {1, 2, 3, 4}; + int b[4] = {4, 3, 2, 1}; + auto out = joinArrays(a, b); + int check[4] = {5, 5, 5, 5}; + assert(std::equal(out.begin(), out.end(), check)); + } + + { + std::string_view str = "Hello, World."; + auto upp = toUpper(str); + std::string_view check = "HELLO, WORLD."; + assert(std::equal(upp.begin(), upp.end(), check.begin(), check.end())); + } + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp @@ -0,0 +1,48 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::operator{++,--,+=,-=} + +#include + +#include "test_macros.h" +#include "../types.h" + +constexpr bool test() { + std::ranges::transform_view transformView; + auto iter = std::move(transformView).begin(); + assert((++iter).base() == globalBuff + 1); + + assert((iter++).base() == globalBuff + 1); + assert(iter.base() == globalBuff + 2); + + assert((--iter).base() == globalBuff + 1); + assert((iter--).base() == globalBuff + 1); + assert(iter.base() == globalBuff); + + // Check that decltype(InputIter++) == void. + ASSERT_SAME_TYPE(decltype( + std::declval>>()++), + void); + + assert((iter += 4).base() == globalBuff + 4); + assert((iter -= 3).base() == globalBuff + 1); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp @@ -0,0 +1,52 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::base + +#include + +#include "test_macros.h" +#include "../types.h" + +template +concept BaseInvocable = requires(std::ranges::iterator_t> iter) { + iter.base(); +}; + +constexpr bool test() { + { + std::ranges::transform_view transformView; + auto iter = std::move(transformView).begin(); + ASSERT_SAME_TYPE(int*, decltype(iter.base())); + assert(iter.base() == globalBuff); + ASSERT_SAME_TYPE(int*, decltype(std::move(iter).base())); + assert(std::move(iter).base() == globalBuff); + } + + { + std::ranges::transform_view transformView; + auto iter = transformView.begin(); + assert(std::move(iter).base() == globalBuff); + ASSERT_SAME_TYPE(cpp20_input_iterator, decltype(std::move(iter).base())); + } + + static_assert(!BaseInvocable); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp @@ -0,0 +1,67 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::operator{<,>,<=,>=} + +#include +#include + +#include "test_macros.h" +#include "../types.h" + +constexpr bool test() { + { + std::ranges::transform_view transformView1; + auto iter1 = std::move(transformView1).begin(); + std::ranges::transform_view transformView2; + auto iter2 = std::move(transformView2).begin(); + assert(iter1 == iter2); + assert(iter1 + 1 != iter2); + assert(iter1 + 1 == iter2 + 1); + + assert(iter1 < iter1 + 1); + assert(iter1 + 1 > iter1); + assert(iter1 <= iter1 + 1); + assert(iter1 <= iter2); + assert(iter1 + 1 >= iter2); + assert(iter1 >= iter2); + } + +// TODO: when three_way_comparable is implemented and std::is_eq is implemented, +// uncomment this. +// { +// std::ranges::transform_view transformView1; +// auto iter1 = transformView1.begin(); +// std::ranges::transform_view transformView2; +// auto iter2 = transformView2.begin(); +// +// assert(std::is_eq(iter1 <=> iter2)); +// assert(std::is_lteq(iter1 <=> iter2)); +// ++iter2; +// assert(std::is_neq(iter1 <=> iter2)); +// assert(std::is_lt(iter1 <=> iter2)); +// assert(std::is_gt(iter2 <=> iter1)); +// assert(std::is_gteq(iter2 <=> iter1)); +// +// static_assert( std::three_way_comparable>>); +// static_assert(!std::three_way_comparable>>); +// } + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/ctor.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/ctor.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/ctor.pass.cpp @@ -0,0 +1,79 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::transform_view::(); + +#include + +#include "test_macros.h" +#include "../types.h" + +struct NoDefaultInit { + typedef std::random_access_iterator_tag iterator_category; + typedef int value_type; + typedef std::ptrdiff_t difference_type; + typedef int* pointer; + typedef int& reference; + typedef NoDefaultInit self; + + NoDefaultInit(int*); + + reference operator*() const; + pointer operator->() const; + auto operator<=>(const self&) const = default; + bool operator==(int *) const; + + self& operator++(); + self operator++(int); + + self& operator--(); + self operator--(int); + + self& operator+=(difference_type n); + self operator+(difference_type n) const; + friend self operator+(difference_type n, self x); + + self& operator-=(difference_type n); + self operator-(difference_type n) const; + difference_type operator-(const self&) const; + + reference operator[](difference_type n) const; +}; + +struct IterNoDefaultInitView : std::ranges::view_base { + NoDefaultInit begin() const; + int *end() const; + NoDefaultInit begin(); + int *end(); +}; + +constexpr bool test() { + std::ranges::transform_view transformView; + auto iter = std::move(transformView).begin(); + std::ranges::iterator_t> i2(iter); + (void)i2; + std::ranges::iterator_t> constIter(iter); + (void)constIter; + + + static_assert( std::default_initializable>>); + static_assert(!std::default_initializable>>); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::operator* + +#include + +#include "test_macros.h" +#include "../types.h" + +int main(int, char**) { + int buff[8] = {0, 1, 2, 3, 4, 5, 6, 7}; + + { + std::ranges::transform_view transformView(ContiguousView{buff}, Increment{}); + assert(*transformView.begin() == 1); + } + + static_assert(!noexcept( + *std::declval>>())); + static_assert( noexcept( + *std::declval>>())); + + ASSERT_SAME_TYPE( + int, + decltype(*std::declval>().begin())); + ASSERT_SAME_TYPE( + int&, + decltype(*std::declval>().begin())); + ASSERT_SAME_TYPE( + int&&, + decltype(*std::declval>().begin())); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp @@ -0,0 +1,50 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::operator[] + +#include + +#include "test_macros.h" +#include "../types.h" + +constexpr bool test() { + int buff[8] = {0, 1, 2, 3, 4, 5, 6, 7}; + + { + std::ranges::transform_view transformView(ContiguousView{buff}, Increment{}); + auto iter = transformView.begin(); + static_assert(!noexcept(std::ranges::iter_move(iter))); + + assert(std::ranges::iter_move(iter) == 1); + assert(std::ranges::iter_move(iter + 2) == 3); + + ASSERT_SAME_TYPE(int, decltype(std::ranges::iter_move(iter))); + ASSERT_SAME_TYPE(int, decltype(std::ranges::iter_move(std::move(iter)))); + } + + { + static_assert( noexcept(std::ranges::iter_move( + std::declval>&>()))); + static_assert(!noexcept(std::ranges::iter_move( + std::declval>&>()))); + } + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp @@ -0,0 +1,41 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::operator{+,-} + +#include + +#include "test_macros.h" +#include "../types.h" + +constexpr bool test() { + std::ranges::transform_view transformView1; + auto iter1 = std::move(transformView1).begin(); + std::ranges::transform_view transformView2; + auto iter2 = std::move(transformView2).begin(); + iter1 += 4; + assert((iter1 + 1).base() == globalBuff + 5); + assert((1 + iter1).base() == globalBuff + 5); + assert((iter1 - 1).base() == globalBuff + 3); + assert(iter1 - iter2 == 4); + assert((iter1 + 2) - 2 == iter1); + assert((iter1 - 2) + 2 == iter1); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/requirements.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/requirements.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/requirements.compile.pass.cpp @@ -0,0 +1,24 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// The requirements for transform_view::'s members. + +#include + +#include "test_macros.h" +#include "../types.h" + +static_assert(std::ranges::bidirectional_range>); +static_assert(!std::ranges::bidirectional_range>); + +static_assert(std::ranges::random_access_range>); +static_assert(!std::ranges::random_access_range>); diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp @@ -0,0 +1,65 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// class transform_view::; + +#include + +#include "test_macros.h" +#include "../types.h" + +template +concept EndIsIter = requires(T t) { ++t.end(); }; + +constexpr bool test() { + std::ranges::transform_view transformView1; + // Going to const and back. + auto sent1 = transformView1.end(); + std::ranges::sentinel_t> sent2{sent1}; + std::ranges::sentinel_t> sent3{sent2}; + (void)sent3; + + static_assert(!EndIsIter); + static_assert(!EndIsIter); + assert(sent1.base() == globalBuff + 8); + + std::ranges::transform_view transformView2(SizedSentinelView{4}, IncrementConst()); + auto sent4 = transformView2.end(); + auto iter = transformView1.begin(); + { + assert(iter != sent1); + assert(iter != sent2); + assert(iter != sent4); + } + + { + assert(iter + 8 == sent1); + assert(iter + 8 == sent2); + assert(iter + 4 == sent4); + } + + { + assert(sent1 - iter == 8); + assert(sent4 - iter == 4); + assert(iter - sent1 == -8); + assert(iter - sent4 == -4); + } + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp @@ -0,0 +1,50 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::operator[] + +#include + +#include "test_macros.h" +#include "../types.h" + +constexpr bool test() { + int buff[8] = {0, 1, 2, 3, 4, 5, 6, 7}; + std::ranges::transform_view transformView1(ContiguousView{buff}, Increment{}); + auto iter1 = std::move(transformView1).begin() + 1; + assert(iter1[0] == 2); + assert(iter1[4] == 6); + + static_assert(!noexcept( + std::declval>>()[0])); + static_assert( noexcept( + std::declval>>()[0])); + + ASSERT_SAME_TYPE( + int, + decltype(std::declval>().begin()[0])); + ASSERT_SAME_TYPE( + int&, + decltype(std::declval>().begin()[0])); + ASSERT_SAME_TYPE( + int&&, + decltype(std::declval>().begin()[0])); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/types.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/types.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/types.pass.cpp @@ -0,0 +1,93 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// transform_view::::difference_type +// transform_view::::value_type +// transform_view::::iterator_category +// transform_view::::iterator_concept + +#include + +#include "test_macros.h" +#include "../types.h" + +template +concept HasIterCategory = requires { typename std::ranges::transform_view::iterator_category; }; + +constexpr bool test() { + { + // Member typedefs for contiguous iterator. + static_assert(std::same_as::iterator_concept, std::contiguous_iterator_tag>); + static_assert(std::same_as::iterator_category, std::random_access_iterator_tag>); + + using TView = std::ranges::transform_view; + using TIter = std::ranges::iterator_t; + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + } + { + // Member typedefs for random access iterator. + using TView = std::ranges::transform_view; + using TIter = std::ranges::iterator_t; + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + } + { + // Member typedefs for random access iterator/not-lvalue-ref. + using TView = std::ranges::transform_view; + using TIter = std::ranges::iterator_t; + static_assert(std::same_as); + static_assert(std::same_as); // Note: this is now input_iterator_tag. + static_assert(std::same_as); + static_assert(std::same_as); + } + { + // Member typedefs for bidirectional iterator. + using TView = std::ranges::transform_view; + using TIter = std::ranges::iterator_t; + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + } + { + // Member typedefs for forward iterator. + using TView = std::ranges::transform_view; + using TIter = std::ranges::iterator_t; + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + static_assert(std::same_as); + } + { + // Member typedefs for input iterator. + using TView = std::ranges::transform_view; + using TIter = std::ranges::iterator_t; + static_assert(std::same_as); + static_assert(!HasIterCategory); + static_assert(std::same_as); + static_assert(std::same_as); + } + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp @@ -0,0 +1,48 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// constexpr auto size() requires sized_range +// constexpr auto size() const requires sized_range + +#include + +#include "test_macros.h" +#include "types.h" + +template +concept SizeInvocable = requires(T t) { t.size(); }; + +constexpr bool test() { + { + std::ranges::transform_view transformView(ContiguousView{}, Increment{}); + assert(transformView.size() == 8); + } + + { + const std::ranges::transform_view transformView(ContiguousView{globalBuff, 4}, Increment{}); + assert(transformView.size() == 4); + } + + static_assert(!SizeInvocable>); + + static_assert(SizeInvocable>); + static_assert(!SizeInvocable>); + + return true; +} + +int main(int, char**) { + test(); + static_assert(test()); + + return 0; +} diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/types.h b/libcxx/test/std/ranges/range.adaptors/range.transform/types.h new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/types.h @@ -0,0 +1,155 @@ +#ifndef TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_TRANSFORM_TYPES_H +#define TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_TRANSFORM_TYPES_H + +#include "test_macros.h" +#include "test_iterators.h" +#include "test_range.h" + +int globalBuff[8] = {0,1,2,3,4,5,6,7}; + +template +concept ValidDropView = requires { typename std::ranges::transform_view; }; + +struct ContiguousView : std::ranges::view_base { + int start_; + int *ptr_; + constexpr ContiguousView(int* ptr = globalBuff, int start = 0) : start_(start), ptr_(ptr) {} + constexpr ContiguousView(ContiguousView&&) = default; + constexpr ContiguousView& operator=(ContiguousView&&) = default; + constexpr friend int* begin(ContiguousView& view) { return view.ptr_ + view.start_; } + constexpr friend int* begin(ContiguousView const& view) { return view.ptr_ + view.start_; } + constexpr friend int* end(ContiguousView& view) { return view.ptr_ + 8; } + constexpr friend int* end(ContiguousView const& view) { return view.ptr_ + 8; } +}; + +struct CopyableView : std::ranges::view_base { + int start_; + constexpr CopyableView(int start = 0) : start_(start) {} + constexpr CopyableView(CopyableView const&) = default; + constexpr CopyableView& operator=(CopyableView const&) = default; + constexpr friend int* begin(CopyableView& view) { return globalBuff + view.start_; } + constexpr friend int* begin(CopyableView const& view) { return globalBuff + view.start_; } + constexpr friend int* end(CopyableView&) { return globalBuff + 8; } + constexpr friend int* end(CopyableView const&) { return globalBuff + 8; } +}; + +using ForwardIter = forward_iterator; +struct ForwardView : std::ranges::view_base { + int *ptr_; + constexpr ForwardView(int* ptr = globalBuff) : ptr_(ptr) {} + constexpr ForwardView(ForwardView&&) = default; + constexpr ForwardView& operator=(ForwardView&&) = default; + constexpr friend ForwardIter begin(ForwardView& view) { return ForwardIter(view.ptr_); } + constexpr friend ForwardIter begin(ForwardView const& view) { return ForwardIter(view.ptr_); } + constexpr friend ForwardIter end(ForwardView& view) { return ForwardIter(view.ptr_ + 8); } + constexpr friend ForwardIter end(ForwardView const& view) { return ForwardIter(view.ptr_ + 8); } +}; + +using ForwardRange = test_common_range; + +using RandomAccessIter = random_access_iterator; +struct RandomAccessView : std::ranges::view_base { + RandomAccessIter begin() const noexcept; + RandomAccessIter end() const noexcept; + RandomAccessIter begin() noexcept; + RandomAccessIter end() noexcept; +}; + +using BidirectionalIter = bidirectional_iterator; +struct BidirectionalView : std::ranges::view_base { + BidirectionalIter begin() const; + BidirectionalIter end() const; + BidirectionalIter begin(); + BidirectionalIter end(); +}; + +struct BorrowableRange { + friend int* begin(BorrowableRange const& range); + friend int* end(BorrowableRange const&); + friend int* begin(BorrowableRange& range); + friend int* end(BorrowableRange&); +}; + +template<> +inline constexpr bool std::ranges::enable_borrowed_range = true; + +struct InputView : std::ranges::view_base { + int *ptr_; + constexpr InputView(int* ptr = globalBuff) : ptr_(ptr) {} + constexpr cpp20_input_iterator begin() const { return cpp20_input_iterator(ptr_); } + constexpr int* end() const { return ptr_ + 8; } + constexpr cpp20_input_iterator begin() { return cpp20_input_iterator(ptr_); } + constexpr int* end() { return ptr_ + 8; } +}; + +constexpr bool operator==(const cpp20_input_iterator &lhs, int* rhs) { return lhs.base() == rhs; } +constexpr bool operator==(int* lhs, const cpp20_input_iterator &rhs) { return rhs.base() == lhs; } + +struct SizedSentinelView : std::ranges::view_base { + int count_; + constexpr SizedSentinelView(int count = 8) : count_(count) {} + constexpr RandomAccessIter begin() const { return RandomAccessIter(globalBuff); } + constexpr int* end() const { return globalBuff + count_; } + constexpr RandomAccessIter begin() { return RandomAccessIter(globalBuff); } + constexpr int* end() { return globalBuff + count_; } +}; + +constexpr long operator- (const RandomAccessIter &lhs, int* rhs) { return lhs.base() - rhs; } +constexpr long operator- (int* lhs, const RandomAccessIter &rhs) { return lhs - rhs.base(); } +constexpr bool operator==(const RandomAccessIter &lhs, int* rhs) { return lhs.base() == rhs; } +constexpr bool operator==(int* lhs, const RandomAccessIter &rhs) { return rhs.base() == lhs; } + +struct SizedSentinelNotConstView : std::ranges::view_base { + ForwardIter begin() const; + int *end() const; + ForwardIter begin(); + int *end(); + size_t size(); +}; +bool operator==(const ForwardIter &lhs, int* rhs); +bool operator==(int* lhs, const ForwardIter &rhs); + +struct Range { + friend int* begin(Range const&); + friend int* end(Range const&); + friend int* begin(Range&); + friend int* end(Range&); +}; + +using CountedIter = stride_counting_iterator>; +struct CountedView : std::ranges::view_base { + constexpr CountedIter begin() { return CountedIter(ForwardIter(globalBuff)); } + constexpr CountedIter begin() const { return CountedIter(ForwardIter(globalBuff)); } + constexpr CountedIter end() { return CountedIter(ForwardIter(globalBuff + 8)); } + constexpr CountedIter end() const { return CountedIter(ForwardIter(globalBuff + 8)); } +}; + +using ThreeWayCompIter = three_way_contiguous_iterator; +struct ThreeWayCompView : std::ranges::view_base { + constexpr ThreeWayCompIter begin() { return ThreeWayCompIter(globalBuff); } + constexpr ThreeWayCompIter begin() const { return ThreeWayCompIter(globalBuff); } + constexpr ThreeWayCompIter end() { return ThreeWayCompIter(globalBuff + 8); } + constexpr ThreeWayCompIter end() const { return ThreeWayCompIter(globalBuff + 8); } +}; + +struct Increment { + constexpr int operator()(int x) { return x + 1; } +}; + +struct IncrementConst { + constexpr int operator()(int x) const { return x + 1; } +}; + +struct IncrementRef { + constexpr int& operator()(int& x) { return ++x; } +}; + +struct IncrementRvalueRef { + constexpr int&& operator()(int& x) { return std::move(++x); } +}; + +struct IncrementNoexcept { + constexpr int operator()(int x) noexcept { return x + 1; } +}; + +#endif // TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_TRANSFORM_TYPES_H diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h --- a/libcxx/test/support/test_iterators.h +++ b/libcxx/test/support/test_iterators.h @@ -875,6 +875,62 @@ I base_ = I(); }; +template +class three_way_contiguous_iterator +{ + static_assert(std::is_pointer_v, "Things probably break in this case"); + + It it_; + + template friend class three_way_contiguous_iterator; +public: + typedef std::contiguous_iterator_tag iterator_category; + typedef typename std::iterator_traits::value_type value_type; + typedef typename std::iterator_traits::difference_type difference_type; + typedef It pointer; + typedef typename std::iterator_traits::reference reference; + typedef typename std::remove_pointer::type element_type; + + TEST_CONSTEXPR_CXX14 It base() const {return it_;} + + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator() : it_() {} + explicit TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator(It it) : it_(it) {} + template + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator(const three_way_contiguous_iterator& u) : it_(u.it_) {} + + TEST_CONSTEXPR_CXX14 reference operator*() const {return *it_;} + TEST_CONSTEXPR_CXX14 pointer operator->() const {return it_;} + + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator& operator++() {++it_; return *this;} + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator operator++(int) + {three_way_contiguous_iterator tmp(*this); ++(*this); return tmp;} + + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator& operator--() {--it_; return *this;} + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator operator--(int) + {three_way_contiguous_iterator tmp(*this); --(*this); return tmp;} + + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator& operator+=(difference_type n) {it_ += n; return *this;} + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator operator+(difference_type n) const + {three_way_contiguous_iterator tmp(*this); tmp += n; return tmp;} + friend TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator operator+(difference_type n, three_way_contiguous_iterator x) + {x += n; return x;} + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator& operator-=(difference_type n) {return *this += -n;} + TEST_CONSTEXPR_CXX14 three_way_contiguous_iterator operator-(difference_type n) const + {three_way_contiguous_iterator tmp(*this); tmp -= n; return tmp;} + + TEST_CONSTEXPR_CXX14 reference operator[](difference_type n) const {return it_[n];} + + template + void operator,(T const &) DELETE_FUNCTION; + + friend TEST_CONSTEXPR_CXX14 + difference_type operator-(const three_way_contiguous_iterator& x, const three_way_contiguous_iterator& y) { + return x.base() - y.base(); + } + + friend auto operator<=>(const three_way_contiguous_iterator&, const three_way_contiguous_iterator&) = default; +}; + // clang-format on #endif // TEST_STD_VER > 17 && defined(__cpp_lib_concepts)