in
let ns1 = StateSet.inter s1 orig_s1
and ns2 = StateSet.inter s2 orig_s2 in
- let res, ops, todo = eval_trans auto orig_s1 orig_s2 trl in
+ let res, ops, todo = eval_trans auto ns1 ns2 trl in
let code, not_marking = ResJIT.compile ops in
let todo_code, todo_notmarking =
List.fold_left (fun (l, b) (p, q, o) -> let c, b' = ResJIT.compile o in
DEFINE LOOP (t, states, ctx) = (
let _t = t in
LOG(__ "top-down-run" 3
- "Entering node %i with loop (tag %s, context %i) with states %a"
- (Node.to_int _t)
- (Tag.to_string (Tree.tag tree _t))
- (Node.to_int (ctx))
- (StateSet.print) (states));
+ "Entering node %i with loop (tag %s, context %i) with states %a"
+ (Node.to_int _t)
+ (Tag.to_string (Tree.tag tree _t))
+ (Node.to_int (ctx))
+ (StateSet.print) (states));
if _t == Tree.nil then nil_res
else
let tag = Tree.tag tree _t in
l2jit_dispatch
_t (tag) (states) (ctx) (L2JIT.find cache2 (tag) (states)))
+
let top_down_run auto tree root states ctx =
let res_len = StateSet.max_elt auto.states + 1 in
let empty_slot = Array.create res_len U.NS.empty in
l3jit_dispatch tr_list res1 res2 t slot1 slot2
and l2jit_dispatch_instr t ctx instr =
+ let () = LOG(__ "top-down-run" 3 "Dispatching instr: %a on node %i (context=%i)"
+ L2JIT.print_jump instr (Node.to_int t) (Node.to_int ctx))
+ in
match instr with
| L2JIT.NOP () -> nil_res
| L2JIT.FIRST_CHILD s -> LOOP ((Tree.first_child tree t), s, ctx)
| L2JIT.TAGGED_CHILD (s, tag) ->
LOOP_TAG((Tree.tagged_child tree t tag), s, tag, ctx)
- | L2JIT.TAGGED_FOLLOWING_SIBLING (s, tag) ->
- LOOP_TAG((Tree.tagged_following_sibling tree t tag), s, tag, ctx)
+ | L2JIT.TAGGED_SIBLING (s, tag) ->
+ LOOP_TAG((Tree.tagged_sibling tree t tag), s, tag, ctx)
| L2JIT.SELECT_CHILD (s, _, us) ->
LOOP ((Tree.select_child tree t us), s, ctx)
- | L2JIT.SELECT_FOLLOWING_SIBLING (s, _, us) ->
- LOOP ((Tree.select_following_sibling tree t us), s, ctx)
+ | L2JIT.SELECT_SIBLING (s, _, us) ->
+ LOOP ((Tree.select_sibling tree t us), s, ctx)
| L2JIT.TAGGED_SUBTREE(s, tag) ->
mark_subtree s (U.NS.subtree_tags tree t tag)
| e1 :: ((e2 :: ll) as l) -> if e1 == e2 then uniq l
else e1 :: e2 :: (uniq ll);;
+DEFINE BOTTOM_UP_NEXT(node, rest, stop) =
+ (let ___fs = Tree.first_child tree node in
+ let ___res1 =
+ if ___fs == Tree.nil then nil_res
+ else full_top_down_run auto states tree ___fs
+ in
+ move_up node ___res1 true rest stop)
+
+
let bottom_up_run auto tree (query, pat) =
let array = time ~msg:"Timing text query" (Tree.full_text_query query tree) pat in
let leaves = Array.to_list array in
let res_len = (StateSet.max_elt states) + 1 in
let empty_slot = Array.create res_len U.NS.empty in
let nil_res = auto.bottom_states, empty_slot in
- let cache = Cache.Lvl3.create 1024 L3JIT.dummy in
- let rec loop_leaves l acc =
- match l with
- [] -> acc
- | node :: ll ->
- let res, lll = bottom_up_next node ll Tree.nil in
- if (lll <> []) then
- begin
- eprintf "Leftover nodes: %i\n" (List.length lll);
- end;
- res
-
- and bottom_up_next node rest stop =
- let fs = Tree.first_child tree node in
- let res1 =
- if fs == Tree.nil then nil_res
- else full_top_down_run auto states tree fs
- in
- move_up node res1 true rest stop
-
- and move_up node res is_left rest stop =
+ let cache = Cache.Lvl3.create 0 L3JIT.dummy in
+ let rec move_up node res is_left rest stop =
if node == stop then res, rest
else
- let prev_sibling = Tree.prev_sibling tree node in
- let is_left' = prev_sibling == Tree.nil in
- let real_parent = Tree.parent tree node in
- let parent =
- if is_left' then real_parent else max (Tree.first_child tree real_parent) stop
+ (*let prev_sibling = Tree.prev_sibling tree node in *)
+ let is_left' = Tree.is_first_child tree node (*prev_sibling == Tree.nil*) in
+ (*TODO: unsound in case of following-sibling moves
+ should replace the else by previous_sibling and walk up the sequence of
+ right child moves *)
+ let parent = if is_left' then Tree.parent tree node else
+ let p = Tree.first_child tree (Tree.parent tree node) in
+ if p < stop then stop else p
in
- (* let parent = if is_left' then Tree.parent tree node else prev_sibling in *)
let (s1, sl1), (s2, sl2), rest' =
if is_left then match rest with
[] -> res, nil_res, rest
| next :: rest' ->
if Tree.is_right_descendant tree node next
then
- let res2, rest' = bottom_up_next next rest' node in
+ let res2, rest' = (*bottom_up_next*) BOTTOM_UP_NEXT(next, rest', node) in
res, res2, rest'
else res, nil_res, rest
else
let id1 = Uid.to_int s1.StateSet.Node.id in
let id2 = Uid.to_int s2.StateSet.Node.id in
let code =
- let code = Cache.Lvl3.find cache tag id1 id2 in
- if code == L3JIT.dummy then
+ let code = Cache.Lvl3.find cache id2 id1 tag in
+ if code == L3JIT.dummy then
let trl =
StateSet.fold
(fun q acc ->
List.fold_left (fun acc' (labels, tr) ->
- if labels == TagSet.any || TagSet.mem tag labels
+ if TagSet.mem tag labels
then Translist.cons tr acc' else acc')
acc
(Hashtbl.find auto.trans q)
Translist.nil
in
let code = L3JIT.gen_code auto trl s1 s2 in
- Cache.Lvl3.add cache tag id1 id2 code; code
+ Cache.Lvl3.add cache id2 id1 tag code; code
else code
in
let res' = code empty_slot sl1 sl2 tree node in
move_up parent res' is_left' rest' stop
in
- let _, slot = loop_leaves leaves (nil_res) in
- slot.(StateSet.min_elt auto.topdown_marking_states)
+ let loop_leaves l =
+ match l with
+ [] -> nil_res
+ | node :: ll ->
+ let res, lll = BOTTOM_UP_NEXT( (*bottom_up_next*) node, ll, Tree.nil) in
+ if lll <> [] then
+ Logger.print err_formatter "WARNING: Leftover nodes: %i\n" (List.length lll);
+ res
+ in
+ let _, slot = loop_leaves leaves in
+ slot.(StateSet.min_elt auto.topdown_marking_states)
+
let get_trans g auto tag states =
StateSet.fold (fun q tr_acc ->
let res_len = (StateSet.max_elt auto.states) + 1 in
let empty_slot = Array.create res_len U.NS.empty in
let nil_res = mk_nil auto.bottom_states empty_slot in
- let empty_res = mk_empty (StateSet.empty, empty_slot) in
let cache3 = L3JIT.create () in
let dummy2 = (StateSet.empty, StateSet.empty, Translist.nil) in
let cache2 = Cache.Lvl2.create 512 dummy2 in
let rule_counter = ref 0 in
let preorder_counter = ref 0 in
- let dcache = DCache.create 1023 in
- let ucache = UCache.create 1023 in
let term_array = [| StateSet.empty; StateSet.empty |] in
let get_trans tag states =
let c = Cache.Lvl2.find cache2 tag (Uid.to_int states.StateSet.Node.id) in
projects / SXSI / xpathcomp.git / blobdiff