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

Merge pull request #325 from c-cube/ccpair_map

Browse source 
break(CCPair): use more standard name for some map functions
This commit is contained in:
Simon Cruanes 2020-07-27 22:58:58 -04:00 • committed by GitHub
commit 30b9307a70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/CCPair.ml
View file

@ -7,24 +7,28 @@ type ('a,'b) t = ('a * 'b)
let make x y = x,y let make x y = x,y
let map1 f (x,y) = f x,y let map_fst f (x,y) = f x,y
let map2 f (x,y) = x,f y let map_snd f (x,y) = x,f y
let map f g (x,y) = f x, g y let map f g (x,y) = f x, g y
let map_same f (x,y) = f x, f y let map_same f (x,y) = f x, f y
let map_fst f (x,_) = f x let map2 f g (a,b) (x,y) = f a x, g b y
let map_snd f (_,x) = f x
let map_same2 f (a,b) (x,y) = f a x, f b y
let fst_map f (x,_) = f x
let snd_map f (_,x) = f x
let iter f (x,y) = f x y let iter f (x,y) = f x y
let swap (x,y) = y, x let swap (x,y) = y, x
let (<<<) = map1 let (<<<) = map_fst
let (>>>) = map2 let (>>>) = map_snd
let ( *** ) = map let ( *** ) = map

25
src/core/CCPair.mli
View file

@ -9,11 +9,13 @@ val make : 'a -> 'b -> ('a, 'b) t
(** Make a tuple from its components. (** Make a tuple from its components.
@since 0.16 *) @since 0.16 *)
val map1 : ('a -> 'b) -> ('a * 'c) -> ('b * 'c) val map_fst : ('a -> 'b) -> ('a * 'c) -> ('b * 'c)
(** [map1 f (x, y)] returns [(f x, y)]. *) (** [map_fst f (x, y)] returns [(f x, y)].
Renamed from [map1] since NEXT_RELEASE. *)
val map2 : ('a -> 'b) -> ('c * 'a) -> ('c * 'b) val map_snd : ('a -> 'b) -> ('c * 'a) -> ('c * 'b)
(** [map2 f (x, y)] returns [(x, f y)]. *) (** [map_snd f (x, y)] returns [(x, f y)].
Renamed from [map2] since NEXT_RELEASE. *)
val map : ('a -> 'c) -> ('b -> 'd) -> ('a * 'b) -> ('c * 'd) val map : ('a -> 'c) -> ('b -> 'd) -> ('a * 'b) -> ('c * 'd)
(** Synonym to {!( *** )}. Map on both sides of a tuple. *) (** Synonym to {!( *** )}. Map on both sides of a tuple. *)
@ -21,12 +23,23 @@ val map : ('a -> 'c) -> ('b -> 'd) -> ('a * 'b) -> ('c * 'd)
val map_same : ('a -> 'b) -> ('a * 'a) -> ('b * 'b) val map_same : ('a -> 'b) -> ('a * 'a) -> ('b * 'b)
(** Like {!map} but specialized for pairs with elements of the same type. *) (** Like {!map} but specialized for pairs with elements of the same type. *)
val map_fst : ('a -> 'b) -> ('a * _) -> 'b val map2 : ('a1 -> 'b1 -> 'c1) -> ('a2 -> 'b2 -> 'c2) -> ('a1 * 'a2) ->
('b1 * 'b2) -> ('c1 * 'c2)
(** [map2 f g (a,b) (x,y)] return [(f a x, g b y)].
@since NEXT_RELEASE *)
val map_same2 : ('a -> 'b -> 'c) -> ('a * 'a) -> ('b * 'b) -> ('c * 'c)
(** [map_same2 f (a,b) (x,y)] return [(f a x, f b y)].
@since NEXT_RELEASE *)
val fst_map : ('a -> 'b) -> ('a * _) -> 'b
(** Compose the given function with [fst]. (** Compose the given function with [fst].
Rename from [map_fst] since NEXT_RELEASE.
@since 0.3.3 *) @since 0.3.3 *)
val map_snd : ('a -> 'b) -> (_ * 'a) -> 'b val snd_map : ('a -> 'b) -> (_ * 'a) -> 'b
(** Compose the given function with [snd]. (** Compose the given function with [snd].
Rename from [map_snd] since NEXT_RELEASE.
@since 0.3.3 *) @since 0.3.3 *)
val iter : ('a -> 'b -> unit) -> ('a * 'b) -> unit val iter : ('a -> 'b -> unit) -> ('a * 'b) -> unit