diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-10-26 16:22:35 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-10-26 16:22:35 +0000 |
| commit | 2c8ad1f81c486115fad58553ed15e775ca50de87 (patch) | |
| tree | 5c2c4ef953ffdf7876ee8618b8bae713b7016a95 /checker/environ.mli | |
| parent | cf21be5bfd42720bd1cc8756cfcdb388cdaebd80 (diff) | |
Checker/subtyping.ml: avoid adding in env a module already there (fix #2609)
When doing a [check_subtypes env mtb1 mtb2], we used to always add [mtb1]
in the environment. But since the stricter checks of commit r14150, this
is an error if the environment already knows [mtb1] (for instance
when doing (F M) and checking that M is compatible with the type of the
arg of F.
[check_subtypes] now expect [mtb1] to be already in env, and we move the
add_module to the unique call site of this function that requires it.
Moreover, we solve a second issue : when subtyping a functor, we
update the environment once inside the functor, and this is also
refused by the checks of commits r14150. So we first remove the module
name from the env before doing the update. Since the module added
earlier was a functor, there is no inner defs to chase in env.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14615 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'checker/environ.mli')
| -rw-r--r-- | checker/environ.mli | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/checker/environ.mli b/checker/environ.mli index add7c7060..628febbb0 100644 --- a/checker/environ.mli +++ b/checker/environ.mli @@ -69,5 +69,6 @@ val add_modtype : module_path -> Declarations.module_type_body -> env -> env val shallow_add_module : module_path -> Declarations.module_body -> env -> env +val shallow_remove_module : module_path -> env -> env val lookup_module : module_path -> env -> Declarations.module_body val lookup_modtype : module_path -> env -> Declarations.module_type_body |