X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fmatita%2FmatitaScript.ml;h=718ea7a23f64091e05642560ff4ce094d122b857;hb=8f5b2a89a53e1ee111fe90d1a9fba9f5c45072e7;hp=a6842d832e2076251a7a14fdf82631b51e11d319;hpb=5716f9072fc8a7d46324e91cca970489c59cc590;p=helm.git
diff --git a/helm/software/matita/matitaScript.ml b/helm/software/matita/matitaScript.ml
index a6842d832..718ea7a23 100644
--- a/helm/software/matita/matitaScript.ml
+++ b/helm/software/matita/matitaScript.ml
@@ -129,11 +129,11 @@ let wrap_with_developments guistuff f arg =
(ActionCancelled
("Internal error: "^f_pwd^" exists but I'm unable to include it!"))
in
- let handle_with_devel d lexiconfile exc =
+ let handle_with_devel d lexiconfile mafile exc =
let name = MatitamakeLib.name_for_development d in
let title = "Unable to include " ^ lexiconfile in
let message =
- lexiconfile ^ " is handled by development " ^ name ^ ".\n\n" ^
+ mafile ^ " is handled by development " ^ name ^ ".\n\n" ^
"Should I compile it and Its dependencies?"
in
(match guistuff.ask_confirmation ~title ~message with
@@ -170,7 +170,7 @@ let wrap_with_developments guistuff f arg =
* but was unable to get the compilation output 'xfilename' *)
match MatitamakeLib.development_for_dir (Filename.dirname mafilename) with
| None -> handle_without_devel mafilename exn
- | Some d -> handle_with_devel d xfilename exn
+ | Some d -> handle_with_devel d xfilename mafilename exn
;;
let eval_with_engine
@@ -288,9 +288,6 @@ let rec eval_macro include_paths (buffer : GText.buffer) guistuff lexicon_status
let t_and_ty = Cic.Cast (term,ty) in
guistuff.mathviewer#show_entry (`Cic (t_and_ty,metasenv));
[], parsed_text_length
- (* TODO *)
- | TA.Quit _ -> failwith "not implemented"
- | TA.Print (_,kind) -> failwith "not implemented"
and eval_executable include_paths (buffer : GText.buffer) guistuff
lexicon_status grafite_status user_goal unparsed_text skipped_txt nonskipped_txt
@@ -586,6 +583,11 @@ object (self)
let grafite_status = self#grafite_status in
List.iter (fun o -> o lexicon_status grafite_status) observers
+ method loadFromString s =
+ buffer#set_text s;
+ self#reset_buffer;
+ buffer#set_modified true
+
method loadFromFile f =
buffer#set_text (HExtlib.input_file f);
self#reset_buffer;