diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-05-16 00:06:51 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-05-28 15:28:24 +0200 |
| commit | 4552729b88058946055dddde1533057e25bfc5a9 (patch) | |
| tree | 38c4c1440c9aa03430b63da175663f96bcf668dd /engine | |
| parent | b053d98fb17d2f46878f49d7adf4839ae632c10b (diff) | |
Unify pre_env and env
We now have only two notions of environments in the kernel: env and
safe_env.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/eConstr.ml | 2 | ||||
| -rw-r--r-- | engine/evarutil.ml | 1 | ||||
| -rw-r--r-- | engine/termops.ml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/engine/eConstr.ml b/engine/eConstr.ml index f1530b2d1..6810626ad 100644 --- a/engine/eConstr.ml +++ b/engine/eConstr.ml @@ -783,7 +783,7 @@ let of_existential : Constr.existential -> existential = let lookup_rel i e = cast_rel_decl (sym unsafe_eq) (lookup_rel i e) let lookup_named n e = cast_named_decl (sym unsafe_eq) (lookup_named n e) -let lookup_named_val n e = cast_named_decl (sym unsafe_eq) (lookup_named_val n e) +let lookup_named_val n e = cast_named_decl (sym unsafe_eq) (lookup_named_ctxt n e) let map_rel_context_in_env f env sign = let rec aux env acc = function diff --git a/engine/evarutil.ml b/engine/evarutil.ml index 38ceed569..afedfe180 100644 --- a/engine/evarutil.ml +++ b/engine/evarutil.ml @@ -13,7 +13,6 @@ open Util open Names open Term open Constr -open Pre_env open Environ open Evd open Termops diff --git a/engine/termops.ml b/engine/termops.ml index 053fcc3db..04fdad670 100644 --- a/engine/termops.ml +++ b/engine/termops.ml @@ -1374,7 +1374,7 @@ let smash_rel_context sign = let fold_named_context_both_sides f l ~init = List.fold_right_and_left f l init let mem_named_context_val id ctxt = - try ignore(Environ.lookup_named_val id ctxt); true with Not_found -> false + try ignore(Environ.lookup_named_ctxt id ctxt); true with Not_found -> false let map_rel_decl f = function | RelDecl.LocalAssum (id, t) -> RelDecl.LocalAssum (id, f t) |