X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmQueryUtil.ml;h=98371c0538aeda098e851288730238f0f2c11da4;hb=a4df9661e15509e5da6ed9c57e3ab6a27a440c3f;hp=ea1829719f37bfd86641ecf4cadecb4f8deba55c;hpb=ba824e867afc3eaf081ed1a1d6526d421242a6a0;p=helm.git

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index ea1829719..98371c053 100644
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -41,65 +41,72 @@ 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 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.ExactOp -> ""
-      | M.SubOp   -> "sub "
-      | M.SuperOp -> "super "
-   in
-   let txt_vvar_list l =
-      l
+      | M.RefineExact -> ""
+      | M.RefineSub   -> "sub "
+      | 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_qstr s
-      | M.Const l             -> "{" ^ txt_list txt_qstr ", " 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.Attribute (r, p, x) -> "attribute " ^ txt_ref r ^ txt_list txt_qstr "/" 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"
       | M.Ex b x      -> "ex " ^ txt_boole x
-(*    | M.Ex b x      -> "ex [" ^ txt_list txt_rvar "," b ^ "] " ^ txt_boole x *)
-      | M.Not x       -> "not " ^ txt_boole x
+(*    | M.Ex b x      -> "ex [" ^ txt_list txt_rvar "," b ^ "] " ^ txt_boole x
+*)    | M.Not x       -> "not " ^ txt_boole x
       | M.And (x, y)  -> "(" ^ txt_boole x ^ " and " ^ txt_boole y ^ ")"
       | M.Or (x, y)   -> "(" ^ txt_boole x ^ " or " ^ txt_boole y ^ ")"
       | M.Sub (x, y)  -> "(" ^ txt_val x ^ " sub " ^ txt_val y ^ ")"
       | M.Meet (x, y) -> "(" ^ txt_val x ^ " meet " ^ txt_val y ^ ")"
       | M.Eq (x, y)   -> "(" ^ txt_val x ^ " eq " ^ txt_val y ^ ")"
    and txt_set = function
-      | M.SVar sv                -> txt_svar sv
-      | M.RVar rv                -> txt_rvar rv
-      | M.Relation (r, p, x, []) -> "relation " ^ txt_ref r ^ txt_list txt_qstr "/" p ^ " " ^ txt_set x
-      | M.Relation (r, p, x, l)  -> "relation " ^ txt_ref r ^ txt_list txt_qstr "/" p ^ " " ^ txt_set x ^ " attr " ^ txt_list txt_vvar ", " 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 ^ ")"
-      | M.LetSVar (sv, x, y)     -> "let " ^ txt_svar sv ^ " be " ^ txt_set x ^ " in " ^ txt_set y
-      | M.LetVVar (vv, x, y)     -> "let " ^ txt_vvar vv ^ " be " ^ txt_val x ^ " in " ^ txt_set y
-      | 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
+      | M.SVar sv                   -> txt_svar sv
+      | M.RVar rv                   -> txt_rvar rv
+      | 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 ^ ")"
+      | M.LetSVar (sv, x, y)        -> "let " ^ txt_svar sv ^ " be " ^ txt_set x ^ " in " ^ txt_set y
+      | M.LetVVar (vv, x, y)        -> "let " ^ txt_vvar vv ^ " be " ^ txt_val x ^ " in " ^ txt_set y
+      | 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
-      | (s, []) -> txt_qstr s
-      | (s, l)  -> txt_qstr s ^ "=" ^ txt_list txt_qstr ", " 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
-      | (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