Skip to content

Commit 8166cf8

Browse files
SekaiArendelleSekaiArendelle
authored
Bugfix: const iter for fast_io::list (#1221)
1 parent 427890f commit 8166cf8

2 files changed

Lines changed: 183 additions & 8 deletions

File tree

‎include/fast_io_dsal/impl/list.h‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ class list
566566
}
567567
[[nodiscard]] inline constexpr const_iterator end() const noexcept
568568
{
569-
return {__builtin_addressof(imp)};
569+
return {const_cast<::fast_io::containers::details::list_node_common*>(__builtin_addressof(imp))};
570570
}
571571

572572
[[nodiscard]] inline constexpr const_iterator cbegin() const noexcept
@@ -575,25 +575,26 @@ class list
575575
}
576576
[[nodiscard]] inline constexpr const_iterator cend() const noexcept
577577
{
578-
return {__builtin_addressof(imp)};
578+
return {const_cast<::fast_io::containers::details::list_node_common*>(__builtin_addressof(imp))};
579579
}
580580

581-
[[nodiscard]] inline constexpr reverse_iterator rend() noexcept
582-
{
583-
return reverse_iterator({imp.next});
584-
}
585581
[[nodiscard]] inline constexpr reverse_iterator rbegin() noexcept
586582
{
587583
return reverse_iterator({__builtin_addressof(imp)});
588584
}
589585

586+
[[nodiscard]] inline constexpr reverse_iterator rend() noexcept
587+
{
588+
return reverse_iterator({imp.next});
589+
}
590+
590591
[[nodiscard]] inline constexpr const_reverse_iterator rend() const noexcept
591592
{
592593
return const_reverse_iterator({imp.next});
593594
}
594595
[[nodiscard]] inline constexpr const_reverse_iterator rbegin() const noexcept
595596
{
596-
return const_reverse_iterator({__builtin_addressof(imp)});
597+
return const_reverse_iterator({const_cast<::fast_io::containers::details::list_node_common*>(__builtin_addressof(imp))});
597598
}
598599

599600
[[nodiscard]] inline constexpr const_reverse_iterator crend() const noexcept
@@ -602,7 +603,7 @@ class list
602603
}
603604
[[nodiscard]] inline constexpr const_reverse_iterator crbegin() const noexcept
604605
{
605-
return const_reverse_iterator({__builtin_addressof(imp)});
606+
return const_reverse_iterator({const_cast<::fast_io::containers::details::list_node_common*>(__builtin_addressof(imp))});
606607
}
607608

608609
[[nodiscard]] inline constexpr bool empty() const noexcept

‎tests/0026.container/0002.list/list_iter.cc‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
#include <fast_io_dsal/list.h>
2+
3+
struct X
4+
{
5+
int a;
6+
};
7+
8+
void test_iter()
9+
{
10+
::fast_io::list<X> l{X{1}, X{2}, X{3}};
11+
12+
auto iter = l.begin();
13+
{
14+
auto &&value = *iter;
15+
auto &&value2 = iter->a;
16+
auto value3 = *iter++;
17+
18+
if (value.a != 1 || value2 != 1 || value3.a != 1)
19+
{
20+
::fast_io::fast_terminate();
21+
}
22+
}
23+
24+
++iter;
25+
26+
{
27+
auto &&value = *iter;
28+
auto &&value2 = iter->a;
29+
auto value3 = *iter++;
30+
31+
if (value.a != 3 || value2 != 3 || value3.a != 3)
32+
{
33+
::fast_io::fast_terminate();
34+
}
35+
}
36+
37+
if (iter != l.end())
38+
{
39+
::fast_io::fast_terminate();
40+
}
41+
}
42+
43+
void test_iter2()
44+
{
45+
::fast_io::list<X> l{X{1}, X{2}, X{3}};
46+
47+
for (auto &&v : l)
48+
{
49+
if (v.a != 1 && v.a != 2 && v.a != 3)
50+
{
51+
::fast_io::fast_terminate();
52+
}
53+
}
54+
}
55+
56+
void test_const_iter()
57+
{
58+
::fast_io::list<X> const l{X{1}, X{2}, X{3}};
59+
60+
auto iter = l.begin();
61+
{
62+
auto &&value = *iter;
63+
auto &&value2 = iter->a;
64+
auto value3 = *iter++;
65+
66+
if (value.a != 1 || value2 != 1 || value3.a != 1)
67+
{
68+
::fast_io::fast_terminate();
69+
}
70+
}
71+
72+
++iter;
73+
74+
{
75+
auto &&value = *iter;
76+
auto &&value2 = iter->a;
77+
auto value3 = *iter++;
78+
79+
if (value.a != 3 || value2 != 3 || value3.a != 3)
80+
{
81+
::fast_io::fast_terminate();
82+
}
83+
}
84+
85+
if (iter != l.end())
86+
{
87+
::fast_io::fast_terminate();
88+
}
89+
}
90+
91+
void test_const_iter2()
92+
{
93+
::fast_io::list<X> const l{X{1}, X{2}, X{3}};
94+
95+
for (auto &&v : l)
96+
{
97+
if (v.a != 1 && v.a != 2 && v.a != 3)
98+
{
99+
::fast_io::fast_terminate();
100+
}
101+
}
102+
}
103+
104+
void test_reverse_iter()
105+
{
106+
::fast_io::list<X> l{X{1}, X{2}, X{3}};
107+
auto iter = l.rbegin();
108+
{
109+
auto &&value = *iter;
110+
auto &&value2 = iter->a;
111+
auto value3 = *iter++;
112+
113+
if (value.a != 3 || value2 != 3 || value3.a != 3)
114+
{
115+
::fast_io::fast_terminate();
116+
}
117+
}
118+
{
119+
auto &&value = *iter;
120+
auto &&value2 = iter->a;
121+
auto value3 = *iter++;
122+
123+
if (value.a != 2 || value2 != 2 || value3.a != 2)
124+
{
125+
::fast_io::fast_terminate();
126+
}
127+
}
128+
++iter;
129+
if (iter != l.rend())
130+
{
131+
::fast_io::fast_terminate();
132+
}
133+
}
134+
135+
void test_reverse_const_iter()
136+
{
137+
::fast_io::list<X> const l{X{1}, X{2}, X{3}};
138+
auto iter = l.crbegin();
139+
{
140+
auto &&value = *iter;
141+
auto &&value2 = iter->a;
142+
auto value3 = *iter++;
143+
144+
if (value.a != 3 || value2 != 3 || value3.a != 3)
145+
{
146+
::fast_io::fast_terminate();
147+
}
148+
}
149+
{
150+
auto &&value = *iter;
151+
auto &&value2 = iter->a;
152+
auto value3 = *iter++;
153+
154+
if (value.a != 2 || value2 != 2 || value3.a != 2)
155+
{
156+
::fast_io::fast_terminate();
157+
}
158+
}
159+
++iter;
160+
if (iter != l.crend())
161+
{
162+
::fast_io::fast_terminate();
163+
}
164+
}
165+
166+
int main()
167+
{
168+
::test_iter();
169+
::test_iter2();
170+
::test_const_iter();
171+
::test_const_iter2();
172+
::test_reverse_iter();
173+
::test_reverse_const_iter();
174+
}

0 commit comments

Comments
 (0)