X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.ml;h=f32005d412e95a023ece1a36318d52f1202d2896;hb=25dd7fcc77c2188732d96d5ff98d759bb81737cb;hp=b2b694ffc8efd22f51ce2f5cb95d3271307bb9b7;hpb=f1da22caf34bc3367984228ace9e7e7aa0760f0a;p=SXSI%2Fxpathcomp.git

diff --git a/ata.ml b/ata.ml
index b2b694f..f32005d 100644
--- a/ata.ml
+++ b/ata.ml
@@ -1,11 +1,9 @@
 INCLUDE "debug.ml"
 INCLUDE "utils.ml"
 
+
+
 type jump_kind = [ `TAG of Tag.t | `CONTAINS of string | `NOTHING ]
-let cpt_trans = ref 0
-let miss_trans = ref 0
-let cpt_eval = ref 0
-let miss_eval = ref 0
 
 (* Todo : move elsewhere *)
 external vb : bool -> int = "%identity"
@@ -561,7 +559,7 @@ END
 	  (mk_fun (Tree.text_next) "Tree.text_next")
 	  (mk_fun (fun _ -> Tree.node_sibling_ctx) "[TaggedSibling]Tree.node_sibling_ctx")(* !! no tagged_sibling in Tree.ml *)
 	  (mk_fun (fun _ -> Tree.node_sibling_ctx) "[SelectSibling]Tree.node_sibling_ctx")(* !! no select_sibling in Tree.ml *)
-	  (mk_fun (Tree.tagged_foll_below) "Tree.tagged_foll_below")
+	  (mk_fun (Tree.tagged_foll_ctx) "Tree.tagged_foll_ctx")
 	  (mk_fun (fun _ -> Tree.node_sibling_ctx) "[SelectFoll]Tree.node_sibling_ctx")(* !! no select_foll *)
 	  (mk_fun (Tree.node_sibling_ctx) "Tree.node_sibling_ctx")	  
 				
@@ -911,7 +909,7 @@ END
 	    match k with
 	      | `TAG (tag) -> 
 		  (*Tree.tagged_lowest t tag, fun tree -> Tree.tagged_next tree tag*)
-		  (Tree.tagged_desc tag t, fun tree -> Tree.tagged_foll_below tag tree t)
+		  (Tree.tagged_desc tag t, fun tree -> Tree.tagged_foll_ctx tag tree t)
 	      | `CONTAINS(_) -> (Tree.text_below t,fun tree -> Tree.text_next tree t)
 	      | _ -> assert false
 	  in