X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FprimitiveTactics.ml;h=c1823d1c9d3af3a12cc4a4d701ea9590cea56b4a;hb=242e171b023f113228c55ad273797c63becf53e6;hp=92b89a679c987c293e4395f993930707c5ad3d2b;hpb=218c0062f93dd3221b0266cfbc26fd9cf787ad18;p=helm.git diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml index 92b89a679..c1823d1c9 100644 --- a/helm/ocaml/tactics/primitiveTactics.ml +++ b/helm/ocaml/tactics/primitiveTactics.ml @@ -37,29 +37,37 @@ exception WrongUriToVariable of string (* and [bo] = Lambda/LetIn [context].(Meta [newmeta]) *) (* So, lambda_abstract is the core of the implementation of *) (* the Intros tactic. *) -let lambda_abstract metasenv context newmeta ty mk_fresh_name = +(* howmany = -1 means Intros, howmany > 0 means Intros n *) +let lambda_abstract ?(howmany=(-1)) metasenv 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' = mk_fresh_name metasenv context n ~typ:s in - let (context',ty,bo) = - collect_context ((Some (n',(C.Decl s)))::context) t + let rec collect_context context howmany ty = + match howmany with + | 0 -> + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable context in - (context',ty,C.Lambda(n',s,bo)) - | C.LetIn (n,s,t) -> - let (context',ty,bo) = - collect_context ((Some (n,(C.Def (s,None))))::context) t - in - (context',ty,C.LetIn(n,s,bo)) - | _ as t -> - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable context - in - context, t, (C.Meta (newmeta,irl)) + context, ty, (C.Meta (newmeta,irl)) + | _ -> + match ty with + C.Cast (te,_) -> collect_context context howmany te + | C.Prod (n,s,t) -> + let n' = mk_fresh_name metasenv context n ~typ:s in + let (context',ty,bo) = + collect_context ((Some (n',(C.Decl s)))::context) (howmany - 1) t + in + (context',ty,C.Lambda(n',s,bo)) + | C.LetIn (n,s,t) -> + let (context',ty,bo) = + collect_context ((Some (n,(C.Def (s,None))))::context) (howmany - 1) t + in + (context',ty,C.LetIn(n,s,bo)) + | _ as t -> + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable context + in + context, t, (C.Meta (newmeta,irl)) in - collect_context context ty + collect_context context howmany ty let eta_expand metasenv context t arg = let module T = CicTypeChecker in @@ -161,8 +169,9 @@ let classify_metas newmeta in_subst_domain subst_in metasenv = let new_metasenv_for_apply newmeta proof context ty = let module C = Cic in let module S = CicSubstitution in - let rec aux newmeta = - function + let rec aux newmeta ty = + let ty' = ty in + match ty' with C.Cast (he,_) -> aux newmeta he (* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type (* If the expected type is a Type, then also Set is OK ==> @@ -190,8 +199,15 @@ let new_metasenv_for_apply newmeta proof context ty = let (res,newmetasenv,arguments,lastmeta) = aux (newmeta + 1) (S.subst newargument t) in - res,(newmeta,context,s)::newmetasenv,newargument::arguments,lastmeta - | t -> t,[],[],newmeta + let s' = CicReduction.normalize ~delta:false context s in + res,(newmeta,context,s')::newmetasenv,newargument::arguments,lastmeta + (** NORMALIZE RATIONALE + * we normalize the target only NOW since we may be in this case: + * A1 -> A2 -> T where T = (\lambda x.A3 -> P) k + * and we want a mesasenv with ?1:A1 and ?2:A2 and not + * ?1, ?2, ?3 (that is the one we whould get if we start from the + * beta-normalized A1 -> A2 -> A3 -> P **) + | t -> (CicReduction.normalize ~delta:false context t),[],[],newmeta in (* WARNING: here we are using the invariant that above the most *) (* recente new_meta() there are no used metas. *) @@ -205,11 +221,7 @@ let let module C = Cic in let params = let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in - match o with - C.Constant (_,_,_,params) - | C.CurrentProof (_,_,_,_,params) - | C.Variable (_,_,_,params) - | C.InductiveDefinition (_,params,_) -> params + CicUtil.params_of_obj o in let exp_named_subst_diff,new_fresh_meta,newmetasenvfragment,exp_named_subst'= let next_fresh_meta = ref newmeta in @@ -222,7 +234,7 @@ let let ty = let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in match o with - C.Variable (_,_,ty,_) -> + C.Variable (_,_,ty,_,_) -> CicSubstitution.subst_vars !exp_named_subst_diff ty | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri)) in @@ -262,6 +274,19 @@ let new_fresh_meta,newmetasenvfragment,exp_named_subst',exp_named_subst_diff ;; +let new_metasenv_and_unify_and_t newmeta' metasenv' proof context term' ty termty = + let (consthead,newmetas,arguments,_) = + new_metasenv_for_apply newmeta' proof context termty + in + let newmetasenv = metasenv'@newmetas in + let subst,newmetasenv',_ = + CicUnification.fo_unif newmetasenv context consthead ty CicUniv.empty_ugraph + in + let t = + if List.length newmetas = 0 then term' else Cic.Appl (term'::arguments) + in + subst,newmetasenv',t + let apply_tac_verbose ~term (proof, goal) = (* Assumption: The term "term" must be closed in the current context *) let module T = CicTypeChecker in @@ -303,47 +328,42 @@ let apply_tac_verbose ~term (proof, goal) = | _ -> [],newmeta,[],term in let metasenv' = metasenv@newmetasenvfragment in - let termty,_ = (* TASSI:FIXME *) + let termty,_ = CicTypeChecker.type_of_aux' metasenv' context term CicUniv.empty_ugraph in let termty = CicSubstitution.subst_vars exp_named_subst_diff termty in - (* newmeta is the lowest index of the new metas introduced *) - let (consthead,newmetas,arguments,_) = - new_metasenv_for_apply newmeta' proof context termty - in - let newmetasenv = metasenv'@newmetas in - let subst,newmetasenv',_ = (* TASSI:FIXME *) - CicUnification.fo_unif newmetasenv context consthead ty - CicUniv.empty_ugraph - in - let in_subst_domain i = List.exists (function (j,_) -> i=j) subst in - let apply_subst = CicMetaSubst.apply_subst subst in - let old_uninstantiatedmetas,new_uninstantiatedmetas = - (* subst_in doesn't need the context. Hence the underscore. *) - let subst_in _ = CicMetaSubst.apply_subst subst in - classify_metas newmeta in_subst_domain subst_in newmetasenv' - in - let bo' = - apply_subst - (if List.length newmetas = 0 then - term' - else - Cic.Appl (term'::arguments) - ) - in - let newmetasenv'' = new_uninstantiatedmetas@old_uninstantiatedmetas in - let subst_in = - (* if we just apply the subtitution, the type is irrelevant: + prerr_endline ("term:" ^ CicPp.ppterm term); + prerr_endline ("termty:" ^ CicPp.ppterm termty); + let subst,newmetasenv',t = + try + new_metasenv_and_unify_and_t newmeta' metasenv' proof context term' ty + termty + with CicUnification.UnificationFailure _ -> + new_metasenv_and_unify_and_t newmeta' metasenv' proof context term' ty + (CicReduction.whd context termty) + in + let in_subst_domain i = List.exists (function (j,_) -> i=j) subst in + let apply_subst = CicMetaSubst.apply_subst subst in + let old_uninstantiatedmetas,new_uninstantiatedmetas = + (* subst_in doesn't need the context. Hence the underscore. *) + let subst_in _ = CicMetaSubst.apply_subst subst in + classify_metas newmeta in_subst_domain subst_in newmetasenv' + in + let bo' = apply_subst t in + let newmetasenv'' = new_uninstantiatedmetas@old_uninstantiatedmetas in +(* prerr_endline ("me: " ^ CicMetaSubst.ppmetasenv newmetasenv'' subst); *) + 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) - in - let (newproof, newmetasenv''') = - subst_meta_and_metasenv_in_proof - proof metano subst_in newmetasenv'' - in - (subst_in,(newproof, List.map (function (i,_,_) -> i) new_uninstantiatedmetas)) + CicMetaSubst.apply_subst ((metano,(context,bo',Cic.Implicit None))::subst) + in + let (newproof, newmetasenv''') = + subst_meta_and_metasenv_in_proof proof metano subst_in newmetasenv'' + in + (subst_in, + (newproof, + List.map (function (i,_,_) -> i) new_uninstantiatedmetas)) let apply_tac ~term status = snd (apply_tac_verbose ~term status) @@ -366,7 +386,7 @@ let apply_tac ~term = in mk_tactic (apply_tac ~term) -let intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ()= +let intros_tac ?howmany ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ()= let intros_tac ?(mk_fresh_name_callback = (FreshNamesGenerator.mk_fresh_name ~subst:[])) () (proof, goal) @@ -377,7 +397,7 @@ let intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~sub let metano,context,ty = CicUtil.lookup_meta goal metasenv in let newmeta = new_meta_of_proof ~proof in let (context',ty',bo') = - lambda_abstract metasenv context newmeta ty mk_fresh_name_callback + lambda_abstract ?howmany metasenv context newmeta ty mk_fresh_name_callback in let (newproof, _) = subst_meta_in_proof proof metano bo' [newmeta,context',ty'] @@ -386,7 +406,7 @@ let intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~sub in mk_tactic (intros_tac ~mk_fresh_name_callback ()) -let cut_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ~term= +let cut_tac?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ~term= let cut_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) term (proof, goal) @@ -494,7 +514,7 @@ let elim_tac ~term = let name = let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in match o with - C.InductiveDefinition (tys,_,_) -> + C.InductiveDefinition (tys,_,_,_) -> let (name,_,_,_) = List.nth tys typeno in name | _ -> assert false @@ -556,6 +576,11 @@ let elim_tac ~term = mk_tactic (elim_tac ~term) ;; +let elim_intros_tac ~term = + Tacticals.then_ ~start:(elim_tac ~term) + ~continuation:(intros_tac ()) +;; + (* The simplification is performed only on the conclusion *) let elim_intros_simpl_tac ~term = Tacticals.then_ ~start:(elim_tac ~term)