-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
+
+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 * 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 : (bool*bool*bool*bool)-> elt -> t -> t -> t
+ end
+module IdSet : ResultSet
+module GResult : ResultSet
-module BottomUpNew :
-sig
- val miss : int ref
- val call : int ref
- val run : t -> Tree.Binary.t -> Tree.Binary.t list
-end
+val top_down_count : 'a t -> Tree.t -> int
+val top_down : 'a t -> Tree.t -> GResult.t
+val bottom_up_count :
+ 'a t -> Tree.t -> [> `CONTAINS of 'b | `TAG of Tag.t ] -> int