Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt to coq/coq#19620 (Global.push_context_set no strict argument) #1104

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Draft

Adapt to coq/coq#19620 (Global.push_context_set no strict argument) #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template-coq/src/plugin_core.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ let tmInductive (infer_univs : bool) (mie : mutual_inductive_entry) : unit tm =
if infer_univs then
let evm = Evd.from_env env in
let ctx, mie = Tm_util.RetypeMindEntry.infer_mentry_univs env evm mie in
Global.push_context_set ~strict:true ctx; mie
Global.push_context_set ctx; mie
else mie
in
let names = (UState.Monomorphic_entry Univ.ContextSet.empty, UnivNames.empty_binders) in
Expand Down
4 changes: 2 additions & 2 deletions template-coq/src/run_template_monad.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,12 @@ let declare_inductive (env: Environ.env) (evm: Evd.evar_map) (infer_univs : bool
let mind = reduce_all env evm mind in
let evm' = Evd.from_env env in
let evm', ctx, mind = unquote_mutual_inductive_entry env evm' mind in
let () = Global.push_context_set ~strict:true ctx in
let () = Global.push_context_set ctx in
let evm, mind =
if infer_univs then
let ctx, mind = Tm_util.RetypeMindEntry.infer_mentry_univs env evm' mind in
debug (fun () -> Pp.(str "Declaring universe context " ++ Univ.pr_universe_context_set UnivNames.pr_level_with_global_universes ctx));
Global.push_context_set ~strict:true ctx;
Global.push_context_set ctx;
Evd.merge_context_set Evd.UnivRigid evm ctx, mind
else evm, mind
in
Expand Down
Loading