Skip to content

Commit 4de5a64

Browse files
bobzhangbobzhang
committed
more consistent
1 parent 215f9f6 commit 4de5a64

30 files changed

+179
-171
lines changed

‎jscomp/others/bs_Map.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -279,22 +279,22 @@ let minKeyValueNull m = N.minKVNull0 (B.data m)
279279
let maxKeyValueOpt m = N.maxKVOpt0 (B.data m)
280280
let maxKeyValueNull m = N.maxKVNull0 (B.data m)
281281

282-
let findOpt (type k) (type id) (map : (k,_,id) t) x =
282+
let getOpt (type k) (type id) (map : (k,_,id) t) x =
283283
let dict,map = B.(dict map, data map) in
284284
let module X = (val dict) in
285285
N.findOpt0 ~cmp:X.cmp map x
286286

287-
let findNull (type k) (type id) (map : (k,_,id) t) x =
287+
let getNull (type k) (type id) (map : (k,_,id) t) x =
288288
let dict,map = B.(dict map, data map) in
289289
let module X = (val dict) in
290290
N.findNull0 ~cmp:X.cmp map x
291291

292-
let findWithDefault (type k) (type id) (map : (k,_,id) t) x def =
292+
let getWithDefault (type k) (type id) (map : (k,_,id) t) x def =
293293
let dict,map = B.(dict map, data map) in
294294
let module X = (val dict) in
295295
N.findWithDefault0 ~cmp:X.cmp map x def
296296

297-
let findExn (type k) (type id) (map : (k,_,id) t) x =
297+
let getExn (type k) (type id) (map : (k,_,id) t) x =
298298
let dict,map = B.(dict map, data map) in
299299
let module X = (val dict) in
300300
N.findExn0 ~cmp:X.cmp map x

‎jscomp/others/bs_Map.mli

