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

CU-fh2vcf - Deprecate mapN and fix zip for collections #2324

Merged
merged 11 commits into from
Mar 13, 2021
Merged

CU-fh2vcf - Deprecate mapN and fix zip for collections #2324

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cfb2e98
mapN -> zip for NonEmptyList.kt
danimontoya Mar 11, 2021
cafc3d4
mapN -> zip for NonEmptyListApply.kt
danimontoya Mar 11, 2021
0e78895
Merge branch 'master' into CU-fh2vcf-replace-mapN-with-zip
danimontoya Mar 11, 2021
86e337c
Add missing import in the example
danimontoya Mar 11, 2021
4b5efd4
Fix example
danimontoya Mar 11, 2021
687a5d1
Remove creation of intermediate lists in zip
danimontoya Mar 11, 2021
46e46b2
Update zip
danimontoya Mar 12, 2021
6dbe687
Fix map#zip
nomisRev Mar 12, 2021
e70c87f
Fix Iterable#zip & NonEmptyList#zip
nomisRev Mar 12, 2021
b934478
Fix Sequence#test
nomisRev Mar 12, 2021
e599d9a
Update deprecations mapN collectiosn
nomisRev Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
292 changes: 164 additions & 128 deletions arrow-libs/core/arrow-core-data/src/main/kotlin/arrow/core/NonEmptyList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,14 @@ typealias Nel<A> = NonEmptyList<A>
* }
* ```
*
* ### mapN
* ### zip
*
* Λrrow contains methods that allow you to preserve type information when computing over different `NonEmptyList` typed values.
*
* ```kotlin:ank:playground
* import arrow.core.NonEmptyList
* import arrow.core.nonEmptyListOf
* import arrow.core.zip
* import java.util.UUID
*
* //sampleStart
Expand All @@ -146,7 +147,7 @@ typealias Nel<A> = NonEmptyList<A>
* val nelName: NonEmptyList<String> = nonEmptyListOf("William Alvin Howard", "Haskell Curry")
* val nelYear: NonEmptyList<Int> = nonEmptyListOf(1926, 1900)
*
* val value = NonEmptyList.mapN(nelId, nelName, nelYear) { id, name, year ->
* val value = nelId.zip(nelName, nelYear) { id, name, year ->
* Person(id, name, year)
* }
* //sampleEnd
Expand All @@ -160,7 +161,7 @@ typealias Nel<A> = NonEmptyList<A>
* - `NonEmptyList` is __used to model lists that guarantee at least one element__
* - We can easily construct values of `NonEmptyList` with `nonEmptyListOf`
* - `foldLeft`, `map`, `flatMap` and others are used to compute over the internal contents of a `NonEmptyList` value.
* - `NonEmptyList.mapM(a, b, c) { ... }` can be used to compute over multiple `NonEmptyList` values preserving type information and __abstracting over arity__ with `mapN`
* - `a.zip(b, c) { ... }` can be used to compute over multiple `NonEmptyList` values preserving type information and __abstracting over arity__ with `zip`
*
*/
class NonEmptyList<out A>(
Expand Down Expand Up @@ -331,128 +332,6 @@ class NonEmptyList<out A>(
internal val unit: NonEmptyList<Unit> =
of(Unit)

inline fun <B, C, D> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
map: (B, C) -> D
): NonEmptyList<D> =
mapN(b, c, unit, unit, unit, unit, unit, unit, unit, unit) { b, c, _, _, _, _, _, _, _, _ -> map(b, c) }

inline fun <B, C, D, E> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
map: (B, C, D) -> E
): NonEmptyList<E> =
mapN(b, c, d, unit, unit, unit, unit, unit, unit, unit) { b, c, d, _, _, _, _, _, _, _ -> map(b, c, d) }

inline fun <B, C, D, E, F> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
map: (B, C, D, E) -> F
): NonEmptyList<F> =
mapN(b, c, d, e, unit, unit, unit, unit, unit, unit) { b, c, d, e, _, _, _, _, _, _ -> map(b, c, d, e) }

inline fun <B, C, D, E, F, G> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
map: (B, C, D, E, F) -> G
): NonEmptyList<G> =
mapN(b, c, d, e, f, unit, unit, unit, unit, unit) { b, c, d, e, f, _, _, _, _, _ -> map(b, c, d, e, f) }

inline fun <B, C, D, E, F, G, H> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
map: (B, C, D, E, F, G) -> H
): NonEmptyList<H> =
mapN(b, c, d, e, f, g, unit, unit, unit, unit) { b, c, d, e, f, g, _, _, _, _ -> map(b, c, d, e, f, g) }

inline fun <B, C, D, E, F, G, H, I> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
map: (B, C, D, E, F, G, H) -> I
): NonEmptyList<I> =
mapN(b, c, d, e, f, g, h, unit, unit, unit) { b, c, d, e, f, g, h, _, _, _ -> map(b, c, d, e, f, g, h) }

inline fun <B, C, D, E, F, G, H, I, J> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
i: NonEmptyList<I>,
crossinline map: (B, C, D, E, F, G, H, I) -> J
): NonEmptyList<J> =
mapN(b, c, d, e, f, g, h, i, unit, unit) { b, c, d, e, f, g, h, i, _, _ -> map(b, c, d, e, f, g, h, i) }

