Cleanup zipWith

runarorama · runarorama · commit 5756b62c06cc · 2012-02-07T09:38:37.000-05:00
diff --git a/core/src/main/java/fj/control/Trampoline.java b/core/src/main/java/fj/control/Trampoline.java
@@ -339,11 +339,11 @@ public <B, C> Trampoline<C> zipWith(final Trampoline<B> b, final F2<A, B, C> f)
       for (final P1<Trampoline<B>> y : eb.left()) {
         return suspend(P1.bind(x, y, new F2<Trampoline<A>, Trampoline<B>, Trampoline<C>>() {
           public Trampoline<C> f(final Trampoline<A> ta, final Trampoline<B> tb) {
-            return ta.bind(tb, new F2<A, B, C>() {
-              public C f(final A a, final B b) {
-                return f.f(a, b);
+            return suspend(new P1<Trampoline<C>>() {
+              public Trampoline<C> _1() {
+                return ta.zipWith(tb, f);
               }
-            }.curry());
+            });
           }
         }.curry()));
       }

Original file line number	Diff line number	Diff line change
`@@ -339,11 +339,11 @@ public <B, C> Trampoline<C> zipWith(final Trampoline<B> b, final F2<A, B, C> f)`
`339`	`339`	`for (final P1<Trampoline<B>> y : eb.left()) {`
`340`	`340`	`return suspend(P1.bind(x, y, new F2<Trampoline<A>, Trampoline<B>, Trampoline<C>>() {`
`341`	`341`	`public Trampoline<C> f(final Trampoline<A> ta, final Trampoline<B> tb) {`
`342`		`- return ta.bind(tb, new F2<A, B, C>() {`
`343`		`- public C f(final A a, final B b) {`
`344`		`- return f.f(a, b);`
	`342`	`+ return suspend(new P1<Trampoline<C>>() {`
	`343`	`+ public Trampoline<C> _1() {`
	`344`	`+ return ta.zipWith(tb, f);`
`345`	`345`	`}`
`346`		`- }.curry());`
	`346`	`+ });`
`347`	`347`	`}`
`348`	`348`	`}.curry()));`
`349`	`349`	`}`