X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FvariousTactics.ml;h=f8c9cfa94dd409b67f65cbbfe332681473978eef;hb=6150b8ef905aaea17b47ff466c067054f976cd8f;hp=70952d84d5157d2d6a73f1aec8b89165261824f4;hpb=f654787b2156ede958a1d35ca8daf239de1b7b89;p=helm.git diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml index 70952d84d..f8c9cfa94 100644 --- a/helm/ocaml/tactics/variousTactics.ml +++ b/helm/ocaml/tactics/variousTactics.ml @@ -23,7 +23,36 @@ * 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 @@ -35,7 +64,7 @@ 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 (PrimitiveTactics.apply_tac status ~term:(C.Rel n)) with ProofEngineTypes.Fail _ -> None in (match res with @@ -50,46 +79,90 @@ 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))); + (* + let time1 = Unix.gettimeofday() in + let _, all_paths = NewConstraints.prefixes 5 ty in + let time2 = Unix.gettimeofday() in + prerr_endline + (Printf.sprintf "TEMPO DI CALCOLO = %1.3f" (time2 -. time1) ); + prerr_endline + ("ALL PATHS: n = " ^ string_of_int + (List.length all_paths)); + prerr_endline (NewConstraints.pp_prefixes all_paths); + *) + (* 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,opengoals) goal -> - let newproof, newgoals = auto_tac mqi_handle (level-1) proof goal in - (newproof, newgoals@opengoals)) - (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 (proof,goal) = prerr_endline "Entro in Auto"; try - let res = auto_tac mqi_handle depth proof goal in + let proof = auto_tac_aux mqi_handle depth proof goal in prerr_endline "AUTO_TAC HA FINITO"; - res + (proof,[]) with | MaxDepth -> assert false (* this should happens only if depth is 0 above *) | NotApplicableTheorem -> @@ -100,7 +173,8 @@ prerr_endline "AUTO_TAC HA FINITO"; 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 status = + let (proof, goal) = status in let module C = Cic in let module R = CicReduction in let module S = CicSubstitution in @@ -119,7 +193,7 @@ let assumption_tac ~status:((proof,goal) as status) = | _ -> find (n+1) tl ) | [] -> raise (ProofEngineTypes.Fail "Assumption: No such assumption") - in PrimitiveTactics.apply_tac ~status ~term:(C.Rel (find 1 context)) + in PrimitiveTactics.apply_tac status ~term:(C.Rel (find 1 context)) ;; (* ANCORA DA DEBUGGARE *) @@ -132,8 +206,9 @@ 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) + terms status = + let (proof, goal) = status in let module C = Cic in let module P = PrimitiveTactics in let module T = Tacticals in @@ -164,7 +239,7 @@ let generalize_tac ~where:ty) ))) ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac] - ~status + status ;;