Improve evar_map handling in tmMkDefinition and friends #1111
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes
#1108#1115.This PR fixes a bug in the implementation of the template monad. When modifying the global environment (
tmDefinitionRed
and friends), we currently ditch the old evar map and create a fresh one usingEvd.from_env
(see e.g.template-coq/run_template_monad.ml
, in the main loop, theTmDefinition
case).This is a problem since the evar map can contain evars and universes which are still used afterwards, and we discard them, leading to
Undeclared universe
errors e.g. when callingtmMkDefinition
multiple times.The fix is to replace :
by :
let evm = Evd.update_sigma_univs (Environ.universes env) evm
in the relevant places.