X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcache.ml;h=68cae6760c9cf2cf6f6f2371004130a8043640f8;hb=7c4c61cec6fe1ae3a1b83a59b17ce90adcfe9b0b;hp=60301fe758dd310006e4bc2b0be95cc52830ddd7;hpb=5db22d04b3c81471dd521537a819da9ce541a171;p=SXSI%2Fxpathcomp.git diff --git a/src/cache.ml b/src/cache.ml index 60301fe..68cae67 100644 --- a/src/cache.ml +++ b/src/cache.ml @@ -1,4 +1,3 @@ -INCLUDE "trace.ml" let realloc l old_size new_size dummy = let l' = Array.create new_size dummy in @@ -30,11 +29,9 @@ struct Format.fprintf fmt "%s" "E")) a.line let add a i v = - TRACE("twopass", 2, __ "Before add (%i): %a\n%!" i print a); if a.offset == ~-1 then a.offset <- i; let offset = a.offset in let len = Array.length a.line in - let () = if i >= offset && i < offset + len then a.line.(i - offset) <- v else @@ -58,8 +55,6 @@ struct narray.(i - offset) <- v; a.line <- narray end - in - TRACE("twopass", 2, __ "After add (%i): %a\n%!" i print a) let find a i = let offset = a.offset in @@ -94,16 +89,15 @@ struct let add a i j v = - TRACE("twopass", 2, __ "Adding %i %i\n%!" i j); let line = Lvl1.find a i in if line == a.Lvl1.dummy then let nline = Lvl1.create 0 line.Lvl1.dummy in - TRACE("twopass", 2, __ "Reallocating\n%!"); Lvl1.add a i nline; Lvl1.add nline j v else Lvl1.add line j v + let find a i j = let v = Lvl1.find a i in if v == a.Lvl1.dummy then a.Lvl1.dummy.Lvl1.dummy