X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=cffb9cf449c30d72cd71741e108d03248209b6a7;hb=f3ae21edf39f33e4e9af1fafa1d2cde119d5cdc6;hp=0bd5acb9576ee33bf61e95764b5228690f5d448f;hpb=718082d4e6316ba47b69494c5187dde950847236;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index 0bd5acb95..cffb9cf44 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -65,8 +65,8 @@ let tactic_of_ast ast = | GrafiteAst.Absurd (_, term) -> Tactics.absurd term | GrafiteAst.Apply (_, term) -> Tactics.apply term | GrafiteAst.Assumption _ -> Tactics.assumption - | GrafiteAst.Auto (_,depth,width,paramodulation) -> - AutoTactic.auto_tac ?depth ?width ?paramodulation + | GrafiteAst.Auto (_,depth,width,paramodulation,full) -> + AutoTactic.auto_tac ?depth ?width ?paramodulation ?full ~dbd:(MatitaDb.instance ()) () | GrafiteAst.Change (_, pattern, with_what) -> Tactics.change ~pattern with_what @@ -227,8 +227,8 @@ let disambiguate_tactic status tactic = let cic = disambiguate_term status_ref term in GrafiteAst.Apply (loc, cic) | GrafiteAst.Assumption loc -> GrafiteAst.Assumption loc - | GrafiteAst.Auto (loc,depth,width,paramodulation) -> - GrafiteAst.Auto (loc,depth,width,paramodulation) + | GrafiteAst.Auto (loc,depth,width,paramodulation,full) -> + GrafiteAst.Auto (loc,depth,width,paramodulation,full) | GrafiteAst.Change (loc, pattern, with_what) -> let with_what = disambiguate_lazy_term status_ref with_what in let pattern = disambiguate_pattern status_ref pattern in @@ -568,16 +568,9 @@ let eval_coercion status coercion = in let ty_src,ty_tgt = extract_last_two_p coer_ty in let context = [] in - let src_uri = - let ty_src = CicReduction.whd context ty_src in - CicUtil.uri_of_term ty_src - in - let tgt_uri = - let ty_tgt = CicReduction.whd context ty_tgt in - CicUtil.uri_of_term ty_tgt - in + let src_uri = CoercDb.coerc_carr_of_term (CicReduction.whd context ty_src) in + let tgt_uri = CoercDb.coerc_carr_of_term (CicReduction.whd context ty_tgt) in let new_coercions = - (* also adds them to the Db *) CoercGraph.close_coercion_graph src_uri tgt_uri coer_uri in let status = List.fold_left (fun s (uri,o,_) -> MatitaSync.add_obj uri o status) @@ -624,7 +617,7 @@ let generate_projections uri fields status = with CicTypeChecker.TypeCheckerFailure s -> MatitaLog.message - ("Unable to create projection " ^ name ^ " cause: " ^ s); + ("Unable to create projection " ^ name ^ " cause: " ^ (Lazy.force s)); status | CicEnvironment.Object_not_found uri -> let depend = UriManager.name_of_uri uri in @@ -634,7 +627,7 @@ let generate_projections uri fields status = ) status projections (* to avoid a long list of recursive functions *) -let eval_from_dump_ref = ref (fun _ _ _ -> assert false);; +let eval_from_moo_ref = ref (fun _ _ _ -> assert false);; let disambiguate_obj status obj = let uri = @@ -660,13 +653,15 @@ let disambiguate_obj status obj = let status = MatitaSync.set_proof_aliases status diff in status, cic -let disambiguate_command status = function +let disambiguate_command status = + function | GrafiteAst.Alias _ | GrafiteAst.Default _ | GrafiteAst.Drop _ | GrafiteAst.Dump _ | GrafiteAst.Include _ | GrafiteAst.Interpretation _ + | GrafiteAst.Metadata _ | GrafiteAst.Notation _ | GrafiteAst.Qed _ | GrafiteAst.Render _ @@ -712,28 +707,31 @@ let eval_command opts status cmd = let status = ref status in if not (Sys.file_exists moopath) then raise (IncludedFileNotCompiled moopath); - !eval_from_dump_ref status moopath (fun _ _ -> ()); + !eval_from_moo_ref status moopath (fun _ _ -> ()); !status + | GrafiteAst.Metadata (loc, m) -> + (match m with + | GrafiteAst.Dependency uri -> MatitaTypes.add_moo_metadata [m] status + | GrafiteAst.Baseuri _ -> status) | GrafiteAst.Set (loc, name, value) -> - let value = - if name = "baseuri" then - let v = MatitaMisc.strip_trailing_slash value in - try - ignore (String.index v ' '); - command_error "baseuri can't contain spaces" - with Not_found -> v - else - value + let status = + if name = "baseuri" then begin + let value = + let v = MatitaMisc.strip_trailing_slash value in + try + ignore (String.index v ' '); + command_error "baseuri can't contain spaces" + with Not_found -> v + in + if not (MatitaMisc.is_empty value) && opts.clean_baseuri then begin + MatitaLog.warn ("baseuri " ^ value ^ " is not empty"); + MatitaLog.message ("cleaning baseuri " ^ value); + MatitacleanLib.clean_baseuris [value] + end; + add_moo_metadata [GrafiteAst.Baseuri value] status + end else + status in - if not (MatitaMisc.is_empty value) then - begin - MatitaLog.warn ("baseuri " ^ value ^ " is not empty"); - if opts.clean_baseuri then - begin - MatitaLog.message ("cleaning baseuri " ^ value); - MatitacleanLib.clean_baseuris [value] - end - end; set_option status name value | GrafiteAst.Drop loc -> raise Drop | GrafiteAst.Qed loc -> @@ -772,13 +770,20 @@ let eval_command opts status cmd = MatitaSync.set_proof_aliases status diff | GrafiteAst.Render _ -> assert false (* ZACK: to be removed *) | GrafiteAst.Dump _ -> assert false (* ZACK: to be removed *) - | GrafiteAst.Interpretation (_, dsc, (symbol, _), _) as stm -> - let status' = add_moo_content [stm] status in + | GrafiteAst.Interpretation (_, dsc, (symbol, _), cic_appl_pattern) as stm -> + let status = add_moo_content [stm] status in + let uris = + List.map + (fun uri -> GrafiteAst.Dependency (UriManager.buri_of_uri uri)) + (CicNotationUtil.find_appl_pattern_uris cic_appl_pattern) + in let diff = [DisambiguateTypes.Symbol (symbol, 0), DisambiguateChoices.lookup_symbol_by_dsc symbol dsc] in - MatitaSync.set_proof_aliases status' diff + let status = MatitaSync.set_proof_aliases status diff in + let status = MatitaTypes.add_moo_metadata uris status in + status | GrafiteAst.Notation _ as stm -> add_moo_content [stm] status | GrafiteAst.Obj (loc,obj) -> let ext,name = @@ -871,7 +876,6 @@ let eval_executable opts status ex = let eval_comment status c = status - let eval_ast ?(do_heavy_checks=false) ?(include_paths=[]) ?(clean_baseuri=true) status st = @@ -884,23 +888,30 @@ let eval_ast | GrafiteAst.Executable (_,ex) -> eval_executable opts status ex | GrafiteAst.Comment (_,c) -> eval_comment status c -let eval_from_dump ?do_heavy_checks ?include_paths ?clean_baseuri status fname - cb +let eval_from_moo ?do_heavy_checks ?include_paths ?clean_baseuri status fname cb = - let ic = open_in fname in - let moo = Marshal.from_channel ic in - close_in ic; + let ast_of_cmd cmd = + GrafiteAst.Executable (DisambiguateTypes.dummy_floc, + GrafiteAst.Command (DisambiguateTypes.dummy_floc, + (GrafiteAst.reash_cmd_uris cmd))) + in + let moo, metadata = MatitaMoo.load_moo fname in List.iter (fun ast -> + let ast = ast_of_cmd ast in + cb !status ast; + status := + eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast) + moo; + List.iter + (fun m -> let ast = - GrafiteAst.Executable (DisambiguateTypes.dummy_floc, - GrafiteAst.Command (DisambiguateTypes.dummy_floc, - (GrafiteAst.reash_uris ast))) + ast_of_cmd (GrafiteAst.Metadata (DisambiguateTypes.dummy_floc, m)) in cb !status ast; status := eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast) - moo + metadata let eval_from_stream ?do_heavy_checks ?include_paths ?clean_baseuri status str cb @@ -915,7 +926,7 @@ let eval_from_stream with End_of_file -> () (* to avoid a long list of recursive functions *) -let _ = eval_from_dump_ref := eval_from_dump +let _ = eval_from_moo_ref := eval_from_moo let eval_from_stream_greedy ?do_heavy_checks ?include_paths ?clean_baseuri status str cb @@ -954,7 +965,7 @@ let initial_status = lazy { aliases = DisambiguateTypes.Environment.empty; multi_aliases = DisambiguateTypes.Environment.empty; - moo_content_rev = []; + moo_content_rev = [], []; proof_status = No_proof; options = default_options (); objects = [];