merge changes from 4.00 branching to 4.00.0 (part 1)

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

1 files changed, 9 insertions, 4 deletions

diff --git a/ocamldoc/odoc_test.ml b/ocamldoc/odoc_test.ml
index 7b455f45b..a903b1c15 100644
--- a/ocamldoc/odoc_test.ml
+++ b/ocamldoc/odoc_test.ml
@@ -22,12 +22,13 @@ type test_kind =
 
 let p = Format.fprintf
 
-module Generator =
+module Generator (G : Odoc_gen.Base) =
 struct
-class string_gen =
+  class string_gen =
   object(self)
     inherit Odoc_info.Scan.scanner
 
+
     val mutable test_kinds = []
     val mutable fmt = Format.str_formatter
 
@@ -111,8 +112,12 @@ class string_gen =
   class generator =
     let g = new string_gen in
     object
-      method generate = g#generate
+      inherit G.generator as base
+
+      method generate l =
+        base#generate l;
+        g#generate l
     end
 end;;
 
-let _ = Odoc_args.set_generator (Odoc_gen.Other (module Generator : Odoc_gen.Base))
+let _ = Odoc_args.extend_base_generator (module Generator : Odoc_gen.Base_functor);;