Flatten the sources, only leave the XPath module packed.

[tatoo.git] / src / xpath / ast.ml

diff --git a/src/xpath/ast.ml b/src/xpath/ast.ml
index 64c6c8d..a90a41b 100644 (file)
--- a/src/xpath/ast.ml
+++ b/src/xpath/ast.ml
@@ -14,10 +14,9 @@
 (***********************************************************************)
 
 (*
 (***********************************************************************)
 
 (*

-  Time-stamp: <Last modified on 2013-03-13 10:59:20 CET by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-04 18:43:04 CEST by Kim Nguyen>

 *)
 
 *)
 

-open Utils

 
 type path = single_path list
 and single_path = Absolute of step list | Relative of step list
 
 type path = single_path list
 and single_path = Absolute of step list | Relative of step list


@@ -30,7 +29,7 @@ and axis = Self | Attribute | Child
            | PrecedingSibling
            | Preceding | Following
 
            | PrecedingSibling
            | Preceding | Following
 

-and test = QNameSet.t * Tree.Common.NodeKind.t
+and test = QNameSet.t * Tree.NodeKind.t

 
 and binop = Eq | Neq | Lt | Gt | Lte | Gte | Or | And | Add | Sub | Mult | Div | Mod
 and unop =  Neg
 
 and binop = Eq | Neq | Lt | Gt | Lte | Gte | Or | And | Add | Sub | Mult | Div | Mod
 and unop =  Neg


@@ -128,7 +127,7 @@ and print_axis fmt a = pp fmt "%s" begin
 end
 
 and print_test fmt (ts,kind) =
 end
 
 and print_test fmt (ts,kind) =

-  let open Tree.Common.NodeKind in
+  let open Tree.NodeKind in

     match kind with
       Text -> pp fmt "%s" "text()"
     | Element | Attribute ->
     match kind with
       Text -> pp fmt "%s" "text()"
     | Element | Attribute ->