Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion jscomp/others/belt_HashMap.ml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ let make (type key) (type identity) ~hintSize ~(id : (key,identity) id) =
C.make ~hash:M.hash ~eq:M.eq ~hintSize


let ofArray (type a) (type identity) arr ~id:(id:(a,identity) id) =
let fromArray (type a) (type identity) arr ~id:(id:(a,identity) id) =
let module M = (val id) in
let hash, eq = M.hash, M.eq in
let len = A.length arr in
Expand All @@ -212,6 +212,8 @@ let ofArray (type a) (type identity) arr ~id:(id:(a,identity) id) =
set0 ~eq ~hash v key value
done ;
v

let ofArray = fromArray

let mergeMany h arr =
let hash, eq = Belt_Id.getHashInternal ( C.hash h) , Belt_Id.getEqInternal (C.eq h) in
Expand Down
4 changes: 3 additions & 1 deletion jscomp/others/belt_HashMap.mli
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,11 @@ val size: _ t -> int
val toArray: ('key, 'value, 'id ) t -> ('key * 'value) array
val keysToArray: ('key, _, _) t -> 'key array
val valuesToArray: (_,'value,_) t -> 'value array
val ofArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t
val fromArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t
val mergeMany: ('key, 'value, 'id ) t -> ('key * 'value) array -> unit
val getBucketHistogram: _ t -> int array
val logStats: _ t -> unit

val ofArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t
[@@ocaml.deprecated "Use fromArray instead"]

4 changes: 3 additions & 1 deletion jscomp/others/belt_HashMapInt.ml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ let valuesToArray = N.valuesToArray
let getBucketHistogram = N.getBucketHistogram
let isEmpty = C.isEmpty

let ofArray arr =
let fromArray arr =
let len = A.length arr in
let v = make len in
for i = 0 to len - 1 do
Expand All @@ -196,6 +196,8 @@ let ofArray arr =
done ;
v

let ofArray = fromArray

(* TOOD: optimize heuristics for resizing *)
let mergeMany h arr =
let len = A.length arr in
Expand Down
5 changes: 4 additions & 1 deletion jscomp/others/belt_HashMapInt.mli
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ val size: _ t -> int
val toArray: 'a t -> (key * 'a) array
val keysToArray: 'a t -> key array
val valuesToArray: 'a t -> 'a array
val ofArray: (key * 'a) array -> 'a t
val fromArray: (key * 'a) array -> 'a t
val mergeMany: 'a t -> (key * 'a) array -> unit
val getBucketHistogram: _ t -> int array
val logStats: _ t -> unit

val ofArray: (key * 'a) array -> 'a t
[@@ocaml.deprecated "Use fromArray instead"]
4 changes: 3 additions & 1 deletion jscomp/others/belt_HashMapString.ml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ let valuesToArray = N.valuesToArray
let getBucketHistogram = N.getBucketHistogram
let isEmpty = C.isEmpty

let ofArray arr =
let fromArray arr =
let len = A.length arr in
let v = make len in
for i = 0 to len - 1 do
Expand All @@ -196,6 +196,8 @@ let ofArray arr =
done ;
v

let ofArray = fromArray

(* TOOD: optimize heuristics for resizing *)
let mergeMany h arr =
let len = A.length arr in
Expand Down
5 changes: 4 additions & 1 deletion jscomp/others/belt_HashMapString.mli
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ val size: _ t -> int
val toArray: 'a t -> (key * 'a) array
val keysToArray: 'a t -> key array
val valuesToArray: 'a t -> 'a array
val ofArray: (key * 'a) array -> 'a t
val fromArray: (key * 'a) array -> 'a t
val mergeMany: 'a t -> (key * 'a) array -> unit
val getBucketHistogram: _ t -> int array
val logStats: _ t -> unit

val ofArray: (key * 'a) array -> 'a t
[@@ocaml.deprecated "Use fromArray instead"]
3 changes: 2 additions & 1 deletion jscomp/others/belt_HashSet.ml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ let copy = N.copy
let getBucketHistogram = N.getBucketHistogram
let isEmpty = C.isEmpty

let ofArray (type a) (type identity) arr ~(id:(a,identity) id) =
let fromArray (type a) (type identity) arr ~(id:(a,identity) id) =
let module M = (val id) in
let eq, hash = M.eq , M.hash in
let len = A.length arr in
Expand All @@ -186,6 +186,7 @@ let ofArray (type a) (type identity) arr ~(id:(a,identity) id) =
done ;
v

let ofArray = fromArray

let mergeMany h arr =
let eq, hash = C.eq h, C.hash h in
Expand Down
3 changes: 3 additions & 0 deletions jscomp/others/belt_HashSet.mli
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ val logStats: _ t -> unit
val toArray: ('a,'id) t -> 'a array

val ofArray: 'a array -> id:('a,'id) id -> ('a,'id) t
[@@ocaml.deprecated "Use fromArray instead"]

val fromArray: 'a array -> id:('a,'id) id -> ('a,'id) t

val mergeMany: ('a,'id) t -> 'a array -> unit

Expand Down
4 changes: 3 additions & 1 deletion jscomp/others/belt_HashSetInt.ml
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,16 @@ let copy = N.copy
let getBucketHistogram = N.getBucketHistogram
let isEmpty = C.isEmpty

let ofArray arr =
let fromArray arr =
let len = A.length arr in
let v = C.make ~hintSize:len ~hash:() ~eq:() in
for i = 0 to len - 1 do
add v (A.getUnsafe arr i)
done ;
v

let ofArray = fromArray

(* TOOD: optimize heuristics for resizing *)
let mergeMany h arr =
let len = A.length arr in
Expand Down
3 changes: 3 additions & 0 deletions jscomp/others/belt_HashSetInt.mli
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ val logStats: t -> unit
val toArray: t -> key array

val ofArray: key array -> t
[@@ocaml.deprecated "Use fromArray instead"]

val fromArray: key array -> t

val mergeMany: t -> key array -> unit

Expand Down
4 changes: 3 additions & 1 deletion jscomp/others/belt_HashSetString.ml
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,16 @@ let copy = N.copy
let getBucketHistogram = N.getBucketHistogram
let isEmpty = C.isEmpty

let ofArray arr =
let fromArray arr =
let len = A.length arr in
let v = C.make ~hintSize:len ~hash:() ~eq:() in
for i = 0 to len - 1 do
add v (A.getUnsafe arr i)
done ;
v

let ofArray = fromArray

(* TOOD: optimize heuristics for resizing *)
let mergeMany h arr =
let len = A.length arr in
Expand Down
3 changes: 3 additions & 0 deletions jscomp/others/belt_HashSetString.mli
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ val logStats: t -> unit
val toArray: t -> key array

val ofArray: key array -> t
[@@ocaml.deprecated "Use fromArray instead"]

val fromArray: key array -> t

val mergeMany: t -> key array -> unit

Expand Down
4 changes: 3 additions & 1 deletion jscomp/others/belt_List.ml
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,11 @@ let rec ofArrayAux a i res =
if i < 0 then res
else ofArrayAux a (i - 1) (A.getUnsafe a i :: res)

let ofArray a =
let fromArray a =
ofArrayAux a (A.length a - 1) []

let ofArray = fromArray

let toArray ( x : _ t) =
let len = length x in
let arr = A.makeUninitializedUnsafe len in
Expand Down
5 changes: 4 additions & 1 deletion jscomp/others/belt_List.mli
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,11 @@ val mapWithIndex: 'a t -> (int -> 'a -> 'b) -> 'b t
*)

val ofArray: 'a array -> 'a t
[@@ocaml.deprecated "Use fromArray instead"]

val fromArray: 'a array -> 'a t
(** @example {[
ofArray [|1;2;3|] = [1;2;3]
fromArray [|1;2;3|] = [1;2;3]
]}
*)

Expand Down
5 changes: 3 additions & 2 deletions jscomp/others/belt_Map.ml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ end

type ('k, 'v, 'id ) t = ('k, 'v, 'id) S.t

let ofArray (type k) (type idx) data ~(id : (k,idx) id) =
let fromArray (type k) (type idx) data ~(id : (k,idx) id) =
let module M = (val id) in
let cmp = M.cmp in
S.t ~cmp ~data:(Dict.ofArray ~cmp data)
S.t ~cmp ~data:(Dict.fromArray ~cmp data)

let ofArray = fromArray

let remove m x =
let cmp, odata = S.cmp m, S.data m in
Expand Down
31 changes: 17 additions & 14 deletions jscomp/others/belt_Map.mli
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ val isEmpty: _ t -> bool
(** [isEmpty s0]
@example {[
module IntCmp = (val Belt.Id.comparable (fun (x:int) y -> Pervasives.compare x y));;
isEmpty (ofArray [|1,"1"|] ~id:(module IntCmp)) = false;;
isEmpty (fromArray [|1,"1"|] ~id:(module IntCmp)) = false;;
]}
*)

Expand All @@ -144,7 +144,7 @@ val has: ('k, 'v, 'id) t -> 'k -> bool

@example {[
module IntCmp = (val Belt.Id.comparable (fun (x:int) y -> Pervasives.compare x y));;
has (ofArray [|1,"1"|] ~id:(module IntCmp)) 1 = true;;
has (fromArray [|1,"1"|] ~id:(module IntCmp)) 1 = true;;
]}
*)

Expand Down Expand Up @@ -191,7 +191,7 @@ val forEach: ('k, 'v, 'id) t -> ('k -> 'v -> unit) -> unit
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;

let s0 = ofArray ~id:(module IntCmp) [|4,"4";1,"1";2,"2,"3""|];;
let s0 = fromArray ~id:(module IntCmp) [|4,"4";1,"1";2,"2,"3""|];;
let acc = ref [] ;;
forEach s0 (fun k v -> acc := (k,v) :: !acc);;

Expand All @@ -209,7 +209,7 @@ val reduce: ('k, 'v, 'id) t -> 'acc -> ('acc -> 'k -> 'v -> 'acc) -> 'acc
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;

let s0 = ofArray ~id:(module IntCmp) [|4,"4";1,"1";2,"2,"3""|];;
let s0 = fromArray ~id:(module IntCmp) [|4,"4";1,"1";2,"2,"3""|];;
reduce s0 [] (fun acc k v -> (k,v) acc ) = [4,"4";3,"3";2,"2";1,"1"];;
]}
*)
Expand All @@ -230,7 +230,7 @@ val size: ('k, 'v, 'id) t -> int
@example {[
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
size (ofArray [2,"2"; 2,"1"; 3,"3"] ~id:(module IntCmp)) = 2 ;;
size (fromArray [2,"2"; 2,"1"; 3,"3"] ~id:(module IntCmp)) = 2 ;;
]}
*)
val toArray: ('k, 'v, 'id) t -> ('k * 'v) array
Expand All @@ -239,7 +239,7 @@ val toArray: ('k, 'v, 'id) t -> ('k * 'v) array
@example {[
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
toArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) = [1,"1";2,"2";3,"3"]
toArray (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) = [1,"1";2,"2";3,"3"]
]}

*)
Expand All @@ -250,11 +250,14 @@ val toList: ('k, 'v, 'id) t -> ('k * 'v) list
*)

val ofArray: ('k * 'v) array -> id:('k,'id) id -> ('k,'v,'id) t
(** [ofArray kvs ~id]
[@@ocaml.deprecated "Use fromArray instead"]

val fromArray: ('k * 'v) array -> id:('k,'id) id -> ('k,'v,'id) t
(** [fromArray kvs ~id]
@example {[
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
toArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) = [1,"1";2,"2";3,"3"]
toArray (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) = [1,"1";2,"2";3,"3"]
]}
*)
val keysToArray: ('k, 'v, 'id) t -> 'k array
Expand All @@ -263,7 +266,7 @@ val keysToArray: ('k, 'v, 'id) t -> 'k array
@example {[
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
keysToArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) =
keysToArray (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) =
[|1;2;3|];;
]}
*)
Expand All @@ -273,7 +276,7 @@ val valuesToArray: ('k, 'v, 'id) t -> 'v array
@example {[
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
valuesToArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) =
valuesToArray (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) =
[|"1";"2";"3"|];;
]}

Expand Down Expand Up @@ -318,9 +321,9 @@ val get: ('k, 'v, 'id) t -> 'k -> 'v option
@example {[
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
get (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) 2 =
get (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) 2 =
Some "2";;
get (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) 2 =
get (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) 2 =
None;;
]}
*)
Expand Down Expand Up @@ -356,7 +359,7 @@ val remove: ('k, 'v, 'id) t -> 'k -> ('k, 'v, 'id) t
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;

let s0 = (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp));;
let s0 = (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp));;

let s1 = remove s0 1;;
let s2 = remove s1 1;;
Expand Down Expand Up @@ -384,7 +387,7 @@ val set:
module IntCmp =
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;

let s0 = (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp));;
let s0 = (fromArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp));;

let s1 = set s0 2 "3";;

Expand Down
1 change: 1 addition & 0 deletions jscomp/others/belt_MapDict.ml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type ('key, 'a, 'id) t = ('key, 'a) N.t
type ('key, 'id) cmp = ('key, 'id) Belt_Id.cmp

let empty = N.empty
let fromArray = N.ofArray
let ofArray = N.ofArray
let isEmpty = N.isEmpty
let cmp = N.cmp
Expand Down
5 changes: 3 additions & 2 deletions jscomp/others/belt_MapDict.mli
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ val size: ('k, 'a, 'id) t -> int
val toList: ('k, 'a, 'id) t -> ('k * 'a) list
(** In increasing order*)
val toArray: ('k, 'a, 'id) t -> ('k * 'a) array
val ofArray:
('k * 'a) array -> cmp:('k,'id) cmp -> ('k,'a,'id) t
val ofArray: ('k * 'a) array -> cmp:('k,'id) cmp -> ('k,'a,'id) t
[@@ocaml.deprecated "Use fromArray instead"]
val fromArray: ('k * 'a) array -> cmp:('k,'id) cmp -> ('k,'a,'id) t
val keysToArray: ('k, 'a, 'id) t -> 'k array
val valuesToArray: ('k, 'a, 'id) t -> 'a array
val minKey: ('k, _, _) t -> 'k option
Expand Down
1 change: 1 addition & 0 deletions jscomp/others/belt_MapInt.ml
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,5 @@ let getExn = I.getExn
let split = I.split
let mergeU = I.mergeU
let merge = I.merge
let fromArray = I.ofArray
let ofArray = I.ofArray
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also change the internal I.ofArray into I.fromArray

2 changes: 2 additions & 0 deletions jscomp/others/belt_MapInt.mli
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ val toList: 'v t -> (key * 'v) list
(** In increasing order with respect *)
val toArray: 'v t -> (key * 'v) array
val ofArray: (key * 'v) array -> 'v t
[@@ocaml.deprecated "Use fromArray instead"]
val fromArray: (key * 'v) array -> 'v t
val keysToArray: 'v t -> key array
val valuesToArray: 'v t -> 'v array
val minKey: _ t -> key option
Expand Down
1 change: 1 addition & 0 deletions jscomp/others/belt_MapString.ml
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,5 @@ let getExn = I.getExn
let split = I.split
let mergeU = I.mergeU
let merge = I.merge
let fromArray = I.ofArray
let ofArray = I.ofArray
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same, maybe a global regex replace should work

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would accidentally grep the ofArray deprecation aliases & msgs if not careful, so I'm doing this semi-manually. Could have been a few clicks of merlin supported cross-file refactoring!

2 changes: 2 additions & 0 deletions jscomp/others/belt_MapString.mli
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ val toList: 'v t -> (key * 'v) list
(** In increasing order with respect *)
val toArray: 'v t -> (key * 'v) array
val ofArray: (key * 'v) array -> 'v t
[@@ocaml.deprecated "Use fromArray instead"]
val fromArray: (key * 'v) array -> 'v t
val keysToArray: 'v t -> key array
val valuesToArray: 'v t -> 'v array
val minKey: _ t -> key option
Expand Down
4 changes: 3 additions & 1 deletion jscomp/others/belt_MutableMap.ml
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,12 @@ let getExn m x =
let has m x =
N.has ~cmp:(S.cmp m) (S.data m) x

let ofArray (type k) (type identity) data ~(id : (k,identity) id)=
let fromArray (type k) (type identity) data ~(id : (k,identity) id)=
let module M = (val id ) in
let cmp = M.cmp in
S.t ~cmp ~data:(N.ofArray ~cmp data)

let ofArray = fromArray

let set m e v =
let oldRoot = S.data m in
Expand Down
Loading