X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fxpath%2Fcompile.ml;h=1bfe292feb58284d87974a41db6419f50b1e7c95;hp=6987b4c13918810fea18d299b1bcdf9828d83055;hb=4b5e86cc5fa3e62a1cb7d29acf79ffb314194efa;hpb=be588f7af67f6b24aa423ff374c0f1c058e64951

diff --git a/src/xpath/compile.ml b/src/xpath/compile.ml
index 6987b4c..1bfe292 100644
--- a/src/xpath/compile.ml
+++ b/src/xpath/compile.ml
@@ -39,7 +39,7 @@ let root_set = QNameSet.singleton QName.document
    holds.
 *)
 
-let compile_axis_test axis (test,kind) phi trans states=
+let compile_axis_test axis (test,kind) phi trans states =
   let q = State.make () in
   let phi = match kind with
     Tree.NodeKind.Node -> phi
@@ -236,6 +236,12 @@ let path p =
       nasts) (StateSet.empty, StateSet.empty, [], StateSet.empty) p
   in
   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.make () 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