X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=8813e498bed94ae6425757af2e4d88ed1c025794;hb=ed5c4e15429c37bef0f59dfd7160f6883586ed0f;hp=08b88b95fbc1b5e32ce1c883b2f5a4ed1d2053d3;hpb=50afaf262195266d156f594cff7e92a6e8898b3e;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 08b88b95f..8813e498b 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -25,7 +25,7 @@ (* $Id$ *) -open Printf +module PEH = ProofEngineHelpers exception Drop (* mo file name, ma file name *) @@ -33,13 +33,11 @@ exception IncludedFileNotCompiled of string * string exception Macro of GrafiteAst.loc * (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -exception ReadOnlyUri of string type 'a disambiguator_input = string * int * 'a type options = { do_heavy_checks: bool ; - clean_baseuri: bool } (** create a ProofEngineTypes.mk_fresh_name_type function which uses given @@ -50,7 +48,10 @@ let namer_of names = let count = ref 0 in fun metasenv context name ~typ -> if !count < len then begin - let name = Cic.Name (List.nth names !count) in + let name = match List.nth names !count with + | Some s -> Cic.Name s + | None -> Cic.Anonymous + in incr count; name end else @@ -85,32 +86,36 @@ let rec tactic_of_ast status ast = Tactics.applyS ~term ~params ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe | GrafiteAst.Assumption _ -> Tactics.assumption - | GrafiteAst.Auto (_,params) -> - AutoTactic.auto_tac ~params ~dbd:(LibraryDb.instance ()) + | GrafiteAst.AutoBatch (_,params) -> + Tactics.auto ~params ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe - | GrafiteAst.Cases (_, what, names) -> - Tactics.cases_intros ~mk_fresh_name_callback:(namer_of names) - what + | GrafiteAst.Cases (_, what, pattern, (howmany, names)) -> + Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names) + ~pattern what | GrafiteAst.Change (_, pattern, with_what) -> Tactics.change ~pattern with_what | GrafiteAst.Clear (_,id) -> Tactics.clear id | GrafiteAst.ClearBody (_,id) -> Tactics.clearbody id + | GrafiteAst.Compose (_,t1,t2,times,(howmany, names)) -> + Tactics.compose times t1 t2 ?howmany + ~mk_fresh_name_callback:(namer_of names) | GrafiteAst.Contradiction _ -> Tactics.contradiction | GrafiteAst.Constructor (_, n) -> Tactics.constructor n | GrafiteAst.Cut (_, ident, term) -> - let names = match ident with None -> [] | Some id -> [id] in + let names = match ident with None -> [] | Some id -> [Some id] in Tactics.cut ~mk_fresh_name_callback:(namer_of names) term | GrafiteAst.Decompose (_, names) -> let mk_fresh_name_callback = namer_of names in Tactics.decompose ~mk_fresh_name_callback () - | GrafiteAst.Demodulate _ -> + | GrafiteAst.Demodulate (_, params) -> Tactics.demodulate - ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe - | GrafiteAst.Destruct (_,term) -> Tactics.destruct term - | GrafiteAst.Elim (_, what, using, pattern, depth, names) -> + ~dbd:(LibraryDb.instance ()) ~params + ~universe:status.GrafiteTypes.universe + | GrafiteAst.Destruct (_,xterms) -> Tactics.destruct xterms + | GrafiteAst.Elim (_, what, using, pattern, (depth, names)) -> Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names) ~pattern what - | GrafiteAst.ElimType (_, what, using, depth, names) -> + | GrafiteAst.ElimType (_, what, using, (depth, names)) -> Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names) what | GrafiteAst.Exact (_, term) -> Tactics.exact term @@ -122,7 +127,6 @@ let rec tactic_of_ast status ast = | `Normalize -> PET.const_lazy_reduction (CicReduction.normalize ~delta:false ~subst:[]) - | `Reduce -> PET.const_lazy_reduction ProofEngineReduction.reduce | `Simpl -> PET.const_lazy_reduction ProofEngineReduction.simpl | `Unfold None -> PET.const_lazy_reduction (ProofEngineReduction.unfold ?what:None) @@ -139,27 +143,24 @@ let rec tactic_of_ast status ast = Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) ~dbd:(LibraryDb.instance ()) hyp | GrafiteAst.Generalize (_,pattern,ident) -> - let names = match ident with None -> [] | Some id -> [id] in + let names = match ident with None -> [] | Some id -> [Some id] in Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern | GrafiteAst.IdTac _ -> Tactics.id - | GrafiteAst.Intros (_, None, names) -> - PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) () - | GrafiteAst.Intros (_, Some num, names) -> - PrimitiveTactics.intros_tac ~howmany:num + | GrafiteAst.Intros (_, (howmany, names)) -> + PrimitiveTactics.intros_tac ?howmany ~mk_fresh_name_callback:(namer_of names) () | GrafiteAst.Inversion (_, term) -> Tactics.inversion term | GrafiteAst.LApply (_, linear, how_many, to_what, what, ident) -> - let names = match ident with None -> [] | Some id -> [id] in + let names = match ident with None -> [] | Some id -> [Some id] in Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ~linear ?how_many ~to_what what | GrafiteAst.Left _ -> Tactics.left | GrafiteAst.LetIn (loc,term,name) -> - Tactics.letin term ~mk_fresh_name_callback:(namer_of [name]) + Tactics.letin term ~mk_fresh_name_callback:(namer_of [Some name]) | GrafiteAst.Reduce (_, reduction_kind, pattern) -> (match reduction_kind with | `Normalize -> Tactics.normalize ~pattern - | `Reduce -> Tactics.reduce ~pattern | `Simpl -> Tactics.simpl ~pattern | `Unfold what -> Tactics.unfold ~pattern what | `Whd -> Tactics.whd ~pattern) @@ -167,19 +168,20 @@ let rec tactic_of_ast status ast = | GrafiteAst.Replace (_, pattern, with_what) -> Tactics.replace ~pattern ~with_what | GrafiteAst.Rewrite (_, direction, t, pattern, names) -> - EqualityTactics.rewrite_tac ~direction ~pattern t names + EqualityTactics.rewrite_tac ~direction ~pattern t +(* to be replaced with ~mk_fresh_name_callback:(namer_of names) *) + (List.map (function Some s -> s | None -> assert false) names) | 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, t1) -> Declarative.suppose t id t1 - | GrafiteAst.By_term_we_proved (_, t, ty, id, t1) -> - Declarative.by_term_we_proved ~dbd:(LibraryDb.instance()) - ~universe:status.GrafiteTypes.universe t ty id t1 + | GrafiteAst.By_just_we_proved (_, just, ty, id, t1) -> + Declarative.by_just_we_proved ~dbd:(LibraryDb.instance()) + ~universe:status.GrafiteTypes.universe just ty id t1 | GrafiteAst.We_need_to_prove (_, t, id, t2) -> Declarative.we_need_to_prove t id t2 | GrafiteAst.Bydone (_, t) -> @@ -191,11 +193,13 @@ let rec tactic_of_ast status ast = 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) -> + | GrafiteAst.ExistsElim (_, just, id1, t1, id2, t2) -> Declarative.existselim ~dbd:(LibraryDb.instance()) - ~universe:status.GrafiteTypes.universe t id1 t1 id2 t2 + ~universe:status.GrafiteTypes.universe just 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.AndElim(_,just,id1,t1,id2,t2) -> + Declarative.andelim ~dbd:(LibraryDb.instance ()) + ~universe:status.GrafiteTypes.universe just id1 t1 id2 t2 | GrafiteAst.RewritingStep (_,termine,t1,t2,cont) -> Declarative.rewritingstep ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe termine t1 t2 cont @@ -216,7 +220,6 @@ let classify_tactic tactic = | _ -> false let reorder_metasenv start refine tactic goals current_goal always_opens_a_goal= - let module PEH = ProofEngineHelpers in (* let print_m name metasenv = prerr_endline (">>>>> " ^ name); prerr_endline (CicMetaSubst.ppmetasenv [] metasenv) @@ -331,14 +334,14 @@ let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) = let after = ProofEngineTypes.goals_of_proof proof in let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in let proof, opened_goals = - let uri, metasenv_after_tactic, t, ty, attrs = proof in + let uri, metasenv_after_tactic, _subst, t, ty, attrs = proof in let reordered_metasenv, opened_goals = reorder_metasenv starting_metasenv metasenv_after_refinement metasenv_after_tactic opened goal always_opens_a_goal in - let proof' = uri, reordered_metasenv, t, ty, attrs in + let proof' = uri, reordered_metasenv, _subst, t, ty, attrs in proof', opened_goals in let incomplete_proof = @@ -365,14 +368,14 @@ let apply_atomic_tactical ~disambiguate_tactic ~patch (text,prefix_len,tactic) ( let after = ProofEngineTypes.goals_of_proof proof in let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in let proof, opened_goals = - let uri, metasenv_after_tactic, t, ty, attrs = proof in + let uri, metasenv_after_tactic, _subst, t, ty, attrs = proof in let reordered_metasenv, opened_goals = reorder_metasenv starting_metasenv metasenv_after_refinement metasenv_after_tactic opened goal always_opens_a_goal in - let proof' = uri, reordered_metasenv, t, ty, attrs in + let proof' = uri, reordered_metasenv, _subst, t, ty, attrs in proof', opened_goals in let incomplete_proof = @@ -406,7 +409,6 @@ type eval_ast = Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> ?do_heavy_checks:bool -> - ?clean_baseuri:bool -> GrafiteTypes.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement) disambiguator_input -> @@ -452,8 +454,8 @@ type 'a eval_executable = type 'a eval_from_moo = { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status } -let coercion_moo_statement_of (uri,arity) = - GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, arity) +let coercion_moo_statement_of (uri,arity, saturations) = + GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, arity, saturations) let refinement_toolkit = { RefinementTool.type_of_aux' = @@ -478,17 +480,17 @@ let refinement_toolkit = { RefinementTool.pack_coercion_obj = CicRefine.pack_coercion_obj; } -let eval_coercion status ~add_composites uri arity baseuri = +let eval_coercion status ~add_composites uri arity saturations = let status,compounds = - GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity - baseuri + GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity + saturations (GrafiteTypes.get_baseuri status) in let moo_content = - List.map coercion_moo_statement_of ((uri,arity)::compounds) + List.map coercion_moo_statement_of ((uri,arity,saturations)::compounds) in let status = GrafiteTypes.add_moo_content moo_content status in {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, - List.map fst compounds + List.map (fun u,_,_ -> u) compounds module MatitaStatus = struct @@ -557,7 +559,7 @@ let add_coercions_of_record_to_moo obj lemmas status = let is_a_coercion uri = try let obj,_ = - CicEnvironment.get_cooked_obj CicUniv.empty_ugraph uri in + CicEnvironment.get_cooked_obj CicUniv.oblivion_ugraph uri in let attrs = CicUtil.attributes_of_obj obj in try match List.find @@ -566,6 +568,7 @@ let add_coercions_of_record_to_moo obj lemmas status = with Not_found -> false,0 with Not_found -> assert false in + let buri = GrafiteTypes.get_baseuri status in (* looking at the fields we can know the 'wanted' coercions, but not the * actually generated ones. So, only the intersection between the wanted * and the actual should be in the moo as coercion, while everithing in @@ -575,8 +578,7 @@ let add_coercions_of_record_to_moo obj lemmas status = (function | (name,true,arity) -> Some - (arity, UriManager.uri_of_string - (GrafiteTypes.qualify status name ^ ".con")) + (arity, UriManager.uri_of_string (buri ^ "/" ^ name ^ ".con" )) | _ -> None) fields in @@ -599,9 +601,9 @@ let add_coercions_of_record_to_moo obj lemmas status = in let is_a_coercion, arity_coercion = is_a_coercion uri in if is_a_coercion then - Some (uri, coercion_moo_statement_of (uri,arity_coercion)) + Some (uri, coercion_moo_statement_of (uri,arity_coercion,0)) else if is_a_wanted_coercion then - Some (uri, coercion_moo_statement_of (uri,arity_wanted)) + Some (uri, coercion_moo_statement_of (uri,arity_wanted,0)) else None) lemmas) @@ -644,9 +646,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status *) let status = GrafiteTypes.add_moo_content [cmd] status in status,[] - | GrafiteAst.Coercion (loc, uri, add_composites, arity) -> - eval_coercion status ~add_composites uri arity - (GrafiteTypes.get_string_option status "baseuri") + | GrafiteAst.Coercion (loc, uri, add_composites, arity, saturations) -> + eval_coercion status ~add_composites uri arity saturations | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; GrafiteTypes.add_moo_content [cmd] status,[] @@ -680,16 +681,16 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status *) status,[] | GrafiteAst.Print (_,"proofterm") -> - let _,_,p,_, _ = GrafiteTypes.get_current_proof status in - print_endline (AutoTactic.pp_proofterm p); + let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in + prerr_endline (Auto.pp_proofterm p); status,[] | GrafiteAst.Print (_,_) -> status,[] | GrafiteAst.Qed loc -> - let uri, metasenv, bo, ty, attrs = + let uri, metasenv, _subst, bo, ty, attrs = match status.GrafiteTypes.proof_status with - | GrafiteTypes.Proof (Some uri, metasenv, body, ty, attrs) -> - uri, metasenv, body, ty, attrs - | GrafiteTypes.Proof (None, metasenv, body, ty, attrs) -> + | GrafiteTypes.Proof (Some uri, metasenv, subst, body, ty, attrs) -> + uri, metasenv, subst, body, ty, attrs + | GrafiteTypes.Proof (None, metasenv, subst, body, ty, attrs) -> raise (GrafiteTypes.Command_error ("Someone allows to start a theorem without giving the "^ "name/uri. This should be fixed!")) @@ -711,35 +712,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) -> Setoids.add_relation id a aeq refl sym trans; status, [] (*CSC: TO BE FIXED *) - | GrafiteAst.Set (loc, name, value) -> - if name = "baseuri" then begin - let value = - let v = Http_getter_misc.strip_trailing_slash value in - try - ignore (String.index v ' '); - GrafiteTypes.command_error "baseuri can't contain spaces" - with Not_found -> v - in - if Http_getter_storage.is_read_only value then begin - HLog.error (sprintf "uri %s belongs to a read-only repository" value); - raise (ReadOnlyUri value) - end; - if not (Http_getter_storage.is_empty value) && - opts.clean_baseuri - then begin - HLog.message ("baseuri " ^ value ^ " is not empty"); - HLog.message ("cleaning baseuri " ^ value); - LibraryClean.clean_baseuris [value]; - assert (Http_getter_storage.is_empty value); - end; - 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,[] + | GrafiteAst.Set (loc, name, value) -> status, [] +(* GrafiteTypes.set_option status name value,[] *) | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with @@ -749,15 +723,15 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status ".ind", (match types with (name,_,_,_)::_ -> name | _ -> assert false) | _ -> assert false in - let uri = - UriManager.uri_of_string (GrafiteTypes.qualify status name ^ ext) in + let buri = GrafiteTypes.get_baseuri status in + let uri = UriManager.uri_of_string (buri ^ "/" ^ name ^ ext) in let obj = CicRefine.pack_coercion_obj obj in let metasenv = GrafiteTypes.get_proof_metasenv status in match obj with | Cic.CurrentProof (_,metasenv',bo,ty,_, attrs) -> let name = UriManager.name_of_uri uri in if not(CicPp.check name ty) then - HLog.error ("Bad name: " ^ name); + HLog.warn ("Bad name: " ^ name); if opts.do_heavy_checks then begin let dbd = LibraryDb.instance () in @@ -774,7 +748,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let t = CicUtil.term_of_uri u in let ty',g = CicTypeChecker.type_of_aux' - metasenv' [] t CicUniv.empty_ugraph + metasenv' [] t CicUniv.oblivion_ugraph in fst(CicReduction.are_convertible [] ty' ty g)) similar @@ -786,7 +760,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status ("Theorem already proved: " ^ UriManager.string_of_uri x ^ "\nPlease use a variant.")); end; - let initial_proof = (Some uri, metasenv', bo, ty, attrs) in + let _subst = [] in + let initial_proof = (Some uri, metasenv', _subst, bo, ty, attrs) in let initial_stack = Continuationals.Stack.of_metasenv metasenv' in { status with GrafiteTypes.proof_status = GrafiteTypes.Incomplete_proof @@ -853,13 +828,10 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status status) status moo } and eval_ast = {ea_go = fun ~disambiguate_tactic ~disambiguate_command -~disambiguate_macro ?(do_heavy_checks=false) ?(clean_baseuri=true) status +~disambiguate_macro ?(do_heavy_checks=false) status (text,prefix_len,st) -> - let opts = { - do_heavy_checks = do_heavy_checks ; - clean_baseuri = clean_baseuri } - in + let opts = { do_heavy_checks = do_heavy_checks ; } in match st with | GrafiteAst.Executable (_,ex) -> eval_executable.ee_go ~disambiguate_tactic ~disambiguate_command