X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnInversion.ml;h=aebda4bce746e543ed9d0f102f3329fa22e1bcae;hb=1bcb1921390d24e02d716614648e749bac6f5933;hp=89a1dd1af65b33bdb126e68575e79358c72d12d6;hpb=870b9b017da98021d9163bf45efe9c27b40bb33d;p=helm.git diff --git a/helm/software/components/ng_tactics/nInversion.ml b/helm/software/components/ng_tactics/nInversion.ml index 89a1dd1af..aebda4bce 100644 --- a/helm/software/components/ng_tactics/nInversion.ml +++ b/helm/software/components/ng_tactics/nInversion.ml @@ -11,8 +11,8 @@ (* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *) -let pp m = prerr_endline (Lazy.force m);; -(* let pp _ = ();; *) +(*let pp m = prerr_endline (Lazy.force m);;*) +let pp _ = ();; let fresh_name = let i = ref 0 in @@ -46,19 +46,13 @@ let rec mk_prods l t = | hd::tl -> CicNotationPt.Binder (`Forall, (mk_id hd, None), mk_prods tl t) ;; -let rec mk_lambdas l t = - match l with - [] -> t - | hd::tl -> CicNotationPt.Binder (`Lambda, (mk_id hd, None), mk_lambdas tl t) -;; - -let rec mk_arrows xs ys selection target = +let rec mk_arrows ?(pattern=false) xs ys selection target = match selection,xs,ys with [],[],[] -> target - | false :: l,x::xs,y::ys -> mk_arrows xs ys l target + | false :: l,x::xs,y::ys -> mk_arrows ~pattern xs ys l target | true :: l,x::xs,y::ys -> - CicNotationPt.Binder (`Forall, (mk_id "_", Some (mk_appl [mk_id "eq" ; CicNotationPt.Implicit `JustOne;x;y])), - mk_arrows xs ys l target) + CicNotationPt.Binder (`Forall, (mk_id "_", Some (mk_appl [if pattern then CicNotationPt.Implicit `JustOne else mk_id "eq" ; CicNotationPt.Implicit `JustOne;x;y])), + mk_arrows ~pattern xs ys l target) | _ -> raise (Invalid_argument "ninverter: the selection doesn't match the arity of the specified inductive type") ;; @@ -71,7 +65,7 @@ let subst_metasenv_and_fix_names status = status#set_obj(u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o) ;; -let mk_inverter name it leftno ?selection outsort status baseuri = +let mk_inverter name is_ind it leftno ?selection outsort status baseuri = pp (lazy ("leftno = " ^ string_of_int leftno)); let _,ind_name,ty,cl = it in pp (lazy ("arity: " ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] ty)); @@ -113,8 +107,6 @@ let mk_inverter name it leftno ?selection outsort status baseuri = in let prods = mk_arrows id_rs id_ys selection pred in - let lambdas = mk_lambdas (ys@["p"]) prods in - let hyplist = let rec hypaux k = function 0 -> [] @@ -124,21 +116,18 @@ let mk_inverter name it leftno ?selection outsort status baseuri = pp (lazy ("lunghezza ys = " ^ string_of_int (List.length ys))); let outsort, suffix = NCicElim.ast_of_sort outsort in - let theorem = mk_prods xs - (CicNotationPt.Binder (`Forall, (mk_id "P", Some (mk_prods (HExtlib.mk_list "_" (List.length ys)) (CicNotationPt.Sort outsort))), - mk_prods hyplist (CicNotationPt.Binder (`Forall, (mk_id "Hterm", (*Some (mk_appl (List.map mk_id (ind_name::xs)))) *) - Some (CicNotationPt.Implicit `JustOne)), - mk_appl (mk_id "P"::id_rs))))) + let theorem = + mk_prods xs + (CicNotationPt.Binder (`Forall, (mk_id "P", Some (mk_prods (HExtlib.mk_list "_" (List.length ys)) (CicNotationPt.Sort outsort))), + mk_prods hyplist (CicNotationPt.Binder (`Forall, (mk_id "Hterm", Some (mk_appl (List.map mk_id (ind_name::xs)))), mk_appl (mk_id "P"::id_rs))))) in - pp (lazy ("and the theorem is: \n" ^ (CicNotationPp.pp_term theorem))); - let t = mk_appl ( [mk_id (ind_name ^ "_" ^ suffix)]@ id_ls @ [lambdas] @ - List.map mk_id hyplist @ - HExtlib.mk_list (CicNotationPt.Implicit `JustOne) (List.length ys) @ [mk_id "Hterm"] ) in - pp (lazy ("and t is: \n" ^ (CicNotationPp.pp_term t))); - let status, theorem = GrafiteDisambiguate.disambiguate_nobj status ~baseuri - (baseuri ^ name ^ ".def", - 0,CicNotationPt.Theorem (`Theorem,name,theorem,Some - (CicNotationPt.Implicit (`Tagged "inv")),`InversionPrinciple)) in + let status, theorem = + GrafiteDisambiguate.disambiguate_nobj status ~baseuri + (baseuri ^ name ^ ".def",0, + CicNotationPt.Theorem + (`Theorem,name,theorem, + Some (CicNotationPt.Implicit (`Tagged "inv")),`InversionPrinciple)) + in let uri,height,nmenv,nsubst,nobj = theorem in let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in let status = status#set_obj theorem in @@ -154,21 +143,33 @@ let mk_inverter name it leftno ?selection outsort status baseuri = CicNotationPt.Implicit (`Tagged "end")); CicNotationPt.Implicit (`Tagged "cut")] in let intros = List.map (fun x -> pp (lazy x); NTactics.intro_tac x) (xs@["P"]@hyplist@["Hterm"]) in - let status = NTactics.block_tac - (NTactics.branch_tac :: - NTactics.case_tac "inv" :: - (intros @ - [NTactics.apply_tac ("",0,cut); - NTactics.branch_tac; - NTactics.case_tac "end"; - NTactics.apply_tac ("",0,mk_id "Hcut"); - NTactics.apply_tac ("",0,mk_id "refl"); - NTactics.shift_tac; - (*NTactics.case_tac "cut";*) - NTactics.apply_tac ("",0,t); - NTactics.merge_tac; - NTactics.merge_tac; - NTactics.skip_tac])) status in + let where = + "",0,(None,[], + Some ( + mk_arrows ~pattern:true + (HExtlib.mk_list (CicNotationPt.Implicit `JustOne) (List.length ys)) + (HExtlib.mk_list CicNotationPt.UserInput (List.length ys)) + selection CicNotationPt.UserInput)) in + let elim_tac = if is_ind then NTactics.elim_tac else NTactics.cases_tac in + let status = + NTactics.block_tac + (NTactics.branch_tac :: + NTactics.case_tac "inv" :: + (intros @ + [NTactics.apply_tac ("",0,cut); + NTactics.branch_tac; + NTactics.case_tac "end"; + NTactics.apply_tac ("",0,mk_id "Hcut"); + NTactics.apply_tac ("",0,mk_id "refl"); + NTactics.shift_tac; + elim_tac ~what:("",0,mk_id "Hterm") ~where; + NTactics.branch_tac ~force:true] @ + HExtlib.list_concat ~sep:[NTactics.shift_tac] + (List.map (fun id-> [NTactics.apply_tac ("",0,mk_id id)]) hyplist) @ + [NTactics.merge_tac; + NTactics.merge_tac; + NTactics.merge_tac; + NTactics.skip_tac])) status in pp (lazy "inv 3"); status,status#obj ;;