diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/mod_typing.ml | 10 | ||||
| -rw-r--r-- | kernel/modops.ml | 3 | ||||
| -rw-r--r-- | kernel/modops.mli | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/kernel/mod_typing.ml b/kernel/mod_typing.ml index 7417b42619..8fee8481d7 100644 --- a/kernel/mod_typing.ml +++ b/kernel/mod_typing.ml @@ -108,7 +108,15 @@ and merge_with env mtb with_decl = | _ -> error_not_a_module (string_of_label l) in let mtb = type_modpath env' mp in - (* here, we should assert that there is no msid in mtb *) + (* here, using assertions in substitutions, + we check that there is no msid bound in mtb *) + begin + try + let _ = subst_modtype (map_msid msid (MPself msid)) mtb in + () + with + Assert_failure _ -> error_circular_with_module id + end; let cst = check_subtypes env' mtb old.msb_modtype in let equiv = match old.msb_equiv with diff --git a/kernel/modops.ml b/kernel/modops.ml index ec25459a9f..c194a6c712 100644 --- a/kernel/modops.ml +++ b/kernel/modops.ml @@ -74,6 +74,9 @@ let error_local_context lo = error ("The local context of the component "^ (string_of_label l)^" is not empty") +let error_circular_with_module l = + error ("The construction \"with Module "^(string_of_id l)^":=...\" is about to create\na circular module type. Their resolution is not implemented yet.\nIf you really need that feature, please report.") + let rec scrape_modtype env = function | MTBident kn -> scrape_modtype env (lookup_modtype kn env) | mtb -> mtb diff --git a/kernel/modops.mli b/kernel/modops.mli index aaff572235..1391380b19 100644 --- a/kernel/modops.mli +++ b/kernel/modops.mli @@ -92,3 +92,5 @@ val error_not_a_constant : label -> 'a val error_with_incorrect : label -> 'a val error_local_context : label option -> 'a + +val error_circular_with_module : identifier -> 'a |