X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Ftatoo.ml;h=c3cddfebdf658e39b99b21682cfb3dfe061edd5a;hp=2c3206245cee5f9f6b7cf101e58218f43c5ffc5b;hb=af9d790ca62e678e8e70ab8d8fa7f804985a75e0;hpb=318ebb395fe3665046b76cf4de6cf8166b94d4cc

diff --git a/src/tatoo.ml b/src/tatoo.ml
index 2c32062..c3cddfe 100644
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -13,10 +13,6 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(*
-  Time-stamp: <Last modified on 2013-04-22 18:48:48 CEST by Kim Nguyen>
-*)
-
 open Format
 
 let time f arg msg =
@@ -24,7 +20,7 @@ let time f arg msg =
   let r = f arg in
   let t2 = Unix.gettimeofday () in
   let time = (t2 -. t1) *. 1000. in
-  if !Options.stats then fprintf err_formatter "@[STATS: %s: %fms@]@." msg time;
+  Logger.msg `STATS "%s: %fms" msg time;
   r
 
 
@@ -50,13 +46,11 @@ let main () =
     | Some f -> open_out f
   in
   if !Options.stats then begin
-    fprintf err_formatter "@[STATS: Query: %a @]@." Xpath.Ast.print_path query;
-    fprintf err_formatter "@[STATS: @[Automaton: @\n";
-    Ata.print err_formatter auto;
-    fprintf err_formatter "@]@]@.";
+    Logger.msg `STATS "Query: %a " Xpath.Ast.print_path query;
+    Logger.msg `STATS "@[Automaton: @\n%a@]" Ata.print auto;
   end;
 
-  let module Naive = Eval.Make(Naive_tree) in
+  let module Naive = Run.Make(Naive_tree) in
   let results =
     time (Naive.eval auto doc) (Naive_tree.root doc) "evaluating query"
   in