public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-854] libstdc++: Fix miscellaneous issues with elements_view::_Sentinel [PR100631]
@ 2021-05-18 4:35 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2021-05-18 4:35 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:2e2eef80ac0c21f9533e6791ccf5e29458cbb77c
commit r12-854-g2e2eef80ac0c21f9533e6791ccf5e29458cbb77c
Author: Patrick Palka <ppalka@redhat.com>
Date: Tue May 18 00:26:07 2021 -0400
libstdc++: Fix miscellaneous issues with elements_view::_Sentinel [PR100631]
libstdc++-v3/ChangeLog:
PR libstdc++/100631
* include/std/ranges (elements_view::_Iterator): Also befriend
_Sentinel<!_Const>.
(elements_view::_Sentinel::_M_equal): Templatize.
(elements_view::_Sentinel::_M_distance_from): Split out from ...
(elements_view::_Sentinel::operator-): ... here. Depend on
_Base2 instead of _Base in the return type.
* testsuite/std/ranges/adaptors/elements.cc (test06, test07):
New tests.
Diff:
---
libstdc++-v3/include/std/ranges | 18 ++++++++-----
.../testsuite/std/ranges/adaptors/elements.cc | 31 ++++++++++++++++++++++
2 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 48100e9d7f2..36bccd6b33b 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -3634,16 +3634,22 @@ namespace views::__adaptor
requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
{ return __x._M_current - __y._M_current; }
- friend _Sentinel<_Const>;
+ template <bool> friend struct _Sentinel;
};
template<bool _Const>
struct _Sentinel
{
private:
- constexpr bool
- _M_equal(const _Iterator<_Const>& __x) const
- { return __x._M_current == _M_end; }
+ template<bool _Const2>
+ constexpr bool
+ _M_equal(const _Iterator<_Const2>& __x) const
+ { return __x._M_current == _M_end; }
+
+ template<bool _Const2>
+ constexpr auto
+ _M_distance_from(const _Iterator<_Const2>& __i) const
+ { return _M_end - __i._M_current; }
using _Base = elements_view::_Base<_Const>;
sentinel_t<_Base> _M_end = sentinel_t<_Base>();
@@ -3684,9 +3690,9 @@ namespace views::__adaptor
template<bool _Const2,
typename _Base2 = __detail::__maybe_const_t<_Const2, _Vp>>
requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<_Base2>>
- friend constexpr range_difference_t<_Base>
+ friend constexpr range_difference_t<_Base2>
operator-(const _Sentinel& __x, const _Iterator<_Const2>& __y)
- { return __x._M_end - __y._M_current; }
+ { return __x._M_distance_from(__y); }
friend _Sentinel<!_Const>;
};
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc
index 134afd6a873..c6839e38ce5 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc
@@ -115,6 +115,35 @@ test05()
VERIFY( r2[0] == 1 && r2[1] == 3 );
}
+void
+test06()
+{
+ // PR libstdc++/100631
+ auto r = views::iota(0)
+ | views::filter([](int){ return true; })
+ | views::take(42)
+ | views::reverse
+ | views::transform([](int) { return std::make_pair(42, "hello"); })
+ | views::take(42)
+ | views::keys;
+ auto b = r.begin();
+ auto e = r.end();
+ e - b;
+}
+
+void
+test07()
+{
+ // PR libstdc++/100631 comment #2
+ auto r = views::iota(0)
+ | views::transform([](int) { return std::make_pair(42, "hello"); })
+ | views::keys;
+ auto b = ranges::cbegin(r);
+ auto e = ranges::end(r);
+ b.base() == e.base();
+ b == e;
+}
+
int
main()
{
@@ -123,4 +152,6 @@ main()
test03();
test04();
test05();
+ test06();
+ test07();
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-18 4:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-18 4:35 [gcc r12-854] libstdc++: Fix miscellaneous issues with elements_view::_Sentinel [PR100631] Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).