if Pcre.pmatch ~rex:heading_nl_RE base then
sprintf "\n%s%s" header base
else
- sprintf "%s\n%s" header base
+ sprintf "\n%s\n%s" header base
(** creates a statement AST for the Goal tactic, e.g. "goal 7" *)
let goal_ast n =
let compile_needed_and_go_on d =
let root = MatitamakeLib.root_for_development d in
let target = root ^ "/" ^ what in
- if not(MatitamakeLib.build_development ~target d) then
+ let refresh_cb () =
+ while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
+ in
+ if not(MatitamakeLib.build_development_in_bg ~target refresh_cb d) then
raise exc
else
eval_with_engine guistuff status user_goal parsed_text st
(match ML.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
| None -> ()
| Some u ->
- if not (MatitacleanLib.is_empty u) then
+ if not (ML.is_empty u) then
match
guistuff.ask_confirmation
~title:"Baseuri redefinition"
let i = ref 0 in
fun () -> incr i; !i
-class script ~(buffer: GText.buffer) ~(init: MatitaTypes.status)
+class script ~(view: GText.view)
+ ~(init: MatitaTypes.status)
~(mathviewer: MatitaTypes.mathViewer)
~set_star
~ask_confirmation
~urichooser
~develcreator
() =
+let buffer = view#buffer in
object (self)
val scriptId = fresh_script_id ()
(fun _ -> if buffer#modified then
set_star self#ppFilename true
else
- set_star self#ppFilename false));
- self#reset ();
- self#template ()
+ set_star self#ppFilename false))
val mutable statements = []; (** executed statements *)
val mutable history = [ init ];
buffer#create_mark ~name:"locked" ~left_gravity:true buffer#start_iter
val locked_tag = buffer#create_tag [`BACKGROUND "lightblue"; `EDITABLE false]
+ method locked_mark = locked_mark
+
(* history can't be empty, the invariant above grant that it contains at
* least the init status *)
method status = match history with hd :: _ -> hd | _ -> assert false
end;
self#moveMark (String.length new_text)
- method private _retract () =
- match statements, history with
- | last_statement :: _, cur_status :: prev_status :: _ ->
- MatitaSync.time_travel ~present:cur_status ~past:prev_status;
- statements <- List.tl statements;
- history <- List.tl history;
- self#moveMark (- (String.length last_statement));
- | _ -> raise Margin
+ method private _retract offset status new_statements new_history =
+ let cur_status = match history with s::_ -> s | [] -> assert false in
+ MatitaSync.time_travel ~present:cur_status ~past:status;
+ statements <- new_statements;
+ history <- new_history;
+ self#moveMark (- offset)
method advance ?statement () =
try
method retract () =
try
- self#_retract ();
- self#notify
+ let cmp,new_statements,new_history,status =
+ match statements,history with
+ stat::statements, _::(status::_ as history) ->
+ String.length stat, statements, history, status
+ | [],[_] -> raise Margin
+ | _,_ -> assert false
+ in
+ self#_retract cmp status new_statements new_history;
+ self#notify
with
| Margin -> self#notify
| exc -> self#notify; raise exc
Incomplete_proof (_,goal) -> self#setGoal goal
| _ -> ()
end ;
+ let mark_position = buffer#get_iter_at_mark mark in
+ if view#move_mark_onscreen mark then
+ begin
+ buffer#move_mark mark mark_position;
+ view#scroll_to_mark ~use_align:true ~xalign:1.0 ~yalign:0.1 mark;
+ end;
while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
method clean_dirty_lock =
set_star self#ppFilename false
method goto (pos: [`Top | `Bottom | `Cursor]) () =
+ let old_locked_mark =
+ `MARK
+ (buffer#create_mark ~name:"old_locked_mark"
+ ~left_gravity:true (buffer#get_iter_at_mark (`MARK locked_mark))) in
let getpos _ = buffer#get_iter_at_mark (`MARK locked_mark) in
+ let getoldpos _ = buffer#get_iter_at_mark old_locked_mark in
+ let dispose_old_locked_mark () = buffer#delete_mark old_locked_mark in
match pos with
- | `Top -> self#goto_top; self#notify
+ | `Top -> dispose_old_locked_mark (); self#goto_top; self#notify
| `Bottom ->
(try
- let rec dowhile pos =
+ let rec dowhile () =
self#_advance ();
- if pos#compare (getpos ()) < 0 then
- dowhile (getpos ())
+ let newpos = getpos () in
+ if (getoldpos ())#compare newpos < 0 then
+ begin
+ buffer#move_mark old_locked_mark newpos;
+ dowhile ()
+ end
in
- dowhile (getpos ());
+ dowhile ();
+ dispose_old_locked_mark ();
self#notify
with
- | Margin -> self#notify
- | exc -> self#notify; raise exc)
+ | Margin -> dispose_old_locked_mark (); self#notify
+ | exc -> dispose_old_locked_mark (); self#notify; raise exc)
| `Cursor ->
let locked_iter () = buffer#get_iter_at_mark (`NAME "locked") in
let cursor_iter () = buffer#get_iter_at_mark `INSERT in
+ let remember =
+ `MARK
+ (buffer#create_mark ~name:"initial_insert"
+ ~left_gravity:true (cursor_iter ())) in
+ let dispose_remember () = buffer#delete_mark remember in
+ let remember_iter () =
+ buffer#get_iter_at_mark (`NAME "initial_insert") in
+ let cmp () = (locked_iter ())#offset - (remember_iter ())#offset in
+ let icmp = cmp () in
let forward_until_cursor () = (* go forward until locked > cursor *)
- let rec aux oldpos =
+ let rec aux () =
self#_advance ();
- if (locked_iter ())#compare (cursor_iter ()) < 0 &&
- oldpos#compare (getpos ()) < 0
+ if cmp () < 0 && (getoldpos ())#compare (getpos ()) < 0
then
- aux (getpos ())
+ begin
+ buffer#move_mark old_locked_mark (getpos ());
+ aux ()
+ end
in
- aux (getpos ())
+ aux ()
in
- let rec back_until_cursor () = (* go backward until locked < cursor *)
- self#_retract ();
- if (locked_iter ())#compare (cursor_iter ()) > 0 then
- back_until_cursor ()
+ let rec back_until_cursor len = (* go backward until locked < cursor *)
+ function
+ statements, (status::_ as history) when len <= 0 ->
+ self#_retract (icmp - len) status statements history
+ | statement::tl1, _::tl2 ->
+ back_until_cursor (len - String.length statement) (tl1,tl2)
+ | _,_ -> assert false
in
- let cmp = (locked_iter ())#compare (cursor_iter ()) in
(try
- if cmp < 0 then (* locked < cursor *)
- (forward_until_cursor (); self#notify)
- else if cmp > 0 then (* locked > cursor *)
- (back_until_cursor (); self#notify)
- else (* cursor = locked *)
- ()
+ begin
+ if icmp < 0 then (* locked < cursor *)
+ (forward_until_cursor (); self#notify)
+ else if icmp > 0 then (* locked > cursor *)
+ (back_until_cursor icmp (statements,history); self#notify)
+ else (* cursor = locked *)
+ ()
+ end ;
+ dispose_remember ();
+ dispose_old_locked_mark ();
with
- | Margin -> self#notify
- | exc -> self#notify; raise exc)
+ | Margin -> dispose_remember (); dispose_old_locked_mark (); self#notify
+ | exc -> dispose_remember (); dispose_old_locked_mark ();
+ self#notify; raise exc)
method onGoingProof () =
match self#status.proof_status with
let _script = ref None
-let script ~buffer ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star ()
+let script ~view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star ()
=
let s = new script
- ~buffer ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star ()
+ ~view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star ()
in
_script := Some s;
s