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

Show file tree
Hide file tree
Changes from 13 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
69 changes: 54 additions & 15 deletions stl/inc/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,11 @@ public:
if constexpr (_Is_fwd_iter_v<_Iter>) {
const auto _Count = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_UFirst, _ULast)));
_Construct_n(_Count, _STD move(_UFirst), _STD move(_ULast));
#ifdef __cpp_lib_concepts
} else if constexpr (forward_iterator<_Iter>) {
const auto _Count = _Convert_size<size_type>(static_cast<size_t>(_RANGES distance(_UFirst, _ULast)));
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
_Construct_n(_Count, _STD move(_UFirst), _STD move(_ULast));
#endif // __cpp_lib_concepts
} else {
auto&& _Alproxy = _GET_PROXY_ALLOCATOR(_Alty, _Getal());
_Container_proxy_ptr<_Alty> _Proxy(_Alproxy, _Mypair._Myval2);
Expand Down Expand Up @@ -1041,7 +1046,7 @@ public:

private:
template <class _Iter>
_CONSTEXPR20 void _Insert_range(const_iterator _Where, _Iter _First, _Iter _Last, input_iterator_tag) {
_CONSTEXPR20 void _Insert_input_range(const_iterator _Where, _Iter _First, _Iter _Last) {
// insert input range [_First, _Last) at _Where
if (_First == _Last) {
return; // nothing to do, avoid invalidating iterators
Expand All @@ -1067,10 +1072,18 @@ private:
}

template <class _Iter>
_CONSTEXPR20 void _Insert_range(const_iterator _Where, _Iter _First, _Iter _Last, forward_iterator_tag) {
_CONSTEXPR20 void _Insert_forward_range(const_iterator _Where, _Iter _First, _Iter _Last) {
// insert forward range [_First, _Last) at _Where
const pointer _Whereptr = _Where._Ptr;
const auto _Count = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
size_type _Count;
#ifdef __cpp_lib_concepts
if constexpr (forward_iterator<_Iter>) {
_Count = _Convert_size<size_type>(static_cast<size_t>(_RANGES distance(_First, _Last)));
} else
#endif // __cpp_lib_concepts
{
_Count = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
}

auto& _Al = _Getal();
auto& _My_data = _Mypair._Myval2;
Expand Down Expand Up @@ -1195,7 +1208,16 @@ public:

_Adl_verify_range(_First, _Last);
const auto _Whereoff = static_cast<size_type>(_Whereptr - _Oldfirst);
_Insert_range(_Where, _Get_unwrapped(_First), _Get_unwrapped(_Last), _Iter_cat_t<_Iter>{});
#ifdef __cpp_lib_concepts
constexpr bool _Is_fwd = _Is_fwd_iter_v<_Iter> || forward_iterator<_Iter>;
#else // ^^^ __cpp_lib_concepts ^^^ / vvv !__cpp_lib_concepts vvv
constexpr bool _Is_fwd = _Is_fwd_iter_v<_Iter>;
#endif // ^^^ !__cpp_lib_concepts ^^^
if constexpr (_Is_fwd) {
_Insert_forward_range(_Where, _Get_unwrapped(_First), _Get_unwrapped(_Last));
} else {
_Insert_input_range(_Where, _Get_unwrapped(_First), _Get_unwrapped(_Last));
}
return _Make_iterator_offset(_Whereoff);
}

Expand Down Expand Up @@ -1250,7 +1272,7 @@ public:

private:
template <class _Iter>
_CONSTEXPR20 void _Assign_range(_Iter _First, _Iter _Last, input_iterator_tag) {
_CONSTEXPR20 void _Assign_input_range(_Iter _First, _Iter _Last) {
// assign input range [_First, _Last)
auto& _My_data = _Mypair._Myval2;
pointer& _Myfirst = _My_data._Myfirst;
Expand Down Expand Up @@ -1281,14 +1303,22 @@ private:
}

template <class _Iter>
_CONSTEXPR20 void _Assign_range(_Iter _First, _Iter _Last, forward_iterator_tag) {
_CONSTEXPR20 void _Assign_forward_range(_Iter _First, _Iter _Last) {
// assign forward range [_First, _Last)
const auto _Newsize = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
auto& _Al = _Getal();
auto& _My_data = _Mypair._Myval2;
pointer& _Myfirst = _My_data._Myfirst;
pointer& _Mylast = _My_data._Mylast;
pointer& _Myend = _My_data._Myend;
size_type _Newsize;
#ifdef __cpp_lib_concepts
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
#endif // __cpp_lib_concepts
{
_Newsize = _Convert_size<size_type>(static_cast<size_t>(_STD distance(_First, _Last)));
}
auto& _Al = _Getal();
auto& _My_data = _Mypair._Myval2;
pointer& _Myfirst = _My_data._Myfirst;
pointer& _Mylast = _My_data._Mylast;
pointer& _Myend = _My_data._Myend;

constexpr bool _Nothrow_construct = conjunction_v<is_nothrow_constructible<_Ty, _Iter_ref_t<_Iter>>,
_Uses_default_construct<_Alloc, _Ty*, _Iter_ref_t<_Iter>>>;
Expand Down Expand Up @@ -1334,11 +1364,20 @@ public:
template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
_CONSTEXPR20 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
constexpr bool _Is_fwd = _Is_fwd_iter_v<_Iter> || forward_iterator<_Iter>;
#else // ^^^ __cpp_lib_concepts ^^^ / vvv !__cpp_lib_concepts vvv
constexpr bool _Is_fwd = _Is_fwd_iter_v<_Iter>;
#endif // ^^^ !__cpp_lib_concepts ^^^
if constexpr (_Is_fwd) {
_Assign_forward_range(_Get_unwrapped(_First), _Get_unwrapped(_Last));
} else {
_Assign_input_range(_Get_unwrapped(_First), _Get_unwrapped(_Last));
}
}

_CONSTEXPR20 void assign(initializer_list<_Ty> _Ilist) {
_Assign_range(_Ilist.begin(), _Ilist.end(), random_access_iterator_tag{});
_Assign_forward_range(_Ilist.begin(), _Ilist.end());
}

public:
Expand All @@ -1364,7 +1403,7 @@ public:
}

_CONSTEXPR20 vector& operator=(initializer_list<_Ty> _Ilist) {
_Assign_range(_Ilist.begin(), _Ilist.end(), random_access_iterator_tag{});
_Assign_forward_range(_Ilist.begin(), _Ilist.end());
return *this;
}

StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
12 changes: 10 additions & 2 deletions tests/std/tests/VSO_0000000_fancy_pointers/test.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,22 @@ class fancy_pointer {
return *this;
}

void operator++(int) = delete; // avoid postincrement
fancy_pointer operator++(int) {
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
fancy_pointer result = *this;
++rep;
return result;
}

fancy_pointer& operator--() {
--rep;
return *this;
}

void operator--(int) = delete; // avoid postdecrement
fancy_pointer operator--(int) {
fancy_pointer result = *this;
--rep;
return result;
}

#ifdef _WIN64
fancy_pointer& operator+=(int rhs) {
Expand Down