simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-09 12:45:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make CCPersistentHashtbl.S.merge more general.

Browse source 
This patch brings the merge function of CCPersistentHashtbl
in line with the merge functions of other maps
(Map, BatMap from batteries). In particular, its signature
changes from the restrictive
  merge: (key -> 'a option -> 'a option -> 'a option) ->
    'a t -> 'a t -> 'a t
to a more general
  merge: (key -> 'a option -> 'b option -> 'c option) ->
    'a t -> 'b t -> 'c t
This commit is contained in:
jkloos 2016-03-09 11:28:55 +01:00
parent d6487a02a0
commit fecbd7683a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/data/CCPersistentHashtbl.ml
View file

@ -89,8 +89,8 @@ module type S = sig
(** Fresh copy of the table; the underlying structure is not shared (** Fresh copy of the table; the underlying structure is not shared
anymore, so using both tables alternatively will be efficient *) anymore, so using both tables alternatively will be efficient *)
val merge : (key -> 'a option -> 'a option -> 'a option) -> val merge : (key -> 'a option -> 'b option -> 'c option) ->
'a t -> 'a t -> 'a t 'a t -> 'b t -> 'c t
(** Merge two tables together into a new table. The function's argument (** Merge two tables together into a new table. The function's argument
correspond to values associated with the key (if present); if the correspond to values associated with the key (if present); if the
function returns [None] the key will not appear in the result. *) function returns [None] the key will not appear in the result. *)
@ -576,7 +576,7 @@ module Make(H : HashedType) : S with type key = H.t = struct
if mem t1 k then tbl if mem t1 k then tbl
else match f k None (Some v2) with else match f k None (Some v2) with
| None -> tbl | None -> tbl
| Some _ -> replace tbl k v2 | Some v' -> replace tbl k v'
) tbl t2 ) tbl t2
(*$R (*$R

4
src/data/CCPersistentHashtbl.mli
View file

@ -96,8 +96,8 @@ module type S = sig
(** Fresh copy of the table; the underlying structure is not shared (** Fresh copy of the table; the underlying structure is not shared
anymore, so using both tables alternatively will be efficient *) anymore, so using both tables alternatively will be efficient *)
val merge : (key -> 'a option -> 'a option -> 'a option) -> val merge : (key -> 'a option -> 'b option -> 'c option) ->
'a t -> 'a t -> 'a t 'a t -> 'b t -> 'c t
(** Merge two tables together into a new table. The function's argument (** Merge two tables together into a new table. The function's argument
correspond to values associated with the key (if present); if the correspond to values associated with the key (if present); if the
function returns [None] the key will not appear in the result. *) function returns [None] the key will not appear in the result. *)