Add a kind element to the node tree. Improve support for XPath by

[tatoo.git] / src / auto / ata.ml

diff --git a/src/auto/ata.ml b/src/auto/ata.ml
index c7bb172..4418996 100644 (file)
--- a/src/auto/ata.ml
+++ b/src/auto/ata.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-03-09 18:06:46 CET by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-03-11 00:14:28 CET by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -28,7 +28,7 @@ type predicate = | First_child
                  | Stay
                  | Is_first_child
                  | Is_next_sibling
-                 | Is_attribute
+                 | Is of (Tree.Common.NodeKind.t)
                  | Has_first_child
                  | Has_next_sibling
 
@@ -63,7 +63,7 @@ struct
     | Stay -> fprintf ppf "%s(%a)" Pretty.epsilon State.print q
     | Is_first_child -> fprintf ppf "FC%s?" Pretty.inverse
     | Is_next_sibling -> fprintf ppf "NS%s?" Pretty.inverse
-    | Is_attribute -> fprintf ppf "%s" "@?"
+    | Is k -> fprintf ppf "is-%a?" Tree.Common.NodeKind.print k
     | Has_first_child -> fprintf ppf "FC?"
     | Has_next_sibling -> fprintf ppf "NS?"
 
@@ -77,7 +77,9 @@ end
 module SFormula =
 struct
   include Formula.Make(Atom)
+  open Tree.Common.NodeKind
   let mk_atom a b c = atom_ (Atom.make (a,b,c))
+  let mk_kind k = mk_atom (Is k) true State.dummy
   let has_first_child =
     (mk_atom Has_first_child true State.dummy)
 
@@ -91,7 +93,16 @@ struct
     (mk_atom Is_next_sibling true State.dummy)
 
   let is_attribute =
-    (mk_atom Is_attribute true State.dummy)
+    (mk_atom (Is Attribute) true State.dummy)
+
+  let is_element =
+    (mk_atom (Is Element) true State.dummy)
+
+  let is_processing_instruction =
+    (mk_atom (Is ProcessingInstruction) true State.dummy)
+
+  let is_comment =
+    (mk_atom (Is Comment) true State.dummy)
 
   let first_child q =
   and_