X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.mli;h=125e34b5680ad51b6e5b1d804fba69f50c963894;hb=9f227961ae2219728e4cdd56e4d4c4e7165e4306;hp=a5fb3e148c43d6803a325f10a73b26cbef7b8e57;hpb=cf6d366b25132eea7b0f1966c11d034d748af0fa;p=SXSI%2Fxpathcomp.git

diff --git a/ata.mli b/ata.mli
index a5fb3e1..125e34b 100644
--- a/ata.mli
+++ b/ata.mli
@@ -4,7 +4,7 @@ sig
   include Sigs.T with type t = int
   val make : unit -> t 
 end
-type merge_conf = NO | MARK | ONLY1 | ONLY2 | ONLY12 | MARK1 | MARK2 | MARK12
+type merge_conf = NO | ONLY1 | ONLY2 | ONLY12 | MARK | MARK1 | MARK2 | MARK12
 module StateSet :
   sig
     include Ptset.S with type elt = int
@@ -22,7 +22,7 @@ module Formula :
 
     type t
     val hash : t -> int
-    val uid : t -> int
+    val uid : t -> Uid.t
     val equal : t -> t -> bool
     val expr : t -> t expr
     val st :
@@ -58,7 +58,7 @@ module Transition :
     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
     module Infix : sig
     val ( ?< ) : State.t -> State.t