Bug fixed: variable capture in previous commit prevented all aliases insertion.

[helm.git] / helm / software / matita / matitaGui.ml

diff --git a/helm/software/matita/matitaGui.ml b/helm/software/matita/matitaGui.ml
index ded9c83aa46dee4136af781f481d0a469321841c..62c15acad20db2c3cda302f869e36eacdeabb1a9 100644 (file)
--- a/helm/software/matita/matitaGui.ml
+++ b/helm/software/matita/matitaGui.ml
@@ -729,7 +729,7 @@ class gui () =
               MultiPassDisambiguator.use_library := saved_use_library;
               unlock_world ()
            | exc ->
-              notify_exn exc;
+              (try notify_exn exc with Sys.Break as e -> notify_exn e);
               unlock_world ()
        in
        (*thread_main ();*)
@@ -1127,6 +1127,7 @@ class gui () =
       with Virtuals.Not_a_virtual -> false
          
     val similar_memory = Hashtbl.create 97
+    val mutable old_used_memory = false
 
     method private nextSimilarSymbol () = 
       let write_similarsymbol s =
@@ -1157,22 +1158,42 @@ class gui () =
           | [] ->  ()
           | eqclass ->
               similarsymbols_orig <- eqclass;
+              let is_used = 
+                try Hashtbl.find similar_memory similarsymbols_orig  
+                with Not_found -> 
+                  let is_used = List.map (fun x -> x,false) eqclass in
+                  Hashtbl.add similar_memory eqclass is_used; 
+                  is_used
+              in
               let hd, next, tl = 
-                match 
-                  try Hashtbl.find similar_memory similarsymbols_orig  
-                  with Not_found -> Hashtbl.add similar_memory eqclass eqclass; eqclass
-                with a::b::c -> a,b,c | _ -> assert false
+                let used, unused = 
+                  List.partition (fun s -> List.assoc s is_used) eqclass 
+                in
+                match used @ unused with a::b::c -> a,b,c | _ -> assert false
               in
               let hd, tl = 
                 if hd = last_symbol then next, tl @ [hd] else hd, (next::tl)
               in
+              old_used_memory <- List.assoc hd is_used;
+              let is_used = 
+                (hd,true) :: List.filter (fun (x,_) -> x <> hd) is_used
+              in
+              Hashtbl.replace similar_memory similarsymbols_orig is_used;
               write_similarsymbol hd;
               similarsymbols <- tl @ [ hd ]))
       else 
         match similarsymbols with
         | [] -> ()
         | hd :: tl ->
-            Hashtbl.replace similar_memory similarsymbols_orig similarsymbols;
+            let is_used = Hashtbl.find similar_memory similarsymbols_orig in
+            let last = HExtlib.list_last tl in
+            let old_used_for_last = old_used_memory in
+            old_used_memory <- List.assoc hd is_used;
+            let is_used = 
+              (hd, true) :: (last,old_used_for_last) ::
+                List.filter (fun (x,_) -> x <> last && x <> hd) is_used 
+            in
+            Hashtbl.replace similar_memory similarsymbols_orig is_used;
             similarsymbols <- tl @ [ hd ];
             write_similarsymbol hd