projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite parser using ocamlyacc to remove further dependencies
[tatoo.git]
/
src
/
test.ml
diff --git
a/src/test.ml
b/src/test.ml
index
b8f2be8
..
daabd09
100644
(file)
--- a/
src/test.ml
+++ b/
src/test.ml
@@
-30,19
+30,14
@@
let doc =
close_in fd; d
close_in fd; d
-
let query =
let arg2 = Sys.argv.(2) in
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 () =
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
fprintf err_formatter "Document:\n%!";
Tree.print_xml stderr doc (Tree.root doc);
exit 0