Flatten the sources, only leave the XPath module packed.

[tatoo.git] / src / tatoo.ml

diff --git a/src/tatoo.ml b/src/tatoo.ml
index d6a1986..1b8c17d 100644 (file)
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -14,12 +14,12 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-03-13 21:29:17 CET by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-04 18:45:43 CEST by Kim Nguyen>
 *)
 
 let doc =
   let fd = open_in Sys.argv.(1) in
-  let d = Tree.Naive.load_xml_file fd in
+  let d = Naive_tree.load_xml_file fd in
   close_in fd; d
 
 
@@ -34,16 +34,16 @@ open Format
 
 let () =
   fprintf err_formatter "Query: %a\n%!" Xpath.Ast.print_path query;
-  fprintf err_formatter "Automata: %a\n%!" Auto.Ata.print auto;
+  fprintf err_formatter "Automata: %a\n%!" Ata.print auto;
   fprintf err_formatter "Evaluating automaton:\n%!";
-  let module Naive = Auto.Eval.Make(Tree.Naive) in
+  let module Naive = Eval.Make(Naive_tree) in
   let t1 = Unix.gettimeofday() in
-  let results = Naive.eval auto doc (Tree.Naive.root doc) in
+  let results = Naive.eval auto doc (Naive_tree.root doc) in
   let teval = (Unix.gettimeofday () -. t1) *. 1000. in
   let t1 = Unix.gettimeofday () in
   output_string stdout "<xml_result>\n";
   List.iter (fun n ->
-    Tree.Naive.print_xml stdout doc n;
+    Naive_tree.print_xml stdout doc n;
     output_char stdout '\n'
   ) results;
   output_string stdout "</xml_result>\n";