X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fxpath%2Fcompile.ml;h=d33fbb4cc826785c8d9ad91976300eb3e5c78a3a;hp=f1212f2a4707b10dd2b8b971cb92376cded559e0;hb=fe2ba1820282783ae8c10fbbbd2b65d3dc4c67f2;hpb=8026ca9faaa968ced3c2e75ca1d6b55f7270ca50 diff --git a/src/xpath/compile.ml b/src/xpath/compile.ml index f1212f2..d33fbb4 100644 --- a/src/xpath/compile.ml +++ b/src/xpath/compile.ml @@ -13,23 +13,24 @@ (* *) (***********************************************************************) -(* - Time-stamp: -*) - open Ast -open Auto -open Utils -let mk_atom l b q = - Ata.SFormula.atom_ (Ata.Move.make (l,b,q)) let ( => ) a b = (a, b) -let ( ** ) l q = mk_atom l true q -let ( ++ ) a b = Ata.SFormula.or_ a b -let ( %% ) a b = Ata.SFormula.and_ a b +let ( ++ ) a b = Ata.Formula.or_ a b +let ( %% ) a b = Ata.Formula.and_ a b let ( @: ) a b = StateSet.add a b +module F = Ata.Formula + + +let node_set = QNameSet.remove QName.document QNameSet.any +let star_set = QNameSet.diff QNameSet.any ( + List.fold_right (QNameSet.add) + [ QName.document; QName.text; QName.comment ] + QNameSet.empty) +let root_set = QNameSet.singleton QName.document + (* [compile_axis_test axis test q phi trans states] Takes an xpath [axis] and node [test], a formula [phi], a list of [trans]itions and a set of [states] and returns a formula [phi'], a new set of @@ -38,49 +39,60 @@ let ( @: ) a b = StateSet.add a b holds. *) -let compile_axis_test axis test phi trans states = - let q = State.make () in +let compile_axis_test axis (test,kind) phi trans states = + let q = State.next () in + let phi = match kind with + Tree.NodeKind.Node -> phi + | _ -> phi %% F.is kind + in let phi', trans', states' = match axis with | Self -> - (`Epsilon ** q), - (q, [ test => phi ]) :: trans, - states + (F.stay q, + (q, [ test => phi ]) :: trans, + states) | Child -> - (`Left ** q), - (q, [ test => phi; - QNameSet.any => (`Right ** q) ]) :: trans, - states - - | Descendant self -> - (if self then (`Epsilon ** q) else (`Left ** q)), - (q, [ test => phi; - QNameSet.any => (`Left ** q) ++ (`Right ** q) ]) :: trans, - states + (F.first_child q, + (q, [ test => phi; + QNameSet.any => F.next_sibling q ]) :: trans, + states) + + | Descendant false -> + (F.first_child q, + (q, [ test => phi; + QNameSet.any => F.first_child q ++ F.next_sibling q; + ]) :: trans, + states) + | Descendant true -> + let q' = State.next () in + (F.stay q ++ F.first_child q', + (q', [ QNameSet.any => F.stay q ++ F.first_child q' ++ F.next_sibling q'; + ]):: + (q, [ test => phi]):: trans, + states) | Parent -> - let q' = State.make () in - let move = (`Up1 ** q) ++ (`Up2 ** q') in - move, - (q, [ test => phi ]) - :: (q', [ QNameSet.any => move ]) :: trans, - (q' @: states) + let q' = State.next () in + let move = F.parent q ++ F.previous_sibling q' in + (move, + (q, [ test => phi ]) + :: (q', [ QNameSet.any => move ]) :: trans, + (q' @: states)) | Ancestor self -> - let q' = State.make () in - let move = (`Up1 ** q) ++ (`Up2 ** q') in - (if self then (`Epsilon ** q) else move), - (q, [ test => phi; - QNameSet.any => move ]) - :: (q', [ QNameSet.any => move ]) :: trans, - (q' @: states) + let q' = State.next () in + let move = F.parent q' ++ F.previous_sibling q' in + (if self then F.stay q ++ F.stay q' else F.stay q'), + (q', [ QNameSet.any => move ++ F.parent q]) + :: (q, [ test => phi ]) :: trans, + (q' @: states) | FollowingSibling | PrecedingSibling -> let move = if axis = PrecedingSibling then - (`Up2 ** q) - else (`Right ** q) + F.previous_sibling q + else F.next_sibling q in move, (q, [ test => phi; @@ -88,32 +100,15 @@ let compile_axis_test axis test phi trans states = states | Attribute -> - let q' = State.make () in - let test = if QNameSet.is_finite test then - QNameSet.fold (fun tag acc -> - QNameSet.add (QName.add_attribute_prefix tag) acc) - test QNameSet.empty - else test - in - (`Left ** q), - (q, [ QNameSet.singleton QName.attribute_map => (`Left ** q') ]) - :: (q', [ test => phi; - QNameSet.any => (`Right ** q') ]) :: trans, - (q' @:states) + (F.first_child q, + (q, [ test => phi; + QNameSet.any => F.next_sibling q]) :: trans, + states) | _ -> assert false in phi', trans', q @: states' - -let compile_rev_axis_test axis test phi trans states = - match axis with - | Attribute -> assert false - | _ -> compile_axis_test (invert_axis axis) test phi trans states -;; - - - let rec compile_expr e trans states = match e with | Binop (e1, (And|Or as op), e2) -> @@ -124,7 +119,7 @@ let rec compile_expr e trans states = states2 | Fun_call (f, [ e0 ]) when (QName.to_string f) = "not" -> let phi, trans0, states0 = compile_expr e0 trans states in - (Ata.SFormula.not_ phi), + (F.not_ phi), trans0, states0 | Path p -> compile_path p trans states @@ -133,22 +128,24 @@ let rec compile_expr e trans states = and compile_path paths trans states = List.fold_left (fun (aphi, atrans, astates) p -> let phi, ntrans, nstates = compile_single_path p atrans astates in - (Ata.SFormula.or_ phi aphi), + (F.or_ phi aphi), ntrans, - nstates) (Ata.SFormula.false_,trans,states) paths + nstates) (F.false_,trans,states) paths and compile_single_path p trans states = let steps = match p with | Absolute steps -> - (Ancestor false, QNameSet.singleton QName.document, [])::steps + (Ancestor false, (QNameSet.singleton QName.document, + Tree.NodeKind.Node), []) + :: steps | Relative steps -> steps in compile_step_list steps trans states and compile_step_list l trans states = match l with - | [] -> Ata.SFormula.true_, trans, states + | [] -> F.true_, trans, states | (axis, test, elist) :: ll -> let phi0, trans0, states0 = compile_step_list ll trans states in let phi1, trans1, states1 = @@ -158,67 +155,99 @@ and compile_step_list l trans states = let ephi, etrans, estates = compile_expr e atrans astates in aphi %% ephi, etrans, estates) (phi1, trans1, states1) elist +(** + Compile the top-level XPath query in reverse (going downward + to the last top-level state): + /a0::t0[p0]/../an-1::tn-1[pn-1]/an::tn[pn] becomes: + self::node()[ pn and + self::tn[pn]/inv(an)::(tn-1)[pn-1]/.../inv(a1)::t0[p0]/inv(a0)::document()] + + /child::a/attribute::b + self::@b/parent::a/parent::doc() +*) + let compile_top_level_step_list l trans states = let rec loop l trans states phi_above = match l with - | (axis, test, elist) :: [] -> + | [] -> assert false + | (axis, (test,kind), elist) :: ll -> let phi0, trans0, states0 = - compile_rev_axis_test axis QNameSet.any phi_above trans states + compile_axis_test (invert_axis axis) + (QNameSet.any, Tree.NodeKind.Node) + phi_above trans states in - let phi1, trans1, states1 = - List.fold_left (fun (aphi, atrans, astates) e -> - let ephi, etrans, estates = compile_expr e atrans astates in - aphi %% ephi, etrans, estates) (phi0, trans0, states0) elist + (* Only select attribute nodes if the previous axis + is attribute *) + let phi0 = + if axis != Attribute && kind == Tree.NodeKind.Node then + phi0 %% (F.not_ F.is_attribute) + else phi0 in - let _, trans2, states2 = - compile_axis_test Self test phi1 trans1 states1 + match ll with + [] -> + let phi1, trans1, states1 = + List.fold_left (fun (aphi, atrans, astates) e -> + let ephi, etrans, estates = compile_expr e atrans astates in + aphi %% ephi, etrans, estates) (phi0, trans0, states0) elist + in + let _, trans2, states2 = + compile_axis_test Self (test,kind) phi1 trans1 states1 + in + let marking_state = + StateSet.choose (StateSet.diff states2 states1) + in + marking_state, trans2, states2 + | _ -> + let phi1, trans1, states1 = + compile_axis_test Self (test,kind) phi0 trans0 states0 in - let marking_state = - StateSet.choose (StateSet.diff states2 states1) - in - marking_state, trans2, states2 - | (axis, test, elist) :: ll -> - let phi0, trans0, states0 = - compile_rev_axis_test axis QNameSet.any phi_above trans states - in - let phi1, trans1, states1 = - compile_axis_test Self test phi0 trans0 states0 - in let phi2, trans2, states2 = List.fold_left (fun (aphi, atrans, astates) e -> - let ephi, etrans, estates = compile_expr e atrans astates in - aphi %% ephi, etrans, estates) (phi1, trans1, states1) elist + let ephi, etrans, estates = compile_expr e atrans astates in + aphi %% ephi, etrans, estates) (phi1, trans1, states1) elist in - loop ll trans2 states2 phi2 - | _ -> assert false + loop ll trans2 states2 phi2 in + let starting = State.next () in let phi0, trans0, states0 = compile_axis_test Self - (QNameSet.singleton QName.document) - Ata.SFormula.true_ + (QNameSet.any, Tree.NodeKind.Node) + (F.stay starting) trans states in - loop l trans0 states0 phi0 + let mstates, trans, states = loop l trans0 states0 phi0 in + starting, mstates, trans, states ;; - let path p = - let mstates, trans, states = List.fold_left (fun (ams, atrs, asts) p -> - let ms, natrs, nasts = - match p with - | Absolute l | Relative l -> compile_top_level_step_list l atrs asts - in - (StateSet.add ms ams), natrs, nasts) (StateSet.empty, [], StateSet.empty) p + let sstates, mstates, trans, states = + List.fold_left (fun (ass, ams, atrs, asts) p -> + let ss, ms, natrs, nasts = + match p with + | Absolute l | Relative l -> compile_top_level_step_list l atrs asts + in + (StateSet.add ss ass), + (StateSet.add ms ams), + natrs, + nasts) (StateSet.empty, StateSet.empty, [], StateSet.empty) p in - let a = Ata.create () in - a.Ata.states <- states; - a.Ata.selection_states <- mstates; + let builder = Ata.Builder.make () in + (** ensure that we have a single selecting state at the end *) + let phi_sel = StateSet.fold (fun q acc -> F.or_ (F.stay q) acc) mstates F.false_ in + let q_sel = State.next () in + let states = StateSet.add q_sel states in + let mstates = StateSet.singleton q_sel in + let trans = (q_sel, [QNameSet.any, phi_sel]) :: trans in + StateSet.iter + (Ata.Builder.add_state builder ~starting:true) sstates; + StateSet.iter + (Ata.Builder.add_state builder ~selecting:true) mstates; + StateSet.iter + (Ata.Builder.add_state builder) states; List.iter (fun (q, l) -> List.iter (fun (lab, phi) -> - Ata.add_trans a q lab phi + Ata.Builder.add_trans builder q lab phi ) l) trans; - Ata.complete_transitions a; - Ata.normalize_negations a; - a + Ata.Builder.finalize builder