*)
open Printf
-
open MatitaTypes
+let debug = true
+let debug_print = if debug then prerr_endline else ignore
+
(** raised when one of the script margins (top or bottom) is reached *)
exception Margin
let module UM = UriManager in
DTE.fold (
fun k ((v,_) as value) acc ->
- let v = UM.strip_xpointer (UM.uri_of_string v) in
- if List.exists (fun (s,_) -> s = v) new_status.objects then
+ let b =
+ try
+ let v = UM.strip_xpointer (UM.uri_of_string v) in
+ List.exists (fun (s,_) -> s = v) new_status.objects
+ with UM.IllFormedUri _ -> false
+ in
+ if b then
acc
else
DTE.add k value acc
let term = disambiguate term status in
let uri =
match term with
- | Cic.MutInd (uri,n,_) -> UriManager.string_of_uriref (uri,[n])
+ | Cic.MutInd (uri,n,_) -> UriManager.uri_of_uriref uri n None
| _ -> failwith "Not a MutInd"
in
let l = MQ.elim ~dbd uri in
(TA.Executable (loc,
(TA.Tactical (loc,
TA.Tactic (loc,
- TA.Apply (loc, CicAst.Uri (uri,None)))))))
+ TA.Apply (loc, CicAst.Uri (UriManager.string_of_uri uri,None)))))))
in
let new_status = MatitaEngine.eval_ast status ast in
let extra_text =
"\n" ^ TAPp.pp_statement ast
in
[ new_status , extra_text ], parsed_text_length
- | _ -> assert false)
+ | _ ->
+ MatitaLog.error
+ "The result of the urichooser should be only 1 uri, not:\n";
+ List.iter (
+ fun u -> MatitaLog.error (UriManager.string_of_uri u ^ "\n")
+ ) selected;
+ assert false)
| TA.Check (_,term) ->
let metasenv = MatitaMisc.get_proof_metasenv status in
let context = MatitaMisc.get_proof_context status in
eval_executable
status mathviewer urichooser user_goal parsed_text script ex
+let fresh_script_id =
+ let i = ref 0 in
+ fun () -> incr i; !i
class script ~(buffer: GText.buffer) ~(init: MatitaTypes.status)
~(mathviewer: MatitaTypes.mathViewer)
+ ~set_star
~urichooser () =
object (self)
- initializer self#reset ()
+ val mutable filename = None
+ val scriptId = fresh_script_id ()
+ method private getFilename =
+ match filename with Some f -> f | _ -> assert false
+ method private ppFilename =
+ match filename with Some f -> f | None -> sprintf ".unnamed%d.ma" scriptId
+
+ initializer
+ ignore(GMain.Timeout.add ~ms:30000
+ ~callback:(fun _ -> self#_saveToBackuptFile ();true));
+ set_star self#ppFilename false;
+ ignore(buffer#connect#modified_changed
+ (fun _ -> if buffer#modified then
+ set_star self#ppFilename true
+ else
+ set_star self#ppFilename false));
+ self#reset ()
val mutable statements = []; (** executed statements *)
val mutable history = [ init ];
(** goal as seen by the user (i.e. metano corresponding to current tab) *)
val mutable userGoal = ~-1
+
(** text mark and tag representing locked part of a script *)
val locked_mark =
buffer#create_mark ~name:"locked" ~left_gravity:true buffer#start_iter
history <- List.rev new_statuses @ history;
statements <- List.rev new_statements @ statements;
let start = buffer#get_iter_at_mark (`MARK locked_mark) in
- if statement = None then begin
- let stop = start#copy#forward_chars parsed_len in
- buffer#delete ~start ~stop
- end;
let new_text = String.concat "" new_statements in
- buffer#insert ~iter:start new_text;
+ if new_text <> String.sub s 0 parsed_len then
+ begin
+(* prerr_endline ("new:" ^ new_text); *)
+(* prerr_endline ("s:" ^ String.sub s 0 parsed_len); *)
+ let stop = start#copy#forward_chars parsed_len in
+ buffer#delete ~start ~stop;
+ buffer#insert ~iter:start new_text;
+(* prerr_endline "AUTOMATICALLY MODIFIED!!!!!" *)
+ end;
self#moveMark (String.length new_text)
method private _retract () =
let status = self#status in
List.iter (fun o -> o status) observers
- method loadFrom fname =
- buffer#set_text (MatitaMisc.input_file fname);
- self#goto_top
-
- method saveTo fname =
- let oc = open_out fname in
+ method loadFromFile () =
+ buffer#set_text (MatitaMisc.input_file self#getFilename);
+ self#goto_top;
+ buffer#set_modified false
+
+ method assignFileName file =
+ filename <- Some file;
+
+ method saveToFile () =
+ let oc = open_out self#getFilename in
output_string oc (buffer#get_text ~start:buffer#start_iter
~stop:buffer#end_iter ());
- close_out oc
-
+ close_out oc;
+ buffer#set_modified false
+
+ method private _saveToBackuptFile () =
+ if buffer#modified then
+ begin
+ let f = self#ppFilename ^ "~" in
+ let oc = open_out f in
+ output_string oc (buffer#get_text ~start:buffer#start_iter
+ ~stop:buffer#end_iter ());
+ close_out oc;
+ MatitaLog.debug ("backup " ^ f ^ " saved")
+ end
+
method private goto_top =
MatitaSync.time_travel ~present:self#status ~past:init;
statements <- [];
MatitaLog.debug ("history size: " ^ string_of_int (List.length history));
MatitaLog.debug (sprintf "%d statements:" (List.length statements));
List.iter MatitaLog.debug statements;
+ MatitaLog.debug ("Current file name: " ^
+ (match filename with None -> "[ no name ]" | Some f -> f));
end
let _script = ref None
-let script ~buffer ~init ~mathviewer ~urichooser () =
- let s = new script ~buffer ~init ~mathviewer ~urichooser () in
+let script ~buffer ~init ~mathviewer ~urichooser ~set_star () =
+ let s = new script ~buffer ~init ~mathviewer ~urichooser ~set_star () in
_script := Some s;
s