X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.mli;h=3af690737540090d6d2b684ac7a0bafbb9a3ce89;hb=df5fdb22632be887ecd9f5c46a014e7e970148a2;hp=159bd78eb8e192c6fc23b27f7a8e9c60d16f4660;hpb=be1caa5c46009c13241cc48ed34a36ee2936ef87;p=SXSI%2Fxpathcomp.git

diff --git a/ata.mli b/ata.mli
index 159bd78..3af6907 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 | 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
@@ -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
@@ -101,12 +101,18 @@ module IdSet : ResultSet
 module GResult (Doc : sig val doc : Tree.t end) : ResultSet 
 
 val top_down_count : 'a t -> Tree.t -> int
+val top_down_count1 : 'a t -> Tree.t -> int
 val top_down : 'a t -> Tree.t -> IdSet.t
+val top_down1 : '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
+  val top_down1 : 'a t -> Tree.t -> Results.t
 end