From 5a7375309545996c0a1bd1669738817843c709ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dimino?= <jeremie@dimino.org>
Date: Fri, 23 Feb 2018 16:06:12 +0700
Subject: [PATCH] Extend interned module with a Table type

---
 src/interned.ml  | 53 +++++++++++++++++++++++++++++++++++++++++-------
 src/interned.mli | 19 ++++++++++++++++-
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/src/interned.ml b/src/interned.ml
index 1074a544..1e19161c 100644
--- a/src/interned.ml
+++ b/src/interned.ml
@@ -2,31 +2,70 @@ open Import
 
 module type S = sig
   type t
-
-  val make : string -> t
   val compare : t -> t -> Ordering.t
-
+  val to_string : t -> string
+  val make : string -> t
+  val get : string -> t option
   module Set : sig
     include Set.S with type elt = t
-
     val make : string list -> t
   end
-
   module Map : Map.S with type key = t
+  module Table : sig
+    type key = t
+    type 'a t
+    val create : unit -> 'a t
+    val get : 'a t -> key -> 'a option
+    val set : 'a t -> key:key -> data:'a -> unit
+  end with type key := t
 end
 
 module Make() = struct
   include Int
 
-  let table = Hashtbl.create 1024
+  let ids = Hashtbl.create 1024
   let next = ref 0
 
+  module Table = struct
+    type 'a t = 'a option array ref
+
+    let create () = ref [||]
+
+    let resize t =
+      let increment_size = 512 in
+      let n = (!next land (lnot (increment_size - 1))) + (increment_size * 2) in
+      let old_array = !t                in
+      let new_array = Array.make n None in
+      t := new_array;
+      Array.blit
+        ~src:old_array ~src_pos:0
+        ~dst:new_array ~dst_pos:0
+        ~len:(Array.length old_array)
+
+    let get t key =
+      if key >= Array.length !t then
+        None
+      else
+        !t.(key)
+
+    let set t ~key ~data =
+      if key >= Array.length !t then resize t;
+      !t.(key) <- Some data
+  end
+
+  let names = Table.create ()
+
   let make s =
-    Hashtbl.find_or_add table s ~f:(fun _ ->
+    Hashtbl.find_or_add ids s ~f:(fun s ->
       let n = !next in
       next := n + 1;
+      Table.set names ~key:n ~data:s;
       n)
 
+  let get s = Hashtbl.find ids s
+
+  let to_string t = Option.value_exn (Table.get names t)
+
   module Set = struct
     include Int_set
 
diff --git a/src/interned.mli b/src/interned.mli
index dca2d76e..716f915c 100644
--- a/src/interned.mli
+++ b/src/interned.mli
@@ -4,9 +4,14 @@ open! Import
 
 module type S = sig
   type t
+  val compare : t -> t -> Ordering.t
+  val to_string : t -> string
 
   val make : string -> t
-  val compare : t -> t -> Ordering.t
+
+  (** Like [make] except it returns [None] if the string hasn't been
+      registered with [make] previously. *)
+  val get : string -> t option
 
   module Set : sig
     include Set.S with type elt = t
@@ -15,6 +20,18 @@ module type S = sig
   end
 
   module Map : Map.S with type key = t
+
+  (** Same as a hash table, but optimized for the case where we are
+      using one entry for every possible [t] *)
+  module Table : sig
+    type key = t
+    type 'a t
+
+    val create : unit -> 'a t
+
+    val get : 'a t -> key -> 'a option
+    val set : 'a t -> key:key -> data:'a -> unit
+  end with type key := t
 end
 
 module Make() : S