Revert "copy module instead of include (ocaml/odoc#1162)"

This reverts commit 2fcf6e5.
codex-semantics-library · Jul 18, 2024 · 35ee967 · 35ee967
1 parent 7913415
commit 35ee967
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/signatures.ml b/src/sigs.ml → src/signatures.ml
diff --git 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; *)