inline fun <B, C, D, E, F, G, H, I, J, K> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
i: NonEmptyList<I>,
j: NonEmptyList<J>,
map: (B, C, D, E, F, G, H, I, J) -> K
): NonEmptyList<K> =
mapN(b, c, d, e, f, g, h, i, j, unit) { b, c, d, e, f, g, h, i, j, _ -> map(b, c, d, e, f, g, h, i, j) }

inline fun <B, C, D, E, F, G, H, I, J, K, L> mapN(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
i: NonEmptyList<I>,
j: NonEmptyList<J>,
k: NonEmptyList<K>,
map: (B, C, D, E, F, G, H, I, J, K) -> L
): NonEmptyList<L> =
NonEmptyList(
map(b.head, c.head, d.head, e.head, f.head, g.head, h.head, i.head, j.head, k.head),
b.tail.flatMap { bb ->
c.tail.flatMap { cc ->
d.tail.flatMap { dd ->
e.tail.flatMap { ee ->
f.tail.flatMap { ff ->
g.tail.flatMap { gg ->
h.tail.flatMap { hh ->
i.tail.flatMap { ii ->
j.tail.flatMap { jj ->
k.tail.map { kk ->
map(bb, cc, dd, ee, ff, gg, hh, ii, jj, kk)
}
}
}
}
}
}
}
}
}
}
)

@Suppress("UNCHECKED_CAST")
private tailrec fun <A, B> go(
buf: ArrayList<B>,
Expand Down Expand Up @@ -550,8 +429,165 @@ object NonEmptyListSemigroup : Semigroup<NonEmptyList<Any?>> {
NonEmptyList(this.head, this.tail.plus(b))
}

fun <A, B, Z> NonEmptyList<A>.zip(fb: NonEmptyList<B>, f: (A, B) -> Z): NonEmptyList<Z> =
NonEmptyList(f(head, fb.head), tail.zip(fb.tail, f))

fun <A, B> NonEmptyList<A>.zip(fb: NonEmptyList<B>): NonEmptyList<Pair<A, B>> =
zip(fb, ::Pair)

inline fun <A, B, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
map: (A, B) -> Z
): NonEmptyList<Z> =
zip(
b,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit
) { aa, bb, _, _, _, _, _, _, _, _ ->
map(aa, bb)
}

inline fun <A, B, C, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
map: (A, B, C) -> Z
): NonEmptyList<Z> =
zip(
b, c,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit
) { aa, bb, cc, _, _, _, _, _, _, _ ->
map(aa, bb, cc)
}

inline fun <A, B, C, D, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
map: (A, B, C, D) -> Z
): NonEmptyList<Z> =
zip(
b, c, d,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit
) { aa, bb, cc, dd, _, _, _, _, _, _ ->
map(aa, bb, cc, dd)
}

inline fun <A, B, C, D, E, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
map: (A, B, C, D, E) -> Z
): NonEmptyList<Z> =
zip(
b, c, d, e,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit
) { aa, bb, cc, dd, ee, _, _, _, _, _ ->
map(aa, bb, cc, dd, ee)
}

inline fun <A, B, C, D, E, F, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
map: (A, B, C, D, E, F) -> Z
): NonEmptyList<Z> =
zip(
b, c, d, e, f,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit
) { aa, bb, cc, dd, ee, ff, _, _, _, _ ->
map(aa, bb, cc, dd, ee, ff)
}

inline fun <A, B, C, D, E, F, G, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
map: (A, B, C, D, E, F, G) -> Z
): NonEmptyList<Z> =
zip(
b, c, d, e, f, g,
NonEmptyList.unit,
NonEmptyList.unit,
NonEmptyList.unit
) { aa, bb, cc, dd, ee, ff, gg, _, _, _ ->
map(aa, bb, cc, dd, ee, ff, gg)
}

inline fun <A, B, C, D, E, F, G, H, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
map: (A, B, C, D, E, F, G, H) -> Z
): NonEmptyList<Z> =
zip(
b, c, d, e, f, g, h,
NonEmptyList.unit, NonEmptyList.unit
) { aa, bb, cc, dd, ee, ff, gg, hh, _, _ ->
map(aa, bb, cc, dd, ee, ff, gg, hh)
}

inline fun <A, B, C, D, E, F, G, H, I, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
i: NonEmptyList<I>,
map: (A, B, C, D, E, F, G, H, I) -> Z
): NonEmptyList<Z> =
zip(
b, c, d, e, f, g, h, i,
NonEmptyList.unit
) { aa, bb, cc, dd, ee, ff, gg, hh, ii, _ ->
map(aa, bb, cc, dd, ee, ff, gg, hh, ii)
}

inline fun <A, B, C, D, E, F, G, H, I, J, Z> NonEmptyList<A>.zip(
b: NonEmptyList<B>,
c: NonEmptyList<C>,
d: NonEmptyList<D>,
e: NonEmptyList<E>,
f: NonEmptyList<F>,
g: NonEmptyList<G>,
h: NonEmptyList<H>,
i: NonEmptyList<I>,
j: NonEmptyList<J>,
map: (A, B, C, D, E, F, G, H, I, J) -> Z
): NonEmptyList<Z> =
NonEmptyList(
map(head, b.head, c.head, d.head, e.head, f.head, g.head, h.head, i.head, j.head),
tail.zip(b.tail, c.tail, d.tail, e.tail, f.tail, g.tail, h.tail, i.tail, j.tail, map)
aballano marked this conversation as resolved.
Show resolved Hide resolved
)