(* and [bo] = Lambda/LetIn [context].(Meta [newmeta]) *)
(* So, lambda_abstract is the core of the implementation of *)
(* the Intros tactic. *)
-let lambda_abstract context newmeta ty mknames =
+let lambda_abstract context newmeta ty mk_fresh_name =
let module C = Cic in
let rec collect_context context =
function
C.Cast (te,_) -> collect_context context te
| C.Prod (n,s,t) ->
- let n' = C.Name (mknames n) in
+ let n' = mk_fresh_name context n ~typ:s in
let (context',ty,bo) =
collect_context ((Some (n',(C.Decl s)))::context) t
in
let argty =
T.type_of_aux' metasenv context arg
in
- (C.Appl [C.Lambda ((C.Name "dummy"),argty,aux 0 t) ; arg])
+ let fresh_name =
+ ProofEngineHelpers.mk_fresh_name context (Cic.Name "Heta") ~typ:argty
+ in
+ (C.Appl [C.Lambda (fresh_name,argty,aux 0 t) ; arg])
(*CSC: ma serve solamente la prima delle new_uninst e l'unione delle due!!! *)
let classify_metas newmeta in_subst_domain subst_in metasenv =
with CicUnification.UnificationFailed as e ->
raise (Fail (Printexc.to_string e))
-let intros_tac ~status:(proof, goal) =
+let intros_tac
+ ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name) ()
+ ~status:(proof, goal)
+=
let module C = Cic in
let module R = CicReduction in
let (_,metasenv,_,_) = proof in
let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
let newmeta = new_meta ~proof in
let (context',ty',bo') =
- lambda_abstract context newmeta ty (ProofEngineHelpers.fresh_name)
+ lambda_abstract context newmeta ty mk_fresh_name_callback
in
let (newproof, _) =
subst_meta_in_proof proof metano bo' [newmeta,context',ty']
in
(newproof, [newmeta])
-let cut_tac ~term ~status:(proof, goal) =
+let cut_tac
+ ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name)
+ term ~status:(proof, goal)
+=
let module C = Cic in
let curi,metasenv,pbo,pty = proof in
let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
let newmeta1 = new_meta ~proof in
let newmeta2 = newmeta1 + 1 in
+ let fresh_name =
+ mk_fresh_name_callback context (Cic.Name "Hcut") ~typ:term in
let context_for_newmeta1 =
- (Some (C.Name "dummy_for_cut",C.Decl term))::context in
+ (Some (fresh_name,C.Decl term))::context in
let irl1 =
identity_relocation_list_for_metavariable context_for_newmeta1 in
let irl2 = identity_relocation_list_for_metavariable context in
let newmeta1ty = CicSubstitution.lift 1 ty in
let bo' =
C.Appl
- [C.Lambda (C.Name "dummy_for_cut",term,C.Meta (newmeta1,irl1)) ;
+ [C.Lambda (fresh_name,term,C.Meta (newmeta1,irl1)) ;
C.Meta (newmeta2,irl2)]
in
let (newproof, _) =
in
(newproof, [newmeta1 ; newmeta2])
-let letin_tac ~term ~status:(proof, goal) =
+let letin_tac
+ ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name)
+ term ~status:(proof, goal)
+=
let module C = Cic in
let curi,metasenv,pbo,pty = proof in
let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
let _ = CicTypeChecker.type_of_aux' metasenv context term in
let newmeta = new_meta ~proof in
+ let fresh_name =
+ mk_fresh_name_callback context (Cic.Name "Hletin") ~typ:term in
let context_for_newmeta =
- (Some (C.Name "dummy_for_letin",C.Def term))::context in
+ (Some (fresh_name,C.Def term))::context in
let irl =
identity_relocation_list_for_metavariable context_for_newmeta in
let newmetaty = CicSubstitution.lift 1 ty in
- let bo' = C.LetIn (C.Name "dummy_for_letin",term,C.Meta (newmeta,irl)) in
+ let bo' = C.LetIn (fresh_name,term,C.Meta (newmeta,irl)) in
let (newproof, _) =
subst_meta_in_proof
proof metano bo'[newmeta,context_for_newmeta,newmetaty]
Tacticals.then_ ~start:(elim_tac ~term)
~continuation:
(Tacticals.thens
- ~start:intros_tac
+ ~start:(intros_tac ())
~continuations:
[ReductionTactics.simpl_tac ~also_in_hypotheses:false ~term:None])
;;