(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-03-10 12:28:07 CET by Kim Nguyen>
+ Time-stamp: <Last modified on 2013-03-13 11:02:32 CET by Kim Nguyen>
*)
open Ast
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
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
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.Common.NodeKind.Node -> phi
+ | _ -> phi %% F.mk_kind kind
+ in
let phi', trans', states' =
match axis with
| Self ->
| Child ->
(F.first_child q,
- (q, [ test => phi %% phi_attr;
+ (q, [ test => phi;
QNameSet.any => F.next_sibling q ]) :: trans,
states)
| Descendant false ->
(F.first_child q,
- (q, [ test => phi %% phi_attr;
+ (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 %% phi_attr;
+ (q', [ test => phi;
QNameSet.any => F.first_child q' ++ F.next_sibling q';
])::
- (q, [ test => phi %% phi_attr]):: trans,
+ (q, [ test => phi]):: trans,
states)
| Parent ->
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
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) ->
let steps =
match p with
| Absolute steps ->
- (Ancestor false, QNameSet.singleton QName.document, [])::steps
+ (Ancestor false, (QNameSet.singleton QName.document,
+ Tree.Common.NodeKind.Node), [])
+ :: steps
| Relative steps -> steps
in
compile_step_list steps 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) :: [] ->
- 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
- in
- let phi' =
- if axis = Attribute then
- F.is_attribute
- else
- F.not_ F.is_attribute
- 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 ->
+ | [] -> assert false
+ | (axis, (test,kind), elist) :: ll ->
let phi0, trans0, states0 =
- compile_rev_axis_test
- block_attr axis QNameSet.any phi_above trans states
+ compile_axis_test (invert_axis axis)
+ (QNameSet.any, Tree.Common.NodeKind.Node)
+ phi_above trans states
in
- let phi1, trans1, states1 =
- compile_axis_test Self test phi0 trans0 states0
+ (* 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 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.Common.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 =
projects / tatoo.git / blobdiff