MathQL.ml updated

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

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index 75e587229f29071c93ca3eb7412809ff93f50898..98371c0538aeda098e851288730238f0f2c11da4 100644 (file)
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -46,11 +46,14 @@ let txt_str s = "\"" ^ s ^ "\""
 let txt_path (p0, p1) =
    txt_str p0 ^ (if p1 <> [] then "/" ^ txt_list txt_str "/" p1 else "")
 
+let txt_svar sv = "%" ^ sv 
+
+let txt_rvar rv = "@" ^ rv 
+
+let txt_vvar vv = "$" ^ vv 
+
 let text_of_query x =
    let module M = MathQL in
-   let txt_svar sv = "%" ^ sv in
-   let txt_rvar rv = "@" ^ rv in
-   let txt_vvar vv = "$" ^ vv in
    let txt_inv i = if i then "inverse " else "" in
    let txt_ref = function
       | M.RefineExact -> ""
@@ -58,14 +61,15 @@ let text_of_query x =
       | M.RefineSuper -> "super "
    in
    let txt_refpath i r p = txt_inv i ^ txt_ref r ^ txt_path p ^ " " in
+   let txt_assign (pl, pr) = txt_vvar (fst pl) ^ " <- " ^ txt_path pr in
    let rec txt_val = function
-      | M.Const [s]              -> txt_str s
-      | M.Const l                -> "{" ^ txt_list txt_str ", " l ^ "}"
-      | M.VVar vv                -> txt_vvar vv
-      | 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
+      | M.Const [s]             -> txt_str s
+      | M.Const l               -> "{" ^ txt_list txt_str ", " l ^ "}"
+      | M.VVar vv               -> txt_vvar vv
+      | M.Record (rv, p)        -> txt_rvar rv ^ "." ^ txt_vvar (fst p)
+      | M.Fun (s, x)            -> "fun " ^ txt_str s ^ " " ^ txt_val x
+      | M.Property (i, r, p, x) -> "property " ^ txt_refpath i r p ^ txt_val x
+      | M.RefOf x               -> "refof " ^ txt_set x
    and txt_boole = function
       | M.False       -> "false"
       | M.True        -> "true"
@@ -80,8 +84,8 @@ let text_of_query x =
    and txt_set = function
       | 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_str ", " l
+      | M.Relation (i, r, p, M.Ref x, []) -> "relation " ^ txt_refpath i r p ^ txt_val x
+      | M.Relation (i, r, p, M.Ref x, l)  -> "relation " ^ txt_refpath i r p ^ txt_val x ^ " attr " ^ txt_list txt_assign ", " 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 ^ ")"
@@ -90,13 +94,14 @@ let text_of_query x =
       | M.Select (rv, x, y)         -> "select " ^ txt_rvar rv ^ " in " ^ txt_set x ^ " where " ^ txt_boole y
       | M.Pattern x                 -> "pattern " ^ txt_val x
       | M.Ref x                     -> "ref " ^ txt_val x
+      | _                           -> assert false
    in 
    txt_set x
 
 let text_of_result x sep =
    let txt_attr = function
-      | (p, []) -> txt_path p
-      | (p, l)  -> txt_path p ^ " = " ^ txt_list txt_str ", " l
+      | (p, []) -> txt_vvar (fst p)
+      | (p, l)  -> txt_vvar (fst p) ^ " = " ^ txt_list txt_str ", " l
    in
    let txt_group l = "{" ^ txt_list txt_attr "; " l ^ "}" in
    let txt_res = function