X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FprimitiveTactics.ml;h=2b67b521f6d0e1ea1cc26f184237280abc48ab11;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=06e83a125335ea218df3a3e25f2c02f197910397;hpb=249d79bebff886846fbab65cc079623d90684baf;p=helm.git diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml index 06e83a125..2b67b521f 100644 --- a/helm/ocaml/tactics/primitiveTactics.ml +++ b/helm/ocaml/tactics/primitiveTactics.ml @@ -61,10 +61,13 @@ let lambda_abstract ?(howmany=(-1)) metasenv context newmeta ty mk_fresh_name = in (context',ty,C.LetIn(n,s,bo)) | _ as t -> - let irl = + if howmany <= 0 then + let irl = CicMkImplicit.identity_relocation_list_for_metavariable context - in - context, t, (C.Meta (newmeta,irl)) + in + context, t, (C.Meta (newmeta,irl)) + else + raise (Fail "intro(s): not enough products or let-ins") in collect_context context howmany ty @@ -160,59 +163,6 @@ let classify_metas newmeta in_subst_domain subst_in metasenv = old_uninst,((i,canonical_context',ty')::new_uninst) ) metasenv ([],[]) -(* Auxiliary function for apply: given a type (a backbone), it returns its *) -(* head, a META environment in which there is new a META for each hypothesis,*) -(* a list of arguments for the new applications and the indexes of the first *) -(* and last new METAs introduced. The nth argument in the list of arguments *) -(* is just the nth new META. *) -let new_metasenv_for_apply newmeta proof context ty = - let module C = Cic in - let module S = CicSubstitution in - 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 ==> - * we accept any term of type Type *) - (*CSC: BUG HERE: in this way it is possible for the term of - * type Type to be different from a Sort!!! *) - | C.Prod (name,(C.Sort (C.Type _) as s),t) -> - (* TASSI: ask CSC if BUG HERE refers to the C.Cast or C.Propd case *) - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable context - in - let newargument = C.Meta (newmeta+1,irl) in - let (res,newmetasenv,arguments,lastmeta) = - aux (newmeta + 2) (S.subst newargument t) - in - res, - (newmeta,[],s)::(newmeta+1,context,C.Meta (newmeta,[]))::newmetasenv, - newargument::arguments,lastmeta -*) - | C.Prod (name,s,t) -> - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable context - in - let newargument = C.Meta (newmeta,irl) in - let (res,newmetasenv,arguments,lastmeta) = - aux (newmeta + 1) (S.subst newargument t) - in - 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. *) - let (res,newmetasenv,arguments,lastmeta) = aux newmeta ty in - res,newmetasenv,arguments,lastmeta - (* Useful only inside apply_tac *) let generalize_exp_named_subst_with_fresh_metas context newmeta uri exp_named_subst @@ -231,11 +181,11 @@ let [],[] -> [] | uri::tl,[] -> let ty = - let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in match o with - C.Variable (_,_,ty,_,_) -> - CicSubstitution.subst_vars !exp_named_subst_diff ty - | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri)) + C.Variable (_,_,ty,_,_) -> + CicSubstitution.subst_vars !exp_named_subst_diff ty + | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri)) in (* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type (match ty with @@ -246,7 +196,7 @@ let let subst_item = uri,C.Meta (fresh_meta',[]) in newmetasenvfragment := (fresh_meta,[],C.Sort (C.Type (CicUniv.fresh()))) :: - (* TASSI: ?? *) + (* TASSI: ?? *) (fresh_meta',[],C.Meta (fresh_meta,[])) :: !newmetasenvfragment ; exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ; subst_item::(aux (tl,[])) @@ -273,16 +223,14 @@ 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 new_metasenv_and_unify_and_t newmeta' metasenv' context term' ty termty = + let (consthead,newmetasenv,arguments,_) = + saturate_term newmeta' metasenv' context termty in let subst,newmetasenv',_ = - CicUnification.fo_unif newmetasenv context consthead ty CicUniv.empty_ugraph + 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) + if List.length arguments = 0 then term' else Cic.Appl (term'::arguments) in subst,newmetasenv',t @@ -332,13 +280,16 @@ let apply_tac_verbose ~term (proof, goal) = let termty = CicSubstitution.subst_vars exp_named_subst_diff termty in +(*CSC: this code is suspect and/or bugged: we try first without reduction + and then using whd. However, the saturate_term always tries with full + reduction without delta. *) 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) + try + new_metasenv_and_unify_and_t newmeta' metasenv' context term' ty + termty + with CicUnification.UnificationFailure _ -> + new_metasenv_and_unify_and_t newmeta' metasenv' 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 @@ -352,7 +303,7 @@ let apply_tac_verbose ~term (proof, goal) = (* 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 *) + we may use Implicit, since it will be dropped *) CicMetaSubst.apply_subst ((metano,(context,bo',Cic.Implicit None))::subst) in let (newproof, newmetasenv''') = @@ -368,8 +319,11 @@ let apply_tac_verbose ~term status = try apply_tac_verbose ~term status (* TODO cacciare anche altre eccezioni? *) - with CicUnification.UnificationFailure _ as e -> - raise (Fail (Printexc.to_string e)) + with + | CicUnification.UnificationFailure _ as e -> + raise (Fail (Printexc.to_string e)) + | CicTypeChecker.TypeCheckerFailure _ as e -> + raise (Fail (Printexc.to_string e)) (* TODO per implementare i tatticali e' necessario che tutte le tattiche sollevino _solamente_ Fail *) @@ -378,8 +332,11 @@ let apply_tac ~term = try apply_tac ~term status (* TODO cacciare anche altre eccezioni? *) - with CicUnification.UnificationFailure _ as e -> - raise (Fail (Printexc.to_string e)) + with + | CicUnification.UnificationFailure _ as e -> + raise (Fail (Printexc.to_string e)) + | CicTypeChecker.TypeCheckerFailure _ as e -> + raise (Fail (Printexc.to_string e)) in mk_tactic (apply_tac ~term) @@ -498,7 +455,6 @@ let elim_tac ~term = let (curi,metasenv,proofbo,proofty) = proof in let metano,context,ty = CicUtil.lookup_meta goal metasenv in let termty,_ = T.type_of_aux' metasenv context term CicUniv.empty_ugraph in - (* TASSI: FIXME *) let uri,exp_named_subst,typeno,args = match termty with C.MutInd (uri,typeno,exp_named_subst) -> (uri,exp_named_subst,typeno,[]) @@ -509,7 +465,7 @@ let elim_tac ~term = let eliminator_uri = let buri = U.buri_of_uri uri in let name = - let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in match o with C.InductiveDefinition (tys,_,_,_) -> let (name,_,_,_) = List.nth tys typeno in @@ -517,7 +473,6 @@ let elim_tac ~term = | _ -> assert false in let ty_ty,_ = T.type_of_aux' metasenv context ty CicUniv.empty_ugraph in - (* TASSI: FIXME *) let ext = match ty_ty with C.Sort C.Prop -> "_ind" @@ -531,7 +486,7 @@ let elim_tac ~term = in let eliminator_ref = C.Const (eliminator_uri,exp_named_subst) in let ety,_ = - T.type_of_aux' metasenv context eliminator_ref CicUniv.empty_ugraph in + T.type_of_aux' metasenv context eliminator_ref CicUniv.empty_ugraph in let rec find_args_no = function C.Prod (_,_,t) -> 1 + find_args_no t @@ -550,9 +505,9 @@ let elim_tac ~term = in let metasenv', term_to_refine' = CicMkImplicit.expand_implicits metasenv [] context term_to_refine in - let refined_term,_,metasenv'',_ = (* TASSI: FIXME *) + let refined_term,_,metasenv'',_ = CicRefine.type_of_aux' metasenv' context term_to_refine' - CicUniv.empty_ugraph + CicUniv.empty_ugraph in let new_goals = ProofEngineHelpers.compare_metasenvs