X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Funiverse.ml;h=d20dbda352acf9ed2a59adeff810352c6993ada8;hb=95adf6dc8e29a71adc34e71eafe3f427990126e0;hp=99041ed1ba33a8e1e526d1e96656f7c13a612046;hpb=56da33f7a668f84dd0edb335bce9f6fef9a985aa;p=helm.git

diff --git a/helm/software/components/tactics/universe.ml b/helm/software/components/tactics/universe.ml
index 99041ed1b..d20dbda35 100644
--- a/helm/software/components/tactics/universe.ml
+++ b/helm/software/components/tactics/universe.ml
@@ -28,16 +28,35 @@ module Codomain = struct
   let compare = Pervasives.compare 
 end
 module S = Set.Make(Codomain)
-module TI = Discrimination_tree.DiscriminationTreeIndexing(S)
+module TI = Discrimination_tree.Make(Cic_indexable.CicIndexable)(S)
 type universe = TI.t
 
-let empty = TI.empty
+let empty = TI.empty ;;
+
+let iter u f = 
+  TI.iter u 
+   (fun p s -> f p (S.elements s))
 ;;
 
 let get_candidates univ ty = 
   S.elements (TI.retrieve_unifiables univ ty)
 ;;
 
+let in_universe univ ty =
+  let candidates = get_candidates univ ty in
+    List.fold_left 
+      (fun res cand ->
+	 match res with
+	   | Some found -> Some found
+	   | None -> 
+	       let candty,_ = 
+		 CicTypeChecker.type_of_aux' [] [] cand CicUniv.oblivion_ugraph in
+	       let same ,_ = 
+		 CicReduction.are_convertible [] candty ty CicUniv.oblivion_ugraph in
+	       if same then Some cand else None
+      ) None candidates
+;;
+
 let rec unfold context = function
   | Cic.Prod(name,s,t) -> 
       let t' = unfold ((Some (name,Cic.Decl s))::context) t in
@@ -73,7 +92,7 @@ let rec collapse_head_metas t =
 
 let rec dummies_of_coercions = 
   function
-    | Cic.Appl (c::l) when CoercDb.is_a_coercion' c ->
+    | Cic.Appl (c::l) when CoercDb.is_a_coercion c <> None ->
         Cic.Meta (-1,[])
     | Cic.Appl l -> 
         let l' = List.map dummies_of_coercions l in Cic.Appl l'
@@ -85,10 +104,11 @@ let rec dummies_of_coercions =
         let s' = dummies_of_coercions s in
         let t' = dummies_of_coercions t in
           Cic.Prod (n,s',t')        
-    | Cic.LetIn(n,s,t) ->
+    | Cic.LetIn(n,s,ty,t) ->
         let s' = dummies_of_coercions s in
+        let ty' = dummies_of_coercions ty in
         let t' = dummies_of_coercions t in
-          Cic.LetIn (n,s',t')        
+          Cic.LetIn (n,s',ty',t')        
     | Cic.MutCase _ -> Cic.Meta (-1,[])
     | t -> t
 ;;
@@ -119,7 +139,7 @@ let keys context ty =
     [head true ty; head true (unfold context ty)]
   with ProofEngineTypes.Fail _ -> [head true ty]
 
-let key term = head false term
+let key term = head false term;;
 
 let index_term_and_unfolded_term univ context t ty =
   let key = head true ty in
@@ -161,7 +181,7 @@ let remove univ context term ty =
 
 let remove_uri univ uri =
   let term = CicUtil.term_of_uri uri in
-  let ty,_ = CicTypeChecker.type_of_aux' [] [] term CicUniv.empty_ugraph in
+  let ty,_ = CicTypeChecker.type_of_aux' [] [] term CicUniv.oblivion_ugraph in
     remove univ [] term ty