P1206R7 Conversions From Ranges To Containers #2806

CaseyCarter · 2022-06-20T22:03:37Z

<ranges>: Implement ranges::to, guarded by __cpp_lib_ranges_to_container.

The following are all guarded by __cpp_lib_containers_ranges:
<xmemory>: Generalize _Uninitialized_copy to iterator+sentinel ranges; add _Uninitialized_copy_n for counted ranges. Implement from_range_t, from_range, and exposition-only helper concepts / type aliases.
<xutility>: Promote _Get_final_iterator_unwrapped here from <algorithm>. Add _Copy_memmove_n (_Copy_n_unchecked), similar to _Copy_memmove (resp. _Copy_unchecked) but for counted ranges. Generalize _Iter_copy_cat to _Sent_copy_cat.
<memory>: Use _Copy_memmove_n (see <xutility>) as appropriate.

<yvals_core.h>: _HAS_CXX23 controls P1206R7, define __cpp_lib_containers_ranges and __cpp_lib_ranges_to_container.

<deque>: Implement from_range_t constructor(s) and corresponding deduction guide(s), prepend_range, append_range, assign_range, and insert_range.
<forward_list>: Implement from_range_t constructor(s) and corresponding deduction guide(s), prepend_range, assign_range, and insert_range_after.
<list>: Implement from_range_t constructor(s) and corresponding deduction guide(s), prepend_range, append_range, assign_range, and insert_range.
<map> and <set>: For both map, multimap, set, and multiset, implement from_range_t constructor(s) and corresponding deduction guide(s). (Inherit insert_range from _Tree.)
<queue>: For both queue and priority_queue, implement from_range_t constructor(s) and corresponding deduction guide(s), and push_range. (I've speculatively implemented priority_queue::push_range by calling append_range on the container per the resolution I've proposed for an LWG issue I submitted specifically to allow implementation via append_range.)
<stack>: Implement from_range_t constructor(s) and corresponding deduction guide(s), and push_range.
<unordered_map> and <unordered_set>: For both unordered_map, unordered_multimap, unordered_set, and unordered_multiset, implement from_range_t constructor(s) and corresponding deduction guide(s). (Inherit insert_range from _Hash.)
<vector>: For both vector and vector<bool>, implement from_range_t constructor(s) and corresponding deduction guide(s), append_range, assign_range, and insert_range.
<xstring>: For both basic_string, implement from_range_t constructor(s) and corresponding deduction guide(s), append_range, assign_range, insert_range, and replace_with_range.

Test both new feature-test macros in tests/std/tests/VSO_0157762_feature_test_macros.
Test all new deduction guides in tests/std/tests/P0433R2_deduction_guides.
Test _Copy_n_unchecked in tests/std/tests/P0784R7_library_machinery.
Add new tP1206R7_{container}_{operation} "range algorithm"-style tests for each new container (or container adapter) member function.
Add new P1206R7_from_range test for from_range and from_range_t.
Add new P1206R7_ranges_to test for ranges::to.

Fixes #2532.

`<ranges>`: Implement `ranges::to`, guarded by `__cpp_lib_ranges_to_container`. The following are all guarded by `__cpp_lib_containers_ranges`: `<xmemory>`: Generalize `_Uninitialized_copy` to iterator+sentinel ranges; add `_Uninitialized_copy_n` for counted ranges. Implement `from_range_t`, `from_range`, and exposition-only helper concepts / type aliases. `<xutility>`: Promote `_Get_final_iterator_unwrapped` here from `<algorithm>`. Add `_Copy_memmove_n` (`_Copy_n_unchecked`), similar to `_Copy_memmove` (resp. `_Copy_unchecked`) but for counted ranges. Generalize `_Iter_copy_cat` to `_Sent_copy_cat`. `<memory>`: Use `_Copy_memmove_n` (see `<xutility>`) as appropriate. `<yvals_core.h>`: `_HAS_CXX23` controls P1206R7, define `__cpp_lib_containers_ranges` and `__cpp_lib_ranges_to_container`. `<deque>`: Implement `from_range_t` constructor(s) and corresponding deduction guide(s), `prepend_range`, `append_range`, `assign_range`, and `insert_range`. `<forward_list>`: Implement `from_range_t` constructor(s) and corresponding deduction guide(s), `prepend_range`, `assign_range`, and `insert_range_after`. `<list>`: Implement `from_range_t` constructor(s) and corresponding deduction guide(s), `prepend_range`, `append_range`, `assign_range`, and `insert_range`. `<map>` and `<set>`: For both `map`, `multimap`, `set`, and `multiset`, implement `from_range_t` constructor(s) and corresponding deduction guide(s). (Inherit `insert_range` from `_Tree`.) `<queue>`: For both `queue` and `priority_queue`, implement `from_range_t` constructor(s) and corresponding deduction guide(s), and `push_range`. (I've speculatively implemented `priority_queue::push_range` by calling `append_range` on the container per the resolution I've proposed for an LWG issue I submitted specifically to allow implementation via `append_range`.) `<stack>`: Implement `from_range_t` constructor(s) and corresponding deduction guide(s), and `push_range`. `<unordered_map>` and `<unordered_set>`: For both `unordered_map`, `unordered_multimap`, `unordered_set`, and `unordered_multiset`, implement `from_range_t` constructor(s) and corresponding deduction guide(s). (Inherit `insert_range` from `_Hash`.) `<vector>`: For both `vector` and `vector<bool>`, implement `from_range_t` constructor(s) and corresponding deduction guide(s), `append_range`, `assign_range`, and `insert_range`. `<xstring>`: For both `basic_string`, implement `from_range_t` constructor(s) and corresponding deduction guide(s), `append_range`, `assign_range`, `insert_range`, and `replace_with_range`. Test both new feature-test macros in `tests/std/tests/VSO_0157762_feature_test_macros`. Test all new deduction guides in `tests/std/tests/P0433R2_deduction_guides`. Test `_Copy_n_unchecked` in `tests/std/tests/P0784R7_library_machinery`. Add new t`P1206R7_{container}_{operation}` "range algorithm"-style tests for each new container (or container adapter) member function. Add new `P1206R7_from_range` test for `from_range` and `from_range_t`. Add new `P1206R7_ranges_to` test for `ranges::to`. Fixes microsoft#2532.

