Add auto funtion tupled andThen and compose

Author: nicolasstucki

library/src-3.x/scala/TupledFunction.scala

@@ -13,4 +13,14 @@ object TupledFunction {
   def (f: F) apply[F, Args <: Tuple, R](args: Args) given (tf: TupledFunction[F, Args, R]): R =
     tf.applyFunctionTo(f, args)
 
+  /** Composes two instances of TupledFunctions in a new TupledFunctions, with this function applied last */
+  def (f: F) compose[F, G, FArgs <: Tuple, GArgs <: Tuple, R](g: G) given TupledFunction[G, GArgs, FArgs], TupledFunction[F, FArgs, R]: GArgs => R = {
+    x => f(g(x))
+  }
+
+  /** Composes two instances of TupledFunctions in a new TupledFunctions, with this function applied first */
+  def (f: F) andThen[F, G, FArgs <: Tuple, GArgs <: Tuple, R](g: G) given TupledFunction[F, FArgs, GArgs], TupledFunction[G, GArgs, R]: FArgs => R = {
+    x => g(f(x))
+  }
+
 }

tests/run/tupled-function-andThen.scala

@@ -1,14 +1,15 @@
 object Test {
   def main(args: Array[String]): Unit = {
+    import TupledFunction._
 
     val f1 = (x1: Int, x2: Int) => (x1, x2, x1 + x2)
     val g1 = (x1: Int, x2: Int, x3: Int) => x1 + x2 + x3
-    val h1 = f1.tupled.andThen(g1.tupled)
+    val h1 = f1.andThen(g1)
     println(h1(1, 2))
 
     val f2 = (x1: Int, x2: Int) => (1, x1, x2, x1 + x2, x1 * x2)
     val g2 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int) => (x1 + x2, x3 + x4 + x5)
-    val h2 = f2.tupled.andThen(g2.tupled)
+    val h2 = f2.andThen(g2)
     println(h2(1, 2))
 
     val h3 = h2.andThen(h1)
@@ -20,8 +21,7 @@ object Test {
     val g25 =
       (x0: Int, x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int, x22: Int, x23: Int, x24: Int) =>
         (3 * x0, 3 * x1, 3 * x2, 3 * x3, 3 * x4, 3 * x5, 3 * x6, 3 * x7, 3 * x8, 3 * x9, 3 * x10, 3 * x11, 3 * x12, 3 * x13, 3 * x14, 3 * x15, 3 * x16, 3 * x17, 3 * x18, 3 * x19, 3 * x20, 3 * x21, 3 * x22, 3 * x23, 3 * x24)
-    val h25 = f25.tupled.andThen(g25.tupled)
+    val h25 = f25.andThen(g25)
     println(h25(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25))
-
   }
 }

tests/run/tupled-function-compose.scala

@@ -1,14 +1,15 @@
 object Test {
   def main(args: Array[String]): Unit = {
+    import TupledFunction._
 
     val f1 = (x1: Int, x2: Int) => (x1, x2, x1 + x2)
     val g1 = (x1: Int, x2: Int, x3: Int) => x1 + x2 + x3
-    val h1 = g1.tupled.compose(f1.tupled)
+    val h1 = g1.compose(f1)
     println(h1(1, 2))
 
     val f2 = (x1: Int, x2: Int) => (1, x1, x2, x1 + x2, x1 * x2)
     val g2 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int) => (x1 + x2, x3 + x4 + x5)
-    val h2 = g2.tupled.compose(f2.tupled)
+    val h2 = g2.compose(f2)
     println(h2(1, 2))
 
     val h3 = h1.compose(h2)