X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmQueryUtil.ml;h=ba2382ef99be82526e2b36dd592bf1bae24735cf;hb=d2c60bae1c4badba0a0f29e3fd2faed6d3a1869e;hp=09759cc4536dfd8962ae825de25c9375c998895c;hpb=e5c9ea9efcc95afee3be91e8beb754c0cb4301dc;p=helm.git diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml index 09759cc45..ba2382ef9 100644 --- a/helm/ocaml/mathql/mQueryUtil.ml +++ b/helm/ocaml/mathql/mQueryUtil.ml @@ -36,72 +36,80 @@ (* text linearization and parsing *******************************************) -let rec txt_list f s = function - | [] -> "" +let rec txt_list out f s = function + | [] -> () | [a] -> f a - | a :: tail -> f a ^ s ^ txt_list f s tail + | a :: tail -> f a; out s; txt_list out f s tail -let txt_qstr s = "\"" ^ s ^ "\"" +let txt_str out s = out ("\"" ^ s ^ "\"") -let text_of_query x = +let txt_path out (p0, p1) = + txt_str out p0; if p1 <> [] then out "/"; txt_list out (txt_str out) "/" p1 + +let txt_svar out sv = out ("%" ^ sv) + +let txt_rvar out rv = out ("@" ^ rv) + +let txt_vvar out vv = out ("$" ^ vv) + +let text_of_query out x sep = 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_inv i = if i then out "inverse " in let txt_ref = function - | M.ExactOp -> "" - | M.SubOp -> "sub " - | M.SuperOp -> "super " + | M.RefineExact -> () + | M.RefineSub -> out "sub " + | M.RefineSuper -> out "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 out p; out " " in + let txt_assign (pl, pr) = txt_vvar out (fst pl); out " <- "; txt_path out 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 (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 out s + | M.Const l -> out "{"; txt_list out (txt_str out) ", " l; out "}" + | M.VVar vv -> txt_vvar out vv + | M.Record (rv, p) -> txt_rvar out rv; out "."; txt_vvar out (fst p) + | M.Fun (s, x) -> out "fun "; txt_str out s; out " "; txt_val x + | M.Property (i, r, p, x) -> out "property "; txt_refpath i r p; txt_val x + | M.RefOf x -> out "refof "; txt_set x and txt_boole = function - | M.False -> "false" - | M.True -> "true" - | M.Ex b x -> "ex " ^ txt_boole x + | M.False -> out "false" + | M.True -> out "true" + | M.Ex b x -> out "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.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 ^ ")" +*) | M.Not x -> out "not "; txt_boole x + | M.And (x, y) -> out "("; txt_boole x; out " and "; txt_boole y; out ")" + | M.Or (x, y) -> out "("; txt_boole x; out " or "; txt_boole y; out ")" + | M.Sub (x, y) -> out "("; txt_val x; out " sub "; txt_val y; out ")" + | M.Meet (x, y) -> out "("; txt_val x; out " meet "; txt_val y; out ")" + | M.Eq (x, y) -> out "("; txt_val x; out " eq "; txt_val y; out ")" 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_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 out sv + | M.RVar rv -> txt_rvar out rv + | M.Relation (i, r, p, M.Ref x, []) -> out "relation "; txt_refpath i r p; txt_val x + | M.Relation (i, r, p, M.Ref x, l) -> out "relation "; txt_refpath i r p; txt_val x; out " attr "; txt_list out txt_assign ", " l + | M.Union (x, y) -> out "("; txt_set x; out " union "; txt_set y; out ")" + | M.Intersect (x, y) -> out "("; txt_set x; out " intersect "; txt_set y; out ")" + | M.Diff (x, y) -> out "("; txt_set x; out " diff "; txt_set y; out ")" + | M.LetSVar (sv, x, y) -> out "let "; txt_svar out sv; out " be "; txt_set x; out " in "; txt_set y + | M.LetVVar (vv, x, y) -> out "let "; txt_vvar out vv; out " be "; txt_val x; out " in "; txt_set y + | M.Select (rv, x, y) -> out "select "; txt_rvar out rv; out " in "; txt_set x; out " where "; txt_boole y + | M.Pattern x -> out "pattern "; txt_val x + | M.Ref x -> out "ref "; txt_val x + | _ -> assert false in - txt_set x + txt_set x; out sep -let text_of_result x sep = +let text_of_result out x sep = let txt_attr = function - | (s, []) -> txt_qstr s - | (s, l) -> txt_qstr s ^ "=" ^ txt_list txt_qstr ", " l + | (p, []) -> txt_vvar out (fst p) + | (p, l) -> txt_vvar out (fst p); out " = "; txt_list out (txt_str out) ", " l in - let txt_group l = "{" ^ txt_list txt_attr "; " l ^ "}" in + let txt_group l = out "{"; txt_list out txt_attr "; " l; out "}" in let txt_res = function - | (s, []) -> txt_qstr s - | (s, l) -> txt_qstr s ^ " attr " ^ txt_list txt_group ", " l + | (s, []) -> txt_str out s + | (s, l) -> txt_str out s; out " attr "; txt_list out txt_group ", " l in - let txt_set l = txt_list txt_res ("; " ^ sep) l ^ sep in - txt_set x + let txt_set l = txt_list out txt_res ("; " ^ sep) l in + txt_set x; out sep let query_of_text lexbuf = MQueryTParser.query MQueryTLexer.query_token lexbuf