X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ptset.ml;fp=ptset.ml;h=3185da4ea97a214875b9073266165d58647f3fab;hb=b82be3bb29963ce00218ccc59e1622e284145351;hp=3fd3d39e26dc1b79b9b8b28e2a52a383c67f226b;hpb=479afaf5e67e28ef73c0126e95ca8badec3392aa;p=SXSI%2Fxpathcomp.git diff --git a/ptset.ml b/ptset.ml index 3fd3d39..3185da4 100644 --- a/ptset.ml +++ b/ptset.ml @@ -36,7 +36,7 @@ struct let equal x y = match x,y with | Empty,Empty -> true - | Leaf k1, Leaf k2 -> H.equal k1 k2 + | Leaf k1, Leaf k2 -> k1 == k2 | Branch(b1,i1,l1,r1),Branch(b2,i2,l2,r2) -> b1 == b2 && i1 == i2 && (HNode.equal l1 l2) && @@ -82,7 +82,7 @@ struct let kid = H.uid k in let rec loop n = match HNode.node n with | Empty -> false - | Leaf j -> H.equal k j + | Leaf j -> k == j | Branch (p, _, l, r) -> if kid <= p then loop l else loop r in loop n @@ -145,7 +145,7 @@ END let kid = H.uid k in let rec ins n = match HNode.node n with | Empty -> leaf k - | Leaf j -> if H.equal j k then n else join kid (leaf k) (H.uid j) n + | Leaf j -> if j == k then n else join kid (leaf k) (H.uid j) n | Branch (p,m,t0,t1) -> if match_prefix kid p m then if zero_bit kid m then @@ -161,7 +161,7 @@ END let kid = H.uid k in let rec rmv n = match HNode.node n with | Empty -> empty - | Leaf j -> if H.equal k j then empty else n + | Leaf j -> if k == j then empty else n | Branch (p,m,t0,t1) -> if match_prefix kid p m then if zero_bit kid m then