X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftest.ml;h=e9000c326277461108bf717b01f28065c8d8b49c;hb=c1b43e1dcdb3d0960dbc50db9f226d68ad30c16e;hp=cba40e05eb8fabb3c0cb264f929efffb5615a373;hpb=91c3b3585a018dd5f98949e4838ef3d6c5c120fc;p=tatoo.git

diff --git a/src/test.ml b/src/test.ml
index cba40e0..e9000c3 100644
--- a/src/test.ml
+++ b/src/test.ml
@@ -19,33 +19,51 @@
     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
-
-open Format
+        let q = XPath.parse_file fq in
+        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
 
-let build_asta () =
+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 () =
-  fprintf err_formatter "Query: %a\n%!" XPath.Ast.print query;
-  fprintf err_formatter "Asta: %a\n%!" Asta.print (build_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;
+  Run.print err_formatter run;
+  output_string stderr "\n  # Doc: \n";
+  Tree.print_xml_preorder stderr doc (Tree.root doc);
+  output_string stderr "\n";
   exit 0
-