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

diff --git a/ata.mli b/ata.mli
index a5fb3e1..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 | 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
@@ -101,7 +101,10 @@ 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 :
@@ -111,4 +114,5 @@ 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