diff options
| author | letouzey | 2013-08-20 08:22:42 +0000 |
|---|---|---|
| committer | letouzey | 2013-08-20 08:22:42 +0000 |
| commit | fac949450909b5ef17078f220ae809cf54ae3f08 (patch) | |
| tree | faf5fd79415c5282766c2cdea79624b276b31774 /kernel/environ.ml | |
| parent | 6f53ffee4a1c85ac07e82c65d31de0d2a367566b (diff) | |
Safe_typing code refactoring
- No more modinfo sub-record in the safe_environment record,
this was a syntactic pain.
senv.modinfo.modpath --> senv.modpath
senv.modinfo.variant --> senv.modvariant
senv.modinfo.resolver --> senv.modresolver
senv.modinfo.resolver_of_param --> senv.paramresolver
senv.modinfo.label : removed (can be inferred from modpath)
- No more systematic chaining of safe_environment ('old' field).
Instead, earlier safe_environment is stored in the modvariant field
when necessary (STRUCT and SIG case).
- Improved sharing between end_module and end_modtype
- More qualified names instead of open, better comments, ...
- Some user errors are now checked earlier elsewhere (see for
instance vernac_end_segment), so we can turn these errors into
asserts. The user error about higher-order include is now algebraic.
- Highlight the idea of a state monad in Safe_typing :
type 'a safe_transformer = safe_environment -> 'a * safe_environment
More systematic code in Global, thanks to 'globalize' function.
- Declaremods : less informations stored in openmod_info
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16708 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'kernel/environ.ml')
| -rw-r--r-- | kernel/environ.ml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel/environ.ml b/kernel/environ.ml index 4a3e51aa14..8a4871a1dc 100644 --- a/kernel/environ.ml +++ b/kernel/environ.ml @@ -275,18 +275,16 @@ let keep_hyps env needed = (* Modules *) -let add_modtype ln mtb env = - let new_modtypes = MPmap.add ln mtb env.env_globals.env_modtypes in - let new_globals = - { env.env_globals with - env_modtypes = new_modtypes } in +let add_modtype mtb env = + let mp = mtb.typ_mp in + let new_modtypes = MPmap.add mp mtb env.env_globals.env_modtypes in + let new_globals = { env.env_globals with env_modtypes = new_modtypes } in { env with env_globals = new_globals } -let shallow_add_module mp mb env = +let shallow_add_module mb env = + let mp = mb.mod_mp in let new_mods = MPmap.add mp mb env.env_globals.env_modules in - let new_globals = - { env.env_globals with - env_modules = new_mods } in + let new_globals = { env.env_globals with env_modules = new_mods } in { env with env_globals = new_globals } let lookup_module mp env = |