Add partitionU and switch argument order

Author: mikaelbr

jscomp/others/belt_Array.ml

@@ -408,15 +408,15 @@ let cmpU a b p =
 
 let cmp a b p = cmpU a b (fun[@bs] a b -> p a b)
 
-let partition f a =
+let partitionU a f =
   let l = length a in
   let i = ref 0 in
   let j = ref 0 in
   let a1 = makeUninitializedUnsafe l in
   let a2 = makeUninitializedUnsafe l in
   for ii = 0 to l - 1 do
     let v = getUnsafe a ii in
-    if f v then (
+    if f v [@bs] then (
       setUnsafe a1 !i v;
       incr i
     )
@@ -429,13 +429,15 @@ let partition f a =
   let a2 = slice a2 ~offset:0 ~len:!j in
   (a1, a2)
 
+let partition a f = partitionU a (fun [@bs] x -> f x)
+
 let unzip a =
   let l = length a in
-  let a1 = makeUninitializedUnsafe l in 
-  let a2 = makeUninitializedUnsafe l in 
+  let a1 = makeUninitializedUnsafe l in
+  let a2 = makeUninitializedUnsafe l in
   for i = 0 to l - 1 do
     let (v1, v2) = getUnsafe a i in
     setUnsafe a1 i v1;
-    setUnsafe a2 i v2    
+    setUnsafe a2 i v2
   done;
   (a1, a2)

jscomp/others/belt_Array.mli

@@ -412,12 +412,14 @@ val mapWithIndex: 'a array ->  (int -> 'a -> 'b ) -> 'b array
     ]}
 *)
 
-val partition : ('a -> bool) -> 'a array -> 'a array * 'a array
+
+val partitionU : 'a array -> ('a -> bool [@bs]) -> 'a array * 'a array
+val partition : 'a array ->  ('a -> bool) -> 'a array * 'a array
 (** [partition f a] split array into tuple of two arrays based on predicate f; first of tuple where predicate vause true, second where predicate cause false
 
     @example {[
-      predicate (fun x -> if x mod 2 = 0) [|1;2;3;4;5|] = ([|2;4|], [|1;2;3|]);;
-      predicate (fun x -> if x mod 2 <> 0) [|1;2;3;4;5|] = ([|1;2;3|], [|2;4|]);;
+      predicate [|1;2;3;4;5|] (fun x -> if x mod 2 = 0)  = ([|2;4|], [|1;2;3|]);;
+      predicate [|1;2;3;4;5|] (fun x -> if x mod 2 <> 0) = ([|1;2;3|], [|2;4|]);;
     ]}
 *)
 

jscomp/test/bs_array_test.js

@@ -568,9 +568,9 @@ var a$2 = /* array */[
   5
 ];
 
-var match = Belt_Array.partition((function (x) {
+var match = Belt_Array.partition(a$2, (function (x) {
         return x % 2 === 0;
-      }), a$2);
+      }));
 
 eq("File \"bs_array_test.ml\", line 153, characters 5-12", match[0], /* array */[
       2,
@@ -583,9 +583,9 @@ eq("File \"bs_array_test.ml\", line 154, characters 5-12", match[1], /* array */
       5
     ]);
 
-var match$1 = Belt_Array.partition((function (x) {
+var match$1 = Belt_Array.partition(a$2, (function (x) {
         return x === 2;
-      }), a$2);
+      }));
 
 eq("File \"bs_array_test.ml\", line 156, characters 5-12", match$1[0], /* array */[2]);
 
@@ -596,9 +596,9 @@ eq("File \"bs_array_test.ml\", line 157, characters 5-12", match$1[1], /* array
       5
     ]);
 
-var match$2 = Belt_Array.partition((function () {
+var match$2 = Belt_Array.partition(/* array */[], (function () {
         return false;
-      }), /* array */[]);
+      }));
 
 eq("File \"bs_array_test.ml\", line 159, characters 5-12", match$2[0], /* array */[]);
 

jscomp/test/bs_array_test.ml

@@ -149,13 +149,13 @@ let () =
 
 let () =
   let a = [|1;2;3;4;5|] in
-  let (v0, v1) = A.partition (fun x -> x mod 2 = 0) a in
+  let (v0, v1) = A.partition a (fun x -> x mod 2 = 0) in
   eq __LOC__ v0 [|2;4|];
   eq __LOC__ v1 [|1;3;5|];
-  let (v0, v1) = A.partition (fun x -> x = 2) a in
+  let (v0, v1) = A.partition a (fun x -> x = 2) in
   eq __LOC__ v0 [|2|];
   eq __LOC__ v1 [|1;3;4;5|];
-  let (v0, v1) = A.partition (fun x -> false) [||] in
+  let (v0, v1) = A.partition [||] (fun x -> false)  in
   eq __LOC__ v0 [||];
   eq __LOC__ v1 [||]
 

lib/js/belt_Array.js

@@ -14,7 +14,7 @@ function get(arr, i) {
 
 function getExn(arr, i) {
   if (!(i >= 0 && i < arr.length)) {
-    throw new Error("File \"belt_Array.ml\", line 25, characters 6-12");
+    throw new Error("File \"belt_Array.ml\", line 24, characters 4-10");
   }
   return arr[i];
 }
@@ -30,7 +30,7 @@ function set(arr, i, v) {
 
 function setExn(arr, i, v) {
   if (!(i >= 0 && i < arr.length)) {
-    throw new Error("File \"belt_Array.ml\", line 31, characters 4-10");
+    throw new Error("File \"belt_Array.ml\", line 29, characters 24-30");
   }
   arr[i] = v;
   return /* () */0;
@@ -541,15 +541,15 @@ function cmp(a, b, p) {
   return cmpU(a, b, Curry.__2(p));
 }
 
-function partition(f, a) {
+function partitionU(a, f) {
   var l = a.length;
   var i = 0;
   var j = 0;
   var a1 = new Array(l);
   var a2 = new Array(l);
   for(var ii = 0 ,ii_finish = l - 1 | 0; ii <= ii_finish; ++ii){
     var v = a[ii];
-    if (Curry._1(f, v)) {
+    if (f(v)) {
       a1[i] = v;
       i = i + 1 | 0;
     } else {
@@ -565,6 +565,10 @@ function partition(f, a) {
         ];
 }
 
+function partition(a, f) {
+  return partitionU(a, Curry.__1(f));
+}
+
 function unzip(a) {
   var l = a.length;
   var a1 = new Array(l);
@@ -617,6 +621,7 @@ exports.forEachWithIndexU = forEachWithIndexU;
 exports.forEachWithIndex = forEachWithIndex;
 exports.mapWithIndexU = mapWithIndexU;
 exports.mapWithIndex = mapWithIndex;
+exports.partitionU = partitionU;
 exports.partition = partition;
 exports.reduceU = reduceU;
 exports.reduce = reduce;