X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fxpath%2Fcompile.ml;h=e62b91801dac8a2a12ef8f461b24864cd0cbac82;hp=1c46b8f93b42f8154c475c87295c9b52793b67df;hb=b00bff88c7902e828804c06b7f9dc55222fdc84e;hpb=7aa6c5c4e2b329bbf5fa7cc31a7542ba48ace84f diff --git a/src/xpath/compile.ml b/src/xpath/compile.ml index 1c46b8f..e62b918 100644 --- a/src/xpath/compile.ml +++ b/src/xpath/compile.ml @@ -14,26 +14,16 @@ (***********************************************************************) (* - Time-stamp: + Time-stamp: *) open Ast -open Auto -open Utils let ( => ) a b = (a, b) let ( ++ ) a b = Ata.SFormula.or_ a b let ( %% ) a b = Ata.SFormula.and_ a b let ( @: ) a b = StateSet.add a b -(* -let add_attribute_prefix 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 -*) module F = Ata.SFormula @@ -41,9 +31,8 @@ module F = Ata.SFormula 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.attribute_map ] + [ QName.document; QName.text; QName.comment ] QNameSet.empty) -let attribute = QNameSet.singleton QName.attribute_map let root_set = QNameSet.singleton QName.document (* [compile_axis_test axis test q phi trans states] Takes an xpath @@ -54,9 +43,12 @@ let root_set = QNameSet.singleton QName.document holds. *) -let compile_axis_test ?(block_attr=true) axis test phi trans states = +let compile_axis_test axis (test,kind) phi trans states = let q = State.make () in - let phi_attr = if block_attr then F.not_ F.is_attribute else F.true_ in + let phi = match kind with + Tree.NodeKind.Node -> phi + | _ -> phi %% F.mk_kind kind + in let phi', trans', states' = match axis with | Self -> @@ -66,16 +58,24 @@ let compile_axis_test ?(block_attr=true) axis test phi trans states = | Child -> (F.first_child q, - (q, [ test => phi %% phi_attr; + (q, [ test => phi; QNameSet.any => F.next_sibling q ]) :: trans, states) - | Descendant self -> - ((if self then F.stay q else F.first_child q), - (q, [ test => phi %% phi_attr; + | 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.make () in + (F.or_ (F.stay q) (F.first_child q'), + (q', [ test => phi; + QNameSet.any => F.first_child q' ++ F.next_sibling q'; + ]):: + (q, [ test => phi]):: trans, + states) | Parent -> let q' = State.make () in @@ -101,13 +101,13 @@ let compile_axis_test ?(block_attr=true) axis test phi trans states = else F.next_sibling q in move, - (q, [ test => phi %% phi_attr; + (q, [ test => phi; QNameSet.any => move ]) :: trans, states | Attribute -> (F.first_child q, - (q, [ test => phi %% F.is_attribute; + (q, [ test => phi; QNameSet.any => F.next_sibling q]) :: trans, states) | _ -> assert false @@ -115,15 +115,6 @@ let compile_axis_test ?(block_attr=true) axis test phi trans states = in phi', trans', q @: states' - -let compile_rev_axis_test block_attr axis test phi trans states = - match axis with - | Attribute -> - compile_axis_test - ~block_attr:false Parent test phi trans states - | _ -> compile_axis_test - ~block_attr:block_attr (invert_axis axis) test phi trans states - let rec compile_expr e trans states = match e with | Binop (e1, (And|Or as op), e2) -> @@ -151,7 +142,9 @@ 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 @@ -168,60 +161,70 @@ 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 (doing 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 block_attr phi_above = + 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 - block_attr axis QNameSet.any 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 + compile_axis_test (invert_axis axis) + (QNameSet.any, Tree.NodeKind.Node) + phi_above trans states in - let phi' = - if axis = Attribute then - F.is_attribute - else - F.not_ F.is_attribute + (* Only select attribute nodes if the previous axis + is attribute *) + let phi0 = + if axis != Attribute then + phi0 %% (Ata.SFormula.not_ Ata.SFormula.is_attribute) + else phi0 in - let _, trans2, states2 = - compile_axis_test Self test (phi1 %% phi') trans1 states1 - 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 - block_attr 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 - in - loop ll trans2 states2 (axis != Attribute) phi2 - | _ -> assert false + 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 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 + in + loop ll trans2 states2 phi2 in let phi0, trans0, states0 = compile_axis_test Self - (QNameSet.singleton QName.document) + (QNameSet.singleton QName.document, Tree.NodeKind.Node) Ata.SFormula.true_ trans states in - loop l trans0 states0 true phi0 + loop l trans0 states0 phi0 ;; - let path p = let mstates, trans, states = List.fold_left (fun (ams, atrs, asts) p -> let ms, natrs, nasts = @@ -230,9 +233,7 @@ let path p = in (StateSet.add ms ams), natrs, nasts) (StateSet.empty, [], StateSet.empty) p in - let a = Ata.create () in - a.Ata.states <- states; - a.Ata.selection_states <- mstates; + let a = Ata.create states mstates in List.iter (fun (q, l) -> List.iter (fun (lab, phi) -> Ata.add_trans a q lab phi