remove empty

Author: bobzhang

jscomp/others/belt_MapDict.ml

@@ -29,7 +29,7 @@ type ('key,  'a, 'id) t = ('key, 'a) N.t
 
 type ('key, 'id) cmp = ('key, 'id)  Belt_Id.cmp
 
-let empty = N.empty
+let empty = None
 let fromArray = N.fromArray
 let isEmpty = N.isEmpty
 let cmp = N.cmp
@@ -175,7 +175,7 @@ let rec removeAux0  n x ~cmp =
 
 let remove n x ~cmp = 
   match  n with        
-  | None -> N.empty
+  | None -> None
   | Some n -> removeAux0 n x ~cmp 
 
 let mergeMany   h arr ~cmp =   
@@ -198,14 +198,14 @@ let rec splitAuxPivot n x pres  ~cmp =
   if c < 0 then
     match  l with 
     | None -> 
-      N.empty, N.return n
+      None, N.return n
     | Some l -> 
       let (ll,rl) = splitAuxPivot ~cmp l x pres in
       (ll,  N.join rl v d r)
   else
     match  r with 
     | None ->
-      N.return n, N.empty
+      N.return n, None
     | Some r -> 
       let (lr,  rr) = splitAuxPivot ~cmp r x pres in
       (N.join l v d lr,  rr)
@@ -214,7 +214,7 @@ let rec splitAuxPivot n x pres  ~cmp =
 let split  n x ~cmp = 
   match  n with 
   | None ->     
-    (N.empty, N.empty), None
+    (None, None), None
   | Some n  ->
     let pres = ref None in
     let v = splitAuxPivot ~cmp n x pres in 
@@ -225,7 +225,7 @@ let findFirstBy = N.findFirstBy
 
 let rec mergeU s1 s2 f ~cmp =
   match s1, s2 with
-    (None, None) -> N.empty
+    (None, None) -> None
   | Some _, None -> 
     N.keepMapU s1 (fun[@bs] k v -> 
         f k (Some v) None [@bs]
@@ -270,7 +270,7 @@ let rec removeMany0 t xs i len ~cmp =
 let removeMany t keys ~cmp =
   let len = A.length keys in
   match  t with
-  | None -> N.empty
+  | None -> None
   | Some t ->  removeMany0 t keys 0 len ~cmp 
 
 

jscomp/others/belt_MapInt.ml

@@ -8,7 +8,7 @@ module A = Belt_Array
 
 type 'a t = (key, 'a) N.t
 
-let empty = N.empty      
+let empty = None      
 let isEmpty = N.isEmpty
 (* let singleton = N.singleton *)
 
@@ -121,7 +121,7 @@ let rec removeAux n (x : key) =
 
 let remove n x = 
   match n with 
-  | None -> N.empty
+  | None -> None
   | Some n -> removeAux n x 
 
 let rec removeMany0 t xs i len  =
@@ -137,7 +137,7 @@ let rec removeMany0 t xs i len  =
 let removeMany t keys =
   let len = A.length keys in
   match t with
-  | None -> N.empty
+  | None -> None
   | Some t ->  removeMany0 t keys 0 len
 
 let findFirstByU = N.findFirstByU

jscomp/others/belt_MapString.ml

@@ -8,7 +8,7 @@ module A = Belt_Array
 
 type 'a t = (key, 'a) N.t
 
-let empty = N.empty      
+let empty = None      
 let isEmpty = N.isEmpty
 (* let singleton = N.singleton *)
 
@@ -121,7 +121,7 @@ let rec removeAux n (x : key) =
 
 let remove n x = 
   match n with 
-  | None -> N.empty
+  | None -> None
   | Some n -> removeAux n x 
 
 let rec removeMany0 t xs i len  =
@@ -137,7 +137,7 @@ let rec removeMany0 t xs i len  =
 let removeMany t keys =
   let len = A.length keys in
   match t with
-  | None -> N.empty
+  | None -> None
   | Some t ->  removeMany0 t keys 0 len
 
 let findFirstByU = N.findFirstByU

jscomp/others/belt_MutableMap.ml

@@ -84,7 +84,7 @@ let rec removeArrayMutateAux t xs i len ~cmp  =
     let ele = A.getUnsafe xs i in 
     let u = removeMutateAux t ele ~cmp in 
     match  u with 
-    | None -> N.empty
+    | None -> None
     | Some t -> removeArrayMutateAux t xs (i+1) len ~cmp 
   else N.return t    
 
@@ -141,9 +141,9 @@ let update t x f = updateU t x (fun [@bs] a -> f a)
 
 let make (type key) (type identity) ~(id : (key,identity) id) =
   let module M = (val id) in 
