various updates, removed proofs for now because they are the real bottleneck!!

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

diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml
index 99b7018e42ac9d50ffa921513e6b2c97a1847496..0d6bfedee5ea0ec6d6ef68a3e904ad6389be5580 100644 (file)
--- a/helm/matita/matitaScript.ml
+++ b/helm/matita/matitaScript.ml
@@ -93,8 +93,13 @@ let eval_with_engine status user_goal parsed_text st =
     let module UM = UriManager in
     DTE.fold (
       fun k ((v,_) as value) acc -> 
-        let v = UM.strip_xpointer (UM.uri_of_string v) in
-        if List.exists (fun (s,_) -> s = v) new_status.objects then
+        let b = 
+          try
+            let v = UM.strip_xpointer (UM.uri_of_string v) in
+            List.exists (fun (s,_) -> s = v) new_status.objects 
+          with UM.IllFormedUri _ -> false
+        in
+        if b then 
           acc
         else
           DTE.add k value acc
@@ -164,7 +169,7 @@ let eval_macro status (mathviewer:MatitaTypes.mathViewer) urichooser parsed_text
       let term = disambiguate term status in
       let uri =
         match term with
-        | Cic.MutInd (uri,n,_) -> UriManager.string_of_uriref (uri,[n])
+        | Cic.MutInd (uri,n,_) -> UriManager.uri_of_uriref uri n None 
         | _ -> failwith "Not a MutInd"
       in
       let l = MQ.elim ~dbd uri in
@@ -190,7 +195,7 @@ let eval_macro status (mathviewer:MatitaTypes.mathViewer) urichooser parsed_text
           (TA.Executable (loc,
             (TA.Tactical (loc, 
                TA.Tactic (loc,
-                 TA.Apply (loc, CicAst.Uri (uri,None))))))) 
+                 TA.Apply (loc, CicAst.Uri (UriManager.string_of_uri uri,None))))))) 
         in
         let new_status = MatitaEngine.eval_ast status ast in
         let extra_text = 
@@ -202,7 +207,7 @@ let eval_macro status (mathviewer:MatitaTypes.mathViewer) urichooser parsed_text
           MatitaLog.error 
             "The result of the urichooser should be only 1 uri, not:\n";
           List.iter (
-            fun u -> MatitaLog.error (u ^ "\n")
+            fun u -> MatitaLog.error (UriManager.string_of_uri u ^ "\n")
           ) selected;
           assert false)
   | TA.Check (_,term) ->
@@ -286,9 +291,21 @@ user_goal script s =
 
 class script ~(buffer: GText.buffer) ~(init: MatitaTypes.status) 
               ~(mathviewer: MatitaTypes.mathViewer) 
+              ~set_star
               ~urichooser () =
+let std_filename = "unNamed.ma" in
 object (self)
-  initializer self#reset ()
+  val mutable filename = std_filename
+  
+  initializer 
+    ignore(GMain.Timeout.add ~ms:30000 
+       ~callback:(fun _ -> self#_saveToBackuptFile ();true));
+    ignore(buffer#connect#modified_changed 
+       (fun _ -> if buffer#modified then 
+          set_star filename true 
+        else 
+          set_star filename false));
+    self#reset ()
 
   val mutable statements = [];    (** executed statements *)
   val mutable history = [ init ];
@@ -300,6 +317,7 @@ object (self)
   (** goal as seen by the user (i.e. metano corresponding to current tab) *)
   val mutable userGoal = ~-1
 
+
   (** text mark and tag representing locked part of a script *)
   val locked_mark =
     buffer#create_mark ~name:"locked" ~left_gravity:true buffer#start_iter
@@ -322,12 +340,16 @@ 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
-    if statement = None then begin
-      let stop = start#copy#forward_chars parsed_len in
-      buffer#delete ~start ~stop
-    end;
     let new_text = String.concat "" new_statements in
-    buffer#insert ~iter:start new_text;
+    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)
 
   method private _retract () =
@@ -376,16 +398,32 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
     let status = self#status in
     List.iter (fun o -> o status) observers
 
-  method loadFrom fname =
-    buffer#set_text (MatitaMisc.input_file fname);
-    self#goto_top
-
-  method saveTo fname =
-    let oc = open_out fname in
+  method loadFromFile () =
+    buffer#set_text (MatitaMisc.input_file filename);
+    self#goto_top;
+    buffer#set_modified false
+    
+  method assignFileName file =
+    filename <- file;
+    
+  method saveToFile () =
+    let oc = open_out filename in
     output_string oc (buffer#get_text ~start:buffer#start_iter
                         ~stop:buffer#end_iter ());
-    close_out oc
-
+    close_out oc;
+    buffer#set_modified false
+  
+  method private _saveToBackuptFile () =
+    if buffer#modified then
+      begin
+        let f = filename ^ "~" in 
+        let oc = open_out f in
+        output_string oc (buffer#get_text ~start:buffer#start_iter
+                            ~stop:buffer#end_iter ());
+        close_out oc;
+        MatitaLog.debug ("backup " ^ f ^ " saved")                    
+      end
+  
   method private goto_top =
     MatitaSync.time_travel ~present:self#status ~past:init;
     statements <- [];
@@ -444,13 +482,14 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements;
     MatitaLog.debug ("history size: " ^ string_of_int (List.length history));
     MatitaLog.debug (sprintf "%d statements:" (List.length statements));
     List.iter MatitaLog.debug statements;
+    MatitaLog.debug ("Current file name: " ^ filename);
 
 end
 
 let _script = ref None
 
-let script ~buffer ~init ~mathviewer ~urichooser () =
-  let s = new script ~buffer ~init ~mathviewer ~urichooser () in
+let script ~buffer ~init ~mathviewer ~urichooser ~set_star () =
+  let s = new script ~buffer ~init ~mathviewer ~urichooser ~set_star () in
   _script := Some s;
   s