let loc = CicAst.dummy_floc in
A.Executable (loc, A.Tactical (loc, A.Tactic (loc, A.Goal (loc, n))))
-let eval_with_engine output status user_goal parsed_text st =
+let eval_with_engine status user_goal parsed_text st =
let module TA = TacticAst in
let module TAPp = TacticAstPp in
let parsed_text_length = String.length parsed_text in
match status.proof_status with
| Incomplete_proof (_, goal) when goal <> user_goal ->
goal_changed := true;
- MatitaEngine.eval_ast output status (goal_ast user_goal)
+ MatitaEngine.eval_ast status (goal_ast user_goal)
| _ -> status
in
- let new_status = MatitaEngine.eval_ast output status st in
+ 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 output status (mathviewer:MatitaTypes.mathViewer) urichooser
+let eval_macro status (mathviewer:MatitaTypes.mathViewer) urichooser
parsed_text script mac
=
let module TA = TacticAst in
TA.Tactic (loc,
TA.Apply (loc, CicAst.Uri (UriManager.string_of_uri uri,None))))))
in
- let new_status = MatitaEngine.eval_ast output status ast in
+ let new_status = MatitaEngine.eval_ast status ast in
let extra_text =
comment parsed_text ^
"\n" ^ TAPp.pp_statement ast
| TA.Search_term (_, search_kind, term) -> failwith "not implemented"
-let eval_executable output status (mathviewer:MatitaTypes.mathViewer) urichooser
-user_goal parsed_text script ex =
+let eval_executable status (mathviewer:MatitaTypes.mathViewer) urichooser
+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 output 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 output status mathviewer urichooser parsed_text script mac
+ eval_macro status mathviewer urichooser parsed_text script mac
-let rec eval_statement output status (mathviewer:MatitaTypes.mathViewer)
- urichooser user_goal script s
-=
+let rec eval_statement status (mathviewer:MatitaTypes.mathViewer) urichooser
+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 output 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 ->
| [] -> [], 0)
| TacticAst.Executable (loc, ex) ->
let parsed_text, parsed_text_length = text_of_loc loc in
- eval_executable output status mathviewer urichooser user_goal
- parsed_text script ex
+ eval_executable
+ status mathviewer urichooser ask_confirmation
+ user_goal parsed_text script ex
let fresh_script_id =
let i = ref 0 in
class script ~(buffer: GText.buffer) ~(init: MatitaTypes.status)
~(mathviewer: MatitaTypes.mathViewer)
~set_star
+ ~ask_confirmation
~urichooser () =
object (self)
val mutable filename = None
match filename with Some f -> f | None -> sprintf ".unnamed%d.ma" scriptId
initializer
- ignore(GMain.Timeout.add ~ms:30000
+ ignore(GMain.Timeout.add ~ms:300000
~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 ()
+ self#reset ();
+ self#template ()
val mutable statements = []; (** executed statements *)
val mutable history = [ init ];
let s = match statement with Some s -> s | None -> self#getFuture in
MatitaLog.debug ("evaluating: " ^ first_line s ^ " ...");
let (entries, parsed_len) =
- eval_statement (assert false) 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";
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 = []
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:";
let _script = ref None
-let script ~buffer ~init ~mathviewer ~urichooser ~set_star () =
- let s = new script ~buffer ~init ~mathviewer ~urichooser ~set_star () 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