-  {cmp = M.cmp ; data = N.empty}
+  {cmp = M.cmp ; data = None}
 
-let clear m = m.data <- N.empty
+let clear m = m.data <- None
 
 let isEmpty d = 
   N.isEmpty (d.data)

jscomp/others/belt_MutableMapInt.ml

@@ -13,9 +13,9 @@ type 'a t = {
 } 
 
 
-let make () = {data = N.empty}
+let make () = {data = None}
 let isEmpty m = N.isEmpty m.data
-let clear m =  m.data<- N.empty
+let clear m =  m.data<- None
 (* let singleton k v = t ~data:(N.singleton k v) *)
 
 let minKeyUndefined m = N.minKeyUndefined m.data
@@ -135,7 +135,7 @@ let rec removeArrayMutateAux t xs i len   =
     let ele = A.getUnsafe xs i in 
     let u = removeMutateAux t ele  in 
     match  u with 
-    | None -> N.empty
+    | None -> None
     | Some t -> removeArrayMutateAux t xs (i+1) len 
   else N.return t    
 

jscomp/others/belt_MutableMapString.ml

@@ -13,9 +13,9 @@ type 'a t = {
 } 
 
 
-let make () = {data = N.empty}
+let make () = {data = None}
 let isEmpty m = N.isEmpty m.data
-let clear m =  m.data<- N.empty
+let clear m =  m.data<- None
 (* let singleton k v = t ~data:(N.singleton k v) *)
 
 let minKeyUndefined m = N.minKeyUndefined m.data
@@ -135,7 +135,7 @@ let rec removeArrayMutateAux t xs i len   =
     let ele = A.getUnsafe xs i in 
     let u = removeMutateAux t ele  in 
     match  u with 
-    | None -> N.empty
+    | None -> None
     | Some t -> removeArrayMutateAux t xs (i+1) len 
   else N.return t    
 

jscomp/others/belt_internalAVLtree.ml

@@ -29,7 +29,7 @@ module A = Belt_Array
 module S = Belt_SortArray
 
 external return : 'a -> 'a option = "%identity"
-let empty = None
+
 external unsafeCoerce : 'a option -> 'a = "%identity"
 
 
@@ -51,7 +51,7 @@ let create l x d r =
   return { left = l ; key = x ; value = d ; right = r ; height = (if hl >= hr then hl + 1 else hr + 1)}
 
 let singleton x d =
-  return { left = empty; key = x;  value = d; right = empty; height = 1}
+  return { left = None; key = x;  value = d; right = None; height = 1}
 
 let heightGe l r =
   match  l,  r with
@@ -198,7 +198,7 @@ let forEach n f = forEachU n (fun [@bs] a b -> f a b)
 let rec mapU n f =
   match  n with
     None  ->
-    empty
+    None
   | Some n  ->
     let newLeft = n .left |. mapU  f in
     let newD = f n.value [@bs] in
@@ -210,7 +210,7 @@ let map n f = mapU n (fun[@bs] a -> f a)
 let rec mapWithKeyU n f =
   match  n with
     None ->
-    empty
+    None
   | Some n ->
     let key = n.key  in
     let newLeft = n .left |. mapWithKeyU  f in
@@ -304,7 +304,7 @@ let concatOrJoin t1 v d t2 =
 
 let rec keepSharedU n p =
   match  n with
-    None -> empty
+    None -> None
   | Some n  ->
     (* call [p] in the expected left-to-right order *)
     let  {key = v; value = d} =  n   in
@@ -317,7 +317,7 @@ let keepShared n p = keepSharedU n (fun [@bs] a b -> p a b)
 
 let rec keepMapU n p =
   match  n with
-    None -> empty
+    None -> None
   | Some n  ->
     (* call [p] in the expected left-to-right order *)
     let  {key = v; value = d} =  n  in
@@ -332,7 +332,7 @@ let keepMap n p = keepMapU n (fun[@bs] a b -> p a b)
 
 let rec partitionSharedU n p =
   match  n with
-    None -> (empty, empty)
+    None -> (None, None)
   | Some n  ->
     let  {key; value } =  n  in
     (* call [p] in the expected left-to-right order *)
@@ -499,12 +499,12 @@ let valuesToArray n =
 
 let rec fromSortedArrayRevAux arr off len =
   match len with
-  | 0 -> empty
+  | 0 -> None
   | 1 -> let k, v = (A.getUnsafe arr off) in singleton k v
   | 2 ->
     let (x0,y0),(x1,y1) = A.(getUnsafe arr off, getUnsafe arr (off - 1) )
     in
