X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaScript.ml;h=34e0408c598f281aa0d6bee4417bc3ad5493e407;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=7e4dcb9fc04e4200a8c00e15a77c02af7e617a37;hpb=0c04e1f673d69ac652c15705863931c45e107515;p=helm.git
diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml
index 7e4dcb9fc..34e0408c5 100644
--- a/helm/matita/matitaScript.ml
+++ b/helm/matita/matitaScript.ml
@@ -26,8 +26,10 @@
open Printf
open MatitaTypes
-let debug = true
-let debug_print = if debug then prerr_endline else ignore
+module TA = GrafiteAst
+
+let debug = false
+let debug_print = if debug then prerr_endline else ignore
(** raised when one of the script margins (top or bottom) is reached *)
exception Margin
@@ -36,15 +38,16 @@ let safe_substring s i j =
try String.sub s i j with Invalid_argument _ -> assert false
let heading_nl_RE = Pcre.regexp "^\\s*\n\\s*"
+let heading_nl_RE' = Pcre.regexp "^(\\s*\n\\s*)((.|\n)*)"
let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$"
let multiline_RE = Pcre.regexp "^\n[^\n]+$"
let newline_RE = Pcre.regexp "\n"
let comment str =
if Pcre.pmatch ~rex:multiline_RE str then
- "\n(** " ^ (Pcre.replace ~rex:newline_RE str) ^ " **)"
+ "\n(** " ^ (Pcre.replace ~rex:newline_RE str) ^ " *)"
else
- "\n(**\n" ^ str ^ "\n**)"
+ "\n(**\n" ^ str ^ "\n*)"
let first_line s =
let s = Pcre.replace ~rex:heading_nl_RE s in
@@ -53,17 +56,13 @@ let first_line s =
String.sub s 0 nl_pos
with Not_found -> s
-let prepend_text header base =
- if Pcre.pmatch ~rex:heading_nl_RE base then
- sprintf "\n%s%s" header base
- else
- sprintf "\n%s\n%s" header base
-
(** creates a statement AST for the Goal tactic, e.g. "goal 7" *)
let goal_ast n =
let module A = GrafiteAst in
- let loc = Disambiguate.dummy_floc in
- A.Executable (loc, A.Tactical (loc, A.Tactic (loc, A.Goal (loc, n))))
+ let loc = DisambiguateTypes.dummy_floc in
+ A.Executable (loc, A.Tactical (loc,
+ A.Tactic (loc, A.Goal (loc, n)),
+ Some (A.Dot loc)))
type guistuff = {
mathviewer:MatitaTypes.mathViewer;
@@ -74,7 +73,6 @@ type guistuff = {
}
let eval_with_engine guistuff status user_goal parsed_text st =
- let module TA = GrafiteAst in
let module TAPp = GrafiteAstPp in
let include_ =
match guistuff.filenamedata with
@@ -87,33 +85,49 @@ let eval_with_engine guistuff status user_goal parsed_text st =
in
let parsed_text_length = String.length parsed_text in
let loc, ex =
- match st with TA.Executable (loc,ex) -> loc, ex | _ -> assert false
- in
- let goal_changed = ref false in
- let status =
+ match st with TA.Executable (loc,ex) -> loc, ex | _ -> assert false in
+ let initial_space,parsed_text =
+ try
+ let pieces = Pcre.extract ~rex:heading_nl_RE' parsed_text in
+ pieces.(1), pieces.(2)
+ with
+ Not_found -> "", parsed_text in
+ (* we add the goal command if needed *)
+ let inital_space,new_status,new_status_and_text_list' =
match status.proof_status with
- | Incomplete_proof (_, goal) when goal <> user_goal ->
- goal_changed := true;
+(* | Incomplete_proof { stack = stack }
+ when not (List.mem user_goal (Continuationals.head_goals stack)) ->
+ let status =
MatitaEngine.eval_ast ~include_paths:include_
~do_heavy_checks:true status (goal_ast user_goal)
- | _ -> status
- in
+ in
+ let initial_space = if initial_space = "" then "\n" else initial_space
+ in
+ "\n", status,
+ [ status,
+ initial_space ^ TAPp.pp_tactical (TA.Select (loc, [user_goal])) ] *)
+ | _ -> initial_space,status,[] in
let new_status =
MatitaEngine.eval_ast
- ~include_paths:include_ ~do_heavy_checks:true status st
+ ~include_paths:include_ ~do_heavy_checks:true new_status st
in
let new_aliases =
match ex with
| TA.Command (_, TA.Alias _)
- | TA.Command (_, TA.Include _) -> DisambiguateTypes.Environment.empty
+ | TA.Command (_, TA.Include _)
+ | TA.Command (_, TA.Interpretation _) -> []
| _ -> MatitaSync.alias_diff ~from:status new_status
in
- (* we remove the defined object since we consider them "automathic aliases" *)
- let new_aliases =
+ (* we remove the defined object since we consider them "automatic aliases" *)
+ let dummy_st =
+ TA.Comment (DisambiguateTypes.dummy_floc,
+ TA.Note (DisambiguateTypes.dummy_floc, ""))
+ in
+ let initial_space,status,new_status_and_text_list_rev =
let module DTE = DisambiguateTypes.Environment in
let module UM = UriManager in
- DTE.fold (
- fun k ((v,_) as value) acc ->
+ List.fold_left (
+ fun (initial_space,status,acc) (k,((v,_) as value)) ->
let b =
try
let v = UM.strip_xpointer (UM.uri_of_string v) in
@@ -121,36 +135,35 @@ let eval_with_engine guistuff status user_goal parsed_text st =
with UM.IllFormedUri _ -> false
in
if b then
- acc
+ initial_space,status,acc
else
- DTE.add k value acc
- ) new_aliases DTE.empty
- in
- let new_text =
- if DisambiguateTypes.Environment.is_empty new_aliases then
- parsed_text
- else
- prepend_text (DisambiguatePp.pp_environment new_aliases)
- parsed_text
- in
- let new_text =
- if !goal_changed then
- prepend_text
- (TAPp.pp_tactic (TA.Goal (loc, user_goal))(* ^ "\n"*))
- new_text
- else
- new_text
+ let new_text =
+ let initial_space =
+ if initial_space = "" then "\n" else initial_space in
+ initial_space ^
+ DisambiguatePp.pp_environment
+ (DisambiguateTypes.Environment.add k value
+ DisambiguateTypes.Environment.empty) in
+ let new_status =
+ MatitaSync.set_proof_aliases status [k,value]
+ in
+ "\n",new_status,((new_status, (new_text, dummy_st))::acc)
+ ) (initial_space,status,[]) new_aliases in
+ let parsed_text = initial_space ^ parsed_text in
+ let res =
+ List.rev new_status_and_text_list_rev @ new_status_and_text_list' @
+ [new_status, (parsed_text, st)]
in
- [ new_status, new_text ], parsed_text_length
+ res,parsed_text_length
let eval_with_engine guistuff status user_goal parsed_text st =
try
eval_with_engine guistuff status user_goal parsed_text st
with
- MatitaEngine.UnableToInclude what as exc ->
+ | MatitaEngine.UnableToInclude what
+ | MatitaEngine.IncludedFileNotCompiled what as exc ->
let compile_needed_and_go_on d =
- let root = MatitamakeLib.root_for_development d in
- let target = root ^ "/" ^ what in
+ let target = what in
let refresh_cb () =
while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
in
@@ -172,11 +185,11 @@ let eval_with_engine guistuff status user_goal parsed_text st =
| `NO -> raise exc
| `CANCEL -> do_nothing ())
in
- let handle_withoud_devel filename =
+ let handle_without_devel filename =
let title = "Unable to include " ^ what in
let message =
what ^ " is not handled by a development.\n" ^
- "All dependencies are authomatically solved for a development.\n\n" ^
+ "All dependencies are automatically solved for a development.\n\n" ^
"Do you want to set up a development?"
in
(match guistuff.ask_confirmation ~title ~message with
@@ -190,28 +203,27 @@ let eval_with_engine guistuff status user_goal parsed_text st =
| `CANCEL -> do_nothing())
in
match guistuff.filenamedata with
- | None,None -> handle_withoud_devel None
+ | None,None -> handle_without_devel None
| None,Some d -> handle_with_devel d
| Some f,_ ->
match MatitamakeLib.development_for_dir (Filename.dirname f) with
- | None -> handle_withoud_devel (Some f)
+ | None -> handle_without_devel (Some f)
| Some d -> handle_with_devel d
;;
-let disambiguate term status =
+let disambiguate_macro_term term status user_goal =
let module MD = MatitaDisambiguator 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 metasenv = MatitaTypes.get_proof_metasenv status in
+ let context = MatitaTypes.get_proof_context status user_goal in
+ let interps =
+ MD.disambiguate_term ~dbd ~context ~metasenv ~aliases:status.aliases
+ ~universe:(Some status.multi_aliases) term in
match interps with
- | [_,_,x,_] -> x
+ | [_,_,x,_], _ -> x
| _ -> assert false
-let eval_macro guistuff status parsed_text script mac
-=
- let module TA = GrafiteAst in
+let eval_macro guistuff status user_goal unparsed_text parsed_text script mac =
let module TAPp = GrafiteAstPp in
let module MQ = MetadataQuery in
let module MDB = MatitaDb in
@@ -224,13 +236,17 @@ let eval_macro guistuff status parsed_text script mac
match mac with
(* WHELP's stuff *)
| TA.WMatch (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let l = MQ.match_term ~dbd term in
- let entry = `Whelp (TAPp.pp_macro_cic (TA.WMatch (loc, term)), l) in
+ let query_url =
+ MatitaMisc.strip_suffix ~suffix:"."
+ (HExtlib.trim_blanks unparsed_text)
+ in
+ let entry = `Whelp (query_url, l) in
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
[], parsed_text_length
| TA.WInstance (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let l = MQ.instance ~dbd term in
let entry = `Whelp (TAPp.pp_macro_cic (TA.WInstance (loc, term)), l) in
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
@@ -241,7 +257,7 @@ let eval_macro guistuff status parsed_text script mac
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
[], parsed_text_length
| TA.WElim (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let uri =
match term with
| Cic.MutInd (uri,n,_) -> UriManager.uri_of_uriref uri n None
@@ -252,7 +268,7 @@ let eval_macro guistuff status parsed_text script mac
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
[], parsed_text_length
| TA.WHint (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let s = ((None,[0,[],term], Cic.Meta (0,[]) ,term),0) in
let l = List.map fst (MQ.experimental_hint ~dbd s) in
let entry = `Whelp (TAPp.pp_macro_cic (TA.WHint (loc, term)), l) in
@@ -260,24 +276,26 @@ let eval_macro guistuff status parsed_text script mac
[], parsed_text_length
(* REAL macro *)
| TA.Hint loc ->
- let s = MatitaMisc.get_proof_status status in
- let l = List.map fst (MQ.experimental_hint ~dbd s) in
+ let proof = MatitaTypes.get_current_proof status in
+ let proof_status = proof, user_goal in
+ let l = List.map fst (MQ.experimental_hint ~dbd proof_status) in
let selected = guistuff.urichooser l in
(match selected with
| [] -> [], parsed_text_length
| [uri] ->
- let ast =
- TA.Executable (loc,
- (TA.Tactical (loc,
- TA.Tactic (loc,
- TA.Apply (loc, CicNotationPt.Uri (UriManager.string_of_uri uri,None))))))
- in
+ let suri = UriManager.string_of_uri uri in
+ let ast =
+ TA.Executable (loc, (TA.Tactical (loc,
+ TA.Tactic (loc,
+ TA.Apply (loc, CicNotationPt.Uri (suri, None))),
+ Some (TA.Dot loc))))
+ in
let new_status = MatitaEngine.eval_ast status ast in
let extra_text =
comment parsed_text ^
"\n" ^ TAPp.pp_statement ast
in
- [ new_status , extra_text ], parsed_text_length
+ [ new_status , (extra_text, ast) ], parsed_text_length
| _ ->
MatitaLog.error
"The result of the urichooser should be only 1 uri, not:\n";
@@ -286,16 +304,15 @@ let eval_macro guistuff status parsed_text script mac
) selected;
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 metasenv = MatitaTypes.get_proof_metasenv status in
+ let context = MatitaTypes.get_proof_context status user_goal 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
- | [x] -> x
+ | [x], _ -> x
| _ -> assert false
in
let ty,_ = CTC.type_of_aux' metasenv context term ugraph in
@@ -323,21 +340,21 @@ let eval_macro guistuff status parsed_text script mac
| TA.Print (_,kind) -> failwith "not implemented"
| TA.Search_pat (_, search_kind, str) -> failwith "not implemented"
| TA.Search_term (_, search_kind, term) -> failwith "not implemented"
-
-let eval_executable guistuff status user_goal parsed_text script ex =
- let module TA = GrafiteAst in
+let eval_executable guistuff status user_goal unparsed_text parsed_text script
+ ex
+=
let module TAPp = GrafiteAstPp 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, _) ->
+ | TA.Command (loc, _) | TA.Tactical (loc, _, _) ->
(try
- (match ML.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
+ (match MatitaMisc.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
| None -> ()
| Some u ->
- if not (ML.is_empty u) then
+ if not (MatitaMisc.is_empty u) then
match
guistuff.ask_confirmation
~title:"Baseuri redefinition"
@@ -353,37 +370,77 @@ let eval_executable guistuff status user_goal parsed_text script ex =
guistuff status user_goal parsed_text (TA.Executable (loc, ex))
with MatitaTypes.Cancel -> [], 0)
| TA.Macro (_,mac) ->
- eval_macro guistuff status parsed_text script mac
+ eval_macro guistuff status user_goal unparsed_text parsed_text script mac
+
+let parse_statement baseoffset parsedlen ?error_tag (buffer: GText.buffer) text
+=
+ try
+ GrafiteParser.parse_statement (Ulexing.from_utf8_string text)
+ with CicNotationParser.Parse_error (floc, err) as exn ->
+ match error_tag with
+ | None -> raise exn
+ | Some error_tag ->
+ let (x, y) = CicNotationPt.loc_of_floc floc in
+ let x = parsedlen + x in
+ let y = parsedlen + y in
+ let x' = baseoffset + x in
+ let y' = baseoffset + y in
+ let x_iter = buffer#get_iter (`OFFSET x') in
+ let y_iter = buffer#get_iter (`OFFSET y') in
+ buffer#apply_tag error_tag ~start:x_iter ~stop:y_iter;
+ let id = ref None in
+ id := Some (buffer#connect#changed ~callback:(fun () ->
+ buffer#remove_tag error_tag ~start:buffer#start_iter
+ ~stop:buffer#end_iter;
+ match !id with
+ | None -> assert false (* a race condition occurred *)
+ | Some id ->
+ (new GObj.gobject_ops buffer#as_buffer)#disconnect id));
+ let flocb,floce = floc in
+ let floc =
+ { flocb with Lexing.pos_cnum = x }, { floce with Lexing.pos_cnum = y }
+ in
+ buffer#place_cursor (buffer#get_iter (`OFFSET x'));
+ raise (CicNotationParser.Parse_error (floc, err))
-let rec eval_statement guistuff status user_goal script s =
- if Pcre.pmatch ~rex:only_dust_RE s then raise Margin;
- let st = GrafiteParser.parse_statement (Stream.of_string s) in
+let rec eval_statement baseoffset parsedlen error_tag (buffer : GText.buffer)
+ guistuff status user_goal script statement
+=
+ let st, unparsed_text =
+ match statement with
+ | `Raw text ->
+ if Pcre.pmatch ~rex:only_dust_RE text then raise Margin;
+ parse_statement baseoffset parsedlen ~error_tag buffer text, text
+ | `Ast (st, text) -> st, text
+ in
let text_of_loc loc =
let parsed_text_length = snd (CicNotationPt.loc_of_floc loc) in
- let parsed_text = safe_substring s 0 parsed_text_length in
+ let parsed_text = safe_substring unparsed_text 0 parsed_text_length in
parsed_text, parsed_text_length
in
match st with
- | GrafiteAst.Comment (loc,_)->
+ | GrafiteAst.Comment (loc, _) ->
let parsed_text, parsed_text_length = text_of_loc loc in
- let remain_len = String.length s - parsed_text_length in
- let s = String.sub s parsed_text_length remain_len in
+ let remain_len = String.length unparsed_text - parsed_text_length in
+ let s = String.sub unparsed_text parsed_text_length remain_len in
let s,len =
- eval_statement guistuff status user_goal script s
+ eval_statement baseoffset (parsedlen + parsed_text_length) error_tag
+ buffer guistuff status user_goal script (`Raw s)
in
(match s with
- | (status, text) :: tl ->
- ((status, parsed_text ^ text)::tl), (parsed_text_length + len)
+ | (status, (text, ast)) :: tl ->
+ ((status, (parsed_text ^ text, ast))::tl), (parsed_text_length + len)
| [] -> [], 0)
| GrafiteAst.Executable (loc, ex) ->
let parsed_text, parsed_text_length = text_of_loc loc in
- eval_executable guistuff status user_goal parsed_text script ex
+ eval_executable guistuff status user_goal unparsed_text parsed_text
+ script ex
let fresh_script_id =
let i = ref 0 in
fun () -> incr i; !i
-class script ~(view: GText.view)
+class script ~(source_view: GSourceView.source_view)
~(init: MatitaTypes.status)
~(mathviewer: MatitaTypes.mathViewer)
~set_star
@@ -391,7 +448,8 @@ class script ~(view: GText.view)
~urichooser
~develcreator
() =
-let buffer = view#buffer in
+let buffer = source_view#buffer in
+let source_buffer = source_view#source_buffer in
object (self)
val scriptId = fresh_script_id ()
@@ -404,6 +462,8 @@ object (self)
method private getFilename =
match guistuff.filenamedata with Some f,_ -> f | _ -> assert false
+
+ method filename = self#getFilename
method private ppFilename =
match guistuff.filenamedata with
@@ -411,13 +471,10 @@ object (self)
| 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 ];
@@ -433,41 +490,66 @@ object (self)
val locked_mark =
buffer#create_mark ~name:"locked" ~left_gravity:true buffer#start_iter
val locked_tag = buffer#create_tag [`BACKGROUND "lightblue"; `EDITABLE false]
+ val error_tag = buffer#create_tag [`UNDERLINE `SINGLE; `FOREGROUND "red"]
method locked_mark = locked_mark
+ method locked_tag = locked_tag
(* 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
method private _advance ?statement () =
+ let rec aux st =
+ let baseoffset = (buffer#get_iter_at_mark (`MARK locked_mark))#offset in
+ let (entries, parsed_len) =
+ eval_statement baseoffset 0 error_tag buffer guistuff self#status
+ userGoal self st
+ in
+ let (new_statuses, new_statements, new_asts) =
+ let statuses, statements = List.split entries in
+ let texts, asts = List.split statements in
+ statuses, texts, asts
+ in
+ history <- List.rev new_statuses @ history;
+ statements <- List.rev new_statements @ statements;
+ let start = buffer#get_iter_at_mark (`MARK locked_mark) in
+ let new_text = String.concat "" new_statements in
+ if statement <> None then
+ buffer#insert ~iter:start new_text
+ else
+ let s = match st with `Raw s | `Ast (_, s) -> s in
+ if new_text <> String.sub s 0 parsed_len then
+ begin
+ let stop = start#copy#forward_chars parsed_len in
+ buffer#delete ~start ~stop;
+ buffer#insert ~iter:start new_text;
+ end;
+ self#moveMark (String.length new_text);
+ (*
+ (match List.rev new_asts with (* advance again on punctuation *)
+ | TA.Executable (_, TA.Tactical (_, tac, _)) :: _ ->
+ let baseoffset =
+ (buffer#get_iter_at_mark (`MARK locked_mark))#offset
+ in
+ let text = self#getFuture in
+ (try
+ (match parse_statement baseoffset 0 ?error_tag:None buffer text with
+ | TA.Executable (loc, TA.Tactical (_, tac, None)) as st
+ when GrafiteAst.is_punctuation tac ->
+ let len = snd (CicNotationPt.loc_of_floc loc) in
+ aux (`Ast (st, String.sub text 0 len))
+ | _ -> ())
+ with CicNotationParser.Parse_error _ | End_of_file -> ())
+ | _ -> ())
+ *)
+ in
let s = match statement with Some s -> s | None -> self#getFuture in
MatitaLog.debug ("evaluating: " ^ first_line s ^ " ...");
- let (entries, parsed_len) =
- eval_statement guistuff self#status userGoal self s
- in
- let (new_statuses, new_statements) = List.split entries in
-(*
-prerr_endline "evalStatement returned";
-List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
-*)
- history <- List.rev new_statuses @ history;
- statements <- List.rev new_statements @ statements;
- let start = buffer#get_iter_at_mark (`MARK locked_mark) in
- let new_text = String.concat "" new_statements in
- 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)
+ (try aux (`Raw s) with End_of_file -> raise Margin)
method private _retract offset status new_statements new_history =
- let cur_status = match history with s::_ -> s | [] -> assert false in
+ 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;
@@ -516,16 +598,11 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
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;
- begin
- match self#status.proof_status with
- Incomplete_proof (_,goal) -> self#setGoal goal
- | _ -> ()
- end ;
let mark_position = buffer#get_iter_at_mark mark in
- if view#move_mark_onscreen mark then
+ if source_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;
+ source_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
@@ -543,9 +620,9 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
let status = self#status in
List.iter (fun o -> o status) observers
- method loadFromFile () =
- buffer#set_text (MatitaMisc.input_file self#getFilename);
- self#goto_top;
+ method loadFromFile f =
+ buffer#set_text (HExtlib.input_file f);
+ self#reset_buffer;
buffer#set_modified false
method assignFileName file =
@@ -560,7 +637,7 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
close_out oc;
buffer#set_modified false
- method private _saveToBackuptFile () =
+ method private _saveToBackupFile () =
if buffer#modified then
begin
let f = self#ppFilename ^ "~" in
@@ -572,77 +649,109 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
end
method private goto_top =
- MatitaSync.time_travel ~present:self#status ~past:init;
+ MatitaSync.time_travel ~present:self#status ~past:init
+
+ method private reset_buffer =
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;
+ self#reset_buffer;
+ source_buffer#begin_not_undoable_action ();
buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter;
- self#notify;
+ source_buffer#end_not_undoable_action ();
buffer#set_modified false
-
+
method template () =
- let template = MatitaMisc.input_file BuildTimeConf.script_template in
+ let template = HExtlib.input_file BuildTimeConf.script_template in
buffer#insert ~iter:(buffer#get_iter `START) template;
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 getoffset () = (buffer#get_iter_at_mark (`MARK locked_mark))#offset in
+ 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#reset_buffer;
+ self#notify
| `Bottom ->
(try
- let rec dowhile pos =
+ let rec dowhile () =
self#_advance ();
- let newpos = getoffset () in
- if pos - newpos < 0 then
- dowhile newpos
+ let newpos = getpos () in
+ if (getoldpos ())#compare newpos < 0 then
+ begin
+ buffer#move_mark old_locked_mark newpos;
+ dowhile ()
+ end
in
- dowhile (getoffset ());
+ 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_offset () =
- (buffer#get_iter_at_mark (`NAME "locked"))#offset in
- let cursor_offset () = (buffer#get_iter_at_mark `INSERT)#offset in
- let cmp = (locked_offset ()) - cursor_offset () in
+ 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_offset ()) - cursor_offset () < 0 &&
- oldpos - (getoffset ()) < 0
+ if cmp () < 0 && (getoldpos ())#compare (getpos ()) < 0
then
- aux (getoffset ())
+ begin
+ buffer#move_mark old_locked_mark (getpos ());
+ aux ()
+ end
in
- aux (getoffset ())
+ aux ()
in
let rec back_until_cursor len = (* go backward until locked < cursor *)
function
statements, (status::_ as history) when len <= 0 ->
- self#_retract (cmp - len) status statements history
+ self#_retract (icmp - len) status statements history
| statement::tl1, _::tl2 ->
back_until_cursor (len - String.length statement) (tl1,tl2)
| _,_ -> assert false
in
(try
- if cmp < 0 then (* locked < cursor *)
- (forward_until_cursor (); self#notify)
- else if cmp > 0 then (* locked > cursor *)
- (back_until_cursor cmp (statements,history); 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
@@ -650,16 +759,19 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
| Incomplete_proof _ -> true
| Intermediate _ -> assert false
- method proofStatus = MatitaMisc.get_proof_status self#status
- method proofMetasenv = MatitaMisc.get_proof_metasenv self#status
- method proofContext = MatitaMisc.get_proof_context self#status
+(* method proofStatus = MatitaTypes.get_proof_status self#status *)
+ method proofMetasenv = MatitaTypes.get_proof_metasenv self#status
+ method proofContext = MatitaTypes.get_proof_context self#status userGoal
+ method proofConclusion = MatitaTypes.get_proof_conclusion self#status userGoal
+ method stack = MatitaTypes.get_stack self#status
method setGoal n = userGoal <- n
+ method goal = userGoal
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 = GrafiteParser.parse_statement (Stream.of_string s) in
+ let st = GrafiteParser.parse_statement (Ulexing.from_utf8_string s) in
match st with
| GrafiteAst.Comment (loc,_)->
let parsed_text_length = snd (CicNotationPt.loc_of_floc loc) in
@@ -672,10 +784,8 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
is_there_and_executable s
with
| CicNotationParser.Parse_error _ -> false
- | Margin -> true
-
-
-
+ | Margin | End_of_file -> true
+
(* debug *)
method dump () =
MatitaLog.debug "script status:";
@@ -691,14 +801,13 @@ end
let _script = ref None
-let script ~view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star ()
+let script ~source_view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star ()
=
let s = new script
- ~view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star ()
+ ~source_view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star ()
in
_script := Some s;
s
-let instance () = match !_script with None -> assert false | Some s -> s
-
+let current () = match !_script with None -> assert false | Some s -> s