From 270082a7e126f727437c99ab8403185e9f29244c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 14 Nov 2019 16:53:18 +0000 Subject: [PATCH] libstdc++: Implement new predicate concepts from P1716R3 * include/bits/iterator_concepts.h (__iter_concept_impl): Add comments. (indirect_relation): Rename to indirect_binary_predicate and adjust definition as per P1716R3. (indirect_equivalence_relation): Define. (indirectly_comparable): Adjust definition. * include/std/concepts (equivalence_relation): Define. * testsuite/std/concepts/concepts.callable/relation.cc: Add tests for equivalence_relation. From-SVN: r278256 --- libstdc++-v3/ChangeLog | 10 +++++ libstdc++-v3/include/bits/iterator_concepts.h | 41 ++++++++++++++----- libstdc++-v3/include/std/concepts | 14 ++++--- .../concepts/concepts.callable/relation.cc | 5 +++ 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 75f4eeb992d..3714e74bb23 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,15 @@ 2019-11-14 Jonathan Wakely + * include/bits/iterator_concepts.h (__iter_concept_impl): Add + comments. + (indirect_relation): Rename to indirect_binary_predicate and adjust + definition as per P1716R3. + (indirect_equivalence_relation): Define. + (indirectly_comparable): Adjust definition. + * include/std/concepts (equivalence_relation): Define. + * testsuite/std/concepts/concepts.callable/relation.cc: Add tests for + equivalence_relation. + * include/bits/iterator_concepts.h (disable_sized_sentinel): Rename to disable_sized_sentinel_for. * testsuite/24_iterators/headers/iterator/synopsis_c++20.cc: Adjust. diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index 7cc058eb8c9..90a8bc8071f 100644 --- a/libstdc++-v3/include/bits/iterator_concepts.h +++ b/libstdc++-v3/include/bits/iterator_concepts.h @@ -420,20 +420,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { template - struct __iter_concept_impl - { }; + struct __iter_concept_impl; + // ITER_CONCEPT(I) is ITER_TRAITS(I)::iterator_concept if that is valid. template requires requires { typename __iter_traits<_Iter>::iterator_concept; } struct __iter_concept_impl<_Iter> { using type = typename __iter_traits<_Iter>::iterator_concept; }; + // Otherwise, ITER_TRAITS(I)::iterator_category if that is valid. template requires (!requires { typename __iter_traits<_Iter>::iterator_concept; } && requires { typename __iter_traits<_Iter>::iterator_category; }) struct __iter_concept_impl<_Iter> { using type = typename __iter_traits<_Iter>::iterator_category; }; + // Otherwise, random_access_tag if iterator_traits is not specialized. template requires (!requires { typename __iter_traits<_Iter>::iterator_concept; } && !requires { typename __iter_traits<_Iter>::iterator_category; } @@ -441,7 +443,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __iter_concept_impl<_Iter> { using type = random_access_iterator_tag; }; - // ITER_TRAITS + // Otherwise, there is no ITER_CONCEPT(I) type. + template + struct __iter_concept_impl + { }; + + // ITER_CONCEPT template using __iter_concept = typename __iter_concept_impl<_Iter>::type; } // namespace __detail @@ -615,15 +622,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && predicate<_Fn&, iter_reference_t<_Iter>> && predicate<_Fn&, iter_common_reference_t<_Iter>>; + template + concept indirect_binary_predicate = readable<_I1> && readable<_I2> + && copy_constructible<_Fn> + && predicate<_Fn&, iter_value_t<_I1>&, iter_value_t<_I2>&> + && predicate<_Fn&, iter_value_t<_I1>&, iter_reference_t<_I2>> + && predicate<_Fn&, iter_reference_t<_I1>, iter_value_t<_I2>&> + && predicate<_Fn&, iter_reference_t<_I1>, iter_reference_t<_I2>> + && predicate<_Fn&, iter_common_reference_t<_I1>, + iter_common_reference_t<_I2>>; + template - concept indirect_relation = readable<_I1> && readable<_I2> + concept indirect_equivalence_relation = readable<_I1> && readable<_I2> && copy_constructible<_Fn> - && relation<_Fn&, iter_value_t<_I1>&, iter_value_t<_I2>&> - && relation<_Fn&, iter_value_t<_I1>&, iter_reference_t<_I2>> - && relation<_Fn&, iter_reference_t<_I1>, iter_value_t<_I2>&> - && relation<_Fn&, iter_reference_t<_I1>, iter_reference_t<_I2>> - && relation<_Fn&, iter_common_reference_t<_I1>, - iter_common_reference_t<_I2>>; + && equivalence_relation<_Fn&, iter_value_t<_I1>&, iter_value_t<_I2>&> + && equivalence_relation<_Fn&, iter_value_t<_I1>&, iter_reference_t<_I2>> + && equivalence_relation<_Fn&, iter_reference_t<_I1>, iter_value_t<_I2>&> + && equivalence_relation<_Fn&, iter_reference_t<_I1>, + iter_reference_t<_I2>> + && equivalence_relation<_Fn&, iter_common_reference_t<_I1>, + iter_common_reference_t<_I2>>; template concept indirect_strict_weak_order = readable<_I1> && readable<_I2> @@ -767,7 +785,8 @@ namespace ranges template concept indirectly_comparable - = indirect_relation<_Rel, projected<_I1, _P1>, projected<_I2, _P2>>; + = indirect_binary_predicate<_Rel, projected<_I1, _P1>, + projected<_I2, _P2>>; /// [alg.req.permutable], concept `permutable` template diff --git a/libstdc++-v3/include/std/concepts b/libstdc++-v3/include/std/concepts index c4acfd2e212..e6d405a1bee 100644 --- a/libstdc++-v3/include/std/concepts +++ b/libstdc++-v3/include/std/concepts @@ -334,26 +334,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [concepts.callable], callable concepts - // [concept.invocable], concept invocable + /// [concept.invocable], concept invocable template concept invocable = is_invocable_v<_Fn, _Args...>; - // [concept.regularinvocable], concept regular_invocable + /// [concept.regularinvocable], concept regular_invocable template concept regular_invocable = invocable<_Fn, _Args...>; - // [concept.predicate], concept predicate + /// [concept.predicate], concept predicate template concept predicate = regular_invocable<_Fn, _Args...> && boolean>; - // [concept.relation], concept relation + /// [concept.relation], concept relation template concept relation = predicate<_Rel, _Tp, _Tp> && predicate<_Rel, _Up, _Up> && predicate<_Rel, _Tp, _Up> && predicate<_Rel, _Up, _Tp>; - // [concept.strictweakorder], concept strict_weak_order + /// [concept.equiv], concept equivalence_relation + template + concept equivalence_relation = relation<_Rel, _Tp, _Up>; + + /// [concept.strictweakorder], concept strict_weak_order template concept strict_weak_order = relation<_Rel, _Tp, _Up>; diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc b/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc index 783c3ab9c4a..73ff54bbb6d 100644 --- a/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc +++ b/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc @@ -46,3 +46,8 @@ struct F static_assert( ! std::relation ); static_assert( std::relation ); static_assert( std::relation ); + +// [concept.equiv] +static_assert( std::equivalence_relation ); +static_assert( ! std::equivalence_relation ); +static_assert( std::equivalence_relation ); -- 2.30.2