X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FvariousTactics.ml;h=be08c4d9e9b69bf5114ba1f4c62d6384ea8a312e;hb=fdd8107cc53f5e862004aa5fcd48593ee5634234;hp=5be94e7df0dd87ee7b2c1368e30052d1e7318602;hpb=59a077151336a0e73804572b52fb757a0e7f6a97;p=helm.git

diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml
index 5be94e7df..be08c4d9e 100644
--- a/helm/ocaml/tactics/variousTactics.ml
+++ b/helm/ocaml/tactics/variousTactics.ml
@@ -36,18 +36,23 @@ let assumption_tac =
   let module R = CicReduction in
   let module S = CicSubstitution in
   let module PT = PrimitiveTactics in
-   let _,metasenv,_,_ = proof in
-    let _,context,ty = CicUtil.lookup_meta goal metasenv in
-     let rec find n = function 
-        hd::tl -> 
-         (match hd with
+  let _,metasenv,_,_ = proof in
+  let _,context,ty = CicUtil.lookup_meta goal metasenv in
+  let rec find n = function 
+      hd::tl -> 
+        (match hd with
              (Some (_, C.Decl t)) when
-               (R.are_convertible context (S.lift n t) ty) -> n
+               fst (R.are_convertible context (S.lift n t) ty 
+		       CicUniv.empty_ugraph) -> n
            | (Some (_, C.Def (_,Some ty'))) when
-               (R.are_convertible context ty' ty) -> n
-           | (Some (_, C.Def (t,None))) when
-               (R.are_convertible context
-                (CicTypeChecker.type_of_aux' metasenv context (S.lift n t)) ty) -> n 
+               fst (R.are_convertible context (S.lift n ty') ty
+                       CicUniv.empty_ugraph) -> n
+           | (Some (_, C.Def (t,None))) ->
+	       let ty_t, u = (* TASSI: FIXME *)
+		 CicTypeChecker.type_of_aux' metasenv context (S.lift n t) 
+		   CicUniv.empty_ugraph in
+	       let b,_ = R.are_convertible context ty_t ty u in
+		 if b then n else find (n+1) tl
            | _ -> find (n+1) tl
          )
       | [] -> raise (PET.Fail "Assumption: No such assumption")
@@ -65,7 +70,7 @@ e li aggiunga nel context, poi si conta la lunghezza di questo nuovo
 contesto e si lifta di tot... COSA SIGNIFICA TUTTO CIO'?????? *)
 
 let generalize_tac 
- ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) terms
+ ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) terms
  =
   let module PET = ProofEngineTypes in
   let generalize_tac mk_fresh_name_callback terms status =
@@ -75,17 +80,19 @@ let generalize_tac
    let module T = Tacticals in
     let _,metasenv,_,_ = proof in
     let _,context,ty = CicUtil.lookup_meta goal metasenv in
-     let typ =
+     let typ,_ =
       match terms with
          [] -> assert false
        | he::tl ->
-          (* We need to check that all the convertibility of all the terms *)
-          List.iter
-           (function t ->
-             if not (CicReduction.are_convertible context he t) then 
-              raise AllSelectedTermsMustBeConvertible
-           ) tl ;
-          (CicTypeChecker.type_of_aux' metasenv context he)
+           (* We need to check that all the convertibility of all the terms *)
+           let u = List.fold_left ( (* TASSI: FIXME *)
+	     fun u t ->
+	       let b,u1 = CicReduction.are_convertible context he t u in 
+		 if not b then 
+		   raise AllSelectedTermsMustBeConvertible
+		 else
+		   u1) CicUniv.empty_ugraph tl in
+             (CicTypeChecker.type_of_aux' metasenv context he u)
      in
       PET.apply_tactic 
       (T.thens