Simplify TupledFunction API

Author: nicolasstucki

library/src-3.x/dotty/DottyPredef.scala

@@ -37,4 +37,12 @@ object DottyPredef {
   }
 
   inline def the[T] given (x: T): x.type = x
+
+  /** Creates a tupled version of this function: instead of N arguments,
+    *  it accepts a single [[scala.Tuple]] argument.
+    */
+  def (f: F) tupled[F, Args <: Tuple, R] given (tf: TupledFunction[F, Args, R]): Args => R = {
+    x => tf.applyFunctionTo(f, x)
+  }
+
 }

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

@@ -13,21 +13,4 @@ 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))
-  }
-
-  /** Creates a tupled version of this function: instead of N arguments,
-   *  it accepts a single [[scala.Tuple]] argument.
-   */
-  def (f: F) tupled[F, Args <: Tuple, R] given TupledFunction[F, Args, R]: Args => R = {
-    x => f(x)
-  }
-
 }

tests/run/tupled-function-andThen.check

@@ -1,3 +1,4 @@
 6
 (2,7)
 18
+(6,12,18,24,30,36,42,48,54,60,66,72,78,84,90,96,102,108,114,120,126,132,138,144,150)

tests/run/tupled-function-andThen.scala

@@ -1,19 +1,27 @@
 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.andThen(g1)
+    val h1 = f1.tupled.andThen(g1.tupled)
     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.andThen(g2)
+    val h2 = f2.tupled.andThen(g2.tupled)
     println(h2(1, 2))
 
     val h3 = h2.andThen(h1)
     println(h3(1, 2))
 
+    val f25 =
+      (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) =>
+        (2 * x0, 2 * x1, 2 * x2, 2 * x3, 2 * x4, 2 * x5, 2 * x6, 2 * x7, 2 * x8, 2 * x9, 2 * x10, 2 * x11, 2 * x12, 2 * x13, 2 * x14, 2 * x15, 2 * x16, 2 * x17, 2 * x18, 2 * x19, 2 * x20, 2 * x21, 2 * x22, 2 * x23, 2 * x24)
+    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)
+    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.check

@@ -1,3 +1,4 @@
 6
 (2,7)
 18
+(6,12,18,24,30,36,42,48,54,60,66,72,78,84,90,96,102,108,114,120,126,132,138,144,150)

tests/run/tupled-function-compose.scala

@@ -1,19 +1,27 @@
 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.compose(f1)
+    val h1 = g1.tupled.compose(f1.tupled)
     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.compose(f2)
+    val h2 = g2.tupled.compose(f2.tupled)
     println(h2(1, 2))
 
     val h3 = h1.compose(h2)
     println(h3(1, 2))
 
+    val f25 =
+      (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) =>
+        (2 * x0, 2 * x1, 2 * x2, 2 * x3, 2 * x4, 2 * x5, 2 * x6, 2 * x7, 2 * x8, 2 * x9, 2 * x10, 2 * x11, 2 * x12, 2 * x13, 2 * x14, 2 * x15, 2 * x16, 2 * x17, 2 * x18, 2 * x19, 2 * x20, 2 * x21, 2 * x22, 2 * x23, 2 * x24)
+    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.compose(g25.tupled)
+    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))
+
   }
 }