(* *)
(***********************************************************************)
-(*
- Time-stamp: <Last modified on 2013-03-13 11:02:32 CET by Kim Nguyen>
-*)
-
open Ast
-open Auto
-open Utils
let ( => ) a b = (a, b)
let compile_axis_test axis (test,kind) phi trans states =
let q = State.make () in
let phi = match kind with
- Tree.Common.NodeKind.Node -> phi
+ Tree.NodeKind.Node -> phi
| _ -> phi %% F.mk_kind kind
in
let phi', trans', states' =
match p with
| Absolute steps ->
(Ancestor false, (QNameSet.singleton QName.document,
- Tree.Common.NodeKind.Node), [])
+ Tree.NodeKind.Node), [])
:: steps
| Relative steps -> steps
in
| (axis, (test,kind), elist) :: ll ->
let phi0, trans0, states0 =
compile_axis_test (invert_axis axis)
- (QNameSet.any, Tree.Common.NodeKind.Node)
+ (QNameSet.any, Tree.NodeKind.Node)
phi_above trans states
in
(* Only select attribute nodes if the previous axis
let phi0, trans0, states0 =
compile_axis_test
Self
- (QNameSet.singleton QName.document, Tree.Common.NodeKind.Node)
+ (QNameSet.singleton QName.document, Tree.NodeKind.Node)
Ata.SFormula.true_
trans
states
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