let new_status = MatitaEngine.eval_ast status st in
let new_aliases =
match ex with
- | TA.Command (_, TA.Alias _) ->
- DisambiguateTypes.Environment.empty
+ | TA.Command (_, TA.Alias _)
+ | TA.Command (_, TA.Include _) -> DisambiguateTypes.Environment.empty
| _ -> MatitaSync.alias_diff ~from:status new_status
in
(* we remove the defined object since we consider them "automathic aliases" *)
| [_,_,x,_] -> x
| _ -> assert false
-let eval_macro status (mathviewer:MatitaTypes.mathViewer) urichooser parsed_text
- script mac
+let eval_macro status (mathviewer:MatitaTypes.mathViewer) urichooser
+ parsed_text script mac
=
let module TA = TacticAst in
let module TAPp = TacticAstPp in
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
| [] -> [], parsed_text_length
| [uri] ->
let ast =
- (TA.Executable (loc,
- (TA.Tactical (loc,
- TA.Tactic (loc,
- TA.Apply (loc, CicAst.Uri (uri,None)))))))
+ TA.Executable (loc,
+ (TA.Tactical (loc,
+ TA.Tactic (loc,
+ TA.Apply (loc, CicAst.Uri (UriManager.string_of_uri uri,None))))))
in
let new_status = MatitaEngine.eval_ast status ast in
let extra_text =
MatitaLog.error
"The result of the urichooser should be only 1 uri, not:\n";
List.iter (
- fun u -> MatitaLog.error (u ^ "\n")
+ fun u -> MatitaLog.error (UriManager.string_of_uri u ^ "\n")
) selected;
assert false)
| TA.Check (_,term) ->
let eval_executable status (mathviewer:MatitaTypes.mathViewer) urichooser
-user_goal parsed_text script ex =
+ask_confirmation user_goal parsed_text script ex =
let module TA = TacticAst in
let module TAPp = TacticAstPp in
let module MD = MatitaDisambiguator in
+ let module ML = MatitacleanLib in
let parsed_text_length = String.length parsed_text in
match ex with
| TA.Command (loc, _) | TA.Tactical (loc, _) ->
- eval_with_engine status user_goal parsed_text (TA.Executable (loc, ex))
+ (try
+ (match ML.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
+ | None -> ()
+ | Some u ->
+ if not (MatitacleanLib.is_empty u) then
+ match
+ ask_confirmation
+ ~title:"Baseuri redefinition"
+ ~message:(
+ "Baseuri " ^ u ^ " already exists.\n" ^
+ "Do you want to redefine the corresponding "^
+ "part of the library?")
+ with
+ | `YES -> MatitacleanLib.clean_baseuris [u]
+ | `NO -> ()
+ | `CANCEL -> raise MatitaTypes.Cancel);
+ eval_with_engine status user_goal parsed_text (TA.Executable (loc, ex))
+ with MatitaTypes.Cancel -> [], 0)
| TA.Macro (_,mac) ->
eval_macro status mathviewer urichooser parsed_text script mac
let rec eval_statement status (mathviewer:MatitaTypes.mathViewer) urichooser
-user_goal script s =
+ask_confirmation user_goal script s =
if Pcre.pmatch ~rex:only_dust_RE s then raise Margin;
let st = CicTextualParser2.parse_statement (Stream.of_string s) in
let text_of_loc loc =
let remain_len = String.length s - parsed_text_length in
let s = String.sub s parsed_text_length remain_len in
let s,len =
- eval_statement status mathviewer urichooser user_goal script s
+ eval_statement status
+ mathviewer urichooser ask_confirmation user_goal script s
in
(match s with
| (status, text) :: tl ->
| TacticAst.Executable (loc, ex) ->
let parsed_text, parsed_text_length = text_of_loc loc in
eval_executable
- status mathviewer urichooser user_goal parsed_text script ex
+ status mathviewer urichooser ask_confirmation
+ 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
+ ~ask_confirmation
~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: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));
+ self#reset ();
+ self#template ()
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
let s = match statement with Some s -> s | None -> self#getFuture in
MatitaLog.debug ("evaluating: " ^ first_line s ^ " ...");
let (entries, parsed_len) =
- eval_statement self#status mathviewer urichooser userGoal self s in
+ eval_statement self#status
+ mathviewer urichooser ask_confirmation userGoal self s
+ in
let (new_statuses, new_statements) = List.split entries in
(*
prerr_endline "evalStatement returned";
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 () =
method advance ?statement () =
try
- self#_advance ?statement ()
- with Margin -> ()
+ self#_advance ?statement ();
+ self#notify
+ with Margin -> self#notify
- method retract () = try self#_retract () with Margin -> ()
+ method retract () =
+ try
+ self#_retract ();
+ self#notify
+ with Margin -> self#notify
method private getFuture =
buffer#get_text ~start:(buffer#get_iter_at_mark (`MARK locked_mark))
buffer#move_mark mark ~where:new_mark_pos;
buffer#apply_tag locked_tag ~start:buffer#start_iter ~stop:new_mark_pos;
buffer#move_mark `INSERT old_insert;
- self#notify
+ begin
+ match self#status.proof_status with
+ Incomplete_proof (_,goal) -> self#setGoal goal
+ | _ -> ()
+ end ;
+ while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
val mutable observers = []
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 <- [];
history <- [ init ];
userGoal <- ~-1;
- self#notify;
buffer#remove_tag locked_tag ~start:buffer#start_iter ~stop:buffer#end_iter;
buffer#move_mark (`MARK locked_mark) ~where:buffer#start_iter
method reset () =
self#goto_top;
- buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter
+ buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter;
+ self#notify;
+ buffer#set_modified false
+
+ method template () =
+ let template = MatitaMisc.input_file BuildTimeConf.script_template in
+ buffer#insert ~iter:(buffer#get_iter `START) template;
+ filename <- None;
+ buffer#set_modified false;
+ set_star self#ppFilename false
method goto (pos: [`Top | `Bottom | `Cursor]) () =
match pos with
- | `Top -> self#goto_top
+ | `Top -> self#goto_top; self#notify
| `Bottom ->
- (try while true do self#_advance () done with Margin -> ())
+ (try
+ let getpos _ = buffer#get_iter_at_mark (`MARK locked_mark) in
+ let rec dowhile pos =
+ self#_advance ();
+ if pos#compare (getpos ()) < 0 then
+ dowhile (getpos ())
+ in
+ dowhile (getpos ());
+ self#notify
+ with Margin -> self#notify)
| `Cursor ->
let locked_iter () = buffer#get_iter_at_mark (`NAME "locked") in
let cursor_iter () = buffer#get_iter_at_mark `INSERT in
let cmp = (locked_iter ())#compare (cursor_iter ()) in
(try
if cmp < 0 then (* locked < cursor *)
- forward_until_cursor ()
+ (forward_until_cursor (); self#notify)
else if cmp > 0 then (* locked > cursor *)
- back_until_cursor ()
+ (back_until_cursor (); self#notify)
else (* cursor = locked *)
()
- with Margin -> ())
+ with Margin -> self#notify)
method onGoingProof () =
match self#status.proof_status with
method proofContext = MatitaMisc.get_proof_context self#status
method setGoal n = userGoal <- n
+ method eos =
+ let s = self#getFuture in
+ let rec is_there_and_executable s =
+ if Pcre.pmatch ~rex:only_dust_RE s then raise Margin;
+ let st = CicTextualParser2.parse_statement (Stream.of_string s) in
+ match st with
+ | TacticAst.Comment (loc,_)->
+ let parsed_text_length = snd (CicAst.loc_of_floc loc) in
+ let remain_len = String.length s - parsed_text_length in
+ let next = String.sub s parsed_text_length remain_len in
+ is_there_and_executable next
+ | TacticAst.Executable (loc, ex) -> false
+ in
+ try
+ is_there_and_executable s
+ with
+ | CicTextualParser2.Parse_error _ -> false
+ | Margin -> true
+
+
+
(* debug *)
method dump () =
MatitaLog.debug "script status:";
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 ~ask_confirmation ~set_star ()
+=
+ let s = new script
+ ~buffer ~init ~mathviewer ~ask_confirmation ~urichooser ~set_star ()
+ in
_script := Some s;
s
projects / helm.git / blobdiff