From adf4f29714321b139b2b81e21d6c92480468e9f1 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Mon, 22 Dec 2014 00:12:51 +0100 Subject: [PATCH] update CCPervasives (wip: hashtbl) --- src/pervasives/CCPervasives.ml | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/src/pervasives/CCPervasives.ml b/src/pervasives/CCPervasives.ml index 5e38bcd4..13228ed0 100644 --- a/src/pervasives/CCPervasives.ml +++ b/src/pervasives/CCPervasives.ml @@ -42,13 +42,38 @@ Changed [Opt] to [Option] to better reflect that this module is about the @since 0.5 *) -module Array = struct include Array include CCArray end +module Array = struct + include Array + include CCArray +end module Bool = CCBool module Error = CCError module Fun = CCFun module Int = CCInt -module List = struct include List include CCList end +(* FIXME +module Hashtbl = struct + include (Hashtbl : module type of Hashtbl + with type statistics = Hashtbl.statistics + and module Make := Hashtbl.Make + and module type S := Hashtbl.S + and type ('a,'b) t := ('a,'b) Hashtbl.t + ) + include CCHashtbl +end +*) +module List = struct + include List + include CCList +end +module Map = CCMap module Option = CCOpt module Pair = CCPair -module String = struct include String include CCString end +module Random = struct + include Random + include CCRandom +end +module String = struct + include String + include CCString +end module Vector = CCVector