X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ata.mli;h=1565caa8648f47ae2a619c8bd03a46efbabcaa85;hb=329088598ab63bc2d67ff0dfc4f54e90f5d4f283;hp=159bd78eb8e192c6fc23b27f7a8e9c60d16f4660;hpb=f067dedce5a6b8386010aec45475ad42d24f1d5b;p=SXSI%2Fxpathcomp.git

diff --git a/ata.mli b/ata.mli
index 159bd78..1565caa 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
 module StateSet :
   sig
     include Ptset.S with type elt = int
@@ -92,7 +92,7 @@ module type ResultSet =
     val fold : (elt -> 'a -> 'a) -> t -> 'a -> 'a
     val map : (elt -> elt) -> t -> t
     val length : t -> int
-    val merge : (bool*bool*bool*bool)-> elt -> t -> t -> t 
+    val merge : merge_conf -> elt -> t -> t -> t 
     val mk_quick_tag_loop : (elt -> elt -> 'a*t array) -> 'a -> int -> Tree.t -> Tag.t -> (elt -> elt -> 'a*t array)
     val mk_quick_star_loop : (elt -> elt -> 'a*t array) -> 'a -> int -> Tree.t -> (elt -> elt -> 'a*t array)
   end