[ranges] Mark exposition-only names as kebab-case. #3559
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jensmaurer
force-pushed
the
c16
branch
2 times, most recently
from
06e7cff
to
b9ba19c
Compare
|
I'm still preparing a review. |
JohelEGP
reviewed
Dec 16, 2019
| noexcept(noexcept(ranges::iter_move(i.@\exposid{current_}@))); | ||
| friend constexpr void iter_swap(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y) | ||
| noexcept(noexcept(ranges::iter_swap(x.@\exposid{current_}@, y.@\exposid{current_}@))) | ||
| requires indirectly_swappable<@\exposid{iterator}@_t<V>>; |
There was a problem hiding this comment.
Suggested change
| requires indirectly_swappable<@\exposid{iterator}@_t<V>>; | |
| requires indirectly_swappable<iterator_t<V>>; |
| \end{itemdecl} | ||
|
|
||
| \begin{itemdescr} | ||
| \pnum | ||
| \effects | ||
| Initializes \tcode{end_} with \tcode{ranges::end(parent.base_)}. | ||
| Initializes \exposid{end_} with \tcode{ranges::end(\exposid{parent_}.\exposid{base_})}. |
There was a problem hiding this comment.
Suggested change
| Initializes \exposid{end_} with \tcode{ranges::end(\exposid{parent_}.\exposid{base_})}. | |
| Initializes \exposid{end_} with \tcode{ranges::end(parent.\exposid{base_})}. |
| requires Const && convertible_to<iterator_t<V>, iterator_t<Base>>; | ||
| @\exposid{iterator}@() = default; | ||
| constexpr @\exposid{iterator}@(@\exposid{Parent}@& parent, iterator_t<@\exposid{Base}@> current); | ||
| constexpr @\exposid{iterator}@(iterator<!Const> i) |
There was a problem hiding this comment.
Suggested change
| constexpr @\exposid{iterator}@(iterator<!Const> i) | |
| constexpr @\exposid{iterator}@(@\exposid{iterator}<!Const> i) |
| using CI = counted_iterator<iterator_t<Base>>; // \expos | ||
| sentinel_t<Base> end_ = sentinel_t<Base>(); // \expos | ||
| using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos | ||
| using CI = counted_iterator<iterator_t<@\exposid{Base}@>>; // \expos |
There was a problem hiding this comment.
Suggested change
| using CI = counted_iterator<iterator_t<@\exposid{Base}@>>; // \expos | |
| using @\exposid{CI}@ = counted_iterator<iterator_t<@\exposid{Base}@>>; // \expos |
| V base_; // \expos | ||
| @\placeholder{semiregular-box}@<Pred> pred_; @\itcorr[-1]@ // \expos | ||
| V @\exposid{base_}@; // \expos | ||
| @\placeholder{semiregular-box}@<Pred> @\exposid{pred_}@; @\itcorr[-1]@ // \expos |
There was a problem hiding this comment.
Is @\itcorr[-1]@ still correct here? I assume it was put there to change how the italicized semiregular-box looks, and I'm wondering if it accidentally affects how pred_ looks.
There is one other such occurrence in this PR.
There was a problem hiding this comment.
This is trying to align the comment that follows with the other comments in the surroundings. This is still substantially broken, but likely benefits from a more holistic approach. Not now.
|
|
||
| \pnum | ||
| \effects | ||
| Equivalent to: | ||
| \begin{codeblock} | ||
| *parent_->stream >> parent_->object_; | ||
| *@\exposid{parent_}@->stream >> @\exposid{parent_}@->@\exposid{object_}@; |
There was a problem hiding this comment.
Suggested change
| *@\exposid{parent_}@->stream >> @\exposid{parent_}@->@\exposid{object_}@; | |
| *@\exposid{parent_}@->@\exposid{stream_}@ >> @\exposid{parent_}@->@\exposid{object_}@; |
| return *this; | ||
| \end{codeblock} | ||
| \item Otherwise, | ||
| \begin{codeblock} | ||
| ranges::advance(begin_, n, end_); | ||
| ranges::advance(begin_, n, @\exposid{end_}@); |
There was a problem hiding this comment.
Suggested change
| ranges::advance(begin_, n, @\exposid{end_}@); | |
| ranges::advance(@\exposid{begin_}@, n, @\exposid{end_}@); |
| \begin{codeblock} | ||
| auto d = n - ranges::advance(begin_, n, end_); | ||
| auto d = n - ranges::advance(begin_, n, @\exposid{end_}@); |
There was a problem hiding this comment.
Suggested change
| auto d = n - ranges::advance(begin_, n, @\exposid{end_}@); | |
| auto d = n - ranges::advance(\exposid{begin_}, n, @\exposid{end_}@); |
|
|
||
| friend constexpr bool operator==(const CI& y, const sentinel& x); | ||
| friend constexpr bool operator==(const CI& y, const @\exposid{sentinel}@& x); |
There was a problem hiding this comment.
Suggested change
| friend constexpr bool operator==(const CI& y, const @\exposid{sentinel}@& x); | |
| friend constexpr bool operator==(const @\exposid{CI}@& y, const @\exposid{sentinel}@& x); |
| \end{itemdescr} | ||
|
|
||
| \indexlibrarymember{operator==}{take_view::sentinel}% | ||
| \begin{itemdecl} | ||
| friend constexpr bool operator==(const CI& y, const sentinel& x); | ||
| friend constexpr bool operator==(const CI& y, const @\exposid{sentinel}@& x); |
There was a problem hiding this comment.
Suggested change
| friend constexpr bool operator==(const CI& y, const @\exposid{sentinel}@& x); | |
| friend constexpr bool operator==(const @\exposid{CI}@& y, const @\exposid{sentinel}@& x); |
JohelEGP
reviewed
Dec 16, 2019
|
Fixes are in #3562. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3097.