Fusion des modifs de la branche release308 entre 3.08.0 et 3.08.1

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6612 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 24 insertions, 0 deletions

diff --git a/ocamldoc/odoc_str.ml b/ocamldoc/odoc_str.ml
index de82a9e46..c36d4b957 100644
--- a/ocamldoc/odoc_str.ml
+++ b/ocamldoc/odoc_str.ml
@@ -115,6 +115,30 @@ let string_of_class_type_param_list l =
     )
     (if par then "]" else "")
 
+let string_of_class_params c =
+  let b = Buffer.create 256 in
+  let rec iter = function
+      Types.Tcty_fun (label, t, ctype) ->
+	Printf.bprintf b "%s%s -> "
+	  (
+	   match label with
+	     "" -> ""
+	   | s -> s^":"
+	  )
+	  (Odoc_print.string_of_type_expr
+	     (if Odoc_misc.is_optional label then
+	       Odoc_misc.remove_option t
+	     else
+	       t
+	     )
+	  );
+	iter ctype
+    | Types.Tcty_signature _ 
+    | Types.Tcty_constr _ -> ()
+  in
+  iter c.Odoc_class.cl_type;
+  Buffer.contents b
+
 let string_of_type t =
   let module M = Odoc_type in
   "type "^