implemented normalize (used in new_metasenv_for_apply)

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

diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml
index b0159afe5dea45f7d299ee4d17dd7cc37b786225..5b3e47fba02540d96cacb67138b0eb9a78d955df 100644 (file)
--- a/helm/ocaml/tactics/primitiveTactics.ml
+++ b/helm/ocaml/tactics/primitiveTactics.ml
@@ -170,7 +170,7 @@ let new_metasenv_for_apply newmeta proof context ty =
  let module C = Cic in
  let module S = CicSubstitution in
   let rec aux newmeta ty =
-   let ty' = (*CicReduction.whd context*) ty in 
+   let ty' = ty in
    match ty' with
       C.Cast (he,_) -> aux newmeta he
 (* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type
@@ -199,8 +199,9 @@ let new_metasenv_for_apply newmeta proof context ty =
          let (res,newmetasenv,arguments,lastmeta) =
           aux (newmeta + 1) (S.subst newargument t)
          in
-          res,(newmeta,context,s)::newmetasenv,newargument::arguments,lastmeta
-    | t -> t,[],[],newmeta
+         let s' = CicReduction.normalize ~delta:false context s in
+          res,(newmeta,context,s')::newmetasenv,newargument::arguments,lastmeta
+    | t -> (CicReduction.normalize ~delta:false context t),[],[],newmeta
   in
    (* WARNING: here we are using the invariant that above the most *)
    (* recente new_meta() there are no used metas.                  *)
@@ -326,6 +327,8 @@ let apply_tac_verbose ~term (proof, goal) =
    let termty =
      CicSubstitution.subst_vars exp_named_subst_diff termty
    in
+   prerr_endline ("term:" ^ CicPp.ppterm term);
+   prerr_endline ("termty:" ^ CicPp.ppterm termty);
    let subst,newmetasenv',t = 
      try
        new_metasenv_and_unify_and_t newmeta' metasenv' proof context term' ty
@@ -343,6 +346,7 @@ let apply_tac_verbose ~term (proof, goal) =
    in
    let bo' = apply_subst t in
    let newmetasenv'' = new_uninstantiatedmetas@old_uninstantiatedmetas in
+(*    prerr_endline ("me: " ^ CicMetaSubst.ppmetasenv newmetasenv'' subst); *)
    let subst_in =
      (* if we just apply the subtitution, the type is irrelevant:
              we may use Implicit, since it will be dropped *)