open MatitaTypes
+type callback = string -> command_outcome
+
(* let default_prompt = "# " *)
let default_prompt = ""
let default_phrase_sep = "."
-let default_callback = fun (phrase: string) -> true
+let default_callback = fun (phrase: string) -> (true, true)
let bullet = "∙"
let message_props = [ `STYLE `ITALIC ]
method private invoke_callback phrase =
history#add phrase;
- if _callback phrase then begin
- self#hide ();
- self#clear ()
- end
- (* else callback encountered troubles, don't hide console which
- probably contains error message *)
+ let (success, hide) = _callback phrase in
+ if hide then self#hide ()
method clear () =
let buf = self#buffer in
self#lock
method echo_message msg =
+ self#show ();
let buf = self#buffer in
self#ignore_insert_text_signal true;
buf#insert ~iter:buf#end_iter ~tags:[buf#create_tag message_props]
method private next_phrase =
try self#set_phrase history#next with History_failure -> ()
- method wrap_exn (f: unit -> unit) =
- try
- f ();
- true
- with
- | StatefulProofEngine.Tactic_failure exn ->
- self#echo_error (sprintf "Tactic failed: %s"(Printexc.to_string exn));
- false
- | CicTextualParser2.Parse_error (floc, msg) ->
- let buf = self#buffer in
- let (x, y) = CicAst.loc_of_floc floc in
- let red = buf#create_tag [`FOREGROUND "red"] in
- let (start_error_pos, end_error_pos) =
- buf#end_iter#backward_chars (String.length last_phrase - x),
- buf#end_iter#backward_chars (String.length last_phrase - y)
- in
- if x - y = 0 then (* no region to highlight, let's add an hint about
- where the error occured *)
- buf#insert ~iter:end_error_pos ~tags:[red] bullet
- else (* highlight the region where the error occured *)
- buf#apply_tag red ~start:start_error_pos ~stop:end_error_pos;
- self#echo_error (sprintf "at character %d-%d: %s" x y msg);
- false
- | exn ->
- self#echo_error (sprintf "Uncaught exception: %s"
- (Printexc.to_string exn));
- false
+ method wrap_exn: 'a. (unit -> 'a) -> 'a option =
+ fun f ->
+ try
+ Some (f ())
+ with exn ->
+ (match exn with (* highlight parse errors in user input *)
+ | CicTextualParser2.Parse_error (floc, msg) ->
+ let buf = self#buffer in
+ let (x, y) = CicAst.loc_of_floc floc in
+ let red = buf#create_tag [`FOREGROUND "red"] in
+ let (start_error_pos, end_error_pos) =
+ buf#end_iter#backward_chars (String.length last_phrase - x),
+ buf#end_iter#backward_chars (String.length last_phrase - y)
+ in
+ if x - y = 0 then (* no region to highlight, let's add an hint
+ about where the error occured *)
+ buf#insert ~iter:end_error_pos ~tags:[red] bullet
+ else (* highlight the region where the error occured *)
+ buf#apply_tag red ~start:start_error_pos ~stop:end_error_pos;
+ | _ -> ());
+ self#echo_error (explain exn);
+ None
end