diff options
Diffstat (limited to 'ocamldoc/odoc_env.ml')
| -rw-r--r-- | ocamldoc/odoc_env.ml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ocamldoc/odoc_env.ml b/ocamldoc/odoc_env.ml index 02d1e3a21..3e0590585 100644 --- a/ocamldoc/odoc_env.ml +++ b/ocamldoc/odoc_env.ml @@ -26,7 +26,7 @@ type env = { env_classes : env_element list ; env_modules : env_element list ; env_module_types : env_element list ; - env_exceptions : env_element list ; + env_extensions : env_element list ; } let empty = { @@ -36,7 +36,7 @@ let empty = { env_classes = [] ; env_modules = [] ; env_module_types = [] ; - env_exceptions = [] ; + env_extensions = [] ; } (** Add a signature to an environment. *) @@ -52,7 +52,7 @@ let rec add_signature env root ?rel signat = match item with Types.Sig_value (ident, _) -> { env with env_values = (rel_name ident, qualify ident) :: env.env_values } | Types.Sig_type (ident,_,_) -> { env with env_types = (rel_name ident, qualify ident) :: env.env_types } - | Types.Sig_exception (ident, _) -> { env with env_exceptions = (rel_name ident, qualify ident) :: env.env_exceptions } + | Types.Sig_typext (ident, _, _) -> { env with env_extensions = (rel_name ident, qualify ident) :: env.env_extensions } | Types.Sig_module (ident, md, _) -> let env2 = match md.Types.md_type with (* A VOIR : le cas ou c'est un identificateur, dans ce cas on n'a pas de signature *) @@ -77,9 +77,9 @@ let rec add_signature env root ?rel signat = in List.fold_left f env signat -let add_exception env full_name = +let add_extension env full_name = let simple_name = Name.simple full_name in - { env with env_exceptions = (simple_name, full_name) :: env.env_exceptions } + { env with env_extensions = (simple_name, full_name) :: env.env_extensions } let add_type env full_name = let simple_name = Name.simple full_name in @@ -146,11 +146,11 @@ let full_value_name env n = try List.assoc n env.env_values with Not_found -> n -let full_exception_name env n = - try List.assoc n env.env_exceptions +let full_extension_constructor_name env n = + try List.assoc n env.env_extensions with Not_found -> - print_DEBUG ("Exception "^n^" not found with env="); - List.iter (fun (sn, fn) -> print_DEBUG ("("^sn^", "^fn^")")) env.env_exceptions; + print_DEBUG ("Extension "^n^" not found with env="); + List.iter (fun (sn, fn) -> print_DEBUG ("("^sn^", "^fn^")")) env.env_extensions; n let full_class_name env n = |