libstdc++: Add feature-test macros for implemented C++23 views [PR108260]

PR libstdc++/108260

libstdc++-v3/ChangeLog:

	* include/bits/utility.h (__cpp_lib_ranges_zip): Define for C++23.
	* include/std/ranges (__cpp_lib_ranges_zip): Likewise.
	(__cpp_lib_ranges_chunk): Likewise.
	(__cpp_lib_ranges_slide): Likewise.
	(__cpp_lib_ranges_chunk_by): Likewise.
	(__cpp_lib_ranges_join_with): Likewise.
	(__cpp_lib_ranges_repeat): Likewise.
	(__cpp_lib_ranges_stride): Likewise.
	(__cpp_lib_ranges_cartesian_product): Likewise.
	(__cpp_lib_ranges_as_rvalue): Likewise.
	* include/std/version: Ditto.
	* testsuite/20_util/tuple/p2321r2.cc: Verify value of
	feature-test macro.
	* testsuite/std/ranges/adaptors/as_rvalue/1.cc: Likewise.
	* testsuite/std/ranges/adaptors/chunk/1.cc: Likewise.
	* testsuite/std/ranges/adaptors/chunk_by/1.cc: Likewise.
	* testsuite/std/ranges/adaptors/join_with/1.cc: Likewise.
	* testsuite/std/ranges/adaptors/slide/1.cc: Likewise.
	* testsuite/std/ranges/adaptors/stride/1.cc: Likewise.
	* testsuite/std/ranges/cartesian_product/1.cc: Likewise.
	* testsuite/std/ranges/repeat/1.cc: Likewise.
	* testsuite/std/ranges/zip/1.cc: Likewise.
	* testsuite/std/ranges/version_c++23.cc: New test.
This commit is contained in:
Patrick Palka 2023-01-06 10:32:10 -05:00
parent 553332c19a
commit f7bd48c6bb
14 changed files with 116 additions and 0 deletions

View file

@ -263,6 +263,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ using type = _Tp1; };
#endif
#if __cplusplus > 202002L
#define __cpp_lib_ranges_zip 202110L // for <tuple> and <utility>
#endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace

View file

@ -4364,6 +4364,9 @@ namespace views::__adaptor
} // namespace views
#if __cplusplus > 202002L
#define __cpp_lib_ranges_zip 202110L
namespace __detail
{
template<typename... _Rs>
@ -5802,6 +5805,8 @@ namespace views::__adaptor
inline constexpr auto pairwise_transform = adjacent_transform<2>;
}
#define __cpp_lib_ranges_chunk 202202L
namespace __detail
{
template<typename _Tp>
@ -6339,6 +6344,8 @@ namespace views::__adaptor
inline constexpr _Chunk chunk;
}
#define __cpp_lib_ranges_slide 202202L
namespace __detail
{
template<typename _Vp>
@ -6702,6 +6709,8 @@ namespace views::__adaptor
inline constexpr _Slide slide;
}
#define __cpp_lib_ranges_chunk_by 202202L
template<forward_range _Vp,
indirect_binary_predicate<iterator_t<_Vp>, iterator_t<_Vp>> _Pred>
requires view<_Vp> && is_object_v<_Pred>
@ -6895,6 +6904,8 @@ namespace views::__adaptor
inline constexpr _ChunkBy chunk_by;
}
#define __cpp_lib_ranges_join_with 202202L
namespace __detail
{
template<typename _Range, typename _Pattern>
@ -7375,6 +7386,8 @@ namespace views::__adaptor
inline constexpr _JoinWith join_with;
} // namespace views
#define __cpp_lib_ranges_repeat 202207L
template<copy_constructible _Tp, semiregular _Bound = unreachable_sentinel_t>
requires (is_object_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>>
&& (__detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t>))
@ -7626,6 +7639,8 @@ namespace views::__adaptor
}
}
#define __cpp_lib_ranges_stride 202207L
template<input_range _Vp>
requires view<_Vp>
class stride_view : public view_interface<stride_view<_Vp>>
@ -7977,6 +7992,8 @@ namespace views::__adaptor
inline constexpr _Stride stride;
}
#define __cpp_lib_ranges_cartesian_product 202207L
namespace __detail
{
template<bool _Const, typename _First, typename... _Vs>
@ -8487,6 +8504,8 @@ namespace views::__adaptor
inline constexpr _CartesianProduct cartesian_product;
}
#define __cpp_lib_ranges_as_rvalue 202207L
template<input_range _Vp>
requires view<_Vp>
class as_rvalue_view : public view_interface<as_rvalue_view<_Vp>>