StephanTLavavej

There are numerous real test failures - please investigate, fix, and verify before we begin reviewing this small PR. 😹

stl/inc/xtree

frederick-vs-ja

A strange value 202200L is used to test feature-test macros.

I have not idea why the test for deque failed now...

tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp

frederick-vs-ja

We shouldn't use _RERAISE again (see #2308).

stl/inc/deque

…_after(pos, first, last)

stl/inc/forward_list

miscco

Partial review until ranges header

stl/inc/algorithm

stl/inc/deque

stl/inc/forward_list

miscco

Partial review until xstring

stl/inc/ranges

stl/inc/vector

stl/inc/xstring

StephanTLavavej

Extremely partial video code review 😹

stl/inc/xutility

stl/inc/list

stl/inc/queue

tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp

stl/inc/xutility

stl/inc/xmemory

stl/inc/ranges

tests/std/tests/P1206R7_string_from_range/test.cpp

tests/std/tests/P1206R7_vector_insert_range/test.cpp

tests/std/tests/P1206R7_ranges_to/test.cpp

StephanTLavavej · 2022-08-08T09:45:54Z

@CaseyCarter @strega-nil-ms I've pushed changes nicely structured as a series of commits for double-checking. Please meow if you have meows!

strega-nil-ms

I am so excited to have ranges::to for tests!

CaseyCarter · 2022-08-08T18:49:49Z

@CaseyCarter @strega-nil-ms I've pushed changes nicely structured as a series of commits for double-checking. Please meow if you have meows!

Thanks for keeping these short and simple - very easy to review. You know, compared to, say, a hypothetical 7,000 line change.

... per resolution of just-submitted LWG issue.

StephanTLavavej · 2022-08-09T00:35:24Z

I'm mirroring this to the MSVC-internal repo - please notify me if any further changes are pushed.

StephanTLavavej · 2022-08-09T08:18:10Z

Thanks for implementing this tiny feature - I believe that to is the shortest function name in the STL! 🐈 😻 😹

Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>

hewillk · 2022-09-30T08:41:37Z

stl/inc/ranges

-        && constructible_from<_Container, from_range_t, _Rng, _Types...>;
+    concept _Converts_tag_constructible = _Ref_converts<_Rng, _Container>
+        // per LWG issue unnumbered as of 2022-08-08
+        && constructible_from<_Container, const from_range_t&, _Rng, _Types...>;


I noticed this issue recently too.
And when I used MSVC-STL for resolution validation I found that you already dealt with it. Are you planning to file this LWG and stride_view::iterator::operator+= recently?

CaseyCarter added ranges C++20/23 ranges cxx23 C++23 feature labels Jun 20, 2022

CaseyCarter requested a review from a team as a code owner June 20, 2022 22:03

StephanTLavavej requested changes Jun 20, 2022

View reviewed changes

WIP

a62fe8b

frederick-vs-ja reviewed Jun 21, 2022

View reviewed changes

stl/inc/xtree Outdated Show resolved Hide resolved

frederick-vs-ja reviewed Jun 21, 2022

View reviewed changes

tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp Outdated Show resolved Hide resolved

tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp Outdated Show resolved Hide resolved

frederick-vs-ja reviewed Jun 21, 2022

View reviewed changes

stl/inc/deque Outdated Show resolved Hide resolved

stl/inc/deque Outdated Show resolved Hide resolved

CaseyCarter added 2 commits June 21, 2022 14:58

Fixes

4e59216

fix feature-test macro test

