X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.ml;h=c3dbc47d685296f18a3d55efe8cbed15ccc75db0;hb=d550133ad7afdf65c5e284c2bcf67a5bdde6faa7;hp=e06ac040ba9420cafec4414ff6542f4ff0efe30e;hpb=451e60ad59e35344dff62da5ca27fcd5eec1bff9;p=SXSI%2Fxpathcomp.git diff --git a/ata.ml b/ata.ml index e06ac04..c3dbc47 100644 --- a/ata.ml +++ b/ata.ml @@ -25,14 +25,7 @@ struct if x < 0 then failwith (Printf.sprintf "State: Assertion %i < 0 failed" x) end -module StateSet = struct - include Ptset.Int - let print ppf s = - Format.pp_print_string ppf "{ "; - iter (fun i -> Format.fprintf ppf "%i " i) s; - Format.pp_print_string ppf "}"; - Format.pp_print_flush ppf () -end +module StateSet = Ptset.Int module Formula = struct @@ -167,7 +160,7 @@ struct let psize = (size f1) + (size f2) in let nsize = (size (not_ f1)) + (size (not_ f2)) in let sp,sn = merge_states f1 f2 in - fst (cons (Or(f1,f2)) (And(not_ f1,not_ f2)) sp sn psize nsize) + fst (cons (Or(f1,f2)) (And(not_ f1,not_ f2)) sp sn psize nsize) let and_ f1 f2 = @@ -262,9 +255,9 @@ let dump ppf a = if TagSet.is_finite ts then "{" ^ (TagSet.fold (fun t a -> a ^ " '" ^ (Tag.to_string t)^"'") ts "") ^" }" else let cts = TagSet.neg ts in - if TagSet.is_empty cts then "*" else - (TagSet.fold (fun t a -> a ^ " " ^ (Tag.to_string t)) cts "*\\{" - )^ "}" + if TagSet.is_empty cts then "*" else + (TagSet.fold (fun t a -> a ^ " " ^ (Tag.to_string t)) cts "*\\{" + )^ "}" in let s = Printf.sprintf "(%s,%i)" s q in let s_frm = @@ -287,44 +280,6 @@ module FormTable = Hashtbl.Make(struct let hash (f,s,t) = HASHINT3(Formula.uid f ,StateSet.uid s,StateSet.uid t) end) -(* Too slow -module MemoForm = Memoizer.Make( - -module F = Formula -(* -let eval_form_bool = - MemoForm.make_rec( - fun eval (f, ((s1,s2) as sets)) -> - match F.expr f with - | F.True -> true,true,true - | F.False -> false,false,false - | F.Atom((`Left|`LLeft),b,q) -> - if b == (StateSet.mem q s1) - then (true,true,false) - else false,false,false - | F.Atom(_,b,q) -> - if b == (StateSet.mem q s2) - then (true,false,true) - else false,false,false - | F.Or(f1,f2) -> - let b1,rl1,rr1 = eval (f1,sets) - in - if b1 && rl1 && rr1 then (true,true,true) else - let b2,rl2,rr2 = eval (f2,sets) in - let rl1,rr1 = if b1 then rl1,rr1 else false,false - and rl2,rr2 = if b2 then rl2,rr2 else false,false - in (b1 || b2, rl1||rl2,rr1||rr2) - - | F.And(f1,f2) -> - let b1,rl1,rr1 = eval (f1,sets) in - if b1 && rl1 && rr1 then (true,true,true) else - if b1 then - let b2,rl2,rr2 = eval (f2,sets) in - if b2 then (true,rl1||rl2,rr1||rr2) else (false,false,false) - else (false,false,false) - ) - -*) *) module F = Formula let eval_form_bool = @@ -374,22 +329,6 @@ module FTable = Hashtbl.Make( struct let hash (f,s,t) = HASHINT3(Formlist.uid f ,StateSet.uid s,StateSet.uid t);; end) -(* -module MemoFormlist = Memoizer.Make(FTable) - - Too slow - let eval_formlist = MemoFormlist.make_rec ( - fun eval (fl,((s1,s2)as sets)) -> - match Formlist.node fl with - | Formlist.Nil -> StateSet.empty,false,false,false,false - | Formlist.Cons(f,fll) -> - let q,mark,f,_ = Transition.node f in - let b,b1,b2 = eval_form_bool f s1 s2 in - let s,b',b1',b2',amark = eval (fll,sets) in - if b then (StateSet.add q s, b, b1'||b1,b2'||b2,mark||amark) - else s,b',b1',b2',amark ) -*) - let h_f = FTable.create BIG_H_SIZE @@ -403,11 +342,11 @@ let eval_formlist s1 s2 fl = | Formlist.Cons(f,fll) -> let q,mark,f,_ = Transition.node f in let b,b1,b2 = eval_form_bool f s1 s2 in - let s,b',b1',b2',amark = loop fll in - let r = if b then (StateSet.add q s, b, b1'||b1,b2'||b2,mark||amark) - else s,b',b1',b2',amark + let (s,(b',b1',b2',amark)) as res = loop fll in + let r = if b then (StateSet.add q s, (b, b1'||b1,b2'||b2,mark||amark)) + else res in FTable.add h_f (fl,s1,s2) r;r - | Formlist.Nil -> StateSet.empty,false,false,false,false + | Formlist.Nil -> StateSet.empty,(false,false,false,false) in loop fl let tags_of_state a q = @@ -434,27 +373,26 @@ let tags_of_state a q = match b with | `Positive s -> let r = Ptset.Int.inter a s in (r,Ptset.Int.mem Tag.pcdata r, true) | `Negative s -> let r = Ptset.Int.diff a s in (r, Ptset.Int.mem Tag.pcdata r, false) - - let mk_nil_ctx x _ = Tree.mk_nil x - let next_sibling_ctx x _ = Tree.next_sibling x - let r_ignore _ x = x module type ResultSet = sig type t + type elt = [` Tree] Tree.node val empty : t - val cons : Tree.t -> t -> t + val cons : elt -> t -> t val concat : t -> t -> t - val iter : (Tree.t -> unit) -> t -> unit - val fold : (Tree.t -> 'a -> 'a) -> t -> 'a -> 'a - val map : (Tree.t -> Tree.t) -> t -> t + val iter : ( elt -> unit) -> t -> unit + 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 end module Integer : ResultSet = struct type t = int + type elt = [`Tree] Tree.node let empty = 0 let cons _ x = x+1 let concat x y = x + y @@ -462,12 +400,21 @@ 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 = + if rb then + let res1 = if rb1 then res1 else 0 + and res2 = if rb2 then res2 else 0 + in + if mark then 1+res1+res2 + else res1+res2 + else 0 end module IdSet : ResultSet = struct + type elt = [`Tree] Tree.node type node = Nil - | Cons of Tree.t * node + | Cons of elt * node | Concat of node*node and t = { node : node; @@ -504,6 +451,18 @@ let tags_of_state a q = | Concat(t1,t2) -> Concat(loop t1,loop t2) 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 end @@ -532,11 +491,73 @@ END let string_of_ts tags = (Ptset.Int.fold (fun t a -> a ^ " " ^ (Tag.to_string t) ) tags "{")^ " }" - let choose_jump tagset qtags1 qtagsn a f_nil f_text f_t1 f_s1 f_tn f_sn f_notext = + + module Algebra = + struct + type jump = [ `LONG | `CLOSE | `NIL ] + type t = jump*Ptset.Int.t + + let merge_jump (j1,l1) (j2,l2) = + match j1,j2 with + | _ when j1 = j2 -> (j1,Ptset.Int.union l1 l2) + | _,`NIL -> j1,l1 + | `NIL,_ -> j2,l2 + | _,_ -> (`CLOSE, Ptset.Int.union l1 l2) + + let merge_jump_list = function + | [] -> `NIL,Ptset.Int.empty + | p::r -> List.fold_left (merge_jump) p r + + let labels a s = + Hashtbl.fold + ( + fun q l acc -> + if (q == s) + then + + (List.fold_left + (fun acc (ts,f) -> + let _,_,_,bur = Transition.node f in + if bur then acc else TagSet.cup acc ts) + acc l) + else acc ) a.trans TagSet.empty + exception Found + + let is_rec a s access = + List.exists + (fun (_,t) -> let _,_,f,_ = Transition.node t in + StateSet.mem s (access f)) (Hashtbl.find a.trans s) + + + let decide a c_label l_label dir_states access = + + let l = StateSet.fold + (fun s l -> + let s_rec= is_rec a s access in + let tlabels,jmp = + if s_rec then l_label,`LONG + else c_label,`CLOSE in + let slabels = TagSet.positive ((TagSet.cap (labels a s) tlabels)) + in + (if Ptset.Int.is_empty slabels + then `NIL,Ptset.Int.empty + else jmp,slabels)::l) dir_states [] + in merge_jump_list l + + + + + + end + + + + let choose_jump tagset qtags1 qtagsn a f_nil f_t1 f_s1 f_tn f_sn f_notext f_maytext = let tags1,hastext1,fin1 = inter_text tagset (tags a qtags1) in let tagsn,hastextn,finn = inter_text tagset (tags a qtagsn) in - if (hastext1||hastextn) then (`ANY,f_text) (* jumping to text nodes doesn't work really well *) - else if (Ptset.Int.is_empty tags1) && (Ptset.Int.is_empty tagsn) then (`NIL,f_nil) + (*if (hastext1||hastextn) then (`ANY,f_text) (* jumping to text nodes doesn't work really well *) + else*) + if (Ptset.Int.is_empty tags1) && (Ptset.Int.is_empty tagsn) then (`NIL,f_nil) else if (Ptset.Int.is_empty tagsn) then if (Ptset.Int.is_singleton tags1) then (* TaggedChild/Sibling *) @@ -549,27 +570,28 @@ END let tag = (Ptset.Int.choose tagsn) in (`TAG(tag),mk_app_fun f_tn tag (Tag.to_string tag)) else (* SelectDesc/Following *) (`ANY,mk_app_fun f_sn tagsn (string_of_ts tagsn)) + else if (hastext1||hastextn) then (`ANY,f_maytext) else (`ANY,f_notext) - let choose_jump_down a b c d = + let choose_jump_down tree a b c d = choose_jump a b c d - (mk_fun (Tree.mk_nil) "Tree.mk_nil") - (mk_fun (Tree.first_child) "Tree.text_below") - (mk_fun (Tree.tagged_child) "Tree.tagged_child") - (mk_fun (Tree.select_child) "Tree.select_child") (* !! no select_child in Tree.ml *) - (mk_fun (Tree.tagged_desc) "Tree.tagged_desc") - (mk_fun (Tree.select_desc) "Tree.select_desc") (* !! no select_desc *) - (mk_fun (Tree.first_child) "Tree.first_child") - - let choose_jump_next a b c d = + (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.first_element tree) "Tree.first_element") + (mk_fun (Tree.first_child tree) "Tree.first_child") + + let choose_jump_next tree a b c d = choose_jump a b c d - (mk_fun (fun t _ -> Tree.mk_nil t) "Tree.mk_nil2") - (mk_fun (Tree.next_sibling_ctx) "Tree.text_next") - (mk_fun (Tree.tagged_sibling_ctx) "Tree.tagged_sibling_ctx")(* !! no tagged_sibling in Tree.ml *) - (mk_fun (Tree.select_sibling_ctx) "Tree.select_sibling_ctx")(* !! no select_sibling in Tree.ml *) - (mk_fun (Tree.tagged_foll_ctx) "Tree.tagged_foll_ctx") - (mk_fun (Tree.select_foll_ctx) "Tree.select_foll_ctx")(* !! no select_foll *) - (mk_fun (Tree.next_sibling_ctx) "Tree.node_sibling_ctx") + (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 (Tree.next_element_ctx tree) "Tree.node_element_ctx") + (mk_fun (Tree.next_sibling_ctx tree) "Tree.node_sibling_ctx") module SetTagKey = @@ -582,23 +604,23 @@ END module CachedTransTable = Hashtbl.Make(SetTagKey) let td_trans = CachedTransTable.create 4093 - let merge rb rb1 rb2 mark t res1 res2 = - if rb - then - let res1 = if rb1 then res1 else RS.empty - and res2 = if rb2 then res2 else RS.empty - in - if mark then RS.cons t (RS.concat res1 res2) - else RS.concat res1 res2 - else RS.empty let empty_size n = let rec loop acc = function 0 -> acc | n -> loop (SList.cons StateSet.empty acc) (n-1) in loop SList.nil n - - - let top_down ?(noright=false) a t slist ctx slot_size = + + let merge rb rb1 rb2 mark t res1 res2 = + if rb then + let res1 = if rb1 then res1 else RS.empty + and res2 = if rb2 then res2 else RS.empty + in + if mark then RS.cons t (RS.concat res1 res2) + else RS.concat res1 res2 + else RS.empty + + + let top_down ?(noright=false) a tree t slist ctx slot_size = let pempty = empty_size slot_size in (* evaluation starts from the right so we put sl1,res1 at the end *) let eval_fold2_slist fll t (sl2,res2) (sl1,res1) = @@ -608,8 +630,8 @@ END | SList.Cons(s1,ll1), SList.Cons(s2,ll2), fl::fll -> - let r',rb,rb1,rb2,mark = eval_formlist s1 s2 fl in - let _ = res.(i) <- merge rb rb1 rb2 mark t res1.(i) res2.(i) + let r',flags = eval_formlist s1 s2 fl in + let _ = res.(i) <- RS.merge flags t res1.(i) res2.(i) in fold ll1 ll2 fll (i+1) (SList.cons r' aq) @@ -621,79 +643,79 @@ END let null_result() = (pempty,Array.make slot_size RS.empty) in let rec loop t slist ctx = - if Tree.is_nil t then null_result() else get_trans t slist (Tree.tag t) ctx + if t == Tree.nil then null_result() else get_trans t slist (Tree.tag tree t) ctx and loop_tag tag t slist ctx = - if Tree.is_nil t then null_result() else get_trans t slist tag ctx + if t == Tree.nil then null_result() else get_trans t slist tag ctx and loop_no_right t slist ctx = - if Tree.is_nil t then null_result() else get_trans ~noright:true t slist (Tree.tag t) ctx + if t == Tree.nil then null_result() else get_trans ~noright:true t slist (Tree.tag tree t) ctx and get_trans ?(noright=false) t slist tag ctx = let cont = try CachedTransTable.find td_trans (tag,slist) with - | 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 *) - let fl,ll,rr,ca,da,sa,fa = - StateSet.fold - (fun q acc -> - List.fold_left - (fun ((fl_acc,ll_acc,rl_acc,c_acc,d_acc,s_acc,f_acc) as acc) - (ts,t) -> - if (TagSet.mem tag ts) - then - let _,_,f,_ = Transition.node t in - let (child,desc,below),(sibl,foll,after) = Formula.st f in - (Formlist.cons t fl_acc, - StateSet.union ll_acc below, - StateSet.union rl_acc after, - StateSet.union child c_acc, - StateSet.union desc d_acc, - StateSet.union sibl s_acc, - StateSet.union foll f_acc) - else acc ) acc ( - try Hashtbl.find a.trans q - with - Not_found -> Printf.eprintf "Looking for state %i, doesn't exist!!!\n%!" - q;[] - ) - - ) set (Formlist.nil,StateSet.empty,StateSet.empty,ca,da,sa,fa) - in fl::fll_acc, (SList.cons ll lllacc), (SList.cons rr rllacc),ca,da,sa,fa) - slist ([],SList.nil,SList.nil,StateSet.empty,StateSet.empty,StateSet.empty,StateSet.empty) - in - (* Logic to chose the first and next function *) - let tags_below,tags_after = Tree.tags t tag in - let f_kind,first = choose_jump_down tags_below ca da a - and n_kind,next = if noright then (`NIL, fun t _ -> Tree.mk_nil t ) - else choose_jump_next tags_after sa fa a in - let empty_res = null_result() in - let cont = - match f_kind,n_kind with - | `NIL,`NIL -> - (fun _ _ -> eval_fold2_slist fl_list t empty_res empty_res ) - | _,`NIL -> ( - match f_kind with - |`TAG(tag) -> - (fun t _ -> eval_fold2_slist fl_list t empty_res - (loop_tag tag (first t) llist t)) - | `ANY -> - (fun t _ -> eval_fold2_slist fl_list t empty_res - (loop (first t) llist t)) - | _ -> assert false) - + | 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 *) + let fl,ll,rr,ca,da,sa,fa = + StateSet.fold + (fun q acc -> + List.fold_left + (fun ((fl_acc,ll_acc,rl_acc,c_acc,d_acc,s_acc,f_acc) as acc) + (ts,t) -> + if (TagSet.mem tag ts) + then + let _,_,f,_ = Transition.node t in + let (child,desc,below),(sibl,foll,after) = Formula.st f in + (Formlist.cons t fl_acc, + StateSet.union ll_acc below, + StateSet.union rl_acc after, + StateSet.union child c_acc, + StateSet.union desc d_acc, + StateSet.union sibl s_acc, + StateSet.union foll f_acc) + else acc ) acc ( + try Hashtbl.find a.trans q + with + Not_found -> Printf.eprintf "Looking for state %i, doesn't exist!!!\n%!" + q;[] + ) + + ) set (Formlist.nil,StateSet.empty,StateSet.empty,ca,da,sa,fa) + in fl::fll_acc, (SList.cons ll lllacc), (SList.cons rr rllacc),ca,da,sa,fa) + slist ([],SList.nil,SList.nil,StateSet.empty,StateSet.empty,StateSet.empty,StateSet.empty) + in + (* Logic to chose the first and next function *) + let _,tags_below,_,tags_after = Tree.tags tree tag in + let f_kind,first = choose_jump_down tree tags_below ca da a + and n_kind,next = if noright then (`NIL, fun _ _ -> Tree.nil ) + else choose_jump_next tree tags_after sa fa a in + let empty_res = null_result() in + let cont = + match f_kind,n_kind with + | `NIL,`NIL -> + (fun _ _ -> eval_fold2_slist fl_list t empty_res empty_res ) + | _,`NIL -> ( + match f_kind with + |`TAG(tag) -> + (fun t _ -> eval_fold2_slist fl_list t empty_res + (loop_tag tag (first t) llist t)) + | `ANY -> + (fun t _ -> eval_fold2_slist fl_list t empty_res + (loop (first t) llist t)) + | _ -> assert false) + | `NIL,_ -> ( match n_kind with |`TAG(tag) -> (fun t ctx -> eval_fold2_slist fl_list t (loop_tag tag (next t ctx) rlist ctx) empty_res) - + | `ANY -> (fun t ctx -> eval_fold2_slist fl_list t (loop (next t ctx) rlist ctx) empty_res) - + | _ -> assert false) | `TAG(tag1),`TAG(tag2) -> @@ -717,25 +739,26 @@ END (loop (next t ctx) rlist ctx) (loop (first t) llist t) ) | _ -> assert false - in - let cont = D_IF_( (fun t ctx -> - let a,b = cont t ctx in - register_trace t (slist,a,fl_list,first,next,ctx); - (a,b) - ) ,cont) - in - (CachedTransTable.add td_trans (tag,slist) cont;cont) + in + let cont = D_IF_( (fun t ctx -> + let a,b = cont t ctx in + register_trace t (slist,a,fl_list,first,next,ctx); + (a,b) + ) ,cont) + in + (CachedTransTable.add td_trans (tag,slist) cont;cont) in cont t ctx + in (if noright then loop_no_right else loop) t slist ctx - - - let run_top_down a t = + + + let run_top_down a tree = let init = SList.cons a.init SList.nil in - let _,res = top_down a t init t 1 + let _,res = top_down a tree Tree.root init Tree.root 1 in D_IGNORE_( - output_trace a t "trace.html" + output_trace a tree root "trace.html" (RS.fold (fun t a -> IntSet.add (Tree.id t) a) res.(0) IntSet.empty), res.(0)) ;; @@ -769,22 +792,24 @@ END StateSet.print fmt k; Format.fprintf fmt "-> %i\n" (RS.length d)) c.results; Format.fprintf fmt "\n%!" - + let merge c1 c2 = - let acc1 = IMap.fold (fun s r acc -> - IMap.add s - (try - RS.concat r (IMap.find s acc) - with - | Not_found -> r) acc) c1.results IMap.empty + let acc1 = + IMap.fold + ( fun s r acc -> + IMap.add s + (try + RS.concat r (IMap.find s acc) + with + | Not_found -> r) acc) c1.results IMap.empty in let imap = - IMap.fold (fun s r acc -> - IMap.add s - (try - RS.concat r (IMap.find s acc) - with - | Not_found -> r) acc) c2.results acc1 + IMap.fold (fun s r acc -> + IMap.add s + (try + RS.concat r (IMap.find s acc) + with + | Not_found -> r) acc) c2.results acc1 in let h,s = Ptss.fold @@ -805,27 +830,27 @@ END match SList.node sl,fl with |SList.Nil,[] -> acc |SList.Cons(s,sll), formlist::fll -> - let r',rb,rb1,rb2,mark = + let r',(rb,rb1,rb2,mark) = let key = SList.hash sl,Formlist.hash formlist,dir in - try - Hashtbl.find h_fold key - with - Not_found -> let res = - if dir then eval_formlist s Ptset.Int.empty formlist - else eval_formlist Ptset.Int.empty s formlist - in (Hashtbl.add h_fold key res;res) + try + Hashtbl.find h_fold key + with + Not_found -> let res = + if dir then eval_formlist s Ptset.Int.empty formlist + else eval_formlist Ptset.Int.empty s formlist + in (Hashtbl.add h_fold key res;res) + in + if rb && ((dir&&rb1)|| ((not dir) && rb2)) + then + let acc = + let old_r = + try Configuration.IMap.find s conf.Configuration.results + with Not_found -> RS.empty in - if rb && ((dir&&rb1)|| ((not dir) && rb2)) - then - let acc = - let old_r = - try Configuration.IMap.find s conf.Configuration.results - with Not_found -> RS.empty - in - Configuration.add acc r' (if mark then RS.cons t old_r else old_r) - in - loop sll fll acc - else loop sll fll acc + Configuration.add acc r' (if mark then RS.cons t old_r else old_r) + in + loop sll fll acc + else loop sll fll acc | _ -> assert false in loop slist fl_list Configuration.empty @@ -853,33 +878,32 @@ END let h_tdconf = Hashtbl.create 511 - let rec bottom_up a tree conf next jump_fun root dotd init accu = + let rec bottom_up a tree t conf next jump_fun root dotd init accu = if (not dotd) && (Configuration.is_empty conf ) then accu,conf,next else - let below_right = Tree.is_below_right tree next in - - let accu,rightconf,next_of_next = - if below_right then (* jump to the next *) - bottom_up a next conf (jump_fun next) jump_fun (Tree.next_sibling tree) true init accu - else accu,Configuration.empty,next - in + let below_right = Tree.is_below_right tree t next in + + let accu,rightconf,next_of_next = + if below_right then (* jump to the next *) + bottom_up a tree next conf (jump_fun next) jump_fun (Tree.next_sibling tree t) true init accu + else accu,Configuration.empty,next + in let sub = if dotd then - if below_right then prepare_topdown a tree true - else prepare_topdown a tree false + if below_right then prepare_topdown a tree t true + else prepare_topdown a tree t false else conf in let conf,next = (Configuration.merge rightconf sub, next_of_next) in - if Tree.equal tree root then accu,conf,next - else - let parent = Tree.binary_parent tree in - let ptag = Tree.tag parent in - let dir = Tree.is_left tree in + if t == root then accu,conf,next else + let parent = Tree.binary_parent tree t in + let ptag = Tree.tag tree parent in + let dir = Tree.is_left tree t in let slist = Configuration.Ptss.fold (fun e a -> SList.cons e a) conf.Configuration.sets SList.nil in let fl_list = get_up_trans slist ptag a parent in let slist = SList.rev (slist) in @@ -891,10 +915,10 @@ END (newconf.Configuration.results) (accu,Configuration.empty) in - bottom_up a parent newconf next jump_fun root false init accu - - and prepare_topdown a t noright = - let tag = Tree.tag t in + bottom_up a tree parent newconf next jump_fun root false init accu + + and prepare_topdown a tree t noright = + let tag = Tree.tag tree t in (* pr "Going top down on tree with tag %s = %s " (if Tree.is_nil t then "###" else (Tag.to_string(Tree.tag t))) (Tree.dump_node t); *) let r = @@ -913,7 +937,7 @@ END pr "\n%!"; in *) let r = SList.cons r SList.nil in - let set,res = top_down (~noright:noright) a t r t 1 in + let set,res = top_down (~noright:noright) a tree t r t 1 in let set = match SList.node set with | SList.Cons(x,_) ->x | _ -> assert false @@ -925,7 +949,8 @@ END - let run_bottom_up a t k = + let run_bottom_up a tree k = + let t = Tree.root in let trlist = Hashtbl.find a.trans (Ptset.Int.choose a.init) in let init = List.fold_left @@ -939,16 +964,18 @@ END match k with | `TAG (tag) -> (*Tree.tagged_lowest t tag, fun tree -> Tree.tagged_next tree tag*) - (Tree.tagged_desc tag t, fun tree -> Tree.tagged_foll_ctx tag tree t) - | `CONTAINS(_) -> (Tree.first_child t,fun tree -> Tree.next_sibling_ctx tree t) + (Tree.tagged_desc tree tag t, let jump = Tree.tagged_foll_ctx tree tag + in fun n -> jump n t ) + | `CONTAINS(_) -> (Tree.first_child tree t,let jump = Tree.next_sibling_ctx tree + in fun n -> jump n t) | _ -> assert false in let tree2 = jump_fun tree1 in - let rec loop tree next acc = + let rec loop t next acc = (* let _ = pr "\n_________________________\nNew iteration\n" in let _ = pr "Jumping to %s\n%!" (Tree.dump_node tree) in *) - let acc,conf,next_of_next = bottom_up a tree - Configuration.empty next jump_fun (Tree.root tree) true init acc + let acc,conf,next_of_next = bottom_up a tree t + Configuration.empty next jump_fun (Tree.root) true init acc in (* let _ = pr "End of first iteration, conf is:\n%!"; Configuration.pr fmt conf