diff options
author | 2016-10-05 18:18:22 +0200 | |
---|---|---|
committer | 2016-10-05 18:18:22 +0200 | |
commit | 2dcd8f2e82366bb3b0f51a42426ccdfbb00281dc (patch) | |
tree | 4e9a44599dec13e262538e70a6a60bcf3e5fa97e /engine | |
parent | 01a448be0133872a686e613ab1034b4cb97cd666 (diff) | |
parent | 8114da3ba8a9b31ffe194e7f7f0239ecc2219b9c (diff) |
Merge branch 'v8.6'
Diffstat (limited to 'engine')
-rw-r--r-- | engine/termops.ml | 7 | ||||
-rw-r--r-- | engine/termops.mli | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/engine/termops.ml b/engine/termops.ml index b2c9492e1..5e65652c0 100644 --- a/engine/termops.ml +++ b/engine/termops.ml @@ -976,11 +976,8 @@ let smash_rel_context sign = let fold_named_context_both_sides f l ~init = List.fold_right_and_left f l init -let rec mem_named_context id ctxt = - match ctxt with - | decl :: _ when Id.equal id (NamedDecl.get_id decl) -> true - | _ :: sign -> mem_named_context id sign - | [] -> false +let mem_named_context_val id ctxt = + try Environ.lookup_named_val id ctxt; true with Not_found -> false let compact_named_context sign = let compact l decl = diff --git a/engine/termops.mli b/engine/termops.mli index a7f45d28a..7d6e99acc 100644 --- a/engine/termops.mli +++ b/engine/termops.mli @@ -237,7 +237,7 @@ val map_rel_context_with_binders : val fold_named_context_both_sides : ('a -> Context.Named.Declaration.t -> Context.Named.Declaration.t list -> 'a) -> Context.Named.t -> init:'a -> 'a -val mem_named_context : Id.t -> Context.Named.t -> bool +val mem_named_context_val : Id.t -> named_context_val -> bool val compact_named_context : Context.Named.t -> Context.Compacted.t val clear_named_body : Id.t -> env -> env |