Merged -correctxpath branch

[SXSI/xpathcomp.git] / OCamlDriver.cpp

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index ed9afe1..8603c11 100644 (file)
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -377,7 +377,7 @@ extern "C" CAMLprim value caml_int_vector_set(value vec, value i, value v){
 
 
 #define VECT(x)  ((int*) (x))
-extern "C" CAMLprim value caml_xml_tree_tagged_below(value tree, value node, value ctags, value dtags){
+extern "C" CAMLprim value caml_xml_tree_select_below(value tree, value node, value ctags, value dtags){
   CAMLparam4(tree,node,ctags,dtags);
    
   CAMLreturn (Val_int (
@@ -388,7 +388,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_below(value tree, value node, val
                                                   VECT(dtags)[0]))));                                     
 }
 
-extern "C" CAMLprim value caml_xml_tree_tagged_next(value tree, value node, value ctags, value ftags,value root){
+extern "C" CAMLprim value caml_xml_tree_select_next(value tree, value node, value ctags, value ftags,value root){
   CAMLparam5(tree,node,ctags,ftags,root);
   CAMLreturn (Val_int (
                       (XMLTREE(tree)->TaggedNext(TREENODEVAL(node),
@@ -399,7 +399,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_next(value tree, value node, valu
                                                  TREENODEVAL(root)))));
 }
 
-extern "C" CAMLprim value caml_xml_tree_tagged_desc_only(value tree, value node,value dtags){
+extern "C" CAMLprim value caml_xml_tree_select_desc_only(value tree, value node,value dtags){
   CAMLparam3(tree,node,dtags);
    
   CAMLreturn (Val_int (
@@ -408,7 +408,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_desc_only(value tree, value node,
                                                   VECT(dtags)[0]))));                                     
 }
 
-extern "C" CAMLprim value caml_xml_tree_tagged_foll_only(value tree, value node, value ftags,value root){
+extern "C" CAMLprim value caml_xml_tree_select_foll_only(value tree, value node, value ftags,value root){
   CAMLparam4(tree,node,ftags,root);
   CAMLreturn (Val_int (
                       (XMLTREE(tree)->TaggedFollOnly(TREENODEVAL(node),
@@ -417,7 +417,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_foll_only(value tree, value node,
                                                  TREENODEVAL(root)))));
 }
 
-extern "C" CAMLprim value caml_xml_tree_tagged_desc_or_foll_only(value tree, value node, value ftags,value root){
+extern "C" CAMLprim value caml_xml_tree_select_desc_or_foll_only(value tree, value node, value ftags,value root){
   CAMLparam4(tree,node,ftags,root);
   CAMLreturn (Val_int (
                       (XMLTREE(tree)->TaggedDescOrFollOnly(TREENODEVAL(node),