version 0.7.1

[helm.git] / helm / matita / matitaScript.ml

diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml
index 4b548f6069f7e43860bf21125f2cb859ee14ef3e..63a6ed007aab91a4f09f8e4f63c4075b6fd6b9f4 100644 (file)
--- a/helm/matita/matitaScript.ml
+++ b/helm/matita/matitaScript.ml
@@ -255,25 +255,28 @@ ask_confirmation user_goal parsed_text script ex =
   let module TA = TacticAst in
   let module TAPp = TacticAstPp 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, _) ->
-      (match MatitacleanLib.baseuri_of_baseuri_decl (TA.Executable (loc,ex))with
-      | None -> ()
-      | Some u -> 
-          if not (MatitacleanLib.is_empty u) then
-            match 
-              ask_confirmation 
-                ~title:"Baseuri redefinition" 
-                ~message:(
-                  "Baseuri " ^ u ^ " already exists.\n" ^
-                  "Do you want to redefine the corresponding "^
-                  "part of the library?")
-            with
-            | `YES -> MatitacleanLib.clean_baseuris [u]
-            | `NO -> ()
-            | `CANCEL -> raise MatitaTypes.Cancel);
-      eval_with_engine status user_goal parsed_text (TA.Executable (loc, ex))
+      (try 
+        (match ML.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
+        | None -> ()
+        | Some u -> 
+            if not (MatitacleanLib.is_empty u) then
+              match 
+                ask_confirmation 
+                  ~title:"Baseuri redefinition" 
+                  ~message:(
+                    "Baseuri " ^ u ^ " already exists.\n" ^
+                    "Do you want to redefine the corresponding "^
+                    "part of the library?")
+              with
+              | `YES -> MatitacleanLib.clean_baseuris [u]
+              | `NO -> ()
+              | `CANCEL -> raise MatitaTypes.Cancel);
+        eval_with_engine status user_goal parsed_text (TA.Executable (loc, ex))
+      with MatitaTypes.Cancel -> [], 0)
   | TA.Macro (_,mac) ->
       eval_macro status mathviewer urichooser parsed_text script mac
 
@@ -323,15 +326,15 @@ object (self)
     match filename with Some f -> f | None -> sprintf ".unnamed%d.ma" scriptId
   
   initializer 
-    ignore(GMain.Timeout.add ~ms:30000 
+    ignore(GMain.Timeout.add ~ms:300000 
        ~callback:(fun _ -> self#_saveToBackuptFile ();true));
-    set_star self#ppFilename false;
     ignore(buffer#connect#modified_changed 
        (fun _ -> if buffer#modified then 
           set_star self#ppFilename true 
         else 
           set_star self#ppFilename false));
-    self#reset ()
+    self#reset ();
+    self#template ()
 
   val mutable statements = [];    (** executed statements *)
   val mutable history = [ init ];
@@ -393,13 +396,13 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
     try
       self#_advance ?statement ();
       self#notify
-    with Margin -> ()
+    with Margin -> self#notify
 
   method retract () =
     try
       self#_retract ();
       self#notify
-    with Margin -> ()
+    with Margin -> self#notify
 
   method private getFuture =
     buffer#get_text ~start:(buffer#get_iter_at_mark (`MARK locked_mark))
@@ -420,9 +423,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;
-    match self#status.proof_status with
-       Incomplete_proof (_,goal) -> self#setGoal goal
-     | _ -> ();
+    begin
+     match self#status.proof_status with
+        Incomplete_proof (_,goal) -> self#setGoal goal
+      | _ -> ()
+    end ;
     while Glib.Main.pending () do ignore(Glib.Main.iteration false); done
 
   val mutable observers = []
@@ -471,13 +476,30 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
   method reset () =
     self#goto_top;
     buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter;
-    self#notify
+    self#notify;
+    buffer#set_modified false
+
+  method template () =
+    let template = MatitaMisc.input_file BuildTimeConf.script_template in 
+    buffer#insert ~iter:(buffer#get_iter `START) template;
+    filename <- None;
+    buffer#set_modified false;
+    set_star self#ppFilename false
 
   method goto (pos: [`Top | `Bottom | `Cursor]) () =
     match pos with
     | `Top -> self#goto_top; self#notify
     | `Bottom ->
-        (try while true do self#_advance () done; self#notify with Margin -> ())
+        (try 
+          let getpos _ = buffer#get_iter_at_mark (`MARK locked_mark) in 
+          let rec dowhile pos =
+            self#_advance ();
+            if pos#compare (getpos ()) < 0 then
+              dowhile (getpos ())
+          in
+          dowhile (getpos ());
+          self#notify 
+        with Margin -> self#notify)
     | `Cursor ->
         let locked_iter () = buffer#get_iter_at_mark (`NAME "locked") in
         let cursor_iter () = buffer#get_iter_at_mark `INSERT in
@@ -499,7 +521,7 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
             (back_until_cursor (); self#notify)
           else                  (* cursor = locked *)
               ()
-        with Margin -> ())
+        with Margin -> self#notify)
 
   method onGoingProof () =
     match self#status.proof_status with
@@ -512,6 +534,27 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
   method proofContext = MatitaMisc.get_proof_context self#status
   method setGoal n = userGoal <- n
 
+  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 = CicTextualParser2.parse_statement (Stream.of_string s) in
+      match st with
+      | TacticAst.Comment (loc,_)-> 
+          let parsed_text_length = snd (CicAst.loc_of_floc loc) in
+          let remain_len = String.length s - parsed_text_length in
+          let next = String.sub s parsed_text_length remain_len in
+          is_there_and_executable next
+      | TacticAst.Executable (loc, ex) -> false
+    in
+    try
+      is_there_and_executable s
+    with 
+    | CicTextualParser2.Parse_error _ -> false
+    | Margin -> true
+      
+    
+    
   (* debug *)
   method dump () =
     MatitaLog.debug "script status:";