Skip to content

Commit e4cd32d

Browse files
changkhothuychungchangkhothuychung
committed
fix
1 parent 6ca2e58 commit e4cd32d

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

‎libcxx/include/__ranges/concat_view.h‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
6767

6868
namespace ranges {
6969

70-
template <class... __Tp>
71-
using __extract_last = __Tp...[sizeof...(__Tp) - 1];
70+
template <class... _Tp>
71+
using __extract_last = _Tp...[sizeof...(_Tp) - 1];
7272

7373
template <class _Tp, class... _Tail>
7474
constexpr bool __derived_from_pack =
@@ -248,64 +248,64 @@ class concat_view<_Views...>::__iterator {
248248
base_iter it_;
249249
__maybe_const<_Const, concat_view>* parent_ = nullptr;
250250

251-
template <std::size_t _N>
251+
template <std::size_t _Idx>
252252
_LIBCPP_HIDE_FROM_ABI constexpr void satisfy() {
253-
if constexpr (_N < (sizeof...(_Views) - 1)) {
254-
if (std::get<_N>(it_) == ranges::end(std::get<_N>(parent_->__views_))) {
255-
it_.template emplace<_N + 1>(ranges::begin(std::get<_N + 1>(parent_->__views_)));
256-
satisfy<_N + 1>();
253+
if constexpr (_Idx < (sizeof...(_Views) - 1)) {
254+
if (std::get<_Idx>(it_) == ranges::end(std::get<_Idx>(parent_->__views_))) {
255+
it_.template emplace<_Idx + 1>(ranges::begin(std::get<_Idx + 1>(parent_->__views_)));
256+
satisfy<_Idx + 1>();
257257
}
258258
}
259259
}
260260

261-
template <std::size_t _N>
261+
template <std::size_t _Idx>
262262
_LIBCPP_HIDE_FROM_ABI constexpr void prev() {
263-
if constexpr (_N == 0) {
263+
if constexpr (_Idx == 0) {
264264
--std::get<0>(it_);
265265
} else {
266-
if (std::get<_N>(it_) == ranges::begin(std::get<_N>(parent_->__views_))) {
267-
using prev_view = __maybe_const<_Const, tuple_element_t<_N - 1, tuple<_Views...>>>;
266+
if (std::get<_Idx>(it_) == ranges::begin(std::get<_Idx>(parent_->__views_))) {
267+
using prev_view = __maybe_const<_Const, tuple_element_t<_Idx - 1, tuple<_Views...>>>;
268268
if constexpr (common_range<prev_view>) {
269-
it_.emplace<_N - 1>(ranges::end(std::get<_N - 1>(parent_->__views_)));
269+
it_.template emplace<_Idx - 1>(ranges::end(std::get<_Idx - 1>(parent_->__views_)));
270270
} else {
271-
it_.emplace<_N - 1>(ranges::__next(
272-
ranges::begin(std::get<_N - 1>(parent_->__views_)), ranges::size(std::get<_N - 1>(parent_->__views_))));
271+
it_.template emplace<_Idx - 1>(ranges::__next(
272+
ranges::begin(std::get<_Idx - 1>(parent_->__views_)), ranges::size(std::get<_Idx - 1>(parent_->__views_))));
273273
}
274-
prev<_N - 1>();
274+
prev<_Idx - 1>();
275275
} else {
276-
--std::get<_N>(it_);
276+
--std::get<_Idx>(it_);
277277
}
278278
}
279279
}
280280

281-
template <std::size_t _N>
281+
template <std::size_t _Idx>
282282
_LIBCPP_HIDE_FROM_ABI constexpr void advance_fwd(difference_type __offset, difference_type __steps) {
283-
using underlying_diff_type = iter_difference_t<variant_alternative_t<_N, base_iter>>;
284-
if constexpr (_N == sizeof...(_Views) - 1) {
285-
std::get<_N>(it_) += static_cast<underlying_diff_type>(__steps);
283+
using underlying_diff_type = iter_difference_t<variant_alternative_t<_Idx, base_iter>>;
284+
if constexpr (_Idx == sizeof...(_Views) - 1) {
285+
std::get<_Idx>(it_) += static_cast<underlying_diff_type>(__steps);
286286
} else {
287-
difference_type __n_size = ranges::size(std::get<_N>(parent_->__views_));
287+
difference_type __n_size = ranges::size(std::get<_Idx>(parent_->__views_));
288288
if (__offset + __steps < __n_size) {
289-
std::get<_N>(it_) += static_cast<underlying_diff_type>(__steps);
289+
std::get<_Idx>(it_) += static_cast<underlying_diff_type>(__steps);
290290
} else {
291-
it_.template emplace<_N + 1>(ranges::begin(std::get<_N + 1>(parent_->__views_)));
292-
advance_fwd<_N + 1>(0, __offset + __steps - __n_size);
291+
it_.template emplace<_Idx + 1>(ranges::begin(std::get<_Idx + 1>(parent_->__views_)));
292+
advance_fwd<_Idx + 1>(0, __offset + __steps - __n_size);
293293
}
294294
}
295295
}
296296

297-
template <std::size_t _N>
297+
template <std::size_t _Idx>
298298
_LIBCPP_HIDE_FROM_ABI constexpr void advance_bwd(difference_type __offset, difference_type __steps) {
299-
using underlying_diff_type = iter_difference_t<variant_alternative_t<_N, base_iter>>;
300-
if constexpr (_N == 0) {
301-
std::get<_N>(it_) -= static_cast<underlying_diff_type>(__steps);
299+
using underlying_diff_type = iter_difference_t<variant_alternative_t<_Idx, base_iter>>;
300+
if constexpr (_Idx == 0) {
301+
std::get<_Idx>(it_) -= static_cast<underlying_diff_type>(__steps);
302302
} else {
303303
if (__offset >= __steps) {
304-
std::get<_N>(it_) -= static_cast<underlying_diff_type>(__steps);
304+
std::get<_Idx>(it_) -= static_cast<underlying_diff_type>(__steps);
305305
} else {
306-
auto __prev_size = ranges::__distance(std::get<_N - 1>(parent_->__views_));
307-
it_.emplace<_N - 1>(ranges::begin(std::get<_N - 1>(parent_->__views_)) + __prev_size);
308-
advance_bwd<_N - 1>(__prev_size, __steps - __offset);
306+
auto __prev_size = ranges::__distance(std::get<_Idx - 1>(parent_->__views_));
307+
it_.template emplace<_Idx - 1>(ranges::begin(std::get<_Idx - 1>(parent_->__views_)) + __prev_size);
308+
advance_bwd<_Idx - 1>(__prev_size, __steps - __offset);
309309
}
310310
}
311311
}
@@ -316,9 +316,9 @@ class concat_view<_Views...>::__iterator {
316316
((__index == _Is ? (__func(std::integral_constant<size_t, _Is>{}), 0) : 0), ...);
317317
}
318318

319-
template <size_t _N, typename _Func>
319+
template <size_t _Idx, typename _Func>
320320
_LIBCPP_HIDE_FROM_ABI constexpr void apply_fn_with_const_index(size_t __index, _Func&& __func) {
321-
apply_fn_with_const_index(__index, std::forward<_Func>(__func), std::make_index_sequence<_N>{});
321+
apply_fn_with_const_index(__index, std::forward<_Func>(__func), std::make_index_sequence<_Idx>{});
322322
}
323323

324324
template <class... _Args>
@@ -412,10 +412,10 @@ class concat_view<_Views...>::__iterator {
412412
[&](auto& __active_it) {
413413
apply_fn_with_const_index<std::tuple_size_v<decltype(parent_->__views_)>>(
414414
__active_index, [&](auto __index_constant) {
415-
constexpr size_t __I = __index_constant.value;
416-
auto& __active_view = std::get<__I>(parent_->__views_);
415+
constexpr size_t __i = __index_constant.value;
416+
auto& __active_view = std::get<__i>(parent_->__views_);
417417
difference_type __idx = __active_it - ranges::begin(__active_view);
418-
advance_fwd<__I>(__idx, __n);
418+
advance_fwd<__i>(__idx, __n);
419419
});
420420
},
421421
it_);
@@ -426,10 +426,10 @@ class concat_view<_Views...>::__iterator {
426426
[&](auto& __active_it) {
427427
apply_fn_with_const_index<std::tuple_size_v<decltype(parent_->__views_)>>(
428428
__active_index, [&](auto __index_constant) {
429-
constexpr size_t __I = __index_constant.value;
430-
auto& __active_view = std::get<__I>(parent_->__views_);
429+
constexpr size_t __i = __index_constant.value;
430+
auto& __active_view = std::get<__i>(parent_->__views_);
431431
difference_type __idx = __active_it - ranges::begin(__active_view);
432-
advance_bwd<__I>(__idx, -__n);
432+
advance_bwd<__i>(__idx, -__n);
433433
});
434434
},
435435
it_);
@@ -529,14 +529,14 @@ class concat_view<_Views...>::__iterator {
529529
if (__ix > __iy) {
530530
std::visit(
531531
[&](auto& __it_x, auto& __it_y) {
532-
__it_x.apply_fn_with_const_index<std::tuple_size_v<decltype(__x.parent_->__views_)>>(
533-
__ix, [&](auto index_constant) {
534-
constexpr size_t __index_x = index_constant.value;
532+
__it_x.apply_fn_with_const_index<tuple_size_v<decltype(__x.parent_->__views_)>>(
533+
__ix, [&](auto __index_constant_x) {
534+
constexpr size_t __index_x = __index_constant_x.value;
535535
auto __dx = ranges::__distance(ranges::begin(std::get<__index_x>(__x.parent_->__views_)), __it_x);
536536

537-
__it_y.apply_fn_with_const_index<std::tuple_size_v<decltype(__y.parent_->__views_)>>(
538-
__iy, [&](auto index_constant) {
539-
constexpr size_t __index_y = index_constant.value;
537+
__it_y.apply_fn_with_const_index<tuple_size_v<decltype(__y.parent_->__views_)>>(
538+
__iy, [&](auto __index_constant_y) {
539+
constexpr size_t __index_y = __index_constant_y.value;
540540
auto __dy =
541541
ranges::__distance(ranges::begin(std::get<__index_y>(__y.parent_->__views_)), __it_y);
542542
difference_type __s = 0;
@@ -601,9 +601,9 @@ namespace views {
601601
namespace __concat {
602602
struct __fn {
603603
template <class... _Views>
604-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Views... views) const noexcept(
605-
noexcept(concat_view(std::forward<_Views>(views)...))) -> decltype(concat_view(std::forward<_Views>(views)...)) {
606-
return concat_view(std::forward<_Views>(views)...);
604+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Views... __views) const noexcept(
605+
noexcept(concat_view(std::forward<_Views>(__views)...))) -> decltype(concat_view(std::forward<_Views>(__views)...)) {
606+
return concat_view(std::forward<_Views>(__views)...);
607607
}
608608
};
609609
} // namespace __concat

0 commit comments

Comments
 (0)