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

diff --git a/ata.mli b/ata.mli
index e8d64b1..a5fb3e1 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
@@ -52,7 +52,7 @@ module Formula :
   end
 module Transition :
   sig
-    type node = State.t * bool * Formula.t * bool
+    type node = State.t * TagSet.t * bool * Formula.t * bool
     type data = node
     type t
     val make : data -> t
@@ -92,13 +92,23 @@ 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 -> GResult.t
+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
+val bottom_up :
+  'a t -> Tree.t -> [> `CONTAINS of 'b | `TAG of Tag.t ] -> IdSet.t
+
+module Test (Doc : sig val doc : Tree.t end ) :
+sig
+  module Results : ResultSet
+  val top_down : 'a t -> Tree.t -> Results.t
+end