diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/clflags.ml | 1 | ||||
| -rw-r--r-- | utils/clflags.mli | 1 | ||||
| -rw-r--r-- | utils/config.mlp | 6 | ||||
| -rw-r--r-- | utils/warnings.ml | 11 | ||||
| -rw-r--r-- | utils/warnings.mli | 1 |
5 files changed, 15 insertions, 5 deletions
diff --git a/utils/clflags.ml b/utils/clflags.ml index b44b7491f3..829393a00d 100644 --- a/utils/clflags.ml +++ b/utils/clflags.ml @@ -58,6 +58,7 @@ and dllpaths = ref ([] : string list) (* -dllpath *) and make_package = ref false (* -pack *) and for_package = ref (None: string option) (* -for-pack *) and error_size = ref 500 (* -error-size *) +and transparent_modules = ref false (* -trans-mod *) let dump_source = ref false (* -dsource *) let dump_parsetree = ref false (* -dparsetree *) and dump_typedtree = ref false (* -dtypedtree *) diff --git a/utils/clflags.mli b/utils/clflags.mli index 038c3aacba..876776acdb 100644 --- a/utils/clflags.mli +++ b/utils/clflags.mli @@ -55,6 +55,7 @@ val dllpaths : string list ref val make_package : bool ref val for_package : string option ref val error_size : int ref +val transparent_modules : bool ref val dump_source : bool ref val dump_parsetree : bool ref val dump_typedtree : bool ref diff --git a/utils/config.mlp b/utils/config.mlp index 874db44a4b..e16ef29988 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -52,12 +52,12 @@ let exec_magic_number = "Caml1999X010" and cmi_magic_number = "Caml1999I016" and cmo_magic_number = "Caml1999O008" and cma_magic_number = "Caml1999A009" -and cmx_magic_number = "Caml1999Y011" -and cmxa_magic_number = "Caml1999Z010" +and cmx_magic_number = "Caml1999Y012" +and cmxa_magic_number = "Caml1999Z011" and ast_impl_magic_number = "Caml1999M016" and ast_intf_magic_number = "Caml1999N015" and cmxs_magic_number = "Caml2007D001" -and cmt_magic_number = "Caml2012T002" +and cmt_magic_number = "Caml2012T003" let load_path = ref ([] : string list) diff --git a/utils/warnings.ml b/utils/warnings.ml index 3a4e0912f3..58d2753962 100644 --- a/utils/warnings.ml +++ b/utils/warnings.ml @@ -65,6 +65,7 @@ type t = | Open_shadow_label_constructor of string * string (* 45 *) | Bad_env_variable of string * string (* 46 *) | Attribute_payload of string * string (* 47 *) + | Eliminated_optional_arguments of string list (* 48 *) ;; (* If you remove a warning, leave a hole in the numbering. NEVER change @@ -121,9 +122,10 @@ let number = function | Open_shadow_label_constructor _ -> 45 | Bad_env_variable _ -> 46 | Attribute_payload _ -> 47 + | Eliminated_optional_arguments _ -> 48 ;; -let last_warning_number = 47 +let last_warning_number = 48 (* Must be the max number returned by the [number] function. *) let letter = function @@ -226,7 +228,7 @@ let parse_opt flags s = let parse_options errflag s = parse_opt (if errflag then error else active) s;; (* If you change these, don't forget to change them in man/ocamlc.m *) -let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45";; +let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48";; let defaults_warn_error = "-a";; let () = parse_options false defaults_w;; @@ -360,6 +362,10 @@ let message = function Printf.sprintf "illegal environment variable %s : %s" var s | Attribute_payload (a, s) -> Printf.sprintf "illegal payload for attribute '%s'.\n%s" a s + | Eliminated_optional_arguments sl -> + Printf.sprintf "implicit elimination of optional argument%s %s" + (if List.length sl = 1 then "" else "s") + (String.concat ", " sl) ;; let nerrors = ref 0;; @@ -453,6 +459,7 @@ let descriptions = 45, "Open statement shadows an already defined label or constructor."; 46, "Illegal environment variable"; 47, "Illegal attribute payload"; + 48, "Implicit elimination of optional arguments"; ] ;; diff --git a/utils/warnings.mli b/utils/warnings.mli index a7c3abd40e..05bf66bdea 100644 --- a/utils/warnings.mli +++ b/utils/warnings.mli @@ -60,6 +60,7 @@ type t = | Open_shadow_label_constructor of string * string (* 45 *) | Bad_env_variable of string * string (* 46 *) | Attribute_payload of string * string (* 47 *) + | Eliminated_optional_arguments of string list (* 48 *) ;; val parse_options : bool -> string -> unit;; |