Use '_' suffix scheme for first class cata of Option and Either

jbgi · jbgi · commit 18690a20a1a6 · 2016-07-01T12:41:23.000+02:00
diff --git a/core/src/main/java/fj/Equal.java b/core/src/main/java/fj/Equal.java
@@ -281,8 +281,8 @@ public static <A, B> Equal<Either<A, B>> eitherEqual(final Equal<A> ea, final Eq
     Definition<A> eaDef = ea.def;
     Definition<B> ebDef = eb.def;
     return equalDef(e1 -> e1.either(
-        a1 -> Either.cata(eaDef.equal(a1), (B __) -> false),
-        b1 -> Either.cata((A __)-> false, ebDef.equal(b1))
+        a1 -> Either.either_(eaDef.equal(a1), (B __) -> false),
+        b1 -> Either.either_((A __)-> false, ebDef.equal(b1))
     ));
   }
 
@@ -341,7 +341,7 @@ public static <A> Equal<Option<A>> optionEqual(final Equal<A> ea) {
     Definition<A> eaDef = ea.def;
     return equalDef(o1 -> o1.option(
         Option.isNone_(),
-        a1 -> Option.cata(false, eaDef.equal(a1))
+        a1 -> Option.option_(false, eaDef.equal(a1))
     ));
   }
 
diff --git a/core/src/main/java/fj/data/Either.java b/core/src/main/java/fj/data/Either.java
@@ -744,7 +744,7 @@ public static <A, B> Either<A, B> right(final B b) {
    * @param right The function to call if this is right.
    * @return The reducing function.
    */
-  public static <A, B, X> F<Either<A,B>, X> cata(final F<A, X> left, final F<B, X> right) {
+  public static <A, B, X> F<Either<A,B>, X> either_(final F<A, X> left, final F<B, X> right) {
     return e -> e.either(left, right);
   }
 
diff --git a/core/src/main/java/fj/data/Option.java b/core/src/main/java/fj/data/Option.java
@@ -696,7 +696,7 @@ public static <T> F<T, Option<T>> fromNull() {
    * @param some The function to apply to the value of this optional value.
    * @return the reducing function.
    */
-  public static final <A, B> F<Option<A>, B> cata(final B none, final F<A, B> some) {
+  public static final <A, B> F<Option<A>, B> option_(final B none, final F<A, B> some) {
     return o -> o.option(none, some);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ public static <A, B> Either<A, B> right(final B b) {`
`744`	`744`	`* @param right The function to call if this is right.`
`745`	`745`	`* @return The reducing function.`
`746`	`746`	`*/`
`747`		`- public static <A, B, X> F<Either<A,B>, X> cata(final F<A, X> left, final F<B, X> right) {`
	`747`	`+ public static <A, B, X> F<Either<A,B>, X> either_(final F<A, X> left, final F<B, X> right) {`
`748`	`748`	`return e -> e.either(left, right);`
`749`	`749`	`}`
`750`	`750`
Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,7 @@ public static <T> F<T, Option<T>> fromNull() {`
`696`	`696`	`* @param some The function to apply to the value of this optional value.`
`697`	`697`	`* @return the reducing function.`
`698`	`698`	`*/`
`699`		`- public static final <A, B> F<Option<A>, B> cata(final B none, final F<A, B> some) {`
	`699`	`+ public static final <A, B> F<Option<A>, B> option_(final B none, final F<A, B> some) {`
`700`	`700`	`return o -> o.option(none, some);`
`701`	`701`	`}`
`702`	`702`