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

diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml
index 5be94e7df..e2003f48d 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")
@@ -58,37 +63,68 @@ let assumption_tac =
 
 (* ANCORA DA DEBUGGARE *)
 
+exception UnableToDetectTheTermThatMustBeGeneralizedYouMustGiveItExplicitly;;
+exception TheSelectedTermsMustLiveInTheGoalContext
 exception AllSelectedTermsMustBeConvertible;;
-
-(* serve una funzione che cerchi nel ty dal basso a partire da term, i lambda
-e li aggiunga nel context, poi si conta la lunghezza di questo nuovo
-contesto e si lifta di tot... COSA SIGNIFICA TUTTO CIO'?????? *)
+exception GeneralizationInHypothesesNotImplementedYet;;
 
 let generalize_tac 
- ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) terms
+ ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
+ pattern
  =
   let module PET = ProofEngineTypes in
-  let generalize_tac mk_fresh_name_callback terms status =
+  let generalize_tac mk_fresh_name_callback
+       ~pattern:(term,hyps_pat,concl_pat) status
+  =
+   if hyps_pat <> [] then raise GeneralizationInHypothesesNotImplementedYet;
    let (proof, goal) = status in
    let module C = Cic in
    let module P = PrimitiveTactics in
    let module T = Tacticals in
     let _,metasenv,_,_ = proof in
-    let _,context,ty = CicUtil.lookup_meta goal metasenv in
-     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)
-     in
-      PET.apply_tactic 
-      (T.thens 
+    let (_,context,ty) as conjecture = CicUtil.lookup_meta goal metasenv in
+    let selected_hyps,terms_with_context =
+     ProofEngineHelpers.select ~metasenv ~conjecture ~pattern in
+    let typ,term =
+     match terms_with_context, term with
+        [], None ->
+         raise UnableToDetectTheTermThatMustBeGeneralizedYouMustGiveItExplicitly
+      | _, Some term
+      | (_,term)::_, None ->
+         fst
+          (CicTypeChecker.type_of_aux' metasenv context term
+            CicUniv.empty_ugraph),
+         term in
+    (* We need to check:
+        1. whether they live in the context of the goal;
+           if they do they are also well-typed since they are closed subterms
+           of a well-typed term in the well-typed context of the well-typed
+           term
+        2. whether they are convertible
+    *)
+    ignore (
+     (* TASSI: FIXME *)
+     List.fold_left
+      (fun u (context_of_t,t) ->
+        (* 1 *)
+        begin
+         try
+          ignore
+           (CicMetaSubst.delift_rels [] metasenv
+             (List.length context_of_t - List.length context) t)
+         with
+          CicMetaSubst.DeliftingARelWouldCaptureAFreeVariable ->
+           raise TheSelectedTermsMustLiveInTheGoalContext
+        end;
+        (* 2 *)
+        let b,u1 = CicReduction.are_convertible context term t u in 
+         if not b then 
+          raise AllSelectedTermsMustBeConvertible
+         else
+          u1
+      ) CicUniv.empty_ugraph terms_with_context) ;
+    PET.apply_tactic 
+     (T.thens 
        ~start:
          (P.cut_tac 
           (C.Prod(
@@ -96,14 +132,14 @@ let generalize_tac
             typ,
             (ProofEngineReduction.replace_lifting_csc 1
               ~equality:(==) 
-              ~what:terms
-              ~with_what:(List.map (function _ -> C.Rel 1) terms)
+              ~what:(List.map snd terms_with_context)
+              ~with_what:(List.map (function _ -> C.Rel 1) terms_with_context)
               ~where:ty)
           )))
-       ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac])
+       ~continuations:
+         [(P.apply_tac ~term:(C.Appl [C.Rel 1; CicSubstitution.lift 1 term])) ;
+           T.id_tac])
        status
  in
-  PET.mk_tactic (generalize_tac mk_fresh_name_callback terms)
+  PET.mk_tactic (generalize_tac mk_fresh_name_callback ~pattern)
 ;;
-
-