simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-18 08:36:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into list_counts

Browse source
This commit is contained in:
Francois Berenger 2018-10-09 09:58:59 +09:00 • committed by GitHub
commit 38635dd7ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.adoc
View file

@ -32,3 +32,4 @@
- Jules Aguillon (@julow) - Jules Aguillon (@julow)
- Metin Akat (@loxs) - Metin Akat (@loxs)
- Francois Berenger (@UnixJunkie) - Francois Berenger (@UnixJunkie)
- Hongchang Wu (@hongchangwu)

9
src/core/CCResult.ml
View file

@ -93,6 +93,15 @@ let get_or e ~default = match e with
| Ok x -> x | Ok x -> x
| Error _ -> default | Error _ -> default
let get_or_failwith = function
| Ok x -> x
| Error msg -> failwith msg
(*$T
get_or_failwith (Ok 1) = 1
try ignore @@ get_or_failwith (Error "e"); false with Failure msg -> msg = "e"
*)
let map_or f e ~default = match e with let map_or f e ~default = match e with
| Ok x -> f x | Ok x -> f x
| Error _ -> default | Error _ -> default

5
src/core/CCResult.mli
View file

@ -84,6 +84,11 @@ val get_exn : ('a, _) t -> 'a
val get_or : ('a, _) t -> default:'a -> 'a val get_or : ('a, _) t -> default:'a -> 'a
(** [get_or e ~default] returns [x] if [e = Ok x], [default] otherwise. *) (** [get_or e ~default] returns [x] if [e = Ok x], [default] otherwise. *)
val get_or_failwith : ('a, string) t -> 'a
(** [get_or_failwith e] returns [x] if [e = Ok x], fails otherwise.
@raise Failure with [msg] if [e = Error msg].
@since NEXT_RELEASE *)
val map_or : ('a -> 'b) -> ('a, 'c) t -> default:'b -> 'b val map_or : ('a -> 'b) -> ('a, 'c) t -> default:'b -> 'b
(** [map_or f e ~default] returns [f x] if [e = Ok x], [default] otherwise. *) (** [map_or f e ~default] returns [f x] if [e = Ok x], [default] otherwise. *)