INCLUDE "debug.ml"
INCLUDE "utils.ml"
-
+open Camlp4.Struct
type jump_kind = [ `TAG of Tag.t | `CONTAINS of string | `NOTHING ]
(* Todo : move elsewhere *)
let h_f = FTable.create BIG_H_SIZE
+type merge_conf = NO | MARK | ONLY1 | ONLY2 | ONLY12 | MARK1 | MARK2 | MARK12
let eval_formlist tag s1 s2 fl =
let rec loop 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 ->
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
struct
type t = int
type elt = [`Tree] Tree.node
+
let empty = 0
let cons _ x = x+1
let concat x y = x + y
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
if mark then 1+res1+res2
else res1+res2
else 0
+ let merge conf t res1 res2 =
+ match conf with
+ NO -> 0
+ | MARK -> 1
+ | ONLY12 -> res1+res2
+ | ONLY1 -> res1
+ | ONLY2 -> res2
+ | MARK12 -> res1+res2+1
+ | MARK1 -> res1+1
+ | MARK2 -> res2+1
+
let mk_quick_tag_loop _ sl ss tree tag = ();
fun t ctx ->
(sl, Array.make ss (Tree.subtree_tags tree tag t))
end
- module IdSet : ResultSet =
+ module IdSet : ResultSet=
struct
type elt = [`Tree] Tree.node
type node = Nil
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
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 set_tag_bits : bits -> Tag.t -> Tree.t -> elt -> elt = "caml_set_tag_bits"
type t =
{ segments : elt list;
bits : bits;
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 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) =
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
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
+
let td_trans = TransCache.create 10000 (* should be number of tags *number of states^2
in the document *)
| 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 =
+ module Fold2ResOld =
struct
type 'a t = 'a SListTable.t SListTable.t FllTable.t
let create n = Array.init 10000 (fun _ -> FllTable.create n)
SListTable.add hs2 s2 data
end
- let h_fold2 = Fold2Res.create SMALL_H_SIZE
+ 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 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 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
+ set as2 s2.SList.Node.id data
+ end
+
+
+ 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
r,res
with
Not_found ->
- let btab = Array.make slot_size (false,false,false,false) in
+ 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,
| 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
+ 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)
+ 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
let cont =
match f_kind,n_kind with
| `NIL,`NIL ->
+ Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__);
(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
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_tag_loop default llist 1 tree tag'
- else default
- else default
+ then
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
+ RS.mk_quick_tag_loop default llist 1 tree tag'
+ else
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
+ default
+ else
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
+ default
| _ ->
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res
(loop (first t) llist t ))
)
if t == Tree.nil then empty_res else
let res2 = loop (next t ctx) ctx in
eval_fold2_slist fl_list t tag res2 empty_res
- in loop
+ in Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__);loop
else
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t)
(loop_tag tag' (next t ctx) rlist ctx ) empty_res)
| _ ->
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t)
(loop (next t ctx) rlist ctx ) empty_res)
)
- | `TAG(tag1),`TAG(tag2) ->
+ | `TAG(tag1),`TAG(tag2) ->
+ let _ = Printf.eprintf "Using %i %s %s\n" (Loc.start_line __LOCATION__)
+ (Tag.to_string tag1)
+ (Tag.to_string tag2)
+ in
(fun t ctx ->
eval_fold2_slist fl_list t (Tree.tag tree t)
(loop_tag tag2 (next t ctx) rlist ctx )
(loop_tag tag1 (first t) llist t ))
| `TAG(tag'),`ANY ->
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t ctx ->
eval_fold2_slist fl_list t (Tree.tag tree t)
(loop (next t ctx) rlist ctx )
(loop_tag tag' (first t) llist t ))
| `ANY,`TAG(tag') ->
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t ctx ->
eval_fold2_slist fl_list t (Tree.tag tree t)
(loop_tag tag' (next t ctx) rlist ctx )
(loop (first t) llist t ))
| `ANY,`ANY ->
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
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
+ in
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
+ loop
+ else
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t ctx ->
eval_fold2_slist fl_list t (Tree.tag tree t)
(loop (next t ctx) rlist ctx )
(loop (first t) llist t ))
| _,_ ->
+ let _ = Printf.eprintf "Using %i\n" (Loc.start_line __LOCATION__) in
(fun t ctx ->
eval_fold2_slist fl_list t (Tree.tag tree t)
(loop (next t ctx) rlist ctx )
(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
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
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 =
type 'a node = private int
type node_kind = [`Text | `Tree ]
+type t = {
+ doc : tree;
+ ttable : (Tag.t,(Ptset.Int.t*Ptset.Int.t*Ptset.Int.t*Ptset.Int.t)) Hashtbl.t;
+}
+
external inode : 'a node -> int = "%identity"
external nodei : int -> 'a node = "%identity"
let compare_node x y = (inode x) - (inode y)
external tree_first_child : tree -> [`Tree] node -> [`Tree] node = "caml_xml_tree_first_child" "noalloc"
external tree_closing : tree -> [`Tree] node -> [`Tree] node = "caml_xml_tree_closing" "noalloc"
external tree_is_open : tree -> [`Tree] node -> bool = "caml_xml_tree_is_open" "noalloc"
-external tree_first_element : tree -> [`Tree] node -> [`Tree] node = "caml_xml_tree_first_element" "noalloc"
+external tree_first_element : t -> [`Tree] node -> [`Tree] node = "caml_xml_tree_first_element" "noalloc"
external tree_tagged_child : tree -> [`Tree] node -> Tag.t -> [`Tree] node = "caml_xml_tree_tagged_child" "noalloc"
external tree_next_sibling : tree -> [`Tree] node -> [`Tree] node = "caml_xml_tree_next_sibling" "noalloc"
-external tree_next_element : tree -> [`Tree] node -> [`Tree] node = "caml_xml_tree_next_element" "noalloc"
+external tree_next_element : t -> [`Tree] node -> [`Tree] node = "caml_xml_tree_next_element" "noalloc"
external tree_tagged_sibling : tree -> [`Tree] node -> Tag.t -> [`Tree] node = "caml_xml_tree_tagged_sibling" "noalloc"
external tree_prev_sibling : tree -> [`Tree] node -> [`Tree] node = "caml_xml_tree_prev_sibling" "noalloc"
let tree_is_last t n = equal_node nil (tree_next_sibling t n)
-
-(*external tree_prev_text : tree -> [`Tree] node -> [`Text ] node = "caml_xml_tree_prev_text" "noalloc" *)
+
external tree_my_text : tree -> [`Tree] node -> [`Text ] node = "caml_xml_tree_my_text" "noalloc"
external tree_my_text_unsafe : tree -> [`Tree] node -> [`Text ] node = "caml_xml_tree_my_text_unsafe" "noalloc"
external tree_is_ancestor : tree -> [`Tree ] node -> [`Tree ] node -> bool = "caml_xml_tree_is_ancestor" "noalloc"
external tree_tagged_desc : tree -> [`Tree ] node -> Tag.t -> [`Tree ] node = "caml_xml_tree_tagged_desc" "noalloc"
external tree_tagged_foll_below : tree -> [`Tree ] node -> Tag.t -> [`Tree ] node -> [`Tree ] node = "caml_xml_tree_tagged_foll_below" "noalloc"
+external tree_tagged_foll_before : tree -> [`Tree ] node -> Tag.t -> [`Tree ] node -> [`Tree ] node = "caml_xml_tree_tagged_foll_before" "noalloc"
external tree_subtree_tags : tree -> [`Tree ] node -> Tag.t -> int = "caml_xml_tree_subtree_tags" "noalloc"
external tree_select_foll_sibling : tree -> [`Tree ] node -> unordered_set -> [`Tree] node = "caml_xml_tree_select_foll_sibling" "noalloc"
external tree_select_desc : tree -> [`Tree ] node -> unordered_set -> [`Tree] node = "caml_xml_tree_select_desc" "noalloc"
external tree_select_foll_below : tree -> [`Tree ] node -> unordered_set -> [`Tree] node -> [`Tree] node = "caml_xml_tree_select_foll_below" "noalloc"
+external tree_select_foll_before : tree -> [`Tree ] node -> unordered_set -> [`Tree] node -> [`Tree] node = "caml_xml_tree_select_foll_before" "noalloc"
module HPtset = Hashtbl.Make(Ptset.Int)
HPtset.add vector_htbl s v; v
-type t = {
- doc : tree;
- ttable : (Tag.t,(Ptset.Int.t*Ptset.Int.t*Ptset.Int.t*Ptset.Int.t)) Hashtbl.t;
-}
+
let subtree_size t i = tree_subtree_size t.doc i
let subtree_elements t i = tree_subtree_elements t.doc i
let text_size t = text_size t.doc
let parent t n = tree_parent t.doc n
let first_child t = (); fun n -> tree_first_child t.doc n
-let first_element t = (); fun n -> tree_first_element t.doc n
+let first_element t = (); fun n -> tree_first_element t n
(* these function will be called in two times: first partial application
on the tag, then application of the tag and the tree, then application of
fun n -> tree_select_child t.doc n v
let next_sibling t = (); fun n -> tree_next_sibling t.doc n
-let next_element t = (); fun n -> tree_next_element t.doc n
+let next_element t = (); fun n -> tree_next_element t n
let tagged_sibling t tag = (); fun n -> tree_tagged_sibling t.doc n tag
fun n -> tree_select_foll_sibling t.doc n v
let next_sibling_ctx t = (); fun n _ -> tree_next_sibling t.doc n
-let next_element_ctx t = (); fun n _ -> tree_next_element t.doc n
+let next_element_ctx t = (); fun n _ -> tree_next_element t n
let tagged_sibling_ctx t tag = (); fun n _ -> tree_tagged_sibling t.doc n tag
let select_sibling_ctx t = fun ts ->
projects / SXSI / xpathcomp.git / commitdiff