let module T = CicTypeChecker in
let module R = CicReduction in
let module C = Cic in
- let (_,metasenv,_,_, _) = proof in
+ let (_,metasenv,_subst,_,_, _) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let newmeta = max (CicMkImplicit.new_meta metasenv subst) maxmeta in
let exp_named_subst_diff,newmeta',newmetasenvfragment,term' =
let subst_in =
(* if we just apply the subtitution, the type is irrelevant:
we may use Implicit, since it will be dropped *)
- CicMetaSubst.apply_subst ((metano,(context,bo',Cic.Implicit None))::subst)
+ ((metano,(context,bo',Cic.Implicit None))::subst)
in
let (newproof, newmetasenv''') =
ProofEngineHelpers.subst_meta_and_metasenv_in_proof proof metano subst_in
=
let module C = Cic in
let module R = CicReduction in
- let (_,metasenv,_,_, _) = proof in
+ let (_,metasenv,_subst,_,_, _) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let newmeta = ProofEngineHelpers.new_meta_of_proof ~proof in
let (context',ty',bo') =
term (proof, goal)
=
let module C = Cic in
- let curi,metasenv,pbo,pty, attrs = proof in
+ let curi,metasenv,_subst,pbo,pty, attrs = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let newmeta1 = ProofEngineHelpers.new_meta_of_proof ~proof in
let newmeta2 = newmeta1 + 1 in
CicMkImplicit.identity_relocation_list_for_metavariable context
in
let newmeta1ty = CicSubstitution.lift 1 ty in
+(* This is the pre-letin implementation
let bo' =
C.Appl
[C.Lambda (fresh_name,term,C.Meta (newmeta1,irl1)) ;
C.Meta (newmeta2,irl2)]
in
+*)
+ let bo' =
+ Cic.LetIn (fresh_name, C.Meta (newmeta2,irl2), C.Meta (newmeta1,irl1))
+ in
let (newproof, _) =
ProofEngineHelpers.subst_meta_in_proof proof metano bo'
[newmeta2,context,term; newmeta1,context_for_newmeta1,newmeta1ty];
term (proof, goal)
=
let module C = Cic in
- let curi,metasenv,pbo,pty, attrs = proof in
+ let curi,metasenv,_subst,pbo,pty, attrs = proof in
(* occur check *)
let occur i t =
let m = CicUtil.metas_of_term t in
let exact_tac ~term =
let exact_tac ~term (proof, goal) =
(* Assumption: the term bo must be closed in the current context *)
- let (_,metasenv,_,_, _) = proof in
+ let (_,metasenv,_subst,_,_, _) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let module T = CicTypeChecker in
let module R = CicReduction in
module T = Tacticals
module RT = ReductionTactics
+let rec args_init n f =
+ if n <= 0 then [] else f n :: args_init (pred n) f
+
+let mk_predicate_for_elim
+ ~context ~metasenv ~ugraph ~goal ~arg ~using ~cpattern ~args_no =
+ let instantiated_eliminator =
+ let f n = if n = 1 then arg else C.Implicit None in
+ C.Appl (using :: args_init args_no f)
+ in
+ let _actual_arg, iety, _metasenv', _ugraph =
+ CicRefine.type_of_aux' metasenv context instantiated_eliminator ugraph
+ in
+ let _actual_meta, actual_args = match iety with
+ | C.Meta (i, _) -> i, []
+ | C.Appl (C.Meta (i, _) :: args) -> i, args
+ | _ -> assert false
+ in
+(* let _, upto = PEH.split_with_whd (List.nth splits pred_pos) in *)
+ let rec mk_pred metasenv context' pred arg' cpattern' = function
+ | [] -> metasenv, pred, arg'
+ | arg :: tail ->
+(* FG: we find the predicate for the eliminator as in the rewrite tactic ****)
+ let argty, _ugraph = TC.type_of_aux' metasenv context arg ugraph in
+ let argty = CicReduction.whd context argty in
+ let fresh_name =
+ FreshNamesGenerator.mk_fresh_name
+ ~subst:[] metasenv context' C.Anonymous ~typ:argty
+ in
+ let hyp = Some (fresh_name, C.Decl argty) in
+ let lazy_term c m u =
+ let distance = List.length c - List.length context in
+ S.lift distance arg, m, u
+ in
+ let pattern = Some lazy_term, [], Some cpattern' in
+ let subst, metasenv, _ugraph, _conjecture, selected_terms =
+ ProofEngineHelpers.select
+ ~metasenv ~ugraph ~conjecture:(0, context, pred) ~pattern
+ in
+ let metasenv = MS.apply_subst_metasenv subst metasenv in
+ let map (_context_of_t, t) l = t :: l in
+ let what = List.fold_right map selected_terms [] in
+ let arg' = MS.apply_subst subst arg' in
+ let argty = MS.apply_subst subst argty in
+ let pred = PER.replace_with_rel_1_from ~equality:(==) ~what 1 pred in
+ let pred = MS.apply_subst subst pred in
+ let pred = C.Lambda (fresh_name, argty, pred) in
+ let cpattern' = C.Lambda (C.Anonymous, C.Implicit None, cpattern') in
+ mk_pred metasenv (hyp :: context') pred arg' cpattern' tail
+ in
+ let metasenv, pred, arg =
+ mk_pred metasenv context goal arg cpattern (List.rev actual_args)
+ in
+ HLog.debug ("PREDICATE: " ^ CicPp.ppterm ~metasenv pred ^ " ARGS: " ^ String.concat " " (List.map (CicPp.ppterm ~metasenv) actual_args));
+ metasenv, pred, arg, actual_args
+
let beta_after_elim_tac upto predicate =
let beta_after_elim_tac status =
let proof, goal = status in
- let _, metasenv, _, _, _ = proof in
+ let _, metasenv, _subst, _, _, _ = proof in
let _, _, ty = CicUtil.lookup_meta goal metasenv in
let mk_pattern ~equality ~upto ~predicate ty =
(* code adapted from ProceduralConversion.generalize *)
let elim_tac ?using ?(pattern = PET.conclusion_pattern None) term =
let elim_tac (proof, goal) =
- let cpatt = match pattern with
- | None, [], Some cpatt -> cpatt
- | _ -> raise (PET.Fail (lazy "not implemented"))
+ let cpattern = match pattern with
+ | None, [], Some cpattern -> cpattern
+ | _ -> raise (PET.Fail (lazy "not implemented"))
in
let ugraph = CicUniv.empty_ugraph in
- let curi, metasenv, proofbo, proofty, attrs = proof in
+ let curi, metasenv, _subst, proofbo, proofty, attrs = proof in
let conjecture = CicUtil.lookup_meta goal metasenv in
let metano, context, ty = conjecture in
let termty,_ugraph = TC.type_of_aux' metasenv context term ugraph in
TC.type_of_aux' metasenv' context eliminator_ref ugraph in
(* FG: ADDED PART ***********************************************************)
(* FG: we can not assume eliminator is the default eliminator ***************)
- let rec args_init n f =
- if n <= 0 then [] else f n :: args_init (pred n) f
- in
let splits, args_no = PEH.split_with_whd (context, ety) in
let pred_pos = match List.hd splits with
| _, C.Rel i when i > 1 && i <= args_no -> i
| _, C.Appl (C.Rel i :: _) when i > 1 && i <= args_no -> i
| _ -> raise NotAnEliminator
in
- let upto, metasenv', pred, term = match pattern with
+ let metasenv', pred, term, actual_args = match pattern with
| None, [], Some (C.Implicit (Some `Hole)) ->
- 0, metasenv', C.Implicit None, term
+ metasenv', C.Implicit None, term, []
| _ ->
- let instantiated_eliminator =
- let f n = if n = 1 then term else C.Implicit None in
- C.Appl (eliminator_ref :: args_init args_no f)
- in
- let _actual_term, iety, _metasenv'', _ugraph =
- CicRefine.type_of_aux' metasenv' context instantiated_eliminator ugraph
- in
- let _actual_meta, actual_args = match iety with
- | C.Meta (i, _) -> i, []
- | C.Appl (C.Meta (i, _) :: args) -> i, args
- | _ -> assert false
- in
- (* let _, upto = PEH.split_with_whd (List.nth splits pred_pos) in *)
- let upto = List.length actual_args in
- let rec mk_pred metasenv context' pred term' = function
- | [] -> metasenv, pred, term'
- | term :: tail ->
-(* FG: we find the predicate for the eliminator as in the rewrite tactic ****)
- let termty, _ugraph = TC.type_of_aux' metasenv context' term ugraph in
- let termty = CicReduction.whd context' termty in
- let fresh_name =
- FreshNamesGenerator.mk_fresh_name
- ~subst:[] metasenv context' C.Anonymous ~typ:termty
- in
- let hyp = Some (fresh_name, C.Decl termty) in
- let lazy_term c m u =
- let distance = List.length c - List.length context in
- S.lift distance term, m, u
- in
- let pattern = Some lazy_term, [], Some cpatt in
- let subst, metasenv, _ugraph, _conjecture, selected_terms =
- ProofEngineHelpers.select
- ~metasenv ~ugraph ~conjecture:(metano, context, pred) ~pattern
- in
- let metasenv = MS.apply_subst_metasenv subst metasenv in
- let map (_context_of_t, t) l = t :: l in
- let what = List.fold_right map selected_terms [] in
- let term' = MS.apply_subst subst term' in
- let termty = MS.apply_subst subst termty in
- let pred = PER.replace_with_rel_1_from ~equality:(==) ~what 1 pred in
- let pred = MS.apply_subst subst pred in
- let pred = C.Lambda (fresh_name, termty, pred) in
- mk_pred metasenv (hyp :: context') pred term' tail
- in
- let metasenv', pred, term = mk_pred metasenv' context ty term actual_args in
- HLog.debug ("PRED: " ^ CicPp.ppterm ~metasenv:metasenv' pred ^ " ARGS: " ^ String.concat " " (List.map (CicPp.ppterm ~metasenv:metasenv') actual_args));
- upto, metasenv', pred, term
- in
+ mk_predicate_for_elim
+ ~args_no ~context ~ugraph ~cpattern
+ ~metasenv:metasenv' ~arg:term ~using:eliminator_ref ~goal:ty
+ in
(* FG: END OF ADDED PART ****************************************************)
let term_to_refine =
let f n =
ProofEngineHelpers.compare_metasenvs
~oldmetasenv:metasenv ~newmetasenv:metasenv''
in
- let proof' = curi,metasenv'',proofbo,proofty, attrs in
+ let proof' = curi,metasenv'',_subst,proofbo,proofty, attrs in
let proof'', new_goals' =
PET.apply_tactic (apply_tac ~term:refined_term) (proof',goal)
in
(* The apply_tactic can have closed some of the new_goals *)
let patched_new_goals =
- let (_,metasenv''',_,_, _) = proof'' in
+ let (_,metasenv''',_subst,_,_, _) = proof'' in
List.filter
(function i -> List.exists (function (j,_,_) -> j=i) metasenv''')
new_goals @ new_goals'
in
let res = proof'', patched_new_goals in
+ let upto = List.length actual_args in
if upto = 0 then res else
let continuation = beta_after_elim_tac upto pred in
let dummy_status = proof,goal in
let module U = UriManager in
let module R = CicReduction in
let module C = Cic in
- let (curi,metasenv,proofbo,proofty, attrs) = proof in
+ let (curi,metasenv,_subst, proofbo,proofty, attrs) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let termty,_ = TC.type_of_aux' metasenv context term CicUniv.empty_ugraph in
let termty = CicReduction.whd context termty in
ProofEngineHelpers.compare_metasenvs
~oldmetasenv:metasenv ~newmetasenv:metasenv''
in
- let proof' = curi,metasenv'',proofbo,proofty, attrs in
+ let proof' = curi,metasenv'',_subst,proofbo,proofty, attrs in
let proof'', new_goals' =
PET.apply_tactic (apply_tac ~term:refined_term) (proof',goal)
in
(* The apply_tactic can have closed some of the new_goals *)
let patched_new_goals =
- let (_,metasenv''',_,_,_) = proof'' in
+ let (_,metasenv''',_subst,_,_,_) = proof'' in
List.filter
(function i -> List.exists (function (j,_,_) -> j=i) metasenv''')
new_goals @ new_goals'
let mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[] in
let term = C.Sort C.Set in
let letout_tac (proof, goal) =
- let curi, metasenv, pbo, pty, attrs = proof in
+ let curi, metasenv, _subst, pbo, pty, attrs = proof in
let metano, context, ty = CicUtil.lookup_meta goal metasenv in
let newmeta = ProofEngineHelpers.new_meta_of_proof ~proof in
let fresh_name = mk_fresh_name_callback metasenv context (Cic.Name "hole") ~typ:term in