remedier a la liste desordonné par l'ajout de sort a la fin de la fonction eval_query...

[tatoo.git] / src / table.ml

diff --git a/src/table.ml b/src/table.ml
index f6e7749..ae446ea 100644 (file)
--- a/src/table.ml
+++ b/src/table.ml
@@ -1,4 +1,3 @@
-(*creer a 28/01/2014*)
 
 type move = Self
            | Firstchild
@@ -10,27 +9,38 @@ type query_tree = Binop of op * query_tree * query_tree
                  | Axis of Xpath.Ast.axis * query_tree
                  | Start 
                  | Dom
-                 | Tag of QNameSet.t
+                 | Tag of QNameSet.t * Tree.NodeKind.t
 and op = Union | Inter | Diff
+(*and query_tree = {
+  mutable desc  : query_tree_desc;
+  mutable id : int;
+  mutable hash : int;
+}
+*)
+
+
+
+
+
 
 (*28/01/2014  
   parametres : tree  l'arbre xml
                n     un noeud
                m     move   
-  retour :un noeud qui correspond à la relation r
+  retour :un noeud qui correspond à¥\86 la relation r
 *)
 
 let print_node_list tree l =
   List.iter (fun node ->
-    Naive_tree.print_xml stdout tree node
-  ) l;
-  print_newline() 
+    Naive_tree.print_xml stdout tree node;
+    print_newline() 
+  ) l
 
 let rec print_query_tree fmt q =
   match q with
       Dom -> Format.fprintf fmt "Dom"
     | Start -> Format.fprintf fmt "Start"
-    | Tag t -> Format.fprintf fmt "Tag(%a)" QNameSet.print t
+    | Tag (t,k) -> Format.fprintf fmt "Tag(%a, %a)" QNameSet.print t Tree.NodeKind.print k
     | Axis (a,q) ->
       Format.fprintf fmt "%a(%a)" Xpath.Ast.print_axis a print_query_tree q
     | Binop (op,q1,q2) -> 
@@ -57,7 +67,7 @@ let rec eval_relation tree m n =
   parametres : tree  l'arbre xml
                ls    l'ensemble de noeuds
                m     move   
-  retour : l'ensemble de noeuds qui correspondent à la relation r
+  retour : l'ensemble de noeuds qui correspondent à¥\86 la relation r
 *)
 
 
@@ -75,7 +85,7 @@ let rec eval_move tree ls m =
   parametres : tree  l'arbre xml
                ls    l'ensemble de noeuds
                m     move   
-  retour : l'ensemble de noeuds qui correspondent à des relations lr
+  retour : l'ensemble de noeuds qui correspondent à¥\86 des relations lr
 *)
 
 and eval_star tree ls lr =
@@ -100,57 +110,69 @@ and eval_star tree ls lr =
   parametres : tree  l'arbre xml
                ls    l'ensemble de noeuds
                a     axis   
-  retour : l'ensemble de noeuds qui correspondent à l'axe
+  retour : l'ensemble de noeuds qui correspondent à¥\86 l'axe
 *)
 
-let keep_elements t l =
+let keep_elements t l = (*
    List.filter (fun n -> match Naive_tree.kind t n with
-     | Element | Text | Document -> true | _ -> false) l
+     | Element | Text | Document | Attribute -> true | _ -> false) l
+                       *) l
+
+let keep_attributs t l = (*
+  List.filter (fun n -> match Naive_tree.kind t n with
+    | Attribute ->true | _ -> false) *) l
 
 let rec eval_axis tree ls a =
   let open Xpath.Ast in
-      let res =
-     (* let ls =  List.sort ( fun a b -> compare (Naive_tree.preorder tree a ) (Naive_tree.preorder tree b ) ) ls in écrir  dans la log!!!!!*)
        match a with
            Self -> ls
              
-         | Attribute -> assert false
+         | Attribute -> let lfc = eval_move tree ls Firstchild in
+                        let lc = eval_star tree lfc [Nextsibling] in
+                        keep_attributs tree lc
            
          | Child -> let lfc = eval_move tree ls Firstchild in
-                    eval_star tree lfc [Nextsibling]
+                    let lc = eval_star tree lfc [Nextsibling] in
+                    keep_elements tree lc
                       
          | Descendant c -> let lfc = eval_move tree ls Firstchild in                
                            let ls2 = eval_star tree lfc [Firstchild;Nextsibling] in
-                           
-                         (* List.merge (compare_node tree) (if c then ls else [])
-                            (List.merge (compare_node tree) ls2 ls)*)
-                          
+                           let ldes =
                            if not c then ls2
                            else List.merge (compare_node tree) ls2 ls
+                           in
+                           keep_elements tree ldes
                              
          | FollowingSibling -> let lnexts = eval_move tree ls Nextsibling in
-                               eval_star tree lnexts [Nextsibling]
+                               let lfs = eval_star tree lnexts [Nextsibling] in
+                               keep_elements tree lfs
                                  
          | Parent -> let lprevs = eval_star tree ls [Prevsibling] in
-                     eval_move tree lprevs Revfirstchild
+                     let lp = eval_move tree lprevs Revfirstchild in
+                     keep_elements tree lp
                        
          | Ancestor b -> let ls2 = eval_star tree ls [Revfirstchild;Prevsibling] in
                          let ls3 = eval_move tree ls2 Revfirstchild in
+                         let lac =
                          if not b then ls3
                          else List.merge (compare_node tree ) ls3 ls
+                         in
+                         keep_elements tree lac
                            
          | PrecedingSibling -> let ls2 = eval_star tree ls [Prevsibling] in
-                               eval_move tree ls2 Prevsibling
+                               let lps = eval_move tree ls2 Prevsibling in
+                               keep_elements tree lps
                                  
          | Preceding -> let ls2 = eval_axis tree ls (Ancestor true) in
                         let ls3 = eval_axis tree ls2 PrecedingSibling in
-                        eval_axis tree ls3 (Descendant true) 
+                        let lp = eval_axis tree ls3 (Descendant true) in
+                        keep_elements tree lp
                         
          | Following -> let ls2 = eval_axis tree ls (Ancestor true) in
                         let ls3 = eval_axis tree ls2 FollowingSibling in
-                        eval_axis tree ls3 (Descendant true) 
-      in
-      keep_elements tree res
+                        let lf = eval_axis tree ls3 (Descendant true) in
+                        keep_elements tree lf
+