Fix #3666, plus some drive-by edits #3750
Closed
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
JohelEGP
reviewed
Feb 20, 2020
burblebee
added
lwg
JohelEGP
suggested changes
Mar 12, 2020
| template<view V, class Pred> | ||
| requires input_range<V> && is_object_v<Pred> && | ||
| indirect_unary_predicate<const Pred, iterator_t<V>> | ||
|
|
| template<view V, class Pred> | ||
| requires input_range<V> && is_object_v<Pred> && | ||
| indirect_unary_predicate<const Pred, iterator_t<V>> | ||
|
|
CaseyCarter
commented
Mar 12, 2020
| @@ -2270,7 +2272,8 @@ | |||
| \indexlibraryglobal{iota_view::iterator}% | |||
| \begin{codeblock} | |||
| namespace std::ranges { | |||
| template<class W, class Bound> | |||
| template<weakly_incrementable W, semiregular Bound> | |||
There was a problem hiding this comment.
Suggested change
| template<weakly_incrementable W, semiregular Bound> | |
| template<@\libconcept{weakly_incrementable}@ W, @\libconcept{semiregular}@ Bound> |
CaseyCarter
commented
Mar 12, 2020
| @@ -2640,7 +2643,8 @@ | |||
| \indexlibraryglobal{iota_view::sentinel}% | |||
| \begin{codeblock} | |||
| namespace std::ranges { | |||
| template<class W, class Bound> | |||
| template<weakly_incrementable W, semiregular Bound> | |||
There was a problem hiding this comment.
Suggested change
| template<weakly_incrementable W, semiregular Bound> | |
| template<@\libconcept{weakly_incrementable}@ W, @\libconcept{semiregular}@ Bound> |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+3230
to
+3231
| template<input_range V, indirect_unary_predicate<iterator_t<V>> Pred> | ||
| requires view<V> && is_object_v<Pred> |
There was a problem hiding this comment.
Suggested change
| template<input_range V, indirect_unary_predicate<iterator_t<V>> Pred> | |
| requires view<V> && is_object_v<Pred> | |
| template<@\libconcept{input_range}@ V, @\libconcept{indirect_unary_predicate}@<iterator_t<V>> Pred> | |
| requires @\libconcept{view}@<V> && is_object_v<Pred> |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+3481
to
+3482
| template<input_range V, indirect_unary_predicate<iterator_t<V>> Pred> | ||
| requires view<V> && is_object_v<Pred> |
There was a problem hiding this comment.
Suggested change
| template<input_range V, indirect_unary_predicate<iterator_t<V>> Pred> | |
| requires view<V> && is_object_v<Pred> | |
| template<@\libconcept{input_range}@ V, @\libconcept{indirect_unary_predicate}@<iterator_t<V>> Pred> | |
| requires @\libconcept{view}@<V> && is_object_v<Pred> |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+3715
to
+3717
| template<input_range V, copy_constructible F> | ||
| requires view<V> && is_object_v<F> && | ||
| regular_invocable<F&, range_reference_t<V>> |
There was a problem hiding this comment.
Suggested change
| template<input_range V, copy_constructible F> | |
| requires view<V> && is_object_v<F> && | |
| regular_invocable<F&, range_reference_t<V>> | |
| template<@\libconcept{input_range}@ V, @\libconcept{copy_constructible}@ F> | |
| requires @\libconcept{view}@<V> && is_object_v<F> && | |
| @\libconcept{regular_invocable}@<F&, range_reference_t<V>> |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+4120
to
+4122
| template<input_range V, copy_constructible F> | ||
| requires view<V> && is_object_v<F> && | ||
| regular_invocable<F&, range_reference_t<V>> |
There was a problem hiding this comment.
Suggested change
| template<input_range V, copy_constructible F> | |
| requires view<V> && is_object_v<F> && | |
| regular_invocable<F&, range_reference_t<V>> | |
| template<@\libconcept{input_range}@ V, @\libconcept{copy_constructible}@ F> | |
| requires @\libconcept{view}@<V> && is_object_v<F> && | |
| @\libconcept{regular_invocable}@<F&, range_reference_t<V>> |
CaseyCarter
commented
Mar 12, 2020
| @@ -4361,7 +4373,7 @@ | |||
| \indexlibraryglobal{take_view::sentinel}% | |||
| \begin{codeblock} | |||
| namespace std::ranges { | |||
| template<class V> | |||
| template<view V> | |||
There was a problem hiding this comment.
Suggested change
| template<view V> | |
| template<@\libconcept{view}@ V> |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+4547
to
+4549
| template<view V, class Pred> | ||
| requires input_range<V> && is_object_v<Pred> && | ||
| indirect_unary_predicate<const Pred, iterator_t<V>> |
There was a problem hiding this comment.
Suggested change
| template<view V, class Pred> | |
| requires input_range<V> && is_object_v<Pred> && | |
| indirect_unary_predicate<const Pred, iterator_t<V>> | |
| template<@\libconcept{view}@ V, class Pred> | |
| requires @\libconcept{input_range}@<V> && is_object_v<Pred> && | |
| @\libconcept{indirect_unary_predicate}@<const Pred, iterator_t<V>> |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+4982
to
+4985
| template<input_range V> | ||
| requires view<V> && input_range<range_reference_t<V>> && | ||
| (is_reference_v<range_reference_t<V>> || | ||
| view<range_value_t<V>>) |
There was a problem hiding this comment.
Suggested change
| template<input_range V> | |
| requires view<V> && input_range<range_reference_t<V>> && | |
| (is_reference_v<range_reference_t<V>> || | |
| view<range_value_t<V>>) | |
| template<@\libconcept{input_range}@ V> | |
| requires @\libconcept{view}@<V> && @\libconcept{input_range}@<range_reference_t<V>> && | |
| (is_reference_v<range_reference_t<V>> || | |
| @\libconcept{view}@<range_value_t<V>>) |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+5294
to
+5297
| template<input_range V> | ||
| requires view<V> && input_range<range_reference_t<V>> && | ||
| (is_reference_v<range_reference_t<V>> || | ||
| view<range_value_t<V>>) |
There was a problem hiding this comment.
Suggested change
| template<input_range V> | |
| requires view<V> && input_range<range_reference_t<V>> && | |
| (is_reference_v<range_reference_t<V>> || | |
| view<range_value_t<V>>) | |
| template<@\libconcept{input_range}@ V> | |
| requires @\libconcept{view}@<V> && @\libconcept{input_range}@<range_reference_t<V>> && | |
| (is_reference_v<range_reference_t<V>> || | |
| @\libconcept{view}@<range_value_t<V>>) |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+5489
to
+5492
| template<input_range V, forward_range Pattern> | ||
| requires view<V> && view<Pattern> && | ||
| indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | ||
| (forward_range<V> || @\exposconcept{tiny-range}@<Pattern>) |
There was a problem hiding this comment.
Suggested change
| template<input_range V, forward_range Pattern> | |
| requires view<V> && view<Pattern> && | |
| indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | |
| (forward_range<V> || @\exposconcept{tiny-range}@<Pattern>) | |
| template<input_range V, forward_range Pattern> | |
| requires @\libconcept{view}@<V> && @\libconcept{view}@<Pattern> && | |
| @\libconcept{indirectly_comparable}@<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | |
| (@\libconcept{forward_range}@<V> || @\exposconcept{tiny-range}@<Pattern>) |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+5650
to
+5653
| template<input_range V, forward_range Pattern> | ||
| requires view<V> && view<Pattern> && | ||
| indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | ||
| (forward_range<V> || @\exposconcept{tiny-range}@<Pattern>) |
There was a problem hiding this comment.
Suggested change
| template<input_range V, forward_range Pattern> | |
| requires view<V> && view<Pattern> && | |
| indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | |
| (forward_range<V> || @\exposconcept{tiny-range}@<Pattern>) | |
| template<input_range V, forward_range Pattern> | |
| requires @\libconcept{view}@<V> && @\libconcept{view}@<Pattern> && | |
| @\libconcept{indirectly_comparable}@<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | |
| (@\libconcept{forward_range}@<V> || @\exposconcept{tiny-range}@<Pattern>) |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+5718
to
+5721
| template<input_range V, forward_range Pattern> | ||
| requires view<V> && view<Pattern> && | ||
| indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | ||
| (forward_range<V> || @\exposconcept{tiny-range}@<Pattern>) |
There was a problem hiding this comment.
Suggested change
| template<input_range V, forward_range Pattern> | |
| requires view<V> && view<Pattern> && | |
| indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | |
| (forward_range<V> || @\exposconcept{tiny-range}@<Pattern>) | |
| template<input_range V, forward_range Pattern> | |
| requires @\libconcept{view}@<V> && @\libconcept{view}@<Pattern> && | |
| @\libconcept{indirectly_comparable}@<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> && | |
| (@\libconcept{forward_range}@<V> || @\exposconcept{tiny-range}@<Pattern>) |
|
Manually rebased (and basically recreated from scratch, since the template-heads have changed substantially) and merged in ac3fcee. |
CaseyCarter
commented
Mar 12, 2020
Comment on lines
+6327
to
+6329
| template<input_range V, size_t N> | ||
| requires view<V> && @\placeholder{has-tuple-element}@<range_value_t<V>, N> && | ||
| @\placeholder{has-tuple-element}@<remove_reference_t<range_reference_t<V>>, N> |
There was a problem hiding this comment.
Suggested change
| template<input_range V, size_t N> | |
| requires view<V> && @\placeholder{has-tuple-element}@<range_value_t<V>, N> && | |
| @\placeholder{has-tuple-element}@<remove_reference_t<range_reference_t<V>>, N> | |
| template<@\libconcept{input_range}@ V, size_t N> | |
| requires @\libconcept{view}@<V> && @\exposconcept{has-tuple-element}@<range_value_t<V>, N> && | |
| @\exposconcept{has-tuple-element}@<remove_reference_t<range_reference_t<V>>, N> |
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.
See the three commit logs.
Note that the change to
basic_istream_view::iteratoruses the namedefault_initializableinstead ofdefault_constructiblein anticipation of LWG motion 2.