Skip to content
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

Jump to bottom

Use iterator concept in vector's range constructor #1794

Merged
merged 14 commits into from
Jun 12, 2022
Merged

Use iterator concept in vector's range constructor #1794

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
146f580
Use iterator concept in vector's range constructor
AdamBucior Mar 31, 2021
3e39305
Should be ifdef + comments
AdamBucior Mar 31, 2021
f8b273d
Use the stronger of iterator_concept and iterator_category
AdamBucior Mar 31, 2021
53a0a35
clang-format
AdamBucior Mar 31, 2021
41213bd
Fix tests
AdamBucior Mar 31, 2021
041055c
Actually the test was wrong
AdamBucior Mar 31, 2021
bd14612
Remove double call to _Assign_range
AdamBucior Mar 31, 2021
d4d876e
Merge remote-tracking branch 'upstream/main' into vector-range-constr…
AdamBucior Jun 30, 2021
43f8d98
refactoring and insert
AdamBucior Jul 1, 2021
5706366
Merge remote-tracking branch 'upstream/main' into vector-range-constr…
AdamBucior Jul 20, 2021
f68437e
Merge remote-tracking branch 'upstream/main' into vector-range-constr…
AdamBucior Aug 12, 2021
7c105bb
Merge remote-tracking branch 'upstream/main' into vector-range-constr…
AdamBucior Aug 27, 2021
609a2fe
Merge branch 'main' into vector-range-constructor
StephanTLavavej Jun 9, 2022
798f9ce
Code review feedback.
StephanTLavavej Jun 10, 2022
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
43 changes: 39 additions & 4 deletions stl/inc/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,16 @@ private:

template <class _Iter>
_CONSTEXPR20_CONTAINER void _Range_construct_or_tidy(_Iter _First, _Iter _Last, forward_iterator_tag) {
#ifdef __cpp_lib_concepts
size_type _Count;
if constexpr (forward_iterator<_Iter>) {
AdamBucior marked this conversation as resolved.
Show resolved Hide resolved
_Count = _Convert_size<size_type>(static_cast<size_t>(_RANGES distance(_First, _Last)));
} else {
_Count = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
}
#else // ^^^ __cpp_lib_concepts ^^^ / vvv !__cpp_lib_concepts vvv
const auto _Count = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
#endif // ^^^ !__cpp_lib_concepts ^^^
if (_Count != 0) {
_Buy_nonzero(_Count);
_Tidy_guard<vector> _Guard{this};
Expand All @@ -539,7 +548,15 @@ public:
auto&& _Alproxy = _GET_PROXY_ALLOCATOR(_Alty, _Getal());
_Container_proxy_ptr<_Alty> _Proxy(_Alproxy, _Mypair._Myval2);
_Adl_verify_range(_First, _Last);
#ifdef __cpp_lib_concepts
if constexpr (derived_from<_Iter_concept<_Iter>, _Iter_cat_t<_Iter>>) {
_Range_construct_or_tidy(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_concept<_Iter>{});
} else {
_Range_construct_or_tidy(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_cat_t<_Iter>{});
}
#else // ^^^ __cpp_lib_concepts ^^^ / vvv !__cpp_lib_concepts vvv
_Range_construct_or_tidy(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_cat_t<_Iter>{});
#endif // ^^^ !__cpp_lib_concepts ^^^
_Proxy._Release();
}

Expand Down Expand Up @@ -1137,11 +1154,20 @@ private:
template <class _Iter>
_CONSTEXPR20_CONTAINER void _Assign_range(_Iter _First, _Iter _Last, forward_iterator_tag) {
// assign forward range [_First, _Last)
#ifdef __cpp_lib_concepts
size_type _Newsize;
if constexpr (forward_iterator<_Iter>) {
AdamBucior marked this conversation as resolved.
Show resolved Hide resolved
_Newsize = _Convert_size<size_type>(static_cast<size_t>(_RANGES distance(_First, _Last)));
} else {
_Newsize = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
}
#else // ^^^ __cpp_lib_concepts ^^^ / vvv !__cpp_lib_concepts vvv
const auto _Newsize = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
auto& _My_data = _Mypair._Myval2;
pointer& _Myfirst = _My_data._Myfirst;
pointer& _Mylast = _My_data._Mylast;
pointer& _Myend = _My_data._Myend;
#endif // ^^^ !__cpp_lib_concepts ^^^
auto& _My_data = _Mypair._Myval2;
pointer& _Myfirst = _My_data._Myfirst;
pointer& _Mylast = _My_data._Mylast;
pointer& _Myend = _My_data._Myend;

_My_data._Orphan_all();

Expand Down Expand Up @@ -1187,6 +1213,15 @@ public:
_CONSTEXPR20_CONTAINER void assign(_Iter _First, _Iter _Last) {
_Adl_verify_range(_First, _Last);
_Assign_range(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_cat_t<_Iter>{});
#ifdef __cpp_lib_concepts
if constexpr (derived_from<_Iter_concept<_Iter>, _Iter_cat_t<_Iter>>) {
_Assign_range(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_concept<_Iter>{});
} else {
_Assign_range(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_cat_t<_Iter>{});
}
#else // ^^^ __cpp_lib_concepts ^^^ / vvv !__cpp_lib_concepts vvv
_Assign_range(_Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_cat_t<_Iter>{});
#endif // ^^^ !__cpp_lib_concepts ^^^
}

_CONSTEXPR20_CONTAINER void assign(initializer_list<_Ty> _Ilist) {
Expand Down