X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Ftatoo.ml;h=24e212f6ba340e7f954112427758b62039ec240a;hp=6464cb4be8e307820171cfcaf2d1319a05ab5bf6;hb=3406b26f1ea26a997d7f194c547439891c108ce6;hpb=e56b9fbeaed04c1f2fb7019de34f7d8e87d6db73 diff --git a/src/tatoo.ml b/src/tatoo.ml index 6464cb4..24e212f 100644 --- a/src/tatoo.ml +++ b/src/tatoo.ml @@ -15,8 +15,6 @@ open Format - - let time f arg msg = let t1 = Unix.gettimeofday () in let r = f arg in @@ -106,9 +104,10 @@ let main () = Logger.msg `STATS "@[Automaton: @\n%a@]" Ata.print auto) auto_list; end; - let module Naive = Run.Make(Naive_tree) in + let module Naive = Run.Make(Naive_tree)(Naive_node_list) in let result_list = - let root = [ Naive_tree.root doc] in + + let root = Naive_node_list.(add (Naive_tree.root doc) (create())) in let f, msg = match !Options.parallel, !Options.compose with true, true -> @@ -136,10 +135,10 @@ let main () = output_string output (string_of_int !count); output_string output "\" >\n"; if !Options.count then begin - output_string output (string_of_int (List.length results)); + output_string output (string_of_int (Naive_node_list.length results)); output_char output '\n'; end else - List.iter (fun n -> + Naive_node_list.iter (fun n -> Naive_tree.print_xml output doc n; output_char output '\n' ) results;