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

Simplify Scala 3 extension methods (not yet compiling) #11

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Simplify Scala 3 extension methods (not yet compiling) #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4b76e3
Simplify Scala 3 extension methods (not yet compiling)
mpilquist Oct 28, 2023
dbf3c65
Remove old AnyVal classes
mpilquist Oct 28, 2023
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
46 changes: 15 additions & 31 deletions core/shared/src/main/scala-3/org/typelevel/twiddles/Twiddles.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,18 @@ import cats.syntax.all._

trait TwiddleSyntax[F[_]]:

implicit def toTwiddleOpCons[B <: Tuple](fb: F[B]): TwiddleOpCons[F, B] = new TwiddleOpCons(
fb
)
implicit def toTwiddleOpTwo[B](fb: F[B]): TwiddleOpTwo[F, B] = new TwiddleOpTwo(fb)

extension [A](fa: F[A])
// TODO: Define *: here instead of with toTwiddleOpCons/Two methods above; doing so breaks a bunch of tests though
@annotation.targetName("cons")
def *:[B <: Tuple](fb: F[B])(using InvariantSemigroupal[F]): F[A *: B] =
fa.product(fb).imap[A *: B] { case (hd, tl) => hd *: tl } { case hd *: tl => (hd, tl) }

@annotation.targetName("pair")
@annotation.nowarn
def *:[B](fb: F[B])(using InvariantSemigroupal[F]): F[A *: B *: EmptyTuple] =
fa.product(fb).imap[A *: B *: EmptyTuple] { case (a, b) => a *: b *: EmptyTuple } {
case a *: b *: EmptyTuple => (a, b)
}

def to[B](using iso: Iso[A, B], F: Invariant[F]): F[B] = fa.imap(iso.to)(iso.from)

extension [A <: Tuple](fa: F[A])
Expand All @@ -51,13 +56,13 @@ trait TwiddleSyntax[F[_]]:
object syntax:
extension [F[_], A](fa: F[A])
@annotation.targetName("cons")
def *:[G[x] >: F[x], B <: Tuple](gb: G[B])(using InvariantSemigroupal[G]): G[A *: B] =
fa.product(gb).imap[A *: B] { case (hd, tl) => hd *: tl } { case hd *: tl => (hd, tl) }
def *:[B <: Tuple](fb: F[B])(using InvariantSemigroupal[F]): F[A *: B] =
fa.product(fb).imap[A *: B] { case (hd, tl) => hd *: tl } { case hd *: tl => (hd, tl) }

@annotation.targetName("pair")
@annotation.nowarn
def *:[G[x] >: F[x], B](gb: G[B])(using InvariantSemigroupal[G]): G[A *: B *: EmptyTuple] =
fa.product(gb).imap[A *: B *: EmptyTuple] { case (a, b) => a *: b *: EmptyTuple } {
def *:[B](fb: F[B])(using InvariantSemigroupal[F]): F[A *: B *: EmptyTuple] =
fa.product(fb).imap[A *: B *: EmptyTuple] { case (a, b) => a *: b *: EmptyTuple } {
case a *: b *: EmptyTuple => (a, b)
}

Expand All @@ -67,24 +72,3 @@ object syntax:
inline def dropUnits(using Invariant[F]): F[DropUnits[A]] =
fa.imap(DropUnits.drop(_))(DropUnits.insert(_))

final class TwiddleOpCons[F[_], B <: Tuple](private val self: F[B]) extends AnyVal:
// Workaround for https://github.com/typelevel/twiddles/pull/2
@annotation.targetName("consFixedF")
def *:[A](fa: F[A])(using F: InvariantSemigroupal[F]): F[A *: B] =
*:[F, A](fa)(using F)

def *:[G[x] >: F[x], A](ga: G[A])(using InvariantSemigroupal[G]): G[A *: B] =
ga.product(self).imap[A *: B] { case (hd, tl) => hd *: tl } { case hd *: tl => (hd, tl) }

final class TwiddleOpTwo[F[_], B](private val self: F[B]) extends AnyVal:
// Workaround for https://github.com/typelevel/twiddles/pull/2
@annotation.targetName("twoFixedF")
def *:[A](
fa: F[A]
)(using F: InvariantSemigroupal[F]): F[A *: B *: EmptyTuple] =
*:[F, A](fa)(using F)

def *:[G[x] >: F[x], A](ga: G[A])(using InvariantSemigroupal[G]): G[A *: B *: EmptyTuple] =
ga.product(self).imap[A *: B *: EmptyTuple] { case (a, b) => a *: b *: EmptyTuple } {
case a *: b *: EmptyTuple => (a, b)
}
Loading