diff options
| author | Alain Frisch <alain@frisch.fr> | 2013-09-27 15:04:03 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2013-09-27 15:04:03 +0000 |
| commit | c0778758c1bc167ac0f9d5725bb886bc26540bc9 (patch) | |
| tree | 19498d644e5eddc22f3852c5a7d42b66825af161 /ocamldoc | |
| parent | ef38d679df471402ae327305daddc7b05c1c0fce (diff) | |
| download | ocaml-c0778758c1bc167ac0f9d5725bb886bc26540bc9.tar.gz | |
Keep attributes/locs for class type declarations and class declarations in Types. Renaming cty -> csig prefix for class signatures to be coherent with Typedtree.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14194 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc')
| -rw-r--r-- | ocamldoc/odoc_print.ml | 8 | ||||
| -rw-r--r-- | ocamldoc/odoc_sig.ml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ocamldoc/odoc_print.ml b/ocamldoc/odoc_print.ml index d09bc93249..aa6dea1281 100644 --- a/ocamldoc/odoc_print.ml +++ b/ocamldoc/odoc_print.ml @@ -84,11 +84,11 @@ let simpl_class_type t = (* on vire les vals et methods pour ne pas qu'elles soient imprimees quand on affichera le type *) let tnil = { Types.desc = Types.Tnil ; Types.level = 0; Types.id = 0 } in - Types.Cty_signature { Types.cty_self = { cs.Types.cty_self with + Types.Cty_signature { Types.csig_self = { cs.Types.csig_self with Types.desc = Types.Tobject (tnil, ref None) }; - Types.cty_vars = Types.Vars.empty ; - Types.cty_concr = Types.Concr.empty ; - Types.cty_inher = [] + csig_vars = Types.Vars.empty ; + csig_concr = Types.Concr.empty ; + csig_inher = [] } | Types.Cty_arrow (l, texp, ct) -> let new_ct = iter ct in diff --git a/ocamldoc/odoc_sig.ml b/ocamldoc/odoc_sig.ml index 0cd837399b..615627ad0f 100644 --- a/ocamldoc/odoc_sig.ml +++ b/ocamldoc/odoc_sig.ml @@ -106,11 +106,11 @@ module Signature_search = | _ -> assert false let search_attribute_type name class_sig = - let (_, _, type_expr) = Types.Vars.find name class_sig.Types.cty_vars in + let (_, _, type_expr) = Types.Vars.find name class_sig.Types.csig_vars in type_expr let search_method_type name class_sig = - let fields = Odoc_misc.get_fields class_sig.Types.cty_self in + let fields = Odoc_misc.get_fields class_sig.Types.csig_self in List.assoc name fields end |