unwrap redondant function application

jbgi · jbgi · commit d784b7f7ee1e · 2016-05-24T07:41:22.000+02:00
diff --git a/core/src/main/java/fj/control/Trampoline.java b/core/src/main/java/fj/control/Trampoline.java
@@ -56,7 +56,7 @@ public Either<P1<Trampoline<A>>, A> resume() {
         // WARNING: In JDK 8, update 25 (current version) the following code is a
         // workaround for an internal JDK compiler error, likely due to
         // https:bugs.openjdk.java.net/browse/JDK-8062253.
-        F<Normal<Object>, Trampoline<A>> f = o -> o.foldNormal(cont::f, t -> t._1().bind(cont));
+        F<Normal<Object>, Trampoline<A>> f = o -> o.foldNormal(cont, t -> t._1().bind(cont));
         F<Codense<Object>, Trampoline<A>> g = c -> codense(c.sub, o -> c.cont.f(o).bind(cont));
         return ot.fold(f, g);
       }), o -> P.lazy(() -> cont.f(o))));
diff --git a/core/src/main/java/fj/data/Array.java b/core/src/main/java/fj/data/Array.java
@@ -529,7 +529,7 @@ public <B, C> Array<C> bind(final Array<B> sb, final F2<A, B, C> f) {
    * @return A new array after applying the given array of functions through this array.
    */
   public <B> Array<B> apply(final Array<F<A, B>> lf) {
-    return lf.bind(f -> map(f::f));
+    return lf.bind(f -> map(f));
   }
 
   /**
diff --git a/core/src/main/java/fj/data/IOFunctions.java b/core/src/main/java/fj/data/IOFunctions.java
@@ -417,7 +417,7 @@ public static <A> IO<Stream<A>> sequenceWhile(final Stream<IO<A>> stream, final
     }
 
     public static <A, B> IO<B> apply(IO<A> io, IO<F<A, B>> iof) {
-        return bind(iof, f -> map(io, f::f));
+        return bind(iof, f -> map(io, f));
     }
 
     public static <A, B, C> IO<C> liftM2(IO<A> ioa, IO<B> iob, F2<A, B, C> f) {
diff --git a/core/src/main/java/fj/data/Option.java b/core/src/main/java/fj/data/Option.java
@@ -460,7 +460,7 @@ public final <E, B> Validation<E, Option<B>> traverseValidation(F<A, Validation<
    *         optional value.
    */
   public final <B> Option<B> apply(final Option<F<A, B>> of) {
-    return of.bind(f -> map(f::f));
+    return of.bind(f -> map(f));
   }
 
   /**
diff --git a/core/src/main/java/fj/data/State.java b/core/src/main/java/fj/data/State.java
@@ -93,7 +93,7 @@ public State<S, A> withs(F<S, S> f) {
 	}
 
 	public static <S, A> State<S, A> gets(F<S, A> f) {
-		return State.<S>init().map(f::f);
+		return State.<S>init().map(f);
 	}
 
 	/**
diff --git a/core/src/main/java/fj/data/vector/V.java b/core/src/main/java/fj/data/vector/V.java
@@ -35,7 +35,7 @@ public static <A> V2<A> v(final A a1, final A a2) {
    * @return The vector-2.
    */
   public static <A> V2<A> v(final F0<A> a1, final F0<A> a2) {
-      return V2.p(P.lazy(a1::f, a2::f));
+      return V2.p(P.lazy(a1, a2));
   }
 
   /**
diff --git a/quickcheck/src/main/java/fj/test/Gen.java b/quickcheck/src/main/java/fj/test/Gen.java
@@ -276,7 +276,7 @@ public <B, C, D, E> Gen<E> bind(final Gen<B> gb, final Gen<C> gc, final Gen<D> g
    * @return A new generator after function application.
    */
   public <B> Gen<B> apply(final Gen<F<A, B>> gf) {
-    return gf.bind(f1 -> map(f1::f));
+    return gf.bind(f1 -> map(f1));
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ public <B, C> Array<C> bind(final Array<B> sb, final F2<A, B, C> f) {`
`529`	`529`	`* @return A new array after applying the given array of functions through this array.`
`530`	`530`	`*/`
`531`	`531`	`public <B> Array<B> apply(final Array<F<A, B>> lf) {`
`532`		`- return lf.bind(f -> map(f::f));`
	`532`	`+ return lf.bind(f -> map(f));`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ public static <A> IO<Stream<A>> sequenceWhile(final Stream<IO<A>> stream, final`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`public static <A, B> IO<B> apply(IO<A> io, IO<F<A, B>> iof) {`
`420`		`- return bind(iof, f -> map(io, f::f));`
	`420`	`+ return bind(iof, f -> map(io, f));`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`public static <A, B, C> IO<C> liftM2(IO<A> ioa, IO<B> iob, F2<A, B, C> f) {`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ public final <E, B> Validation<E, Option<B>> traverseValidation(F<A, Validation<`
`460`	`460`	`* optional value.`
`461`	`461`	`*/`
`462`	`462`	`public final <B> Option<B> apply(final Option<F<A, B>> of) {`
`463`		`- return of.bind(f -> map(f::f));`
	`463`	`+ return of.bind(f -> map(f));`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public State<S, A> withs(F<S, S> f) {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public static <S, A> State<S, A> gets(F<S, A> f) {`
`96`		`- return State.<S>init().map(f::f);`
	`96`	`+ return State.<S>init().map(f);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static <A> V2<A> v(final A a1, final A a2) {`
`35`	`35`	`* @return The vector-2.`
`36`	`36`	`*/`
`37`	`37`	`public static <A> V2<A> v(final F0<A> a1, final F0<A> a2) {`
`38`		`- return V2.p(P.lazy(a1::f, a2::f));`
	`38`	`+ return V2.p(P.lazy(a1, a2));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public <B, C, D, E> Gen<E> bind(final Gen<B> gb, final Gen<C> gc, final Gen<D> g`
`276`	`276`	`* @return A new generator after function application.`
`277`	`277`	`*/`
`278`	`278`	`public <B> Gen<B> apply(final Gen<F<A, B>> gf) {`
`279`		`- return gf.bind(f1 -> map(f1::f));`
	`279`	`+ return gf.bind(f1 -> map(f1));`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`/**`