X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.mli;h=1565caa8648f47ae2a619c8bd03a46efbabcaa85;hb=329088598ab63bc2d67ff0dfc4f54e90f5d4f283;hp=649a49610daee17e1f68874b8d005c7b5bff9213;hpb=6a7025fee3c050eff58baa536a14d80baf5c1b87;p=SXSI%2Fxpathcomp.git

diff --git a/ata.mli b/ata.mli
index 649a496..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,13 +92,21 @@ 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
 
 module IdSet : ResultSet
-module GResult : ResultSet 
+module GResult (Doc : sig val doc : Tree.t end) : ResultSet 
 
 val top_down_count : 'a t -> Tree.t -> int
 val top_down : 'a t -> Tree.t -> IdSet.t
 val bottom_up_count :
   'a t -> Tree.t -> [> `CONTAINS of 'b | `TAG of Tag.t ] -> int
+
+module Test (Doc : sig val doc : Tree.t end ) :
+sig
+  module Results : ResultSet
+  val top_down : 'a t -> Tree.t -> Results.t
+end