From f95254104483b77815fe4ebd7f04835399208eec Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Mon, 19 Oct 2015 22:16:52 +0200 Subject: [PATCH] add `Containers.Hashtbl` with most combinators of `CCHashtbl` --- src/core/containers.ml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/core/containers.ml b/src/core/containers.ml index 4ee3802b..b00aeb7b 100644 --- a/src/core/containers.ml +++ b/src/core/containers.ml @@ -61,17 +61,21 @@ end module Fun = CCFun module Hash = CCHash module Int = CCInt -(* FIXME + +(** @since NEXT_RELEASE *) 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 module Make = Hashtbl.Make and type ('a,'b) t := ('a,'b) Hashtbl.t ) - include CCHashtbl + (* still unable to include CCHashtbl itself, for the polymorphic functions *) + module type S' = CCHashtbl.S + module Make' = CCHashtbl.Make + module Counter = CCHashtbl.MakeCounter + module MakeDefault = CCHashtbl.MakeDefault end -*) + module List = struct include List include CCList