diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-02-12 10:17:08 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-02-12 10:17:08 +0100 |
| commit | f593be83d8f53857ae5dac9adc293c86fd9fe0bc (patch) | |
| tree | a811de06eb8883e66ee23e6464ca28d091aa8df1 /interp | |
| parent | ab52b106915e00130ba593122595af155b7928ba (diff) | |
| parent | 91597060c0919489a29c31bc60b6ae0d754ef09b (diff) | |
Merge PR #6128: Simplification: cumulativity information is variance information.
Diffstat (limited to 'interp')
| -rw-r--r-- | interp/declare.ml | 7 | ||||
| -rw-r--r-- | interp/discharge.ml | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/interp/declare.ml b/interp/declare.ml index 55f825c25..72cdabfd2 100644 --- a/interp/declare.ml +++ b/interp/declare.ml @@ -364,13 +364,8 @@ let infer_inductive_subtyping (pth, mind_ent) = | Cumulative_ind_entry cumi -> begin let env = Global.env () in - let env' = - Environ.push_context - (Univ.CumulativityInfo.univ_context cumi) env - in (* let (env'', typed_params) = Typeops.infer_local_decls env' (mind_ent.mind_entry_params) in *) - let evd = Evd.from_env env' in - (pth, Inductiveops.infer_inductive_subtyping env' evd mind_ent) + (pth, InferCumulativity.infer_inductive env mind_ent) end type inductive_obj = Dischargedhypsmap.discharged_hyps * mutual_inductive_entry diff --git a/interp/discharge.ml b/interp/discharge.ml index 75bfca307..710f88c3f 100644 --- a/interp/discharge.ml +++ b/interp/discharge.ml @@ -92,7 +92,7 @@ let process_inductive info modlist mib = let auctx = Univ.ACumulativityInfo.univ_context cumi in let subst, auctx = Lib.discharge_abstract_universe_context info auctx in let auctx = Univ.AUContext.repr auctx in - subst, Cumulative_ind_entry (Universes.univ_inf_ind_from_universe_context auctx) + subst, Cumulative_ind_entry (Univ.CumulativityInfo.from_universe_context auctx) in let discharge c = Vars.subst_univs_level_constr subst (expmod_constr modlist c) in let inds = |