X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftest.ml;h=2dd1caee3d6e1ee1c1d445f9664c7508981b36d9;hb=f49a93deba13602e16a3923695281e9a20215ac8;hp=b8f2be8c224b13957cc95d8e718e77f7deda833c;hpb=e2dcfc3066d33b814d4e9724563cc5b3e696060d;p=tatoo.git

diff --git a/src/test.ml b/src/test.ml
index b8f2be8..2dd1cae 100644
--- a/src/test.ml
+++ b/src/test.ml
@@ -13,37 +13,41 @@
 (*                                                                     *)
 (***********************************************************************)
 
+(*
+  Time-stamp: <Last modified on 2013-03-04 16:38:27 CET by Kim Nguyen>
+*)
 
 (** use: xml_file "XPath querie"
     or : xml_file -f XPath_querie_file
     only the first line of XPath_querie_file is read 
 *)
 
-module F = Formula
-module A = Ata
+module F = Auto.Formula
+module A = Auto.Ata
+module X = Xpath.Compile
+
 (* to force ocaml build to add Formula to the dependency chain even if
    we don't use it yet*)
 
 let doc =
   let fd = open_in Sys.argv.(1) in
-  let d = Tree.load_xml_file fd in
+  let d = Tree.Naive.load_xml_file fd in
   close_in fd; 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
+  Xpath.Parser.parse (Ulexing.from_latin1_string arg2)
+
+let auto =
+  Xpath.Compile.path query
 
 open Format
 
 let () =
-  fprintf err_formatter "Query: %a\n%!" XPath.Ast.print query;
+  fprintf err_formatter "Query: %a\n%!" Xpath.Ast.print_path query;
+  fprintf err_formatter "Automata: %a\n%!" Auto.Ata.print auto;
   fprintf err_formatter "Document:\n%!";
-  Tree.print_xml stderr doc (Tree.root doc);
+  Tree.Naive.print_xml stderr doc (Tree.Naive.root doc);
   exit 0