generator patched for new semantics with structurated attribute names

diff --git a/helm/gTopLevel/mQueryGenerator.ml b/helm/gTopLevel/mQueryGenerator.ml
index c05cba1c710c6f824d9b6c575f807e64ea2edb94..78ce04e6c81c500fbdacab9a9b9f106cbd35d433 100644 (file)
--- a/helm/gTopLevel/mQueryGenerator.ml
+++ b/helm/gTopLevel/mQueryGenerator.ml
@@ -185,7 +185,7 @@ let execute_query query =
 
 let locate s =
    let module M = MathQL in
-   let q = M.Ref (M.Attribute true M.ExactOp ["objectName"] (M.Const [s])) in
+   let q = M.Ref (M.Attribute true M.RefineExact ("objectName", []) (M.Const [s])) in
    execute_query q
 
 let backward e c t level =
@@ -193,8 +193,8 @@ let backward e c t level =
    let v_pos = M.Const ["MainConclusion"; "InConclusion"] in
    let q_where = M.Sub (M.RefOf (
       M.Select ("uri", 
-                M.Relation (false, M.ExactOp, ["refObj"], M.RVar "uri0", ["pos"]),
-                M.Ex ["uri"] (M.Meet (M.VVar "positions", M.Record ("uri", "pos"))) 
+                M.Relation (false, M.RefineExact, ("refObj", []), M.RVar "uri0", ["pos"]),
+                M.Ex ["uri"] (M.Meet (M.VVar "positions", M.Record ("uri", ("pos", [])))) 
               )),      M.VVar "universe"
                       )
    in
@@ -208,8 +208,8 @@ let backward e c t level =
    let build_select (r, b, v) =
       let pos = if b then "MainConclusion" else "InConclusion" in
       M.Select ("uri", 
-                M.Relation (false, M.ExactOp, ["backPointer"], M.Ref (M.Const [r]), ["pos"]),
-                M.Ex ["uri"] (M.Sub (M.Const [pos], M.Record ("uri", "pos")))
+                M.Relation (false, M.RefineExact, ("backPointer", []), M.Ref (M.Const [r]), ["pos"]),
+                M.Ex ["uri"] (M.Sub (M.Const [pos], M.Record ("uri", ("pos", []))))
                )
    in 
    let rec build_intersect = function