X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.ml;h=4ea20676825e0ab895e3bd12b3929c106595db22;hb=609094fe14ca90cd5417ee22de621f76d1d0ec94;hp=3741b569f134acf7a0f7284d292157a3de9a73b0;hpb=be1caa5c46009c13241cc48ed34a36ee2936ef87;p=SXSI%2Fxpathcomp.git diff --git a/ata.ml b/ata.ml index 3741b56..4ea2067 100644 --- a/ata.ml +++ b/ata.ml @@ -1,6 +1,6 @@ INCLUDE "debug.ml" INCLUDE "utils.ml" - +open Camlp4.Struct type jump_kind = [ `TAG of Tag.t | `CONTAINS of string | `NOTHING ] (* Todo : move elsewhere *) @@ -337,7 +337,8 @@ module FTable = Hashtbl.Make(struct let h_f = FTable.create BIG_H_SIZE - +type merge_conf = NO | ONLY1 | ONLY2 | ONLY12 | MARK | MARK1 | MARK2 | MARK12 +(* 000 001 010 011 100 101 110 111 *) let eval_formlist tag s1 s2 fl = let rec loop fl = try @@ -355,8 +356,32 @@ let eval_formlist tag s1 s2 fl = else res in FTable.add h_f (tag,fl,s1,s2) r;r | Formlist.Nil -> StateSet.empty,(false,false,false,false) - in loop fl - + in + let r,conf = loop fl + in + r,(match conf with + | (false,_,_,_) -> NO + | (_,false,false,false) -> NO + | (_,true,false,false) -> ONLY1 + | (_,false,true,false) -> ONLY2 + | (_,true,true,false) -> ONLY12 + | (_,false,false,true) -> MARK + | (_,true,false,true) -> MARK1 + | (_,false,true,true) -> MARK2 + | _ -> MARK12) + +let bool_of_merge conf = + match conf with + | NO -> false,false,false,false + | ONLY1 -> true,true,false,false + | ONLY2 -> true,false,true,false + | ONLY12 -> true,true,true,false + | MARK -> true,false,false,true + | MARK1 -> true,true,false,true + | MARK2 -> true,false,true,true + | MARK12 -> true,true,true,true + + let tags_of_state a q = Hashtbl.fold (fun p l acc -> @@ -394,7 +419,7 @@ let tags_of_state a q = val fold : ( elt -> 'a -> 'a) -> t -> 'a -> 'a val map : ( elt -> elt) -> t -> t val length : t -> int - val merge : (bool*bool*bool*bool) -> elt -> t -> t -> t + val merge : merge_conf -> elt -> t -> t -> t val mk_quick_tag_loop : (elt -> elt -> 'a*t array) -> 'a -> int -> Tree.t -> Tag.t -> (elt -> elt -> 'a*t array) val mk_quick_star_loop : (elt -> elt -> 'a*t array) -> 'a -> int -> Tree.t -> (elt -> elt -> 'a*t array) end @@ -403,6 +428,7 @@ let tags_of_state a q = struct type t = int type elt = [`Tree] Tree.node + let empty = 0 let cons _ x = x+1 let concat x y = x + y @@ -410,7 +436,8 @@ let tags_of_state a q = let fold _ _ _ = failwith "fold not implemented" let map _ _ = failwith "map not implemented" let length x = x - let merge (rb,rb1,rb2,mark) t res1 res2 = + let merge2 conf t res1 res2 = + let rb,rb1,rb2,mark = conf in if rb then let res1 = if rb1 then res1 else 0 and res2 = if rb2 then res2 else 0 @@ -418,6 +445,17 @@ let tags_of_state a q = if mark then 1+res1+res2 else res1+res2 else 0 + let merge conf t res1 res2 = + match conf with + NO -> 0 + | MARK -> 1 + | MARK1 -> res1+1 + | ONLY1 -> res1 + | ONLY2 -> res2 + | ONLY12 -> res1+res2 + | MARK2 -> res2+1 + | MARK12 -> res1+res2+1 + let mk_quick_tag_loop _ sl ss tree tag = (); fun t ctx -> (sl, Array.make ss (Tree.subtree_tags tree tag t)) @@ -427,7 +465,7 @@ let tags_of_state a q = end - module IdSet : ResultSet = + module IdSet : ResultSet= struct type elt = [`Tree] Tree.node type node = Nil @@ -469,28 +507,34 @@ let tags_of_state a q = in { l with node = loop l.node } - let merge (rb,rb1,rb2,mark) t res1 res2 = - if rb then - let res1 = if rb1 then res1 else empty - and res2 = if rb2 then res2 else empty - in - if mark then { node = Cons(t,(Concat(res1.node,res2.node))); - length = res1.length + res2.length + 1;} - else - { node = (Concat(res1.node,res2.node)); - length = res1.length + res2.length ;} - else empty + let merge conf t res1 res2 = + match conf with + NO -> empty + | MARK -> cons t empty + | ONLY1 -> res1 + | ONLY2 -> res2 + | ONLY12 -> { node = (Concat(res1.node,res2.node)); + length = res1.length + res2.length ;} + | MARK12 -> { node = Cons(t,(Concat(res1.node,res2.node))); + length = res1.length + res2.length + 1;} + | MARK1 -> { node = Cons(t,res1.node); + length = res1.length + 1;} + | MARK2 -> { node = Cons(t,res2.node); + length = res2.length + 1;} + let mk_quick_tag_loop f _ _ _ _ = f let mk_quick_star_loop f _ _ _ = f end module GResult(Doc : sig val doc : Tree.t end) = struct type bits type elt = [` Tree] Tree.node - external create_empty : int -> bits = "caml_result_set_create" - external set : bits -> int -> unit = "caml_result_set_set" - external next : bits -> int -> int = "caml_result_set_next" - external clear : bits -> elt -> elt -> unit = "caml_result_set_clear" - + external create_empty : int -> bits = "caml_result_set_create" "noalloc" + external set : bits -> int -> unit = "caml_result_set_set" "noalloc" + external next : bits -> int -> int = "caml_result_set_next" "noalloc" + external count : bits -> int = "caml_result_set_count" "noalloc" + external clear : bits -> elt -> elt -> unit = "caml_result_set_clear" "noalloc" + + external set_tag_bits : bits -> Tag.t -> Tree.t -> elt -> elt = "caml_set_tag_bits" "noalloc" type t = { segments : elt list; bits : bits; @@ -540,37 +584,75 @@ let tags_of_state a q = else (f ((Obj.magic i):elt);loop (next t.bits i)) in loop (next t.bits 0) - let fold _ _ _ = failwith "noop" + let fold f t acc = + let rec loop i acc = + if i == -1 then acc + else loop (next t.bits i) (f ((Obj.magic i):elt) acc) + in loop (next t.bits 0) acc + let map _ _ = failwith "noop" - let length t = let cpt = ref 0 in - iter (fun _ -> incr cpt) t; !cpt + (*let length t = let cpt = ref 0 in + iter (fun _ -> incr cpt) t; !cpt *) + let length t = count t.bits + let clear_bits t = + let rec loop l = match l with + [] -> () + | idx::ll -> + clear t.bits idx (Tree.closing Doc.doc idx); loop ll + in + loop t.segments;empty + let merge (rb,rb1,rb2,mark) elt t1 t2 = if rb then (* let _ = Printf.eprintf "Lenght before merging is %i %i\n" (List.length t1.segments) (List.length t2.segments) - in *) + in *) match t1.segments,t2.segments with [],[] -> if mark then cons elt empty else empty - | [p],[] when rb1 -> if mark then cons elt t1 else t1 - | [], [p] when rb2 -> if mark then cons elt t2 else t2 - | [x],[y] when rb1 && rb2 -> if mark then cons elt empty else + | [_],[] when rb1 -> if mark then cons elt t1 else t1 + | [], [_] when rb2 -> if mark then cons elt t2 else t2 + | [_],[_] when rb1 && rb2 -> if mark then cons elt empty else concat t1 t2 - | _,_ -> - let t1 = if rb1 then t1 else - (List.iter (fun idx -> clear t1.bits idx (Tree.closing Doc.doc idx)) t1.segments;empty) - and t2 = if rb2 then t2 else - (List.iter (fun idx -> clear t2.bits idx (Tree.closing Doc.doc idx)) t2.segments;empty) + | _ -> + let t1 = if rb1 then t1 else clear_bits t1 + and t2 = if rb2 then t2 else clear_bits t2 in (if mark then cons elt (concat t1 t2) else concat t1 t2) else - let _ = - List.iter (fun idx -> clear t1.bits idx (Tree.closing Doc.doc idx)) t1.segments; - List.iter (fun idx -> clear t2.bits idx (Tree.closing Doc.doc idx)) t2.segments - in - empty - let mk_quick_tag_loop f _ _ _ _ = f + let _ = clear_bits t1 in + clear_bits t2 + + let merge conf t t1 t2 = + match t1.segments,t2.segments,conf with + | _,_,NO -> let _ = clear_bits t1 in clear_bits t2 + | [],[],(MARK1|MARK2|MARK12|MARK) -> cons t empty + | [],[],_ -> empty + | [_],[],(ONLY1|ONLY12) -> t1 + | [_],[],(MARK1|MARK12) -> cons t t1 + | [],[_],(ONLY2|ONLY12) -> t2 + | [],[_],(MARK2|MARK12) -> cons t t2 + | [_],[_],ONLY12 -> concat t1 t2 + | [_],[_],MARK12 -> cons t empty + | _,_,MARK -> let _ = clear_bits t2 in cons t (clear_bits t1) + | _,_,ONLY1 -> let _ = clear_bits t2 in t1 + | _,_,ONLY2 -> let _ = clear_bits t1 in t2 + | _,_,ONLY12 -> concat t1 t2 + | _,_,MARK1 -> let _ = clear_bits t2 in cons t t1 + | _,_,MARK2 -> let _ = clear_bits t1 in cons t t2 + | _,_,MARK12 -> cons t (concat t1 t2) + + let mk_quick_tag_loop _ sl ss tree tag = (); + fun t _ -> + let res = empty in + let first = set_tag_bits empty.bits tag tree t in + let res = + if first == Tree.nil then res else + cons first res + in + (sl, Array.make ss res) + let mk_quick_star_loop f _ _ _ = f end module Run (RS : ResultSet) = @@ -715,8 +797,8 @@ END (mk_fun (fun _ -> Tree.nil) "Tree.mk_nil") (mk_fun (Tree.tagged_child tree) "Tree.tagged_child") (mk_fun (Tree.select_child tree) "Tree.select_child") - (mk_fun (Tree.tagged_desc tree) "Tree.tagged_desc") - (mk_fun (Tree.select_desc tree) "Tree.select_desc") + (mk_fun (Tree.tagged_descendant tree) "Tree.tagged_desc") + (mk_fun (Tree.select_descendant tree) "Tree.select_desc") (mk_fun (fun _ _ -> Tree.first_child tree) "[FIRSTCHILD]Tree.select_child_desc") (mk_fun (Tree.first_element tree) "Tree.first_element") (mk_fun (Tree.first_child tree) "Tree.first_child") @@ -724,20 +806,22 @@ END let choose_jump_next tree d = choose_jump d (mk_fun (fun _ _ -> Tree.nil) "Tree.mk_nil2") - (mk_fun (Tree.tagged_sibling_ctx tree) "Tree.tagged_sibling_ctx") - (mk_fun (Tree.select_sibling_ctx tree) "Tree.select_sibling_ctx") - (mk_fun (Tree.tagged_foll_ctx tree) "Tree.tagged_foll_ctx") - (mk_fun (Tree.select_foll_ctx tree) "Tree.select_foll_ctx") - (mk_fun (fun _ _ -> Tree.next_sibling_ctx tree) "[NEXTSIBLING]Tree.select_sibling_foll_ctx") - (mk_fun (Tree.next_element_ctx tree) "Tree.next_element_ctx") - (mk_fun (Tree.next_sibling_ctx tree) "Tree.node_sibling_ctx") + (mk_fun (Tree.tagged_following_sibling_below tree) "Tree.tagged_sibling_ctx") + (mk_fun (Tree.select_following_sibling_below tree) "Tree.select_sibling_ctx") + (mk_fun (Tree.tagged_following_below tree) "Tree.tagged_foll_ctx") + (mk_fun (Tree.select_following_below tree) "Tree.select_foll_ctx") + (mk_fun (fun _ _ -> Tree.next_sibling_below tree) "[NEXTSIBLING]Tree.select_sibling_foll_ctx") + (mk_fun (Tree.next_element_below tree) "Tree.next_element_ctx") + (mk_fun (Tree.next_sibling_below tree) "Tree.node_sibling_ctx") module SListTable = Hashtbl.Make(struct type t = SList.t let equal = (==) let hash t = t.SList.Node.id end) - module TransCache = + + + module TransCacheOld = struct type 'a t = Obj.t array SListTable.t let create n = SListTable.create n @@ -769,6 +853,43 @@ END end + module TransCache = + struct + external get : 'a array -> int ->'a = "%array_unsafe_get" + external set : 'a array -> int -> 'a -> unit = "%array_unsafe_set" + type fun_tree = [`Tree] Tree.node -> [`Tree] Tree.node -> SList.t*RS.t array + type t = fun_tree array array + let dummy_cell = [||] + let create n = Array.create n dummy_cell + let dummy = fun _ _-> assert false + let find h tag slist = + let tab = get h slist.SList.Node.id in + if tab == dummy_cell then raise Not_found + else + let res = get tab tag in + if res == dummy then raise Not_found else res + + let add (h : t) tag slist (data : fun_tree) = + let tab = get h slist.SList.Node.id in + let tab = if tab == dummy_cell then + let x = Array.create 10000 dummy in + (set h slist.SList.Node.id x;x) + else tab + in + set tab tag data + end + + module TransCache2 = struct + include Hashtbl.Make (struct + type t = Tag.t*SList.t + let equal (a,b) (c,d) = a==c && b==d + let hash (a,b) = HASHINT2((Obj.magic a), b.SList.Node.id) + end) + + let add h t s d = add h (t,s) d + let find h t s = find h (t,s) + end + let td_trans = TransCache.create 10000 (* should be number of tags *number of states^2 in the document *) @@ -777,50 +898,82 @@ END | n -> loop (SList.cons StateSet.empty acc) (n-1) in loop SList.nil n - - module Fold2ResOld = Hashtbl.Make(struct - type t = Formlistlist.t*SList.t*SList.t - let hash (f,s,t) = HASHINT3(f.Formlistlist.Node.id, - s.SList.Node.id, - t.SList.Node.id) - let equal (a,b,c) (d,e,f) = a==d && b == e && c == f - end) - module FllTable = Hashtbl.Make (struct type t = Formlistlist.t let equal = (==) let hash t = t.Formlistlist.Node.id end) - module Fold2Res = - struct - type 'a t = 'a SListTable.t SListTable.t FllTable.t - let create n = Array.init 10000 (fun _ -> FllTable.create n) - - let find h tag fl s1 s2 = - let hf = h.(tag) in - let hs1 = FllTable.find hf fl in - let hs2 = SListTable.find hs1 s1 in - SListTable.find hs2 s2 - + module Fold2Res = struct + external get : 'a array -> int ->'a = "%array_unsafe_get" + external set : 'a array -> int -> 'a -> unit = "%array_unsafe_set" + external field1 : 'a -> 'b = "%field1" + type 'a t = 'a array array array array + let dummy = [||] + let dummy_val : 'a = + let v = Obj.repr ((),2,()) in + Obj.magic v + + let create n = Array.create n dummy + + let find h tag fl s1 s2 = + let af = get h tag in + if af == dummy then raise Not_found + else + let as1 = get af fl.Formlistlist.Node.id in + if as1 == dummy then raise Not_found + else + let as2 = get as1 s1.SList.Node.id in + if as2 == dummy then raise Not_found + else let v = get as2 s2.SList.Node.id in + if field1 v == 2 then raise Not_found + else v + let add h tag fl s1 s2 data = - let hf = h.(tag) in - let hs1 = - try FllTable.find hf fl with - | Not_found -> - let hs1 = SListTable.create SMALL_H_SIZE - in FllTable.add hf fl hs1;hs1 + let af = + let x = get h tag in + if x == dummy then + begin + let y = Array.make 10000 dummy in + set h tag y;y + end + else x in - let hs2 = - try SListTable.find hs1 s1 - with - | Not_found -> - let hs2 = SListTable.create SMALL_H_SIZE - in SListTable.add hs1 s1 hs2;hs2 + let as1 = + let x = get af fl.Formlistlist.Node.id in + if x == dummy then + begin + let y = Array.make 10000 dummy in + set af fl.Formlistlist.Node.id y;y + end + else x + in + let as2 = + let x = get as1 s1.SList.Node.id in + if x == dummy then + begin + let y = Array.make 10000 dummy_val in + set as1 s1.SList.Node.id y;y + end + else x in - SListTable.add hs2 s2 data + set as2 s2.SList.Node.id data + end + + module Fold2Res2 = struct + include Hashtbl.Make(struct + type t = Tag.t*Formlistlist.t*SList.t*SList.t + let equal (a,b,c,d) (x,y,z,t) = + a == x && b == y && c == z && d == t + let hash (a,b,c,d) = HASHINT4 (a,b.Formlistlist.Node.id, + c.SList.Node.id,d.SList.Node.id) + end) + let add h t f s1 s2 d = + add h (t,f,s1,s2) d + let find h t f s1 s2 = + find h (t,f,s1,s2) end - let h_fold2 = Fold2Res.create SMALL_H_SIZE + let h_fold2 = Fold2Res.create 10000 let top_down ?(noright=false) a tree t slist ctx slot_size = let pempty = empty_size slot_size in @@ -828,35 +981,37 @@ END (* evaluation starts from the right so we put sl1,res1 at the end *) let eval_fold2_slist fll t tag (sl2,res2) (sl1,res1) = let res = Array.copy rempty in - try - let r,b,btab = Fold2Res.find h_fold2 tag fll sl1 sl2 in - if b then for i=0 to slot_size - 1 do - res.(i) <- RS.merge btab.(i) t res1.(i) res2.(i); - done; - r,res - with - Not_found -> - let btab = Array.make slot_size (false,false,false,false) in - let rec fold l1 l2 fll i aq ab = - match fll.Formlistlist.Node.node, - l1.SList.Node.node, - l2.SList.Node.node - with - | Formlistlist.Cons(fl,fll), - SList.Cons(s1,ll1), - SList.Cons(s2,ll2) -> - let r',((b,_,_,_) as flags) = eval_formlist tag s1 s2 fl in - let _ = btab.(i) <- flags + try + let r,b,btab = Fold2Res.find h_fold2 tag fll sl1 sl2 in + if b then for i=0 to slot_size - 1 do + res.(i) <- RS.merge btab.(i) t res1.(i) res2.(i); + done; + r,res + with + Not_found -> + begin + let btab = Array.make slot_size NO in + let rec fold l1 l2 fll i aq ab = + match fll.Formlistlist.Node.node, + l1.SList.Node.node, + l2.SList.Node.node + with + | Formlistlist.Cons(fl,fll), + SList.Cons(s1,ll1), + SList.Cons(s2,ll2) -> + let r',conf = eval_formlist tag s1 s2 fl in + let _ = btab.(i) <- conf in - fold ll1 ll2 fll (i+1) (SList.cons r' aq) (b||ab) - | _ -> aq,ab - in - let r,b = fold sl1 sl2 fll 0 SList.nil false in - Fold2Res.add h_fold2 tag fll sl1 sl2 (r,b,btab); - if b then for i=0 to slot_size - 1 do - res.(i) <- RS.merge btab.(i) t res1.(i) res2.(i); - done; - r,res + fold ll1 ll2 fll (i+1) (SList.cons r' aq) ((conf!=NO)||ab) + | _ -> aq,ab + in + let r,b = fold sl1 sl2 fll 0 SList.nil false in + Fold2Res.add h_fold2 tag fll sl1 sl2 (r,b,btab); + if b then for i=0 to slot_size - 1 do + res.(i) <- RS.merge btab.(i) t res1.(i) res2.(i); + done; + r,res; + end in let null_result = (pempty,Array.copy rempty) in @@ -871,7 +1026,7 @@ END try TransCache.find td_trans tag slist with - | Not_found -> + | Not_found -> let fl_list,llist,rlist,ca,da,sa,fa = SList.fold (fun set (fll_acc,lllacc,rllacc,ca,da,sa,fa) -> (* For each set *) @@ -909,7 +1064,10 @@ END let d_n = Algebra.decide a tags_siblings tags_after (StateSet.union sa fa) false in let f_kind,first = choose_jump_down tree d_f and n_kind,next = if noright then (`NIL, fun _ _ -> Tree.nil ) - else choose_jump_next tree d_n in + else choose_jump_next tree d_n in + (*let f_kind,first = `ANY, Tree.first_child tree + and n_kind,next = `ANY, Tree.next_sibling_below tree + in *) let empty_res = null_result in let cont = match f_kind,n_kind with @@ -917,19 +1075,20 @@ END (fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res empty_res) | _,`NIL -> ( match f_kind with - |`TAG(tag') -> + (*|`TAG(tag') -> let default = fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res (loop_tag tag' (first t) llist t ) - in + in default (* let cf = SList.hd llist in if (slot_size == 1) && StateSet.is_singleton cf then let s = StateSet.choose cf in if (Algebra.is_rec a s fst) && (Algebra.is_rec a s snd) && (Algebra.is_final_marking a s) - then RS.mk_quick_subtree default llist 1 tree tag' + then + RS.mk_quick_tag_loop default llist 1 tree tag' else default - else default + else default *) *) | _ -> (fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res (loop (first t) llist t )) @@ -943,7 +1102,7 @@ END let res2 = loop (next t ctx) ctx in eval_fold2_slist fl_list t tag res2 empty_res in loop - else + else (fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t) (loop_tag tag' (next t ctx) rlist ctx ) empty_res) @@ -952,7 +1111,7 @@ END (loop (next t ctx) rlist ctx ) empty_res) ) - | `TAG(tag1),`TAG(tag2) -> + | `TAG(tag1),`TAG(tag2) -> (fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t) (loop_tag tag2 (next t ctx) rlist ctx ) @@ -971,16 +1130,16 @@ END (loop (first t) llist t )) | `ANY,`ANY -> - if SList.equal slist rlist && SList.equal slist llist + (*if SList.equal slist rlist && SList.equal slist llist then let rec loop t ctx = if t == Tree.nil then empty_res else - let r1 = loop (first t) t + let r1 = loop (first t) t and r2 = loop (next t ctx) ctx in eval_fold2_slist fl_list t (Tree.tag tree t) r2 r1 in loop - else + else *) (fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t) (loop (next t ctx) rlist ctx ) @@ -998,8 +1157,8 @@ END (a,b) ) ,cont) in - (TransCache.add td_trans tag slist (Obj.repr cont) ;cont) - in (Obj.magic cont) t ctx + ( TransCache.add td_trans tag slist cont ; cont) + in cont t ctx in (if noright then loop_no_right else loop) t slist ctx @@ -1082,7 +1241,7 @@ END match SList.node sl,fl with |SList.Nil,[] -> acc |SList.Cons(s,sll), formlist::fll -> - let r',(rb,rb1,rb2,mark) = + let r',mcnf = let key = SList.hash sl,Formlist.hash formlist,dir in try Hashtbl.find h_fold key @@ -1092,6 +1251,7 @@ END else eval_formlist tag Ptset.Int.empty s formlist in (Hashtbl.add h_fold key res;res) in + let (rb,rb1,rb2,mark) = bool_of_merge mcnf in if rb && ((dir&&rb1)|| ((not dir) && rb2)) then let acc = @@ -1211,7 +1371,7 @@ END match k with | `TAG (tag) -> (*Tree.tagged_lowest t tag, fun tree -> Tree.tagged_next tree tag*) - (Tree.tagged_desc tree tag t, let jump = Tree.tagged_foll_ctx tree tag + (Tree.tagged_descendant tree tag t, let jump = Tree.tagged_following_below tree tag in fun n -> jump n t ) | `CONTAINS(_) -> (Tree.text_below tree t,let jump = Tree.text_next tree in fun n -> jump n t) @@ -1238,7 +1398,7 @@ END let top_down_count a t = let module RI = Run(Integer) in Integer.length (RI.run_top_down a t) let top_down a t = let module RI = Run(IdSet) in (RI.run_top_down a t) let bottom_up_count a t k = let module RI = Run(Integer) in Integer.length (RI.run_bottom_up a t k) - + let bottom_up a t k = let module RI = Run(IdSet) in (RI.run_bottom_up a t k) module Test (Doc : sig val doc : Tree.t end) = struct