X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=hcons.ml;h=7bc8823b2dfd5020296a0a4e520f5db96c3d406c;hb=a6a05531716a001b369e018c9d2c87ce532ef163;hp=35bc9427232d20ca68173b2c70bb589fca936afd;hpb=c5f06d325240c808a9be4d71e20fc01969420bb3;p=SXSI%2Fxpathcomp.git

diff --git a/hcons.ml b/hcons.ml
index 35bc942..7bc8823 100644
--- a/hcons.ml
+++ b/hcons.ml
@@ -6,44 +6,60 @@ module type SA =
     val make : data -> t
     val node : t -> data
     val hash : t -> int
-    val uid : t -> int
+    val uid : t -> Uid.t
     val equal : t -> t -> bool
-  end
+
+    val with_id : Uid.t -> t
+ end
 
 module type S =
   sig
+
     type data
-    type t = private { id : int;
+    type t = private { id : Uid.t;
 		       key : int;
 		       node : data }
     val make : data -> t
     val node : t -> data
     val hash : t -> int
-    val uid : t -> int
+    val uid : t -> Uid.t
     val equal : t -> t -> bool
+
+
+    val with_id : Uid.t -> t
   end
 
 module Make (H : Hashtbl.HashedType) : S with type data = H.t =
 struct
+  let uid_make = Uid.make_maker()
   type data = H.t
-  type t = { id : int;
+  type t = { id : Uid.t;
 	     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 = (==)
+  let hash t = t.key
+  let equal t1 t2 = t1 == t2
   module WH = Weak.Make( struct 
 			   type _t = t 
 			   type t = _t 
 			   let hash = hash
-			   let equal a b = 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 = 
-    let cell = { id = gen_uid(); key = H.hash x; node = x } in
+    let cell = { id = uid_make(); key = H.hash x; node = x } in
       WH.merge pool cell
+
+  exception Found of t
+
+  let with_id id = 
+    try
+      WH.iter (fun r -> if r.id == id then raise (Found r))  pool;      
+      raise Not_found
+    with
+      | Found r -> r
+      | e -> raise e
+  ;;
+
 end