X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=aa056f3e2c35585c8d4c599bdbf055913918f1a9;hb=6beda5aa100b617b75d88a5a519b5022c99208a0;hp=2d478673f94670e67c24b0da585ea9740105d809;hpb=55e71f58c4ee05842c53960ffbfb3fed7cf3ac30;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 2d478673f..aa056f3e2 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -25,19 +25,19 @@ (* $Id$ *) +module PEH = ProofEngineHelpers + exception Drop (* mo file name, ma file name *) 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 @@ -86,8 +86,8 @@ 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) @@ -96,6 +96,9 @@ let rec tactic_of_ast status ast = 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) -> @@ -107,7 +110,7 @@ let rec tactic_of_ast status ast = | GrafiteAst.Demodulate _ -> Tactics.demodulate ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe - | GrafiteAst.Destruct (_,term) -> Tactics.destruct term + | 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 @@ -123,7 +126,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) @@ -158,7 +160,6 @@ let rec tactic_of_ast status ast = | 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) @@ -172,7 +173,6 @@ let rec tactic_of_ast status 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 *) @@ -217,7 +217,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) @@ -407,7 +406,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 -> @@ -453,8 +451,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 +477,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 @@ -567,6 +565,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 @@ -576,8 +575,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 @@ -600,9 +598,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,9 +643,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,[] @@ -682,7 +679,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); + prerr_endline (Auto.pp_proofterm p); status,[] | GrafiteAst.Print (_,_) -> status,[] | GrafiteAst.Qed loc -> @@ -712,36 +709,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 (Printf.sprintf "uri %s belongs to a read-only repository" value); - raise (ReadOnlyUri value) - end; - if (not (Http_getter_storage.is_empty 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); - 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 @@ -751,15 +720,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 @@ -856,13 +825,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