projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temp
[tatoo.git]
/
src
/
xpath
/
compile.ml
diff --git
a/src/xpath/compile.ml
b/src/xpath/compile.ml
index
0038506
..
e62b918
100644
(file)
--- a/
src/xpath/compile.ml
+++ b/
src/xpath/compile.ml
@@
-14,12
+14,10
@@
(***********************************************************************)
(*
(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-0
3-15 18:17:50 CE
T by Kim Nguyen>
+ Time-stamp: <Last modified on 2013-0
4-04 18:43:48 CES
T by Kim Nguyen>
*)
open Ast
*)
open Ast
-open Auto
-open Utils
let ( => ) a b = (a, b)
let ( => ) a b = (a, b)
@@
-48,7
+46,7
@@
let root_set = QNameSet.singleton QName.document
let compile_axis_test axis (test,kind) phi trans states =
let q = State.make () in
let phi = match kind with
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' =
| _ -> phi %% F.mk_kind kind
in
let phi', trans', states' =
@@
-145,7
+143,7
@@
and compile_single_path p trans states =
match p with
| Absolute steps ->
(Ancestor false, (QNameSet.singleton QName.document,
match p with
| Absolute steps ->
(Ancestor false, (QNameSet.singleton QName.document,
- Tree.
Common.
NodeKind.Node), [])
+ Tree.NodeKind.Node), [])
:: steps
| Relative steps -> steps
in
:: steps
| Relative steps -> steps
in
@@
-181,7
+179,7
@@
let compile_top_level_step_list l trans states =
| (axis, (test,kind), elist) :: ll ->
let phi0, trans0, states0 =
compile_axis_test (invert_axis axis)
| (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
phi_above trans states
in
(* Only select attribute nodes if the previous axis
@@
-219,7
+217,7
@@
let compile_top_level_step_list l trans states =
let phi0, trans0, states0 =
compile_axis_test
Self
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
Ata.SFormula.true_
trans
states