X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteSync.ml;h=60bfc69217b71425f922440ec50c69a0bba50637;hb=5c8de084e314e41f3dc2f605f6242283e930b803;hp=3fc67f2fda4f71b9dde3ddfa08c99e7b4f4e0122;hpb=b225178112c2c5ef1a717ac7e647d854d94b2e52;p=helm.git

diff --git a/helm/software/components/grafite_engine/grafiteSync.ml b/helm/software/components/grafite_engine/grafiteSync.ml
index 3fc67f2fd..60bfc6921 100644
--- a/helm/software/components/grafite_engine/grafiteSync.ml
+++ b/helm/software/components/grafite_engine/grafiteSync.ml
@@ -54,35 +54,86 @@ let uris_for_inductive_type uri obj =
 	in uris
     | _ -> [uri] 
 ;;
+
+let is_equational_fact ty =
+  let rec aux ctx t = 
+    match CicReduction.whd ctx t with 
+    | Cic.Prod (name,src,tgt) ->
+        let s,u = 
+          CicTypeChecker.type_of_aux' [] ctx src CicUniv.oblivion_ugraph
+        in
+        if fst (CicReduction.are_convertible ctx s (Cic.Sort Cic.Prop) u) then
+          false
+        else
+          aux (Some (name,Cic.Decl src)::ctx) tgt
+    | Cic.Appl [ Cic.MutInd (u,_,_) ; _; _; _] -> LibraryObjects.is_eq_URI u
+    | _ -> false
+  in 
+    aux [] ty
+;;
     
 let add_obj ~pack_coercion_obj uri obj status =
  let lemmas = LibrarySync.add_obj ~pack_coercion_obj uri obj in
- let add_to_universe (universe,status) uri =
+ let add_to_universe (automation_cache,status) uri =
    let term = CicUtil.term_of_uri uri in
    let ty,_ = CicTypeChecker.type_of_aux' [] [] term CicUniv.oblivion_ugraph in
    let tkeys = Universe.keys [] ty in
-   let index_cmd = 
-     List.map 
-       (fun key -> GrafiteAst.Index(HExtlib.dummy_floc,(Some key),uri))
-       tkeys
+   let universe = automation_cache.AutomationCache.univ in
+   let universe, index_cmd = 
+     List.fold_left 
+       (fun (universe,acc) key -> 
+         let cands = Universe.get_candidates universe key in
+         let tys = 
+           List.map
+              (fun t -> 
+                 let ty, _ = 
+                   CicTypeChecker.type_of_aux' [] [] t CicUniv.oblivion_ugraph
+                 in
+                   ty)
+              cands
+         in
+         if List.for_all 
+              (fun cty -> 
+                 not (fst(CicReduction.are_convertible [] ty cty
+                 CicUniv.oblivion_ugraph))) tys 
+        then
+           Universe.index universe key term,
+           GrafiteAst.Index(HExtlib.dummy_floc,(Some key),uri)::acc
+         else
+           universe, acc)
+       (universe,[]) tkeys
+   in
+   let is_equational = is_equational_fact ty in
+   let select_cmd = 
+      if is_equational then
+       [ GrafiteAst.Select(HExtlib.dummy_floc,uri) ]
+      else
+       []
    in
-   let universe = Universe.index_term_and_unfolded_term universe [] term ty
+   let automation_cache = 
+     if is_equational then
+        AutomationCache.add_term_to_active automation_cache [] [] [] term None
+     else
+        automation_cache
    in
+   let automation_cache = 
+     { automation_cache with AutomationCache.univ = universe }  in
    let status = GrafiteTypes.add_moo_content index_cmd status in
-   (universe,status)
+   let status = GrafiteTypes.add_moo_content select_cmd status in
+   (automation_cache,status)
  in
  let uris_to_index = 
    if is_a_variant obj then []
    else (uris_for_inductive_type uri obj) @ lemmas 
  in
- let universe,status =
+ let automation_cache,status =
    List.fold_left add_to_universe 
-     (status.GrafiteTypes.universe,status) 
+     (status.GrafiteTypes.automation_cache,status) 
      uris_to_index 
  in
   {status with 
      GrafiteTypes.objects = uri :: lemmas @ status.GrafiteTypes.objects;
-     GrafiteTypes.universe = universe},
+     GrafiteTypes.automation_cache = automation_cache},
    lemmas
 
 let add_coercion ~pack_coercion_obj ~add_composites status uri arity
@@ -91,10 +142,17 @@ let add_coercion ~pack_coercion_obj ~add_composites status uri arity
  let lemmas = 
    LibrarySync.add_coercion ~add_composites ~pack_coercion_obj 
     uri arity saturations baseuri in
+ let status = 
  { status with GrafiteTypes.coercions = CoercDb.dump () ; 
-   objects = lemmas @ status.GrafiteTypes.objects
-  },
-   lemmas
+   objects = lemmas @ status.GrafiteTypes.objects;
+  }
+ in
+ let db = 
+   NCicCoercion.index_old_db (CoercDb.dump ()) 
+    (GrafiteTypes.get_coercions status) 
+ in
+ let status = GrafiteTypes.set_coercions db status in 
+ status, lemmas
 
 let prefer_coercion s u = 
   CoercDb.prefer u;
@@ -113,17 +171,26 @@ let time_travel ~present ~past =
    uri_list_diff present.GrafiteTypes.objects past.GrafiteTypes.objects in
   List.iter LibrarySync.remove_obj objs_to_remove;
   CoercDb.restore past.GrafiteTypes.coercions;
+  NCicLibrary.time_travel (GrafiteTypes.get_library_db past)
 ;;
 
-let initial_status baseuri = {
+let initial_status lexicon_status baseuri = {
     GrafiteTypes.moo_content_rev = [];
     proof_status = GrafiteTypes.No_proof;
     objects = [];
     coercions = CoercDb.empty_coerc_db;
-    universe = Universe.empty;
+    automation_cache = AutomationCache.empty ();
     baseuri = baseuri;
-    ng_status = None;
+    ng_status = GrafiteTypes.CommandMode { 
+      NEstatus.lstatus = lexicon_status;
+      NEstatus.rstatus = {
+        NRstatus.uhint_db = NCicUnifHint.empty_db;
+        NRstatus.coerc_db = NCicCoercion.empty_db;
+        NRstatus.library_db = NCicLibrary.time0;
+        NRstatus.dump = fun x -> x;
+      };
   }
+}
 
 
 let init baseuri =