From: Claudio Sacerdoti Coen Date: Fri, 6 Dec 2002 13:17:13 +0000 (+0000) Subject: 1. depth constraints for Rels and Sorts are now optional X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=a7e6ed7d50bc19be218b00f833b8839d00fca666;p=helm.git 1. depth constraints for Rels and Sorts are now optional 2. "can" constraints renamed to "only" constraints 3. several bug fixes: * the order of arguments for Sub in the second phase of the query was wrong * some identifiers in the generated query were unbound --- diff --git a/helm/gTopLevel/mQueryGenerator.ml b/helm/gTopLevel/mQueryGenerator.ml index 88a50c41d..6736bc8e0 100644 --- a/helm/gTopLevel/mQueryGenerator.ml +++ b/helm/gTopLevel/mQueryGenerator.ml @@ -39,23 +39,16 @@ type uri = string type position = string -type depth = int +type depth = int option type sort = string -type r_obj = (uri * position * depth option) +type r_obj = (uri * position * depth) type r_rel = (position* depth) type r_sort = (position* depth * sort) type must_restrictions = (r_obj list * r_rel list * r_sort list) -type can_restrictions = (r_obj list option * r_rel list option * r_sort list option) - - - - - - - - +type only_restrictions = + (r_obj list option * r_rel list option * r_sort list option) exception Discard @@ -122,41 +115,157 @@ let searchPattern must_use can_use = let module M = MathQL in let in_path s = (s, []) in let assign v p = (in_path v, in_path p) in + +(* can restrictions *) + + let (cr_o,cr_r,cr_s) = can_use in + + let uri_of_entry (r, p, d) = r in + + let universe = + match cr_o with + None -> [] + | Some cr_o -> List.map uri_of_entry cr_o + in + + let tfst (a,b,c) = a in + let tsnd (a,b,c) = b in + let trd (a,b,c) = c in + + let to_int_list l d = + match d with + None -> l + | Some d -> l@[d] + in + + let opos = + match cr_o with + None -> [] + | Some cr_o -> (List.map tsnd cr_o) in + + let odep = + match cr_o with + None -> [] + | Some cr_o -> let odep_option_list = List.map trd cr_o in + let lo_dep_int = List.fold_left to_int_list [] odep_option_list in + List.map string_of_int lo_dep_int + in + + let rpos = + match cr_r with + None -> [] + | Some cr_r -> (List.map fst cr_r) in + + let rdep = + match cr_r with + None -> [] + | Some cr_r -> let rdep_option_list = List.map snd cr_r in + let lr_dep_int = List.fold_left to_int_list [] rdep_option_list in + List.map string_of_int lr_dep_int + in + + + let spos = + match cr_s with + None -> [] + | Some cr_s -> (List.map tfst cr_s) in + + + let sdep = + match cr_s with + None -> [] + | Some cr_s -> let sdep_option_list = List.map tsnd cr_s in + let ls_dep_int = List.fold_left to_int_list [] sdep_option_list in + List.map string_of_int ls_dep_int + in + + let sor = + match cr_s with + None -> [] + | Some cr_s -> List.map trd cr_s in + + let q_where_obj = function Some l -> - M.Sub - (M.RefOf + if odep = [] then + M.Sub + (M.RefOf (M.Select - ("uri", - M.Relation - (false, M.RefineExact, in_path "refObj", - M.Ref (M.RefOf (M.RVar "uri0")), - [assign "pos" "position"]), - M.Ex ["uri"] - (M.Meet (M.VVar "obj_positions", M.Record ("uri", in_path "pos"))) - ) - ), - M.VVar "universe" - ) + ("uri", + M.Relation (false, M.RefineExact, in_path "refObj", M.Ref (M.RefOf (M.RVar "uri0")), [assign "pos" "position"]), + M.Ex ["uri"] + (M.Meet (M.VVar "obj_positions", M.Record ("uri", in_path "pos"))))), + M.VVar "universe") + else + M.Sub + (M.RefOf + (M.Select + ("uri", + M.Relation + (false, M.RefineExact, in_path "refObj", + M.Ref (M.RefOf (M.RVar "uri0")), + [assign "p" "position"; assign "d" "depth"] + ), + M.Ex ["uri"] + (M.And + ((M.Meet(M.VVar "obj_positions",M.Record("uri",in_path "p"))), + (M.Meet(M.VVar "obj_depths", M.Record("uri",in_path "d"))))) + ) + ), + M.VVar "universe" + ) + | None -> M.True in let q_where_rel = function Some l -> - M.And - (M.Sub(M.VVar "rel_positions", M.Property(false, M.RefineExact, ("refRel", ["position"]), M.RefOf(M.RVar "uri0"))), - M.Sub(M.VVar "rel_depths", M.Property(false, M.RefineExact, ("refRel", ["depth"]), M.RefOf(M.RVar "uri0")))) + let q0 = + M.Sub + (M.Property + (false, M.RefineExact, ("refRel", ["position"]), + M.RefOf(M.RVar "uri0")), + M.VVar "rel_positions") + in + if rdep = [] then q0 + else + M.And + (q0, + M.Sub + (M.Property + (false, M.RefineExact, ("refRel", ["depth"]), + M.RefOf(M.RVar "uri0")), + M.VVar "rel_depths")) | None -> M.True in let q_where_sort = function Some l -> - M.And - (M.And - (M.Sub(M.VVar "sort_positions", M.Property(false, M.RefineExact, ("refSort", ["position"]), M.RefOf(M.RVar "uri0"))), - M.Sub(M.VVar "sort_depths", M.Property(false, M.RefineExact, ("refSort", ["depth"]), M.RefOf(M.RVar "uri0")))), - M.Sub(M.VVar "sorts", M.Property(false, M.RefineExact, ("refSort", ["sort"]), M.RefOf(M.RVar "uri0")))) + let q0 = + M.And + (M.Sub + (M.Property + (false, M.RefineExact, ("refSort", ["position"]), + M.RefOf(M.RVar "uri0") + ), + M.VVar "sort_positions"), + M.Sub + (M.Property + (false, M.RefineExact, ("refSort", ["sort"]), + M.RefOf(M.RVar "uri0")), + M.VVar "sorts")) + in + if sdep = [] then + q0 + else + M.And + (q0, + M.Sub + (M.VVar "sort_depths", + M.Property + (false, M.RefineExact, ("refSort", ["depth"]), + M.RefOf(M.RVar "uri0")))) | None -> M.True in @@ -165,8 +274,8 @@ let searchPattern must_use can_use = M.And(M.And(q_where_obj cr_o, q_where_rel cr_r), q_where_sort cr_s) in - - let uri_of_entry (r, p, d) = r in + +(* must restrictions *) let build_select_obj (r, pos, dep) = match dep with @@ -187,26 +296,43 @@ let searchPattern must_use can_use = (M.Sub (M.Const [string_dep], M.Record ("uri", in_path "d")))))) in - let build_select_rel (pos, dep) = - M.Select - ("uri", - M.Relation (true, M.RefineExact, ("refRel", []), M.Ref (M.Const [""]), [assign "p" "position";assign "d" "depth"]), - M.Ex ["uri"] - (M.And - ((M.Sub (M.Const [pos], M.Record ("uri", in_path "p"))), - (M.Sub (M.Const [dep], M.Record ("uri", in_path "d")))))) + let build_select_rel (pos, dep) = + match dep with + None -> M.Select + ("uri", + M.Relation (true, M.RefineExact, ("refRel", []), M.Ref (M.Const [""]), [assign "p" "position";assign "d" "depth"]), + M.Ex ["uri"] + (M.Sub (M.Const [pos], M.Record ("uri", in_path "p")))) + | Some dep -> let string_dep = string_of_int dep in + M.Select + ("uri", + M.Relation (true, M.RefineExact, ("refRel", []), M.Ref (M.Const [""]), [assign "p" "position";assign "d" "depth"]), + M.Ex ["uri"] + (M.And + ((M.Sub (M.Const [pos], M.Record ("uri", in_path "p"))), + (M.Sub (M.Const [string_dep], M.Record ("uri", in_path "d")))))) in - let build_select_sort (pos, dep, sor) = - M.Select - ("uri", - M.Relation (true, M.RefineExact, ("refSort", []), M.Ref (M.Const [""]), [assign "p" "position";assign "d" "depth";assign "s" "sort"]), - M.Ex ["uri"] - (M.And - ((M.And - ((M.Sub (M.Const [pos], M.Record ("uri", in_path "p"))), - (M.Sub (M.Const [dep], M.Record ("uri", in_path "d"))))), - (M.Sub (M.Const [sor], M.Record ("uri", in_path "s")))))) + let build_select_sort (pos, dep, sor) = + match dep with + None -> M.Select + ("uri", + M.Relation (true, M.RefineExact, ("refSort", []), M.Ref (M.Const [""]), [assign "p" "position";assign "d" "depth";assign "s" "sort"]), + M.Ex ["uri"] + (M.And + ((M.Sub (M.Const [pos], M.Record ("uri", in_path "p"))), + (M.Sub (M.Const [sor], M.Record ("uri", in_path "s")))))) + + | Some dep -> let string_dep = string_of_int dep in + M.Select + ("uri", + M.Relation (true, M.RefineExact, ("refSort", []), M.Ref (M.Const [""]), [assign "p" "position";assign "d" "depth";assign "s" "sort"]), + M.Ex ["uri"] + (M.And + ((M.And + ((M.Sub (M.Const [pos], M.Record ("uri", in_path "p"))), + (M.Sub (M.Const [string_dep], M.Record ("uri", in_path "d"))))), + (M.Sub (M.Const [sor], M.Record ("uri", in_path "s")))))) in let rec build_intersect_obj = function @@ -227,114 +353,54 @@ let searchPattern must_use can_use = | hd :: tl -> M.Intersect (build_select_sort hd, build_intersect_sort tl) in - let build_intersect must = - let tostring_sort (a,b,c) = + let build_intersect = function +(* let tostring_sort (a,b,c) = let b1 = string_of_int b in (a,b1,c) in let tostring_rel (a,b) = let b1 = string_of_int b in (a,b1) - in - - let (l1,l2,l3) = must in - match (l1,l2,l3) with + in*) + +(* let (l1,l2,l3) = must in + match (l1,l2,l3) with *) l1,[],[] -> build_intersect_obj l1 - | [],l2,[] -> let lrel = List.map tostring_rel l2 in - build_intersect_rel lrel - | [],[],l3 -> let lsort = List.map tostring_sort l3 in - build_intersect_sort lsort - | l1,l2,[] -> let lrel = List.map tostring_rel l2 in - M.Intersect (build_intersect_obj l1, build_intersect_rel lrel) - | l1,[],l3 -> let lsort = List.map tostring_sort l3 in - M.Intersect (build_intersect_obj l1, build_intersect_sort lsort) - | [],l2,l3 -> let lrel = List.map tostring_rel l2 in - let lsort = List.map tostring_sort l3 in - M.Intersect (build_intersect_rel lrel, build_intersect_sort lsort) - | _ -> let lrel = List.map tostring_rel l2 in - let lsort = List.map tostring_sort l3 in - M.Intersect (M.Intersect (build_intersect_obj l1, build_intersect_rel lrel), build_intersect_sort lsort) + | [],l2,[] -> (*let lrel = List.map tostring_rel l2 in*) + build_intersect_rel l2 + | [],[],l3 ->(* let lsort = List.map tostring_sort l3 in*) + build_intersect_sort l3 + | l1,l2,[] -> (*let lrel = List.map tostring_rel l2 in*) + M.Intersect (build_intersect_obj l1, build_intersect_rel l2) + | l1,[],l3 ->(* let lsort = List.map tostring_sort l3 in *) + M.Intersect (build_intersect_obj l1, build_intersect_sort l3) + | [],l2,l3 ->(* let lrel = List.map tostring_rel l2 in + let lsort = List.map tostring_sort l3 in*) + M.Intersect (build_intersect_rel l2, build_intersect_sort l3) + | l1,l2,l3 ->(* let lrel = List.map tostring_rel l2 in + let lsort = List.map tostring_sort l3 in *) + M.Intersect (M.Intersect (build_intersect_obj l1, build_intersect_rel l2), build_intersect_sort l3) in - + let q_in = build_intersect must_use in let q_select = M.Select ("uri0", q_in, q_where can_use) in - - let (cr_o,cr_r,cr_s) = can_use in - - let universe = - match cr_o with - None -> M.Const [] - | Some cr_o -> M.Const (List.map uri_of_entry cr_o) - in - - let tfst (a,b,c) = a in - let tsnd (a,b,c) = b in - let trd (a,b,c) = c in - - let opos = - match cr_o with - None -> M.Const [] - | Some cr_o -> M.Const (List.map tsnd cr_o) in - - let odep = - match cr_o with - None -> M.Const [] - | Some cr_o -> let lofc = List.map trd cr_o in - let f l c = - match c with - None -> l - | Some c -> l@[c] - in - let lof_dep_int = List.fold_left f [] lofc in - M.Const(List.map string_of_int lof_dep_int) - in - - let rpos = - match cr_r with - None -> M.Const [] - | Some cr_r -> M.Const (List.map fst cr_r) in - - let rdep = - match cr_r with - None -> M.Const [] - | Some cr_r -> let rdep_int = List.map snd cr_r in - M.Const (List.map string_of_int rdep_int) - in - - let spos = - match cr_s with - None -> M.Const [] - | Some cr_s -> M.Const (List.map tfst cr_s) in - - - let sdep = - match cr_s with - None -> M.Const [] - | Some cr_s -> let sdep_int = List.map tsnd cr_s in - M.Const (List.map string_of_int sdep_int) - in - - - let sor = - match cr_s with - None -> M.Const[] - | Some cr_s -> M.Const (List.map trd cr_s) in - - let q_let_u = M.LetVVar ("universe", universe, q_select) in +(* variables for can restrictions *) + + let q_let_u = M.LetVVar ("universe", M.Const universe, q_select) in - let q_let_s = M.LetVVar ("sorts", sor, q_let_u) in + let q_let_s = M.LetVVar ("sorts", M.Const sor, q_let_u) in - let q_let_ds = M.LetVVar ("sort_depths", sdep, q_let_s) in + let q_let_ds = M.LetVVar ("sort_depths", M.Const sdep, q_let_s) in - let q_let_dr = M.LetVVar ("rel_depths", rdep, q_let_ds) in + let q_let_dr = M.LetVVar ("rel_depths", M.Const rdep, q_let_ds) in - let q_let_do = M.LetVVar ("obj_depths", odep, q_let_dr) in + let q_let_do = M.LetVVar ("obj_depths", M.Const odep, q_let_dr) in - let q_let_ps = M.LetVVar ("sort_positions", spos, q_let_do) in + let q_let_ps = M.LetVVar ("sort_positions", M.Const spos, q_let_do) in - let q_let_pr = M.LetVVar ("rel_positions", rpos, q_let_ps) in + let q_let_pr = M.LetVVar ("rel_positions", M.Const rpos, q_let_ps) in - let q_let_po = M.LetVVar ("obj_positions", opos, q_let_pr) in + let q_let_po = M.LetVVar ("obj_positions", M.Const opos, q_let_pr) in print_endline ("### " ^ MQueryUtil.text_of_query q_let_po) ; flush stdout; execute_query q_let_po diff --git a/helm/gTopLevel/mQueryGenerator.mli b/helm/gTopLevel/mQueryGenerator.mli index e6b98c2ea..b1db11142 100644 --- a/helm/gTopLevel/mQueryGenerator.mli +++ b/helm/gTopLevel/mQueryGenerator.mli @@ -37,20 +37,16 @@ exception Discard type uri = string type position = string -type depth = int +type depth = int option type sort = string -type r_obj = (uri * position * depth option) +type r_obj = (uri * position * depth) type r_rel = (position * depth) type r_sort = (position * depth * sort) -(* -type r_obj = (string * string * int option) -type r_rel = (string * int) -type r_sort = (string * int * string) -*) type must_restrictions = (r_obj list * r_rel list * r_sort list) -type can_restrictions = (r_obj list option * r_rel list option * r_sort list option) +type only_restrictions = + (r_obj list option * r_rel list option * r_sort list option) @@ -63,6 +59,6 @@ val execute_query : MathQL.query -> MathQL.result val locate : string -> MathQL.result -val searchPattern : must_restrictions -> can_restrictions -> MathQL.result +val searchPattern : must_restrictions -> only_restrictions -> MathQL.result val get_query_info : unit -> string list