Structure of run.

diff --git a/src/run.ml b/src/run.ml
index e24462f..83fa0e0 100644 (file)
--- a/src/run.ml
+++ b/src/run.ml
@@ -11,8 +11,20 @@
 (*                                                                     *)
 (***********************************************************************)
 
-type t = int
 
-let compute tree asta = 0
+(* Il faut tout paramétrer par tr!!!! je ne sais pas comment faire >< **)
+
+module Node  =
+struct
+  type t = Tree.node
+  let tr = Tree.load_xml_string "<a></a>"
+  let compare n1 n2 = (Tree.preorder tr n2) - (Tree.preorder tr n1)
+end
+  
+module NodeMap = Map.Make (Node)
+
+type t = StateSet.t NodeMap.t
+
+let compute tree asta = NodeMap.empty
 
 let print fmt run = ()

diff --git a/src/test.ml b/src/test.ml
index f20e471..e6cd725 100644 (file)
--- a/src/test.ml
+++ b/src/test.ml
@@ -52,8 +52,8 @@ let compute_run doc query =
   run
 
 let () =
-  let query = query () in
   let doc = doc () in
+  let query = query () in
   let asta = build_asta query in
   let run = compute_run doc asta in
   fprintf err_formatter "@[<v 0>##### Query #####@.  %a@]\n"

diff --git a/tests/results/my.result b/tests/results/my.result
index 63faaef..8d48275 100644 (file)
--- a/tests/results/my.result
+++ b/tests/results/my.result
@@ -1,4 +1,4 @@
-Parse query OK ! Parse Tree OK ! Compil OK ! Run OK ! 
+Parse Tree OK ! Parse query OK ! Compil OK ! Run OK ! 
 ##### Query #####
   /descendant::a[descendant::c[child::e and not descendant::f[not descendant::e]/descendant::g]]/descendant::b[child::g]