X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftest.ml;h=e6cd725eb629f3de3475d6ba9a431e9547d8dbff;hb=c4a733a7ffde6dfbc66b02124e204e3945ed33a4;hp=334e57260e2c6d1b7808b334e3a2214657fdfcd6;hpb=e80e269c313952b4d427fa6a5a9729ea15e43f39;p=tatoo.git

diff --git a/src/test.ml b/src/test.ml
index 334e572..e6cd725 100644
--- a/src/test.ml
+++ b/src/test.ml
@@ -19,30 +19,49 @@
     only the first line of XPath_querie_file is read 
 *)
 
+open Format
 
-let doc =
+let doc () =
   let fd = open_in Sys.argv.(1) in
   let d = Tree.load_xml_file fd in
-  close_in fd; d
-
+  close_in fd;
+  fprintf err_formatter "Parse Tree OK ! ";
+  d
 
 
-let query = 
+let query () = 
   let arg2 = Sys.argv.(2) in
   if arg2 = "-f"
   then  let fq = open_in Sys.argv.(3) in
 	let q = XPath.parse_file fq in
-	close_in fq; q
-  else XPath.parse_string arg2
+	close_in fq;
+	fprintf err_formatter "Parse query OK ! ";
+	q
+  else let q = XPath.parse_string arg2 in
+       fprintf err_formatter "Parse query OK ! ";
+       q
 
-open Format
+let build_asta query =
+  let asta = Compil.trans query in
+  fprintf err_formatter "Compil OK ! ";
+  asta
 
-let asta = Compil.trans query
+let compute_run doc query = 
+  let run = Run.compute doc query in
+  fprintf err_formatter "Run OK ! \n";
+  run
 
 let () =
-  fprintf err_formatter "Query: %a\n%!" XPath.Ast.print query;
-  fprintf err_formatter "Asta: %a\n%!" Asta.print asta;
-  fprintf err_formatter "Document:\n%!";
+  let doc = doc () in
+  let query = query () in
+  let asta = build_asta query in
+  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>##### Run #####@.  %a@]\n"
+    Run.print run;
   exit 0
-