X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fauto%2Fata.ml;h=1015513f2563db0d5ebc669c5d47681c3a8f3004;hp=441899693c8fe0bb883945cf26dedb012d31f45f;hb=ce09a30489dce8ac9e389c8c1525a34d1e02354e;hpb=53a0fd29a20e7f4550e0eb5fa5b0d5af6191c36d diff --git a/src/auto/ata.ml b/src/auto/ata.ml index 4418996..1015513 100644 --- a/src/auto/ata.ml +++ b/src/auto/ata.ml @@ -14,7 +14,7 @@ (***********************************************************************) (* - Time-stamp: + Time-stamp: *) INCLUDE "utils.ml" @@ -153,14 +153,34 @@ let create () = { id = next (); } +module Transition = Hcons.Make (struct + type t = State.t * QNameSet.t * SFormula.t + let equal (a, b, c) (d, e, f) = + a == d && b == e && c == f + let hash (a, b, c) = + HASHINT4 (PRIME1, a, ((QNameSet.uid b) :> int), ((SFormula.uid c) :> int)) +end) + +module TransList : sig + include Hlist.S with type elt = Transition.t + val print : Format.formatter -> t -> unit +end = + struct + include Hlist.Make(Transition) + let print ppf l = + iter (fun t -> + let q, lab, f = Transition.node t in + fprintf ppf "%a, %a -> %a
" State.print q QNameSet.print lab SFormula.print f) l + end + let get_trans a states tag = StateSet.fold (fun q acc0 -> try let trs = Hashtbl.find a.transitions q in List.fold_left (fun acc1 (labs, phi) -> - if QNameSet.mem tag labs then (q,phi)::acc1 else acc1) acc0 trs + if QNameSet.mem tag labs then TransList.cons (Transition.make (q, labs, phi)) acc1 else acc1) acc0 trs with Not_found -> acc0 - ) states [] + ) states TransList.nil (* [add_trans a q labels f] adds a transition [(q,labels) -> f] to the