Fixed bug in NextElement, improved caching

[SXSI/xpathcomp.git] / hcons.ml

diff --git a/hcons.ml b/hcons.ml
index 293b90f..35bc942 100644 (file)
--- a/hcons.ml
+++ b/hcons.ml
@@ -1,34 +1,46 @@
 INCLUDE "utils.ml"
-module type S = 
-sig
-  type data
-  type t
-  val make : data -> t
-  val node : t -> data
-  val hash : t -> int
-  val uid : t -> int
-  val equal : t -> t -> bool
-end
+module type SA =
+  sig
+    type data
+    type t 
+    val make : data -> t
+    val node : t -> data
+    val hash : t -> int
+    val uid : t -> int
+    val equal : t -> t -> bool
+  end
+
+module type S =
+  sig
+    type data
+    type t = private { id : int;
+                      key : int;
+                      node : data }
+    val make : data -> t
+    val node : t -> data
+    val hash : t -> int
+    val uid : t -> int
+    val equal : t -> t -> bool
+  end
+
 module Make (H : Hashtbl.HashedType) : S with type data = H.t =
 struct
   type data = H.t
-  type t =  { id : int;
-             key : int; (* hash *)
-             node : data;
-           }
-  
+  type t = { id : int;
+            key : int;
+            node : data }
   let node t = t.node
   let hash t = t.key
   let uid t = t.id
   let gen_uid  =
     let id = ref ~-1 in 
       fun () -> incr id;!id
-  let equal t1 t2 = t1 == t2 || t1.id == t2.id
+  let equal = (==)
   module WH = Weak.Make( struct 
                           type _t = t 
                           type t = _t 
                           let hash = hash
-                          let equal a b = H.equal a.node b.node 
+                          let equal a b = a==b || H.equal a.node b.node 
                         end)
   let pool = WH.create MED_H_SIZE
   let make x =