Big refactoring of libxml-tree, part (1) (everything compiles)

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

diff --git a/src/l2JIT.ml b/src/l2JIT.ml
index 90105d8..b656faf 100644 (file)
--- a/src/l2JIT.ml
+++ b/src/l2JIT.ml
@@ -16,9 +16,9 @@ type jump =
   | SELECT_DESCENDANT of StateSet.t * Ptset.Int.t * Tree.unordered_set
   | SELECT_FOLLOWING of StateSet.t * Ptset.Int.t * Tree.unordered_set
   | TAGGED_CHILD of StateSet.t * Tag.t
-  | TAGGED_FOLLOWING_SIBLING of StateSet.t * Tag.t
+  | TAGGED_SIBLING of StateSet.t * Tag.t
   | SELECT_CHILD of StateSet.t * Ptset.Int.t * Tree.unordered_set
-  | SELECT_FOLLOWING_SIBLING of StateSet.t * Ptset.Int.t * Tree.unordered_set
+  | SELECT_SIBLING of StateSet.t * Ptset.Int.t * Tree.unordered_set
   | TAGGED_SUBTREE of StateSet.t * Tag.t
   | ELEMENT_SUBTREE of StateSet.t
 
@@ -34,9 +34,9 @@ let _tagged_following s t = TAGGED_FOLLOWING(s,t)
 let _select_descendant s t = SELECT_DESCENDANT(s,t, Tree.unordered_set_of_set t)
 let _select_following s t = SELECT_FOLLOWING(s,t, Tree.unordered_set_of_set t)
 let _tagged_child s t = TAGGED_CHILD(s,t)
-let _tagged_following_sibling s t = TAGGED_FOLLOWING_SIBLING(s,t)
+let _tagged_following_sibling s t = TAGGED_SIBLING(s,t)
 let _select_child s t = SELECT_CHILD(s,t, Tree.unordered_set_of_set t)
-let _select_following_sibling s t = SELECT_FOLLOWING_SIBLING(s,t, Tree.unordered_set_of_set t)
+let _select_following_sibling s t = SELECT_SIBLING(s,t, Tree.unordered_set_of_set t)
 let _tagged_subtree s t = TAGGED_SUBTREE (s, t)
 let _element_subtree s = ELEMENT_SUBTREE s
 
@@ -67,13 +67,13 @@ let print_jump fmt j =
 
   | TAGGED_CHILD (_, tag) -> fprintf fmt "tagged_child(%s)" (Tag.to_string tag)
 
-  | TAGGED_FOLLOWING_SIBLING (_, tag) ->
+  | TAGGED_SIBLING (_, tag) ->
     fprintf fmt "tagged_following_sibling(%s)" (Tag.to_string tag)
 
   | SELECT_CHILD (_, tags, _) -> fprintf fmt "select_child(%a)"
     TagSet.print (TagSet.inj_positive tags)
 
-  | SELECT_FOLLOWING_SIBLING (_, tags, _) -> fprintf fmt "select_following_sibling(%a)"
+  | SELECT_SIBLING (_, tags, _) -> fprintf fmt "select_following_sibling(%a)"
     TagSet.print (TagSet.inj_positive tags)
 
   | TAGGED_SUBTREE (_, tag) -> fprintf fmt "tagged_subtree(%s)" (Tag.to_string tag)