From f7bd48c6bbd3d7a479943b248b973aaf6c59463b Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Fri, 6 Jan 2023 10:32:10 -0500 Subject: [PATCH] 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. --- libstdc++-v3/include/bits/utility.h | 4 ++ libstdc++-v3/include/std/ranges | 19 ++++++++ libstdc++-v3/include/std/version | 9 ++++ .../testsuite/20_util/tuple/p2321r2.cc | 4 ++ .../std/ranges/adaptors/as_rvalue/1.cc | 4 ++ .../testsuite/std/ranges/adaptors/chunk/1.cc | 4 ++ .../std/ranges/adaptors/chunk_by/1.cc | 4 ++ .../std/ranges/adaptors/join_with/1.cc | 4 ++ .../testsuite/std/ranges/adaptors/slide/1.cc | 4 ++ .../testsuite/std/ranges/adaptors/stride/1.cc | 4 ++ .../std/ranges/cartesian_product/1.cc | 4 ++ libstdc++-v3/testsuite/std/ranges/repeat/1.cc | 4 ++ .../testsuite/std/ranges/version_c++23.cc | 44 +++++++++++++++++++ libstdc++-v3/testsuite/std/ranges/zip/1.cc | 4 ++ 14 files changed, 116 insertions(+) create mode 100644 libstdc++-v3/testsuite/std/ranges/version_c++23.cc diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h index 6a192e278366..fac6c7dc3bd1 100644 --- a/libstdc++-v3/include/bits/utility.h +++ b/libstdc++-v3/include/bits/utility.h @@ -263,6 +263,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { using type = _Tp1; }; #endif +#if __cplusplus > 202002L +#define __cpp_lib_ranges_zip 202110L // for and +#endif + _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index ba544e116e14..dce7867e9774 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -4364,6 +4364,9 @@ namespace views::__adaptor } // namespace views #if __cplusplus > 202002L + +#define __cpp_lib_ranges_zip 202110L + namespace __detail { template @@ -5802,6 +5805,8 @@ namespace views::__adaptor inline constexpr auto pairwise_transform = adjacent_transform<2>; } +#define __cpp_lib_ranges_chunk 202202L + namespace __detail { template @@ -6339,6 +6344,8 @@ namespace views::__adaptor inline constexpr _Chunk chunk; } +#define __cpp_lib_ranges_slide 202202L + namespace __detail { template @@ -6702,6 +6709,8 @@ namespace views::__adaptor inline constexpr _Slide slide; } +#define __cpp_lib_ranges_chunk_by 202202L + template, 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 @@ -7375,6 +7386,8 @@ namespace views::__adaptor inline constexpr _JoinWith join_with; } // namespace views +#define __cpp_lib_ranges_repeat 202207L + template 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 requires view<_Vp> class stride_view : public view_interface> @@ -7977,6 +7992,8 @@ namespace views::__adaptor inline constexpr _Stride stride; } +#define __cpp_lib_ranges_cartesian_product 202207L + namespace __detail { template @@ -8487,6 +8504,8 @@ namespace views::__adaptor inline constexpr _CartesianProduct cartesian_product; } +#define __cpp_lib_ranges_as_rvalue 202207L + template requires view<_Vp> class as_rvalue_view : public view_interface> diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index c1a9896b0c22..5730357793dd 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -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 diff --git a/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc b/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc index 04ac27358eb3..ceed38b16ec8 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc @@ -8,6 +8,10 @@ #include #include +#if __cpp_lib_ranges_zip != 202110L +# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in " +#endif + using std::tuple; using std::pair; using std::allocator; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc index 8ca4f50e9d25..fbf0d6513660 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc @@ -7,6 +7,10 @@ #include #include +#if __cpp_lib_ranges_as_rvalue != 202207L +# error "Feature-test macro __cpp_lib_ranges_as_rvalue has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc index 125c88ef853d..18b934f99ee4 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc @@ -7,6 +7,10 @@ #include #include +#if __cpp_lib_ranges_chunk != 202202L +# error "Feature-test macro __cpp_lib_ranges_chunk has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc index d57b127fbc8d..cba6fad6f9a8 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc @@ -7,6 +7,10 @@ #include #include +#if __cpp_lib_ranges_chunk_by != 202202L +# error "Feature-test macro __cpp_lib_ranges_chunk_by has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc index 8b9c6c4fc9f9..15127c0715f9 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc @@ -7,6 +7,10 @@ #include #include +#if __cpp_lib_ranges_join_with != 202202L +# error "Feature-test macro __cpp_lib_ranges_join_with has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; using namespace std::literals; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc index 985604208105..8c015c1162b5 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc @@ -7,6 +7,10 @@ #include #include +#if __cpp_lib_ranges_slide != 202202L +# error "Feature-test macro __cpp_lib_ranges_slide has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc index 37ae896014a5..92aca35e83f0 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc @@ -6,6 +6,10 @@ #include #include +#if __cpp_lib_ranges_stride != 202207L +# error "Feature-test macro __cpp_lib_ranges_stride has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc index d6e4b538b20b..1ec4422e6f3a 100644 --- a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc @@ -6,6 +6,10 @@ #include #include +#if __cpp_lib_ranges_cartesian_product != 202207L +# error "Feature-test macro __cpp_lib_ranges_cartesian_product has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc index f9817c99600a..2f3ad4522a40 100644 --- a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc @@ -5,6 +5,10 @@ #include #include +#if __cpp_lib_ranges_repeat != 202207L +# error "Feature-test macro __cpp_lib_ranges_repeat has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc new file mode 100644 index 000000000000..d9ea9eca6c77 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc @@ -0,0 +1,44 @@ +// { dg-options "-std=gnu++23" } +// { dg-do preprocess { target c++23 } } + +#include + +#if __cpp_lib_ranges != 202110L +# error "Feature-test macro __cpp_lib_ranges has wrong value in " +#endif + +#if __cpp_lib_ranges_zip != 202110L +# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in " +#endif + +#if __cpp_lib_ranges_chunk != 202202L +# error "Feature-test macro __cpp_lib_ranges_chunk has wrong value in " +#endif + +#if __cpp_lib_ranges_slide != 202202L +# error "Feature-test macro __cpp_lib_ranges_slide has wrong value in " +#endif + +#if __cpp_lib_ranges_chunk_by != 202202L +# error "Feature-test macro __cpp_lib_ranges_chunk_by has wrong value in " +#endif + +#if __cpp_lib_ranges_join_with != 202202L +# error "Feature-test macro __cpp_lib_ranges_join_with has wrong value in " +#endif + +#if __cpp_lib_ranges_repeat != 202207L +# error "Feature-test macro __cpp_lib_ranges_repeat has wrong value in " +#endif + +#if __cpp_lib_ranges_stride != 202207L +# error "Feature-test macro __cpp_lib_ranges_stride has wrong value in " +#endif + +#if __cpp_lib_ranges_cartesian_product != 202207L +# error "Feature-test macro __cpp_lib_ranges_cartesian_product has wrong value in " +#endif + +#if __cpp_lib_ranges_as_rvalue != 202207L +# error "Feature-test macro __cpp_lib_ranges_as_rvalue has wrong value in " +#endif diff --git a/libstdc++-v3/testsuite/std/ranges/zip/1.cc b/libstdc++-v3/testsuite/std/ranges/zip/1.cc index e9e40fb15eb7..8ca386d65632 100644 --- a/libstdc++-v3/testsuite/std/ranges/zip/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/zip/1.cc @@ -8,6 +8,10 @@ #include #include +#if __cpp_lib_ranges_zip != 202110L +# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in " +#endif + namespace ranges = std::ranges; namespace views = std::views; -- 2.47.2