(* Copyright (C) 2002, HELM Team.
-
*
* This file is part of HELM, an Hypertextual, Electronic
* Library of Mathematics, developed at the Computer Science
let names = List.map (function None -> None | Some (x,_) -> Some x) ctx in
CicPp.pp t names
;;
+
let is_propositional context sort =
match CicReduction.whd context sort with
| Cic.Sort Cic.Prop
| Cic.Sort (Cic.CProp _) -> true
| _-> false
;;
+
let is_in_prop context subst metasenv ty =
let sort,u = typeof ~subst metasenv context ty CicUniv.oblivion_ugraph in
is_propositional context sort
| _ -> false
;;
-type auto_params = Cic.term list * (string * string) list
+type auto_params = Cic.term list option * (string * string) list
let elems = ref [] ;;
(* functions for retrieving theorems *)
-exception FillingFailure of AutoCache.cache * int
+
+exception FillingFailure of AutoCache.cache * AutomationCache.tables
let rec unfold context = function
| Cic.Prod(name,s,t) ->
List.partition (fun (_,ty) -> is_an_equality ty)
-let default_auto maxm _ _ cache _ _ _ _ = [],cache,maxm ;;
+let default_auto tables _ cache _ _ _ _ = [],cache,tables ;;
(* giusto per provare che succede
let is_unit_equation context metasenv oldnewmeta term =
(only (MetadataConstraints.UriManagerSet.add eq_uri signature)
context metasenv) candidates
-let build_equality bag head args proof newmetas maxmeta =
+let build_equality bag head args proof newmetas =
match head with
| Cic.Appl [Cic.MutInd (uri, _, _); ty; t1; t2] ->
let p =
(* let w = compute_equality_weight stat in *)
let w = 0 in
let proof = Equality.Exact p in
- let e = Equality.mk_equality bag (w, proof, stat, newmetas) in
+ let bag, e = Equality.mk_equality bag (w, proof, stat, newmetas) in
(* to clean the local context of metas *)
- Equality.fix_metas bag maxmeta e
+ Equality.fix_metas bag e
| _ -> assert false
;;
let partition_unit_equalities context metasenv newmeta bag equations =
List.fold_left
- (fun (units,other,maxmeta)(t,ty) ->
+ (fun (bag,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
+ bag, units,(t,ty)::other,maxmeta
else
match is_unit_equation context metasenv maxmeta ty with
| Some (args,metasenv,newmetas,head,newmeta') ->
- let maxmeta,equality =
- build_equality bag head args t newmetas newmeta' in
- equality::units,other,maxmeta
+ let bag, equality =
+ build_equality bag head args t newmetas in
+ bag, equality::units,other,maxmeta
| None ->
- units,(t,ty)::other,maxmeta)
- ([],[],newmeta) equations
-
-let empty_tables =
- (Saturation.make_active [],
- Saturation.make_passive [],
- Equality.mk_equality_bag)
-
+ bag, units,(t,ty)::other,maxmeta)
+ (bag,[],[],newmeta) equations
+;;
let init_cache_and_tables
- ?dbd use_library paramod use_context dont_filter universe (proof, goal)
+ ?dbd ~use_library ~use_context
+ automation_cache restricted_univ (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 _, metasenv, subst, _, _, _ = proof in
let _,context,_ = CicUtil.lookup_meta goal 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 =
- 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 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.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
+ let add_list_to_tables metasenv subst automation_cache ct =
+ List.fold_left
+ (fun automation_cache (t,_) ->
+ AutomationCache.add_term_to_active automation_cache
+ metasenv subst context t None)
+ automation_cache ct
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
- let active,passive,newmeta =
- if paramod then active,passive,newmeta
- else
- Saturation.pump_actives
- context bag newmeta active passive (no+1) infinity
- in
- (active,passive,bag),cache,newmeta
+ match restricted_univ with
+ | None ->
+ let ct =
+ if use_context then find_context_theorems context metasenv else []
+ in
+ let lt =
+ match use_library, dbd with
+ | true, Some dbd -> find_library_theorems dbd metasenv goal
+ | _ -> []
+ in
+ let cache = AutoCache.cache_empty in
+ let cache = cache_add_list cache context (ct@lt) in
+ let automation_cache =
+ add_list_to_tables metasenv subst automation_cache ct
+ in
+(* AutomationCache.pp_cache automation_cache; *)
+ automation_cache.AutomationCache.univ,
+ automation_cache.AutomationCache.tables,
+ cache
+ | Some restricted_univ ->
+ let t_ty =
+ List.map
+ (fun t ->
+ let ty, _ = CicTypeChecker.type_of_aux'
+ metasenv ~subst:[] context t CicUniv.oblivion_ugraph
+ in
+ t, ty)
+ restricted_univ
+ in
+ (* let automation_cache = AutomationCache.empty () in *)
+ let automation_cache =
+ let universe = Universe.empty in
+ let universe =
+ Universe.index_list universe context t_ty
+ in
+ { automation_cache with AutomationCache.univ = universe }
+ in
+ let ct =
+ if use_context then find_context_theorems context metasenv else t_ty
+ in
+ let automation_cache =
+ add_list_to_tables metasenv subst automation_cache ct
+ in
+ (* AutomationCache.pp_cache automation_cache; *)
+ automation_cache.AutomationCache.univ,
+ automation_cache.AutomationCache.tables,
+ cache_empty
+;;
-let fill_hypothesis context metasenv oldnewmeta term tables (universe:Universe.universe) cache auto fast =
- let head, metasenv, args, newmeta =
- TermUtil.saturate_term oldnewmeta metasenv context term 0
+let fill_hypothesis context metasenv subst term tables (universe:Universe.universe) cache auto fast =
+ let actives, passives, bag = tables in
+ let bag, head, metasenv, args =
+ Equality.saturate_term bag metasenv subst context term
in
+ let tables = actives, passives, bag in
let propositional_args =
HExtlib.filter_map
(function
| _ -> assert false)
args
in
- let results,cache,newmeta =
+ let results,cache,tables =
if propositional_args = [] then
- let newmetas = List.filter (fun (i,_,_) -> i >= oldnewmeta) metasenv in
- [args,metasenv,newmetas,head,newmeta],cache,newmeta
+ let _,_,bag = tables in
+ let newmetas = Equality.filter_metasenv_gt_maxmeta bag metasenv in
+ [args,metasenv,newmetas,head],cache,tables
else
(*
let proof =
maxwidth = 2;maxdepth = 4;
use_paramod=true;use_only_paramod=false}
in
- match auto newmeta tables universe cache context metasenv propositional_args flags with
- | [],cache,newmeta -> raise (FillingFailure (cache,newmeta))
- | substs,cache,newmeta ->
- List.map
- (fun subst ->
+ match auto tables universe cache context metasenv propositional_args flags with
+ | [],cache,tables -> raise (FillingFailure (cache,tables))
+ | substs,cache,tables ->
+ let actives, passaives, bag = tables in
+ let bag, res =
+ List.fold_right
+ (fun subst (bag,acc) ->
let metasenv =
CicMetaSubst.apply_subst_metasenv subst metasenv
in
let head = CicMetaSubst.apply_subst subst head in
- let newmetas =
- List.filter (fun (i,_,_) ->i >= oldnewmeta) metasenv
- in
+ let newmetas = Equality.filter_metasenv_gt_maxmeta bag metasenv in
let args = List.map (CicMetaSubst.apply_subst subst) args in
let newm = CicMkImplicit.new_meta metasenv subst in
- args,metasenv,newmetas,head,max newm newmeta)
- substs, cache, newmeta
+ let bag = Equality.push_maxmeta bag newm in
+ bag, ((args,metasenv,newmetas,head) :: acc))
+ substs (bag,[])
+ in
+ let tables = actives, passives, bag in
+ res, cache, tables
in
- results,cache,newmeta
+ results,cache,tables
+;;
-let build_equalities auto context metasenv tables universe cache newmeta equations =
+let build_equalities auto context metasenv subst tables universe cache equations =
List.fold_left
- (fun (facts,cache,newmeta) (t,ty) ->
+ (fun (tables,facts,cache) (t,ty) ->
(* in any case we add the equation to the cache *)
let cache = AutoCache.cache_add_list cache context [(t,ty)] in
try
- let saturated,cache,newmeta =
- fill_hypothesis context metasenv newmeta ty tables universe cache auto true
+ let saturated, cache, tables =
+ fill_hypothesis context metasenv subst ty tables universe cache auto true
in
- let (active,passive,bag) = tables in
- let eqs,bag,newmeta =
+ let eqs, tables =
List.fold_left
- (fun (acc,bag,newmeta) (args,metasenv,newmetas,head,newmeta') ->
- let maxmeta,equality =
- build_equality bag head args t newmetas newmeta'
+ (fun (acc, tables) (args,metasenv,newmetas,head) ->
+ let actives, passives, bag = tables in
+ let bag, equality =
+ build_equality bag head args t newmetas
in
- equality::acc,bag,maxmeta)
- ([],bag,newmeta) saturated
+ let tables = actives, passives, bag in
+ equality::acc,tables)
+ ([],tables) saturated
in
- (eqs@facts, cache, newmeta)
- with FillingFailure (cache,newmeta) ->
+ (tables, eqs@facts, cache)
+ with FillingFailure (cache,tables) ->
(* if filling hypothesis fails we add the equation to
the cache *)
- (facts,cache,newmeta)
+ (tables,facts,cache)
)
- ([],cache,newmeta) equations
+ (tables,[],cache) equations
-let close_more tables maxmeta context status auto universe cache =
- let (active,passive,bag) = tables in
+let close_more tables context status auto signature universe cache =
let proof, goalno = status in
- let _, metasenv,_subst,_,_, _ = proof in
- let signature = MetadataQuery.signature_of metasenv goalno in
+ let _, metasenv,subst,_,_, _ = proof in
let equations =
retrieve_equations false signature universe cache context metasenv
in
(* retrieve_equations could also return flexible terms *)
if is_an_equality ty then Some(t,ty) else None)
equations in
- let units, cache, maxm =
- build_equalities auto context metasenv tables universe cache maxmeta eqs_and_types in
- debug_print (lazy (">>>>>>> gained from a new context saturation >>>>>>>>>" ^
- string_of_int maxm));
- List.iter
- (fun e -> debug_print (lazy (Equality.string_of_equality e)))
- units;
- debug_print (lazy ">>>>>>>>>>>>>>>>>>>>>>");
+ let tables, units, cache =
+ build_equalities auto context metasenv subst tables universe cache eqs_and_types
+ in
+ let active,passive,bag = tables in
let passive = Saturation.add_to_passive units passive in
let no = List.length units in
- debug_print (lazy ("No = " ^ (string_of_int no)));
- let active,passive,newmeta =
- Saturation.pump_actives context bag maxm active passive (no+1) infinity
+ let active, passive, bag =
+ Saturation.pump_actives context bag active passive (no+1) infinity
in
- (active,passive,bag),cache,newmeta
+ (active,passive,bag), cache
+;;
-let find_context_equalities
- maxmeta bag context proof (universe:Universe.universe) cache
+let find_context_equalities dbd tables context proof (universe:Universe.universe) cache
=
let module C = Cic in
let module S = CicSubstitution in
let module T = CicTypeChecker in
- let _,metasenv,_subst,_,_, _ = proof in
- let newmeta = max (ProofEngineHelpers.new_meta_of_proof ~proof) maxmeta in
+ let _,metasenv,subst,_,_, _ = proof in
(* if use_auto is true, we try to close the hypothesis of equational
statements using auto; a naif, and probably wrong approach *)
- let rec aux cache index newmeta = function
- | [] -> [], newmeta,cache
+ let rec aux tables cache index = function
+ | [] -> tables, [], cache
| (Some (_, C.Decl (term)))::tl ->
debug_print
(lazy
(Printf.sprintf "Examining: %d (%s)" index (CicPp.ppterm term)));
- let do_find context term =
+ let do_find tables context term =
match term with
| C.Prod (name, s, t) when is_an_equality t ->
(try
-
let term = S.lift index term in
- let saturated,cache,newmeta =
- fill_hypothesis context metasenv newmeta term
- empty_tables universe cache default_auto false
+ let saturated, cache, tables =
+ fill_hypothesis context metasenv subst term
+ tables universe cache default_auto false
in
- let eqs,newmeta =
+ let actives, passives, bag = tables in
+ let bag,eqs =
List.fold_left
- (fun (acc,newmeta) (args,metasenv,newmetas,head,newmeta') ->
- let newmeta, equality =
- build_equality
- bag head args (Cic.Rel index) newmetas (max newmeta newmeta')
+ (fun (bag,acc) (args,metasenv,newmetas,head) ->
+ let bag, equality =
+ build_equality bag head args (Cic.Rel index) newmetas
in
- equality::acc, newmeta + 1)
- ([],newmeta) saturated
+ bag, equality::acc)
+ (bag,[]) saturated
in
- eqs, newmeta, cache
- with FillingFailure (cache,newmeta) ->
- [],newmeta,cache)
+ let tables = actives, passives, bag in
+ tables, eqs, cache
+ with FillingFailure (cache,tables) ->
+ tables, [], cache)
| C.Appl [C.MutInd (uri, _, _); ty; t1; t2]
when LibraryObjects.is_eq_URI uri ->
let term = S.lift index term in
- let newmeta, e =
- build_equality bag term [] (Cic.Rel index) [] newmeta
+ let actives, passives, bag = tables in
+ let bag, e =
+ build_equality bag term [] (Cic.Rel index) []
in
- [e], (newmeta+1),cache
- | _ -> [], newmeta, cache
+ let tables = actives, passives, bag in
+ tables, [e], cache
+ | _ -> tables, [], cache
in
- let eqs, newmeta, cache = do_find context term in
- let rest, newmeta,cache = aux cache (index+1) newmeta tl in
- List.map (fun x -> index,x) eqs @ rest, newmeta, cache
+ let tables, eqs, cache = do_find tables context term in
+ let tables, rest, cache = aux tables cache (index+1) tl in
+ tables, List.map (fun x -> index,x) eqs @ rest, cache
| _::tl ->
- aux cache (index+1) newmeta tl
- in
- let il, maxm, cache =
- aux cache 1 newmeta context
+ aux tables cache (index+1) tl
in
+ let tables, il, cache = aux tables cache 1 context in
let indexes, equalities = List.split il in
- indexes, equalities, maxm, cache
+ tables, indexes, equalities, cache
;;
(********** PARAMETERS PASSING ***************)
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)
+
+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 ")))
+;;
+
+(* performs steps of rewrite with the universe, obtaining if possible
+ * a trivial goal *)
+let solve_rewrite ~automation_cache ~params:(univ,params) (proof,goal)=
+ let steps = int_of_string (string params "steps" "4") in
+ let use_context = bool params "use_context" true in
+ let universe, tables, cache =
+ init_cache_and_tables ~use_library:false ~use_context
+ automation_cache univ (proof,goal)
+ in
+ let actives, passives, bag = tables in
+ let pa,metasenv,subst,pb,pc,pd = proof in
+ let _,context,ty = CicUtil.lookup_meta goal metasenv in
+ let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
+ let context = CicMetaSubst.apply_subst_context subst context in
+ let ty = CicMetaSubst.apply_subst subst ty in
+ let eq_uri = eq_of_goal ty in
+ let initgoal = [], metasenv, ty in
+ let table =
+ let equalities = (Saturation.list_of_passive passives) in
+ List.fold_left (fun tbl eq -> Indexing.index tbl eq) (snd actives) equalities
+ in
+ let env = metasenv,context,CicUniv.oblivion_ugraph in
+ debug_print (lazy ("demod to solve: " ^ CicPp.ppterm ty));
+ match Indexing.solve_demodulating bag env table initgoal steps with
+ | Some (bag, gproof, metasenv, sub_subst, proof) ->
+ let subst_candidates,extra_infos =
+ List.split
+ (HExtlib.filter_map
+ (fun (i,c,_) ->
+ if i <> goal && c = context then Some (i,(c,ty)) else None)
+ metasenv)
+ in
+ let proofterm,proto_subst =
+ let proof = Equality.add_subst sub_subst proof in
+ Equality.build_goal_proof
+ bag eq_uri gproof proof ty subst_candidates context metasenv
+ in
+ let proofterm = Subst.apply_subst sub_subst proofterm in
+ let extrasubst =
+ HExtlib.filter_map
+ (fun (i,((c,ty),t)) ->
+ match t with
+ | Cic.Meta (j,_) when i=j -> None
+ | _ -> Some (i,(c,t,ty)))
+ (List.combine subst_candidates
+ (List.combine extra_infos proto_subst))
+ in
+ let subst = subst @ extrasubst in
+ let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
+ let proofterm, _, metasenv,subst, _ =
+ CicRefine.type_of metasenv subst context proofterm
+ CicUniv.oblivion_ugraph
+ in
+ let status = (pa,metasenv,subst,pb,pc,pd), goal in
+ ProofEngineTypes.apply_tactic
+ (PrimitiveTactics.apply_tac ~term:proofterm) status
+ | None ->
+ raise
+ (ProofEngineTypes.Fail (lazy
+ ("Unable to solve with " ^ string_of_int steps ^ " demodulations")))
+;;
+
+(* 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 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 (_,metasenv,subst,_,_,_), open_goals =
+ ProofEngineTypes.apply_tactic
+ (PrimitiveTactics.apply_tac ~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 ~automation_cache 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 context,ty,bo =
+ match obj with
+ | Cic.Constant(n, _, ty ,_, _) -> open_type ty (Cic.Const(uri,[]))
+ | _ -> raise (ProofEngineTypes.Fail (lazy "not a theorem"))
+ in
+ 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
+ (* retrieve equations from the universe universe *)
+ (* XXX automation_cache *)
+ let universe = automation_cache.AutomationCache.univ in
+ let equations =
+ retrieve_equations true signature universe AutoCache.cache_empty context []
+ 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' [] 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 bag, 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
+ 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*)
+;;
+
+
+(* NEW DEMODULATE *)
+let demodulate ~dbd ~automation_cache ~params:(univ, params) (proof,goal)=
+ let universe, tables, cache =
+ init_cache_and_tables
+ ~dbd ~use_library:false ~use_context:true
+ automation_cache univ (proof,goal)
+ in
+ let eq_uri =
+ match LibraryObjects.eq_URI () with
+ | Some (uri) -> uri
+ | None -> raise (ProofEngineTypes.Fail (lazy "equality not declared")) in
+ let active, passive, bag = tables in
+ let curi,metasenv,subst,pbo,pty, attrs = proof in
+ let metano,context,ty = CicUtil.lookup_meta goal metasenv in
+ let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
+ let initgoal = [], metasenv, ty in
+ let equalities = (Saturation.list_of_passive passive) in
+ (* we demodulate using both actives passives *)
+ let env = metasenv,context,CicUniv.empty_ugraph in
+ debug_print (lazy ("PASSIVES:" ^ string_of_int(List.length equalities)));
+ List.iter (fun e -> debug_print (lazy (Equality.string_of_equality ~env e)))
+ equalities;
+ let table =
+ List.fold_left
+ (fun tbl eq -> Indexing.index tbl eq)
+ (snd active) equalities
+ in
+ 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 maxm = CicMkImplicit.new_meta metasenv subst in
+ let opengoal = Equality.Exact (Cic.Meta(maxm,irl)) in
+ let subst_candidates = List.map (fun (i,_,_) -> i) metasenv in
+ let subst_candidates = List.filter (fun x-> x <> goal) subst_candidates in
+ let proofterm, proto_subst =
+ Equality.build_goal_proof (~contextualize:false) bag
+ eq_uri newproof opengoal ty subst_candidates context metasenv
+ in
+ (* XXX understan what to do with proto subst *)
+ let metasenv = (maxm,context,newty)::metasenv in
+ let proofterm, _, metasenv, subst, _ =
+ CicRefine.type_of metasenv subst context proofterm
+ CicUniv.oblivion_ugraph
+ in
+ let extended_status = (curi,metasenv,subst,pbo,pty, attrs),goal in
+ let proof,gl =
+ ProofEngineTypes.apply_tactic
+ (PrimitiveTactics.apply_tac ~term:proofterm) extended_status
+ in
+ proof,maxm::gl
+ end
+ else
+ raise (ProofEngineTypes.Fail (lazy "no progress"))
+;;
+let demodulate_tac ~dbd ~params:(_,flags as params) ~automation_cache =
+ ProofEngineTypes.mk_tactic
+ (fun status ->
+ let all = bool flags "all" false in
+ if all then
+ solve_rewrite ~params ~automation_cache status
+ else
+ demodulate ~dbd ~params ~automation_cache status)
+;;
(***************** applyS *******************)
-let new_metasenv_and_unify_and_t
- dbd flags universe proof goal ?tables newmeta' metasenv'
- context term' ty termty goal_arity
+let apply_smart_aux
+ dbd automation_cache (params:auto_params) proof goal newmeta' metasenv' subst
+ context term' ty termty goal_arity
=
- let ppterm = ppterm context in
- let (consthead,newmetasenv,arguments,_) =
+ let consthead,newmetasenv,arguments,_ =
TermUtil.saturate_term newmeta' metasenv' context termty goal_arity in
let term'' =
- match arguments with [] -> term' | _ -> Cic.Appl (term'::arguments)
+ match arguments with
+ | [] -> term'
+ | _ -> Cic.Appl (term'::arguments)
in
- let proof',oldmetasenv =
- let (puri,metasenv,_subst,pbo,pty, attrs) = proof in
- (puri,newmetasenv,_subst,pbo,pty, attrs),metasenv
+ let consthead =
+ let rec aux t = function
+ | [] ->
+ let t = CicReduction.normalize ~delta:false context t in
+ (match t, ty with
+ | Cic.Appl (hd1::_), Cic.Appl (hd2::_) when hd1 <> hd2 ->
+ let t = ProofEngineReduction.unfold context t in
+ (match t with
+ | Cic.Appl (hd1'::_) when hd1' = hd2 -> t
+ | _ -> raise (ProofEngineTypes.Fail (lazy "incompatible head")))
+ | _ -> t)
+ | arg :: tl ->
+ match CicReduction.whd context t with
+ | Cic.Prod (_,_,tgt) ->
+ aux (CicSubstitution.subst arg tgt) tl
+ | _ -> assert false
+ in
+ aux termty arguments
in
let goal_for_paramod =
match LibraryObjects.eq_URI () with
| Some uri ->
- Cic.Appl [Cic.MutInd (uri,0,[]); Cic.Sort Cic.Prop; consthead; ty]
+ Cic.Appl [Cic.MutInd (uri,0,[]); Cic.Implicit (Some `Type); consthead; ty]
| None -> raise (ProofEngineTypes.Fail (lazy "No equality defined"))
in
- let newmeta = CicMkImplicit.new_meta newmetasenv (*subst*) [] in
- let metasenv_for_paramod = (newmeta,context,goal_for_paramod)::newmetasenv in
- let proof'' =
- let uri,_,_subst,p,ty, attrs = proof' in
- uri,metasenv_for_paramod,_subst,p,ty, attrs
- in
- let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
- let proof''',goals =
- ProofEngineTypes.apply_tactic
- (EqualityTactics.rewrite_tac ~direction:`RightToLeft
- ~pattern:(ProofEngineTypes.conclusion_pattern None)
- (Cic.Meta(newmeta,irl)) [])
- (proof'',goal)
- in
- let goal = match goals with [g] -> g | _ -> assert false in
- let proof'''', _ =
- ProofEngineTypes.apply_tactic
- (PrimitiveTactics.apply_tac term'')
- (proof''',goal)
- in
- let (active, passive,bag), cache, maxm =
- init_cache_and_tables ~dbd flags.use_library false (* was true *)
- true false universe
- (proof'''',newmeta)
+ try
+ let goal_for_paramod, _, newmetasenv, subst, _ =
+ CicRefine.type_of newmetasenv subst context goal_for_paramod
+ CicUniv.oblivion_ugraph
in
- match
- Saturation.given_clause bag maxm (proof'''',newmeta) active passive
- 10 10 flags.timeout
- with
- | None, _,_,_ ->
- raise (ProofEngineTypes.Fail (lazy ("FIXME: propaga le tabelle")))
- | Some (_,proof''''',_), active,passive,_ ->
- proof''''',
- ProofEngineHelpers.compare_metasenvs ~oldmetasenv
- ~newmetasenv:(let _,m,_subst,_,_, _ = proof''''' in m), active, passive
-(*
- debug_print
- (lazy
- ("SUBSUMPTION SU: " ^ string_of_int newmeta ^ " " ^ ppterm goal_for_paramod));
- let res, maxmeta =
- Saturation.all_subsumed bag maxm (proof'''',newmeta) active passive
- in
- if res = [] then
- raise (ProofEngineTypes.Fail (lazy("BUM")))
- else let (_,proof''''',_) = List.hd res in
- proof''''',ProofEngineHelpers.compare_metasenvs ~oldmetasenv
- ~newmetasenv:(let _,m,_subst,_,_, _ = proof''''' in m), active, passive
+ let newmeta = CicMkImplicit.new_meta newmetasenv subst in
+ let metasenv_for_paramod = (newmeta,context,goal_for_paramod)::newmetasenv in
+ let proof'' =
+ let uri,_,_,p,ty, attrs = proof in
+ uri,metasenv_for_paramod,subst,p,ty, attrs
+ in
+ let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
+(*
+ prerr_endline ("------ prima di rewrite su ------ " ^ string_of_int goal);
+ prerr_endline ("menv:\n"^CicMetaSubst.ppmetasenv [] metasenv_for_paramod);
+ prerr_endline ("subst:\n"^CicMetaSubst.ppsubst
+ ~metasenv:(metasenv_for_paramod)
+ subst);
*)
-;;
-
-let rec count_prods context ty =
- match CicReduction.whd context ty with
- Cic.Prod (n,s,t) -> 1 + count_prods (Some (n,Cic.Decl s)::context) t
- | _ -> 0
+
+ let (proof''',goals) =
+ ProofEngineTypes.apply_tactic
+ (EqualityTactics.rewrite_tac ~direction:`RightToLeft
+ ~pattern:(ProofEngineTypes.conclusion_pattern None)
+ (Cic.Meta(newmeta,irl)) []) (proof'',goal)
+ in
+ let goal = match goals with [g] -> g | _ -> assert false in
+ let proof'''', _ =
+ ProofEngineTypes.apply_tactic
+ (PrimitiveTactics.apply_tac term'')
+ (proof''',goal)
+ in
+
+
+ let (_,m,_,_,_,_ as p) =
+ let pu,metasenv,subst,proof,px,py = proof'''' in
+ let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
+ let proof'''' = pu,metasenv,subst,proof,px,py in
+ let univ, params = params in
+ let use_context = bool params "use_context" true in
+ let universe, (active,passive,bag), cache =
+ init_cache_and_tables ~use_library:false ~use_context
+ automation_cache univ (proof'''',newmeta)
+ in
+ match
+ Saturation.solve_narrowing bag (proof'''',newmeta) active passive
+ 2 (*0 infinity*)
+ with
+ | None, active, passive, bag ->
+ raise (ProofEngineTypes.Fail (lazy ("paramod fails")))
+ | Some(subst',(pu,metasenv,_,proof,px, py),open_goals),active,
+ passive,bag ->
+ assert_subst_are_disjoint subst subst';
+ let subst = subst@subst' in
+ pu,metasenv,subst,proof,px,py
+ in
+
+(*
+ let (_,m,_,_,_,_ as p),_ =
+ solve_rewrite ~params ~automation_cache (proof'''',newmeta)
+ in
+*)
+
+ let open_goals =
+ ProofEngineHelpers.compare_metasenvs ~oldmetasenv:metasenv' ~newmetasenv:m
+ in
+ p, open_goals
+ with
+ CicRefine.RefineFailure msg ->
+ raise (ProofEngineTypes.Fail msg)
+;;
let apply_smart
- ~dbd ~term ~subst ~universe ?tables ~params:(univ,params) (proof, goal)
+ ~dbd ~term ~automation_cache ~params (proof, goal)
=
let module T = CicTypeChecker in
let module R = CicReduction in
let module C = Cic in
- let (_,metasenv,_subst,_,_, _) = proof 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
in
let metasenv' = metasenv@newmetasenvfragment in
let termty,_ =
- CicTypeChecker.type_of_aux' metasenv' context term' CicUniv.oblivion_ugraph
+ CicTypeChecker.type_of_aux'
+ metasenv' ~subst 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 proof, gl, active, passive =
- new_metasenv_and_unify_and_t dbd flags universe proof goal ?tables
- newmeta' metasenv' context term' ty termty goal_arity
+ let goal_arity =
+ let rec count_prods context ty =
+ match CicReduction.whd ~subst context ty with
+ | Cic.Prod (n,s,t) -> 1 + count_prods (Some (n,Cic.Decl s)::context) t
+ | _ -> 0
+ in
+ count_prods context ty
in
- proof, gl, active, passive
+ apply_smart_aux dbd automation_cache params proof goal
+ newmeta' metasenv' subst context term' ty termty goal_arity
;;
-(****************** AUTO ********************)
-
+let applyS_tac ~dbd ~term ~params ~automation_cache =
+ ProofEngineTypes.mk_tactic
+ (fun status ->
+ try
+ apply_smart ~dbd ~term ~params ~automation_cache status
+ with
+ | CicUnification.UnificationFailure msg
+ | CicTypeChecker.TypeCheckerFailure msg ->
+ raise (ProofEngineTypes.Fail msg))
+;;
-(*
-let prop = function (_,depth,P) -> depth < 9 | _ -> false;;
-*)
+(****************** AUTO ********************)
let calculate_timeout flags =
if flags.timeout = 0. then
let ensure_equational t =
if is_an_equational_goal t then true
else false
- (*
- let msg="Not an equational goal.\nYou cant use the paramodulation flag"in
- raise (ProofEngineTypes.Fail (lazy msg))
- *)
in
(flags.use_paramod && is_an_equational_goal goalty) ||
(flags.use_only_paramod && ensure_equational goalty)
;;
-(*
-let cache_add_success sort cache k v =
- if sort = P then cache_add_success cache k v else cache_remove_underinspection
- cache k
-;;
-*)
type menv = Cic.metasenv
type subst = Cic.substitution
let candidate_no = ref 0;;
type candidate = int * Cic.term Lazy.t
type cache = AutoCache.cache
-type tables =
- Saturation.active_table * Saturation.passive_table * Equality.equality_bag
type fail =
(* the goal (mainly for depth) and key of the goal *)
* end with the same (S(g,_)) *)
elem list
type auto_result =
- (* menv, subst, alternatives, tables, cache, maxmeta *)
- | Proved of menv * subst * elem list * tables * cache * int
- | Gaveup of tables * cache * int
+ (* menv, subst, alternatives, tables, cache *)
+ | Proved of menv * subst * elem list * AutomationCache.tables * cache
+ | Gaveup of AutomationCache.tables * cache
(* the status exported to the external observer *)
let cc,_,goalty = List.assoc goalno s in
(* XXX applicare la subst al contesto? *)
Some (cc, CicMetaSubst.apply_subst s goalty)
- with Not_found -> None
+ with Not_found ->
+ None
;;
let pp_status ctx status =
let close_failures (fl : fail list) (cache : cache) =
List.fold_left
(fun cache ((gno,depth,_),gty) ->
- debug_print (lazy ("FAIL: INDUCED: " ^ string_of_int gno));
- cache_add_failure cache gty depth)
+ if CicUtil.is_meta_closed gty then
+ ( debug_print (lazy ("FAIL: INDUCED: " ^ string_of_int gno));
+ cache_add_failure cache gty depth)
+ else
+ cache)
cache fl
;;
let put_in_subst subst metasenv (goalno,_,_) canonical_ctx t ty =
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
+ tables cache depth fake_proof goalno goalty subst context
flags
=
let active,passive,bag = tables in
let goal_steps, saturation_steps, timeout =
max_int,max_int,flags.timeout
in
-
match
- Saturation.given_clause bag maxm status active passive
+ Saturation.given_clause bag status active passive
goal_steps saturation_steps timeout
with
- | None, active, passive, maxmeta ->
- [], (active,passive,bag), cache, maxmeta, flags
+ | None, active, passive, bag ->
+ [], (active,passive,bag), cache, flags
| Some(subst',(_,metasenv,_subst,proof,_, _),open_goals),active,
- passive,maxmeta ->
+ passive,bag ->
assert_subst_are_disjoint subst subst';
let subst = subst@subst' in
let open_goals =
List.map (fun (x,sort) -> x,depth-1,sort) open_goals
in
incr candidate_no;
- [(!candidate_no,proof),metasenv,subst,open_goals],
- (active,passive,bag),
- cache, maxmeta, flags
+ [(!candidate_no,proof),metasenv,subst,open_goals],
+ (active,passive,bag), cache, flags
end
else
begin
- debug_print
- (lazy
- ("SUBSUMPTION SU: " ^ string_of_int goalno ^ " " ^ ppterm goalty));
- let res, maxmeta =
- Saturation.all_subsumed bag maxm status active passive
+ debug_print (lazy ("NARROWING DEL GOAL: " ^
+ string_of_int goalno ^ " " ^ ppterm goalty ));
+ let goal_steps, saturation_steps, timeout =
+ 1,0,flags.timeout
in
- assert (maxmeta >= maxm);
+ match
+ Saturation.solve_narrowing bag status active passive goal_steps
+ with
+ | None, active, passive, bag ->
+ [], (active,passive,bag), cache, flags
+ | Some(subst',(_,metasenv,_subst,proof,_, _),open_goals),active,
+ passive,bag ->
+ assert_subst_are_disjoint subst subst';
+ let subst = 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;
+ [(!candidate_no,proof),metasenv,subst,open_goals],
+ (active,passive,bag), cache, flags
+ end
+(*
+ begin
+ let params = ([],["use_context","false"]) in
+ let automation_cache = {
+ AutomationCache.tables = tables ;
+ AutomationCache.univ = Universe.empty; }
+ in
+ try
+ let ((_,metasenv,subst,_,_,_),open_goals) =
+
+ solve_rewrite ~params ~automation_cache
+ (fake_proof, goalno)
+ in
+ let proof = lazy (Cic.Meta (-1,[])) in
+ [(!candidate_no,proof),metasenv,subst,[]],tables, cache, flags
+ with ProofEngineTypes.Fail _ -> [], tables, cache, flags
+(*
+ let res = Saturation.all_subsumed bag status active passive in
let res' =
List.map
(fun (subst',(_,metasenv,_subst,proof,_, _),open_goals) ->
(!candidate_no,proof),metasenv,subst,open_goals)
res
in
- res', (active,passive,bag), cache, maxmeta, flags
+ res', (active,passive,bag), cache, flags
+*)
end
+*)
+;;
+
+let sort_new_elems =
+ List.sort (fun (_,_,_,l1) (_,_,_,l2) ->
+ let p1 = List.length (prop_only l1) in
+ let p2 = List.length (prop_only l2) in
+ if p1 = p2 then List.length l1 - List.length l2 else p1-p2)
;;
-let try_candidate
- goalty tables maxm subst fake_proof goalno depth context cand
+
+let try_candidate dbd
+ goalty tables subst fake_proof goalno depth context cand
=
let ppterm = ppterm context in
try
- let subst,((_,metasenv,_,_,_,_), open_goals),maxmeta =
- (PrimitiveTactics.apply_with_subst ~subst ~maxmeta:maxm ~term:cand)
+ let actives, passives, bag = tables in
+ let (_,metasenv,subst,_,_,_), open_goals =
+ ProofEngineTypes.apply_tactic
+ (PrimitiveTactics.apply_tac ~term:cand)
(fake_proof,goalno)
in
+ let tables = actives, passives,
+ Equality.push_maxmeta bag
+ (max (Equality.maxmeta bag) (CicMkImplicit.new_meta metasenv subst))
+ in
debug_print (lazy (" OK: " ^ ppterm cand));
let metasenv = CicRefine.pack_coercion_metasenv metasenv 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,lazy cand),metasenv,subst,open_goals), tables , maxmeta
+ Some ((!candidate_no,lazy cand),metasenv,subst,open_goals), tables
with
- | ProofEngineTypes.Fail s -> None,tables, maxm
- | CicUnification.Uncertain s -> None,tables, maxm
+ | ProofEngineTypes.Fail s -> None,tables
+ | CicUnification.Uncertain s -> None,tables
;;
-let sort_new_elems =
- List.sort (fun (_,_,_,l1) (_,_,_,l2) ->
- List.length (prop_only l1) - List.length (prop_only l2))
+let applicative_case dbd
+ tables depth subst fake_proof goalno goalty metasenv context
+ signature universe cache flags
+=
+ (* let goalty_aux =
+ match goalty with
+ | Cic.Appl (hd::tl) ->
+ Cic.Appl (hd :: HExtlib.mk_list (Cic.Meta (0,[])) (List.length tl))
+ | _ -> goalty
+ in *)
+ let goalty_aux = goalty in
+ let candidates =
+ get_candidates flags.skip_trie_filtering universe cache goalty_aux
+ in
+ (* if the goal is an equality we skip the congruence theorems
+ let candidates =
+ if is_equational_case goalty flags
+ then List.filter not_default_eq_term candidates
+ else candidates
+ in *)
+ let candidates = List.filter (only signature context metasenv) candidates
+ in
+ let tables, elems =
+ List.fold_left
+ (fun (tables,elems) cand ->
+ match
+ try_candidate dbd goalty
+ tables subst fake_proof goalno depth context cand
+ with
+ | None, tables -> tables, elems
+ | Some x, tables -> tables, x::elems)
+ (tables,[]) candidates
+ in
+ let elems = sort_new_elems elems in
+ elems, tables, cache
+;;
+
+let try_smart_candidate dbd
+ goalty tables subst fake_proof goalno depth context cand
+=
+ let ppterm = ppterm context in
+ try
+ let params = (None,[]) in
+ let automation_cache = {
+ AutomationCache.tables = tables ;
+ AutomationCache.univ = Universe.empty; }
+ in
+ debug_print (lazy ("candidato per " ^ string_of_int goalno
+ ^ ": " ^ CicPp.ppterm cand));
+(*
+ let (_,metasenv,subst,_,_,_) = fake_proof in
+ prerr_endline ("metasenv:\n" ^ CicMetaSubst.ppmetasenv [] metasenv);
+ prerr_endline ("subst:\n" ^ CicMetaSubst.ppsubst ~metasenv subst);
+*)
+ let ((_,metasenv,subst,_,_,_),open_goals) =
+ apply_smart ~dbd ~term:cand ~params ~automation_cache
+ (fake_proof, goalno)
+ in
+ let metasenv = CicRefine.pack_coercion_metasenv metasenv 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,lazy cand),metasenv,subst,open_goals), tables
+ with
+ | ProofEngineTypes.Fail s -> None,tables
+ | CicUnification.Uncertain s -> None,tables
;;
-let applicative_case
- tables maxm depth subst fake_proof goalno goalty metasenv context universe
- cache flags
+let smart_applicative_case dbd
+ tables depth subst fake_proof goalno goalty metasenv context signature
+ universe cache flags
=
- let candidates = get_candidates flags.skip_trie_filtering universe cache goalty in
- let tables, elems, maxm =
+ let goalty_aux =
+ match goalty with
+ | Cic.Appl (hd::tl) ->
+ Cic.Appl (hd :: HExtlib.mk_list (Cic.Meta (0,[])) (List.length tl))
+ | _ -> goalty
+ in
+ let smart_candidates =
+ get_candidates flags.skip_trie_filtering universe cache goalty_aux
+ in
+ let candidates =
+ get_candidates flags.skip_trie_filtering universe cache goalty
+ in
+ let smart_candidates =
+ List.filter
+ (fun x -> not(List.mem x candidates)) smart_candidates
+ in
+ let debug_msg =
+ (lazy ("smart_candidates" ^ " = " ^
+ (String.concat "\n" (List.map CicPp.ppterm smart_candidates)))) in
+ debug_print debug_msg;
+ let candidates = List.filter (only signature context metasenv) candidates in
+ let smart_candidates =
+ List.filter (only signature context metasenv) smart_candidates
+ in
+(*
+ let penalty cand depth =
+ if only signature context metasenv cand then depth else ((prerr_endline (
+ "penalizzo " ^ CicPp.ppterm cand));depth -1)
+ in
+*)
+ let tables, elems =
List.fold_left
- (fun (tables,elems,maxm) cand ->
+ (fun (tables,elems) cand ->
match
- try_candidate goalty
- tables maxm subst fake_proof goalno depth context cand
+ try_candidate dbd goalty
+ tables subst fake_proof goalno depth context cand
with
- | None, tables,maxm -> tables,elems, maxm
- | Some x, tables, maxm -> tables,x::elems, maxm)
- (tables,[],maxm) candidates
+ | None, tables ->
+ (* if normal application fails we try to be smart *)
+ (match try_smart_candidate dbd goalty
+ tables subst fake_proof goalno depth context cand
+ with
+ | None, tables -> tables, elems
+ | Some x, tables -> tables, x::elems)
+ | Some x, tables -> tables, x::elems)
+ (tables,[]) candidates
in
- let elems = sort_new_elems elems in
- elems, tables, cache, maxm
+ let tables, smart_elems =
+ List.fold_left
+ (fun (tables,elems) cand ->
+ match
+ try_smart_candidate dbd goalty
+ tables subst fake_proof goalno depth context cand
+ with
+ | None, tables -> tables, elems
+ | Some x, tables -> tables, x::elems)
+ (tables,[]) smart_candidates
+ in
+ let elems = sort_new_elems (elems @ smart_elems) in
+ elems, tables, cache
;;
-let equational_and_applicative_case
- universe flags m s g gty tables cache maxm context
+let equational_and_applicative_case dbd
+ signature universe flags m s g gty tables cache context
=
let goalno, depth, sort = g 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
+ let elems,tables,cache, flags =
+ equational_case tables cache
depth fake_proof goalno gty s context flags
in
- let maxm = maxm1 in
- let more_elems, tables, cache, maxm1 =
+ let more_elems, tables, cache =
if flags.use_only_paramod then
- [],tables, cache, maxm
+ [],tables, cache
else
- applicative_case
- tables maxm depth s fake_proof goalno
- gty m context universe cache flags
+ applicative_case dbd
+ tables depth s fake_proof goalno
+ gty m context signature universe cache flags
in
- let maxm = maxm1 in
- elems@more_elems, tables, cache, maxm, flags
+ elems@more_elems, tables, cache, flags
else
- let elems, tables, cache, maxm =
- applicative_case tables maxm depth s fake_proof goalno
- gty m context universe cache flags
+ let elems, tables, cache =
+ match LibraryObjects.eq_URI () with
+ | Some _ ->
+ smart_applicative_case dbd tables depth s fake_proof goalno
+ gty m context signature universe cache flags
+ | None ->
+ applicative_case dbd tables depth s fake_proof goalno
+ gty m context signature universe cache flags
in
- elems, tables, cache, maxm, flags
+ elems, tables, cache, flags
;;
let rec condition_for_hint i = function
| [] -> false
in
List.for_all (fun i -> List.for_all (fun j -> i<>j) prune) s
;;
-let filter_prune_hint l =
+let filter_prune_hint c l =
let prune = !prune_hint in
prune_hint := []; (* possible race... *)
- if prune = [] then l
- else List.filter (condition_for_prune_hint prune) l
+ if prune = [] then c,l
+ else
+ cache_reset_underinspection c,
+ List.filter (condition_for_prune_hint prune) l
;;
-let auto_main tables maxm context flags universe cache elems =
+
+let auto_main dbd tables context flags signature universe cache elems =
auto_context := context;
- let rec aux tables maxm flags cache (elems : status) =
-(* pp_status context elems; *)
+ let rec aux tables flags cache (elems : status) =
+ 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
+ let cache, elems = filter_prune_hint cache 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
+ aux tables flags cache orlist
| _ ->
hint := None;
- aux tables maxm flags cache elems)
+ aux tables flags cache elems)
| [] ->
(* complete failure *)
debug_print (lazy "give up");
- Gaveup (tables, cache, maxm)
+ Gaveup (tables, cache)
| (m, s, _, _, [],_)::orlist ->
(* complete success *)
debug_print (lazy "success");
- Proved (m, s, orlist, tables, cache, maxm)
+ Proved (m, s, orlist, tables, cache)
| (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 *)
debug_print (lazy "skip existential goal");
- aux tables maxm flags cache ((m, s, size, don, todo, fl)::orlist)
+ aux tables 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, sibling_pruned =
debug_print (lazy (AutoCache.cache_print context cache));
let fl = remove_s_from_fl g fl in
let don = if sibling_pruned then don else op::don in
- aux tables maxm flags cache ((m, s, size, don, todo, fl)::orlist)
+ aux tables 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
+ aux tables flags cache orlist
| (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
+ aux tables flags cache orlist
| _ when Unix.gettimeofday () > flags.timeout ->
(* timeout *)
debug_print (lazy ("FAIL: TIMEOUT"));
- Gaveup (tables, cache, maxm)
+ Gaveup (tables, cache)
| (m, s, size, don, (D (gno,depth,_ as g))::todo, fl)::orlist as status ->
(* attack g *)
debug_print (lazy "attack goal");
| None ->
(* closed by side effect *)
debug_print (lazy ("SUCCESS: SIDE EFFECT: " ^ string_of_int gno));
- aux tables maxm flags cache ((m,s,size,don,todo, fl)::orlist)
+ aux tables 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)
+ aux tables 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)
+ aux tables flags cache orlist)
else
(* still to be proved *)
(debug_print (lazy ("EXAMINE: "^CicPp.ppterm gty));
(* fail depth *)
debug_print (lazy ("FAIL: DEPTH (cache): "^string_of_int gno));
let cache = close_failures fl cache in
- aux tables maxm flags cache orlist
+ aux tables flags cache orlist
| UnderInspection ->
(* fail loop *)
debug_print (lazy ("FAIL: LOOP: " ^ string_of_int gno));
let cache = close_failures fl cache in
- aux tables maxm flags cache orlist
+ aux tables flags cache orlist
| 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, don,todo, fl)::orlist)
+ aux tables flags cache ((m, s, size, don,todo, fl)::orlist)
| Notfound
| Failed_in _ when depth > 0 ->
( (* 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)
+ aux tables flags cache orlist)
else
let cache = cache_add_underinspection cache gty depth in
auto_status := status;
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
- universe flags m s g gty tables cache maxm context
+ let elems, tables, cache, flags =
+ equational_and_applicative_case dbd
+ signature universe flags m s g gty tables cache context
in
if elems = [] then
(* this goal has failed *)
let cache = close_failures ((g,gty)::fl) cache in
- aux tables maxm flags cache orlist
+ aux tables flags cache orlist
else
(* elems = (cand,m,s,gl) *)
let size_gl l = List.length
in
map elems
in
- aux tables maxm flags cache elems)
+ aux tables flags 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 flags cache orlist)
in
- (aux tables maxm flags cache elems : auto_result)
+ (aux tables flags cache elems : auto_result)
;;
let
- auto_all_solutions maxm tables universe cache context metasenv gl flags
+ auto_all_solutions dbd tables universe cache context metasenv gl flags
=
+ let signature =
+ List.fold_left
+ (fun set g ->
+ MetadataConstraints.UriManagerSet.union set
+ (MetadataQuery.signature_of metasenv g)
+ )
+ MetadataConstraints.UriManagerSet.empty gl
+ 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 rec aux tables maxm solutions cache elems flags =
- match auto_main tables maxm context flags universe cache elems with
- | Gaveup (tables,cache,maxm) ->
- solutions,cache,maxm
- | Proved (metasenv,subst,others,tables,cache,maxm) ->
+ let rec aux tables solutions cache elems flags =
+ match auto_main dbd tables context flags signature universe cache elems with
+ | Gaveup (tables,cache) ->
+ solutions,cache, tables
+ | Proved (metasenv,subst,others,tables,cache) ->
if Unix.gettimeofday () > flags.timeout then
- ((subst,metasenv)::solutions), cache, maxm
+ ((subst,metasenv)::solutions), cache, tables
else
- aux tables maxm ((subst,metasenv)::solutions) cache others flags
+ aux tables ((subst,metasenv)::solutions) cache others flags
in
- let rc = aux tables maxm [] cache elems flags in
+ let rc = aux tables [] cache elems flags in
match rc with
- | [],cache,maxm -> [],cache,maxm
- | solutions,cache,maxm ->
+ | [],cache,tables -> [],cache,tables
+ | solutions, cache,tables ->
let solutions =
HExtlib.filter_map
(fun (subst,newmetasenv) ->
if opened = [] then Some subst else None)
solutions
in
- solutions,cache,maxm
+ solutions,cache,tables
;;
(******************* AUTO ***************)
-let auto flags metasenv tables universe cache context metasenv gl =
- let initial_time = Unix.gettimeofday() in
+
+let auto dbd flags metasenv tables universe cache context metasenv gl =
+ let initial_time = Unix.gettimeofday() in
+ let signature =
+ List.fold_left
+ (fun set g ->
+ MetadataConstraints.UriManagerSet.union set
+ (MetadataQuery.signature_of metasenv g)
+ )
+ MetadataConstraints.UriManagerSet.empty gl
+ 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
- match auto_main tables 0 context flags universe cache elems with
- | Proved (metasenv,subst,_, tables,cache,_) ->
+ match auto_main dbd tables context flags signature universe cache elems with
+ | Proved (metasenv,subst,_, tables,cache) ->
debug_print(lazy
("TIME:"^string_of_float(Unix.gettimeofday()-.initial_time)));
Some (subst,metasenv), cache
- | Gaveup (tables,cache,maxm) ->
+ | Gaveup (tables,cache) ->
debug_print(lazy
("TIME:"^string_of_float(Unix.gettimeofday()-.initial_time)));
None,cache
;;
-let applyS_tac ~dbd ~term ~params ~universe =
- ProofEngineTypes.mk_tactic
- (fun status ->
- try
- let proof, gl,_,_ =
- apply_smart ~dbd ~term ~subst:[] ~params ~universe status
- in
- proof, gl
- with
- | CicUnification.UnificationFailure msg
- | CicTypeChecker.TypeCheckerFailure msg ->
- raise (ProofEngineTypes.Fail msg))
-
-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 auto_tac ~(dbd:HSql.dbd) ~params:(univ,params) ~automation_cache (proof, goal) =
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 =
+ let universe, tables, cache =
+ init_cache_and_tables
+ ~dbd ~use_library ~use_context:(not flags.skip_context)
+ automation_cache univ (proof, goal)
+ in
+ let _,metasenv,subst,_,_, _ = proof in
+ let _,context,goalty = CicUtil.lookup_meta goal metasenv in
+ let signature = MetadataQuery.signature_of metasenv goal in
+ let signature =
+ match univ with
+ | None -> signature
+ | Some l ->
+ List.fold_left
+ (fun set t ->
+ let ty, _ =
+ CicTypeChecker.type_of_aux' metasenv context t
+ CicUniv.oblivion_ugraph
+ in
+ MetadataConstraints.UriManagerSet.union set
+ (MetadataConstraints.constants_of ty)
+ )
+ signature l
+ in
+ let tables,cache =
if flags.close_more then
close_more
- tables newmeta context (proof, goal)
- auto_all_solutions universe cache
- else tables,cache,newmeta in
+ tables context (proof, goal)
+ (auto_all_solutions dbd) signature universe cache
+ else tables,cache in
let initial_time = Unix.gettimeofday() in
- let (_,oldmetasenv,_subst,_,_, _) = proof in
- hint := None;
+ let (_,oldmetasenv,_,_,_, _) = proof in
+ hint := None;
let elem =
- metasenv,[],1,[],[D (goal,flags.maxdepth,P)],[]
+ metasenv,subst,1,[],[D (goal,flags.maxdepth,P)],[]
in
- match auto_main tables newmeta context flags universe cache [elem] with
- | Proved (metasenv,subst,_, tables,cache,_) ->
+ match auto_main dbd tables context flags signature universe cache [elem] with
+ | Proved (metasenv,subst,_, tables,cache) ->
debug_print (lazy
("TIME:"^string_of_float(Unix.gettimeofday()-.initial_time)));
let proof,metasenv =
~newmetasenv:metasenv
in
proof,opened
- | Gaveup (tables,cache,maxm) ->
+ | Gaveup (tables,cache) ->
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);;
-
-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 ")))
-;;
-
-(* 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 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 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 context,ty,bo =
- match obj with
- | Cic.Constant(n, _, ty ,_, _) -> open_type ty (Cic.Const(uri,[]))
- | _ -> raise (ProofEngineTypes.Fail (lazy "not a theorem"))
- in
- 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
- (* retrieve equations from the universe universe *)
- let equations =
- retrieve_equations true signature universe AutoCache.cache_empty context []
- 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' [] 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, _, 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
- 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*)
-;;
-
-
-(* 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 = [], 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 false true true universe (proof,goal)
- in
- let equalities = (Saturation.list_of_passive passive) in
- (* we demodulate using both actives passives *)
- let env = metasenv,context,CicUniv.empty_ugraph in
- debug_print (lazy ("PASSIVES:" ^ string_of_int(List.length equalities)));
- List.iter (fun e -> debug_print (lazy (Equality.string_of_equality ~env e)))
- equalities;
- let table =
- List.fold_left
- (fun tbl eq -> Indexing.index tbl eq)
- (snd active) equalities
- in
- 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 (~contextualize:false) bag
- eq_uri newproof opengoal ty [] context metasenv
- in
- let extended_metasenv = (maxm,context,newty)::metasenv in
- let extended_status =
- (curi,extended_metasenv,_subst,pbo,pty, attrs),goal in
- let (status,newgoals) =
- ProofEngineTypes.apply_tactic
- (PrimitiveTactics.apply_tac ~term:proofterm)
- extended_status in
- (status,maxm::newgoals)
- 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 demodulate_tac ~dbd ~params ~universe =
- ProofEngineTypes.mk_tactic (demodulate_tac ~dbd ~params ~universe);;
+let auto_tac ~dbd ~params ~automation_cache =
+ ProofEngineTypes.mk_tactic (auto_tac ~params ~dbd ~automation_cache);;
let pp_proofterm = Equality.pp_proofterm;;