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

diff --git a/ata.mli b/ata.mli
index 3152112..649a496 100644
--- a/ata.mli
+++ b/ata.mli
@@ -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
@@ -84,16 +84,19 @@ val dump : Format.formatter -> 'a t -> unit
 module type ResultSet =
   sig
     type t
+    type elt = [`Tree] Tree.node
     val empty : t
-    val cons : Tree.t -> t -> t
+    val cons : elt -> t -> t
     val concat : t -> t -> t
-    val iter : (Tree.t -> unit) -> t -> unit
-    val fold : (Tree.t -> 'a -> 'a) -> t -> 'a -> 'a
-    val map : (Tree.t -> Tree.t) -> t -> t
+    val iter : (elt -> unit) -> t -> unit
+    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 
   end
 
 module IdSet : ResultSet
+module GResult : ResultSet 
 
 val top_down_count : 'a t -> Tree.t -> int
 val top_down : 'a t -> Tree.t -> IdSet.t