Ensure Hashtbl.Make works for String in ocaml<5.0

zoj613 · Jun 30, 2024 · 505d6f6 · 505d6f6
1 parent 222eeeb
commit 505d6f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/storage/memory.ml b/lib/storage/memory.ml
@@ -1,4 +1,10 @@
-module StrMap = Hashtbl.Make (String)
+module HashableString = struct
+  type t = string
+  let hash = Hashtbl.hash
+  let equal = String.equal
+end
+
+module StrMap = Hashtbl.Make (HashableString)
 
 module Impl = struct
   type t = string StrMap.t

diff --git a/lib/util.ml b/lib/util.ml
@@ -9,14 +9,12 @@ type ('a, 'b) array_repr =
   ;fill_value : 'a}
 
 module HashableArray = struct  
-  include Array
   type t = int array
   let hash = Hashtbl.hash
   let equal x y = Array.for_all2 Int.equal x y
 end
 
 module ComparableArray = struct
-  include Array
   type t = int array
   let compare = Stdlib.compare
 end