add option -no-module-constraint-filter for PR#4588

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

Author: zoggy

ocamldoc/odoc_args.ml

@@ -108,6 +108,8 @@ let keep_code = ref false
 
 let inverse_merge_ml_mli = ref false
 
+let filter_with_module_constraints = ref true
+
 let title = ref (None : string option)
 
 let intro_file = ref (None : string option)
@@ -229,6 +231,9 @@ let options = ref [
   "-no-custom-tags", Arg.Set no_custom_tags, M.no_custom_tags ;
   "-stars", Arg.Set remove_stars, M.remove_stars ;
   "-inv-merge-ml-mli", Arg.Set inverse_merge_ml_mli, M.inverse_merge_ml_mli ;
+  "-no-module-constraint-filter", Arg.Clear filter_with_module_constraints,
+  M.no_filter_with_module_constraints ;
+
   "-keep-code", Arg.Set keep_code, M.keep_code^"\n" ;
 
   "-dump", Arg.String (fun s -> dump := Some s), M.dump ;

ocamldoc/odoc_args.mli

@@ -69,6 +69,9 @@ val keep_code : bool ref
 (** To inverse implementation and interface files when merging. *)
 val inverse_merge_ml_mli : bool ref
 
+(** To filter module elements according to module type constraints. *)
+val filter_with_module_constraints : bool ref
+
 (** The optional title to use in the generated documentation. *)
 val title : string option ref
 

ocamldoc/odoc_ast.ml

@@ -1617,7 +1617,8 @@ module Analyser =
               p_modtype tt_modtype
           in
           let tt_modtype = Odoc_env.subst_module_type env tt_modtype in
-          filter_module_with_module_type_constraint m_base2 tt_modtype;
+          if !Odoc_args.filter_with_module_constraints then
+            filter_module_with_module_type_constraint m_base2 tt_modtype;
           {
             m_base with
             m_type = tt_modtype ;

ocamldoc/odoc_info.mli

@@ -945,6 +945,12 @@ module Args :
       (** The optional title to use in the generated documentation. *)
       val title : string option ref
 
+      (** To inverse [.ml] and [.mli] files while merging comments. *)
+      val inverse_merge_ml_mli : bool ref
+
+      (** To filter module elements according to module type constraints. *)
+      val filter_with_module_constraints : bool ref
+
       (** To keep the code while merging, when we have both .ml and .mli files for a module. *)
       val keep_code : bool ref
 

ocamldoc/odoc_messages.ml

@@ -167,6 +167,7 @@ let no_custom_tags = "\n\t\tDo not allow custom @-tags"
 let remove_stars = "\tRemove beginning blanks of comment lines, until the first '*'"
 let keep_code = "\tAlways keep code when available"
 let inverse_merge_ml_mli = "\n\t\tInverse implementations and interfaces when merging"
+let no_filter_with_module_constraints = "\n\t\tDo not filter module elements using module type constraints"
 let merge_description = ('d', "merge description")
 let merge_author = ('a', "merge @author")
 let merge_version = ('v', "merge @version")