projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stable state. Includes fixes and tweaking of the caching of automata.
[SXSI/xpathcomp.git]
/
tree.ml
diff --git
a/tree.ml
b/tree.ml
index
0a1bdda
..
f84c2bd
100644
(file)
--- a/
tree.ml
+++ b/
tree.ml
@@
-176,7
+176,7
@@
let text_size t = text_size t.doc
module MemUnion = Hashtbl.Make (struct
type t = Ptset.Int.t*Ptset.Int.t
module MemUnion = Hashtbl.Make (struct
type t = Ptset.Int.t*Ptset.Int.t
- let equal (x,y) (z,t) = x == z
||
y == t
+ let equal (x,y) (z,t) = x == z
&&
y == t
let equal a b = equal a b || equal b a
let hash (x,y) = (* commutative hash *)
let x = Uid.to_int (Ptset.Int.uid x)
let equal a b = equal a b || equal b a
let hash (x,y) = (* commutative hash *)
let x = Uid.to_int (Ptset.Int.uid x)
@@
-513,7
+513,8
@@
let select_following_sibling t = fun ts ->
fun n -> tree_select_following_sibling t.doc n v
let next_sibling_below t = (); fun n _ -> tree_next_sibling t.doc n
fun n -> tree_select_following_sibling t.doc n v
let next_sibling_below t = (); fun n _ -> tree_next_sibling t.doc n
-let next_element_below t = (); fun n _ -> tree_next_element t.doc n
+let next_element_below t = (); fun n _ -> tree_next_element t.doc n
+
let tagged_following_sibling_below t tag = (); fun n _ -> tree_tagged_following_sibling t.doc n tag
let select_following_sibling_below t = fun ts ->
let tagged_following_sibling_below t tag = (); fun n _ -> tree_tagged_following_sibling t.doc n tag
let select_following_sibling_below t = fun ts ->