X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=tree.ml;h=f84c2bdd1b7abaf64cd2f8d5c5d78a903579a586;hb=55ee2680ca6d4e952cb800c529d45e064a2eff1c;hp=4b7cb5451a0dbef843c75e090252d16cbe4c003d;hpb=d046f2b9d8e39b30350399eafe122c30ff61c8c1;p=SXSI%2Fxpathcomp.git diff --git a/tree.ml b/tree.ml index 4b7cb54..f84c2bd 100644 --- 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 " ^ ms)); + (let ms = input_line in_c in if ms <> magic_string then failwith "Invalid index file"); (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 ~count:0 load_table () in + let ntable = time (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;} @@ -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 -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 ->