Sat, 22 Oct 2022 18:12:49 +0300
Fix some unit tests after fundamental changes that made them invalid
0 | 1 | /// |
2 | /// Mapping utilities | |
3 | /// | |
4 | ||
5 | use std::mem::MaybeUninit; | |
6 | use itertools::izip; | |
7 | ||
8 | pub trait FixedLength<const N : usize> { | |
9 | type Elem; | |
10 | type Iter : Iterator<Item=Self::Elem>; | |
11 | fn fl_iter(self) -> Self::Iter; | |
12 | } | |
13 | ||
14 | pub trait FixedLengthMut<const N : usize> : FixedLength<N> { | |
15 | type IterMut<'a> : Iterator<Item=&'a mut Self::Elem> where Self : 'a; | |
16 | fn fl_iter_mut(&mut self) -> Self::IterMut<'_>; | |
17 | } | |
18 | ||
19 | impl<A, const N : usize> FixedLength<N> for [A; N] { | |
20 | type Elem = A; | |
21 | type Iter = std::array::IntoIter<A, N>; | |
22 | #[inline] | |
23 | fn fl_iter(self) -> Self::Iter { | |
24 | self.into_iter() | |
25 | } | |
26 | } | |
27 | ||
28 | impl<A, const N : usize> FixedLengthMut<N> for [A; N] { | |
29 | type IterMut<'a> = std::slice::IterMut<'a, A> where A : 'a; | |
30 | #[inline] | |
31 | fn fl_iter_mut(&mut self) -> Self::IterMut<'_> { | |
32 | self.iter_mut() | |
33 | } | |
34 | } | |
35 | ||
36 | impl<'a, A, const N : usize> FixedLength<N> for &'a [A; N] { | |
37 | type Elem = &'a A; | |
38 | type Iter = std::slice::Iter<'a, A>; | |
39 | #[inline] | |
40 | fn fl_iter(self) -> Self::Iter { | |
41 | self.iter() | |
42 | } | |
43 | } | |
44 | ||
45 | macro_rules! tuple_or_singleton { | |
46 | ($a:ident,) => { $a }; | |
47 | ($($a:ident),+) => { ($($a),+) } | |
48 | } | |
49 | ||
50 | macro_rules! make_mapmany { | |
51 | ($name:ident, $name_indexed:ident, $var0:ident $($var:ident)* ; | |
52 | $etype0:ident $($etype:ident)*, $ctype0:ident $($ctype:ident)*) => { | |
53 | /// Map over multiple [`FixedLength`] containers, returning an array. | |
54 | #[inline] | |
55 | pub fn $name< | |
56 | $etype0, | |
57 | $($etype,)* | |
58 | $ctype0 : FixedLength<N,Elem=$etype0>, | |
59 | $($ctype : FixedLength<N,Elem=$etype>,)* | |
60 | Res, | |
61 | const N : usize | |
62 | >( | |
63 | $var0 : $ctype0, | |
64 | $($var : $ctype,)* | |
65 | f : impl Fn($etype0, $($etype),*) -> Res | |
66 | ) -> [Res; N] { | |
67 | let zipit = izip!($var0.fl_iter(), $($var.fl_iter()),*); | |
68 | let map = zipit.map(|tuple_or_singleton!($var0, $($var),*)| f($var0, $($var),*)); | |
69 | collect_into_array_unchecked(map) | |
70 | } | |
71 | ||
72 | /// Map over multiple [`FixedLength`] containers, returning an array. | |
73 | /// This version also passes the index to the mapping function. | |
74 | #[inline] | |
75 | pub fn $name_indexed< | |
76 | $etype0, | |
77 | $($etype,)* | |
78 | $ctype0 : FixedLength<N,Elem=$etype0>, | |
79 | $($ctype : FixedLength<N,Elem=$etype>,)* | |
80 | Res, | |
81 | const N : usize | |
82 | >( | |
83 | $var0 : $ctype0, | |
84 | $($var : $ctype,)* | |
85 | f : impl Fn(usize, $etype0, $($etype),*) -> Res | |
86 | ) -> [Res; N] { | |
87 | let zipit = (0..N).zip(izip!($var0.fl_iter(), $($var.fl_iter()),*)); | |
88 | let map = zipit.map(|(i, tuple_or_singleton!($var0, $($var),*))| f(i, $var0, $($var),*)); | |
89 | collect_into_array_unchecked(map) | |
90 | } | |
91 | } | |
92 | } | |
93 | ||
94 | make_mapmany!(map1, map1_indexed, a; A, CA); | |
95 | make_mapmany!(map2, map2_indexed, a b; A B, CA CB); | |
96 | make_mapmany!(map3, map3_indexed, a b c; A B C, CA CB CC); | |
97 | make_mapmany!(map4, map4_indexed, a b c d; A B C D, CA CB CC CD); | |
98 | make_mapmany!(map5, map5_indexed, a b c d e; A B C D E, CA CB CC CD CE); | |
99 | make_mapmany!(map6, map6_indexed, a b c d e f; A B C D E F, CA CB CC CD CE CF); | |
100 | ||
101 | macro_rules! make_mapmany_mut{ | |
102 | ($name:ident, $name_indexed:ident, $var0:ident $($var:ident)* ; | |
103 | $etype0:ident $($etype:ident)*, $ctype0:ident $($ctype:ident)*) => { | |
104 | /// Map over multiple [`FixedLength`] container inserting the result in the first. | |
105 | #[inline] | |
106 | pub fn $name< | |
107 | $etype0, | |
108 | $($etype,)* | |
109 | $ctype0 : FixedLengthMut<N,Elem=$etype0>, | |
110 | $($ctype : FixedLength<N,Elem=$etype>,)* | |
111 | const N : usize | |
112 | > ( | |
113 | $var0 : &mut $ctype0, | |
114 | $($var : $ctype,)* | |
115 | f : impl Fn(&mut $etype0, $($etype),*) | |
116 | ) { | |
117 | let zipit = izip!($var0.fl_iter_mut(), $($var.fl_iter()),*); | |
118 | zipit.for_each(|tuple_or_singleton!($var0, $($var),*)| f($var0, $($var),*)); | |
119 | } | |
120 | ||
121 | /// Map over multiple [`FixedLength`] container inserting the result in the first. | |
122 | /// This version also passes the index to the mapping function. | |
123 | #[inline] | |
124 | pub fn $name_indexed< | |
125 | $etype0, | |
126 | $($etype,)* | |
127 | $ctype0 : FixedLengthMut<N,Elem=$etype0>, | |
128 | $($ctype : FixedLength<N,Elem=$etype>,)* | |
129 | const N : usize | |
130 | > ( | |
131 | $var0 : &mut $ctype0, | |
132 | $($var : $ctype,)* | |
133 | f : impl Fn(usize, &mut $etype0, $($etype),*) | |
134 | ) { | |
135 | let zipit = (0..N).zip(izip!($var0.fl_iter_mut(), $($var.fl_iter()),*)); | |
136 | zipit.for_each(|(i, tuple_or_singleton!($var0, $($var),*))| f(i, $var0, $($var),*)); | |
137 | } | |
138 | } | |
139 | } | |
140 | ||
141 | make_mapmany_mut!(map1_mut, map1_indexed_mut, a; A, CA); | |
142 | make_mapmany_mut!(map2_mut, map2_indexed_mut, a b; A B, CA CB); | |
143 | make_mapmany_mut!(map3_mut, map3_indexed_mut, a b c; A B C, CA CB CC); | |
144 | make_mapmany_mut!(map4_mut, map4_indexed_mut, a b c d; A B C D, CA CB CC CD); | |
145 | make_mapmany_mut!(map5_mut, map5_indexed_mut, a b c d e; A B C D E, CA CB CC CD CE); | |
146 | make_mapmany_mut!(map6_mut, map6_indexed_mut, a b c d e f; A B C D E F, CA CB CC CD CE CF); | |
147 | ||
148 | ||
149 | /// Initialise an array of length `N` by calling `f` multiple times. | |
150 | #[inline] | |
151 | pub fn array_init<A, F : Fn() -> A, const N : usize>(f : F) -> [A; N] { | |
152 | //[(); N].map(|_| f()) | |
153 | core::array::from_fn(|_| f()) | |
154 | } | |
155 | ||
156 | // /// Initialise an array of length `N` by calling `f` with the index of each element. | |
157 | // #[inline] | |
158 | // pub fn array_gen<A, F : Fn(usize) -> A, const N : usize>(f : F) -> [A; N] { | |
159 | // //[(); N].indexmap(|i, _| f(i)) | |
160 | // core::array::from_fn(f) | |
161 | // } | |
162 | ||
163 | ||
164 | pub struct FoldMap<I : Iterator<Item=A>, A, B, J : Copy, F : Fn(J, A) -> (J, B)> { | |
165 | iter : I, | |
166 | f : F, | |
167 | j : J, | |
168 | } | |
169 | ||
170 | impl<A, B, I : Iterator<Item=A>, J : Copy, F : Fn(J, A) -> (J, B)> Iterator for FoldMap<I, A, B, J, F> { | |
171 | type Item = B; | |
172 | #[inline] | |
173 | fn next(&mut self) -> Option<B> { | |
174 | self.iter.next().map(|a| { | |
175 | let (jnew, b) = (self.f)(self.j, a); | |
176 | self.j = jnew; | |
177 | b | |
178 | }) | |
179 | } | |
180 | } | |
181 | ||
182 | pub struct IndexMap<I : Iterator<Item=A>, A, B, F : Fn(usize, A) -> B> { | |
183 | iter : I, | |
184 | f : F, | |
185 | j : usize, | |
186 | } | |
187 | ||
188 | impl<A, B, I : Iterator<Item=A>, F : Fn(usize, A) -> B> Iterator for IndexMap<I, A, B, F> { | |
189 | type Item = B; | |
190 | #[inline] | |
191 | fn next(&mut self) -> Option<B> { | |
192 | self.iter.next().map(|a| { | |
193 | let b = (self.f)(self.j, a); | |
194 | self.j = self.j+1; | |
195 | b | |
196 | }) | |
197 | } | |
198 | } | |
199 | ||
200 | pub trait FoldMappable<A, B, J, F : Fn(J, A) -> (J, B)> : Sized { | |
201 | type Output; | |
202 | /// Fold and map over an array; typically used to count the element while traversing a map | |
203 | fn foldmap(self, j : J, f : F) -> Self::Output; | |
204 | } | |
205 | ||
206 | pub trait IndexMappable<A, B, F : Fn(usize, A) -> B> : Sized { | |
207 | type Output; | |
208 | fn indexmap(self, f : F) -> Self::Output; | |
209 | } | |
210 | ||
211 | impl<'a, A, B, J : Copy, F : Fn(J, &'a A) -> (J, B)> FoldMappable<&'a A, B, J, F> | |
212 | for std::slice::Iter<'a, A> { | |
213 | type Output = FoldMap<Self, &'a A, B, J, F>; | |
214 | #[inline] | |
215 | fn foldmap(self, j : J, f : F) -> Self::Output { | |
216 | FoldMap { iter : self, j, f } | |
217 | } | |
218 | } | |
219 | ||
220 | impl<'a, A, B, F : Fn(usize, &'a A) -> B> IndexMappable<&'a A, B, F> | |
221 | for std::slice::Iter<'a, A> { | |
222 | type Output = IndexMap<Self, &'a A, B, F>; | |
223 | #[inline] | |
224 | fn indexmap(self, f : F) -> Self::Output { | |
225 | IndexMap { iter : self, j : 0, f } | |
226 | } | |
227 | } | |
228 | ||
229 | ||
230 | impl<A, B, J : Copy, F : Fn(J, A) -> (J, B), const N : usize> FoldMappable<A, B, J, F> | |
231 | for std::array::IntoIter<A, N> { | |
232 | type Output = FoldMap<Self, A, B, J, F>; | |
233 | #[inline] | |
234 | fn foldmap(self, j : J, f : F) -> Self::Output { | |
235 | FoldMap { iter : self, j, f } | |
236 | } | |
237 | } | |
238 | ||
239 | impl<'a, A, B, F : Fn(usize, A) -> B, const N : usize> IndexMappable<A, B, F> | |
240 | for std::array::IntoIter<A, N> { | |
241 | type Output = IndexMap<Self, A, B, F>; | |
242 | #[inline] | |
243 | fn indexmap(self, f : F) -> Self::Output { | |
244 | IndexMap { iter : self, j : 0, f } | |
245 | } | |
246 | } | |
247 | ||
248 | ||
249 | ||
250 | ||
251 | impl<A, B, J : Copy, F : Fn(J, A) -> (J, B), const N : usize> FoldMappable<A, B, J, F> for [A; N] { | |
252 | type Output = [B; N]; | |
253 | #[inline] | |
254 | fn foldmap(self, j : J, f : F) -> [B; N] { | |
255 | // //let mut res : [MaybeUninit<B>; N] = unsafe { MaybeUninit::uninit().assume_init() }; | |
256 | // let mut res = MaybeUninit::uninit_array::<N>(); | |
257 | // for (a, i) in self.into_iter().zip(0..N) { | |
258 | // let (jnew, b) = f(j, a); | |
259 | // unsafe { *(res.get_unchecked_mut(i)) = MaybeUninit::new(b) }; | |
260 | // j = jnew; | |
261 | // } | |
262 | // //unsafe { res.as_mut_ptr().cast::<[B; N]>().read() } | |
263 | // unsafe { MaybeUninit::array_assume_init(res) } | |
264 | let it = self.into_iter().foldmap(j, f); | |
265 | collect_into_array_unchecked(it) | |
266 | } | |
267 | } | |
268 | ||
269 | impl<A, B, F : Fn(usize, A) -> B, const N : usize> IndexMappable<A, B, F> for [A; N] { | |
270 | type Output= [B; N]; | |
271 | #[inline] | |
272 | fn indexmap(self, f : F) -> [B; N] { | |
273 | // //let mut res : [MaybeUninit<B>; N] = unsafe { MaybeUninit::uninit().assume_init() }; | |
274 | // let mut res = MaybeUninit::uninit_array::<N>(); | |
275 | // for (a, i) in self.into_iter().zip(0..N) { | |
276 | // let b = f(i, a); | |
277 | // unsafe { *(res.get_unchecked_mut(i)) = MaybeUninit::new(b) }; | |
278 | // } | |
279 | // //unsafe { res.as_mut_ptr().cast::<[B; N]>().read() } | |
280 | // unsafe { MaybeUninit::array_assume_init(res) } | |
281 | let it = self.into_iter().indexmap(f); | |
282 | collect_into_array_unchecked(it) | |
283 | } | |
284 | } | |
285 | ||
286 | /// | |
287 | /// This is taken and simplified from core::array to not involve `ControlFlow`, | |
288 | /// `Try` etc. (Pulling everything including `NeverShortCircuit` turned out | |
289 | /// too much to maintain here.) | |
290 | /// | |
291 | /// Pulls `N` items from `iter` and returns them as an array. If the iterator | |
292 | /// yields fewer than `N` items, `None` is returned and all already yielded | |
293 | /// items are dropped. | |
294 | /// | |
295 | /// Since the iterator is passed as a mutable reference and this function calls | |
296 | /// `next` at most `N` times, the iterator can still be used afterwards to | |
297 | /// retrieve the remaining items. | |
298 | /// | |
299 | /// If `iter.next()` panicks, all items already yielded by the iterator are | |
300 | /// dropped. | |
301 | #[inline] | |
302 | pub(crate) fn collect_into_array_unchecked<T, I : Iterator<Item=T>, const N: usize>(mut iter: I) -> [T; N] | |
303 | { | |
304 | if N == 0 { | |
305 | // SAFETY: An empty array is always inhabited and has no validity invariants. | |
306 | return unsafe { core::mem::zeroed() }; | |
307 | } | |
308 | ||
309 | struct Guard<'a, T, const N: usize> { | |
310 | array_mut: &'a mut [MaybeUninit<T>; N], | |
311 | initialized: usize, | |
312 | } | |
313 | ||
314 | impl<T, const N: usize> Drop for Guard<'_, T, N> { | |
315 | #[inline] | |
316 | fn drop(&mut self) { | |
317 | debug_assert!(self.initialized <= N); | |
318 | ||
319 | // SAFETY: this slice will contain only initialized objects. | |
320 | unsafe { | |
321 | core::ptr::drop_in_place(MaybeUninit::slice_assume_init_mut( | |
322 | &mut self.array_mut.get_unchecked_mut(..self.initialized), | |
323 | )); | |
324 | } | |
325 | } | |
326 | } | |
327 | ||
328 | let mut array = MaybeUninit::uninit_array::<N>(); | |
329 | let mut guard = Guard { array_mut: &mut array, initialized: 0 }; | |
330 | ||
331 | while let Some(item) = iter.next() { | |
332 | // SAFETY: `guard.initialized` starts at 0, is increased by one in the | |
333 | // loop and the loop is aborted once it reaches N (which is | |
334 | // `array.len()`). | |
335 | unsafe { | |
336 | guard.array_mut.get_unchecked_mut(guard.initialized).write(item); | |
337 | } | |
338 | guard.initialized += 1; | |
339 | ||
340 | // Check if the whole array was initialized. | |
341 | if guard.initialized == N { | |
342 | core::mem::forget(guard); | |
343 | ||
344 | // SAFETY: the condition above asserts that all elements are | |
345 | // initialized. | |
346 | let out = unsafe { MaybeUninit::array_assume_init(array) }; | |
347 | return out; | |
348 | } | |
349 | } | |
350 | ||
351 | unreachable!("Something went wrong with iterator length") | |
352 | } | |
353 | ||
354 | ||
355 | #[cfg(test)] | |
356 | mod tests { | |
357 | use super::*; | |
358 | ||
359 | #[test] | |
360 | fn mapx_test() { | |
361 | let a = [0,1,2]; | |
362 | let mut b = [2,1,0]; | |
363 | assert_eq!(map1(a, |x| x+1), [1,2,3]); | |
364 | assert_eq!(map2(a, b, |x, y| x+y), [2,2,2]); | |
365 | assert_eq!(map1_indexed(a, |i, y| y-i), [0,0,0]); | |
366 | map1_indexed_mut(&mut b, |i, y| *y=i); | |
367 | assert_eq!(b, a); | |
368 | } | |
369 | } |