X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FequalityTactics.ml;h=c56d3de2d75af9c4566d19a98ff568104c4d4699;hb=33a02e0b639217093eb63f30169aaa6ac8c78907;hp=3d54fd18bbc9e126c663b30ab7b1607711a2f389;hpb=ed207660b8a0fa34f1d34b9dbb41144c5be29e68;p=helm.git

diff --git a/helm/ocaml/tactics/equalityTactics.ml b/helm/ocaml/tactics/equalityTactics.ml
index 3d54fd18b..c56d3de2d 100644
--- a/helm/ocaml/tactics/equalityTactics.ml
+++ b/helm/ocaml/tactics/equalityTactics.ml
@@ -42,10 +42,17 @@ let rewrite_tac ~direction ~pattern equality =
   in
   let curi, metasenv, pbo, pty = proof in
   let (metano,context,gty) as conjecture = CicUtil.lookup_meta goal metasenv in
-  let ty_eq,_ = 
+  let ty_eq,ugraph = 
     CicTypeChecker.type_of_aux' metasenv context equality 
-      CicUniv.empty_ugraph
-  in 
+      CicUniv.empty_ugraph in 
+  let (ty_eq,metasenv',arguments,fresh_meta) =
+   ProofEngineHelpers.saturate_term
+    (ProofEngineHelpers.new_meta_of_proof proof) metasenv context ty_eq 0 in
+  let equality =
+   if List.length arguments = 0 then
+    equality
+   else
+    C.Appl (equality :: arguments) in
   let eq_ind, ty, t1, t2 =
     match ty_eq with
     | C.Appl [C.MutInd (uri, 0, []); ty; t1; t2]
@@ -59,15 +66,19 @@ let rewrite_tac ~direction ~pattern equality =
   (* now we always do as if direction was `LeftToRight *)
   let fresh_name = 
     FreshNamesGenerator.mk_fresh_name 
-    ~subst:[] metasenv context C.Anonymous ~typ:ty in
+    ~subst:[] metasenv' context C.Anonymous ~typ:ty in
   let lifted_t1 = CicSubstitution.lift 1 t1 in
   let lifted_gty = CicSubstitution.lift 1 gty in
   let lifted_conjecture =
     metano,(Some (fresh_name,Cic.Decl ty))::context,lifted_gty in
-  let lifted_pattern = Some lifted_t1,[],CicSubstitution.lift 1 concl_pat in
-  let _,selected_terms_with_context =
+  let lifted_pattern =
+    Some (fun _ m u -> lifted_t1, m, u),[],CicSubstitution.lift 1 concl_pat
+  in
+  let subst,metasenv',ugraph,_,selected_terms_with_context =
    ProofEngineHelpers.select
-    ~metasenv ~conjecture:lifted_conjecture ~pattern:lifted_pattern in
+    ~metasenv:metasenv' ~ugraph ~conjecture:lifted_conjecture
+     ~pattern:lifted_pattern in
+  let metasenv' = CicMetaSubst.apply_subst_metasenv subst metasenv' in
   let what,with_what = 
    (* Note: Rel 1 does not live in the context context_of_t           *)
    (* The replace_lifting_csc_0 function will take care of lifting it *)
@@ -78,10 +89,13 @@ let rewrite_tac ~direction ~pattern equality =
   let abstr_gty =
    ProofEngineReduction.replace_lifting_csc 0
     ~equality:(==) ~what ~with_what:with_what ~where:lifted_gty in
+  let abstr_gty = CicMetaSubst.apply_subst subst abstr_gty in
+  let t1 = CicMetaSubst.apply_subst subst t1 in
+  let t2 = CicMetaSubst.apply_subst subst t2 in
+  let equality = CicMetaSubst.apply_subst subst equality in
   let gty' = CicSubstitution.subst t2 abstr_gty in
-  let fresh_meta = ProofEngineHelpers.new_meta_of_proof proof in
   let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
-  let metasenv' = (fresh_meta,context,gty')::metasenv in
+  let metasenv' = (fresh_meta,context,gty')::metasenv' in
   let pred = C.Lambda (fresh_name, ty, abstr_gty) in
   let exact_proof = 
     C.Appl [eq_ind ; ty ; t2 ; pred ; C.Meta (fresh_meta,irl) ; t1 ;equality]
@@ -91,7 +105,11 @@ let rewrite_tac ~direction ~pattern equality =
       (PT.exact_tac ~term:exact_proof) ((curi,metasenv',pbo,pty),goal)
   in
   assert (List.length goals = 0) ;
-  (proof',[fresh_meta])
+  let goals =
+   ProofEngineHelpers.compare_metasenvs ~oldmetasenv:metasenv
+    ~newmetasenv:metasenv'
+  in
+   (proof',goals)
  in
   ProofEngineTypes.mk_tactic (rewrite_tac ~direction ~pattern equality)
   
@@ -116,12 +134,19 @@ let replace_tac ~pattern ~with_what =
   let module U = UriManager in
   let module P = PrimitiveTactics in
   let module T = Tacticals in
-  let _,metasenv,_,_ = proof in
+  let uri,metasenv,pbo,pty = proof in
   let (_,context,ty) as conjecture = CicUtil.lookup_meta goal metasenv in
   assert (hyps_pat = []); (*CSC: not implemented yet *)
   let context_len = List.length context in
-  let _,selected_terms_with_context =
-   ProofEngineHelpers.select ~metasenv ~conjecture ~pattern in
+  let subst,metasenv,u,_,selected_terms_with_context =
+   ProofEngineHelpers.select ~metasenv ~ugraph:CicUniv.empty_ugraph
+    ~conjecture ~pattern in
+  let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
+  let with_what, metasenv, u = with_what context metasenv u in
+  let with_what = CicMetaSubst.apply_subst subst with_what in
+  let pbo = CicMetaSubst.apply_subst subst pbo in
+  let pty = CicMetaSubst.apply_subst subst pty in
+  let status = (uri,metasenv,pbo,pty),goal in
   let ty_of_with_what,u =
    CicTypeChecker.type_of_aux'
     metasenv context with_what CicUniv.empty_ugraph in
@@ -175,7 +200,7 @@ let replace_tac ~pattern ~with_what =
             ~start:(
               P.cut_tac 
                (C.Appl [
-                 (C.MutInd (LibraryObjects.eq_URI, 0, [])) ;
+                 (C.MutInd (LibraryObjects.eq_URI (), 0, [])) ;
                  ty_of_with_what ; 
                  what ; 
                  with_what]))