X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Ftatoo.ml;h=1dff2a42252c4830f5c665aeb4ac7b16d082d7ca;hp=ca79411bc66358b451ec7012088d2e67446c999b;hb=88375a854dab33de2193a7da5be652ae50f2ca64;hpb=969febf12344a3fe3bf793a323b2e88f7b20ebae diff --git a/src/tatoo.ml b/src/tatoo.ml index ca79411..1dff2a4 100644 --- a/src/tatoo.ml +++ b/src/tatoo.ml @@ -13,10 +13,6 @@ (* *) (***********************************************************************) -(* - Time-stamp: -*) - open Format let time f arg msg = @@ -44,6 +40,7 @@ let main () = let auto = time Xpath.Compile.path query "compiling XPath query" in + let auto = time Ata.copy auto "copying Automaton" in let output = match !Options.output_file with | None | Some "-" | Some "/dev/stdout" -> stdout @@ -54,9 +51,9 @@ let main () = 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" + time (Naive.eval auto doc) ([Naive_tree.root doc]) "evaluating query" in time (fun () -> output_string output "\n"; @@ -71,7 +68,7 @@ let main () = output_string output "\n"; flush output; if output != stdout then close_out output - + ) () "serializing results"