Refactor pretty printing of transitions and fix some depracated function uses.

[tatoo.git] / src / ata.ml

diff --git a/src/ata.ml b/src/ata.ml
index 5f7a282..c045aaf 100644 (file)
--- a/src/ata.ml
+++ b/src/ata.ml
@@ -192,24 +192,20 @@ end)
       fprintf ppf "%a, %a %s %a"
         State.print q
         QNameSet.print l
-        Pretty.double_right_arrow
+        Pretty.left_arrow
         Formula.print f
   end
 
 
 module TransList : sig
   include Hlist.S with type elt = Transition.t
-  val print : Format.formatter -> ?sep:string -> t -> unit
+  val print : ?sep:string -> Format.formatter -> t -> unit
 end =
   struct
     include Hlist.Make(Transition)
-    let print ppf ?(sep="\n") l =
+    let print ?(sep="\n") ppf l =
       iter (fun t ->
-        let q, lab, f = Transition.node t in
-        fprintf ppf "%a, %a → %a%s"
-          State.print q
-          QNameSet.print lab
-          Formula.print f sep) l
+          fprintf ppf "%a%s" Transition.print t sep) l
   end
 
 
@@ -284,7 +280,7 @@ let print fmt a =
     fprintf fmt "%s, %s" s1 s2;
     fprintf fmt "%s"
       (Pretty.padding (max_pre - Pretty.length s1 - Pretty.length s2));
-    fprintf fmt " %s  %s@\n" Pretty.right_arrow s3;
+    fprintf fmt " %s  %s@\n" Pretty.left_arrow s3;
   ) strs_strings;
   fprintf fmt "%s@\n" line