2cb4fe9

frederick-vs-ja's deque comments

b5d02f4

CaseyCarter requested a review from StephanTLavavej June 22, 2022 04:20

factor commonality from forward_list::insert_range_after and ::insert…

5fae89b

…_after(pos, first, last)

CaseyCarter commented Jun 22, 2022

View reviewed changes

stl/inc/forward_list Outdated Show resolved Hide resolved

Fix inadvertent comment damage

593e9a1

miscco reviewed Jun 22, 2022

View reviewed changes

stl/inc/ranges Outdated Show resolved Hide resolved

stl/inc/vector Show resolved Hide resolved

stl/inc/vector Outdated Show resolved Hide resolved

stl/inc/vector Outdated Show resolved Hide resolved

stl/inc/xstring Outdated Show resolved Hide resolved

StephanTLavavej self-assigned this Jun 22, 2022

StephanTLavavej reviewed Jun 24, 2022

View reviewed changes

CaseyCarter added 5 commits June 24, 2022 06:42

miscco's review comments

3b687e8

STL's review comments

ccf85f4

Consistently use _Iter, _Sent in container code

b2a0262

Revert accidental change to libcxx/usual_matrix.lst

e75816a

enum_class{underlying_value} is C++17

3e6b68f

frederick-vs-ja reviewed Jun 26, 2022

View reviewed changes

stl/inc/queue Show resolved Hide resolved

StephanTLavavej added 9 commits August 8, 2022 02:27

Qualify _RANGES to.

7641514

Simplify how access control interacts with ifdefs.

d424e80

Fix comments.

7883bd4

Avoid redundant namespace alias.

371deba

constexpr string/vector are always available, reported VSO-1588614.

b983211

Avoid redundant constexpr const.

e9c4a4e

Drop unnecessary std:: in tests.

b9d8186

Use bool for expected arrays.

a4932c5

Apply defined(__cpp_lib_concepts) cleanup.

5582f29

StephanTLavavej reviewed Aug 8, 2022

View reviewed changes

StephanTLavavej approved these changes Aug 8, 2022

View reviewed changes

StephanTLavavej removed their assignment Aug 8, 2022

strega-nil-ms approved these changes Aug 8, 2022

View reviewed changes

Chack construction from const from_range_t& instead of from_range_t

4c9dc79

... per resolution of just-submitted LWG issue.

JMazurkiewicz mentioned this pull request Aug 8, 2022

Range algorithms don't work when used with unwrappable iterators and custom sentinels #3010

Closed

StephanTLavavej approved these changes Aug 8, 2022

View reviewed changes

StephanTLavavej self-assigned this Aug 9, 2022

_Copy_n_unchecked is a zombie

d2cc9ed

StephanTLavavej approved these changes Aug 9, 2022

View reviewed changes

StephanTLavavej merged commit 56446a5 into microsoft:main Aug 9, 2022

StephanTLavavej mentioned this pull request Aug 9, 2022

<functional> should avoid including <memory> #2998

Merged

CaseyCarter deleted the p1206 branch August 9, 2022 16:28

fsb4000 pushed a commit to fsb4000/STL that referenced this pull request Aug 13, 2022

P1206R7 Conversions From Ranges To Containers (microsoft#2806)

7bbd3de

Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>

hewillk reviewed Sep 30, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

P1206R7 Conversions From Ranges To Containers #2806

P1206R7 Conversions From Ranges To Containers #2806

CaseyCarter commented Jun 20, 2022

StephanTLavavej left a comment

frederick-vs-ja left a comment

frederick-vs-ja left a comment

miscco left a comment

miscco left a comment

StephanTLavavej left a comment

StephanTLavavej commented Aug 8, 2022

strega-nil-ms left a comment •

edited

Loading

CaseyCarter commented Aug 8, 2022

StephanTLavavej commented Aug 9, 2022

StephanTLavavej commented Aug 9, 2022

hewillk Sep 30, 2022

P1206R7 Conversions From Ranges To Containers #2806

P1206R7 Conversions From Ranges To Containers #2806

Conversation

CaseyCarter commented Jun 20, 2022

StephanTLavavej left a comment

Choose a reason for hiding this comment

frederick-vs-ja left a comment

Choose a reason for hiding this comment

frederick-vs-ja left a comment

Choose a reason for hiding this comment

miscco left a comment

Choose a reason for hiding this comment

miscco left a comment

Choose a reason for hiding this comment

StephanTLavavej left a comment

Choose a reason for hiding this comment

StephanTLavavej commented Aug 8, 2022

strega-nil-ms left a comment • edited Loading

Choose a reason for hiding this comment

CaseyCarter commented Aug 8, 2022

StephanTLavavej commented Aug 9, 2022

StephanTLavavej commented Aug 9, 2022

hewillk Sep 30, 2022

Choose a reason for hiding this comment

strega-nil-ms left a comment •

edited

Loading