X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=0d2fb682ed78b98ec293f6e26b6ce94353a7c1e2;hb=59d7f64e2e1a22ded8f9017942ca640fe62d886a;hp=c961c58ae611903b2d518dfbf57b2b23ca5a1202;hpb=c6cc2a7227d6750076f591a62d7b1896ebf1ebfa;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index c961c58ae..0d2fb682e 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -25,6 +25,8 @@ (* $Id$ *) +module PEH = ProofEngineHelpers + exception Drop (* mo file name, ma file name *) exception IncludedFileNotCompiled of string * string @@ -40,23 +42,6 @@ type options = { clean_baseuri: bool } -(** create a ProofEngineTypes.mk_fresh_name_type function which uses given - * names as long as they are available, then it fallbacks to name generation - * using FreshNamesGenerator module *) -let namer_of names = - let len = List.length names in - let count = ref 0 in - fun metasenv context name ~typ -> - if !count < len then begin - let name = match List.nth names !count with - | Some s -> Cic.Name s - | None -> Cic.Anonymous - in - incr count; - name - end else - FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ - let rec tactic_of_ast status ast = let module PET = ProofEngineTypes in match ast with @@ -86,33 +71,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, (howmany, names)) -> - Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names) + Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(PEH.namer_of names) 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:(PEH.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 -> [Some id] in - Tactics.cut ~mk_fresh_name_callback:(namer_of names) term + Tactics.cut ~mk_fresh_name_callback:(PEH.namer_of names) term | GrafiteAst.Decompose (_, names) -> - let mk_fresh_name_callback = namer_of names in + let mk_fresh_name_callback = PEH.namer_of names in Tactics.decompose ~mk_fresh_name_callback () | GrafiteAst.Demodulate _ -> Tactics.demodulate ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe - | GrafiteAst.Destruct (_,term) -> Tactics.destruct term + | GrafiteAst.Destruct (_,xterm) -> Tactics.destruct xterm | GrafiteAst.Elim (_, what, using, pattern, (depth, names)) -> - Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names) + Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(PEH.namer_of names) ~pattern what | GrafiteAst.ElimType (_, what, using, (depth, names)) -> - Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names) + Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(PEH.namer_of names) what | GrafiteAst.Exact (_, term) -> Tactics.exact term | GrafiteAst.Exists _ -> Tactics.exists @@ -137,24 +125,24 @@ let rec tactic_of_ast status ast = Tactics.fold ~reduction ~term ~pattern | GrafiteAst.Fourier _ -> Tactics.fourier | GrafiteAst.FwdSimpl (_, hyp, names) -> - Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) + Tactics.fwd_simpl ~mk_fresh_name_callback:(PEH.namer_of names) ~dbd:(LibraryDb.instance ()) hyp | GrafiteAst.Generalize (_,pattern,ident) -> let names = match ident with None -> [] | Some id -> [Some id] in - Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern + Tactics.generalize ~mk_fresh_name_callback:(PEH.namer_of names) pattern | GrafiteAst.IdTac _ -> Tactics.id | GrafiteAst.Intros (_, (howmany, names)) -> PrimitiveTactics.intros_tac ?howmany - ~mk_fresh_name_callback:(namer_of names) () + ~mk_fresh_name_callback:(PEH.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 -> [Some id] in - Tactics.lapply ~mk_fresh_name_callback:(namer_of names) + Tactics.lapply ~mk_fresh_name_callback:(PEH.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 [Some name]) + Tactics.letin term ~mk_fresh_name_callback:(PEH.namer_of [Some name]) | GrafiteAst.Reduce (_, reduction_kind, pattern) -> (match reduction_kind with | `Normalize -> Tactics.normalize ~pattern @@ -167,12 +155,11 @@ let rec tactic_of_ast status ast = Tactics.replace ~pattern ~with_what | GrafiteAst.Rewrite (_, direction, t, pattern, names) -> EqualityTactics.rewrite_tac ~direction ~pattern t -(* to be replaced with ~mk_fresh_name_callback:(namer_of names) *) +(* to be replaced with ~mk_fresh_name_callback:(PEH.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 *) @@ -453,8 +440,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' = @@ -479,17 +466,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 baseuri = 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 baseuri 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 @@ -600,9 +587,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) @@ -645,8 +632,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 + | GrafiteAst.Coercion (loc, uri, add_composites, arity, saturations) -> + eval_coercion status ~add_composites uri arity saturations (GrafiteTypes.get_string_option status "baseuri") | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; @@ -682,7 +669,7 @@ 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); + print_endline (Auto.pp_proofterm p); status,[] | GrafiteAst.Print (_,_) -> status,[] | GrafiteAst.Qed loc -> @@ -725,19 +712,21 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status HLog.error (Printf.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 + if (not (Http_getter_storage.is_empty ~local:true value) || + LibraryClean.db_uris_of_baseuri 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); + assert (Http_getter_storage.is_empty ~local:true 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 ^ + (Filename.dirname + (Http_getter.filename ~local:true ~writable:true (value ^ "/foo.con"))); end; GrafiteTypes.set_option status name value,[] @@ -758,7 +747,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | 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