diff options
| author | Pierre-Marie Pédrot | 2015-10-06 17:51:57 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-10-06 17:51:57 +0200 |
| commit | c4db6fc1086d984fd983ff9a6797ad108d220b98 (patch) | |
| tree | cb57e5b678218e2baad13184544e645fd2e22cf5 /engine/evd.ml | |
| parent | 944c8de0bfe4048e0733a487e6388db4dfc9075a (diff) | |
| parent | 840155eafd9607c7656c80770de1e2819fe56a13 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'engine/evd.ml')
| -rw-r--r-- | engine/evd.ml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engine/evd.ml b/engine/evd.ml index 574be9844a..cd0b52ecaa 100644 --- a/engine/evd.ml +++ b/engine/evd.ml @@ -312,7 +312,10 @@ let union_evar_universe_context ctx ctx' = let names = UNameMap.union (fst ctx.uctx_names) (fst ctx'.uctx_names) in let newus = Univ.LSet.diff (Univ.ContextSet.levels ctx'.uctx_local) (Univ.ContextSet.levels ctx.uctx_local) in - let declarenew g = Univ.LSet.fold (fun u g -> Univ.add_universe u false g) newus g in + let newus = Univ.LSet.diff newus (Univ.LMap.domain ctx.uctx_univ_variables) in + let declarenew g = + Univ.LSet.fold (fun u g -> Univ.add_universe u false g) newus g + in let names_rev = Univ.LMap.union (snd ctx.uctx_names) (snd ctx'.uctx_names) in { uctx_names = (names, names_rev); uctx_local = local; |
