X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaEngine.ml;h=a2effbe039d6656a47b5ad5b06417d0cab15a0be;hb=779859f7a9e317e378d258897c289f447adea7ad;hp=ba4e346969a2757af26c63c9a979f8097b3d77ac;hpb=9a7c77e5c29d764109a104aa629761ba90cb511c;p=helm.git diff --git a/helm/software/matita/matitaEngine.ml b/helm/software/matita/matitaEngine.ml index ba4e34696..a2effbe03 100644 --- a/helm/software/matita/matitaEngine.ml +++ b/helm/software/matita/matitaEngine.ml @@ -58,43 +58,38 @@ let disambiguate_macro lexicon_status_ref grafite_status macro context = in GrafiteTypes.set_metasenv metasenv grafite_status,macro -let eval_ast ?do_heavy_checks grafite_status (text,prefix_len,ast) = - let lexicon_status = GrafiteTypes.get_estatus grafite_status in +let eval_ast ?do_heavy_checks status (text,prefix_len,ast) = let dump = not (Helm_registry.get_bool "matita.moo") in - let lexicon_status_ref = ref (lexicon_status :> LexiconEngine.status) in - let baseuri = grafite_status#baseuri in - let new_grafite_status,new_objs = + let lexicon_status_ref = ref (status :> LexiconEngine.status) in + let baseuri = status#baseuri in + let new_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 [] + 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 grafite_status (text,prefix_len,ast) + ?do_heavy_checks status (text,prefix_len,ast) in - let new_lexicon_status = GrafiteTypes.get_estatus new_grafite_status in - let new_lexicon_status = - if !lexicon_status_ref#lstatus != lexicon_status#lstatus then - new_lexicon_status#set_lstatus (!lexicon_status_ref#lstatus) + let new_status = + if !lexicon_status_ref#lstatus != status#lstatus then + new_status#set_lstatus (!lexicon_status_ref#lstatus) else - new_lexicon_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 + new_status in + let new_status = LexiconSync.add_aliases_for_objs new_status new_objs in + let new_aliases = LexiconSync.alias_diff ~from:status new_status in let _,intermediate_states = List.fold_left - (fun (lexicon_status,acc) (k,value) -> + (fun (status,acc) (k,value) -> let v = LexiconAst.description_of_alias value in let b = try (* this hack really sucks! *) - UriManager.buri_of_uri (UriManager.uri_of_string v) = - baseuri + UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri with UriManager.IllFormedUri _ -> try @@ -107,21 +102,15 @@ let eval_ast ?do_heavy_checks grafite_status (text,prefix_len,ast) = false (* v is a description, not a URI *) in if b then - lexicon_status,acc + status,acc else - let new_lexicon_status = - LexiconEngine.set_proof_aliases lexicon_status [k,value] - in - let grafite_status = - GrafiteTypes.set_estatus new_lexicon_status grafite_status + let new_status = + LexiconEngine.set_proof_aliases status [k,value] in - new_lexicon_status, (grafite_status ,Some (k,value))::acc - ) (lexicon_status,[]) new_aliases - in - let new_grafite_status = - GrafiteTypes.set_estatus new_lexicon_status new_grafite_status + new_status, (new_status ,Some (k,value))::acc + ) (status,[]) new_aliases in - ((new_grafite_status),None)::intermediate_states + ((new_status),None)::intermediate_states ;; exception TryingToAdd of string @@ -129,10 +118,10 @@ exception EnrichedWithStatus of exn * GrafiteTypes.status let eval_from_stream ~first_statement_only ~include_paths ?do_heavy_checks ?(enforce_no_new_aliases=true) - ?(watch_statuses=fun _ -> ()) grafite_status str cb + ?(watch_statuses=fun _ -> ()) status str cb = let matita_debug = Helm_registry.get_bool "matita.debug" in - let rec loop grafite_status statuses = + let rec loop status statuses = let loop = if first_statement_only then fun _ statuses -> statuses else loop @@ -140,27 +129,18 @@ let eval_from_stream ~first_statement_only ~include_paths let stop,g,s = try let cont = - try - let lexicon_status = GrafiteTypes.get_estatus grafite_status in - Some (GrafiteParser.parse_statement ~include_paths str lexicon_status) - with - End_of_file -> None - in + try Some (GrafiteParser.parse_statement ~include_paths str status) + with End_of_file -> None in match cont with - | None -> true, grafite_status, statuses - | Some (lexicon_status,ast) -> - let grafite_status = - GrafiteTypes.set_estatus lexicon_status grafite_status - in + | None -> true, status, statuses + | Some (status,ast) -> (match ast with GrafiteParser.LNone _ -> - watch_statuses grafite_status ; - false, grafite_status, - (((grafite_status),None)::statuses) + watch_statuses status ; + false, status, ((status,None)::statuses) | GrafiteParser.LSome ast -> - cb grafite_status ast; - let new_statuses = - eval_ast ?do_heavy_checks grafite_status ("",0,ast) in + cb status ast; + let new_statuses = eval_ast ?do_heavy_checks status ("",0,ast) in if enforce_no_new_aliases then List.iter (fun (_,alias) -> @@ -169,17 +149,17 @@ let eval_from_stream ~first_statement_only ~include_paths | Some (k,value) -> let newtxt = LexiconAstPp.pp_alias value in raise (TryingToAdd newtxt)) new_statuses; - let grafite_status = + let status = match new_statuses with [] -> assert false | (s,_)::_ -> s in - watch_statuses grafite_status ; - false, grafite_status, (new_statuses @ statuses)) + watch_statuses status ; + false, status, (new_statuses @ statuses)) with exn when not matita_debug -> - raise (EnrichedWithStatus (exn, grafite_status)) + raise (EnrichedWithStatus (exn, status)) in if stop then s else loop g s in - loop grafite_status [] + loop status [] ;;