Stream: Avoid unecessary currying in uncurried version of foldRight.

jbgi · jbgi · commit 87d9b30e8ecd · 2016-10-23T00:35:20.000+02:00
diff --git a/core/src/main/java/fj/data/Stream.java b/core/src/main/java/fj/data/Stream.java
@@ -119,7 +119,7 @@ public final <B> B uncons(final B nil, final F<A, F<P1<Stream<A>>, B>> cons) {
    * @return The final result after the right-fold reduction.
    */
   public final <B> B foldRight(final F<A, F<P1<B>, B>> f, final B b) {
-    return isEmpty() ? b : f.f(head()).f(P.lazy(() -> tail()._1().foldRight(f, b)));
+    return foldRight(uncurryF2(f), b);
   }
 
   /**
@@ -130,7 +130,7 @@ public final <B> B foldRight(final F<A, F<P1<B>, B>> f, final B b) {
    * @return The final result after the right-fold reduction.
    */
   public final <B> B foldRight(final F2<A, P1<B>, B> f, final B b) {
-    return foldRight(curry(f), b);
+    return isEmpty() ? b : f.f(head(), P.lazy(() -> tail()._1().foldRight(f, b)));
   }
 
   /**
@@ -141,7 +141,7 @@ public final <B> B foldRight(final F2<A, P1<B>, B> f, final B b) {
    * @return The final result after the right-fold reduction.
    */
   public final <B> B foldRight1(final F<A, F<B, B>> f, final B b) {
-    return foldRight(compose(Function.<P1<B>, B, B>andThen().f(P1.__1()), f), b);
+    return foldRight1(uncurryF2(f), b);
   }
 
   /**
@@ -152,7 +152,7 @@ public final <B> B foldRight1(final F<A, F<B, B>> f, final B b) {
    * @return The final result after the right-fold reduction.
    */
   public final <B> B foldRight1(final F2<A, B, B> f, final B b) {
-    return foldRight1(curry(f), b);
+    return isEmpty() ? b : f.f(head(), tail()._1().foldRight1(f, b));
   }
 
   /**
