X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FvariousTactics.ml;h=0566564dc276c863954bf4c43facd662ad5f7223;hb=bc2a1fce21a66af077172344854c709b64b7fe82;hp=daf461c5ba78ade83739de5cb180c79fccf9cc85;hpb=e76b78d1d80796de1b8f6a469741cbd26cd4d822;p=helm.git diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml index daf461c5b..0566564dc 100644 --- a/helm/ocaml/tactics/variousTactics.ml +++ b/helm/ocaml/tactics/variousTactics.ml @@ -56,6 +56,8 @@ let search_theorems_in_context status = let module C = Cic in let module R = CicReduction in let module S = CicSubstitution in + let module PET = ProofEngineTypes in + let module PT = PrimitiveTactics in prerr_endline "Entro in search_context"; let _,metasenv,_,_ = proof in let _,context,ty = CicUtil.lookup_meta goal metasenv in @@ -64,9 +66,9 @@ let search_theorems_in_context status = | hd::tl -> let res = try - Some (PrimitiveTactics.apply_tac status ~term:(C.Rel n)) + Some (PET.apply_tactic (PT.apply_tac ~term:(C.Rel n)) status ) with - ProofEngineTypes.Fail _ -> None in + PET.Fail _ -> None in (match res with Some res -> res::(find (n+1) tl) | None -> find (n+1) tl) @@ -147,17 +149,23 @@ prerr_endline ("GOALLIST = " ^ string_of_int (List.length goallist)); | None -> proof ;; -let auto_tac mqi_handle (proof,goal) = +let auto_tac mqi_handle = + let module PET = ProofEngineTypes in + let auto_tac mqi_handle (proof,goal) = prerr_endline "Entro in Auto"; try let proof = auto_tac_aux mqi_handle depth proof goal in -prerr_endline "AUTO_TAC HA FINITO"; - (proof,[]) + prerr_endline "AUTO_TAC HA FINITO"; + (proof,[]) with | MaxDepth -> assert false (* this should happens only if depth is 0 above *) | NotApplicableTheorem -> prerr_endline("No applicable theorem"); - raise (ProofEngineTypes.Fail "No Applicable theorem");; + raise (ProofEngineTypes.Fail "No Applicable theorem") + in + PET.mk_tactic (auto_tac mqi_handle) +;; + *) (**** ESPERIMENTO ************************) @@ -211,7 +219,8 @@ let rec auto_new mqi_handle = function ;; -let auto_tac mqi_handle (proof,goal) = +let auto_tac mqi_handle = + let auto_tac mqi_handle (proof,goal) = prerr_endline "Entro in Auto"; try let (proof,_)::_ = auto_new mqi_handle [(proof, [(goal,depth)])] in @@ -220,17 +229,23 @@ prerr_endline "AUTO_TAC HA FINITO"; with | NoOtherChoices -> prerr_endline("Auto failed"); - raise (ProofEngineTypes.Fail "No Applicable theorem");; + raise (ProofEngineTypes.Fail "No Applicable theorem") + in + ProofEngineTypes.mk_tactic (auto_tac mqi_handle) +;; (* TODO se ce n'e' piu' di una, prende la prima che trova... sarebbe meglio chiedere: find dovrebbe restituire una lista di hyp (?) da passare all'utonto con una funzione di callback che restituisce la (sola) hyp da applicare *) -let assumption_tac status = +let assumption_tac = + let module PET = ProofEngineTypes in + let assumption_tac status = let (proof, goal) = status in let module C = Cic in let module R = CicReduction in let module S = CicSubstitution in + let module PT = PrimitiveTactics in let _,metasenv,_,_ = proof in let _,context,ty = CicUtil.lookup_meta goal metasenv in let rec find n = function @@ -245,8 +260,10 @@ let assumption_tac status = (CicTypeChecker.type_of_aux' metasenv context (S.lift n t)) ty) -> n | _ -> find (n+1) tl ) - | [] -> raise (ProofEngineTypes.Fail "Assumption: No such assumption") - in PrimitiveTactics.apply_tac status ~term:(C.Rel (find 1 context)) + | [] -> raise (PET.Fail "Assumption: No such assumption") + in PET.apply_tactic (PT.apply_tac ~term:(C.Rel (find 1 context))) status + in + PET.mk_tactic assumption_tac ;; (* ANCORA DA DEBUGGARE *) @@ -257,42 +274,46 @@ exception AllSelectedTermsMustBeConvertible;; e li aggiunga nel context, poi si conta la lunghezza di questo nuovo contesto e si lifta di tot... COSA SIGNIFICA TUTTO CIO'?????? *) -let generalize_tac - ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) - terms status -= - let (proof, goal) = status in - let module C = Cic in - let module P = PrimitiveTactics in - let module T = Tacticals in - let _,metasenv,_,_ = proof in - let _,context,ty = CicUtil.lookup_meta goal metasenv in - let typ = - match terms with - [] -> assert false - | he::tl -> - (* We need to check that all the convertibility of all the terms *) - List.iter - (function t -> - if not (CicReduction.are_convertible context he t) then - raise AllSelectedTermsMustBeConvertible - ) tl ; - (CicTypeChecker.type_of_aux' metasenv context he) - in - T.thens - ~start: - (P.cut_tac - (C.Prod( - (mk_fresh_name_callback metasenv context C.Anonymous typ), - typ, - (ProofEngineReduction.replace_lifting_csc 1 - ~equality:(==) - ~what:terms - ~with_what:(List.map (function _ -> C.Rel 1) terms) - ~where:ty) - ))) - ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac] - status +let generalize_tac + ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) terms + = + let module PET = ProofEngineTypes in + let generalize_tac mk_fresh_name_callback terms status = + let (proof, goal) = status in + let module C = Cic in + let module P = PrimitiveTactics in + let module T = Tacticals in + let _,metasenv,_,_ = proof in + let _,context,ty = CicUtil.lookup_meta goal metasenv in + let typ = + match terms with + [] -> assert false + | he::tl -> + (* We need to check that all the convertibility of all the terms *) + List.iter + (function t -> + if not (CicReduction.are_convertible context he t) then + raise AllSelectedTermsMustBeConvertible + ) tl ; + (CicTypeChecker.type_of_aux' metasenv context he) + in + PET.apply_tactic + (T.thens + ~start: + (P.cut_tac + (C.Prod( + (mk_fresh_name_callback metasenv context C.Anonymous ~typ:typ), + typ, + (ProofEngineReduction.replace_lifting_csc 1 + ~equality:(==) + ~what:terms + ~with_what:(List.map (function _ -> C.Rel 1) terms) + ~where:ty) + ))) + ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac]) + status + in + PET.mk_tactic (generalize_tac mk_fresh_name_callback terms) ;;