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

diff --git a/ata.mli b/ata.mli
index f5e2c4f..a5fb3e1 100644
--- a/ata.mli
+++ b/ata.mli
@@ -1,56 +1,114 @@
-type state = int
-val mk_state : unit -> state
-
-type predicate = Ptset.t*Ptset.t -> Tree.Binary.t ->  [ `True | `False | `Maybe ]
-type formula_expr =
-    False
-  | True
-  | Or of formula * formula
-  | And of formula * formula
-  | Atom of ([ `Left | `Right ] * bool * state * predicate option)
-and formula = { fid : int; pos : formula_expr; neg : formula; st : Ptset.t*Ptset.t;}
-val true_ : formula
-val false_ : formula
-val atom_ : ?pred:predicate option -> [`Left | `Right ] -> bool -> state -> formula
-val and_ : formula -> formula -> formula
-val or_ : formula -> formula -> formula
-val not_ : formula -> formula 
-val equal_form : formula -> formula -> bool
-val pr_frm : Format.formatter -> formula -> unit
-
-
-type property = [ `None | `Existential  ]
-
-type t = {
+type jump_kind = [ `CONTAINS of string | `NOTHING | `TAG of Tag.t ]
+module State : 
+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
+    val print : Format.formatter -> t -> unit
+  end
+
+module Formula :
+  sig
+    type 'a expr =
+        False
+      | True
+      | Or of 'a * 'a
+      | And of 'a * 'a
+      | Atom of ([ `LLeft | `Left | `RRight | `Right ] * bool * State.t)
+
+    type t
+    val hash : t -> int
+    val uid : t -> int
+    val equal : t -> t -> bool
+    val expr : t -> t expr
+    val st :
+      t ->
+      (StateSet.t * StateSet.t * StateSet.t) *
+      (StateSet.t * StateSet.t * StateSet.t)
+    val size : t -> int
+    val print : Format.formatter -> t -> unit
+    val is_true : t -> bool
+    val is_false : t -> bool
+    val true_ : t
+    val false_ : t
+    val atom_ :
+      [ `LLeft | `Left | `RRight | `Right ] ->
+      bool -> StateSet.elt -> t
+    val not_ : t -> t
+    val or_ : t -> t -> t
+    val and_ : t -> t -> t
+    module Infix : sig
+    val ( +| ) : t -> t -> t
+    val ( *& ) : t -> t -> t
+    val ( *+ ) :
+      [ `LLeft | `Left | `RRight | `Right ] -> StateSet.elt -> t
+    val ( *- ) :
+      [ `LLeft | `Left | `RRight | `Right ] -> StateSet.elt -> t
+    end
+  end
+module Transition :
+  sig
+    type node = State.t * TagSet.t * bool * Formula.t * bool
+    type data = node
+    type t
+    val make : data -> t
+    val node : t -> data
+    val hash : t -> int
+    val uid : t -> int
+    val equal : t -> t -> bool
+    module Infix : sig
+    val ( ?< ) : State.t -> State.t
+    val ( >< ) : State.t -> TagSet.t * bool -> State.t*(TagSet.t*bool*bool)
+    val ( ><@ ) : State.t -> TagSet.t * bool -> State.t*(TagSet.t*bool*bool)
+    val ( >=> ) : State.t * (TagSet.t*bool*bool) -> Formula.t -> (State.t*TagSet.t*t)
+    end
+    val print : Format.formatter -> t -> unit
+  end
+
+module Formlist : Hlist.S with type elt = Transition.t
+
+type 'a t = {
   id : int;
-  states : Ptset.t;
-  init : Ptset.t;
-  final : Ptset.t;
-  universal : Ptset.t;
-  phi : (TagSet.t * state, bool * formula) Hashtbl.t;
-  delta : (TagSet.t, Ptset.t * bool * Ptset.t * Ptset.t) Hashtbl.t;
-  properties : (state,property) Hashtbl.t;
+  mutable states : StateSet.t;
+  init : StateSet.t;
+  starstate : StateSet.t option;
+  trans : (State.t, (TagSet.t * Transition.t) list) Hashtbl.t;
+  query_string : string;
 }
-val dump : Format.formatter -> t -> unit
-    
-module Transitions : sig
-type t = state*TagSet.t*bool*formula
-(* Doing this avoid the parenthesis *)
-val ( ?< ) : state -> state 
-val ( >< ) : state -> TagSet.t*bool -> state*(TagSet.t*bool)
-val ( >=> ) : state*(TagSet.t*bool) -> formula -> t
-val ( +| ) : formula -> formula -> formula
-val ( *& ) : formula -> formula -> formula
-val ( ** ) : [`Left | `Right ] -> state -> formula
+val dump : Format.formatter -> 'a t -> unit
 
-end
-type transition = Transitions.t
-val equal_trans : transition -> transition -> bool
+module type ResultSet =
+  sig
+    type t
+    type elt = [`Tree] Tree.node
+    val empty : t
+    val cons : elt -> t -> t
+    val concat : 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 : 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 (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
+val bottom_up :
+  'a t -> Tree.t -> [> `CONTAINS of 'b | `TAG of Tag.t ] -> IdSet.t
 
-module BottomUpNew : 
+module Test (Doc : sig val doc : Tree.t end ) :
 sig
-  val miss : int ref
-  val call : int ref
-  val run : t -> Tree.Binary.t -> Tree.Binary.t list
+  module Results : ResultSet
+  val top_down : 'a t -> Tree.t -> Results.t
 end