1. PrimitiveTactics.new_metasenv_for_apply changed a little bit, moved to

[helm.git] / helm / ocaml / tactics / equalityTactics.ml

diff --git a/helm/ocaml/tactics/equalityTactics.ml b/helm/ocaml/tactics/equalityTactics.ml
index e4520292df8b9a9e7c489c1cf1876d77caaefb0a..4a6c445e6e359702300d291c246bb6c30b89b3ef 100644 (file)
--- 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 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]
@@ -65,9 +72,10 @@ let rewrite_tac ~direction ~pattern equality =
   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 subst,metasenv,ugraph,_,selected_terms_with_context =
    ProofEngineHelpers.select
-    ~metasenv ~conjecture:lifted_conjecture ~pattern:lifted_pattern in
+    ~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,8 +86,11 @@ 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 pred = C.Lambda (fresh_name, ty, abstr_gty) in
@@ -110,6 +121,7 @@ let rewrite_simpl_tac ~direction ~pattern equality =
 ;;
 
 let replace_tac ~pattern ~with_what =
+(*
  let replace_tac ~pattern:(wanted,hyps_pat,concl_pat) ~with_what status =
   let (proof, goal) = status in
   let module C = Cic in
@@ -206,6 +218,7 @@ let replace_tac ~pattern ~with_what =
    aux 0 whats status
  in
    ProofEngineTypes.mk_tactic (replace_tac ~pattern ~with_what)
+*) assert false
 ;;