Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[libc++] Implement views::join_with #65536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huixie90 merged 56 commits into from
Jun 21, 2025
Merged

[libc++] Implement views::join_with #65536

Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
698bdd6
[libc++] Implement `views::join_with`
JMazurkiewicz Feb 2, 2024
b631ccd
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Nov 21, 2024
2370857
Add `[[nodiscard]]` to private functions
JMazurkiewicz Nov 21, 2024
b4afb2c
Add third template argument in `__join_with_view_iterator_category`
JMazurkiewicz Nov 21, 2024
7523023
Add missing <includes>
JMazurkiewicz Nov 27, 2024
5714983
Clang 17 is no longer supported
JMazurkiewicz Nov 27, 2024
6778426
Implement LWG-4074
JMazurkiewicz Nov 27, 2024
3a73fac
Usa `[[no_unique_address]]` in `join_with_view::sentinel`
JMazurkiewicz Nov 27, 2024
f6f603d
Cleanup `[[no_unique_address]]` tests
JMazurkiewicz Nov 28, 2024
e55c077
Test when result of `operator*` is type different from `range_referen…
JMazurkiewicz Nov 28, 2024
5a3996a
Various cleanups
JMazurkiewicz Nov 28, 2024
8b3e36c
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Dec 16, 2024
ee942ce
Fix formatting
JMazurkiewicz Dec 16, 2024
56d8850
Fix `example.pass.cpp` test
JMazurkiewicz Dec 16, 2024
15efa6f
Fix `19.rst` file
JMazurkiewicz Dec 16, 2024
f267d76
Enable `iterator/no_unique_address.compile.pass.cpp` test for MSVC
JMazurkiewicz Dec 16, 2024
3ad462c
Fix formatting (again)
JMazurkiewicz Dec 16, 2024
fb5ab01
Remove empty `test_end` function
JMazurkiewicz Jan 9, 2025
4ab1ee2
Test explicitness of default constructor of `join_with_view`
JMazurkiewicz Jan 9, 2025
bf1eeac
Test explicitness of `join_with_view::iterator(iterator<!Const>)` con…
JMazurkiewicz Jan 9, 2025
3771be9
Test explicitness of default constructor of `join_with_view::iterator`
JMazurkiewicz Jan 9, 2025
04942c0
Parametrise `test_pre_increment` on `ref-is-glvalue` being `true` or …
JMazurkiewicz Jan 9, 2025
42ce9c2
Add extra test for `iter_move` (make sure it calls underlying `iter_m…
JMazurkiewicz Jan 9, 2025
21896e9
Remove GCC workaround from `increment.pass.cpp`
JMazurkiewicz Jan 9, 2025
19e4fa2
Add extra test for `iter_swap` (make sure it calls underlying `iter_s…
JMazurkiewicz Jan 9, 2025
14471bc
Make sure `CIter` and `Iter` are different types (`ctor.not_const.pas…
JMazurkiewicz Jan 9, 2025
52ad025
Make sure `CIter` and `Iter` are different types (`eq.pass.cpp`)
JMazurkiewicz Jan 9, 2025
d52bdbf
Make sure `CSent` and `Sent` are different types (`ctor.not_const.pas…
JMazurkiewicz Jan 9, 2025
96eae0b
Make sure `CSent` and `Sent` are different types (`eq.pass.cpp`)
JMazurkiewicz Jan 9, 2025
0dc76bb
Add missing `<array>` include in `iter_swap.pass.cpp`
JMazurkiewicz Jan 13, 2025
9760ec3
Fix `sentinel::operator==`
JMazurkiewicz Jan 13, 2025
8ebaa0c
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Jan 16, 2025
d9d0033
Fix formatting
JMazurkiewicz Jan 16, 2025
d3c014f
Clarify some comments in `test_post_increment`
JMazurkiewicz Jan 17, 2025
abe8ab9
Use `_LIBCPP_NODEBUG` attribute
JMazurkiewicz Jan 28, 2025
4972ccc
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Jan 28, 2025
4601812
[NFC] Use `// REQUIRES: std-at-least-c++23`
JMazurkiewicz Jan 28, 2025
9847c22
More `_LIBCPP_NODEBUG`
JMazurkiewicz Jan 28, 2025
6a4a0a4
Fix unstable ABI tests
JMazurkiewicz Jan 30, 2025
dfe5543
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Jan 30, 2025
60264b0
Target LLVM 21
JMazurkiewicz Jan 30, 2025
36861f1
Trigger CI due to GitHub "incident"
JMazurkiewicz Jan 30, 2025
966b3bb
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Feb 8, 2025
3d54775
Add links to GitHub in `21.rst`
JMazurkiewicz Mar 18, 2025
10fdb29
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Mar 18, 2025
30d02a1
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Mar 31, 2025
6950e48
Don't use `std::is_trivial` (deprecated in C++26)
JMazurkiewicz Apr 14, 2025
41b935b
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Apr 14, 2025
a0420dc
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz May 8, 2025
95ea7bc
`is_reference_v<range_reference_t<_Base>>` => `is_reference_v<_InnerB…
JMazurkiewicz May 15, 2025
8ab29fb
`[[__nodiscard__]]` => `[[nodiscard]]`
JMazurkiewicz May 15, 2025
7198928
Add static member function in `__sentinel` to access priavate member …
JMazurkiewicz May 15, 2025
6cb18ac
Fix `iter_swap.pass.cpp` (friendship issues)
JMazurkiewicz May 15, 2025
37525db
Add `static_cast<bool>` in `end.pass.cpp` to avoid truncation warning…
JMazurkiewicz May 15, 2025
de46d63
Update synopsis in `<ranges>` (LWG-4074)
JMazurkiewicz May 20, 2025
fa9e257
Merge remote-tracking branch 'upstream/main' into libcxx/ranges/join_…
JMazurkiewicz Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use _LIBCPP_NODEBUG attribute
  • Loading branch information
@JMazurkiewicz
JMazurkiewicz committed Jan 28, 2025
commit abe8ab9274dfdebe84a7e2f331d76e30e6de57c4
28 changes: 15 additions & 13 deletions libcxx/include/__ranges/join_with_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,18 @@ template <input_range _View, forward_range _Pattern>
requires view<_View> && input_range<range_reference_t<_View>> && view<_Pattern> &&
__concatable<range_reference_t<_View>, _Pattern>
class join_with_view : public view_interface<join_with_view<_View, _Pattern>> {
using _InnerRng = range_reference_t<_View>;
using _InnerRng _LIBCPP_NODEBUG = range_reference_t<_View>;

_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();

static constexpr bool _UseOuterItCache = !forward_range<_View>;
using _OuterItCache = _If<_UseOuterItCache, __non_propagating_cache<iterator_t<_View>>, __empty_cache>;
using _OuterItCache _LIBCPP_NODEBUG =
_If<_UseOuterItCache, __non_propagating_cache<iterator_t<_View>>, __empty_cache>;
_LIBCPP_NO_UNIQUE_ADDRESS _OuterItCache __outer_it_;
Comment thread
huixie90 marked this conversation as resolved.

static constexpr bool _UseInnerCache = !is_reference_v<_InnerRng>;
using _InnerCache = _If<_UseInnerCache, __non_propagating_cache<remove_cvref_t<_InnerRng>>, __empty_cache>;
using _InnerCache _LIBCPP_NODEBUG =
_If<_UseInnerCache, __non_propagating_cache<remove_cvref_t<_InnerRng>>, __empty_cache>;
_LIBCPP_NO_UNIQUE_ADDRESS _InnerCache __inner_;
Comment thread
huixie90 marked this conversation as resolved.

_LIBCPP_NO_UNIQUE_ADDRESS _Pattern __pattern_ = _Pattern();
Expand Down Expand Up @@ -190,14 +192,14 @@ struct join_with_view<_View, _Pattern>::__iterator
private:
friend join_with_view;

using _Parent = __maybe_const<_Const, join_with_view>;
using _Base = __maybe_const<_Const, _View>;
using _InnerBase = range_reference_t<_Base>;
using _PatternBase = __maybe_const<_Const, _Pattern>;
using _Parent _LIBCPP_NODEBUG = __maybe_const<_Const, join_with_view>;
using _Base _LIBCPP_NODEBUG = __maybe_const<_Const, _View>;
using _InnerBase _LIBCPP_NODEBUG = range_reference_t<_Base>;
using _PatternBase _LIBCPP_NODEBUG = __maybe_const<_Const, _Pattern>;

using _OuterIter = iterator_t<_Base>;
using _InnerIter = iterator_t<_InnerBase>;
using _PatternIter = iterator_t<_PatternBase>;
using _OuterIter _LIBCPP_NODEBUG = iterator_t<_Base>;
using _InnerIter _LIBCPP_NODEBUG = iterator_t<_InnerBase>;
using _PatternIter _LIBCPP_NODEBUG = iterator_t<_PatternBase>;

static_assert(!_Const || forward_range<_Base>, "Const can only be true when Base models forward_range.");

Expand All @@ -206,7 +208,7 @@ struct join_with_view<_View, _Pattern>::__iterator
_Parent* __parent_ = nullptr;

static constexpr bool _OuterIterPresent = forward_range<_Base>;
using _OuterIterType = _If<_OuterIterPresent, _OuterIter, std::__empty>;
using _OuterIterType _LIBCPP_NODEBUG = _If<_OuterIterPresent, _OuterIter, std::__empty>;
_LIBCPP_NO_UNIQUE_ADDRESS _OuterIterType __outer_it_ = _OuterIterType();
Comment thread
huixie90 marked this conversation as resolved.

variant<_PatternIter, _InnerIter> __inner_it_;
Copy link
Copy Markdown
Member

@huixie90 huixie90 Sep 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happens if the variant is in the valueless_by_exception state? is it worth adding assertions in the member functions we are not in that state?

Copy link
Copy Markdown
Contributor

@frederick-vs-ja frederick-vs-ja Sep 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per current standard wording, some operations are required to throw bad_variant_access. It's unclear whether this is intended, and LWG4059 intends to make such operations UB when valueless_by_exception.

Expand Down Expand Up @@ -397,8 +399,8 @@ struct join_with_view<_View, _Pattern>::__sentinel {
private:
friend join_with_view;

using _Parent = __maybe_const<_Const, join_with_view>;
using _Base = __maybe_const<_Const, _View>;
using _Parent _LIBCPP_NODEBUG = __maybe_const<_Const, join_with_view>;
using _Base _LIBCPP_NODEBUG = __maybe_const<_Const, _View>;

_LIBCPP_NO_UNIQUE_ADDRESS sentinel_t<_Base> __end_ = sentinel_t<_Base>();

Expand Down