Minor

[tatoo.git] / src / test.ml

diff --git a/src/test.ml b/src/test.ml
index 1c0ac39..e6cd725 100644 (file)
--- a/src/test.ml
+++ b/src/test.ml
@@ -43,17 +43,25 @@ let query () =
 
 let build_asta query =
   let asta = Compil.trans query in
-  fprintf err_formatter "Compil OK !\n";
+  fprintf err_formatter "Compil OK ! ";
   asta
 
+let compute_run doc query = 
+  let run = Run.compute doc query in
+  fprintf err_formatter "Run OK ! \n";
+  run
+
 let () =
-  let query = query () in
   let doc = doc () in
+  let query = query () in
   let asta = build_asta query in
-  fprintf err_formatter "@[<v 0> ##### Query #####@.      %a@]@ "
+  let run = compute_run doc asta in
+  fprintf err_formatter "@[<v 0>##### Query #####@.  %a@]\n"
     XPath.Ast.print query;
+  output_string stderr "\n##### Doc #####\n";
+  Tree.print_xml stderr doc (Tree.root doc);
+  output_string stderr "\n";
   Asta.print err_formatter asta;
-  fprintf err_formatter "@[<v 0> ##### Doc #####@.%a@]@ "
-    Tree.print_xml doc (Tree.root doc);
+  fprintf err_formatter "@[<v 0>##### Run #####@.  %a@]\n"
+    Run.print run;
   exit 0
-