diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-09-30 13:54:59 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-09-30 13:54:59 +0000 |
| commit | 5f68db9cf0abc36fd0e392e5bc3d426cb6ae7784 (patch) | |
| tree | 9084e2861ff435ced1f15bf1b3dca7effc129109 /ocamldoc/odoc_env.ml | |
| parent | 4c5e9bbe6b98d6138f7943f7b017fbd411f109c8 (diff) | |
| parent | cc31694f7ca1043080fc290e5a82520513cf7f94 (diff) | |
Merge trunk at revision 14200. Now everything works except private types
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/module-alias@14201 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_env.ml')
| -rw-r--r-- | ocamldoc/odoc_env.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ocamldoc/odoc_env.ml b/ocamldoc/odoc_env.ml index d6a595bd7..7a9c86edd 100644 --- a/ocamldoc/odoc_env.ml +++ b/ocamldoc/odoc_env.ml @@ -53,9 +53,9 @@ let rec add_signature env root ?rel signat = 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_module (ident, modtype, _) -> + | Types.Sig_module (ident, md, _) -> let env2 = - match modtype with (* A VOIR : le cas ou c'est un identificateur, dans ce cas on n'a pas de signature *) + match md.Types.md_type with (* A VOIR : le cas ou c'est un identificateur, dans ce cas on n'a pas de signature *) Types.Mty_signature s -> add_signature env (qualify ident) ~rel: (rel_name ident) s | _ -> env in |