structurated attribute names added

[helm.git] / helm / ocaml / mathql / mQueryUtil.ml

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index 09759cc4536dfd8962ae825de25c9375c998895c..75e587229f29071c93ca3eb7412809ff93f50898 100644 (file)
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -41,7 +41,10 @@ let rec txt_list f s = function
    | [a]       -> f a
    | a :: tail -> f a ^ s ^ txt_list f s tail
    
-let txt_qstr s = "\"" ^ s ^ "\""
+let txt_str s = "\"" ^ s ^ "\""
+
+let txt_path (p0, p1) =
+   txt_str p0 ^ (if p1 <> [] then "/" ^ txt_list txt_str "/" p1 else "")
 
 let text_of_query x =
    let module M = MathQL in
@@ -50,17 +53,17 @@ let text_of_query x =
    let txt_vvar vv = "$" ^ vv in
    let txt_inv i = if i then "inverse " else "" in
    let txt_ref = function
-      | M.ExactOp -> ""
-      | M.SubOp   -> "sub "
-      | M.SuperOp -> "super "
+      | M.RefineExact -> ""
+      | M.RefineSub   -> "sub "
+      | M.RefineSuper -> "super "
    in
-   let txt_refpath i r p = txt_inv i ^ txt_ref r ^ txt_list txt_qstr "/" p ^ " " in
+   let txt_refpath i r p = txt_inv i ^ txt_ref r ^ txt_path p ^ " " in
    let rec txt_val = function
-      | M.Const [s]              -> txt_qstr s
-      | M.Const l                -> "{" ^ txt_list txt_qstr ", " l ^ "}"
+      | M.Const [s]              -> txt_str s
+      | M.Const l                -> "{" ^ txt_list txt_str ", " l ^ "}"
       | M.VVar vv                -> txt_vvar vv
-      | M.Record (rv, vv)        -> txt_rvar rv ^ "." ^ txt_vvar vv
-      | M.Fun (s, x)             -> "fun " ^ txt_qstr s ^ " " ^ txt_val x
+      | M.Record (rv, p)         -> txt_rvar rv ^ "." ^ txt_path p
+      | M.Fun (s, x)             -> "fun " ^ txt_str s ^ " " ^ txt_val x
       | M.Attribute (i, r, p, x) -> "attribute " ^ txt_refpath i r p ^ txt_val x
       | M.RefOf x                -> "refof " ^ txt_set x
    and txt_boole = function
@@ -78,7 +81,7 @@ let text_of_query x =
       | M.SVar sv                   -> txt_svar sv
       | M.RVar rv                   -> txt_rvar rv
       | M.Relation (i, r, p, x, []) -> "relation " ^ txt_refpath i r p ^ txt_set x
-      | M.Relation (i, r, p, x, l)  -> "relation " ^ txt_refpath i r p ^ txt_set x ^ " attr " ^ txt_list txt_vvar ", " l
+      | M.Relation (i, r, p, x, l)  -> "relation " ^ txt_refpath i r p ^ txt_set x ^ " attr " ^ txt_list txt_str ", " l
       | M.Union (x, y)              -> "(" ^ txt_set x ^ " union " ^ txt_set y ^ ")"
       | M.Intersect (x, y)          -> "(" ^ txt_set x ^ " intersect " ^ txt_set y ^ ")"
       | M.Diff (x, y)               -> "(" ^ txt_set x ^ " diff " ^ txt_set y ^ ")"
@@ -92,13 +95,13 @@ let text_of_query x =
 
 let text_of_result x sep =
    let txt_attr = function
-      | (s, []) -> txt_qstr s
-      | (s, l)  -> txt_qstr s ^ "=" ^ txt_list txt_qstr ", " l
+      | (p, []) -> txt_path p
+      | (p, l)  -> txt_path p ^ " = " ^ txt_list txt_str ", " l
    in
    let txt_group l = "{" ^ txt_list txt_attr "; " l ^ "}" in
    let txt_res = function
-      | (s, []) -> txt_qstr s 
-      | (s, l)  -> txt_qstr s ^ " attr " ^ txt_list txt_group ", " l
+      | (s, []) -> txt_str s 
+      | (s, l)  -> txt_str s ^ " attr " ^ txt_list txt_group ", " l
    in   
    let txt_set l = txt_list txt_res ("; " ^ sep) l ^ sep in
    txt_set x