+7-6
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,17 @@ val minKeyValueOpt: ('k, 'a, _) t -> ('k * 'a) option
100100
val minKeyValueNull: ('k, 'a, _) t -> ('k * 'a) Js.null
101101
val maxKeyValueOpt: ('k, 'a, _) t -> ('k * 'a) option
102102
val maxKeyValueNull:('k, 'a, _) t -> ('k * 'a) Js.null
103-
val findOpt: ('k, 'a, 'id) t -> 'k -> 'a option
104-
val findNull: ('k, 'a, 'id) t -> 'k -> 'a Js.null
105-
val findWithDefault:
103+
val getOpt: ('k, 'a, 'id) t -> 'k -> 'a option
104+
val getNull: ('k, 'a, 'id) t -> 'k -> 'a Js.null
105+
val getWithDefault:
106106
('k, 'a, 'id) t -> 'k -> 'a -> 'a
107-
val findExn: ('k, 'a, 'id) t -> 'k -> 'a
107+
val getExn: ('k, 'a, 'id) t -> 'k -> 'a
108108

109109
(****************************************************************************)
110110

111+
val remove: ('k, 'a, 'id) t -> 'k -> ('k, 'a, 'id) t
112+
(** [remove m x] when [x] is not in [m], [m] is returned reference unchanged *)
113+
111114
val update:
112115
('k, 'a, 'id) t -> 'k -> 'a -> ('k, 'a, 'id) t
113116
(** [update m x y ] returns a map containing the same bindings as
@@ -121,8 +124,6 @@ val updateWithOpt:
121124
('k option -> 'a option [@bs]) ->
122125
('k, 'a, 'id) t
123126

124-
val remove: ('k, 'a, 'id) t -> 'k -> ('k, 'a, 'id) t
125-
(** [remove m x] when [x] is not in [m], [m] is returned reference unchanged *)
126127

127128
val merge:
128129
('k, 'a, 'id ) t ->

‎jscomp/others/bs_MapInt.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ let rec remove n (x : key) =
9494
let mem = I.mem
9595
let cmp = I.cmp
9696
let eq = I.eq
97-
let findOpt = I.findOpt
98-
let findNull = I.findNull
99-
let findWithDefault = I.findWithDefault
100-
let findExn = I.findExn
97+
let getOpt = I.findOpt
98+
let getNull = I.findNull
99+
let getWithDefault = I.findWithDefault
100+
let getExn = I.findExn
101101
let split = I.split
102102
let merge = I.merge
103103
let ofArray = I.ofArray

‎jscomp/others/bs_MapInt.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,17 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
5151
val minKeyValueNull: 'a t -> (key * 'a) Js.null
5252
val maxKeyValueOpt: 'a t -> (key * 'a) option
5353
val maxKeyValueNull: 'a t -> (key * 'a) Js.null
54-
val findOpt: 'a t -> key -> 'a option
55-
val findNull: 'a t -> key -> 'a Js.null
56-
val findWithDefault: 'a t -> key -> 'a -> 'a
57-
val findExn: 'a t -> key -> 'a
54+
val getOpt: 'a t -> key -> 'a option
55+
val getNull: 'a t -> key -> 'a Js.null
56+
val getWithDefault: 'a t -> key -> 'a -> 'a
57+
val getExn: 'a t -> key -> 'a
5858

5959
(****************************************************************************)
6060

61+
val remove: 'a t -> key -> 'a t
62+
(** [remove m x] returns a map containing the same bindings as
63+
[m], except for [x] which is unbound in the returned map. *)
64+
6165
val update: 'a t -> key -> 'a -> 'a t
6266
(** [add m x y] returns a map containing the same bindings as
6367
[m], plus a binding of [x] to [y]. If [x] was already bound
@@ -69,9 +73,6 @@ val updateWithOpt:
6973
'a t
7074

7175

72-
val remove: 'a t -> key -> 'a t
73-
(** [remove m x] returns a map containing the same bindings as
74-
[m], except for [x] which is unbound in the returned map. *)
7576

7677

7778
val merge:

‎jscomp/others/bs_MapIntM.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ let cmp d0 d1 =
109109
I.cmp (data d0) (data d1)
110110
let eq d0 d1 =
111111
I.eq (data d0) (data d1)
112-
let findOpt d x =
112+
let getOpt d x =
113113
I.findOpt (data d) x
114-
let findNull d x = I.findNull (data d) x
115-
let findWithDefault d x def = I.findWithDefault (data d) x def
116-
let findExn d x = I.findExn (data d) x
114+
let getNull d x = I.findNull (data d) x
115+
let getWithDefault d x def = I.findWithDefault (data d) x def
116+
let getExn d x = I.findExn (data d) x

‎jscomp/others/bs_MapIntM.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,25 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
5757
val minKeyValueNull: 'a t -> (key * 'a) Js.null
5858
val maxKeyValueOpt: 'a t -> (key * 'a) option
5959
val maxKeyValueNull: 'a t -> (key * 'a) Js.null
60-
val findOpt: 'a t -> key -> 'a option
61-
val findNull: 'a t -> key -> 'a Js.null
62-
val findWithDefault: 'a t -> key -> 'a -> 'a
63-
val findExn: 'a t -> key -> 'a
60+
val getOpt: 'a t -> key -> 'a option
61+
val getNull: 'a t -> key -> 'a Js.null
62+
val getWithDefault: 'a t -> key -> 'a -> 'a
63+
val getExn: 'a t -> key -> 'a
6464

6565
(****************************************************************************)
6666

6767
(*TODO: add functional [merge, partition, filter, split]*)
68-
68+
69+
val remove: 'a t -> key -> 'a t
70+
(** [remove m x] do the in-place modification, return [m] for chaining *)
71+
6972
val addOnly : 'a t -> key -> 'a -> unit
7073
val add: 'a t -> key -> 'a -> 'a t
7174
(** [add m x y] do the in-place modification, return
7275
[m] for chaining. If [x] was already bound
7376
in [m], its previous binding disappears. *)
7477

7578

76-
val remove: 'a t -> key -> 'a t
77-
(** [remove m x] do the in-place modification, return [m] for chaining *)
7879

7980

8081
val map: 'a t -> ('a -> 'b [@bs]) -> 'b t

‎jscomp/others/bs_MapM.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@ let map m f =
151151
let mapi map f =
152152
let dict,map = B.(dict map, data map) in
153153
B.bag ~dict ~data:(N.mapi0 map f)
154-
let findOpt (type k) (type id) (map : (k,_,id) t) x =
154+
let getOpt (type k) (type id) (map : (k,_,id) t) x =
155155
let dict,map = B.(dict map, data map) in
156156
let module X = (val dict) in
157157
N.findOpt0 ~cmp:X.cmp map x
158-
let findNull (type k) (type id) (map : (k,_,id) t) x =
158+
let getNull (type k) (type id) (map : (k,_,id) t) x =
159159
let dict,map = B.(dict map, data map) in
160160
let module X = (val dict) in
161161
N.findNull0 ~cmp:X.cmp map x
162-
let findWithDefault (type k) (type id) (map : (k,_,id) t) x def =
162+
let getWithDefault (type k) (type id) (map : (k,_,id) t) x def =
163163
let dict,map = B.(dict map, data map) in
164164
let module X = (val dict) in
165165
N.findWithDefault0 ~cmp:X.cmp map x def
166-
let findExn (type k) (type id) (map : (k,_,id) t) x =
166+
let getExn (type k) (type id) (map : (k,_,id) t) x =
167167
let dict,map = B.(dict map, data map) in
168168
let module X = (val dict) in
169169
N.findExn0 ~cmp:X.cmp map x

‎jscomp/others/bs_MapM.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,25 @@ val minKeyValueOpt: ('k, 'a, _) t -> ('k * 'a) option
8484
val minKeyValueNull: ('k, 'a, _) t -> ('k * 'a) Js.null
8585
val maxKeyValueOpt: ('k, 'a, _) t -> ('k * 'a) option
8686
val maxKeyValueNull:('k, 'a, _) t -> ('k * 'a) Js.null
87-
val findOpt: ('k, 'a, 'id) t -> 'k -> 'a option
88-
val findNull: ('k, 'a, 'id) t -> 'k -> 'a Js.null
89-
val findWithDefault:
87+
val getOpt: ('k, 'a, 'id) t -> 'k -> 'a option
88+
val getNull: ('k, 'a, 'id) t -> 'k -> 'a Js.null
89+
val getWithDefault:
9090
('k, 'a, 'id) t -> 'k -> 'a -> 'a
91-
val findExn: ('k, 'a, 'id) t -> 'k -> 'a
91+
val getExn: ('k, 'a, 'id) t -> 'k -> 'a
9292

9393
(****************************************************************************)
9494

95+
val remove: ('k, 'a, 'id) t -> 'k -> ('k, 'a, 'id) t
96+
(** [remove m x] do the in-place modification,
97+
returnning [m] for chaining. *)
98+
9599
(*TODO: add functional [merge, partition, filter, split]*)
96100

97101
val updateOnly: ('k, 'a, 'id) t -> 'k -> 'a -> unit
98102
val update: ('k, 'a, 'id) t -> 'k -> 'a -> ('k, 'a, 'id) t
99103
(** [update m x y ] do the in-place modification, returnning [m] for chaining. *)
100104

101105
val removeOnly: ('k, 'a, 'id) t -> 'k -> unit
102-
val remove: ('k, 'a, 'id) t -> 'k -> ('k, 'a, 'id) t
103-
(** [remove m x] do the in-place modification,
104-
returnning [m] for chaining. *)
105106
val removeArrayOnly: ('k, 'a, 'id) t -> 'k array -> unit
106107
val removeArray: ('k, 'a, 'id) t -> 'k array -> ('k, 'a, 'id) t
107108

‎jscomp/others/bs_MapString.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ let rec remove n (x : key) =
9494
let mem = I.mem
9595
let cmp = I.cmp
9696
let eq = I.eq
97-
let findOpt = I.findOpt
98-
let findNull = I.findNull
99-
let findWithDefault = I.findWithDefault
100-
let findExn = I.findExn
97+
let getOpt = I.findOpt
98+
let getNull = I.findNull
99+
let getWithDefault = I.findWithDefault
100+
let getExn = I.findExn
101101
let split = I.split
102102
let merge = I.merge
103103
let ofArray = I.ofArray

‎jscomp/others/bs_MapString.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,17 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
5151
val minKeyValueNull: 'a t -> (key * 'a) Js.null
5252
val maxKeyValueOpt: 'a t -> (key * 'a) option
5353
val maxKeyValueNull: 'a t -> (key * 'a) Js.null
54-
val findOpt: 'a t -> key -> 'a option
55-
val findNull: 'a t -> key -> 'a Js.null
56-
val findWithDefault: 'a t -> key -> 'a -> 'a
57-
val findExn: 'a t -> key -> 'a
54+
val getOpt: 'a t -> key -> 'a option
55+
val getNull: 'a t -> key -> 'a Js.null
56+
val getWithDefault: 'a t -> key -> 'a -> 'a
57+
val getExn: 'a t -> key -> 'a
5858

5959
(****************************************************************************)
6060

61+
val remove: 'a t -> key -> 'a t
62+
(** [remove m x] returns a map containing the same bindings as
63+
[m], except for [x] which is unbound in the returned map. *)
64+
6165
val update: 'a t -> key -> 'a -> 'a t
6266
(** [add m x y] returns a map containing the same bindings as
6367
[m], plus a binding of [x] to [y]. If [x] was already bound
@@ -69,9 +73,6 @@ val updateWithOpt:
6973
'a t
7074

7175

72-
val remove: 'a t -> key -> 'a t
73-
(** [remove m x] returns a map containing the same bindings as
74-
[m], except for [x] which is unbound in the returned map. *)
7576

7677

7778
val merge:

‎jscomp/others/bs_MapStringM.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ let cmp d0 d1 =
109109
I.cmp (data d0) (data d1)
110110
let eq d0 d1 =
111111
I.eq (data d0) (data d1)
112-
let findOpt d x =
112+
let getOpt d x =
113113
I.findOpt (data d) x
114-
let findNull d x = I.findNull (data d) x
115-
let findWithDefault d x def = I.findWithDefault (data d) x def
116-
let findExn d x = I.findExn (data d) x
114+
let getNull d x = I.findNull (data d) x
115+
let getWithDefault d x def = I.findWithDefault (data d) x def
116+
let getExn d x = I.findExn (data d) x

‎jscomp/others/bs_MapStringM.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,25 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
5757
val minKeyValueNull: 'a t -> (key * 'a) Js.null
5858
val maxKeyValueOpt: 'a t -> (key * 'a) option
5959
val maxKeyValueNull: 'a t -> (key * 'a) Js.null
60-
val findOpt: 'a t -> key -> 'a option
61-
val findNull: 'a t -> key -> 'a Js.null
62-
val findWithDefault: 'a t -> key -> 'a -> 'a
63-
val findExn: 'a t -> key -> 'a
60+
val getOpt: 'a t -> key -> 'a option
61+
val getNull: 'a t -> key -> 'a Js.null
62+
val getWithDefault: 'a t -> key -> 'a -> 'a
63+
val getExn: 'a t -> key -> 'a
6464

6565
(****************************************************************************)
6666

6767
(*TODO: add functional [merge, partition, filter, split]*)
68-
68+
69+
val remove: 'a t -> key -> 'a t
70+
(** [remove m x] do the in-place modification, return [m] for chaining *)
71+
6972
val addOnly : 'a t -> key -> 'a -> unit
7073
val add: 'a t -> key -> 'a -> 'a t
7174
(** [add m x y] do the in-place modification, return
7275
[m] for chaining. If [x] was already bound
7376
in [m], its previous binding disappears. *)
7477

7578

76-
val remove: 'a t -> key -> 'a t
77-
(** [remove m x] do the in-place modification, return [m] for chaining *)
7879

7980

8081
val map: 'a t -> ('a -> 'b [@bs]) -> 'b t

‎jscomp/others/map.cppo.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ let rec remove n (x : key) =
9999
let mem = I.mem
100100
let cmp = I.cmp
101101
let eq = I.eq
102-
let findOpt = I.findOpt
103-
let findNull = I.findNull
104-
let findWithDefault = I.findWithDefault
105-
let findExn = I.findExn
102+
let getOpt = I.findOpt
103+
let getNull = I.findNull
104+
let getWithDefault = I.findWithDefault
105+
let getExn = I.findExn
106106
let split = I.split
107107
let merge = I.merge
108108
let ofArray = I.ofArray

‎jscomp/others/map.cppo.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,17 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
5555
val minKeyValueNull: 'a t -> (key * 'a) Js.null
5656
val maxKeyValueOpt: 'a t -> (key * 'a) option
5757
val maxKeyValueNull: 'a t -> (key * 'a) Js.null
58-
val findOpt: 'a t -> key -> 'a option
59-
val findNull: 'a t -> key -> 'a Js.null
60-
val findWithDefault: 'a t -> key -> 'a -> 'a
61-
val findExn: 'a t -> key -> 'a
58+
val getOpt: 'a t -> key -> 'a option
59+
val getNull: 'a t -> key -> 'a Js.null
60+
val getWithDefault: 'a t -> key -> 'a -> 'a
61+
val getExn: 'a t -> key -> 'a
6262

6363
(****************************************************************************)
6464

65+
val remove: 'a t -> key -> 'a t
66+
(** [remove m x] returns a map containing the same bindings as
67+
[m], except for [x] which is unbound in the returned map. *)
68+
6569
val update: 'a t -> key -> 'a -> 'a t
6670
(** [add m x y] returns a map containing the same bindings as
6771
[m], plus a binding of [x] to [y]. If [x] was already bound
@@ -73,9 +77,6 @@ val updateWithOpt:
7377
'a t
7478

7579

76-
val remove: 'a t -> key -> 'a t
77-
(** [remove m x] returns a map containing the same bindings as
78-
[m], except for [x] which is unbound in the returned map. *)
7980

8081

8182
val merge:

‎jscomp/others/mapm.cppo.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ let cmp d0 d1 =
115115
I.cmp (data d0) (data d1)
116116
let eq d0 d1 =
117117
I.eq (data d0) (data d1)
118-
let findOpt d x =
118+
let getOpt d x =
119119
I.findOpt (data d) x
120-
let findNull d x = I.findNull (data d) x
121-
let findWithDefault d x def = I.findWithDefault (data d) x def
122-
let findExn d x = I.findExn (data d) x
120+
let getNull d x = I.findNull (data d) x
121+
let getWithDefault d x def = I.findWithDefault (data d) x def
122+
let getExn d x = I.findExn (data d) x

‎jscomp/others/mapm.cppo.mli

+8-7
Original file line numberDiff line numberDiff line change
@@ -61,24 +61,25 @@ val minKeyValueOpt: 'a t -> (key * 'a) option
6161
val minKeyValueNull: 'a t -> (key * 'a) Js.null
6262
val maxKeyValueOpt: 'a t -> (key * 'a) option
6363
val maxKeyValueNull: 'a t -> (key * 'a) Js.null
64-
val findOpt: 'a t -> key -> 'a option
65-
val findNull: 'a t -> key -> 'a Js.null
66-
val findWithDefault: 'a t -> key -> 'a -> 'a
67-
val findExn: 'a t -> key -> 'a
64+
val getOpt: 'a t -> key -> 'a option
65+
val getNull: 'a t -> key -> 'a Js.null
66+
val getWithDefault: 'a t -> key -> 'a -> 'a
67+
val getExn: 'a t -> key -> 'a
6868

6969
(****************************************************************************)
7070

7171
(*TODO: add functional [merge, partition, filter, split]*)
72-
72+
73+
val remove: 'a t -> key -> 'a t
74+
(** [remove m x] do the in-place modification, return [m] for chaining *)
75+
7376
val addOnly : 'a t -> key -> 'a -> unit
7477
val add: 'a t -> key -> 'a -> 'a t
7578
(** [add m x y] do the in-place modification, return
7679
[m] for chaining. If [x] was already bound
7780
in [m], its previous binding disappears. *)
7881

7982

80-
val remove: 'a t -> key -> 'a t
81-
(** [remove m x] do the in-place modification, return [m] for chaining *)
8283

8384

8485
val map: 'a t -> ('a -> 'b [@bs]) -> 'b t

0 commit comments

Comments
 (0)