diff options
| author | Maxence Guesdon <maxence.guesdon@inria.fr> | 2002-04-02 15:16:31 +0000 |
|---|---|---|
| committer | Maxence Guesdon <maxence.guesdon@inria.fr> | 2002-04-02 15:16:31 +0000 |
| commit | 786b610e5db3c48e145a25f54237a22f48845977 (patch) | |
| tree | 554551b48c1c1ba63383f49210dcf509f969c1c5 /ocamldoc/odoc_merge.ml | |
| parent | e3c3f8b66a3c7ed28253f11b348b706d988306af (diff) | |
affichage des types de classes, ajout des labels pour les paramètres (pour les classes seulement pour l'instant)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4577 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_merge.ml')
| -rw-r--r-- | ocamldoc/odoc_merge.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ocamldoc/odoc_merge.ml b/ocamldoc/odoc_merge.ml index aa01c77d3..ebe62945b 100644 --- a/ocamldoc/odoc_merge.ml +++ b/ocamldoc/odoc_merge.ml @@ -291,9 +291,9 @@ let rec merge_parameters param_mli param_ml = match (param_mli, param_ml) with ([], []) -> [] | (l, []) | ([], l) -> l - | (pi_mli :: li, pi_ml :: l) -> - (merge_param_info pi_mli pi_ml) :: merge_parameters li l - + | ((pi_mli, label) :: li, (pi_ml,_) :: l) -> + ((merge_param_info pi_mli pi_ml), label) :: merge_parameters li l + (** Merge of two t_class, one for a .mli, another for the .ml. The .mli class is completed with the information in the .ml class. *) let merge_classes merge_options mli ml = |