diff options
author | Michael Schmidt <github@mschmidt.me> | 2018-06-04 14:47:16 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2018-08-02 10:29:44 +0200 |
commit | d13f1e243ff5ac94ecfc64f2bd81ae5d1c33bfcc (patch) | |
tree | e01d30310ccddee46fb854f7dc69e001447b91f6 /driver | |
parent | a2064197c9dc5578e6f0155b8d0cc9cb3eecef90 (diff) | |
download | compcert-d13f1e243ff5ac94ecfc64f2bd81ae5d1c33bfcc.tar.gz compcert-d13f1e243ff5ac94ecfc64f2bd81ae5d1c33bfcc.zip |
Various improvements in the wording of diagnostics.
Fix various typos in diagnostic messages and unified wording and
capitalization.
Bug 23850
Diffstat (limited to 'driver')
-rw-r--r-- | driver/Assembler.mli | 2 | ||||
-rw-r--r-- | driver/Commandline.ml | 12 | ||||
-rw-r--r-- | driver/Driver.ml | 2 | ||||
-rw-r--r-- | driver/Driveraux.ml | 2 | ||||
-rw-r--r-- | driver/Frontend.mli | 2 | ||||
-rw-r--r-- | driver/Linker.mli | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/driver/Assembler.mli b/driver/Assembler.mli index d8a4e32b..4f2e95ae 100644 --- a/driver/Assembler.mli +++ b/driver/Assembler.mli @@ -15,7 +15,7 @@ val assemble: string -> string -> unit (** From asm to object file *) val assembler_actions: (Commandline.pattern * Commandline.action) list - (** Commandline optins affecting the assembler *) + (** Commandline options affecting the assembler *) val assembler_help: string (** Commandline help description *) diff --git a/driver/Commandline.ml b/driver/Commandline.ml index f139212d..75ca1683 100644 --- a/driver/Commandline.ml +++ b/driver/Commandline.ml @@ -74,7 +74,7 @@ let parse_array spec argv first last = with Not_found -> find_action s inexact_cases in match optact with | None -> - let msg = sprintf "Unknown argument `%s'" s in + let msg = sprintf "unknown argument `%s'" s in raise (CmdError msg) | Some(Set r) -> r := true; parse (i+1) @@ -86,7 +86,7 @@ let parse_array spec argv first last = if i + 1 <= last then begin fn argv.(i+1); parse (i+2) end else begin - let msg = sprintf "Option `%s' expects an argument" s in + let msg = sprintf "option `%s' expects an argument" s in raise (CmdError msg) end | Some(Integer fn) -> @@ -95,19 +95,19 @@ let parse_array spec argv first last = try int_of_string argv.(i+1) with Failure _ -> - let msg = sprintf "Argument to option `%s' must be an integer" s in + let msg = sprintf "argument to option `%s' must be an integer" s in raise (CmdError msg) in fn n; parse (i+2) end else begin - let msg = sprintf "Option `%s' expects an argument" s in + let msg = sprintf "option `%s' expects an argument" s in raise (CmdError msg) end | Some (Ignore) -> if i + 1 <= last then begin parse (i+2) end else begin - let msg = sprintf "Option `%s' expects an argument" s in + let msg = sprintf "option `%s' expects an argument" s in raise (CmdError msg) end | Some (Unit f) -> f (); parse (i+1) @@ -131,7 +131,7 @@ let long_int_action key s = try int_of_string s with Failure _ -> - let msg = sprintf "Argument to option `%s' must be an integer" key in + let msg = sprintf "argument to option `%s' must be an integer" key in raise (CmdError msg) let longopt_int key f = diff --git a/driver/Driver.ml b/driver/Driver.ml index 0ad820ea..8ab8557c 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -404,7 +404,7 @@ let _ = parse_cmdline cmdline_actions; DebugInit.init (); (* Initialize the debug functions *) if nolink () && !option_o <> None && !num_source_files >= 2 then - fatal_error no_loc "Ambiguous '-o' option (multiple source files)"; + fatal_error no_loc "ambiguous '-o' option (multiple source files)"; if !num_input_files = 0 then fatal_error no_loc "no input file"; let linker_args = time "Total compilation time" perform_actions () in diff --git a/driver/Driveraux.ml b/driver/Driveraux.ml index ccc3d00d..5b2d792e 100644 --- a/driver/Driveraux.ml +++ b/driver/Driveraux.ml @@ -47,7 +47,7 @@ let command stdout args = match status with | Unix.WEXITED rc -> rc | Unix.WSIGNALED n | Unix.WSTOPPED n -> - error no_loc "Command '%s' killed on a signal." argv.(0); -1 + error no_loc "command '%s' killed on a signal." argv.(0); -1 with Unix.Unix_error(err, fn, param) -> error no_loc "executing '%s': %s: %s %s" argv.(0) fn (Unix.error_message err) param; diff --git a/driver/Frontend.mli b/driver/Frontend.mli index 39f0e612..a18c2704 100644 --- a/driver/Frontend.mli +++ b/driver/Frontend.mli @@ -18,7 +18,7 @@ val parse_c_file: string -> string -> Csyntax.coq_function Ctypes.program (** From preprocessed C to Csyntax *) val prepro_actions: (Commandline.pattern * Commandline.action) list - (** Commandline optins affecting the frontend *) + (** Commandline options affecting the frontend *) val prepro_help: string (** Commandline help description *) diff --git a/driver/Linker.mli b/driver/Linker.mli index 3b92da05..dd034543 100644 --- a/driver/Linker.mli +++ b/driver/Linker.mli @@ -12,10 +12,10 @@ (* *********************************************************************) val linker: string -> string list -> unit - (** Link files into executbale *) + (** Link files into executable *) val linker_actions: (Commandline.pattern * Commandline.action) list - (** Commandline optins affecting the assembler *) + (** Commandline options affecting the assembler *) val linker_help: string (** Commandline help description *) |