diff options
| author |  ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-18 18:05:56 +0000 |
|---|---|---|
| committer | ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-18 18:05:56 +0000 |
| commit | 6946bbbf2390024b3ded7654814104e709cce755 (patch) | |
| tree | 643429de27ef09026b937c18a55075eb49b11fee /checker | |
| parent | aa37087b8e7151ea96321a11012c1064210ef4ea (diff) | |
Modulification of mod_bound_id
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16098 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'checker')
| -rw-r--r-- | checker/declarations.ml | 4 | ||||
| -rw-r--r-- | checker/declarations.mli | 6 | ||||
| -rw-r--r-- | checker/indtypes.ml | 4 | ||||
| -rw-r--r-- | checker/modops.mli | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/checker/declarations.ml b/checker/declarations.ml index 7e368dcad..c74c95dff 100644 --- a/checker/declarations.ml +++ b/checker/declarations.ml @@ -58,7 +58,7 @@ let empty_delta_resolver = Deltamap.empty module MBImap = Map.Make (struct - type t = mod_bound_id + type t = MBId.t let compare = Pervasives.compare end) @@ -758,7 +758,7 @@ and structure_body = (label * structure_field_body) list and struct_expr_body = | SEBident of module_path - | SEBfunctor of mod_bound_id * module_type_body * struct_expr_body + | SEBfunctor of MBId.t * module_type_body * struct_expr_body | SEBapply of struct_expr_body * struct_expr_body * Univ.constraints | SEBstruct of structure_body | SEBwith of struct_expr_body * with_declaration_body diff --git a/checker/declarations.mli b/checker/declarations.mli index c14d8b73a..ad234a3f5 100644 --- a/checker/declarations.mli +++ b/checker/declarations.mli @@ -185,7 +185,7 @@ and structure_body = (label * structure_field_body) list and struct_expr_body = | SEBident of module_path - | SEBfunctor of mod_bound_id * module_type_body * struct_expr_body + | SEBfunctor of MBId.t * module_type_body * struct_expr_body | SEBapply of struct_expr_body * struct_expr_body * Univ.constraints | SEBstruct of structure_body | SEBwith of struct_expr_body * with_declaration_body @@ -215,9 +215,9 @@ and module_type_body = type 'a subst_fun = substitution -> 'a -> 'a val empty_subst : substitution -val add_mbid : mod_bound_id -> module_path -> substitution -> substitution +val add_mbid : MBId.t -> module_path -> substitution -> substitution val add_mp : module_path -> module_path -> substitution -> substitution -val map_mbid : mod_bound_id -> module_path -> substitution +val map_mbid : MBId.t -> module_path -> substitution val map_mp : module_path -> module_path -> substitution val mp_in_delta : module_path -> delta_resolver -> bool val mind_of_delta : delta_resolver -> mutual_inductive -> mutual_inductive diff --git a/checker/indtypes.ml b/checker/indtypes.ml index d354eb8c4..285be1bc9 100644 --- a/checker/indtypes.ml +++ b/checker/indtypes.ml @@ -20,12 +20,12 @@ open Environ let rec debug_string_of_mp = function | MPfile sl -> Dir_path.to_string sl - | MPbound uid -> "bound("^string_of_mbid uid^")" + | MPbound uid -> "bound("^MBId.to_string uid^")" | MPdot (mp,l) -> debug_string_of_mp mp ^ "." ^ Label.to_string l let rec string_of_mp = function | MPfile sl -> Dir_path.to_string sl - | MPbound uid -> string_of_mbid uid + | MPbound uid -> MBId.to_string uid | MPdot (mp,l) -> string_of_mp mp ^ "." ^ Label.to_string l let string_of_mp mp = diff --git a/checker/modops.mli b/checker/modops.mli index 2a7899f80..ef3bb6fd2 100644 --- a/checker/modops.mli +++ b/checker/modops.mli @@ -23,7 +23,7 @@ val module_type_of_module : module_path option -> module_body -> module_type_body val destr_functor : - env -> struct_expr_body -> mod_bound_id * module_type_body * struct_expr_body + env -> struct_expr_body -> MBId.t * module_type_body * struct_expr_body val add_signature : module_path -> structure_body -> delta_resolver -> env -> env |