X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fauto.ml;h=09156224ec280e4d149486521af62895e52b9587;hb=89be8e257ea6a9b7e30a595c8294e0972d165a72;hp=6f293ff4a8b56e298d262c5c4a8ff68032f314d8;hpb=c6cc2a7227d6750076f591a62d7b1896ebf1ebfa;p=helm.git diff --git a/helm/software/components/tactics/auto.ml b/helm/software/components/tactics/auto.ml index 6f293ff4a..09156224e 100644 --- a/helm/software/components/tactics/auto.ml +++ b/helm/software/components/tactics/auto.ml @@ -26,16 +26,27 @@ open AutoTypes;; open AutoCache;; -let debug = true;; +let debug = false;; let debug_print s = if debug then prerr_endline (Lazy.force s);; + +let is_propositional context sort = + match CicReduction.whd context sort with + | Cic.Sort Cic.Prop + | Cic.Sort (Cic.CProp _) -> true + | _-> false +;; + + +type auto_params = Cic.term list * (string * string) list + let elems = ref [] ;; (* closing a term w.r.t. its metavariables - very naif version: it does not take dependencies into account *) + very naif version: it does not take dependencies properly into account *) -let naif_closure t metasenv context = +let naif_closure ?(prefix_name="xxx_") t metasenv context = let metasenv = ProofEngineHelpers.sort_metasenv metasenv in let n = List.length metasenv in let what = List.map (fun (i,cc,ty) -> Cic.Meta(i,[])) metasenv in @@ -56,12 +67,22 @@ let naif_closure t metasenv context = let _, t = List.fold_left (fun (n,t) (_,cc,ty) -> - n-1, Cic.Lambda(Cic.Name ("x_"^string_of_int n), + n-1, Cic.Lambda(Cic.Name (prefix_name^string_of_int n), CicSubstitution.lift n ty,t)) (n-1,body) metasenv in t ;; + +let lambda_close ?prefix_name t menv ctx = + let t = naif_closure ?prefix_name t menv ctx in + List.fold_left + (fun (t,i) -> function + | None -> CicSubstitution.subst (Cic.Implicit None) t,i (* delift *) + | Some (name, Cic.Decl ty) -> Cic.Lambda (name, ty, t),i+1 + | Some (name, Cic.Def (bo, ty)) -> Cic.LetIn (name, bo, ty, t),i+1) + (t,List.length menv) ctx +;; (* functions for retrieving theorems *) @@ -78,7 +99,7 @@ let find_library_theorems dbd proof goal = let terms = List.map CicUtil.term_of_uri univ in List.map (fun t -> - (t,fst(CicTypeChecker.type_of_aux' [] [] t CicUniv.empty_ugraph))) + (t,fst(CicTypeChecker.type_of_aux' [] [] t CicUniv.oblivion_ugraph))) terms let find_context_theorems context metasenv = @@ -88,16 +109,9 @@ let find_context_theorems context metasenv = match ctxentry with | Some (_,Cic.Decl t) -> (Cic.Rel i, CicSubstitution.lift i t)::res,i+1 - | Some (_,Cic.Def (_,Some t)) -> + | Some (_,Cic.Def (_,t)) -> (Cic.Rel i, CicSubstitution.lift i t)::res,i+1 - | Some (_,Cic.Def (_,None)) -> - let t = Cic.Rel i in - let ty,_ = - CicTypeChecker.type_of_aux' - metasenv context t CicUniv.empty_ugraph - in - (t,ty)::res,i+1 - | _ -> res,i+1) + | None -> res,i+1) ([],1) context in l @@ -114,6 +128,15 @@ let partition_equalities = let default_auto maxm _ _ cache _ _ _ _ = [],cache,maxm ;; +(* giusto per provare che succede +let is_unit_equation context metasenv oldnewmeta term = + let head, metasenv, args, newmeta = + TermUtil.saturate_term oldnewmeta metasenv context term 0 + in + let newmetas = + List.filter (fun (i,_,_) -> i >= oldnewmeta) metasenv + in + Some (args,metasenv,newmetas,head,newmeta) *) let is_unit_equation context metasenv oldnewmeta term = let head, metasenv, args, newmeta = @@ -126,23 +149,22 @@ let is_unit_equation context metasenv oldnewmeta term = let _,_,mt = CicUtil.lookup_meta i metasenv in let sort,u = CicTypeChecker.type_of_aux' metasenv context mt - CicUniv.empty_ugraph - in - let b, _ = - CicReduction.are_convertible ~metasenv context - sort (Cic.Sort Cic.Prop) u + CicUniv.oblivion_ugraph in - if b then Some i else None + if is_propositional context sort then Some i else None | _ -> assert false) args in if propositional_args = [] then - let newmetas = List.filter (fun (i,_,_) -> i >= oldnewmeta) metasenv in + let newmetas = + List.filter (fun (i,_,_) -> i >= oldnewmeta) metasenv + in Some (args,metasenv,newmetas,head,newmeta) else None ;; -let get_candidates universe cache t = +let get_candidates skip_trie_filtering universe cache t = + let t = if skip_trie_filtering then Cic.Meta(0,[]) else t in let candidates= (Universe.get_candidates universe t)@(AutoCache.get_candidates cache t) in @@ -153,19 +175,23 @@ let get_candidates universe cache t = candidates ;; -let only signature context t = +let only signature context metasenv t = try - let ty,_ = CicTypeChecker.type_of_aux' [] context t CicUniv.empty_ugraph in + let ty,_ = + CicTypeChecker.type_of_aux' metasenv context t CicUniv.oblivion_ugraph + in let consts = MetadataConstraints.constants_of ty in let b = MetadataConstraints.UriManagerSet.subset consts signature in - if b then b + if b then (prerr_endline ("keeping " ^ (CicPp.ppterm t)); b) else - try - let ty' = unfold context ty in - let consts' = MetadataConstraints.constants_of ty' in - MetadataConstraints.UriManagerSet.subset consts' signature - with _-> false - with _ -> false + let ty' = unfold context ty in + let consts' = MetadataConstraints.constants_of ty' in + let b = MetadataConstraints.UriManagerSet.subset consts' signature in + if not b then prerr_endline ("filtering " ^ (CicPp.ppterm t)) + else prerr_endline ("keeping " ^ (CicPp.ppterm t)); b + with + | CicTypeChecker.TypeCheckerFailure _ -> assert false + | ProofEngineTypes.Fail _ -> false (* unfold may fail *) ;; let not_default_eq_term t = @@ -174,19 +200,20 @@ let not_default_eq_term t = not (LibraryObjects.in_eq_URIs uri) with Invalid_argument _ -> true -let retrieve_equations signature universe cache context= +let retrieve_equations dont_filter signature universe cache context metasenv = match LibraryObjects.eq_URI() with | None -> [] | Some eq_uri -> let eq_uri = UriManager.strip_xpointer eq_uri in let fake= Cic.Meta(-1,[]) in let fake_eq = Cic.Appl [Cic.MutInd (eq_uri,0, []);fake;fake;fake] in - let candidates = get_candidates universe cache fake_eq in - (* defaults eq uris are built-in in auto *) - let candidates = List.filter not_default_eq_term candidates in - let candidates = List.filter (only signature context) candidates in - List.iter (fun t -> debug_print (lazy (CicPp.ppterm t))) candidates; - candidates + let candidates = get_candidates false universe cache fake_eq in + if dont_filter then candidates + else let eq_uri = UriManager.uri_of_uriref eq_uri 0 None in + (* let candidates = List.filter not_default_eq_term candidates in *) + List.filter + (only (MetadataConstraints.UriManagerSet.add eq_uri signature) + context metasenv) candidates let build_equality bag head args proof newmetas maxmeta = match head with @@ -208,6 +235,14 @@ let build_equality bag head args proof newmetas maxmeta = let partition_unit_equalities context metasenv newmeta bag equations = List.fold_left (fun (units,other,maxmeta)(t,ty) -> + if not (CicUtil.is_meta_closed t && CicUtil.is_meta_closed ty) then + let _ = + HLog.warn + ("Skipping " ^ CicMetaSubst.ppterm_in_context ~metasenv [] t context + ^ " since it is not meta closed") + in + units,(t,ty)::other,maxmeta + else match is_unit_equation context metasenv maxmeta ty with | Some (args,metasenv,newmetas,head,newmeta') -> let maxmeta,equality = @@ -222,50 +257,59 @@ let empty_tables = Saturation.make_passive [], Equality.mk_equality_bag) -let init_cache_and_tables dbd use_library paramod universe (proof, goal) = + +let init_cache_and_tables + ?dbd use_library paramod use_context dont_filter universe (proof, goal) += (* the local cache in initially empty *) let cache = AutoCache.cache_empty in let _, metasenv, _subst,_, _, _ = proof in let signature = MetadataQuery.signature_of metasenv goal in let newmeta = CicMkImplicit.new_meta metasenv [] in let _,context,_ = CicUtil.lookup_meta goal metasenv in - let ct = find_context_theorems context metasenv in + let ct = if use_context then find_context_theorems context metasenv else [] in debug_print (lazy ("ho trovato nel contesto " ^ (string_of_int (List.length ct)))); let lt = - if use_library then - find_library_theorems dbd metasenv goal - else [] in + match use_library, dbd with + | true, Some dbd -> find_library_theorems dbd metasenv goal + | _ -> [] + in debug_print (lazy ("ho trovato nella libreria " ^ (string_of_int (List.length lt)))); let cache = cache_add_list cache context (ct@lt) in let equations = - retrieve_equations signature universe cache context in + retrieve_equations dont_filter (* true *) signature universe cache context metasenv + in debug_print (lazy ("ho trovato equazioni n. "^(string_of_int (List.length equations)))); let eqs_and_types = HExtlib.filter_map (fun t -> let ty,_ = - CicTypeChecker.type_of_aux' metasenv context t CicUniv.empty_ugraph in - (* retrieve_equations could also return flexible terms *) - if is_an_equality ty then Some(t,ty) - else - try - let ty' = unfold context ty in - if is_an_equality ty' then Some(t,ty') else None - with _ -> None) (* catturare l'eccezione giusta di unfold *) - equations in + CicTypeChecker.type_of_aux' + metasenv context t CicUniv.oblivion_ugraph + in + (* retrieve_equations could also return flexible terms *) + if is_an_equality ty then Some(t,ty) + else + try + let ty' = unfold context ty in + if is_an_equality ty' then Some(t,ty') else None + with ProofEngineTypes.Fail _ -> None) + equations + in let bag = Equality.mk_equality_bag () in let units, other_equalities, newmeta = - partition_unit_equalities context metasenv newmeta bag eqs_and_types in - (* let env = (metasenv, context, CicUniv.empty_ugraph) in - let equalities = - let eq_uri = - match LibraryObjects.eq_URI() with - | None ->assert false - | Some eq_uri -> eq_uri in - Saturation.simplify_equalities bag eq_uri env units in *) + partition_unit_equalities context metasenv newmeta bag eqs_and_types + in + (* SIMPLIFICATION STEP + let equalities = + let env = (metasenv, context, CicUniv.oblivion_ugraph) in + let eq_uri = HExtlib.unopt (LibraryObjects.eq_URI()) in + Saturation.simplify_equalities bag eq_uri env units + in + *) let passive = Saturation.make_passive units in let no = List.length units in let active = Saturation.make_active [] in @@ -288,13 +332,9 @@ let fill_hypothesis context metasenv oldnewmeta term tables (universe:Universe.u let _,_,mt = CicUtil.lookup_meta i metasenv in let sort,u = CicTypeChecker.type_of_aux' metasenv context mt - CicUniv.empty_ugraph + CicUniv.oblivion_ugraph in - let b, _ = - CicReduction.are_convertible ~metasenv context - sort (Cic.Sort Cic.Prop) u - in - if b then Some i else None + if is_propositional context sort then Some i else None | _ -> assert false) args in @@ -370,12 +410,15 @@ let close_more tables maxmeta context status auto universe cache = let proof, goalno = status in let _, metasenv,_subst,_,_, _ = proof in let signature = MetadataQuery.signature_of metasenv goalno in - let equations = retrieve_equations signature universe cache context in + let equations = + retrieve_equations false signature universe cache context metasenv + in let eqs_and_types = HExtlib.filter_map (fun t -> let ty,_ = - CicTypeChecker.type_of_aux' metasenv context t CicUniv.empty_ugraph in + CicTypeChecker.type_of_aux' metasenv context t + CicUniv.oblivion_ugraph in (* retrieve_equations could also return flexible terms *) if is_an_equality ty then Some(t,ty) else None) equations in @@ -456,6 +499,84 @@ let find_context_equalities indexes, equalities, maxm, cache ;; +(********** PARAMETERS PASSING ***************) + +let bool params name default = + try + let s = List.assoc name params in + if s = "" || s = "1" || s = "true" || s = "yes" || s = "on" then true + else if s = "0" || s = "false" || s = "no" || s= "off" then false + else + let msg = "Unrecognized value for parameter "^name^"\n" in + let msg = msg^"Accepted values are 1,true,yes,on and 0,false,no,off" in + raise (ProofEngineTypes.Fail (lazy msg)) + with Not_found -> default +;; + +let string params name default = + try List.assoc name params with + | Not_found -> default +;; + +let int params name default = + try int_of_string (List.assoc name params) with + | Not_found -> default + | Failure _ -> + raise (ProofEngineTypes.Fail (lazy (name ^ " must be an integer"))) +;; + +let flags_of_params params ?(for_applyS=false) () = + let int = int params in + let bool = bool params in + let close_more = bool "close_more" false in + let use_paramod = bool "use_paramod" true in + let skip_trie_filtering = bool "skip_trie_filtering" false in + let skip_context = bool "skip_context" false in + let use_only_paramod = + if for_applyS then true else bool "paramodulation" false in + let use_library = bool "library" + ((AutoTypes.default_flags()).AutoTypes.use_library) in + let depth = int "depth" ((AutoTypes.default_flags()).AutoTypes.maxdepth) in + let width = int "width" ((AutoTypes.default_flags()).AutoTypes.maxwidth) in + let size = int "size" ((AutoTypes.default_flags()).AutoTypes.maxsize) in + let gsize = int "gsize" ((AutoTypes.default_flags()).AutoTypes.maxgoalsizefactor) in + let do_type = bool "type" false in + let timeout = int "timeout" 0 in + { AutoTypes.maxdepth = + if use_only_paramod then 2 else depth; + AutoTypes.maxwidth = width; + AutoTypes.maxsize = size; + AutoTypes.timeout = + if timeout = 0 then + if for_applyS then Unix.gettimeofday () +. 30.0 + else + infinity + else + Unix.gettimeofday() +. (float_of_int timeout); + AutoTypes.use_library = use_library; + AutoTypes.use_paramod = use_paramod; + AutoTypes.use_only_paramod = use_only_paramod; + AutoTypes.close_more = close_more; + AutoTypes.dont_cache_failures = false; + AutoTypes.maxgoalsizefactor = gsize; + AutoTypes.do_types = do_type; + AutoTypes.skip_trie_filtering = skip_trie_filtering; + AutoTypes.skip_context = skip_context; + } + +let universe_of_params metasenv context universe tl = + if tl = [] then universe else + let tys = + List.map + (fun term -> + fst (CicTypeChecker.type_of_aux' metasenv context term + CicUniv.oblivion_ugraph)) + tl + in + Universe.index_list Universe.empty context (List.combine tl tys) +;; + + (***************** applyS *******************) let new_metasenv_and_unify_and_t @@ -492,20 +613,23 @@ let new_metasenv_and_unify_and_t (proof'',goal) in let goal = match goals with [g] -> g | _ -> assert false in - let subst, (proof'''', _), _ = - PrimitiveTactics.apply_with_subst ~term:term'' ~subst:[] (proof''',goal) + let proof'''', _ = + ProofEngineTypes.apply_tactic + (PrimitiveTactics.apply_tac term'') + (proof''',goal) in match let (active, passive,bag), cache, maxmeta = - init_cache_and_tables dbd flags.use_library true universe (proof'''',newmeta) + init_cache_and_tables ~dbd flags.use_library true true false universe + (proof'''',newmeta) in Saturation.given_clause bag maxmeta (proof'''',newmeta) active passive max_int max_int flags.timeout with | None, _,_,_ -> raise (ProofEngineTypes.Fail (lazy ("FIXME: propaga le tabelle"))) - | Some (_,proof''''',_), active,passive,_ -> - subst,proof''''', + | Some (_,proof''''',_), active,passive,_ -> + proof''''', ProofEngineHelpers.compare_metasenvs ~oldmetasenv ~newmetasenv:(let _,m,_subst,_,_, _ = proof''''' in m), active, passive ;; @@ -515,12 +639,16 @@ let rec count_prods context ty = Cic.Prod (n,s,t) -> 1 + count_prods (Some (n,Cic.Decl s)::context) t | _ -> 0 -let apply_smart ~dbd ~term ~subst ~universe ?tables flags (proof, goal) = +let apply_smart + ~dbd ~term ~subst ~universe ?tables ~params:(univ,params) (proof, goal) += let module T = CicTypeChecker in let module R = CicReduction in let module C = Cic in let (_,metasenv,_subst,_,_, _) = proof in let metano,context,ty = CicUtil.lookup_meta goal metasenv in + let flags = flags_of_params params ~for_applyS:true () in + let universe = universe_of_params metasenv context universe univ in let newmeta = CicMkImplicit.new_meta metasenv subst in let exp_named_subst_diff,newmeta',newmetasenvfragment,term' = match term with @@ -556,49 +684,55 @@ let apply_smart ~dbd ~term ~subst ~universe ?tables flags (proof, goal) = in let metasenv' = metasenv@newmetasenvfragment in let termty,_ = - CicTypeChecker.type_of_aux' metasenv' context term' CicUniv.empty_ugraph + CicTypeChecker.type_of_aux' metasenv' context term' CicUniv.oblivion_ugraph in let termty = CicSubstitution.subst_vars exp_named_subst_diff termty in let goal_arity = count_prods context ty in - let subst, proof, gl, active, passive = + let proof, gl, active, passive = new_metasenv_and_unify_and_t dbd flags universe proof goal ?tables newmeta' metasenv' context term' ty termty goal_arity in - subst, proof, gl, active, passive + proof, gl, active, passive ;; (****************** AUTO ********************) let mk_irl ctx = CicMkImplicit.identity_relocation_list_for_metavariable ctx;; -let ugraph = CicUniv.empty_ugraph;; +let ugraph = CicUniv.oblivion_ugraph;; let typeof = CicTypeChecker.type_of_aux';; let ppterm ctx t = let names = List.map (function None -> None | Some (x,_) -> Some x) ctx in CicPp.pp t names ;; let is_in_prop context subst metasenv ty = - let sort,u = typeof ~subst metasenv context ty CicUniv.empty_ugraph in - fst (CicReduction.are_convertible context sort (Cic.Sort Cic.Prop) u) + let sort,u = typeof ~subst metasenv context ty CicUniv.oblivion_ugraph in + is_propositional context sort ;; -let assert_proof_is_valid proof metasenv context goalty = +exception NotConvertible;; + +let check_proof_is_valid proof metasenv context goalty = if debug then begin - let ty,u = typeof metasenv context proof CicUniv.empty_ugraph in - let b,_ = CicReduction.are_convertible context ty goalty u in - if not b then - begin - let names = - List.map (function None -> None | Some (x,_) -> Some x) context - in - debug_print (lazy ("PROOF:" ^ CicPp.pp proof names)); - debug_print (lazy ("PROOFTY:" ^ CicPp.pp ty names)); - debug_print (lazy ("GOAL:" ^ CicPp.pp goalty names)); - debug_print (lazy ("MENV:" ^ CicMetaSubst.ppmetasenv [] metasenv)); - end; - assert b + try + let ty,u = typeof metasenv context proof CicUniv.oblivion_ugraph in + let b,_ = CicReduction.are_convertible context ty goalty u in + if not b then raise NotConvertible else b + with _ -> + let names = + List.map (function None -> None | Some (x,_) -> Some x) context + in + debug_print (lazy ("PROOF:" ^ CicPp.pp proof names)); + (* debug_print (lazy ("PROOFTY:" ^ CicPp.pp ty names)); *) + debug_print (lazy ("GOAL:" ^ CicPp.pp goalty names)); + debug_print (lazy ("MENV:" ^ CicMetaSubst.ppmetasenv [] metasenv)); + false end - else () + else true +;; + +let assert_proof_is_valid proof metasenv context goalty = + assert (check_proof_is_valid proof metasenv context goalty) ;; let assert_subst_are_disjoint subst subst' = @@ -615,10 +749,7 @@ let split_goals_in_prop metasenv subst gl = let _,context,ty = CicUtil.lookup_meta g metasenv in try let sort,u = typeof ~subst metasenv context ty ugraph in - let b,_ = - CicReduction.are_convertible - ~subst ~metasenv context sort (Cic.Sort Cic.Prop) u in - b + is_propositional context sort with | CicTypeChecker.AssertFailure s | CicTypeChecker.TypeCheckerFailure s -> @@ -642,10 +773,11 @@ let split_goals_with_metas metasenv subst gl = let order_new_goals metasenv subst open_goals ppterm = let prop,rest = split_goals_in_prop metasenv subst open_goals in let closed_prop, open_prop = split_goals_with_metas metasenv subst prop in + let closed_type, open_type = split_goals_with_metas metasenv subst rest in let open_goals = - (List.map (fun x -> x,P) (closed_prop @ open_prop)) + (List.map (fun x -> x,P) (open_prop @ closed_prop)) @ - (List.map (fun x -> x,T) rest) + (List.map (fun x -> x,T) (open_type @ closed_type)) in let tys = List.map @@ -701,7 +833,7 @@ type menv = Cic.metasenv type subst = Cic.substitution type goal = ProofEngineTypes.goal * int * AutoTypes.sort let candidate_no = ref 0;; -type candidate = int * Cic.term +type candidate = int * Cic.term Lazy.t type cache = AutoCache.cache type tables = Saturation.active_table * Saturation.passive_table * Equality.equality_bag @@ -716,8 +848,8 @@ type op = * step *) | S of goal * AutoCache.cache_key * candidate * int type elem = - (* menv, subst, size, operations to do, failures to cache if any op fails *) - menv * subst * int * op list * fail list + (* menv, subst, size, operations done (only S), operations to do, failures to cache if any op fails *) + menv * subst * int * op list * op list * fail list type status = (* list of computations that may lead to the solution: all op list will * end with the same (S(g,_)) *) @@ -731,8 +863,8 @@ type auto_result = (* the status exported to the external observer *) type auto_status = (* context, (goal,candidate) list, and_list, history *) - Cic.context * (Cic.term * (int * Cic.term) list) list * - Cic.term list * Cic.term list + Cic.context * (int * Cic.term * bool * int * (int * Cic.term Lazy.t) list) list * + (int * Cic.term * int) list * Cic.term Lazy.t list let d_prefix l = let rec aux acc = function @@ -753,6 +885,7 @@ let d_goals l = in aux [] l ;; + let calculate_goal_ty (goalno,_,_) s m = try let _,cc,goalty = CicUtil.lookup_meta goalno m in @@ -760,6 +893,7 @@ let calculate_goal_ty (goalno,_,_) s m = Some (cc, CicMetaSubst.apply_subst s goalty) with CicUtil.Meta_not_found i when i = goalno -> None ;; + let calculate_closed_goal_ty (goalno,_,_) s = try let cc,_,goalty = List.assoc goalno s in @@ -767,6 +901,7 @@ let calculate_closed_goal_ty (goalno,_,_) s = Some (cc, CicMetaSubst.apply_subst s goalty) with Not_found -> None ;; + let pp_status ctx status = if debug then let names = Utils.names_of_context ctx in @@ -784,7 +919,7 @@ let pp_status ctx status = | None -> Printf.sprintf "D(%d, _, %d)" gi d in let string_of_s m su k (ci,ct) gi = - Printf.sprintf "S(%d, %s, %s, %d)" gi (pp k) (pp ct) ci + Printf.sprintf "S(%d, %s, %s, %d)" gi (pp k) (pp (Lazy.force ct)) ci in let string_of_ol m su l = String.concat " | " @@ -801,7 +936,7 @@ let pp_status ctx status = in let rec aux = function | [] -> () - | (m,s,ol,fl)::tl -> + | (m,s,_,_,ol,fl)::tl -> Printf.eprintf "< [%s] ;;; [%s]>\n" (string_of_ol m s ol) (string_of_fl m s fl); aux tl @@ -818,9 +953,13 @@ let pause b = in_pause := b;; let cond = Condition.create ();; let mutex = Mutex.create ();; let hint = ref None;; +let prune_hint = ref [];; let step _ = Condition.signal cond;; let give_hint n = hint := Some n;; +let give_prune_hint hint = + prune_hint := hint :: !prune_hint +;; let check_pause _ = if !in_pause then @@ -833,60 +972,66 @@ let check_pause _ = let get_auto_status _ = let status = !auto_status in -(* - debug_print "status:"; - List.iter (fun ((cand,ty),_,_,gl) -> - Printf.eprintf "cand: %s; ty: %s; gl: %d\n" - (CicPp.ppterm cand) (CicPp.ppterm ty) (List.length gl)) status; -*) let and_list,elems,last = match status with | [] -> [],[],[] - | (m,s,_,gl,fail)::tl -> + | (m,s,_,don,gl,fail)::tl -> let and_list = - List.map snd - (HExtlib.filter_map - (fun g -> calculate_goal_ty g s m) (d_goals gl)) + HExtlib.filter_map + (fun (id,d,_ as g) -> + match calculate_goal_ty g s m with + | Some (_,x) -> Some (id,x,d) | None -> None) + (d_goals gl) in let rows = (* these are the S goalsin the or list *) let orlist = List.map - (fun (m,s,_,gl,fail) -> + (fun (m,s,_,don,gl,fail) -> HExtlib.filter_map - (function S (g,k,c,_) -> Some (g,k,c) | _ -> None) gl) + (function S (g,k,c,_) -> Some (g,k,c) | _ -> None) + (List.rev don @ gl)) status in (* this function eats id from a list l::[id,x] returning x, l *) let eat_tail_if_eq id l = - match (List.rev l) with - | ((id1,_,_),k1,c)::tl when id = id1 -> Some c, List.rev tl - | _ -> None, l + let rec aux (s, l) = function + | [] -> s, l + | ((id1,_,_),k1,c)::tl when id = id1 -> + (match s with + | None -> aux (Some c,l) tl + | Some _ -> assert false) + | ((id1,_,_),k1,c as e)::tl -> aux (s, e::l) tl + in + let c, l = aux (None, []) l in + c, List.rev l in let eat_in_parallel id l = - let rec aux (eaten, new_l as acc) l = + let rec aux (b,eaten, new_l as acc) l = match l with | [] -> acc | l::tl -> match eat_tail_if_eq id l with - | None, l -> aux (eaten, new_l@[l]) tl - | Some t,l -> aux (eaten@[t], new_l@[l]) tl + | None, l -> aux (b@[false], eaten, new_l@[l]) tl + | Some t,l -> aux (b@[true],eaten@[t], new_l@[l]) tl in - aux ([],[]) l + aux ([],[],[]) l in let rec eat_all rows l = match l with | [] -> rows | elem::or_list -> match List.rev elem with - | ((to_eat,_,_),k,_)::next_lunch -> - let eaten, l = eat_in_parallel to_eat l in + | ((to_eat,depth,_),k,_)::next_lunch -> + let b, eaten, l = eat_in_parallel to_eat l in let eaten = HExtlib.list_uniq eaten in - let rows = rows @ [k,eaten] in + let eaten = List.rev eaten in + let b = true (* List.hd (List.rev b) *) in + let rows = rows @ [to_eat,k,b,depth,eaten] in eat_all rows l | [] -> eat_all rows or_list in - eat_all [] orlist + eat_all [] (List.rev orlist) in let history = HExtlib.filter_map @@ -912,16 +1057,25 @@ let list_union l1 l2 = (* TODO ottimizzare compare *) HExtlib.list_uniq (List.sort compare (l1 @ l1)) ;; +let rec eq_todo l1 l2 = + match l1,l2 with + | (D g1) :: tl1,(D g2) :: tl2 when g1=g2 -> eq_todo tl1 tl2 + | (S (g1,k1,(c1,lt1),i1)) :: tl1, (S (g2,k2,(c2,lt2),i2)) :: tl2 + when i1 = i2 && g1 = g2 && k1 = k2 && c1 = c2 -> + if Lazy.force lt1 = Lazy.force lt2 then eq_todo tl1 tl2 else false + | [],[] -> true + | _ -> false +;; let eat_head todo id fl orlist = let rec aux acc = function | [] -> [], acc - | (m, s, _, todo1, fl1)::tl as orlist -> + | (m, s, _, _, todo1, fl1)::tl as orlist -> let rec aux1 todo1 = match first_s todo1 with | None -> orlist, acc | Some (((gno,_,_),_,_,_), todo11) -> (* TODO confronto tra todo da ottimizzare *) - if gno = id && todo11 = todo then + if gno = id && eq_todo todo11 todo then aux (list_union fl1 acc) tl else aux1 todo11 @@ -948,7 +1102,6 @@ let add_to_cache_and_del_from_orlist_if_green_cut | None -> assert false | Some (canonical_ctx , gty) -> let goalno,depth,sort = g in - assert (sort = P); let irl = mk_irl canonical_ctx in let goal = Cic.Meta(goalno, irl) in let proof = CicMetaSubst.apply_subst s goal in @@ -973,7 +1126,7 @@ let add_to_cache_and_del_from_orlist_if_green_cut else (* cache_add_success cache key closed_proof *) (debug_print (lazy ("NO CACHE: (no gree proof)"));cache) in - cache, orlist, fl + cache, orlist, fl, true else let cache = debug_print (lazy ("TENTATIVE CACHE: " ^ CicPp.ppterm gty)); @@ -997,7 +1150,7 @@ let add_to_cache_and_del_from_orlist_if_green_cut | CicTypeChecker.TypeCheckerFailure _ ->*) (debug_print (lazy ("NO CACHE: (no green gty )"));cache) in - cache, orlist, fl + cache, orlist, fl, false ;; let close_failures (fl : fail list) (cache : cache) = List.fold_left @@ -1013,8 +1166,9 @@ let put_in_subst subst metasenv (goalno,_,_) canonical_ctx t ty = let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in subst, metasenv ;; -let mk_fake_proof metasenv (goalno,_,_) goalty context = - None,metasenv,[],Cic.Meta(goalno,mk_irl context),goalty, [] + +let mk_fake_proof metasenv subst (goalno,_,_) goalty context = + None,metasenv,subst ,(lazy (Cic.Meta(goalno,mk_irl context))),goalty, [] ;; let equational_case tables maxm cache depth fake_proof goalno goalty subst context @@ -1030,6 +1184,7 @@ let equational_case let goal_steps, saturation_steps, timeout = max_int,max_int,flags.timeout in + match Saturation.given_clause bag maxm status active passive goal_steps saturation_steps timeout @@ -1062,7 +1217,7 @@ let equational_case assert (maxmeta >= maxm); let res' = List.map - (fun subst',(_,metasenv,_subst,proof,_, _),open_goals -> + (fun (subst',(_,metasenv,_subst,proof,_, _),open_goals) -> assert_subst_are_disjoint subst subst'; let subst = subst@subst' in let open_goals = @@ -1084,31 +1239,31 @@ let try_candidate = let ppterm = ppterm context in try - let subst', ((_,metasenv,_subst,_,_, _), open_goals), maxmeta = - PrimitiveTactics.apply_with_subst - ~maxmeta:maxm ~term:cand ~subst (fake_proof,goalno) + let subst,((_,metasenv,_,_,_,_), open_goals),maxmeta = + (PrimitiveTactics.apply_with_subst ~subst ~maxmeta:maxm ~term:cand) + (fake_proof,goalno) in debug_print (lazy (" OK: " ^ ppterm cand)); let metasenv = CicRefine.pack_coercion_metasenv metasenv in - let subst = subst' in let open_goals = order_new_goals metasenv subst open_goals ppterm in let open_goals = List.map (fun (x,sort) -> x,depth-1,sort) open_goals in incr candidate_no; - Some ((!candidate_no,cand),metasenv,subst,open_goals), tables , maxmeta + Some ((!candidate_no,lazy cand),metasenv,subst,open_goals), tables , maxmeta with | ProofEngineTypes.Fail s -> None,tables, maxm | CicUnification.Uncertain s -> None,tables, maxm ;; let sort_new_elems = - List.sort (fun (_,_,_,l1) (_,_,_,l2) -> List.length l1 - List.length l2) + List.sort (fun (_,_,_,l1) (_,_,_,l2) -> + List.length (prop_only l1) - List.length (prop_only l2)) ;; let applicative_case tables maxm depth subst fake_proof goalno goalty metasenv context universe - cache + cache flags = - let candidates = get_candidates universe cache goalty in + let candidates = get_candidates flags.skip_trie_filtering universe cache goalty in let tables, elems, maxm = List.fold_left (fun (tables,elems,maxm) cand -> @@ -1128,7 +1283,7 @@ let equational_and_applicative_case universe flags m s g gty tables cache maxm context = let goalno, depth, sort = g in - let fake_proof = mk_fake_proof m g gty context in + let fake_proof = mk_fake_proof m s g gty context in if is_equational_case gty flags then let elems,tables,cache,maxm1, flags = equational_case tables maxm cache @@ -1141,21 +1296,21 @@ let equational_and_applicative_case else applicative_case tables maxm depth s fake_proof goalno - gty m context universe cache + gty m context universe cache flags in let maxm = maxm1 in elems@more_elems, tables, cache, maxm, flags else let elems, tables, cache, maxm = applicative_case tables maxm depth s fake_proof goalno - gty m context universe cache + gty m context universe cache flags in elems, tables, cache, maxm, flags ;; -let rec first_s_cand = function - | [] -> 0 - | S (_,_,(i,_),_):: _ -> i - | _::tl -> first_s_cand tl +let rec condition_for_hint i = function + | [] -> false + | S (_,_,(j,_),_):: tl -> j <> i (* && condition_for_hint i tl *) + | _::tl -> condition_for_hint i tl ;; let remove_s_from_fl (id,_,_) (fl : fail list) = let rec aux = function @@ -1165,56 +1320,153 @@ let remove_s_from_fl (id,_,_) (fl : fail list) = in aux fl ;; + +let prunable_for_size flags s m todo = + let rec aux b = function + | (S _)::tl -> aux b tl + | (D (_,_,T))::tl -> aux b tl + | (D g)::tl -> + (match calculate_goal_ty g s m with + | None -> aux b tl + | Some (canonical_ctx, gty) -> + let gsize, _ = + Utils.weight_of_term + ~consider_metas:false ~count_metas_occurrences:true gty in + let newb = b || gsize > flags.maxgoalsizefactor in + aux newb tl) + | [] -> b + in + aux false todo + +(* +let prunable ty todo = + let rec aux b = function + | (S(_,k,_,_))::tl -> aux (b || Equality.meta_convertibility k ty) tl + | (D (_,_,T))::tl -> aux b tl + | D _::_ -> false + | [] -> b + in + aux false todo +;; +*) + +let prunable menv subst ty todo = + let rec aux = function + | (S(_,k,_,_))::tl -> + (match Equality.meta_convertibility_subst k ty menv with + | None -> aux tl + | Some variant -> + no_progress variant tl (* || aux tl*)) + | (D (_,_,T))::tl -> aux tl + | _ -> false + and no_progress variant = function + | [] -> (*prerr_endline "++++++++++++++++++++++++ no_progress";*) true + | D ((n,_,P) as g)::tl -> + (match calculate_goal_ty g subst menv with + | None -> no_progress variant tl + | Some (_, gty) -> + (match calculate_goal_ty g variant menv with + | None -> assert false + | Some (_, gty') -> + if gty = gty' then + no_progress variant tl + else false)) + | _::tl -> no_progress variant tl + in + aux todo + +;; +let condition_for_prune_hint prune (m, s, size, don, todo, fl) = + let s = + HExtlib.filter_map (function S (_,_,(c,_),_) -> Some c | _ -> None) todo + in + List.for_all (fun i -> List.for_all (fun j -> i<>j) prune) s +;; +let filter_prune_hint l = + let prune = !prune_hint in + prune_hint := []; (* possible race... *) + if prune = [] then l + else List.filter (condition_for_prune_hint prune) l +;; let auto_main tables maxm context flags universe cache elems = auto_context := context; let rec aux tables maxm flags cache (elems : status) = -(* pp_status context elems; *) +(* pp_status context elems; *) +(* DEBUGGING CODE: uncomment these two lines to stop execution at each iteration + auto_status := elems; + check_pause (); +*) + let elems = filter_prune_hint elems in match elems with + | (m, s, size, don, todo, fl)::orlist when !hint <> None -> + debug_print (lazy "skip"); + (match !hint with + | Some i when condition_for_hint i todo -> + aux tables maxm flags cache orlist + | _ -> + hint := None; + aux tables maxm flags cache elems) | [] -> (* complete failure *) + debug_print (lazy "give up"); Gaveup (tables, cache, maxm) - | (m, s, _, [],_)::orlist -> + | (m, s, _, _, [],_)::orlist -> (* complete success *) + debug_print (lazy "success"); Proved (m, s, orlist, tables, cache, maxm) - | (m, s, size, (D (_,_,T))::todo, fl)::orlist -> + | (m, s, size, don, (D (_,_,T))::todo, fl)::orlist + when not flags.AutoTypes.do_types -> (* skip since not Prop, don't even check if closed by side-effect *) - aux tables maxm flags cache ((m, s, size, todo, fl)::orlist) - | (m, s, size, (S(g, key, c,minsize))::todo, fl)::orlist -> + debug_print (lazy "skip existential goal"); + aux tables maxm flags cache ((m, s, size, don, todo, fl)::orlist) + | (m, s, size, don, (S(g, key, c,minsize) as op)::todo, fl)::orlist -> (* partial success, cache g and go on *) - let cache, orlist, fl = + let cache, orlist, fl, sibling_pruned = add_to_cache_and_del_from_orlist_if_green_cut g s m cache key todo orlist fl context size minsize in debug_print (lazy (AutoCache.cache_print context cache)); let fl = remove_s_from_fl g fl in - aux tables maxm flags cache ((m, s, size, todo, fl)::orlist) - | (m, s, size, todo, fl)::orlist + let don = if sibling_pruned then don else op::don in + aux tables maxm flags cache ((m, s, size, don, todo, fl)::orlist) + | (m, s, size, don, todo, fl)::orlist when List.length(prop_only (d_goals todo)) > flags.maxwidth -> debug_print (lazy ("FAIL: WIDTH")); (* too many goals in and generated by last th *) let cache = close_failures fl cache in aux tables maxm flags cache orlist - | (m, s, size, todo, fl)::orlist - when size > flags.maxsize -> - debug_print (lazy ("FAIL: SIZE")); + | (m, s, size, don, todo, fl)::orlist when size > flags.maxsize -> + debug_print + (lazy ("FAIL: SIZE: "^string_of_int size ^ + " > " ^ string_of_int flags.maxsize )); (* we already have a too large proof term *) let cache = close_failures fl cache in aux tables maxm flags cache orlist | _ when Unix.gettimeofday () > flags.timeout -> (* timeout *) - debug_print (lazy ("FAIL: SIZE")); + debug_print (lazy ("FAIL: TIMEOUT")); Gaveup (tables, cache, maxm) - | (m, s, size, (D (gno,depth,P as g))::todo, fl)::orlist as status -> - (* attack g *) + | (m, s, size, don, (D (gno,depth,_ as g))::todo, fl)::orlist as status -> + (* attack g *) + debug_print (lazy "attack goal"); match calculate_goal_ty g s m with | None -> (* closed by side effect *) debug_print (lazy ("SUCCESS: SIDE EFFECT: " ^ string_of_int gno)); - aux tables maxm flags cache ((m,s,size,todo, fl)::orlist) - | Some (canonical_ctx, gty) -> + aux tables maxm flags cache ((m,s,size,don,todo, fl)::orlist) + | Some (canonical_ctx, gty) -> + let gsize, _ = + Utils.weight_of_term ~consider_metas:false ~count_metas_occurrences:true gty + in + if gsize > flags.maxgoalsizefactor then + (debug_print (lazy ("FAIL: SIZE: goal: "^string_of_int gsize)); + aux tables maxm flags cache orlist) + else if prunable_for_size flags s m todo then + (debug_print (lazy ("POTO at depth: "^(string_of_int depth))); + aux tables maxm flags cache orlist) + else (* still to be proved *) - debug_print (lazy ("EXAMINE: "^CicPp.ppterm gty)); - debug_print (lazy (AutoCache.cache_print context cache)); + (debug_print (lazy ("EXAMINE: "^CicPp.ppterm gty)); match cache_examine cache gty with | Failed_in d when d >= depth -> (* fail depth *) @@ -1229,20 +1481,22 @@ let auto_main tables maxm context flags universe cache elems = | Succeded t -> debug_print (lazy ("SUCCESS: CACHE HIT: " ^ string_of_int gno)); let s, m = put_in_subst s m g canonical_ctx t gty in - aux tables maxm flags cache ((m, s, size, todo, fl)::orlist) + aux tables maxm flags cache ((m, s, size, don,todo, fl)::orlist) | Notfound | Failed_in _ when depth > 0 -> - (match !hint with - | Some i when first_s_cand todo <> i -> - aux tables maxm flags cache orlist - | _ -> hint := None; - (* more depth or is the first time we see the goal *) + ( (* more depth or is the first time we see the goal *) + if prunable m s gty todo then + (debug_print (lazy( + "FAIL: LOOP: one father is equal")); + aux tables maxm flags cache orlist) + else let cache = cache_add_underinspection cache gty depth in auto_status := status; check_pause (); debug_print (lazy ("INSPECTING: " ^ - string_of_int gno ^ "("^ string_of_int size ^ "): "^CicPp.ppterm gty)); + string_of_int gno ^ "("^ string_of_int size ^ "): "^ + CicPp.ppterm gty)); (* elems are possible computations for proving gty *) let elems, tables, cache, maxm, flags = equational_and_applicative_case @@ -1263,16 +1517,21 @@ let auto_main tables maxm context flags universe cache elems = | [] -> assert false | (cand,m,s,gl)::[] -> (* in the last one we add the failure *) - let todo = inj_gl gl @ (S(g,gty,cand,size+1))::todo in + let todo = + inj_gl gl @ (S(g,gty,cand,size+1))::todo + in (* we are the last in OR, we fail on g and * also on all failures implied by g *) - (m,s, size + size_gl gl, todo, (g,gty)::fl) :: orlist + (m,s, size + size_gl gl, don, todo, (g,gty)::fl) + :: orlist | (cand,m,s,gl)::tl -> (* we add the S step after gl and before todo *) - let todo = inj_gl gl @ (S(g,gty,cand,size+1))::todo in + let todo = + inj_gl gl @ (S(g,gty,cand,size+1))::todo + in (* since we are not the last in OR, we do not * imply failures *) - (m,s, size + size_gl gl, todo, []) :: map tl + (m,s, size + size_gl gl, don, todo, []) :: map tl in map elems in @@ -1281,202 +1540,12 @@ let auto_main tables maxm context flags universe cache elems = (* no more depth *) debug_print (lazy ("FAIL: DEPTH: " ^ string_of_int gno)); let cache = close_failures fl cache in - aux tables maxm flags cache orlist + aux tables maxm flags cache orlist) in (aux tables maxm flags cache elems : auto_result) ;; -(* -let rec auto_main tables maxm context flags elems universe cache = - auto_context := context; - let flags = calculate_timeout flags in - let ppterm = ppterm context in - let irl = mk_irl context in - let rec aux flags tables maxm cache elems status = - match elems with (* elems in OR *) - | [] -> Fail "no more steps can be done", tables, cache, maxm - (*COMPLETE FAILURE*) - | (p ,metasenv,subst,[])::tl -> - Success (p,metasenv,subst,tl), tables, cache,maxm (* solution::cont *) - | (_,metasenv,subst,goals)::tl when - List.length (List.filter prop goals) > flags.maxwidth -> - debug_print - (lazy (" FAILURE(width): " ^ string_of_int (List.length goals))); - aux flags tables maxm cache tl (List.tl status) (* FAILURE (width) *) - | (p,metasenv,subst,((goalno,depth,sort) as elem)::gl)::tl -> - let (_,_,_,_::gl_status)::tl_status = status in - if Unix.gettimeofday() > flags.timeout then - Fail "timeout",tables,cache,maxm - else - try - let _,cc,goalty = CicUtil.lookup_meta goalno metasenv in - let id,_,_ = p in - debug_print - (lazy ("INSPECTING " ^ string_of_int goalno^ - ":"^"(id="^string_of_int id^")"^ppterm goalty ^ - "with depth"^string_of_int depth)); - debug_print (lazy (AutoCache.cache_print context cache)); - if sort = T (* && tl <> []*) then - (debug_print - (lazy (" FAILURE(not in prop)")); - aux flags tables maxm cache ((p,metasenv,subst,gl)::tl) - ((p,metasenv,subst,gl)::tl_status)) - else - match aux_single flags tables maxm universe cache metasenv subst elem - goalty cc gl_status tl_status p with - | Fail s, tables, cache, maxm' -> - let maxm = maxm' in - debug_print - (lazy - (" FAIL "^s^": "^string_of_int goalno^":"^ppterm goalty)); - let cache = - if flags.dont_cache_failures or s = "hint" then - cache_remove_underinspection cache goalty - else - cache_add_failure cache goalty depth - in - aux flags tables maxm cache tl tl_status - | Success (p1,metasenv,subst,others), tables, cache, maxm' -> - let maxm = maxm' in - (* others are alternatives in OR *) - try - let goal = Cic.Meta(goalno,irl) in - let proof = CicMetaSubst.apply_subst subst goal in - debug_print - (lazy ("DONE: " ^ ppterm goalty^" with: "^ppterm proof)); - if is_a_green_cut goalty then - (* assert_proof_is_valid proof metasenv context goalty; *) - let cache = cache_add_success sort cache goalty proof in - aux flags tables maxm cache ((p,metasenv,subst,gl)::tl) - ((p,metasenv,subst,gl)::tl_status) - - else - (let goalty = CicMetaSubst.apply_subst subst goalty in - (* assert_proof_is_valid proof metasenv context goalty; *) - let cache = - if is_a_green_cut goalty then - cache_add_success sort cache goalty proof - else - cache - in - let others = - List.map - (fun (p,metasenv,subst,goals) -> - (p,metasenv,subst,goals@gl)) - others - in - aux flags tables maxm cache - ((p,metasenv,subst,gl)::others@tl) - ((p,metasenv,subst,gl)::others@tl_status) - - ) - - with CicUtil.Meta_not_found i when i = goalno -> - assert false - with CicUtil.Meta_not_found i when i = goalno -> - (* goalno was closed by sideeffect *) - debug_print - (lazy ("Goal "^string_of_int goalno^" closed by sideeffect")); - aux flags tables maxm cache ((p,metasenv,subst,gl)::tl) - ((p,metasenv,subst,gl)::tl_status) - - and aux_single flags tables maxm universe cache metasenv subst (goalno, depth, - _) goalty cc e l (id,_,_) = - match !hint with - | Some id' when id <> id' -> Fail "hint", tables,cache,maxm - | _ -> - hint := None; - (* let flags = if depth < 10 then {flags with maxwidth=3} else flags in *) - let goalty = CicMetaSubst.apply_subst subst goalty in -(* else if not (is_in_prop context subst metasenv goalty) then Fail,cache *) - (* FAILURE (euristic cut) *) - match cache_examine cache goalty with - | Failed_in d when d >= depth -> - Fail ("depth " ^ string_of_int d ^ ">=" ^ string_of_int depth), - tables,cache,maxm(*FAILURE(depth)*) - | Succeded t -> - let entry = goalno, (cc, t,goalty) in - assert_subst_are_disjoint subst [entry]; - let subst = entry :: subst in - let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in - debug_print (lazy (" CACHE HIT!")); - incr candidate_no; - Success ((!candidate_no,t,goalty),metasenv, subst, []), tables, cache, maxm - | UnderInspection -> - (* assert (not (is_a_green_cut goalty)); *) - Fail "looping",tables,cache, maxm - | Notfound - | Failed_in _ when depth > 0 -> (* we have more depth now *) - let cache = cache_add_underinspection cache goalty depth in - let fake_proof = None,metasenv,Cic.Meta(goalno,irl),goalty, [] in (* FG: attrs *) - let elems, tables, cache, maxm, flags = - if is_equational_case goalty flags then - let elems,tables,cache,maxm1, flags = - equational_case tables maxm cache - depth fake_proof goalno goalty subst context flags in - let maxm = maxm1 in - let more_elems, tables, cache, maxm1 = - if flags.use_only_paramod then - [],tables, cache, maxm - else - applicative_case - tables maxm depth subst fake_proof goalno - goalty metasenv context universe cache in - let maxm = maxm1 in - elems@more_elems, tables, cache, maxm, flags - else - let elems, tables, cache, maxm = - applicative_case tables maxm depth subst fake_proof goalno - goalty metasenv context universe cache in - elems, tables, cache, maxm, flags - in - let status = - List.map (fun (p,m,s,l) -> p,m,s,l@e) elems @ l - in - auto_status := status; - check_pause (); - let rc = aux flags tables maxm cache elems status in - debug_print "BACK!"; - rc - | _ -> Fail "depth = 0",tables,cache,maxm - in - aux flags tables maxm cache elems elems - -and -*) -(* -let - auto_all_solutions maxm tables universe cache context metasenv gl flags -= - let goals = order_new_goals metasenv [] gl CicPp.ppterm in - let goals = List.map (fun (x,s) -> x,flags.maxdepth,s) goals in - let elems = [(0,Cic.Implicit None,Cic.Implicit None), metasenv,[],goals] in - let rec aux tables maxm solutions cache elems flags = - match auto_main tables maxm context flags elems universe cache with - | Fail s,tables,cache,maxm ->debug_print s; solutions,cache,maxm - | Success (_,metasenv,subst,others),tables,cache,maxm -> - if Unix.gettimeofday () > flags.timeout then - ((subst,metasenv)::solutions), cache, maxm - else - aux tables maxm ((subst,metasenv)::solutions) cache others flags - in - let rc = aux tables maxm [] cache elems flags in - match rc with - | [],cache,maxm -> [],cache,maxm - | solutions,cache,maxm -> - let solutions = - HExtlib.filter_map - (fun (subst,newmetasenv) -> - let opened = - ProofEngineHelpers.compare_metasenvs ~oldmetasenv:metasenv ~newmetasenv - in - if opened = [] then Some subst else None) - solutions - in - solutions,cache,maxm -;; -*) let auto_all_solutions maxm tables universe cache context metasenv gl flags = @@ -1485,7 +1554,7 @@ let List.map (fun (x,s) -> D (x,flags.maxdepth,s)) goals in - let elems = [metasenv,[],1,goals,[]] in + let elems = [metasenv,[],1,[],goals,[]] in let rec aux tables maxm solutions cache elems flags = match auto_main tables maxm context flags universe cache elems with | Gaveup (tables,cache,maxm) -> @@ -1514,132 +1583,11 @@ let (* }}} ****************** AUTO ***************) -(* script generation for applicative proofs -let cic2grafite context menv t = - let module PT = CicNotationPt in - let module GA = GrafiteAst in - let pp_t context t = - let names = Utils.names_of_context context in - CicPp.pp t names - in - let sort_of context t = - let ty,_ = - CicTypeChecker.type_of_aux' menv context t - CicUniv.oblivion_ugraph - in - let sort,_ = CicTypeChecker.type_of_aux' menv context ty - CicUniv.oblivion_ugraph - in - match sort with - | Cic.Sort Cic.Prop -> P - | _ -> T - in - let floc = HExtlib.dummy_floc in - let rec print_term c = function - | Cic.Rel _ - | Cic.MutConstruct _ - | Cic.MutInd _ - | Cic.Const _ as t -> - PT.Ident (pp_t c t, None) - | Cic.Appl l -> PT.Appl (List.map (print_term c) l) - | Cic.Implicit _ -> PT.Implicit - | Cic.Lambda (Cic.Name n, s, t) -> - PT.Binder (`Lambda, (PT.Ident (n,None), Some (print_term c s)), - print_term (Some (Cic.Name n, Cic.Decl s)::c) t) - | Cic.Prod (Cic.Name n, s, t) -> - PT.Binder (`Forall, (PT.Ident (n,None), Some (print_term c s)), - print_term (Some (Cic.Name n, Cic.Decl s)::c) t) - | Cic.LetIn (Cic.Name n, s, t) -> - PT.Binder (`Lambda, (PT.Ident (n,None), Some (print_term c s)), - print_term (Some (Cic.Name n, Cic.Def (s,None))::c) t) - | Cic.Meta _ -> PT.Implicit - | _ as t -> - PT.Ident ("ERROR"^CicPp.ppterm t, None) - (* - debug_print (lazy (CicPp.ppterm t)); - assert false - *) - in - let rec print_proof context = function - | Cic.Rel _ - | Cic.Const _ as t -> - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Apply (floc, print_term context t)), GA.Dot floc))] - | Cic.Appl (he::tl) -> - let tl = List.map (fun t -> t, sort_of context t) tl in - let subgoals = - HExtlib.filter_map (function (t,P) -> Some t | _ -> None) tl - in - let args = - List.map - (function - | (t,P) -> Cic.Implicit None - | (t,_) -> t) - tl - in - if List.length subgoals > 1 then - (* branch *) - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Apply (floc, print_term context (Cic.Appl (he::args)))), - GA.Semicolon floc))] @ - [GA.Executable (floc, GA.Tactic (floc, None, GA.Branch floc))] @ - (HExtlib.list_concat - ~sep:[GA.Executable (floc, GA.Tactic (floc, None,GA.Shift floc))] - (List.map (print_proof context) subgoals)) @ - [GA.Executable (floc, GA.Tactic (floc, None,GA.Merge floc))] - else - (* simple apply *) - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Apply - (floc, print_term context (Cic.Appl (he::args)) )), GA.Dot floc))] - @ - (match subgoals with - | [] -> [] - | [x] -> print_proof context x - | _ -> assert false) - | _ -> [] - (* - debug_print (lazy (CicPp.ppterm t)); - assert false - *) - in - let ast = print_proof context t in - let pp t = - (* ZACK: setting width to 80 will trigger a bug of BoxPp.render_to_string - * which will show up using the following command line: - * ./tptp2grafite -tptppath ~tassi/TPTP-v3.1.1 GRP170-1 *) - let width = max_int in - let term_pp content_term = - let pres_term = TermContentPres.pp_ast content_term in - let dummy_tbl = Hashtbl.create 1 in - let markup = CicNotationPres.render dummy_tbl pres_term in - let s = "(" ^ BoxPp.render_to_string List.hd width markup ^ ")" in - Pcre.substitute - ~pat:"\\\\forall [Ha-z][a-z0-9_]*" ~subst:(fun x -> "\n" ^ x) s - in - CicNotationPp.set_pp_term term_pp; - let lazy_term_pp = fun x -> assert false in - let obj_pp = CicNotationPp.pp_obj CicNotationPp.pp_term in - GrafiteAstPp.pp_statement ~term_pp ~lazy_term_pp ~obj_pp t - in - String.concat "\n" (List.map pp ast) -;; -let auto_all tables universe cache context metasenv gl flags = - let solutions, cache, _ = - auto_all_solutions 0 tables universe cache context metasenv gl flags - in - solutions, cache -;; -*) - let auto flags metasenv tables universe cache context metasenv gl = let initial_time = Unix.gettimeofday() in let goals = order_new_goals metasenv [] gl CicPp.ppterm in let goals = List.map (fun (x,s) -> D(x,flags.maxdepth,s)) goals in - let elems = [metasenv,[],1,goals,[]] in + let elems = [metasenv,[],1,[],goals,[]] in match auto_main tables 0 context flags universe cache elems with | Proved (metasenv,subst,_, tables,cache,_) -> debug_print(lazy @@ -1651,68 +1599,12 @@ let auto flags metasenv tables universe cache context metasenv gl = None,cache ;; -let bool params name default = - try - let s = List.assoc name params in - if s = "" || s = "1" || s = "true" || s = "yes" || s = "on" then true - else if s = "0" || s = "false" || s = "no" || s= "off" then false - else - let msg = "Unrecognized value for parameter "^name^"\n" in - let msg = msg^"Accepted values are 1,true,yes,on and 0,false,no,off" in - raise (ProofEngineTypes.Fail (lazy msg)) - with Not_found -> default -;; - -let string params name default = - try List.assoc name params with - | Not_found -> default -;; - -let int params name default = - try int_of_string (List.assoc name params) with - | Not_found -> default - | Failure _ -> - raise (ProofEngineTypes.Fail (lazy (name ^ " must be an integer"))) -;; - -let flags_of_params params ?(for_applyS=false) () = - let int = int params in - let bool = bool params in - let close_more = bool "close_more" false in - let use_paramod = bool "use_paramod" true in - let use_only_paramod = - if for_applyS then true else bool "paramodulation" false in - let use_library = bool "library" - ((AutoTypes.default_flags()).AutoTypes.use_library) in - let depth = int "depth" ((AutoTypes.default_flags()).AutoTypes.maxdepth) in - let width = int "width" ((AutoTypes.default_flags()).AutoTypes.maxwidth) in - let size = int "size" ((AutoTypes.default_flags()).AutoTypes.maxsize) in - let timeout = int "timeout" 0 in - { AutoTypes.maxdepth = - if use_only_paramod then 2 else depth; - AutoTypes.maxwidth = width; - AutoTypes.maxsize = size; - AutoTypes.timeout = - if timeout = 0 then - if for_applyS then Unix.gettimeofday () +. 30.0 - else - infinity - else - Unix.gettimeofday() +. (float_of_int timeout); - AutoTypes.use_library = use_library; - AutoTypes.use_paramod = use_paramod; - AutoTypes.use_only_paramod = use_only_paramod; - AutoTypes.close_more = close_more; - AutoTypes.dont_cache_failures = false; - } - let applyS_tac ~dbd ~term ~params ~universe = ProofEngineTypes.mk_tactic (fun status -> try - let _, proof, gl,_,_ = - apply_smart ~dbd ~term ~subst:[] ~universe - (flags_of_params params ~for_applyS:true ()) status + let proof, gl,_,_ = + apply_smart ~dbd ~term ~subst:[] ~params ~universe status in proof, gl with @@ -1720,211 +1612,252 @@ let applyS_tac ~dbd ~term ~params ~universe = | CicTypeChecker.TypeCheckerFailure msg -> raise (ProofEngineTypes.Fail msg)) -(* SUPERPOSITION *) +let auto_tac ~(dbd:HSql.dbd) ~params:(univ,params) ~universe (proof, goal) = + let _,metasenv,_subst,_,_, _ = proof in + let _,context,goalty = CicUtil.lookup_meta goal metasenv in + let flags = flags_of_params params () in + let universe = universe_of_params metasenv context universe univ in + let use_library = flags.use_library in + let tables,cache,newmeta = + init_cache_and_tables ~dbd use_library flags.use_only_paramod (not flags.skip_context) + false universe (proof, goal) in + let tables,cache,newmeta = + if flags.close_more then + close_more + tables newmeta context (proof, goal) + auto_all_solutions universe cache + else tables,cache,newmeta in + let initial_time = Unix.gettimeofday() in + let (_,oldmetasenv,_subst,_,_, _) = proof in + hint := None; + let elem = + metasenv,[],1,[],[D (goal,flags.maxdepth,P)],[] + in + match auto_main tables newmeta context flags universe cache [elem] with + | Proved (metasenv,subst,_, tables,cache,_) -> + debug_print (lazy + ("TIME:"^string_of_float(Unix.gettimeofday()-.initial_time))); + let proof,metasenv = + ProofEngineHelpers.subst_meta_and_metasenv_in_proof + proof goal subst metasenv + in + let opened = + ProofEngineHelpers.compare_metasenvs ~oldmetasenv + ~newmetasenv:metasenv + in + proof,opened + | Gaveup (tables,cache,maxm) -> + debug_print + (lazy ("TIME:"^ + string_of_float(Unix.gettimeofday()-.initial_time))); + raise (ProofEngineTypes.Fail (lazy "Auto gave up")) +;; -(* Syntax: - * auto superposition target = NAME - * [table = NAME_LIST] [demod_table = NAME_LIST] [subterms_only] - * - * - if table is omitted no superposition will be performed - * - if demod_table is omitted no demodulation will be prformed - * - subterms_only is passed to Indexing.superposition_right - * - * lists are coded using _ (example: H_H1_H2) - *) +let auto_tac ~dbd ~params ~universe = + ProofEngineTypes.mk_tactic (auto_tac ~params ~dbd ~universe);; -let eq_and_ty_of_goal = function - | Cic.Appl [Cic.MutInd(uri,0,_);t;_;_] when LibraryObjects.is_eq_URI uri -> - uri,t +let eq_of_goal = function + | Cic.Appl [Cic.MutInd(uri,0,_);_;_;_] when LibraryObjects.is_eq_URI uri -> + uri | _ -> raise (ProofEngineTypes.Fail (lazy ("The goal is not an equality "))) ;; -let rec find_in_ctx i name = function - | [] -> raise (ProofEngineTypes.Fail (lazy ("Hypothesis not found: " ^ name))) - | Some (Cic.Name name', _)::tl when name = name' -> i - | _::tl -> find_in_ctx (i+1) name tl +(* performs steps of rewrite with the universe, obtaining if possible + * a trivial goal *) +let solve_rewrite_tac ~universe ~params:(univ,params) (proof,goal as status)= + let _,metasenv,_subst,_,_,_ = proof in + let _,context,ty = CicUtil.lookup_meta goal metasenv in + let steps = int_of_string (string params "steps" "1") in + let universe = universe_of_params metasenv context universe univ in + let eq_uri = eq_of_goal ty in + let (active,passive,bag), cache, maxm = + (* we take the whole universe (no signature filtering) *) + init_cache_and_tables false true false true universe (proof,goal) + in + let initgoal = [], metasenv, ty in + let table = + let equalities = (Saturation.list_of_passive passive) in + (* we demodulate using both actives passives *) + List.fold_left (fun tbl eq -> Indexing.index tbl eq) (snd active) equalities + in + let env = metasenv,context,CicUniv.oblivion_ugraph in + match Indexing.solve_demodulating bag env table initgoal steps with + | Some (proof, metasenv, newty) -> + let refl = + match newty with + | Cic.Appl[Cic.MutInd _;eq_ty;left;_] -> + Equality.Exact (Equality.refl_proof eq_uri eq_ty left) + | _ -> assert false + in + let proofterm,_ = + Equality.build_goal_proof + bag eq_uri proof refl newty [] context metasenv + in + ProofEngineTypes.apply_tactic + (PrimitiveTactics.apply_tac ~term:proofterm) status + | None -> + raise + (ProofEngineTypes.Fail (lazy + ("Unable to solve with " ^ string_of_int steps ^ " demodulations"))) ;; - -let rec position_of i x = function - | [] -> assert false - | j::tl when j <> x -> position_of (i+1) x tl - | _ -> i +let solve_rewrite_tac ~params ~universe () = + ProofEngineTypes.mk_tactic (solve_rewrite_tac ~universe ~params) ;; +(* Demodulate thorem *) +let open_type ty bo = + let rec open_type_aux context ty k args = + match ty with + | Cic.Prod (n,s,t) -> + let n' = + FreshNamesGenerator.mk_fresh_name [] context n ~typ:s ~subst:[] in + let entry = match n' with + | Cic.Name _ -> Some (n',(Cic.Decl s)) + | Cic.Anonymous -> None + in + open_type_aux (entry::context) t (k+1) ((Cic.Rel k)::args) + | Cic.LetIn (n,s,sty,t) -> + let entry = Some (n,(Cic.Def (s,sty))) + in + open_type_aux (entry::context) t (k+1) args + | _ -> context, ty, args + in + let context, ty, args = open_type_aux [] ty 1 [] in + match args with + | [] -> context, ty, bo + | _ -> context, ty, Cic.Appl (bo::args) +;; -let superposition_tac ~target ~table ~subterms_only ~demod_table status = - Saturation.reset_refs(); - let proof,goalno = status in - let curi,metasenv,_subst,pbo,pty, attrs = proof in - let metano,context,ty = CicUtil.lookup_meta goalno metasenv in - let eq_uri,tty = eq_and_ty_of_goal ty in - let env = (metasenv, context, CicUniv.empty_ugraph) in - let names = Utils.names_of_context context in - let bag = Equality.mk_equality_bag () in - let eq_index, equalities, maxm,cache = - find_context_equalities 0 bag context proof Universe.empty AutoCache.cache_empty +let rec close_type bo ty context = + match context with + | [] -> assert_proof_is_valid bo [] [] ty; (bo,ty) + | Some (n,(Cic.Decl s))::tl -> + close_type (Cic.Lambda (n,s,bo)) (Cic.Prod (n,s,ty)) tl + | Some (n,(Cic.Def (s,sty)))::tl -> + close_type (Cic.LetIn (n,s,sty,bo)) (Cic.LetIn (n,s,sty,ty)) tl + | _ -> assert false +;; + +let is_subsumed univ context ty = + let candidates = Universe.get_candidates univ ty in + List.fold_left + (fun res cand -> + match res with + | Some found -> Some found + | None -> + try + let mk_irl = CicMkImplicit.identity_relocation_list_for_metavariable in + let metasenv = [(0,context,ty)] in + let fake_proof = None,metasenv,[] , (lazy (Cic.Meta(0,mk_irl context))),ty,[] in + let subst,((_,metasenv,_,_,_,_), open_goals),maxmeta = + (PrimitiveTactics.apply_with_subst ~subst:[] ~maxmeta:0 ~term:cand) (fake_proof,0) + in + let prop_goals, other = split_goals_in_prop metasenv subst open_goals in + if prop_goals = [] then Some cand else None + with + | ProofEngineTypes.Fail s -> None + | CicUnification.Uncertain s -> None + ) None candidates +;; + +let demodulate_theorem ~universe uri = + let eq_uri = + match LibraryObjects.eq_URI () with + | Some (uri) -> uri + | None -> raise (ProofEngineTypes.Fail (lazy "equality not declared")) in + let obj,_ = CicEnvironment.get_cooked_obj CicUniv.empty_ugraph uri in - let eq_what = - let what = find_in_ctx 1 target context in - List.nth equalities (position_of 0 what eq_index) + let context,ty,bo = + match obj with + | Cic.Constant(n, _, ty ,_, _) -> open_type ty (Cic.Const(uri,[])) + | _ -> raise (ProofEngineTypes.Fail (lazy "not a theorem")) in - let eq_other = - if table <> "" then - let other = - let others = Str.split (Str.regexp "_") table in - List.map (fun other -> find_in_ctx 1 other context) others - in - List.map - (fun other -> List.nth equalities (position_of 0 other eq_index)) - other - else - [] + if CicUtil.is_closed ty then + raise (ProofEngineTypes.Fail (lazy ("closed term: dangerous reduction"))); + let initgoal = [], [], ty in + (* compute the signature *) + let signature = + let ty_set = MetadataConstraints.constants_of ty in + let hyp_set = MetadataQuery.signature_of_hypothesis context [] in + let set = MetadataConstraints.UriManagerSet.union ty_set hyp_set in + MetadataQuery.close_with_types set [] context in - let index = List.fold_left Indexing.index Indexing.empty eq_other in - let maxm, eql = - if table = "" then maxm,[eq_what] else - Indexing.superposition_right bag - ~subterms_only eq_uri maxm env index eq_what + (* retrieve equations from the universe universe *) + let equations = + retrieve_equations true signature universe AutoCache.cache_empty context [] in - debug_print (lazy ("Superposition right:")); - debug_print (lazy ("\n eq: " ^ Equality.string_of_equality eq_what ~env)); - debug_print (lazy ("\n table: ")); - List.iter - (fun e -> - debug_print (lazy (" " ^ Equality.string_of_equality e ~env))) eq_other; - debug_print (lazy ("\n result: ")); - List.iter (fun e -> debug_print (lazy (Equality.string_of_equality e ~env))) eql; - debug_print (lazy ("\n result (cut&paste): ")); - List.iter - (fun e -> - let t = Equality.term_of_equality eq_uri e in - debug_print (lazy (CicPp.pp t names))) - eql; - debug_print (lazy ("\n result proofs: ")); - List.iter (fun e -> - debug_print (lazy (let _,p,_,_,_ = Equality.open_equality e in - let s = match p with Equality.Exact _ -> Subst.empty_subst | Equality.Step (s,_) -> s in - Subst.ppsubst s ^ "\n" ^ - CicPp.pp (Equality.build_proof_term bag eq_uri [] 0 p) names))) eql; - if demod_table <> "" then - begin - let eql = - if eql = [] then [eq_what] else eql - in - let demod = - let demod = Str.split (Str.regexp "_") demod_table in - List.map (fun other -> find_in_ctx 1 other context) demod - in - let eq_demod = - List.map - (fun demod -> List.nth equalities (position_of 0 demod eq_index)) - demod - in - let table = List.fold_left Indexing.index Indexing.empty eq_demod in - let maxm,eql = - List.fold_left - (fun (maxm,acc) e -> - let maxm,eq = - Indexing.demodulation_equality bag eq_uri maxm env table e - in - maxm,eq::acc) - (maxm,[]) eql - in - let eql = List.rev eql in - debug_print (lazy ("\n result [demod]: ")); - List.iter - (fun e -> debug_print (lazy (Equality.string_of_equality e ~env))) eql; - debug_print (lazy ("\n result [demod] (cut&paste): ")); - List.iter - (fun e -> - let t = Equality.term_of_equality eq_uri e in - debug_print (lazy (CicPp.pp t names))) - eql; - end; - proof,[goalno] -;; + debug_print + (lazy ("ho trovato equazioni n. "^(string_of_int (List.length equations)))); + let eqs_and_types = + HExtlib.filter_map + (fun t -> + let ty,_ = + CicTypeChecker.type_of_aux' [] context t CicUniv.oblivion_ugraph + in + (* retrieve_equations could also return flexible terms *) + if is_an_equality ty then Some(t,ty) + else + try + let ty' = unfold context ty in + if is_an_equality ty' then Some(t,ty') else None + with ProofEngineTypes.Fail _ -> None) + equations + in + let bag = Equality.mk_equality_bag () in -let auto_tac ~(dbd:HMysql.dbd) ~params ~universe (proof, goal) = - (* argument parsing *) - let string = string params in - let bool = bool params in - (* hacks to debug paramod *) - let superposition = bool "superposition" false in - let target = string "target" "" in - let table = string "table" "" in - let subterms_only = bool "subterms_only" false in - let demod_table = string "demod_table" "" in - match superposition with - | true -> - (* this is the ugly hack to debug paramod *) - superposition_tac - ~target ~table ~subterms_only ~demod_table (proof,goal) - | false -> - (* this is the real auto *) - let _,metasenv,_subst,_,_, _ = proof in - let _,context,goalty = CicUtil.lookup_meta goal metasenv in - let flags = flags_of_params params () in - (* just for testing *) - let use_library = flags.use_library in - let tables,cache,newmeta = - init_cache_and_tables dbd use_library flags.use_only_paramod - universe (proof, goal) in - let tables,cache,newmeta = - if flags.close_more then - close_more - tables newmeta context (proof, goal) - auto_all_solutions universe cache - else tables,cache,newmeta in - let initial_time = Unix.gettimeofday() in - let (_,oldmetasenv,_subst,_,_, _) = proof in - hint := None; - let elem = - metasenv,[],1,[D (goal,flags.maxdepth,P)],[] + let units, _, newmeta = + partition_unit_equalities context [] (CicMkImplicit.new_meta [] []) bag eqs_and_types + in + let table = + List.fold_left + (fun tbl eq -> Indexing.index tbl eq) + Indexing.empty units + in + let changed,(newproof,newmetasenv, newty) = + Indexing.demod bag + ([],context,CicUniv.oblivion_ugraph) table initgoal in + if changed then + begin + let oldproof = Equality.Exact bo in + let proofterm,_ = + Equality.build_goal_proof (~contextualize:false) (~forward:true) bag + eq_uri newproof oldproof ty [] context newmetasenv in - match auto_main tables newmeta context flags universe cache [elem] with - | Proved (metasenv,subst,_, tables,cache,_) -> - prerr_endline - ("TIME:"^string_of_float(Unix.gettimeofday()-.initial_time)); - (* script generation - let irl = mk_irl context in - let goal_term = Cic.Meta(goal, irl) in - let proof_term = CicMetaSubst.apply_subst subst goal_term in - HLog.debug (cic2grafite context metasenv proof_term); - *) - let proof,metasenv = - ProofEngineHelpers.subst_meta_and_metasenv_in_proof - proof goal subst metasenv - in - let opened = - ProofEngineHelpers.compare_metasenvs ~oldmetasenv - ~newmetasenv:metasenv - in - proof,opened - | Gaveup (tables,cache,maxm) -> - debug_print - (lazy ("TIME:"^ - string_of_float(Unix.gettimeofday()-.initial_time))); - raise (ProofEngineTypes.Fail (lazy "Auto gave up")) -;; - -let auto_tac ~dbd ~params ~universe = - ProofEngineTypes.mk_tactic (auto_tac ~params ~dbd ~universe);; + if newmetasenv <> [] then + raise (ProofEngineTypes.Fail (lazy ("metasenv not empty"))) + else + begin + assert_proof_is_valid proofterm newmetasenv context newty; + match is_subsumed universe context newty with + | Some t -> raise + (ProofEngineTypes.Fail (lazy ("subsumed by " ^ CicPp.ppterm t))) + | None -> close_type proofterm newty context + end + end + else (* if newty = ty then *) + raise (ProofEngineTypes.Fail (lazy "no progress")) + (*else ProofEngineTypes.apply_tactic + (ReductionTactics.simpl_tac + ~pattern:(ProofEngineTypes.conclusion_pattern None)) initialstatus*) +;; -let eq_of_goal = function - | Cic.Appl [Cic.MutInd(uri,0,_);_;_;_] when LibraryObjects.is_eq_URI uri -> - uri - | _ -> raise (ProofEngineTypes.Fail (lazy ("The goal is not an equality "))) -;; -(* DEMODULATE *) -let demodulate_tac ~dbd ~universe (proof,goal)= +(* NEW DEMODULATE *) +let demodulate_tac ~dbd ~universe ~params:(univ, params) (proof,goal)= let curi,metasenv,_subst,pbo,pty, attrs = proof in let metano,context,ty = CicUtil.lookup_meta goal metasenv in + let universe = universe_of_params metasenv context universe univ in let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in - let initgoal = [], [], ty in - let eq_uri = eq_of_goal ty in + let initgoal = [], metasenv, ty in + let eq_uri = + match LibraryObjects.eq_URI () with + | Some (uri) -> uri + | None -> raise (ProofEngineTypes.Fail (lazy "equality not declared")) in + (* let eq_uri = eq_of_goal ty in *) let (active,passive,bag), cache, maxm = - init_cache_and_tables dbd false true universe (proof,goal) in + init_cache_and_tables + ~dbd false false true true universe (proof,goal) + in let equalities = (Saturation.list_of_passive passive) in (* we demodulate using both actives passives *) let table = @@ -1932,15 +1865,16 @@ let demodulate_tac ~dbd ~universe (proof,goal)= (fun tbl eq -> Indexing.index tbl eq) (snd active) equalities in - let changed,(newproof,newmetasenv, newty) = - Indexing.demodulation_goal bag - (metasenv,context,CicUniv.empty_ugraph) table initgoal + let changed,(newproof,newmetasenv, newty) = + (* Indexing.demodulation_goal bag *) + Indexing.demod bag + (metasenv,context,CicUniv.oblivion_ugraph) table initgoal in if changed then begin let opengoal = Equality.Exact (Cic.Meta(maxm,irl)) in let proofterm,_ = - Equality.build_goal_proof bag + Equality.build_goal_proof (~contextualize:false) bag eq_uri newproof opengoal ty [] context metasenv in let extended_metasenv = (maxm,context,newty)::metasenv in @@ -1959,6 +1893,10 @@ let demodulate_tac ~dbd ~universe (proof,goal)= ~pattern:(ProofEngineTypes.conclusion_pattern None)) initialstatus*) ;; -let demodulate_tac ~dbd ~universe = - ProofEngineTypes.mk_tactic (demodulate_tac ~dbd ~universe);; +let demodulate_tac ~dbd ~params ~universe = + ProofEngineTypes.mk_tactic (demodulate_tac ~dbd ~params ~universe);; + +let pp_proofterm = Equality.pp_proofterm;; +let revision = "$Revision$";; +let size_and_depth context metasenv t = 100, 100