[range.join.iterator, range.join.with.iterator] Add InnerBase and replace more OuterIter/InnerIter
#5478
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
…eplace more `OuterIter/InnerIter`
JohelEGP
suggested changes
May 19, 2022
source/ranges.tex
Outdated
| @@ -5809,11 +5810,11 @@ | |||
| \begin{itemize} | |||
| \item If \exposid{ref-is-glvalue} is \tcode{true}, | |||
| \exposid{Base} models \libconcept{bidirectional_range}, and | |||
| \tcode{range_reference_t<\exposid{Base}>} models | |||
| both \libconcept{bidirectional_range} and \libconcept{common_range}, | |||
| \tcode{\exposid{InnerBase}} models | |||
There was a problem hiding this comment.
Suggested change
| \tcode{\exposid{InnerBase}} models | |
| \exposid{InnerBase} models |
source/ranges.tex
Outdated
| then \tcode{iterator_concept} denotes \tcode{bidirectio\-nal_iterator_tag}. | ||
| \item Otherwise, if \exposid{ref-is-glvalue} is \tcode{true} and | ||
| \exposid{Base} and \tcode{range_reference_t<\exposid{Base}>} | ||
| \exposid{Base} and \tcode{\exposid{InnerBase}} |
There was a problem hiding this comment.
Suggested change
| \exposid{Base} and \tcode{\exposid{InnerBase}} | |
| \exposid{Base} and \exposid{InnerBase} |
source/ranges.tex
Outdated
| @@ -5741,11 +5741,12 @@ | |||
| private: | |||
| using @\exposidnc{Parent}@ = @\exposidnc{maybe-const}@<Const, join_view>; // \expos | |||
| using @\exposidnc{Base}@ = @\exposidnc{maybe-const}@<Const, V>; // \expos | |||
| using @\exposidnc{InnerBase}@ = range_reference_t<@\exposid{Base}@>; // \expos | |||
There was a problem hiding this comment.
Suggested change
| using @\exposidnc{InnerBase}@ = range_reference_t<@\exposid{Base}@>; // \expos | |
| using @\exposidnc{InnerBase}@ = range_reference_t<@\exposidnc{Base}@>; // \expos |
Not really necessary, but consistent, I guess.
source/ranges.tex
Outdated
| \tcode{range_reference_t<\exposid{Base}>} models | ||
| both \libconcept{bidirectional_range} and \libconcept{common_range}, | ||
| \tcode{\exposid{InnerBase}} models | ||
| both \libconcept{bidire\-ctional_range} and \libconcept{common_range}, |
There was a problem hiding this comment.
It this the correct place to break? Shouldn't it be after the "c"?
There was a problem hiding this comment.
Yep, the check will fail if after "c".
There was a problem hiding this comment.
We don't violate English hyphenation rules. Try breaking even earlier.
source/ranges.tex
Outdated
| @@ -5823,18 +5824,18 @@ | |||
| The member \grammarterm{typedef-name} \tcode{iterator_category} is defined | |||
| if and only if \exposid{ref-is-glvalue} is \tcode{true}, | |||
| \exposid{Base} models \libconcept{forward_range}, and | |||
| \tcode{range_reference_t<\exposid{Base}>} models \libconcept{forward_range}. | |||
| \tcode{\exposid{InnerBase}} models \libconcept{forward_range}. | |||
There was a problem hiding this comment.
Suggested change
| \tcode{\exposid{InnerBase}} models \libconcept{forward_range}. | |
| \exposid{InnerBase} models \libconcept{forward_range}. |
source/ranges.tex
Outdated
| \item If | ||
| \placeholder{OUTERC} and \placeholder{INNERC} each model | ||
| \tcode{\libconcept{derived_from}<bidirectional_iterator_tag>} and | ||
| \tcode{range_reference_t<\exposid{Base}>} models \libconcept{common_range}, | ||
| \tcode{\exposid{InnerBase}} models \libconcept{common_range}, |
There was a problem hiding this comment.
Suggested change
| \tcode{\exposid{InnerBase}} models \libconcept{common_range}, | |
| \exposid{InnerBase} models \libconcept{common_range}, |
|
It looks fine for me now, thanks for the review. |
wg21bot
added
the
needs rebase
|
@hewillk This PR needs some attention. |
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.
This is basically a follow-up to #5474, which mainly does three things
InnerBaseforjoin_view::iteratorto be consistent withjoin_with_view::iterator.InnerIter/OuterIterforjoin_view::iterator.OuterIterforjoin_with_view::iteratorand corrected the italics forBaseinusing InnerBase = range_reference_t<Base>;.Hope there are no errors.