Follow the changes in XMLTree API: xml_tree::subtree_elements() does

[SXSI/xpathcomp.git] / src / tree.ml

diff --git a/src/tree.ml b/src/tree.ml
index e729034..f73e347 100644 (file)
--- a/src/tree.ml
+++ b/src/tree.ml
@@ -347,10 +347,10 @@ let rec iter_array_tag i a len tree node acc =
     iter_array_tag (i+1) a len tree node
       (acc - (tree_subtree_tags tree node a.(i)))
 
-external tree_subtree_elements : tree -> [`Tree] Node.t -> tag_list -> int = "caml_xml_tree_subtree_elements" "noalloc"
+external tree_subtree_elements : tree -> [`Tree] Node.t -> int = "caml_xml_tree_subtree_elements" "noalloc"
 
 let subtree_elements t node =
-  tree_subtree_elements t.doc node t.attribute_array
+  tree_subtree_elements t.doc node
 (*
 let subtree_elements t node =
   let size = tree_subtree_size t.doc node - 1 in
@@ -633,7 +633,7 @@ let load ?(sample=64) ?(load_text=true) str =
   let _ = set_binary_mode_in in_c true in
   let load_table () =
     (let ms = input_line in_c in if ms <> magic_string then failwith "Invalid index file");
-    (let vs = input_line in_c in if vs <> version_string then failwith "Invalid version file");
+    (let vs = input_line in_c in if vs <> version_string then failwith "Unsupported index format");
     let c = load_tag_table in_c in
     let s = load_tag_table in_c in
     let d = load_tag_table in_c in
@@ -809,3 +809,6 @@ Largest tag id: %i@\n@?"
 ;;
 
 *)
+
+type tree_pointer = tree
+let get_tree_pointer x = x.doc