X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FvariousTactics.ml;h=d89f702fc071cb3fb732be9bba8bee5a4c2dd680;hb=fd648e40eb2c9c5b29cfa4408459511a74898d1d;hp=080ba224d2cdfc223cc819910874d02de707ee54;hpb=2bd307bda75f4aee3b95c3d5039c64b34408dc6c;p=helm.git diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml index 080ba224d..d89f702fc 100644 --- a/helm/ocaml/tactics/variousTactics.ml +++ b/helm/ocaml/tactics/variousTactics.ml @@ -23,10 +23,41 @@ * http://cs.unibo.it/helm/. *) -let search_theorems_in_context ~status:((proof,goal) as status) = + +(* Da rimuovere, solo per debug*) +let print_context ctx = + let print_name = + function + Cic.Name n -> n + | Cic.Anonymous -> "_" + in + List.fold_right + (fun i (output,context) -> + let (newoutput,context') = + match i with + Some (n,Cic.Decl t) -> + print_name n ^ ":" ^ CicPp.pp t context ^ "\n", (Some n)::context + | Some (n,Cic.Def (t,None)) -> + print_name n ^ ":=" ^ CicPp.pp t context ^ "\n", (Some n)::context + | None -> + "_ ?= _\n", None::context + | Some (_,Cic.Def (_,Some _)) -> assert false + in + output^newoutput,context' + ) ctx ("",[]) + ;; + + + + + +let search_theorems_in_context status = + let (proof, goal) = status in 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 @@ -35,9 +66,9 @@ let search_theorems_in_context ~status:((proof,goal) as 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) @@ -50,69 +81,173 @@ let search_theorems_in_context ~status:((proof,goal) as status) = prerr_endline ("SIAM QUI = " ^ s); [] ;; - +exception NotAProposition;; exception NotApplicableTheorem;; exception MaxDepth;; -let depth = 5;; +let depth = 3;; -let rec auto_tac mqi_handle level proof goal = -prerr_endline "Entro in Auto_rec"; +(* +let rec auto_tac_aux mqi_handle level proof goal = +prerr_endline ("Entro in Auto_rec; level = " ^ (string_of_int level)); if level = 0 then (* (proof, [goal]) *) - (prerr_endline ("NON ci credo"); + (prerr_endline ("MaxDepth"); raise MaxDepth) else - (* choices is a list of pairs proof and goallist *) - let choices = - (search_theorems_in_context ~status:(proof,goal))@ - (TacticChaser.searchTheorems mqi_handle ~status:(proof,goal)) - in - let rec try_choices = function - [] -> raise NotApplicableTheorem - | (proof,goallist)::tl -> + (* let us verify that the metavariable is still an open goal -- + it could have been closed by closing other goals -- and that + it is of sort Prop *) + let _,metasenv,_,_ = proof in + let meta_inf = + (try + let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in + Some (ey, ty) + with _ -> None) in + match meta_inf with + Some (ey, ty) -> + prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty)); + prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey))); + (* if the goal does not have a sort Prop we return the + current proof and a list containing the goal *) + let ty_sort = CicTypeChecker.type_of_aux' metasenv ey ty in + if CicReduction.are_convertible + ey (Cic.Sort Cic.Prop) ty_sort then + (* sort Prop *) + (* choices is a list of pairs proof and goallist *) + let choices = + (search_theorems_in_context (proof,goal))@ + (TacticChaser.searchTheorems mqi_handle (proof,goal)) + in + let rec try_choices = function + [] -> raise NotApplicableTheorem + | (proof,goallist)::tl -> prerr_endline ("GOALLIST = " ^ string_of_int (List.length goallist)); - (try - List.fold_left - (fun proof goal -> - (* It may happen that to close the first open goal - also some other goals are closed *) - let _,metasenv,_,_ = proof in - if List.exists (fun (i,_,_) -> i = goal) metasenv then - let newproof = - auto_tac mqi_handle (level-1) proof goal - in - newproof - else - (* goal already closed *) - proof) - proof goallist - with - | MaxDepth - | NotApplicableTheorem -> - try_choices tl) in - try_choices choices;; - -let auto_tac mqi_handle ~status:(proof,goal) = + (try + List.fold_left + (fun proof goal -> + auto_tac_aux mqi_handle (level-1) proof goal) + proof goallist + with + | MaxDepth + | NotApplicableTheorem + | NotAProposition -> + try_choices tl) in + try_choices choices + else + (* CUT AND PASTE DI PROVA !! *) + let choices = + (search_theorems_in_context (proof,goal))@ + (TacticChaser.searchTheorems mqi_handle (proof,goal)) + in + let rec try_choices = function + [] -> raise NotApplicableTheorem + | (proof,[])::tl -> proof + | _::tl -> try_choices tl in + try_choices choices + (* raise NotAProposition *) + | None -> proof +;; + +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 mqi_handle depth proof goal in -prerr_endline "AUTO_TAC HA FINITO"; - (proof,[]) + let proof = auto_tac_aux mqi_handle depth proof goal in + 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 ************************) + +let new_search_theorems f proof goal depth gtl = + let local_choices = f (proof,goal) + in + List.map + (function (proof, goallist) -> + (proof, (List.map (function g -> (g,depth)) goallist)@gtl)) + local_choices +;; + +exception NoOtherChoices;; + +let rec auto_new mqi_handle = function + [] -> raise NoOtherChoices + | (proof, [])::tl -> (proof, [])::tl + | (proof, (goal,0)::gtl)::tl -> auto_new mqi_handle tl + | (proof, (goal,depth)::gtl)::tl -> + let _,metasenv,_,_ = proof in + let meta_inf = + (try + let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in + Some (ey, ty) + with _ -> None) in + match meta_inf with + Some (ey, ty) -> + prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty)); + prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey))); + let local_choices = + new_search_theorems + search_theorems_in_context proof goal (depth-1) gtl in + let global_choices = + new_search_theorems + (TacticChaser.searchTheorems mqi_handle) + proof goal (depth-1) gtl in + let all_choices = + local_choices@global_choices@tl in + let sorting_list (_,g1) (_,g2) = + let l1 = List.length g1 in + let l2 = List.length g2 in + if (l1 = l2 && not(l1 = 0)) then + (snd(List.nth g2 0)) - (snd(List.nth g1 0)) + else l1 - l2 in + let reorder = + List.stable_sort sorting_list all_choices + in + auto_new mqi_handle reorder + | None -> auto_new mqi_handle ((proof,gtl)::tl) +;; + + +let auto_tac mqi_handle = +(* CicMetaSubst.reset_counters (); *) + let auto_tac mqi_handle (proof,goal) = + prerr_endline "Entro in Auto"; + try + let (proof,_)::_ = auto_new mqi_handle [(proof, [(goal,depth)])] in + prerr_endline "AUTO_TAC HA FINITO"; +(* CicMetaSubst.print_counters (); *) + (proof,[]) + with + | NoOtherChoices -> + prerr_endline("Auto failed"); + 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:((proof,goal) as 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 @@ -127,8 +262,10 @@ let assumption_tac ~status:((proof,goal) as 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 *) @@ -139,41 +276,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:((proof,goal) as status) -= - 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) ;;