X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Fgrafite_engine%2FgrafiteEngine.ml;h=9e524b377fc68e2cb300d2efb13b871b74551894;hb=be16471f978380deb789b3b70c92d998addbb350;hp=d99ab859311367572eb866e6f675bdb5612a3028;hpb=894b08ca7d14aa7e31c35f3acb3903a1c3472a27;p=helm.git diff --git a/components/grafite_engine/grafiteEngine.ml b/components/grafite_engine/grafiteEngine.ml index d99ab8593..9e524b377 100644 --- a/components/grafite_engine/grafiteEngine.ml +++ b/components/grafite_engine/grafiteEngine.ml @@ -25,6 +25,8 @@ (* $Id$ *) +module GT = GrafiteTypes + open Printf exception Drop @@ -32,7 +34,7 @@ exception Drop exception IncludedFileNotCompiled of string * string exception Macro of GrafiteAst.loc * - (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) + (Cic.context -> GT.status * Cic.term GrafiteAst.macro) exception ReadOnlyUri of string type 'a disambiguator_input = string * int * 'a @@ -152,17 +154,28 @@ let tactic_of_ast ast = | GrafiteAst.Right _ -> Tactics.right | GrafiteAst.Ring _ -> Tactics.ring | GrafiteAst.Split _ -> Tactics.split + | GrafiteAst.Subst _ -> Tactics.subst | GrafiteAst.Symmetry _ -> Tactics.symmetry | GrafiteAst.Transitivity (_, term) -> Tactics.transitivity term (* Implementazioni Aggiunte *) | GrafiteAst.Assume (_, id, t) -> Declarative.assume id t - | GrafiteAst.Suppose (_, t, id) -> Declarative.suppose t id - | GrafiteAst.By_term_we_proved (_, t, ty, id) -> - Declarative.by_term_we_proved t ty id - | GrafiteAst.We_need_to_prove (_, t, id) -> Declarative.we_need_to_prove t id - | GrafiteAst.Bydone (_, t) -> Declarative.bydone t + | GrafiteAst.Suppose (_, t, id, t1) -> Declarative.suppose t id t1 + | GrafiteAst.By_term_we_proved (_, t, ty, id, t1) -> + Declarative.by_term_we_proved ~dbd:(LibraryDb.instance()) t ty id t1 + | GrafiteAst.We_need_to_prove (_, t, id, t2) -> + Declarative.we_need_to_prove t id t2 + | GrafiteAst.Bydone (_, t) -> Declarative.bydone ~dbd:(LibraryDb.instance()) t + | GrafiteAst.We_proceed_by_induction_on (_, t, t1) -> + Declarative.we_proceed_by_induction_on t t1 + | GrafiteAst.Byinduction (_, t, id) -> Declarative.byinduction t id + | GrafiteAst.Thesisbecomes (_, t) -> Declarative.thesisbecomes t + | GrafiteAst.ExistsElim (_, t, id1, t1, id2, t2) -> + Declarative.existselim t id1 t1 id2 t2 + | GrafiteAst.Case (_,id,params) -> Declarative.case id params + | GrafiteAst.AndElim(_,t,id1,t1,id2,t2) -> Declarative.andelim t id1 t1 id2 t2 + | GrafiteAst.RewritingStep (_,termine,t1,t2,cont) -> + Declarative.rewritingstep ~dbd:(LibraryDb.instance ()) termine t1 t2 cont -(* maybe we only need special cases for apply and goal *) let classify_tactic tactic = match tactic with (* tactics that can't close the goal (return a goal we want to "select") *) @@ -286,13 +299,13 @@ let reorder_metasenv start refine tactic goals current_goal always_opens_a_goal= let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) = (* prerr_endline "apply_tactic"; *) -(* prerr_endline (Continuationals.Stack.pp (GrafiteTypes.get_stack status)); *) - let starting_metasenv = GrafiteTypes.get_proof_metasenv status in +(* prerr_endline (Continuationals.Stack.pp (GT.get_stack status)); *) + let starting_metasenv = GT.get_proof_metasenv status in let before = List.map (fun g, _, _ -> g) starting_metasenv in (* prerr_endline "disambiguate"; *) let status, tactic = disambiguate_tactic status goal (text,prefix_len,tactic) in - let metasenv_after_refinement = GrafiteTypes.get_proof_metasenv status in - let proof = GrafiteTypes.get_current_proof status in + let metasenv_after_refinement = GT.get_proof_metasenv status in + let proof = GT.get_current_proof status in let proof_status = proof, goal in let needs_reordering, always_opens_a_goal = classify_tactic tactic in let tactic = tactic_of_ast tactic in @@ -324,82 +337,82 @@ prerr_endline("closed_goals: " ^ String.concat ", " (List.map string_of_int clos proof, opened_goals in let incomplete_proof = - match status.GrafiteTypes.proof_status with - | GrafiteTypes.Incomplete_proof p -> p + match status.GT.proof_status with + | GT.Incomplete_proof p -> p | _ -> assert false in - { status with GrafiteTypes.proof_status = - GrafiteTypes.Incomplete_proof - { incomplete_proof with GrafiteTypes.proof = proof } }, + { status with GT.proof_status = + GT.Incomplete_proof + { incomplete_proof with GT.proof = proof } }, opened_goals, closed_goals type eval_ast = {ea_go: 'term 'lazy_term 'reduction 'obj 'ident. disambiguate_tactic: - (GrafiteTypes.status -> + (GT.status -> ProofEngineTypes.goal -> (('term, 'lazy_term, 'reduction, 'ident) GrafiteAst.tactic) disambiguator_input -> - GrafiteTypes.status * + GT.status * (Cic.term, Cic.lazy_term, Cic.lazy_term GrafiteAst.reduction, string) GrafiteAst.tactic) -> disambiguate_command: - (GrafiteTypes.status -> + (GT.status -> ('obj GrafiteAst.command) disambiguator_input -> - GrafiteTypes.status * Cic.obj GrafiteAst.command) -> + GT.status * Cic.obj GrafiteAst.command) -> disambiguate_macro: - (GrafiteTypes.status -> + (GT.status -> ('term GrafiteAst.macro) disambiguator_input -> - Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> + Cic.context -> GT.status * Cic.term GrafiteAst.macro) -> ?do_heavy_checks:bool -> ?clean_baseuri:bool -> - GrafiteTypes.status -> + GT.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GT.status * UriManager.uri list } type 'a eval_command = {ec_go: 'term 'obj. disambiguate_command: - (GrafiteTypes.status -> ('obj GrafiteAst.command) disambiguator_input -> - GrafiteTypes.status * Cic.obj GrafiteAst.command) -> - options -> GrafiteTypes.status -> + (GT.status -> ('obj GrafiteAst.command) disambiguator_input -> + GT.status * Cic.obj GrafiteAst.command) -> + options -> GT.status -> ('obj GrafiteAst.command) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GT.status * UriManager.uri list } type 'a eval_executable = {ee_go: 'term 'lazy_term 'reduction 'obj 'ident. disambiguate_tactic: - (GrafiteTypes.status -> + (GT.status -> ProofEngineTypes.goal -> (('term, 'lazy_term, 'reduction, 'ident) GrafiteAst.tactic) disambiguator_input -> - GrafiteTypes.status * + GT.status * (Cic.term, Cic.lazy_term, Cic.lazy_term GrafiteAst.reduction, string) GrafiteAst.tactic) -> disambiguate_command: - (GrafiteTypes.status -> + (GT.status -> ('obj GrafiteAst.command) disambiguator_input -> - GrafiteTypes.status * Cic.obj GrafiteAst.command) -> + GT.status * Cic.obj GrafiteAst.command) -> disambiguate_macro: - (GrafiteTypes.status -> + (GT.status -> ('term GrafiteAst.macro) disambiguator_input -> - Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> + Cic.context -> GT.status * Cic.term GrafiteAst.macro) -> options -> - GrafiteTypes.status -> + GT.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.code) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GT.status * UriManager.uri list } type 'a eval_from_moo = - { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status } + { efm_go: GT.status -> string -> GT.status } let coercion_moo_statement_of uri = GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false) @@ -433,18 +446,18 @@ let eval_coercion status ~add_composites uri = let moo_content = List.map coercion_moo_statement_of (uri::compounds) in - let status = GrafiteTypes.add_moo_content moo_content status in - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, + let status = GT.add_moo_content moo_content status in + {status with GT.proof_status = GT.No_proof}, compounds let eval_tactical ~disambiguate_tactic status tac = let apply_tactic = apply_tactic ~disambiguate_tactic in let module MatitaStatus = struct - type input_status = GrafiteTypes.status * ProofEngineTypes.goal + type input_status = GT.status * ProofEngineTypes.goal type output_status = - GrafiteTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list + GT.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list type tactic = input_status -> output_status @@ -453,10 +466,20 @@ let eval_tactical ~disambiguate_tactic status tac = let apply_tactic tac = tac let goals (_, opened, closed) = opened, closed let set_goals (opened, closed) (status, _, _) = (status, opened, closed) - let get_stack (status, _) = GrafiteTypes.get_stack status + let get_stack (status, _) = GT.get_stack status + + let get_status (status, goal) = + match status.GT.proof_status with + | GT.Incomplete_proof incomplete -> incomplete.GT.proof, goal + | _ -> assert false + + let get_proof (status, _, _) = + match status.GT.proof_status with + | GT.Incomplete_proof incomplete -> incomplete.GT.proof + | _ -> assert false let set_stack stack (status, opened, closed) = - GrafiteTypes.set_stack stack status, opened, closed + GT.set_stack stack status, opened, closed let inject (status, _) = (status, [], []) let focus goal (status, _, _) = (status, goal) @@ -488,6 +511,8 @@ let eval_tactical ~disambiguate_tactic status tac = | GrafiteAst.Solve (loc, tacticals) -> MatitaTacticals.solve_tactics ~tactics:(List.map (fun t -> "", tactical_of_ast (l+1) t) tacticals) + | GrafiteAst.Progress (loc, tactical) -> + MatitaTacticals.progress_tactic ~tactic:(tactical_of_ast (l+1) tactical) | GrafiteAst.Skip _loc -> MatitaTacticals.skip | GrafiteAst.Dot _loc -> MatitaTacticals.dot @@ -502,11 +527,11 @@ let eval_tactical ~disambiguate_tactic status tac = in let status, _, _ = tactical_of_ast 0 tac (status, ~-1) in let status = (* is proof completed? *) - match status.GrafiteTypes.proof_status with - | GrafiteTypes.Incomplete_proof - { GrafiteTypes.stack = stack; proof = proof } + match status.GT.proof_status with + | GT.Incomplete_proof + { GT.stack = stack; proof = proof } when Continuationals.Stack.is_empty stack -> - { status with GrafiteTypes.proof_status = GrafiteTypes.Proof proof } + { status with GT.proof_status = GT.Proof proof } | _ -> status in status @@ -539,7 +564,7 @@ let add_coercions_of_record_to_moo obj lemmas status = | (name,true) -> Some (UriManager.uri_of_string - (GrafiteTypes.qualify status name ^ ".con")) + (GT.qualify status name ^ ".con")) | _ -> None) fields in @@ -568,9 +593,9 @@ let add_coercions_of_record_to_moo obj lemmas status = List.iter (fun u -> prerr_endline (UriManager.string_of_uri u)) lemmas; *) - let status = GrafiteTypes.add_moo_content moo_content status in + let status = GT.add_moo_content moo_content status in {status with - GrafiteTypes.coercions = coercions @ status.GrafiteTypes.coercions}, + GT.coercions = coercions @ status.GT.coercions}, lemmas let add_obj uri obj status = @@ -583,13 +608,13 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let status,uris = match cmd with | GrafiteAst.Print (_,"proofterm") -> - let _,_,p,_ = GrafiteTypes.get_current_proof status in + let _,_,p,_ = GT.get_current_proof status in print_endline (AutoTactic.pp_proofterm p); status,[] | GrafiteAst.Print (_,_) -> status,[] | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; - GrafiteTypes.add_moo_content [cmd] status,[] + GT.add_moo_content [cmd] status,[] | GrafiteAst.Include (loc, baseuri) -> let moopath_rw, moopath_r = LibraryMisc.obj_file_of_baseuri @@ -610,7 +635,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let v = Http_getter_misc.strip_trailing_slash value in try ignore (String.index v ' '); - GrafiteTypes.command_error "baseuri can't contain spaces" + GT.command_error "baseuri can't contain spaces" with Not_found -> v in if Http_getter_storage.is_read_only value then begin @@ -625,33 +650,36 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status LibraryClean.clean_baseuris [value]; assert (Http_getter_storage.is_empty value); end; - HExtlib.mkdir - (Filename.dirname (Http_getter.filename ~writable:true (value ^ - "/foo.con"))); + if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk" + ~default:false) + then + HExtlib.mkdir + (Filename.dirname (Http_getter.filename ~writable:true (value ^ + "/foo.con"))); end; - GrafiteTypes.set_option status name value,[] + GT.set_option status name value,[] | GrafiteAst.Drop loc -> raise Drop | GrafiteAst.Qed loc -> let uri, metasenv, bo, ty = - match status.GrafiteTypes.proof_status with - | GrafiteTypes.Proof (Some uri, metasenv, body, ty) -> + match status.GT.proof_status with + | GT.Proof (Some uri, metasenv, body, ty) -> uri, metasenv, body, ty - | GrafiteTypes.Proof (None, metasenv, body, ty) -> - raise (GrafiteTypes.Command_error + | GT.Proof (None, metasenv, body, ty) -> + raise (GT.Command_error ("Someone allows to start a theorem without giving the "^ "name/uri. This should be fixed!")) | _-> raise - (GrafiteTypes.Command_error "You can't Qed an incomplete theorem") + (GT.Command_error "You can't Qed an incomplete theorem") in if metasenv <> [] then raise - (GrafiteTypes.Command_error + (GT.Command_error "Proof not completed! metasenv is not empty!"); let name = UriManager.name_of_uri uri in let obj = Cic.Constant (name,Some bo,ty,[],[]) in let status, lemmas = add_obj uri obj status in - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, + {status with GT.proof_status = GT.No_proof}, uri::lemmas | GrafiteAst.Coercion (loc, uri, add_composites) -> eval_coercion status ~add_composites uri @@ -665,9 +693,9 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status (match types with (name,_,_,_)::_ -> name | _ -> assert false) | _ -> assert false in let uri = - UriManager.uri_of_string (GrafiteTypes.qualify status name ^ ext) in + UriManager.uri_of_string (GT.qualify status name ^ ext) in let obj = CicRefine.pack_coercion_obj obj in - let metasenv = GrafiteTypes.get_proof_metasenv status in + let metasenv = GT.get_proof_metasenv status in match obj with | Cic.CurrentProof (_,metasenv',bo,ty,_,_) -> let name = UriManager.name_of_uri uri in @@ -703,25 +731,25 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status end; let initial_proof = (Some uri, metasenv', bo, ty) in let initial_stack = Continuationals.Stack.of_metasenv metasenv' in - { status with GrafiteTypes.proof_status = - GrafiteTypes.Incomplete_proof - { GrafiteTypes.proof = initial_proof; stack = initial_stack } }, + { status with GT.proof_status = + GT.Incomplete_proof + { GT.proof = initial_proof; stack = initial_stack } }, [] | _ -> if metasenv <> [] then - raise (GrafiteTypes.Command_error ( + raise (GT.Command_error ( "metasenv not empty while giving a definition with body: " ^ CicMetaSubst.ppmetasenv [] metasenv)); let status, lemmas = add_obj uri obj status in let status,new_lemmas = add_coercions_of_record_to_moo obj lemmas status in - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, + {status with GT.proof_status = GT.No_proof}, uri::new_lemmas@lemmas in - match status.GrafiteTypes.proof_status with - GrafiteTypes.Intermediate _ -> - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},uris + match status.GT.proof_status with + GT.Intermediate _ -> + {status with GT.proof_status = GT.No_proof},uris | _ -> status,uris } and eval_executable = {ee_go = fun ~disambiguate_tactic ~disambiguate_command