rename -help-warnings to -warn-help

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

7 files changed, 21 insertions, 21 deletions

diff --git a/driver/main.ml b/driver/main.ml
index 9c06e6817d..18480739f0 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -99,7 +99,6 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _dllib s = dllibs := Misc.rev_split_words s @ !dllibs
   let _dllpath s = dllpaths := !dllpaths @ [s]
   let _g = set debug
-  let _help_warnings = Warnings.help_warnings
   let _i () = print_types := true; compile_only := true
   let _I s = include_dirs := s :: !include_dirs
   let _impl = impl
@@ -130,6 +129,7 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _version = print_version_string
   let _w = (Warnings.parse_options false)
   let _warn_error = (Warnings.parse_options true)
+  let _warn_help = Warnings.help_warnings
   let _where = print_standard_library
   let _verbose = set verbose
   let _nopervasives = set nopervasives
diff --git a/driver/main_args.ml b/driver/main_args.ml
index 90f2643153..8af9193289 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -80,10 +80,6 @@ let mk_g_opt f =
   "-g", Arg.Unit f, " Record debugging information for exception backtrace"
 ;;
 
-let mk_help_warnings f =
-  "-help-warnings", Arg.Unit f, "  Show definition for warnings numbers"
-;;
-
 let mk_i f =
   "-i", Arg.Unit f, " Print inferred interface"
 ;;
@@ -282,6 +278,10 @@ let mk_warn_error f =
   \     Default setting is %S" Warnings.defaults_warn_error
 ;;
 
+let mk_warn_help f =
+  "-warn-help", Arg.Unit f, "  Show description of warning numbers"
+;;
+
 let mk_where f =
   "-where", Arg.Unit f, " Print location of standard library and exit"
 ;;
@@ -379,7 +379,6 @@ module type Bytecomp_options = sig
   val _dllib : string -> unit
   val _dllpath : string -> unit
   val _g : unit -> unit
-  val _help_warnings : unit -> unit
   val _i : unit -> unit
   val _I : string -> unit
   val _impl : string -> unit
@@ -409,6 +408,7 @@ module type Bytecomp_options = sig
   val _verbose : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
   val _where : unit -> unit
 
   val _nopervasives : unit -> unit
@@ -422,7 +422,6 @@ module type Bytecomp_options = sig
 end;;
 
 module type Bytetop_options = sig
-  val _help_warnings : unit -> unit
   val _I : string -> unit
   val _init : string -> unit
   val _labels : unit -> unit
@@ -438,6 +437,7 @@ module type Bytetop_options = sig
   val _version : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
 
   val _dparsetree : unit -> unit
   val _drawlambda : unit -> unit
@@ -458,7 +458,6 @@ module type Optcomp_options = sig
   val _config : unit -> unit
   val _for_pack : string -> unit
   val _g : unit -> unit
-  val _help_warnings : unit -> unit
   val _i : unit -> unit
   val _I : string -> unit
   val _impl : string -> unit
@@ -490,6 +489,7 @@ module type Optcomp_options = sig
   val _verbose : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
   val _where : unit -> unit
 
   val _nopervasives : unit -> unit
@@ -515,7 +515,6 @@ end;;
 
 module type Opttop_options = sig
   val _compact : unit -> unit
-  val _help_warnings : unit -> unit
   val _I : string -> unit
   val _init : string -> unit
   val _inline : int -> unit
@@ -533,6 +532,7 @@ module type Opttop_options = sig
   val _version : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
 
   val _dparsetree : unit -> unit
   val _drawlambda : unit -> unit
@@ -574,7 +574,6 @@ struct
     mk_dtypes F._annot;
     mk_for_pack_byt ();
     mk_g_byt F._g;
-    mk_help_warnings F._help_warnings;
     mk_i F._i;
     mk_I F._I;
     mk_impl F._impl;
@@ -608,6 +607,7 @@ struct
     mk_vmthread F._vmthread;
     mk_w F._w;
     mk_warn_error F._warn_error;
+    mk_warn_help F._warn_help;
     mk_where F._where;
 
     mk_nopervasives F._nopervasives;
