let initial_space,status,new_status_and_text_list_rev =
let module DTE = DisambiguateTypes.Environment in
let module UM = UriManager in
- DTE.fold_flatten (
+ DTE.fold (
fun k ((v,_) as value) (initial_space,status,acc) ->
let b =
try
let initial_space =
if initial_space = "" then "\n" else initial_space in
initial_space ^
- DisambiguatePp.pp_environment(DTE.cons k value DTE.empty) in
+ DisambiguatePp.pp_environment(DTE.add k value DTE.empty) in
let new_status =
- {status with aliases = DTE.cons k value status.aliases}
+ MatitaSync.set_proof_aliases status (DTE.add k value status.aliases)
in
"\n",new_status,((new_status, new_text)::acc)
) new_aliases (initial_space,status,[]) in
let dbd = MatitaDb.instance () in
let metasenv = MatitaMisc.get_proof_metasenv status in
let context = MatitaMisc.get_proof_context status in
- let aliases = MatitaMisc.get_proof_aliases status in
- let interps = MD.disambiguate_term dbd context metasenv aliases term in
+ let interps =
+ MD.disambiguate_term ~dbd ~context ~metasenv ~aliases:status.aliases
+ ~universe:(Some status.multi_aliases) term in
match interps with
| [_,_,x,_], _ -> x
| _ -> assert false
| TA.Check (_,term) ->
let metasenv = MatitaMisc.get_proof_metasenv status in
let context = MatitaMisc.get_proof_context status in
- let aliases = MatitaMisc.get_proof_aliases status in
let interps =
- MatitaDisambiguator.disambiguate_term
- dbd context metasenv aliases term
+ MatitaDisambiguator.disambiguate_term ~dbd ~context ~metasenv
+ ~aliases:status.aliases ~universe:(Some status.multi_aliases) term
in
let _, metasenv , term, ugraph =
match interps with
method private ppFilename =
match guistuff.filenamedata with
- | Some f,_ -> Filename.basename f
+ | Some f,_ -> f
| None,_ -> sprintf ".unnamed%d.ma" scriptId
initializer
- ignore(GMain.Timeout.add ~ms:300000
- ~callback:(fun _ -> self#_saveToBackuptFile ();true));
- ignore(buffer#connect#modified_changed
- (fun _ -> if buffer#modified then
- set_star self#ppFilename true
- else
- set_star self#ppFilename false))
+ ignore (GMain.Timeout.add ~ms:300000
+ ~callback:(fun _ -> self#_saveToBackupFile ();true));
+ ignore (buffer#connect#modified_changed
+ (fun _ -> set_star (Filename.basename self#ppFilename) buffer#modified))
val mutable statements = []; (** executed statements *)
val mutable history = [ init ];
close_out oc;
buffer#set_modified false
- method private _saveToBackuptFile () =
+ method private _saveToBackupFile () =
if buffer#modified then
begin
let f = self#ppFilename ^ "~" in
guistuff.filenamedata <-
(None,MatitamakeLib.development_for_dir (Unix.getcwd ()));
buffer#set_modified false;
- set_star self#ppFilename false
+ set_star (Filename.basename self#ppFilename) false
method goto (pos: [`Top | `Bottom | `Cursor]) () =
let old_locked_mark =