Rewrite parser using ocamlyacc to remove further dependencies

[tatoo.git] / src / test.ml

diff --git a/src/test.ml b/src/test.ml
index 465e409..daabd09 100644 (file)
--- a/src/test.ml
+++ b/src/test.ml
@@ -20,6 +20,7 @@
 *)
 
 module F = Formula
+module A = Ata
 (* to force ocaml build to add Formula to the dependency chain even if
    we don't use it yet*)
 
@@ -29,19 +30,14 @@ let doc =
   close_in fd; d
 
 
-
 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
+  Uparser.xpath Ulexer.token (Ulexing.from_latin1_string arg2)
 
 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 "Document:\n%!";
   Tree.print_xml stderr doc (Tree.root doc);
   exit 0