diff options
| author | Pierre-Marie Pédrot | 2020-04-30 14:10:16 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-04-30 14:10:16 +0200 |
| commit | d436c45a19de2f91aad94f492b547225f8c5b305 (patch) | |
| tree | b666e829b6545ba38170dcf79276714dd89cbe32 /checker | |
| parent | 010ef152611977770fa137ed5980205d412febe5 (diff) | |
| parent | 7a4e7dfbaa8dc3fa92931c4bfa39d268940e08f8 (diff) | |
Merge PR #12107: Remove mod_constraints field of module body
Reviewed-by: ppedrot
Diffstat (limited to 'checker')
| -rw-r--r-- | checker/mod_checking.ml | 1 | ||||
| -rw-r--r-- | checker/safe_checking.ml | 2 | ||||
| -rw-r--r-- | checker/values.ml | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/checker/mod_checking.ml b/checker/mod_checking.ml index 8fd81d43be..2f795ff8d9 100644 --- a/checker/mod_checking.ml +++ b/checker/mod_checking.ml @@ -77,7 +77,6 @@ let mk_mtb mp sign delta = mod_expr = (); mod_type = sign; mod_type_alg = None; - mod_constraints = Univ.ContextSet.empty; mod_delta = delta; mod_retroknowledge = ModTypeRK; } diff --git a/checker/safe_checking.ml b/checker/safe_checking.ml index 524ffbc022..b5beab532e 100644 --- a/checker/safe_checking.ml +++ b/checker/safe_checking.ml @@ -14,7 +14,7 @@ open Environ let import senv clib univs digest = let mb = Safe_typing.module_of_library clib in let env = Safe_typing.env_of_safe_env senv in - let env = push_context_set ~strict:true mb.mod_constraints env in + let env = push_context_set ~strict:true (Safe_typing.univs_of_library clib) env in let env = push_context_set ~strict:true univs env in let env = Modops.add_retroknowledge mb.mod_retroknowledge env in Mod_checking.check_module env mb.mod_mp mb; diff --git a/checker/values.ml b/checker/values.ml index 9bd381e4a9..76e3ab0d45 100644 --- a/checker/values.ml +++ b/checker/values.ml @@ -359,17 +359,17 @@ and v_impl = and v_noimpl = v_unit and v_module = Tuple ("module_body", - [|v_mp;v_impl;v_sign;Opt v_mexpr;v_context_set;v_resolver;v_retroknowledge|]) + [|v_mp;v_impl;v_sign;Opt v_mexpr;v_resolver;v_retroknowledge|]) and v_modtype = Tuple ("module_type_body", - [|v_mp;v_noimpl;v_sign;Opt v_mexpr;v_context_set;v_resolver;v_unit|]) + [|v_mp;v_noimpl;v_sign;Opt v_mexpr;v_resolver;v_unit|]) (** kernel/safe_typing *) let v_vodigest = Sum ("module_impl",0, [| [|String|]; [|String;String|] |]) let v_deps = Array (v_tuple "dep" [|v_dp;v_vodigest|]) let v_compiled_lib = - v_tuple "compiled" [|v_dp;v_module;v_deps;v_engagement;Any|] + v_tuple "compiled" [|v_dp;v_module;v_context_set;v_deps;v_engagement;Any|] (** Library objects *) |