Fast closure branch

[SXSI/xpathcomp.git] / tree.ml

diff --git a/tree.ml b/tree.ml
index 8e5dbc7..4b7cb54 100644 (file)
--- a/tree.ml
+++ b/tree.ml
@@ -430,7 +430,7 @@ let load ?(sample=64) ?(load_text=true) str =
   let in_c = Unix.in_channel_of_descr fd in
   let _ = set_binary_mode_in in_c true in
   let load_table () = 
-    (let ms = input_line in_c in if ms <> magic_string then failwith "Invalid index file");
+    (let ms = input_line in_c in if ms <> magic_string then failwith ("Invalid index file " ^ ms));
     (let vs = input_line in_c in if vs <> version_string then failwith "Invalid version file");
     let table : (Tag.t,(Ptset.Int.t*Ptset.Int.t*Ptset.Int.t*Ptset.Int.t)) Hashtbl.t =
       Marshal.from_channel in_c 
@@ -450,7 +450,7 @@ let load ?(sample=64) ?(load_text=true) str =
       ntable
   in
   let _ = Printf.eprintf "\nLoading tag table : " in
-  let ntable = time (load_table) () in
+  let ntable = time ~count:0 load_table () in
   ignore(Unix.lseek fd (pos_in in_c) Unix.SEEK_SET);
   let tree = { doc = tree_load fd load_text sample;
               ttable = ntable;}