Two bugs fixed in the apply tactic:

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

diff --git a/helm/ocaml/tactics/equalityTactics.ml b/helm/ocaml/tactics/equalityTactics.ml
index a14a418bf5326808d8569b40e15b121468f0ab4b..c56d3de2d75af9c4566d19a98ff568104c4d4699 100644 (file)
--- a/helm/ocaml/tactics/equalityTactics.ml
+++ b/helm/ocaml/tactics/equalityTactics.ml
@@ -47,7 +47,7 @@ let rewrite_tac ~direction ~pattern equality =
       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
+    (ProofEngineHelpers.new_meta_of_proof proof) metasenv context ty_eq 0 in
   let equality =
    if List.length arguments = 0 then
     equality
@@ -71,7 +71,9 @@ let rewrite_tac ~direction ~pattern equality =
   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 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:metasenv' ~ugraph ~conjecture:lifted_conjecture
@@ -140,6 +142,7 @@ let replace_tac ~pattern ~with_what =
    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