View file

@ -319,6 +319,15 @@
#define __cpp_lib_reference_from_temporary 202202L
#define __cpp_lib_to_underlying 202102L
#define __cpp_lib_unreachable 202202L
#define __cpp_lib_ranges_zip 202110L
#define __cpp_lib_ranges_chunk 202202L
#define __cpp_lib_ranges_slide 202202L
#define __cpp_lib_ranges_chunk_by 202202L
#define __cpp_lib_ranges_join_with 202202L
#define __cpp_lib_ranges_repeat 202207L
#define __cpp_lib_ranges_stride 202207L
#define __cpp_lib_ranges_cartesian_product 202207L
#define __cpp_lib_ranges_as_rvalue 202207L
#if _GLIBCXX_HOSTED
#define __cpp_lib_adaptor_iterator_pair_constructor 202106L

View file

@ -8,6 +8,10 @@
#include <memory>
#include <testsuite_hooks.h>
#if __cpp_lib_ranges_zip != 202110L
# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in <tuple>"
#endif
using std::tuple;
using std::pair;
using std::allocator;

View file

@ -7,6 +7,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_as_rvalue != 202207L
# error "Feature-test macro __cpp_lib_ranges_as_rvalue has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -7,6 +7,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_chunk != 202202L
# error "Feature-test macro __cpp_lib_ranges_chunk has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -7,6 +7,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_chunk_by != 202202L
# error "Feature-test macro __cpp_lib_ranges_chunk_by has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -7,6 +7,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_join_with != 202202L
# error "Feature-test macro __cpp_lib_ranges_join_with has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;
using namespace std::literals;

View file

@ -7,6 +7,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_slide != 202202L
# error "Feature-test macro __cpp_lib_ranges_slide has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -6,6 +6,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_stride != 202207L
# error "Feature-test macro __cpp_lib_ranges_stride has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -6,6 +6,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_cartesian_product != 202207L
# error "Feature-test macro __cpp_lib_ranges_cartesian_product has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -5,6 +5,10 @@
#include <algorithm>
#include <testsuite_hooks.h>
#if __cpp_lib_ranges_repeat != 202207L
# error "Feature-test macro __cpp_lib_ranges_repeat has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;

View file

@ -0,0 +1,44 @@
// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
#include <version>
#if __cpp_lib_ranges != 202110L
# error "Feature-test macro __cpp_lib_ranges has wrong value in <version>"
#endif
#if __cpp_lib_ranges_zip != 202110L
# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in <version>"
#endif
#if __cpp_lib_ranges_chunk != 202202L
# error "Feature-test macro __cpp_lib_ranges_chunk has wrong value in <version>"
#endif
#if __cpp_lib_ranges_slide != 202202L
# error "Feature-test macro __cpp_lib_ranges_slide has wrong value in <version>"
#endif
#if __cpp_lib_ranges_chunk_by != 202202L
# error "Feature-test macro __cpp_lib_ranges_chunk_by has wrong value in <version>"
#endif
#if __cpp_lib_ranges_join_with != 202202L
# error "Feature-test macro __cpp_lib_ranges_join_with has wrong value in <version>"
#endif
#if __cpp_lib_ranges_repeat != 202207L
# error "Feature-test macro __cpp_lib_ranges_repeat has wrong value in <version>"
#endif
#if __cpp_lib_ranges_stride != 202207L
# error "Feature-test macro __cpp_lib_ranges_stride has wrong value in <version>"
#endif
#if __cpp_lib_ranges_cartesian_product != 202207L
# error "Feature-test macro __cpp_lib_ranges_cartesian_product has wrong value in <version>"
#endif
#if __cpp_lib_ranges_as_rvalue != 202207L
# error "Feature-test macro __cpp_lib_ranges_as_rvalue has wrong value in <version>"
#endif

View file

@ -8,6 +8,10 @@
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#if __cpp_lib_ranges_zip != 202110L
# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in <ranges>"
#endif
namespace ranges = std::ranges;
namespace views = std::views;