X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FdiscriminationTactics.ml;h=ceaccdcefaed715d9a636da8c34f222a1099447f;hb=3bb4ce11fb9d4c6375483a80344beb94c4517dd7;hp=dd2e68d09e8afcaf582ee88f10a7481cc63cfd0d;hpb=a6fc115fd7d4cfba94a43f001f4c27322d3db1a8;p=helm.git diff --git a/helm/ocaml/tactics/discriminationTactics.ml b/helm/ocaml/tactics/discriminationTactics.ml index dd2e68d09..ceaccdcef 100644 --- a/helm/ocaml/tactics/discriminationTactics.ml +++ b/helm/ocaml/tactics/discriminationTactics.ml @@ -25,7 +25,8 @@ open HelmLibraryObjects -let rec injection_tac ~term status = +let rec injection_tac ~term = + let injection_tac ~term status = let (proof, goal) = status in let module C = Cic in let module U = UriManager in @@ -34,6 +35,7 @@ let rec injection_tac ~term status = let _,metasenv,_,_ = proof in let _,context,_ = CicUtil.lookup_meta goal metasenv in let termty = (CicTypeChecker.type_of_aux' metasenv context term) in + ProofEngineTypes.apply_tactic (match termty with (C.Appl [(C.MutInd (equri, 0, [])) ; tty ; t1 ; t2]) when (U.eq equri Logic.eq_URI) -> ( @@ -43,7 +45,8 @@ let rec injection_tac ~term status = match t1,t2 with ((C.MutConstruct (uri1,typeno1,consno1,exp_named_subst1)), (C.MutConstruct (uri2,typeno2,consno2,exp_named_subst2))) - when (uri1 = uri2) && (typeno1 = typeno2) && (consno1 = consno2) && (exp_named_subst1 = exp_named_subst2) -> + when (uri1 = uri2) && (typeno1 = typeno2) && + (consno1 = consno2) && (exp_named_subst1 = exp_named_subst2) -> (* raise (ProofEngineTypes.Fail "Injection: nothing to do") ; *) T.id_tac | ((C.Appl ((C.MutConstruct (uri1,typeno1,consno1,exp_named_subst1))::applist1)), (C.Appl ((C.MutConstruct (uri2,typeno2,consno2,exp_named_subst2))::applist2))) @@ -73,126 +76,132 @@ let rec injection_tac ~term status = ) | _ -> raise (ProofEngineTypes.Fail "Injection: not an equation") ) status + in + ProofEngineTypes.mk_tactic (injection_tac ~term) - -and injection1_tac ~term ~i status = -let (proof, goal) = status in -(* precondizione: t1 e t2 hanno in testa lo stesso costruttore ma differiscono (o potrebbero differire?) nell'i-esimo parametro del costruttore *) - let module C = Cic in - let module S = CicSubstitution in - let module U = UriManager in - let module P = PrimitiveTactics in - let module T = Tacticals in - let _,metasenv,_,_ = proof in - let _,context,_ = CicUtil.lookup_meta goal metasenv in - let termty = (CicTypeChecker.type_of_aux' metasenv context term) in - match termty with (* an equality *) - (C.Appl [(C.MutInd (equri, 0, [])) ; tty ; t1 ; t2]) - when (U.eq equri Logic.eq_URI) -> ( - match tty with (* some inductive type *) - (C.MutInd (turi,typeno,exp_named_subst)) - | (C.Appl (C.MutInd (turi,typeno,exp_named_subst)::_)) -> -prerr_endline ("XXXX term " ^ CicPp.ppterm term) ; -prerr_endline ("XXXX termty " ^ CicPp.ppterm termty) ; -prerr_endline ("XXXX t1 " ^ CicPp.ppterm t1) ; -prerr_endline ("XXXX t2 " ^ CicPp.ppterm t2) ; -prerr_endline ("XXXX tty " ^ CicPp.ppterm tty) ; - let t1',t2',consno = (* sono i due sottotermini che differiscono *) - match t1,t2 with - ((C.Appl ((C.MutConstruct (uri1,typeno1,consno1,exp_named_subst1))::applist1)), - (C.Appl ((C.MutConstruct (uri2,typeno2,consno2,exp_named_subst2))::applist2))) - when (uri1 = uri2) && (typeno1 = typeno2) && (consno1 = consno2) && (exp_named_subst1 = exp_named_subst2) -> (* controllo ridondante *) - (List.nth applist1 (i-1)),(List.nth applist2 (i-1)),consno2 - | _ -> raise (ProofEngineTypes.Fail "Injection: qui non dovrei capitarci mai") - in - let tty' = (CicTypeChecker.type_of_aux' metasenv context t1') in -prerr_endline ("XXXX tty' " ^ CicPp.ppterm tty') ; -prerr_endline ("XXXX t1' " ^ CicPp.ppterm t1') ; -prerr_endline ("XXXX t2' " ^ CicPp.ppterm t2') ; -prerr_endline ("XXXX consno " ^ string_of_int consno) ; - let pattern = - match (CicEnvironment.get_obj turi) with - C.InductiveDefinition (ind_type_list,_,nr_ind_params_dx) -> - let _,_,_,constructor_list = (List.nth ind_type_list typeno) in - let i_constr_id,_ = List.nth constructor_list (consno - 1) in - List.map - (function (id,cty) -> - let reduced_cty = CicReduction.whd context cty in - let rec aux t k = - match t with - C.Prod (_,_,target) when (k <= nr_ind_params_dx) -> - aux target (k+1) - | C.Prod (binder,source,target) when (k > nr_ind_params_dx) -> - let binder' = - match binder with - C.Name b -> C.Name b - | C.Anonymous -> C.Name "y" - in - C.Lambda (binder',source,(aux target (k+1))) - | _ -> - let nr_param_constr = k - 1 - nr_ind_params_dx in - if (id = i_constr_id) - then C.Rel (nr_param_constr - i + 1) - else S.lift (nr_param_constr + 1) t1' (* + 1 per liftare anche il lambda agguinto esternamente al case *) - in aux reduced_cty 1 - ) - constructor_list - | _ -> raise (ProofEngineTypes.Fail "Discriminate: object is not an Inductive Definition: it's imposible") +and injection1_tac ~term ~i = + let injection1_tac ~term ~i status = + let (proof, goal) = status in + (* precondizione: t1 e t2 hanno in testa lo stesso costruttore ma differiscono (o potrebbero differire?) nell'i-esimo parametro del costruttore *) + let module C = Cic in + let module S = CicSubstitution in + let module U = UriManager in + let module P = PrimitiveTactics in + let module T = Tacticals in + let _,metasenv,_,_ = proof in + let _,context,_ = CicUtil.lookup_meta goal metasenv in + let termty = (CicTypeChecker.type_of_aux' metasenv context term) in + match termty with (* an equality *) + (C.Appl [(C.MutInd (equri, 0, [])) ; tty ; t1 ; t2]) + when (U.eq equri Logic.eq_URI) -> ( + match tty with (* some inductive type *) + (C.MutInd (turi,typeno,exp_named_subst)) + | (C.Appl (C.MutInd (turi,typeno,exp_named_subst)::_)) -> + prerr_endline ("XXXX term " ^ CicPp.ppterm term) ; + prerr_endline ("XXXX termty " ^ CicPp.ppterm termty) ; + prerr_endline ("XXXX t1 " ^ CicPp.ppterm t1) ; + prerr_endline ("XXXX t2 " ^ CicPp.ppterm t2) ; + prerr_endline ("XXXX tty " ^ CicPp.ppterm tty) ; + let t1',t2',consno = (* sono i due sottotermini che differiscono *) + match t1,t2 with + ((C.Appl ((C.MutConstruct (uri1,typeno1,consno1,exp_named_subst1))::applist1)), + (C.Appl ((C.MutConstruct (uri2,typeno2,consno2,exp_named_subst2))::applist2))) + when (uri1 = uri2) && (typeno1 = typeno2) && (consno1 = consno2) && (exp_named_subst1 = exp_named_subst2) -> (* controllo ridondante *) + (List.nth applist1 (i-1)),(List.nth applist2 (i-1)),consno2 + | _ -> raise (ProofEngineTypes.Fail "Injection: qui non dovrei capitarci mai") in -prerr_endline ("XXXX cominciamo!") ; - T.thens - ~start:(P.cut_tac (C.Appl [(C.MutInd (equri,0,[])) ; tty' ; t1' ; t2'])) - ~continuations:[ - T.then_ - ~start:(injection_tac ~term:(C.Rel 1)) - ~continuation:T.id_tac (* !!! qui devo anche fare clear di term tranne al primo passaggio *) - ; - T.then_ - ~start: - (fun status -> - let (proof, goal) = status in - let _,metasenv,_,_ = proof in - let _,context,gty = CicUtil.lookup_meta goal metasenv in -prerr_endline ("XXXX goal " ^ string_of_int goal) ; -prerr_endline ("XXXX gty " ^ CicPp.ppterm gty) ; -prerr_endline ("XXXX old t1' " ^ CicPp.ppterm t1') ; -prerr_endline ("XXXX change " ^ CicPp.ppterm (C.Appl [ C.Lambda (C.Name "x", tty, C.MutCase (turi, typeno, (C.Lambda ((C.Name "x"),(S.lift 1 tty),(S.lift 2 tty'))), (C.Rel 1), pattern)); t1])) ; - let new_t1' = - match gty with - (C.Appl (C.MutInd (_,_,_)::arglist)) -> - List.nth arglist 1 - | _ -> raise (ProofEngineTypes.Fail "Injection: goal after cut is not correct") - in -prerr_endline ("XXXX new t1' " ^ CicPp.ppterm new_t1') ; - P.change_tac - ~what:new_t1' - ~with_what: - (C.Appl [ - C.Lambda ( - C.Name "x", tty, - C.MutCase ( - turi, typeno, - (C.Lambda ( - (C.Name "x"), - (S.lift 1 tty), - (S.lift 2 tty'))), - (C.Rel 1), pattern - ) - ); - t1] - ) - status - ) - ~continuation: - (T.then_ - ~start:(EqualityTactics.rewrite_simpl_tac ~term) - ~continuation:EqualityTactics.reflexivity_tac - ) - ] - status - | _ -> raise (ProofEngineTypes.Fail "Discriminate: not a discriminable equality") - ) - | _ -> raise (ProofEngineTypes.Fail "Discriminate: not an equality") + let tty' = (CicTypeChecker.type_of_aux' metasenv context t1') in + prerr_endline ("XXXX tty' " ^ CicPp.ppterm tty') ; + prerr_endline ("XXXX t1' " ^ CicPp.ppterm t1') ; + prerr_endline ("XXXX t2' " ^ CicPp.ppterm t2') ; + prerr_endline ("XXXX consno " ^ string_of_int consno) ; + let pattern = + match (CicEnvironment.get_obj turi) with + C.InductiveDefinition (ind_type_list,_,nr_ind_params_dx) -> + let _,_,_,constructor_list = (List.nth ind_type_list typeno) in + let i_constr_id,_ = List.nth constructor_list (consno - 1) in + List.map + (function (id,cty) -> + let reduced_cty = CicReduction.whd context cty in + let rec aux t k = + match t with + C.Prod (_,_,target) when (k <= nr_ind_params_dx) -> + aux target (k+1) + | C.Prod (binder,source,target) when (k > nr_ind_params_dx) -> + let binder' = + match binder with + C.Name b -> C.Name b + | C.Anonymous -> C.Name "y" + in + C.Lambda (binder',source,(aux target (k+1))) + | _ -> + let nr_param_constr = k - 1 - nr_ind_params_dx in + if (id = i_constr_id) + then C.Rel (nr_param_constr - i + 1) + else S.lift (nr_param_constr + 1) t1' (* + 1 per liftare anche il lambda agguinto esternamente al case *) + in aux reduced_cty 1 + ) + constructor_list + | _ -> raise (ProofEngineTypes.Fail "Discriminate: object is not an Inductive Definition: it's imposible") + in + prerr_endline ("XXXX cominciamo!") ; + ProofEngineTypes.apply_tactic + (T.thens + ~start:(P.cut_tac (C.Appl [(C.MutInd (equri,0,[])) ; tty' ; t1' ; t2'])) + ~continuations:[ + T.then_ + ~start:(injection_tac ~term:(C.Rel 1)) + ~continuation:T.id_tac (* !!! qui devo anche fare clear di term tranne al primo passaggio *) + ; + T.then_ + ~start:(ProofEngineTypes.mk_tactic + (fun status -> + let (proof, goal) = status in + let _,metasenv,_,_ = proof in + let _,context,gty = CicUtil.lookup_meta goal metasenv in + prerr_endline ("XXXX goal " ^ string_of_int goal) ; + prerr_endline ("XXXX gty " ^ CicPp.ppterm gty) ; + prerr_endline ("XXXX old t1' " ^ CicPp.ppterm t1') ; + prerr_endline ("XXXX change " ^ CicPp.ppterm (C.Appl [ C.Lambda (C.Name "x", tty, C.MutCase (turi, typeno, (C.Lambda ((C.Name "x"),(S.lift 1 tty),(S.lift 2 tty'))), (C.Rel 1), pattern)); t1])) ; + let new_t1' = + match gty with + (C.Appl (C.MutInd (_,_,_)::arglist)) -> + List.nth arglist 1 + | _ -> raise (ProofEngineTypes.Fail "Injection: goal after cut is not correct") + in + prerr_endline ("XXXX new t1' " ^ CicPp.ppterm new_t1') ; + ProofEngineTypes.apply_tactic + (P.change_tac + ~what:new_t1' + ~with_what: + (C.Appl [ + C.Lambda ( + C.Name "x", tty, + C.MutCase ( + turi, typeno, + (C.Lambda ( + (C.Name "x"), + (S.lift 1 tty), + (S.lift 2 tty'))), + (C.Rel 1), pattern + ) + ); + t1] + )) + status + )) + ~continuation: + (T.then_ + ~start:(EqualityTactics.rewrite_simpl_tac ~term) + ~continuation:EqualityTactics.reflexivity_tac + ) + ]) + status + | _ -> raise (ProofEngineTypes.Fail "Discriminate: not a discriminable equality") + ) + | _ -> raise (ProofEngineTypes.Fail "Discriminate: not an equality") + in + ProofEngineTypes.mk_tactic (injection1_tac ~term ~i) ;; @@ -202,7 +211,8 @@ exception TwoDifferentSubtermsFound of int (* term ha tipo t1=t2; funziona solo se t1 e t2 hanno in testa costruttori diversi *) -let discriminate'_tac ~term status = +let discriminate'_tac ~term = + let discriminate'_tac ~term status = let (proof, goal) = status in let module C = Cic in let module U = UriManager in @@ -286,8 +296,9 @@ prerr_endline ("XXXX nth funzionano ") ; in let (proof',goals') = - EliminationTactics.elim_type_tac - ~term:(C.MutInd(Logic.false_URI,0,[])) + ProofEngineTypes.apply_tactic + (EliminationTactics.elim_type_tac + ~term:(C.MutInd(Logic.false_URI,0,[]))) status in (match goals' with @@ -296,7 +307,8 @@ prerr_endline ("XXXX nth funzionano ") ; let _,context',gty' = CicUtil.lookup_meta goal' metasenv' in - T.then_ + ProofEngineTypes.apply_tactic + (T.then_ ~start: (P.change_tac ~what:gty' @@ -329,21 +341,26 @@ prerr_endline ("XXXX rewrite<- " ^ CicPp.ppterm term ^ " : " ^ CicPp.ppterm (Cic T.then_ ~start:(EqualityTactics.rewrite_back_simpl_tac ~term) ~continuation:(IntroductionTactics.constructor_tac ~n:1) - ) + )) (proof',goal') | _ -> raise (ProofEngineTypes.Fail "Discriminate: ElimType False left more (or less) than one goal") ) | _ -> raise (ProofEngineTypes.Fail "Discriminate: not a discriminable equality") ) | _ -> raise (ProofEngineTypes.Fail "Discriminate: not an equality") + in + ProofEngineTypes.mk_tactic (discriminate'_tac ~term) ;; - -let discriminate_tac ~term status = - Tacticals.then_ - ~start:(* (injection_tac ~term) *) Tacticals.id_tac - ~continuation:(discriminate'_tac ~term) (* NOOO!!! non term ma una (qualunque) delle nuove hyp introdotte da inject *) +let discriminate_tac ~term = + let discriminate_tac ~term status = + ProofEngineTypes.apply_tactic + (Tacticals.then_ + ~start:(* (injection_tac ~term) *) Tacticals.id_tac + ~continuation:(discriminate'_tac ~term)) (* NOOO!!! non term ma una (qualunque) delle nuove hyp introdotte da inject *) status + in + ProofEngineTypes.mk_tactic (discriminate_tac ~term) ;; @@ -356,8 +373,8 @@ e' vera o no e lo risolve *) -let compare_tac ~term status = Tacticals.id_tac status -(* +let compare_tac ~term = Tacticals.id_tac + (* (* term is in the form t1=t2; the tactic leaves two goals: in the first you have to *) (* demonstrate the goal with the additional hyp that t1=t2, in the second the hyp is ~t1=t2 *) let module C = Cic in