X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaEngine.ml;h=e3040f8b39913ffcfdc0b05f82effb9109862b99;hb=8bc5bc0e8375a85736f6a5df317d129d5efa8de4;hp=40480995971d22f3cb14a1933382427718f25f7f;hpb=8f9d476c32c48d14348a61889dc191c7696bd404;p=helm.git diff --git a/helm/software/matita/matitaEngine.ml b/helm/software/matita/matitaEngine.ml index 404809959..e3040f8b3 100644 --- a/helm/software/matita/matitaEngine.ml +++ b/helm/software/matita/matitaEngine.ml @@ -25,7 +25,7 @@ (* $Id$ *) -open Printf +module G = GrafiteAst let debug = false ;; let debug_print = if debug then prerr_endline else ignore ;; @@ -35,22 +35,19 @@ let disambiguate_tactic text prefix_len lexicon_status_ref grafite_status goal t GrafiteDisambiguate.disambiguate_tactic lexicon_status_ref (GrafiteTypes.get_proof_context grafite_status goal) - (GrafiteTypes.get_proof_metasenv grafite_status) + (GrafiteTypes.get_proof_metasenv grafite_status) (Some goal) tac in GrafiteTypes.set_metasenv metasenv grafite_status,tac -let disambiguate_command lexicon_status_ref grafite_status cmd = - let lexicon_status,metasenv,cmd = - GrafiteDisambiguate.disambiguate_command - ~baseuri:( - try - Some (GrafiteTypes.get_string_option grafite_status "baseuri") - with - GrafiteTypes.Option_error _ -> None) - !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd +let disambiguate_command estatus lexicon_status_ref grafite_status cmd = + let baseuri = GrafiteTypes.get_baseuri grafite_status in + let estatus,metasenv,cmd = + GrafiteDisambiguate.disambiguate_command ~baseuri + { estatus with NEstatus.lstatus = !lexicon_status_ref } + (GrafiteTypes.get_proof_metasenv grafite_status) cmd in - lexicon_status_ref := lexicon_status; + lexicon_status_ref := estatus.NEstatus.lstatus; GrafiteTypes.set_metasenv metasenv grafite_status,cmd let disambiguate_macro lexicon_status_ref grafite_status macro context = @@ -62,75 +59,133 @@ let disambiguate_macro lexicon_status_ref grafite_status macro context = in GrafiteTypes.set_metasenv metasenv grafite_status,macro -let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status - grafite_status (text,prefix_len,ast) -= +let eval_ast ?do_heavy_checks grafite_status (text,prefix_len,ast) = + let lexicon_status = GrafiteTypes.get_lexicon grafite_status in + let dump = not (Helm_registry.get_bool "matita.moo") in let lexicon_status_ref = ref lexicon_status in + let baseuri = GrafiteTypes.get_baseuri grafite_status in + let changed_lexicon = ref false in + let wrap f x = changed_lexicon := true; f x in let new_grafite_status,new_objs = + match ast with + | G.Executable (_, G.Command (_, G.Coercion _)) when dump -> +(* FG: some commands can not be executed when mmas are parsed *************) +(* To be removed when mmas will be executed *) + grafite_status, `Old [] + | ast -> GrafiteEngine.eval_ast - ~disambiguate_tactic:(disambiguate_tactic text prefix_len lexicon_status_ref) - ~disambiguate_command:(disambiguate_command lexicon_status_ref) - ~disambiguate_macro:(disambiguate_macro lexicon_status_ref) - ?do_heavy_checks ?clean_baseuri grafite_status (text,prefix_len,ast) in + ~disambiguate_tactic:(wrap (disambiguate_tactic text prefix_len lexicon_status_ref)) + ~disambiguate_command:(wrap + (disambiguate_command + (GrafiteTypes.get_estatus grafite_status) lexicon_status_ref)) + ~disambiguate_macro:(wrap (disambiguate_macro lexicon_status_ref)) + ?do_heavy_checks grafite_status (text,prefix_len,ast) + in let new_lexicon_status = - LexiconSync.add_aliases_for_objs !lexicon_status_ref new_objs in + if !changed_lexicon then + !lexicon_status_ref + else + GrafiteTypes.get_lexicon new_grafite_status + in + let new_lexicon_status = + LexiconSync.add_aliases_for_objs new_lexicon_status new_objs in let new_aliases = LexiconSync.alias_diff ~from:lexicon_status new_lexicon_status in let _,intermediate_states = - let baseuri = GrafiteTypes.get_string_option new_grafite_status "baseuri" in List.fold_left - (fun (lexicon_status,acc) (k,((v,_) as value)) -> + (fun (lexicon_status,acc) (k,value) -> + let v = LexiconAst.description_of_alias value in let b = try - UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri + (* this hack really sucks! *) + UriManager.buri_of_uri (UriManager.uri_of_string v) = + baseuri with - UriManager.IllFormedUri _ -> false (* v is a description, not a URI *) + UriManager.IllFormedUri _ -> + try + (* this too! *) + let NReference.Ref (uri,_) = NReference.reference_of_string v in + let ouri = NCic2OCic.ouri_of_nuri uri in + UriManager.buri_of_uri ouri = baseuri + with + NReference.IllFormedReference _ -> + false (* v is a description, not a URI *) in if b then lexicon_status,acc else + let new_lexicon_status = LexiconEngine.set_proof_aliases lexicon_status [k,value] in - new_lexicon_status, - ((grafite_status,new_lexicon_status),Some (k,value))::acc + let grafite_status = + GrafiteTypes.set_lexicon new_lexicon_status grafite_status + in + new_lexicon_status, (grafite_status ,Some (k,value))::acc ) (lexicon_status,[]) new_aliases in - ((new_grafite_status,new_lexicon_status),None)::intermediate_states + let new_grafite_status = + GrafiteTypes.set_lexicon new_lexicon_status new_grafite_status + in + ((new_grafite_status),None)::intermediate_states +;; + +exception TryingToAdd of string +exception EnrichedWithStatus of exn * GrafiteTypes.status -let eval_from_stream ~first_statement_only ~include_paths ?(prompt=false) - ?do_heavy_checks ?clean_baseuri lexicon_status grafite_status - str cb +let eval_from_stream ~first_statement_only ~include_paths + ?do_heavy_checks ?(enforce_no_new_aliases=true) + ?(watch_statuses=fun _ -> ()) grafite_status str cb = - let rec loop lexicon_status grafite_status statuses = + let matita_debug = Helm_registry.get_bool "matita.debug" in + let rec loop grafite_status statuses = let loop = - if first_statement_only then - fun _ _ _ -> raise End_of_file - else - loop + if first_statement_only then fun _ statuses -> statuses + else loop in - if prompt then (print_string "matita> "; flush stdout); + let stop,g,s = try - let lexicon_status,ast = - GrafiteParser.parse_statement ~include_paths str lexicon_status - in - (match ast with - GrafiteParser.LNone _ -> - loop lexicon_status grafite_status - (((grafite_status,lexicon_status),None)::statuses) - | GrafiteParser.LSome ast -> - cb grafite_status ast; - let new_statuses = - eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status - grafite_status ("",0,ast) in - let grafite_status,lexicon_status = - match new_statuses with - [] -> assert false - | (s,_)::_ -> s - in - loop lexicon_status grafite_status (new_statuses @ statuses)) - with - End_of_file -> statuses + let cont = + try + let lexicon_status = GrafiteTypes.get_lexicon grafite_status in + Some (GrafiteParser.parse_statement ~include_paths str lexicon_status) + with + End_of_file -> None + in + match cont with + | None -> true, grafite_status, statuses + | Some (lexicon_status,ast) -> + let grafite_status = + GrafiteTypes.set_lexicon lexicon_status grafite_status + in + (match ast with + GrafiteParser.LNone _ -> + watch_statuses grafite_status ; + false, grafite_status, + (((grafite_status),None)::statuses) + | GrafiteParser.LSome ast -> + cb grafite_status ast; + let new_statuses = + eval_ast ?do_heavy_checks grafite_status ("",0,ast) in + if enforce_no_new_aliases then + List.iter + (fun (_,alias) -> + match alias with + None -> () + | Some (k,value) -> + let newtxt = LexiconAstPp.pp_alias value in + raise (TryingToAdd newtxt)) new_statuses; + let grafite_status = + match new_statuses with + [] -> assert false + | (s,_)::_ -> s + in + watch_statuses grafite_status ; + false, grafite_status, (new_statuses @ statuses)) + with exn when not matita_debug -> + raise (EnrichedWithStatus (exn, grafite_status)) + in + if stop then s else loop g s in - loop lexicon_status grafite_status [] + loop grafite_status [] ;;