- Fixing bug #2084 (unification not checking sort constraints), hoping

  it does not cause a time penalty.
- Removing of get_type_of_with_meta made possible by the
  evar_defs/evar_map merge.
- Adding unfolding of Meta in reductionops (this assumes that reduction does
  not move Metas across binders...)
- Renaming newly created fold_map_rel_context into map_rel_context_in_env.



git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12061 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 3 insertions, 4 deletions

diff --git a/pretyping/clenv.ml b/pretyping/clenv.ml
index 05c64521a1..69b5db5e63 100644
--- a/pretyping/clenv.ml
+++ b/pretyping/clenv.ml
@@ -62,8 +62,7 @@ let clenv_type clenv = meta_instance clenv.evd clenv.templtyp
 
 let clenv_hnf_constr ce t = hnf_constr (cl_env ce) (cl_sigma ce) t
 
-let clenv_get_type_of ce c =
-  Retyping.get_type_of_with_meta (cl_env ce) (cl_sigma ce) (metas_of ce.evd) c
+let clenv_get_type_of ce c = Retyping.get_type_of (cl_env ce) (cl_sigma ce) c
 
 exception NotExtensibleClause
 
@@ -135,10 +134,10 @@ let clenv_conv_leq env sigma t c bound =
 
 let mk_clenv_from_env environ sigma n (c,cty) =
   let evd = create_goal_evar_defs sigma in
-  let (env,args,concl) = clenv_environments evd n cty in
+  let (evd,args,concl) = clenv_environments evd n cty in
   { templval = mk_freelisted (match args with [] -> c | _ -> applist (c,args));
     templtyp = mk_freelisted concl;
-    evd = env;
+    evd = evd;
     env = environ }
 
 let mk_clenv_from_n gls n (c,cty) =