simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 19:25:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #60 from johanneskloos/master

Browse source 
Make `CCPersistentHashtbl.S.merge` more general.
This commit is contained in:
Simon Cruanes 2016-03-14 13:56:26 +01:00
commit 69e8f7abf8
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.adoc
View file

@ -13,3 +13,4 @@
- Guillaume Bury (guigui) - Guillaume Bury (guigui)
- JP Rodi - JP Rodi
- octachron (Florian Angeletti) - octachron (Florian Angeletti)
- Johannes Kloos

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. *)