X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FprimitiveTactics.ml;h=388ac2056ef6fb560480aa43ac91403a7b4a9404;hb=c5d5bf37b1e4c4b9b499ed2cbfe27cf2ec181944;hp=91cd6198ef8bb28d6d60f7a42a8450fdfa62bcc8;hpb=bac72fcaa876137ab7a5630e0c1badc2a627dce8;p=helm.git diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml index 91cd6198e..388ac2056 100644 --- a/helm/ocaml/tactics/primitiveTactics.ml +++ b/helm/ocaml/tactics/primitiveTactics.ml @@ -37,24 +37,26 @@ 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 context newmeta ty mk_fresh_name = +let lambda_abstract 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 context n ~typ:s in + let n' = mk_fresh_name metasenv context n ~typ:s in let (context',ty,bo) = collect_context ((Some (n',(C.Decl s)))::context) 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)))::context) t + collect_context ((Some (n,(C.Def (s,None))))::context) t in (context',ty,C.LetIn(n,s,bo)) | _ as t -> - let irl = identity_relocation_list_for_metavariable context in + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable context + in context, t, (C.Meta (newmeta,irl)) in collect_context context ty @@ -72,7 +74,7 @@ let eta_expand metasenv context t arg = C.Var (uri,exp_named_subst') | C.Meta _ | C.Sort _ - | C.Implicit as t -> t + | C.Implicit _ as t -> t | C.Cast (te,ty) -> C.Cast (aux n te, aux n ty) | C.Prod (nn,s,t) -> C.Prod (nn, aux n s, aux (n+1) t) | C.Lambda (nn,s,t) -> C.Lambda (nn, aux n s, aux (n+1) t) @@ -113,7 +115,8 @@ let eta_expand metasenv context t arg = T.type_of_aux' metasenv context arg in let fresh_name = - ProofEngineHelpers.mk_fresh_name context (Cic.Name "Heta") ~typ:argty + FreshNamesGenerator.mk_fresh_name + metasenv context (Cic.Name "Heta") ~typ:argty in (C.Appl [C.Lambda (fresh_name,argty,aux 0 t) ; arg]) @@ -132,9 +135,10 @@ let classify_metas newmeta in_subst_domain subst_in metasenv = match entry with Some (n,Cic.Decl s) -> Some (n,Cic.Decl (subst_in canonical_context' s)) - | Some (n,Cic.Def s) -> - Some (n,Cic.Def (subst_in canonical_context' s)) + | Some (n,Cic.Def (s,None)) -> + Some (n,Cic.Def ((subst_in canonical_context' s),None)) | None -> None + | Some (_,Cic.Def (_,Some _)) -> assert false in entry'::canonical_context' ) canonical_context [] @@ -156,8 +160,28 @@ let new_metasenv_for_apply newmeta proof context ty = let rec aux newmeta = function 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 = identity_relocation_list_for_metavariable context in + 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) @@ -196,13 +220,30 @@ let CicSubstitution.subst_vars !exp_named_subst_diff ty | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri)) in - let irl = identity_relocation_list_for_metavariable context in - let subst_item = uri,C.Meta (!next_fresh_meta,irl) in - newmetasenvfragment := - (!next_fresh_meta,context,ty)::!newmetasenvfragment ; - exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ; - incr next_fresh_meta ; - subst_item::(aux (tl,[])) +(* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type + (match ty with + C.Sort (C.Type _) as s -> (* TASSI: ?? *) + let fresh_meta = !next_fresh_meta in + let fresh_meta' = fresh_meta + 1 in + next_fresh_meta := !next_fresh_meta + 2 ; + let subst_item = uri,C.Meta (fresh_meta',[]) in + newmetasenvfragment := + (fresh_meta,[],C.Sort (C.Type (CicUniv.fresh()))) :: + (* TASSI: ?? *) + (fresh_meta',[],C.Meta (fresh_meta,[])) :: !newmetasenvfragment ; + exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ; + subst_item::(aux (tl,[])) + | _ -> +*) + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable context + in + let subst_item = uri,C.Meta (!next_fresh_meta,irl) in + newmetasenvfragment := + (!next_fresh_meta,context,ty)::!newmetasenvfragment ; + exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ; + incr next_fresh_meta ; + subst_item::(aux (tl,[]))(*)*) | uri::tl1,((uri',_) as s)::tl2 -> assert (UriManager.eq uri uri') ; s::(aux (tl1,tl2)) @@ -212,18 +253,17 @@ let !exp_named_subst_diff,!next_fresh_meta, List.rev !newmetasenvfragment, exp_named_subst' in -prerr_endline ("@@@ " ^ CicPp.ppterm (Cic.Var (uri,exp_named_subst)) ^ " |--> " ^ CicPp.ppterm (Cic.Var (uri,exp_named_subst'))) ; new_fresh_meta,newmetasenvfragment,exp_named_subst',exp_named_subst_diff ;; -let apply_tac ~term ~status:(proof, goal) = +let apply_tac ~term (proof, goal) = (* Assumption: The term "term" must be closed in the current context *) let module T = CicTypeChecker in let module R = CicReduction in let module C = Cic in let (_,metasenv,_,_) = proof in - let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in - let newmeta = new_meta ~proof in + let metano,context,ty = CicUtil.lookup_meta goal metasenv in + let newmeta = new_meta_of_proof ~proof in let exp_named_subst_diff,newmeta',newmetasenvfragment,term' = match term with C.Var (uri,exp_named_subst) -> @@ -257,25 +297,23 @@ let apply_tac ~term ~status:(proof, goal) = | _ -> [],newmeta,[],term in let metasenv' = metasenv@newmetasenvfragment in -prerr_endline ("^^^^^TERM': " ^ CicPp.ppterm term') ; let termty = CicSubstitution.subst_vars exp_named_subst_diff (CicTypeChecker.type_of_aux' metasenv' context term) in -prerr_endline ("^^^^^TERMTY: " ^ CicPp.ppterm termty) ; (* 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' = - CicUnification.fo_unif newmetasenv context consthead ty + CicUnification.fo_unif newmetasenv context consthead ty in let in_subst_domain i = List.exists (function (j,_) -> i=j) subst in - let apply_subst = CicUnification.apply_subst 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 _ = CicUnification.apply_subst subst in + let subst_in _ = CicMetaSubst.apply_subst subst in classify_metas newmeta in_subst_domain subst_in newmetasenv' in let bo' = @@ -286,10 +324,9 @@ prerr_endline ("^^^^^TERMTY: " ^ CicPp.ppterm termty) ; Cic.Appl (term'::arguments) ) in -prerr_endline ("XXXX " ^ CicPp.ppterm (if List.length newmetas = 0 then term' else Cic.Appl (term'::arguments)) ^ " |>>> " ^ CicPp.ppterm bo') ; let newmetasenv'' = new_uninstantiatedmetas@old_uninstantiatedmetas in let (newproof, newmetasenv''') = - let subst_in = CicUnification.apply_subst ((metano,bo')::subst) in + let subst_in = CicMetaSubst.apply_subst ((metano,bo')::subst) in subst_meta_and_metasenv_in_proof proof metano subst_in newmetasenv'' in @@ -297,24 +334,24 @@ prerr_endline ("XXXX " ^ CicPp.ppterm (if List.length newmetas = 0 then term' el (* TODO per implementare i tatticali e' necessario che tutte le tattiche sollevino _solamente_ Fail *) -let apply_tac ~term ~status = +let apply_tac ~term status = try - apply_tac ~term ~status + apply_tac ~term status (* TODO cacciare anche altre eccezioni? *) - with CicUnification.UnificationFailed as e -> + with CicUnification.UnificationFailure _ as e -> raise (Fail (Printexc.to_string e)) let intros_tac - ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name) () - ~status:(proof, goal) + ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) () + (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 metano,context,ty = CicUtil.lookup_meta goal metasenv in + let newmeta = new_meta_of_proof ~proof in let (context',ty',bo') = - lambda_abstract context newmeta ty mk_fresh_name_callback + lambda_abstract metasenv context newmeta ty mk_fresh_name_callback in let (newproof, _) = subst_meta_in_proof proof metano bo' [newmeta,context',ty'] @@ -322,21 +359,25 @@ let intros_tac (newproof, [newmeta]) let cut_tac - ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name) - term ~status:(proof, goal) + ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) + term (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 metano,context,ty = CicUtil.lookup_meta goal metasenv in + let newmeta1 = new_meta_of_proof ~proof in let newmeta2 = newmeta1 + 1 in let fresh_name = - mk_fresh_name_callback context (Cic.Name "Hcut") ~typ:term in + mk_fresh_name_callback metasenv context (Cic.Name "Hcut") ~typ:term in let context_for_newmeta1 = (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 + CicMkImplicit.identity_relocation_list_for_metavariable + context_for_newmeta1 + in + let irl2 = + CicMkImplicit.identity_relocation_list_for_metavariable context + in let newmeta1ty = CicSubstitution.lift 1 ty in let bo' = C.Appl @@ -350,20 +391,22 @@ let cut_tac (newproof, [newmeta1 ; newmeta2]) let letin_tac - ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name) - term ~status:(proof, goal) + ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) + term (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 metano,context,ty = CicUtil.lookup_meta goal metasenv in let _ = CicTypeChecker.type_of_aux' metasenv context term in - let newmeta = new_meta ~proof in + let newmeta = new_meta_of_proof ~proof in let fresh_name = - mk_fresh_name_callback context (Cic.Name "Hletin") ~typ:term in + mk_fresh_name_callback metasenv context (Cic.Name "Hletin") ~typ:term in let context_for_newmeta = - (Some (fresh_name,C.Def term))::context in + (Some (fresh_name,C.Def (term,None)))::context in let irl = - identity_relocation_list_for_metavariable context_for_newmeta in + CicMkImplicit.identity_relocation_list_for_metavariable + context_for_newmeta + in let newmetaty = CicSubstitution.lift 1 ty in let bo' = C.LetIn (fresh_name,term,C.Meta (newmeta,irl)) in let (newproof, _) = @@ -373,10 +416,10 @@ let letin_tac (newproof, [newmeta]) (** functional part of the "exact" tactic *) -let exact_tac ~term ~status:(proof, goal) = +let exact_tac ~term (proof, goal) = (* Assumption: the term bo must be closed in the current context *) let (_,metasenv,_,_) = proof in - let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in + let metano,context,ty = CicUtil.lookup_meta goal metasenv in let module T = CicTypeChecker in let module R = CicReduction in if R.are_convertible context (T.type_of_aux' metasenv context term) ty then @@ -391,13 +434,13 @@ let exact_tac ~term ~status:(proof, goal) = (* not really "primitive" tactics .... *) -let elim_tac ~term ~status:(proof, goal) = +let elim_tac ~term (proof, goal) = let module T = CicTypeChecker in let module U = UriManager in let module R = CicReduction in let module C = Cic in let (curi,metasenv,_,_) = proof in - let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in + let metano,context,ty = CicUtil.lookup_meta goal metasenv in let termty = T.type_of_aux' metasenv context term in let uri,exp_named_subst,typeno,args = match termty with @@ -419,14 +462,15 @@ let elim_tac ~term ~status:(proof, goal) = match T.type_of_aux' metasenv context ty with C.Sort C.Prop -> "_ind" | C.Sort C.Set -> "_rec" - | C.Sort C.Type -> "_rect" + | C.Sort C.CProp -> "_rec" + | C.Sort (C.Type _)-> "_rect" (* TASSI *) | _ -> assert false in U.uri_of_string (buri ^ "/" ^ name ^ ext ^ ".con") in let eliminator_ref = C.Const (eliminator_uri,exp_named_subst) in let ety = T.type_of_aux' metasenv context eliminator_ref in - let newmeta = new_meta ~proof in + let newmeta = new_meta_of_proof ~proof in let (econclusion,newmetas,arguments,lastmeta) = new_metasenv_for_apply newmeta proof context ety in @@ -436,10 +480,11 @@ let elim_tac ~term ~status:(proof, goal) = (* way. *) let meta_of_corpse = let (_,canonical_context,_) = - List.find (function (m,_,_) -> m=(lastmeta - 1)) newmetas + CicUtil.lookup_meta (lastmeta - 1) newmetas in let irl = - identity_relocation_list_for_metavariable canonical_context + CicMkImplicit.identity_relocation_list_for_metavariable + canonical_context in Cic.Meta (lastmeta - 1, irl) in @@ -447,7 +492,7 @@ let elim_tac ~term ~status:(proof, goal) = let subst1,newmetasenv' = CicUnification.fo_unif newmetasenv context term meta_of_corpse in - let ueconclusion = CicUnification.apply_subst subst1 econclusion in + let ueconclusion = CicMetaSubst.apply_subst subst1 econclusion in (* The conclusion of our elimination principle is *) (* (?i farg1 ... fargn) *) (* The conclusion of our goal is ty. So, we can *) @@ -461,7 +506,7 @@ let elim_tac ~term ~status:(proof, goal) = | C.Meta (emeta,_) -> emeta,[] | _ -> raise NotTheRightEliminatorShape in - let ty' = CicUnification.apply_subst subst1 ty in + let ty' = CicMetaSubst.apply_subst subst1 ty in let eta_expanded_ty = (*CSC: newmetasenv' era metasenv ??????????? *) List.fold_left (eta_expand newmetasenv' context) ty' fargs @@ -482,9 +527,9 @@ da subst1!!!! Dovrei rimuoverle o sono innocue?*) (* beta-reduction. apply_subst doesn't need the context. Hence *) (* the underscore. *) let apply_subst _ t = - let t' = CicUnification.apply_subst subst1 t in - CicUnification.apply_subst_reducing - subst2 (Some (emeta,List.length fargs)) t' + let t' = CicMetaSubst.apply_subst subst1 t in + CicMetaSubst.apply_subst_reducing + (Some (emeta,List.length fargs)) subst2 t' in let old_uninstantiatedmetas,new_uninstantiatedmetas = classify_metas newmeta in_subst_domain apply_subst @@ -504,10 +549,10 @@ da subst1!!!! Dovrei rimuoverle o sono innocue?*) (*CSC: Nota: sostituire nuovamente subst1 e' superfluo, *) (*CSC: no? *) let apply_subst' t = - let t' = CicUnification.apply_subst subst1 t in - CicUnification.apply_subst_reducing - ((metano,bo')::subst2) - (Some (emeta,List.length fargs)) t' + let t' = CicMetaSubst.apply_subst subst1 t in + CicMetaSubst.apply_subst_reducing + (Some (emeta,List.length fargs)) + ((metano,bo')::subst2) t' in subst_meta_and_metasenv_in_proof proof metano apply_subst' newmetasenv''' @@ -532,9 +577,9 @@ exception NotConvertible (*CSC: while [what] can have a richer context (because of binders) *) (*CSC: So it is _NOT_ possible to use those binders in the [with_what] term. *) (*CSC: Is that evident? Is that right? Or should it be changed? *) -let change_tac ~what ~with_what ~status:(proof, goal) = +let change_tac ~what ~with_what (proof, goal) = let curi,metasenv,pbo,pty = proof in - let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in + let metano,context,ty = CicUtil.lookup_meta goal metasenv in (* are_convertible works only on well-typed terms *) ignore (CicTypeChecker.type_of_aux' metasenv context with_what) ; if CicReduction.are_convertible context what with_what then @@ -547,9 +592,10 @@ let change_tac ~what ~with_what ~status:(proof, goal) = let context' = List.map (function - Some (name,Cic.Def t) -> Some (name,Cic.Def (replace t)) + Some (name,Cic.Def (t,None)) -> Some (name,Cic.Def ((replace t),None)) | Some (name,Cic.Decl t) -> Some (name,Cic.Decl (replace t)) | None -> None + | Some (_,Cic.Def (_,Some _)) -> assert false ) context in let metasenv' =