more consistency

Author: bobzhang

jscomp/others/.depend

@@ -114,7 +114,7 @@ bs_HashSet.cmi : bs_Hash.cmi bs_Bag.cmj
 bs_HashSetString.cmi :
 bs_HashSetInt.cmi :
 bs_Cmp.cmi :
-bs_Map.cmi : bs_Cmp.cmi bs_Bag.cmj
+bs_Map.cmi : bs_Cmp.cmi
 bs_MapString.cmi :
 bs_MapInt.cmi :
 bs_MapStringM.cmi :

jscomp/others/bs_Map.ml

@@ -21,7 +21,7 @@ type ('k,'v,'id) t =
   (('k,'id) Bs_Cmp.t,
    ('k,'v, 'id) t0 ) B.bag 
 
-let rec update0  (t : _ t0) newK newD  ~cmp =
+let rec set0  (t : _ t0) newK newD  ~cmp =
   match N.toOpt t with 
   | None -> N.singleton0 newK newD 
   | Some n  ->
@@ -32,9 +32,9 @@ let rec update0  (t : _ t0) newK newD  ~cmp =
     else 
       let l,r,v = N.left n, N.right n, N.value n in 
       if c < 0 then
-        N.bal (update0 ~cmp l newK newD ) k v  r
+        N.bal (set0 ~cmp l newK newD ) k v  r
       else
-        N.bal l k v (update0 ~cmp r newK newD )
+        N.bal l k v (set0 ~cmp r newK newD )
 
 let rec updateWithOpt0  (t : _ t0) newK f  ~cmp =
   match N.toOpt t with 
@@ -109,7 +109,7 @@ let updateArray0   h arr ~cmp =
   let v = ref h in  
   for i = 0 to len - 1 do 
     let key,value = A.unsafe_get arr i in 
-    v := update0 !v  ~cmp key value
+    v := set0 !v  ~cmp key value
   done ;
   !v 
 
@@ -220,18 +220,18 @@ let removeArray (type k) (type id) (m : (k,_,id) t) xs =
     if newData == odata then m 
     else B.bag ~dict ~data:newData
 
-let update (type k) (type id) (map : (k,_,id) t) key data  = 
+let set (type k) (type id) (map : (k,_,id) t) key data  = 
   let dict,map = B.(dict map, data map) in 
   let module X = (val dict) in 
-  B.bag ~dict ~data:(update0 ~cmp:X.cmp map key data )
+  B.bag ~dict ~data:(set0 ~cmp:X.cmp map key data )
 
 let updateArray (type elt) (type id) (m : (elt,_,id) t) e = 
   let dict, data = B.(dict m, data m) in 
   let module M = (val dict) in 
   let newData = updateArray0 ~cmp:M.cmp data e in 
   B.bag ~dict ~data:newData  
 
-let updateWithOpt (type k) (type id) (map : (k,_,id) t) key f  = 
+let setWithOpt (type k) (type id) (map : (k,_,id) t) key f  = 
   let dict,map = B.(dict map, data map) in 
   let module X = (val dict) in 
   B.bag ~dict ~data:(updateWithOpt0 ~cmp:X.cmp map key f )
@@ -315,7 +315,7 @@ let minKeyValueNull m = N.minKVNull0 (B.data m)
 let maxKeyValueOpt m = N.maxKVOpt0 (B.data m)
 let maxKeyValueNull m = N.maxKVNull0 (B.data m)
 
-let getOpt (type k) (type id) (map : (k,_,id) t) x  = 
+let get (type k) (type id) (map : (k,_,id) t) x  = 
   let dict,map = B.(dict map, data map) in 
   let module X = (val dict) in 
   N.findOpt0 ~cmp:X.cmp  map x 
@@ -372,3 +372,6 @@ let map0  = N.map0
 
 let filter0 = N.filterShared0
 let partition0 = N.partitionShared0
+let getData = B.data
+let getDict = B.dict
+let packDictData = B.bag 

jscomp/others/bs_Map.mli

@@ -20,9 +20,7 @@ type ('k,  'v, 'id) t0
 *)
 
 
-type ('k,'v,'id) t = 
-  (('k,'id) Bs_Cmp.t,
-   ('k,'v, 'id) t0 ) Bs_Bag.bag
+type ('k,'v,'id) t 
 (** The data associated with a comparison function *)   
 
 (*
@@ -100,7 +98,7 @@ val minKeyValueOpt: ('k, 'a,  _) t -> ('k * 'a) option
 val minKeyValueNull: ('k, 'a, _) t -> ('k * 'a) Js.null
 val maxKeyValueOpt: ('k, 'a, _) t -> ('k * 'a) option
 val maxKeyValueNull:('k, 'a, _) t -> ('k * 'a) Js.null
-val getOpt:  ('k, 'a, 'id) t -> 'k -> 'a option
+val get:  ('k, 'a, 'id) t -> 'k -> 'a option
 val getNull: ('k, 'a, 'id) t -> 'k ->  'a Js.null
 val getWithDefault:
     ('k, 'a, 'id) t -> 'k ->  'a -> 'a 
@@ -112,18 +110,19 @@ val remove:  ('k, 'a, 'id) t -> 'k -> ('k, 'a, 'id) t
 (** [remove m x] when [x] is not in [m], [m] is returned reference unchanged *)
 val removeArray: ('k, 'a, 'id) t -> 'k array -> ('k, 'a, 'id) t  
 
-val update: 
+val set: 
     ('k, 'a, 'id) t -> 'k -> 'a ->  ('k, 'a, 'id) t
-(** [update m x y ] returns a map containing the same bindings as
+(** [set m x y ] returns a map containing the same bindings as
     [m], with a new binding of [x] to [y]. If [x] was already bound
     in [m], its previous binding disappears. *)
-val updateArray:
-    ('k, 'a, 'id) t -> ('k * 'a) array ->  ('k, 'a, 'id) t
-val updateWithOpt:     
+val setWithOpt:     
     ('k, 'a, 'id) t ->  
     'k -> 
     ('k option -> 'a option [@bs]) -> 
     ('k, 'a, 'id) t 
+      
+val updateArray:
+    ('k, 'a, 'id) t -> ('k * 'a) array ->  ('k, 'a, 'id) t
 
 
 val merge:
@@ -177,6 +176,10 @@ val mapi: ('k, 'a, 'id) t -> ('k -> 'a -> 'b [@bs]) -> ('k, 'b, 'id) t
 
 (****************************************************************************)
 
+val getData: ('k,'v,'id) t  -> ('k,'v,'id) t0
+val getDict: ('k,'v,'id) t  -> ('k,'id) Bs_Cmp.t
+val packDictData: dict:('k, 'id) Bs_Cmp.t -> data:('k, 'v, 'id) t0 -> ('k, 'v, 'id) t
+
 val empty0 : ('k, 'a, 'id) t0
 val ofArray0:  
   cmp: ('k,'id) Bs_Cmp.cmp -> 
@@ -190,7 +193,7 @@ val mem0:
    cmp: ('k,'id) Bs_Cmp.cmp -> 
    bool
 
-val update0: 
+val set0: 
   ('k, 'a, 'id) t0 -> 
   'k -> 
   'a -> 

jscomp/others/bs_MapInt.ml

@@ -36,7 +36,7 @@ let keysToArray = N.keysToArray0
 let valuesToArray = N.valuesToArray0 
 let checkInvariant = N.checkInvariant
 
-let rec update  t (newK : key) (newD : _)  = 
+let rec set  t (newK : key) (newD : _)  = 
   match N.toOpt t with
   | None -> 
     N.singleton0 newK newD
@@ -47,11 +47,11 @@ let rec update  t (newK : key) (newD : _)  =
     else
       let v = N.value n in 
       if newK < k then
-        N.bal (update (N.left n) newK newD) k v (N.right n)
+        N.bal (set (N.left n) newK newD) k v (N.right n)
       else
-        N.bal (N.left n) k v (update (N.right n) newK newD)
+        N.bal (N.left n) k v (set (N.right n) newK newD)
 
-let rec updateWithOpt  t (x : key) f  = 
+let rec setWithOpt  t (x : key) f  = 
   match N.toOpt t with
   | None -> 
     begin match f None [@bs] with 
@@ -69,9 +69,9 @@ let rec updateWithOpt  t (x : key) f  =
     else
       let v = N.value n in 
       if x < k then
-        N.bal (updateWithOpt (N.left n) x f) k v (N.right n)
+        N.bal (setWithOpt (N.left n) x f) k v (N.right n)
       else
-        N.bal (N.left n) k v (updateWithOpt (N.right n) x f)        
+        N.bal (N.left n) k v (setWithOpt (N.right n) x f)        
 
 let rec removeAux n (x : key) = 
     let l,v,r = N.(left n, key n, right n) in 
@@ -121,7 +121,7 @@ let removeArray t keys =
 let mem = I.mem 
 let cmp = I.cmp 
 let eq = I.eq 
-let getOpt = I.findOpt
+let get = I.findOpt
 let getNull = I.findNull 
 let getWithDefault = I.findWithDefault 
 let getExn = I.findExn

jscomp/others/bs_MapInt.mli

@@ -51,7 +51,7 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
 val minKeyValueNull: 'a t -> (key * 'a) Js.null
 val maxKeyValueOpt: 'a t -> (key * 'a) option
 val maxKeyValueNull: 'a t -> (key * 'a) Js.null
-val getOpt: 'a t -> key -> 'a option
+val get: 'a t -> key -> 'a option
 val getNull: 'a t -> key -> 'a Js.null
 val getWithDefault:  'a t -> key -> 'a  -> 'a
 val getExn: 'a t -> key -> 'a 
@@ -63,11 +63,11 @@ val remove: 'a t ->  key -> 'a t
    [m], except for [x] which is unbound in the returned map. *)
 val removeArray: 'a t -> key array -> 'a t
 
-val update: 'a t ->  key -> 'a -> 'a t
+val set: 'a t ->  key -> 'a -> 'a t
 (** [add m x y] returns a map containing the same bindings as
    [m], plus a binding of [x] to [y]. If [x] was already bound
    in [m], its previous binding disappears. *)
-val updateWithOpt:
+val setWithOpt:
     'a t -> 
     key -> 
     (key option -> 'a option [@bs]) -> 

jscomp/others/bs_MapIntM.ml

@@ -27,14 +27,14 @@ let minKeyValueNull m = N.minKVNull0 (data m)
 let maxKeyValueOpt m = N.maxKVOpt0 (data m)
 let maxKeyValueNull m = N.maxKVNull0 (data m)
 
-let addDone (m : _ t) k v = 
+let setDone (m : _ t) k v = 
   let old_data = data m in 
   let v = I.addMutate old_data k v in 
   if v != old_data then 
     dataSet m v 
 
-let add (d : 'a t) (k : key) (v : 'a) : 'a t=  
-  addDone d k v; 
+let set (d : 'a t) (k : key) (v : 'a) : 'a t=  
+  setDone d k v; 
   d
 let iter d f = N.iter0 (data d) f     
 let map d f = t ~data:(N.map0 (data d) f)
@@ -130,7 +130,7 @@ let cmp d0 d1 =
   I.cmp (data d0) (data d1)
 let eq d0 d1 = 
   I.eq (data d0) (data d1)
-let getOpt d x = 
+let get d x = 
   I.findOpt (data d) x 
 let getNull d x = I.findNull (data d) x 
 let getWithDefault d x def = I.findWithDefault (data d) x def  

jscomp/others/bs_MapIntM.mli

@@ -57,7 +57,7 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
 val minKeyValueNull: 'a t -> (key * 'a) Js.null
 val maxKeyValueOpt: 'a t -> (key * 'a) option
 val maxKeyValueNull: 'a t -> (key * 'a) Js.null
-val getOpt: 'a t ->  key -> 'a option
+val get: 'a t ->  key -> 'a option
 val getNull: 'a t -> key -> 'a Js.null
 val getWithDefault:  'a t -> key -> 'a  -> 'a
 val getExn: 'a t -> key -> 'a
@@ -72,8 +72,8 @@ val remove: 'a t ->  key -> 'a t
 val removeArrayDone: 'a t -> key array -> unit
 val removeArray: 'a t -> key array -> 'a t
 
-val addDone: 'a t -> key -> 'a -> unit  
-val add: 'a t ->  key -> 'a -> 'a t
+val setDone: 'a t -> key -> 'a -> unit  
+val set: 'a t ->  key -> 'a -> 'a t
 (** [add m x y] do the in-place modification, return
     [m] for chaining. If [x] was already bound
    in [m], its previous binding disappears. *)

jscomp/others/bs_MapM.ml

@@ -150,7 +150,7 @@ let map m f =
 let mapi map  f = 
   let dict,map = B.(dict map, data map) in 
   B.bag ~dict ~data:(N.mapi0 map f)
-let getOpt (type k) (type id) (map : (k,_,id) t) x  = 
+let get (type k) (type id) (map : (k,_,id) t) x  = 
   let dict,map = B.(dict map, data map) in 
   let module X = (val dict) in 
   N.findOpt0 ~cmp:X.cmp  map x 
@@ -173,14 +173,14 @@ let mem (type k) (type id)  (map : (k,_,id) t) x =
 let ofArray (type k) (type id) data ~(dict : (k,id) Bs_Cmp.t)= 
   let module M = (val dict ) in 
   B.bag ~dict  ~data:(N.ofArray0 ~cmp:M.cmp data)  
-let updateDone (type elt) (type id) (m : (elt,_,id) t) e v = 
+let setDone (type elt) (type id) (m : (elt,_,id) t) e v = 
   let dict, oldRoot = B.(dict m, data m) in 
   let module M = (val dict) in 
   let newRoot = N.updateMutate ~cmp:M.cmp oldRoot e v in 
   if newRoot != oldRoot then 
     B.dataSet m newRoot
-let update m e v = 
-  updateDone m e v;
+let set m e v = 
+  setDone m e v;
   m
 let updateArrayMutate t  xs ~cmp =     
   let v = ref t in 

jscomp/others/bs_MapM.mli

@@ -84,7 +84,7 @@ val minKeyValueOpt: ('k, 'a,  _) t -> ('k * 'a) option
 val minKeyValueNull: ('k, 'a, _) t -> ('k * 'a) Js.null
 val maxKeyValueOpt: ('k, 'a, _) t -> ('k * 'a) option
 val maxKeyValueNull:('k, 'a, _) t -> ('k * 'a) Js.null
-val getOpt:  ('k, 'a, 'id) t -> 'k -> 'a option
+val get:  ('k, 'a, 'id) t -> 'k -> 'a option
 val getNull: ('k, 'a, 'id) t -> 'k ->  'a Js.null
 val getWithDefault:
     ('k, 'a, 'id) t -> 'k ->  'a -> 'a 
@@ -103,9 +103,9 @@ val removeArray: ('k, 'a, 'id) t -> 'k array -> ('k, 'a, 'id) t
 
 
 
-val updateDone: ('k, 'a, 'id) t -> 'k -> 'a ->  unit
-val update: ('k, 'a, 'id) t -> 'k -> 'a ->  ('k, 'a, 'id) t
-(** [update m x y ] do the in-place modification, returnning [m] for chaining. *)
+val setDone: ('k, 'a, 'id) t -> 'k -> 'a ->  unit
+val set: ('k, 'a, 'id) t -> 'k -> 'a ->  ('k, 'a, 'id) t
+(** [set m x y ] do the in-place modification, returnning [m] for chaining. *)
 
 
 

jscomp/others/bs_MapString.ml

@@ -36,7 +36,7 @@ let keysToArray = N.keysToArray0
 let valuesToArray = N.valuesToArray0 
 let checkInvariant = N.checkInvariant
 
-let rec update  t (newK : key) (newD : _)  = 
+let rec set  t (newK : key) (newD : _)  = 
   match N.toOpt t with
   | None -> 
     N.singleton0 newK newD
@@ -47,11 +47,11 @@ let rec update  t (newK : key) (newD : _)  =
     else
       let v = N.value n in 
       if newK < k then
-        N.bal (update (N.left n) newK newD) k v (N.right n)
+        N.bal (set (N.left n) newK newD) k v (N.right n)
       else
-        N.bal (N.left n) k v (update (N.right n) newK newD)
+        N.bal (N.left n) k v (set (N.right n) newK newD)
 
-let rec updateWithOpt  t (x : key) f  = 
+let rec setWithOpt  t (x : key) f  = 
   match N.toOpt t with
   | None -> 
     begin match f None [@bs] with 
@@ -69,9 +69,9 @@ let rec updateWithOpt  t (x : key) f  =
     else
       let v = N.value n in 
       if x < k then
-        N.bal (updateWithOpt (N.left n) x f) k v (N.right n)
+        N.bal (setWithOpt (N.left n) x f) k v (N.right n)
       else
-        N.bal (N.left n) k v (updateWithOpt (N.right n) x f)        
+        N.bal (N.left n) k v (setWithOpt (N.right n) x f)        
 
 let rec removeAux n (x : key) = 
     let l,v,r = N.(left n, key n, right n) in 
@@ -121,7 +121,7 @@ let removeArray t keys =
 let mem = I.mem 
 let cmp = I.cmp 
 let eq = I.eq 
-let getOpt = I.findOpt
+let get = I.findOpt
 let getNull = I.findNull 
 let getWithDefault = I.findWithDefault 
 let getExn = I.findExn

jscomp/others/bs_MapString.mli

@@ -51,7 +51,7 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
 val minKeyValueNull: 'a t -> (key * 'a) Js.null
 val maxKeyValueOpt: 'a t -> (key * 'a) option
 val maxKeyValueNull: 'a t -> (key * 'a) Js.null
-val getOpt: 'a t -> key -> 'a option
+val get: 'a t -> key -> 'a option
 val getNull: 'a t -> key -> 'a Js.null
 val getWithDefault:  'a t -> key -> 'a  -> 'a
 val getExn: 'a t -> key -> 'a 
@@ -63,11 +63,11 @@ val remove: 'a t ->  key -> 'a t
    [m], except for [x] which is unbound in the returned map. *)
 val removeArray: 'a t -> key array -> 'a t
 
-val update: 'a t ->  key -> 'a -> 'a t
+val set: 'a t ->  key -> 'a -> 'a t
 (** [add m x y] returns a map containing the same bindings as
    [m], plus a binding of [x] to [y]. If [x] was already bound
    in [m], its previous binding disappears. *)
-val updateWithOpt:
+val setWithOpt:
     'a t -> 
     key -> 
     (key option -> 'a option [@bs]) ->