-    return { left = (singleton x0 y0);  key = x1; value = y1; height = 2; right = empty}
+    return { left = (singleton x0 y0);  key = x1; value = y1; height = 2; right = None}
   | 3 ->
     let (x0,y0),(x1,y1),(x2,y2) =
       A.(getUnsafe arr off,
@@ -526,12 +526,12 @@ let rec fromSortedArrayRevAux arr off len =
 
 let rec fromSortedArrayAux arr off len =
   match len with
-  | 0 -> empty
+  | 0 -> None
   | 1 -> let k, v = (A.getUnsafe arr off) in singleton k v
   | 2 ->
     let (x0,y0),(x1,y1) = A.(getUnsafe arr off, getUnsafe arr (off + 1) )
     in
-    return {left = (singleton x0 y0);  key = x1 ; value = y1; height = 2; right = empty}
+    return {left = (singleton x0 y0);  key = x1 ; value = y1; height = 2; right = None}
   | 3 ->
     let (x0,y0),(x1,y1),(x2,y2) =
       A.(getUnsafe arr off,
@@ -734,7 +734,7 @@ let rec updateMutate (t : _ t) x data ~cmp =
 
 let fromArray (xs : _ array) ~cmp =
   let len = A.length xs in
-  if len = 0 then empty
+  if len = 0 then None
   else
     let next =
       ref (S.strictlySortedLengthU xs

jscomp/others/belt_internalAVLtree.mli

@@ -37,8 +37,7 @@ and ('k,  'v) node  =  {
 
 
 external return : 'a -> 'a option = "%identity"
-val empty : _ t
-(* val empty : _ t *)
+
 type ('k, 'id) cmp = ('k, 'id) Belt_Id.cmp
 
 val copy : ('k, 'v) t -> ('k, 'v) t

jscomp/others/belt_internalMapInt.ml

@@ -90,27 +90,27 @@ let rec splitAux (x : key) (n : _ N.node) : _ t * _ option  * _ t =
   if x < v then
     match l with 
     | None -> 
-      N.(empty , None, return n)
+      None, None, Some n
     | Some l -> 
       let (ll, pres, rl) = splitAux x l in (ll, pres, N.join rl v d r)
   else
     match r with 
     | None ->
-      N.(return n, None, empty)
+      Some n, None, None
     | Some r -> 
       let (lr, pres, rr) = splitAux x r in (N.join l v d lr, pres, rr)
 
 
 let split (x : key) n =
   match n with 
     None ->
-    N.(empty, None, empty)
+    None, None, None
   | Some n -> 
     splitAux x n 
 
 let rec mergeU s1 s2 f =
   match s1, s2 with
-    (None, None) -> N.empty
+    (None, None) -> None
   | Some n (* (Node (l1, v1, d1, r1, h1), _)*), _ 
     when (n.N.height >= (match s2 with None -> 0 | Some n -> n.N.height)) ->
     let {N.left = l1; key = v1; value = d1; right = r1} = n in 
@@ -197,7 +197,7 @@ let rec addMutate  (t : _ t) x data : _ t =
 
 let fromArray (xs : (key * _) array) =   
   let len = A.length xs in 
-  if len = 0 then N.empty
+  if len = 0 then None
   else
     let next = 
         ref (S.strictlySortedLengthU xs 

jscomp/others/belt_internalMapString.ml

@@ -90,27 +90,27 @@ let rec splitAux (x : key) (n : _ N.node) : _ t * _ option  * _ t =
   if x < v then
     match l with 
     | None -> 
-      N.(empty , None, return n)
+      None, None, Some n
     | Some l -> 
       let (ll, pres, rl) = splitAux x l in (ll, pres, N.join rl v d r)
   else
     match r with 
     | None ->
-      N.(return n, None, empty)
+      Some n, None, None
     | Some r -> 
       let (lr, pres, rr) = splitAux x r in (N.join l v d lr, pres, rr)
 
 
 let split (x : key) n =
   match n with 
     None ->
-    N.(empty, None, empty)
+    None, None, None
   | Some n -> 
     splitAux x n 
 
 let rec mergeU s1 s2 f =
   match s1, s2 with
-    (None, None) -> N.empty
+    (None, None) -> None
   | Some n (* (Node (l1, v1, d1, r1, h1), _)*), _ 
     when (n.N.height >= (match s2 with None -> 0 | Some n -> n.N.height)) ->
     let {N.left = l1; key = v1; value = d1; right = r1} = n in 
@@ -197,7 +197,7 @@ let rec addMutate  (t : _ t) x data : _ t =
 
 let fromArray (xs : (key * _) array) =   
   let len = A.length xs in 
-  if len = 0 then N.empty
+  if len = 0 then None
   else
     let next = 
         ref (S.strictlySortedLengthU xs