open Printf
module Constr = MetadataConstraints
+module PET = ProofEngineTypes
+
+ (** maps a shell like pattern (which uses '*' and '?') to a sql pattern for
+ * the "like" operator (which uses '%' and '_'). Does not support escaping. *)
+let sqlpat_of_shellglob =
+ let star_RE, qmark_RE, percent_RE, uscore_RE =
+ Pcre.regexp "\\*", Pcre.regexp "\\?", Pcre.regexp "%", Pcre.regexp "_"
+ in
+ fun shellglob ->
+ Pcre.replace ~rex:star_RE ~templ:"%"
+ (Pcre.replace ~rex:qmark_RE ~templ:"_"
+ (Pcre.replace ~rex:percent_RE ~templ:"\\%"
+ (Pcre.replace ~rex:uscore_RE ~templ:"\\_"
+ shellglob)))
let nonvar s =
let len = String.length s in
let suffix = String.sub s (len-4) 4 in
not (suffix = ".var")
-let locate ~(dbh:Dbi.connection) ?(vars = false) name =
+let locate ~(dbd:Mysql.dbd) ?(vars = false) pat =
+ let sql_pat = sqlpat_of_shellglob pat in
let query =
- dbh#prepare (sprintf "SELECT source FROM %s WHERE value = \"%s\""
- MetadataTypes.name_tbl name)
+ sprintf ("SELECT source FROM %s WHERE value LIKE \"%s\" UNION "^^
+ "SELECT source FROM %s WHERE value LIKE \"%s\"")
+ (MetadataTypes.name_tbl ()) sql_pat
+ MetadataTypes.library_name_tbl sql_pat
in
- query#execute [];
+ let result = Mysql.exec dbd query in
List.filter nonvar
- (List.map (function [`String s] -> s | _ -> assert false)
- (query#fetchall ()))
+ (Mysql.map result
+ (fun cols -> match cols.(0) with Some s -> s | _ -> assert false))
-let match_term ~(dbh:Dbi.connection) ty =
+let match_term ~(dbd:Mysql.dbd) ty =
let metadata = MetadataExtractor.compute ~body:None ~ty in
let constants_no =
MetadataConstraints.StringSet.cardinal (MetadataConstraints.constants_of ty)
in
let constraints = List.map MetadataTypes.constr_of_metadata metadata in
- Constr.at_least ~dbh ~full_card:(MetadataConstraints.Eq constants_no)
+ Constr.at_least ~dbd ~full_card:(MetadataConstraints.Eq constants_no)
constraints
let ( ** ) x y = int_of_float ((float_of_int x) ** (float_of_int y))
let inter = Constr.StringSet.inter set1 set2 in
List.filter (fun s -> Constr.StringSet.mem s inter) uris
-let filter_uris_forward ~dbh (main, constants) uris =
+let filter_uris_forward ~dbd (main, constants) uris =
let main_uris =
match main with
| None -> []
let full_signature =
List.fold_right Constr.StringSet.add main_uris constants
in
- List.filter (Constr.at_most ~dbh ~where:`Statement full_signature) uris
+ List.filter (Constr.at_most ~dbd ~where:`Statement full_signature) uris
-let filter_uris_backward ~dbh signature uris =
+let filter_uris_backward ~dbd ~facts signature uris =
let siguris =
- List.map snd (MetadataConstraints.sigmatch ~dbh ~where:`Statement signature)
+ List.map snd
+ (MetadataConstraints.sigmatch ~dbd ~facts ~where:`Statement signature)
in
- intersect uris siguris
+ intersect uris siguris
let compare_goal_list proof goal1 goal2 =
let _,metasenv,_,_ = proof in
let (_, ey1, ty1) = CicUtil.lookup_meta goal1 metasenv in
let (_, ey2, ty2) = CicUtil.lookup_meta goal2 metasenv in
- let ty_sort1 = CicTypeChecker.type_of_aux' metasenv ey1 ty1 in
- let ty_sort2 = CicTypeChecker.type_of_aux' metasenv ey2 ty2 in
+ let ty_sort1,_ =
+ CicTypeChecker.type_of_aux' metasenv ey1 ty1 CicUniv.empty_ugraph
+ in
+ let ty_sort2,_ =
+ CicTypeChecker.type_of_aux' metasenv ey2 ty2 CicUniv.empty_ugraph
+ in
let prop1 =
- if CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1 then 0
- else 1
+ let b,_ =
+ CicReduction.are_convertible
+ ey1 (Cic.Sort Cic.Prop) ty_sort1 CicUniv.empty_ugraph
+ in
+ if b then 0
+ else 1
in
let prop2 =
- if CicReduction.are_convertible ey2 (Cic.Sort Cic.Prop) ty_sort2 then 0
- else 1
+ let b,_ =
+ CicReduction.are_convertible
+ ey2 (Cic.Sort Cic.Prop) ty_sort2 CicUniv.empty_ugraph
+ in
+ if b then 0
+ else 1
in
prop1 - prop2
-let hint ~(dbh:Dbi.connection) ?signature ((proof, goal) as status) =
+let hint ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) =
let (_, metasenv, _, _) = proof in
let (_, context, ty) = CicUtil.lookup_meta goal metasenv in
let (uris, (main, sig_constants)) =
match signature with
- | Some signature -> (Constr.sigmatch ~dbh signature, signature)
- | None -> (Constr.cmatch' ~dbh ty, Constr.signature_of ty)
+ | Some signature -> (Constr.sigmatch ~dbd ~facts signature, signature)
+ | None -> (Constr.cmatch' ~dbd ~facts ty, Constr.signature_of ty)
in
let uris = List.filter nonvar (List.map snd uris) in
+ let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in
let types_constants =
match main with
| None -> Constr.StringSet.empty
let hyp_constants =
Constr.StringSet.diff (signature_of_hypothesis context) types_constants
in
+Constr.StringSet.iter prerr_endline hyp_constants;
let other_constants = Constr.StringSet.union sig_constants hyp_constants in
let uris =
let pow = 2 ** (Constr.StringSet.cardinal other_constants) in
if ((List.length uris < pow) or (pow <= 0))
then begin
prerr_endline "MetadataQuery: large sig, falling back to old method";
- filter_uris_forward ~dbh (main, other_constants) uris
+ filter_uris_forward ~dbd (main, other_constants) uris
end else
- filter_uris_backward ~dbh (main, other_constants) uris
+ filter_uris_backward ~dbd ~facts (main, other_constants) uris
in
let rec aux = function
| [] -> []
(let status' =
try
let (proof, goal_list) =
- ProofEngineTypes.apply_tactic
- (PrimitiveTactics.apply_tac ~term:(CicUtil.term_of_uri uri))
+(* prerr_endline ("STO APPLICANDO " ^ uri); *)
+ PET.apply_tactic
+ (PrimitiveTactics.apply_tac
+ ~term:(CicUtil.term_of_uri uri))
status
in
let goal_list =
match status' with
| None -> aux tl
| Some status' ->
- prerr_endline ("HO APPLICATO " ^ uri);
status' :: aux tl)
in
List.stable_sort
Pervasives.compare (List.length goals1) (List.length goals2))
(aux uris)
-let elim ~dbh uri =
+(* experimental_hint is a version of hint for experimental
+ purposes. It uses auto_tac_verbose instead of auto tac.
+ Auto_tac verbose also returns a substitution - for the moment
+ as a function from cic to cic, to be changed into an association
+ list in the future -. This substitution is used to build a
+ hash table of the inspected goals with their associated proofs.
+ The cose is a cut and paste of the previous one: at the end
+ of the experimentation we shall make a choice. *)
+
+let experimental_hint
+ ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) =
+ let (_, metasenv, _, _) = proof in
+ let (_, context, ty) = CicUtil.lookup_meta goal metasenv in
+ let (uris, (main, sig_constants)) =
+ match signature with
+ | Some signature ->
+ (Constr.sigmatch ~dbd ~facts signature, signature)
+ | None ->
+ (Constr.cmatch' ~dbd ~facts ty, Constr.signature_of ty)
+ in
+ let uris = List.filter nonvar (List.map snd uris) in
+ let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in
+ let types_constants =
+ match main with
+ | None -> Constr.StringSet.empty
+ | Some (main, types) ->
+ List.fold_right Constr.StringSet.add (main :: types)
+ Constr.StringSet.empty
+ in
+ let hyp_constants =
+ Constr.StringSet.diff (signature_of_hypothesis context) types_constants
+ in
+Constr.StringSet.iter prerr_endline hyp_constants;
+ let other_constants = Constr.StringSet.union sig_constants hyp_constants in
+ let uris =
+ let pow = 2 ** (Constr.StringSet.cardinal other_constants) in
+ if ((List.length uris < pow) or (pow <= 0))
+ then begin
+ prerr_endline "MetadataQuery: large sig, falling back to old method";
+ filter_uris_forward ~dbd (main, other_constants) uris
+ end else
+ filter_uris_backward ~dbd ~facts (main, other_constants) uris
+ in
+ let rec aux = function
+ | [] -> []
+ | uri :: tl ->
+ (let status' =
+ try
+ let (subst,(proof, goal_list)) =
+ (* prerr_endline ("STO APPLICANDO" ^ uri); *)
+ PrimitiveTactics.apply_tac_verbose
+ ~term:(CicUtil.term_of_uri uri)
+ status
+ in
+ let goal_list =
+ List.stable_sort (compare_goal_list proof) goal_list
+ in
+ Some (uri, (subst,(proof, goal_list)))
+ with ProofEngineTypes.Fail _ -> None
+ in
+ match status' with
+ | None -> aux tl
+ | Some status' -> status' :: aux tl)
+ in
+ List.stable_sort
+ (fun (_,(_, (_, goals1))) (_,(_, (_, goals2))) ->
+ Pervasives.compare (List.length goals1) (List.length goals2))
+ (aux uris)
+
+let elim ~dbd uri =
let constraints =
[`Rel [`MainConclusion None];
`Sort (Cic.Prop,[`MainHypothesis (Some 1)]);
`Obj (uri,[`InHypothesis]);
]
in
- MetadataConstraints.at_least ~dbh constraints
+ MetadataConstraints.at_least ~dbd constraints
projects / helm.git / blobdiff