Converted fj root to use lambdas

mperry · mperry · commit 7ee5960d4324 · 2015-08-25T21:36:27.000+10:00
diff --git a/core/src/main/java/fj/Function.java b/core/src/main/java/fj/Function.java
@@ -19,11 +19,7 @@ private Function() {
    * @return A function that is partially-applied to the given value.
    */
   public static <A, B> F<F<A, B>, B> apply(final A a) {
-    return new F<F<A, B>, B>() {
-      public B f(final F<A, B> k) {
-        return k.f(a);
-      }
-    };
+    return f -> f.f(a);
   }
 
   /**
@@ -32,15 +28,7 @@ public B f(final F<A, B> k) {
    * @return A function that composes two functions to produce a new function.
    */
   public static <A, B, C> F<F<B, C>, F<F<A, B>, F<A, C>>> compose() {
-    return new F<F<B, C>, F<F<A, B>, F<A, C>>>() {
-      public F<F<A, B>, F<A, C>> f(final F<B, C> f) {
-        return new F<F<A, B>, F<A, C>>() {
-          public F<A, C> f(final F<A, B> g) {
-            return compose(f, g);
-          }
-        };
-      }
-    };
+    return f -> g -> compose(f, g);
   }
 
   /**
@@ -555,11 +543,7 @@ public static <A, B, C, D, E> F4<A, B, C, D, E> uncurryF4(final F<A, F<B, F<C, F
    * @return An uncurried function.
    */
   public static <A, B, C, D, E, F$, G, H> F<F<A, F<B, F<C, F<D, F<E, F<F$, F<G, H>>>>>>>, F7<A, B, C, D, E, F$, G, H>> uncurryF7() {
-    return new F<F<A, F<B, F<C, F<D, F<E, F<F$, F<G, H>>>>>>>, F7<A, B, C, D, E, F$, G, H>>() {
-      public F7<A, B, C, D, E, F$, G, H> f(final F<A, F<B, F<C, F<D, F<E, F<F$, F<G, H>>>>>>> f) {
-        return uncurryF7(f);
-      }
-    };
+    return f -> uncurryF7(f);
   }
 
   /**
diff --git a/core/src/main/java/fj/Monoid.java b/core/src/main/java/fj/Monoid.java
@@ -151,11 +151,7 @@ public A sumLeft(final Stream<A> as) {
    * @return a function that sums the given values with left-fold.
    */
   public F<List<A>, A> sumLeft() {
-    return new F<List<A>, A>() {
-      public A f(final List<A> as) {
-        return sumLeft(as);
-      }
-    };
+    return as -> sumLeft(as);
   }
 
   /**
@@ -164,11 +160,7 @@ public A f(final List<A> as) {
    * @return a function that sums the given values with right-fold.
    */
   public F<List<A>, A> sumRight() {
-    return new F<List<A>, A>() {
-      public A f(final List<A> as) {
-        return sumRight(as);
-      }
-    };
+    return as -> sumRight(as);
   }
 
   /**
@@ -177,11 +169,7 @@ public A f(final List<A> as) {
    * @return a function that sums the given values with left-fold.
    */
   public F<Stream<A>, A> sumLeftS() {
-    return new F<Stream<A>, A>() {
-      public A f(final Stream<A> as) {
-        return sumLeft(as);
-      }
-    };
+    return as -> sumLeft(as);
   }
 
   /**
diff --git a/core/src/main/java/fj/P.java b/core/src/main/java/fj/P.java
@@ -18,11 +18,7 @@ private P() {
    * @return A function that puts an element in a product-1.
    */
   public static <A> F<A, P1<A>> p1() {
-    return new F<A, P1<A>>() {
-      public P1<A> f(final A a) {
-        return p(a);
-      }
-    };
+    return a -> p(a);
   }
 
   /**
diff --git a/core/src/main/java/fj/P3.java b/core/src/main/java/fj/P3.java
@@ -152,11 +152,7 @@ public C _3() {
    * @return A function that returns the first element of a product.
    */
   public static <A, B, C> F<P3<A, B, C>, A> __1() {
-    return new F<P3<A, B, C>, A>() {
-      public A f(final P3<A, B, C> p) {
-        return p._1();
-      }
-    };
+    return p -> p._1();
   }
 
   /**
@@ -165,11 +161,7 @@ public A f(final P3<A, B, C> p) {
    * @return A function that returns the second element of a product.
    */
   public static <A, B, C> F<P3<A, B, C>, B> __2() {
-    return new F<P3<A, B, C>, B>() {
-      public B f(final P3<A, B, C> p) {
-        return p._2();
-      }
-    };
+    return p -> p._2();
   }
 
   /**
@@ -178,11 +170,7 @@ public B f(final P3<A, B, C> p) {
    * @return A function that returns the third element of a product.
    */
   public static <A, B, C> F<P3<A, B, C>, C> __3() {
-    return new F<P3<A, B, C>, C>() {
-      public C f(final P3<A, B, C> p) {
-        return p._3();
-      }
-    };
+    return p -> p._3();
   }
 
     @Override
diff --git a/core/src/main/java/fj/P4.java b/core/src/main/java/fj/P4.java
@@ -212,11 +212,7 @@ public D _4() {
    * @return A function that returns the first element of a product.
    */
   public static <A, B, C, D> F<P4<A, B, C, D>, A> __1() {
-    return new F<P4<A, B, C, D>, A>() {
-      public A f(final P4<A, B, C, D> p) {
-        return p._1();
-      }
-    };
+    return p -> p._1();
   }
 
   /**
@@ -225,11 +221,7 @@ public A f(final P4<A, B, C, D> p) {
    * @return A function that returns the second element of a product.
    */
   public static <A, B, C, D> F<P4<A, B, C, D>, B> __2() {
-    return new F<P4<A, B, C, D>, B>() {
-      public B f(final P4<A, B, C, D> p) {
-        return p._2();
-      }
-    };
+    return p -> p._2();
   }
 
   /**
@@ -238,11 +230,7 @@ public B f(final P4<A, B, C, D> p) {
    * @return A function that returns the third element of a product.
    */
   public static <A, B, C, D> F<P4<A, B, C, D>, C> __3() {
-    return new F<P4<A, B, C, D>, C>() {
-      public C f(final P4<A, B, C, D> p) {
-        return p._3();
-      }
-    };
+    return p -> p._3();
   }
 
   /**
@@ -251,11 +239,7 @@ public C f(final P4<A, B, C, D> p) {
    * @return A function that returns the fourth element of a product.
    */
   public static <A, B, C, D> F<P4<A, B, C, D>, D> __4() {
-    return new F<P4<A, B, C, D>, D>() {
-      public D f(final P4<A, B, C, D> p) {
-        return p._4();
-      }
-    };
+    return p -> p._4();
   }
 
   @Override
diff --git a/core/src/main/java/fj/P5.java b/core/src/main/java/fj/P5.java
@@ -278,11 +278,7 @@ public E _5() {
    * @return A function that returns the first element of a product.
    */
   public static <A, B, C, D, E> F<P5<A, B, C, D, E>, A> __1() {
-    return new F<P5<A, B, C, D, E>, A>() {
-      public A f(final P5<A, B, C, D, E> p) {
-        return p._1();
-      }
-    };
+    return p -> p._1();
   }
 
   /**
@@ -291,11 +287,7 @@ public A f(final P5<A, B, C, D, E> p) {
    * @return A function that returns the second element of a product.
    */
   public static <A, B, C, D, E> F<P5<A, B, C, D, E>, B> __2() {
-    return new F<P5<A, B, C, D, E>, B>() {
-      public B f(final P5<A, B, C, D, E> p) {
-        return p._2();
-      }
-    };
+    return p -> p._2();
   }
 
   /**
@@ -304,11 +296,7 @@ public B f(final P5<A, B, C, D, E> p) {
    * @return A function that returns the third element of a product.
    */
   public static <A, B, C, D, E> F<P5<A, B, C, D, E>, C> __3() {
-    return new F<P5<A, B, C, D, E>, C>() {
-      public C f(final P5<A, B, C, D, E> p) {
-        return p._3();
-      }
-    };
+    return p -> p._3();
   }
 
   /**
@@ -317,11 +305,7 @@ public C f(final P5<A, B, C, D, E> p) {
    * @return A function that returns the fourth element of a product.
    */
   public static <A, B, C, D, E> F<P5<A, B, C, D, E>, D> __4() {
-    return new F<P5<A, B, C, D, E>, D>() {
-      public D f(final P5<A, B, C, D, E> p) {
-        return p._4();
-      }
-    };
+    return p -> p._4();
   }
 
   /**
@@ -330,11 +314,7 @@ public D f(final P5<A, B, C, D, E> p) {
    * @return A function that returns the fifth element of a product.
    */
   public static <A, B, C, D, E> F<P5<A, B, C, D, E>, E> __5() {
-    return new F<P5<A, B, C, D, E>, E>() {
-      public E f(final P5<A, B, C, D, E> p) {
-        return p._5();
-      }
-    };
+    return p -> p._5();
   }
 
   @Override
diff --git a/core/src/main/java/fj/Primitive.java b/core/src/main/java/fj/Primitive.java