@@ -624,7 +624,6 @@ end;;
 module Make_bytetop_options (F : Bytetop_options) =
 struct
   let list = [
-    mk_help_warnings F._help_warnings;
     mk_I F._I;
     mk_init F._init;
     mk_labels F._labels;
@@ -640,6 +639,7 @@ struct
     mk_version F._version;
     mk_w F._w;
     mk_warn_error F._warn_error;
+    mk_warn_help F._warn_help;
 
     mk_dparsetree F._dparsetree;
     mk_drawlambda F._drawlambda;
@@ -664,7 +664,6 @@ struct
     mk_dtypes F._annot;
     mk_for_pack_opt F._for_pack;
     mk_g_opt F._g;
-    mk_help_warnings F._help_warnings;
     mk_i F._i;
     mk_I F._I;
     mk_impl F._impl;
@@ -696,6 +695,7 @@ struct
     mk_verbose F._verbose;
     mk_w F._w;
     mk_warn_error F._warn_error;
+    mk_warn_help F._warn_help;
     mk_where F._where;
 
     mk_nopervasives F._nopervasives;
@@ -721,7 +721,6 @@ end;;
 module Make_opttop_options (F : Opttop_options) = struct
   let list = [
     mk_compact F._compact;
-    mk_help_warnings F._help_warnings;
     mk_I F._I;
     mk_init F._init;
     mk_inline F._inline;
@@ -739,6 +738,7 @@ module Make_opttop_options (F : Opttop_options) = struct
     mk_version F._version;
     mk_w F._w;
     mk_warn_error F._warn_error;
+    mk_warn_help F._warn_help;
 
     mk_dparsetree F._dparsetree;
     mk_drawlambda F._drawlambda;
diff --git a/driver/main_args.mli b/driver/main_args.mli
index acc04fea51..e0a7e2fa96 100644
--- a/driver/main_args.mli
+++ b/driver/main_args.mli
@@ -25,7 +25,6 @@ module type Bytecomp_options =
     val _dllib : string -> unit
     val _dllpath : string -> unit
     val _g : unit -> unit
-    val _help_warnings : unit -> unit
     val _i : unit -> unit
     val _I : string -> unit
     val _impl : string -> unit
@@ -55,6 +54,7 @@ module type Bytecomp_options =
     val _verbose : unit -> unit
     val _w : string -> unit
     val _warn_error : string -> unit
+    val _warn_help : unit -> unit
     val _where : unit -> unit
 
     val _nopervasives : unit -> unit
@@ -69,7 +69,6 @@ module type Bytecomp_options =
 ;;
 
 module type Bytetop_options = sig
-  val _help_warnings : unit -> unit
   val _I : string -> unit
   val _init : string -> unit
   val _labels : unit -> unit
@@ -85,6 +84,7 @@ module type Bytetop_options = sig
   val _version : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
 
   val _dparsetree : unit -> unit
   val _drawlambda : unit -> unit
@@ -105,7 +105,6 @@ module type Optcomp_options = sig
   val _config : unit -> unit
   val _for_pack : string -> unit
   val _g : unit -> unit
-  val _help_warnings : unit -> unit
   val _i : unit -> unit
   val _I : string -> unit
   val _impl : string -> unit
@@ -137,6 +136,7 @@ module type Optcomp_options = sig
   val _verbose : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
   val _where : unit -> unit
 
   val _nopervasives : unit -> unit
@@ -162,7 +162,6 @@ end;;
 
 module type Opttop_options = sig
   val _compact : unit -> unit
-  val _help_warnings : unit -> unit
   val _I : string -> unit
   val _init : string -> unit
   val _inline : int -> unit
@@ -180,6 +179,7 @@ module type Opttop_options = sig
   val _version : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
+  val _warn_help : unit -> unit
 
   val _dparsetree : unit -> unit
   val _drawlambda : unit -> unit
diff --git a/driver/optmain.ml b/driver/optmain.ml
index 2dd90dba23..51a9162d63 100644
--- a/driver/optmain.ml
+++ b/driver/optmain.ml
@@ -107,7 +107,6 @@ module Options = Main_args.Make_optcomp_options (struct
   let _config () = show_config ()
   let _for_pack s = for_package := Some s
   let _g = set debug
-  let _help_warnings = Warnings.help_warnings
   let _i () = print_types := true; compile_only := true
   let _I dir = include_dirs := dir :: !include_dirs
   let _impl = impl
@@ -139,6 +138,7 @@ module Options = Main_args.Make_optcomp_options (struct
   let _verbose = set verbose
   let _w s = Warnings.parse_options false s
   let _warn_error s = Warnings.parse_options true s
+  let _warn_help = Warnings.help_warnings
   let _where () = print_standard_library ()
 
   let _nopervasives = set nopervasives
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index a6df014772..a2232dc15d 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -54,7 +54,6 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _dllpath = option_with_arg "-dllpath"
   let _dtypes = option "-dtypes"
   let _g = option "-g"
-  let _help_warnings = option "-help-warnings"
   let _i = option "-i"
   let _I s = option_with_arg "-I" s
   let _impl s = with_impl := true; option_with_arg "-impl" s
@@ -85,6 +84,7 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _verbose = option "-verbose"
   let _w = option_with_arg "-w"
   let _warn_error = option_with_arg "-warn-error"
+  let _warn_help = option "-warn-help"
   let _where = option "-where"
   let _nopervasives = option "-nopervasives"
   let _dparsetree = option "-dparsetree"
diff --git a/toplevel/opttopmain.ml b/toplevel/opttopmain.ml
index 2f6f25e811..388e725786 100644
--- a/toplevel/opttopmain.ml
+++ b/toplevel/opttopmain.ml
@@ -58,7 +58,6 @@ module Options = Main_args.Make_opttop_options (struct
   let clear r () = r := false
 
   let _compact = clear optimize_for_speed
-  let _help_warnings = Warnings.help_warnings
   let _I dir =
     let dir = Misc.expand_directory Config.standard_library dir in
     include_dirs := dir :: !include_dirs
@@ -78,6 +77,7 @@ module Options = Main_args.Make_opttop_options (struct
   let _version () = print_version ()
   let _w s = Warnings.parse_options false s
   let _warn_error s = Warnings.parse_options true s
+  let _warn_help = Warnings.help_warnings
 
   let _dparsetree = set dump_parsetree
   let _drawlambda = set dump_rawlambda
diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml
index 3a4adcbd88..803624c5e2 100644
--- a/toplevel/topmain.ml
+++ b/toplevel/topmain.ml
@@ -54,7 +54,6 @@ module Options = Main_args.Make_bytetop_options (struct
   let set r () = r := true
   let clear r () = r := false
 
-  let _help_warnings = Warnings.help_warnings
   let _I dir =
     let dir = Misc.expand_directory Config.standard_library dir in
     include_dirs := dir :: !include_dirs
@@ -72,6 +71,7 @@ module Options = Main_args.Make_bytetop_options (struct
   let _version () = print_version ()
   let _w s = Warnings.parse_options false s
   let _warn_error s = Warnings.parse_options true s
+  let _warn_help = Warnings.help_warnings
   let _dparsetree = set dump_parsetree
   let _drawlambda = set dump_rawlambda
   let _dlambda = set dump_lambda