diff --git a/src/PatriciaTree.ml b/src/PatriciaTree.ml index 9c6adac..80cf374 100644 --- a/src/PatriciaTree.ml +++ b/src/PatriciaTree.ml @@ -20,7 +20,7 @@ (**************************************************************************) include Ints -module Sigs = Sigs +include Signatures include Key_value include Functors include Nodes diff --git a/src/PatriciaTree.mli b/src/PatriciaTree.mli index bc64a71..020589c 100644 --- a/src/PatriciaTree.mli +++ b/src/PatriciaTree.mli @@ -115,18 +115,18 @@ informative; log(n) corresponds to the real complexity in usual distributions. *) +(** {1 Integer manipulations} *) + +include module type of Ints + (** {1 Signatures} *) -module Sigs = Sigs +include module type of Signatures (** {1 Functors} *) include module type of Functors -(** {1 Miscellaneous utilities} *) - -include module type of Ints - (** {1 Default KEY and VALUE implementations} *) (** These can be used as parameters to {!MakeMap}/{!MakeSet} functors in the most common use cases. *) diff --git a/src/functors.ml b/src/functors.ml index 4972a5e..2a72e27 100644 --- a/src/functors.ml +++ b/src/functors.ml @@ -20,7 +20,7 @@ (**************************************************************************) open Ints -open Sigs +open Signatures open Key_value open Nodes diff --git a/src/functors.mli b/src/functors.mli index 8f9a659..6ca8cac 100644 --- a/src/functors.mli +++ b/src/functors.mli @@ -19,7 +19,7 @@ (* for more details (enclosed in the file LICENSE). *) (**************************************************************************) -open Sigs +open Signatures (** This section presents the functors which can be used to build patricia tree maps and sets. *) diff --git a/src/key_value.ml b/src/key_value.ml index a522121..f9b871c 100644 --- a/src/key_value.ml +++ b/src/key_value.ml @@ -19,7 +19,7 @@ (* for more details (enclosed in the file LICENSE). *) (**************************************************************************) -open Sigs +open Signatures (** {1 Keys and values} *) diff --git a/src/key_value.mli b/src/key_value.mli index f2a65f3..e90188a 100644 --- a/src/key_value.mli +++ b/src/key_value.mli @@ -19,7 +19,7 @@ (* for more details (enclosed in the file LICENSE). *) (**************************************************************************) -open Sigs +open Signatures module Value : VALUE with type 'a t = 'a (** Default implementation of {!VALUE}, used in {!MakeMap}. diff --git a/src/nodes.ml b/src/nodes.ml index caec96e..7049b72 100644 --- a/src/nodes.ml +++ b/src/nodes.ml @@ -20,7 +20,7 @@ (**************************************************************************) open Ints -open Sigs +open Signatures let sdbm x y = y + (x lsl 16) + (x lsl 6) - x (** Combine two numbers into a new hash *) diff --git a/src/nodes.mli b/src/nodes.mli index 65c5f36..8507fda 100644 --- a/src/nodes.mli +++ b/src/nodes.mli @@ -19,7 +19,7 @@ (* for more details (enclosed in the file LICENSE). *) (**************************************************************************) -open Sigs +open Signatures (** {1 Basic nodes} *) diff --git a/src/sigs.ml b/src/signatures.ml similarity index 100% rename from src/sigs.ml rename to src/signatures.ml diff --git a/src/test/patriciaTreeTest.ml b/src/test/patriciaTreeTest.ml index 7d4ccdc..4fce639 100644 --- a/src/test/patriciaTreeTest.ml +++ b/src/test/patriciaTreeTest.ml @@ -20,7 +20,6 @@ (**************************************************************************) open PatriciaTree -open Sigs let check_highest_bit x res = (* Printf.printf "CHECK_HIGHEST_BIT: %x %x\n%!" x res; *)