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"
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
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;
+ let status =
MatitaEngine.eval_ast ~include_paths:include_
- ~do_heavy_checks:true status (goal_ast user_goal)
- | _ -> status
- in
+ ~do_heavy_checks:true status (goal_ast user_goal) in
+ let initial_space =
+ if initial_space = "" then "\n" else initial_space
+ in
+ "\n", status,
+ [status, initial_space ^ TAPp.pp_tactic (TA.Goal (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.Include _) -> DisambiguateTypes.Environment.empty
| _ -> 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 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 ->
+ fun k ((v,_) as value) (initial_space,status,acc) ->
let b =
try
let v = UM.strip_xpointer (UM.uri_of_string v) in
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(DTE.add k value DTE.empty) in
+ let new_status =
+ {status with aliases = DTE.add k value status.aliases}
+ in
+ "\n",new_status,((new_status, new_text)::acc)
+ ) new_aliases (initial_space,status,[]) 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]
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 target = what in
let refresh_cb () =
| `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 <b>not</b> handled by a development.\n" ^
| `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 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
~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 ()
| _ -> ()
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
method reset () =
self#goto_top;
+ source_buffer#begin_not_undoable_action ();
buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter;
+ source_buffer#end_not_undoable_action ();
self#notify;
buffer#set_modified 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 proofConclusion = MatitaMisc.get_proof_conclusion self#status
method setGoal n = userGoal <- n
method eos =
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
projects / helm.git / blobdiff