(* *)
(* TAToo *)
(* *)
-(* Lucca Hirschi, ? *)
-(* ? *)
+(* Lucca Hirschi, LRI UMR8623 *)
+(* Université Paris-Sud & CNRS *)
(* *)
(* Copyright 2010-2012 Université Paris-Sud and Centre National de la *)
(* Recherche Scientifique. All rights reserved. This file is *)
let pr_er = Format.err_formatter
+let ax_ (a,b,c) = a
+
let trans query =
- let asta = Asta.empty in
(* Buidling of the ASTA step by step with a special case for the last
step. Then add a top most state. Each function modifies asta. *)
- let rec trans = function (* builds asta from the bottom of the query *)
+ let asta = Asta.empty in
+ (* builds asta from the bottom of the query *)
+ let rec trans = function
| [s] -> trans_last s
- | s :: tl -> trans tl; trans_step s
+ | s :: tl -> trans tl; trans_step s (ax_(List.hd tl))
| [] -> ()
-
- and trans_init () = (* add THE top most state *)
+
+ (* Add THE top most state for top-level query (done in the end) *)
+ and trans_init () =
let top_st = Asta.new_state () in
let or_top =
List.fold_left (fun acc x -> ((`Left *+ x) +| acc))
- (Formula.false_) (Asta.top_states asta)
- in
+ (Formula.false_) (Asta.top_states asta) in
Asta.add_quer asta top_st;
Asta.init_top asta;
Asta.add_top asta top_st;
+ Asta.add_bot asta top_st; (* for trees which are leaves *)
Asta.add_tr asta (top_st, Asta.any_label, or_top) true
-
- and trans_last (ax,test,pred) = (* a selecting state is needed *)
- let fo_p = trans_pr pred in
+
+ (* A selecting state is needed *)
+ and trans_last (ax,test,pred) =
+ let fo_p = trans_pr pred in (* TODO (if ax=Self, only q *)
let q,q' = Asta.new_state(), Asta.new_state() in
Asta.add_selec asta q';
Asta.add_quer asta q;
Asta.add_quer asta q';
Asta.add_top asta q;
Asta.add_top asta q';
- Asta.add_bot asta q;
- Asta.add_bot asta q';
+ Asta.add_bot asta q; (* q' \notin B !! *)
let Simple lab = test in
let tr_selec = (q', lab, fo_p)
and tr_q = (q, Asta.any_label, form_propa_selec q q' ax) in
Asta.add_tr asta tr_selec true;
Asta.add_tr asta tr_q true
-
- and trans_step (ax,test,pred) = (* add a new state for the step *)
+
+ and form_next_step ax_next top_states_next form_pred =
+ match ax_next with
+ | Self -> (form_pred) *& (* (\/ top_next) /\ predicate *)
+ (List.fold_left (fun acc x -> (`Self *+ x ) +| acc)
+ Formula.false_ top_states_next)
+ | FollowingSibling -> (form_pred) *& (* (\/ top_next) /\ predicate *)
+ (List.fold_left (fun acc x -> (`Right *+ x ) +| acc)
+ Formula.false_ top_states_next)
+ | _ -> (form_pred) *& (* (\/ top_next) /\ predicate *)
+ (List.fold_left (fun acc x -> (`Left *+ x ) +| acc)
+ Formula.false_ top_states_next)
+
+ (* Add a new state and its transitions for the step *)
+ and trans_step (ax,test,pred) ax_next =
let fo_p = trans_pr pred
and q = Asta.new_state() in
let Simple label = test
- and form_next = (fo_p) *& (* (\/ top_next) /\ predicat *)
- (List.fold_left (fun acc x -> (`Left *+ x ) +| acc)
- Formula.false_ (Asta.top_states asta)) in
+ and form_next = form_next_step ax_next (Asta.top_states asta) fo_p in
let tr_next = (q, label, form_next)
and tr_propa = (q, Asta.any_label, form_propa q ax) in
Asta.add_quer asta q;
Asta.add_tr asta tr_propa true;
Asta.init_top asta;
Asta.add_top asta q
-
- and trans_pr = function (* either we apply De Morgan rules
- in xPath:parse or here *)
+
+ (* Translating of predicates. Either we apply De Morgan rules
+ in xPath.parse or here *)
+ and trans_pr = function
| Expr True -> Formula.true_
| Expr False -> Formula.false_
| Or (p_1,p_2) -> trans_pr(p_1) +| trans_pr(p_2)
| Not (Expr Path q) -> (trans_pr_path false q)
| Expr Path q -> (trans_pr_path true q)
| x -> print_predicate pr_er x; raise Not_core_XPath
-
- and trans_pr_path posi = function (* builds asta for predicate and gives
- the formula which must be satsified *)
+
+ (* Builds asta for predicate and gives the formula which must be satsified *)
+ and trans_pr_path posi = function
| Relative [] -> if posi then Formula.true_ else Formula.false_
- | Relative steps -> List.fold_left
- (fun acc x -> if posi then (`Left *+ x) +| acc else (`Left *- x) +| acc)
- Formula.false_ (trans_pr_step_l steps)
+ | Relative steps ->
+ let dir = match ax_ (List.hd steps) with
+ | Self -> `Self
+ | FollowingSibling -> `Right
+ | _ -> `Left in
+ List.fold_left
+ (fun acc x -> if posi then (dir *+ x) +| acc else (dir *- x) +| acc)
+ Formula.false_ (trans_pr_step_l steps)
| AbsoluteDoS steps as x -> print pr_er x; raise Not_core_XPath
| Absolute steps as x -> print pr_er x; raise Not_core_XPath
- and trans_pr_step_l = function (* builds asta for a predicate query *)
- | [step] -> trans_pr_step [] step
+ (* Builds asta for a predicate query and give the formula *)
+ and trans_pr_step_l = function
+ | [step] -> trans_pr_step [] step (Self) (* Self doesn't matter since [] *)
| step :: tl -> let list_top = trans_pr_step_l tl in
- trans_pr_step list_top step
+ trans_pr_step list_top step (ax_ (List.hd tl))
| [] -> failwith "Can not happened! 1"
- and trans_pr_step list (ax,test,pred) = (* add a step on the top of
- list in a predicate *)
+ (* Add a step on the top of a list of states in a predicate *)
+ and trans_pr_step list (ax,test,pred) ax_next =
let form_next =
if list = []
then trans_pr pred
- else (trans_pr pred) *&
- (List.fold_left (fun acc x -> (`Left *+ x) +| acc)
- Formula.false_ list)
+ else form_next_step ax_next list (trans_pr pred)
and q = Asta.new_state()
and Simple label = test in
let tr_next = (q,label, form_next)
Asta.add_reco asta q;
Asta.add_tr asta tr_next false;
Asta.add_tr asta tr_propa false;
- [q] (* always one element here, but not with self
- axis*)
-
- and form_propa q = function (* gives the propagation formula *)
+ [q] (* always one element here, but more with self
+ axis *)
+ (* Gives the propagation formula *)
+ and form_propa q = function
| Child -> `Right *+ q
| Descendant -> (`Left *+ q +| `Right *+ q)
+ | Self -> `Self *+ q
+ | FollowingSibling -> `Right *+ q
| x -> print_axis pr_er x; raise Not_core_XPath
- and form_propa_selec q q' = function (* the same with a selecting state *)
+ (* The same with a selecting state *)
+ and form_propa_selec q q' = function
| Child -> `Right *+ q +| `Right *+ q'
| Descendant -> (`Left *+ q +| `Right *+ q) +| (`Left *+ q' +| `Right *+ q')
+ | Self -> `Self *+ q'
+ | FollowingSibling -> `Right *+ q +| `Right *+ q'
| x -> print_axis pr_er x; raise Not_core_XPath
in
- match query with (* match the top-level query *)
+ (* Match the top-level query *)
+ match query with
| Absolute steps -> trans steps; trans_init(); asta
| AbsoluteDoS steps as x -> print pr_er x; raise Not_core_XPath
| Relative steps as x -> print pr_er x; raise Not_core_XPath