Simplify Option.equal, Option.compare

Author: cknitt

src/Core__Option.mjs

@@ -78,11 +78,10 @@ function isNone(x) {
   return x === undefined;
 }
 
-function equal(a, b, f) {
-  var f$1 = Curry.__2(f);
+function equal(a, b, eq) {
   if (a !== undefined) {
     if (b !== undefined) {
-      return f$1(Caml_option.valFromOption(a), Caml_option.valFromOption(b));
+      return Curry._2(eq, Caml_option.valFromOption(a), Caml_option.valFromOption(b));
     } else {
       return false;
     }
@@ -91,11 +90,10 @@ function equal(a, b, f) {
   }
 }
 
-function compare(a, b, f) {
-  var f$1 = Curry.__2(f);
+function compare(a, b, cmp) {
   if (a !== undefined) {
     if (b !== undefined) {
-      return f$1(Caml_option.valFromOption(a), Caml_option.valFromOption(b));
+      return Curry._2(cmp, Caml_option.valFromOption(a), Caml_option.valFromOption(b));
     } else {
       return 1;
     }

src/Core__Option.res

@@ -90,24 +90,17 @@ let isSome = x =>
 
 let isNone = x => x == None
 
-let equalU = (a, b, f) =>
-  switch a {
-  | Some(a) =>
-    switch b {
-    | None => false
-    | Some(b) => f(. a, b)
-    }
-  | None => b == None
+let equal = (a, b, eq) =>
+  switch (a, b) {
+  | (Some(a), Some(b)) => eq(a, b)
+  | (None, None) => true
+  | (None, Some(_)) | (Some(_), None) => false
   }
 
-let equal = (a, b, f) => equalU(a, b, (. x, y) => f(x, y))
-
-let compareU = (a, b, f) =>
+let compare = (a, b, cmp) =>
   switch (a, b) {
-  | (Some(a), Some(b)) => f(. a, b)
+  | (Some(a), Some(b)) => cmp(a, b)
   | (None, Some(_)) => -1
   | (Some(_), None) => 1
   | (None, None) => 0
   }
-
-let compare = (a, b, f) => compareU(a, b, (. x, y) => f(x, y))