Various improvements in the wording of diagnostics.

Fix various typos in diagnostic messages and unified wording and
capitalization.
Bug 23850

Author: m-schmidt

backend/Regalloc.ml

@@ -644,7 +644,7 @@ let add_interfs_instr g instr live =
       (* Reloads from incoming slots can occur when some 64-bit
          parameters are split and passed as two 32-bit stack locations. *)
       begin match src with
-      | L(Locations.S(Incoming, _, _)) -> 
+      | L(Locations.S(Incoming, _, _)) ->
           add_interfs_def g (vmreg temp_for_parent_frame) live
       | _ -> ()
       end
@@ -1210,9 +1210,9 @@ let regalloc f =
         Errors.OK(first_round f3 liveness)
       with
       | Timeout ->
-          Errors.Error(Errors.msg (coqstring_of_camlstring "Spilling fails to converge"))
+          Errors.Error(Errors.msg (coqstring_of_camlstring "spilling fails to converge"))
       | Type_error_at pc ->
-          Errors.Error [Errors.MSG(coqstring_of_camlstring "Ill-typed XTL code at PC ");
+          Errors.Error [Errors.MSG(coqstring_of_camlstring "ill-typed XTL code at PC ");
                  Errors.POS pc]
       | Bad_LTL ->
-          Errors.Error(Errors.msg (coqstring_of_camlstring "Bad LTL after spilling"))
+          Errors.Error(Errors.msg (coqstring_of_camlstring "bad LTL after spilling"))

cparser/Elab.ml

@@ -21,7 +21,7 @@ open Pre_parser_aux
 module SSet = Set.Make(String)
 
 let lexicon : (string, Cabs.cabsloc -> token) Hashtbl.t = Hashtbl.create 17
-let ignored_keyworkds : SSet.t ref = ref SSet.empty
+let ignored_keywords : SSet.t ref = ref SSet.empty
 
 let () =
   List.iter (fun (key, builder) -> Hashtbl.add lexicon key builder)
@@ -85,7 +85,7 @@ let () =
       ("while", fun loc -> WHILE loc)];
   if Configuration.system <> "diab" then
     (* We can ignore the __extension__ GCC keyword. *)
-    ignored_keyworkds := SSet.add "__extension__" !ignored_keyworkds
+    ignored_keywords := SSet.add "__extension__" !ignored_keywords
 
 let init_ctx = SSet.singleton "__builtin_va_list"
 let types_context : SSet.t ref = ref init_ctx
@@ -329,7 +329,7 @@ rule initial = parse
   | ","                           { COMMA(currentLoc lexbuf) }
   | "."                           { DOT(currentLoc lexbuf) }
   | identifier as id              {
-    if SSet.mem id !ignored_keyworkds then
+    if SSet.mem id !ignored_keywords then
       initial lexbuf
     else
       try Hashtbl.find lexicon id (currentLoc lexbuf)

cparser/Lexer.mll

@@ -69,7 +69,7 @@ let preprocessed_file transfs name sourcefile =
              | Parser.Parser.Inter.Fail_pr ->
                  (* Theoretically impossible : implies inconsistencies
                     between grammars. *)
-               Diagnostics.fatal_error Diagnostics.no_loc "Internal error while parsing"
+               Diagnostics.fatal_error Diagnostics.no_loc "internal error while parsing"
              | Parser.Parser.Inter.Timeout_pr -> assert false
              | Parser.Parser.Inter.Parsed_pr (ast, _ ) -> ast) in
       let p1 = Timing.time "Elaboration" Elab.elab_file ast in

cparser/Parse.ml

@@ -31,7 +31,7 @@ let rec local_initializer env path init k =
       let (ty_elt, sz) =
         match unroll env path.etyp with
         | TArray(ty_elt, Some sz, _) -> (ty_elt, sz)
-        | _ -> Diagnostics.fatal_error Diagnostics.no_loc "Wrong type for array initializer" in
+        | _ -> Diagnostics.fatal_error Diagnostics.no_loc "wrong type for array initializer" in
       let rec array_init pos il =
         if pos >= sz then k else begin
           let (i1, il') =

cparser/Unblock.ml

@@ -241,7 +241,7 @@ module DwarfPrinter(Target: DWARF_TARGET):
       let abbrev = !curr_abbrev in
       incr curr_abbrev;abbrev
 
-    (* Mapping from abbreviation string to abbrevaiton id *)
+    (* Mapping from abbreviation string to abbreviaton id *)
     let abbrev_mapping: (string,int) Hashtbl.t = Hashtbl.create 7
 
     (* Look up the id of the abbreviation and add it if it is missing *)

debug/DwarfPrinter.ml

@@ -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 *)

driver/Assembler.mli

@@ -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 =

driver/Commandline.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

driver/Driver.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;

driver/Driveraux.ml

@@ -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 *)

driver/Frontend.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 *)

driver/Linker.mli

@@ -43,9 +43,9 @@ let error msg lexbuf =
                        lexbuf.lex_curr_p.pos_lnum,
                        msg)))
 
-let ill_formed_line lexbuf = error "Ill-formed line" lexbuf
-let unterminated_quote lexbuf = error "Unterminated quote" lexbuf
-let lone_backslash lexbuf = error "Lone \\ (backslash) at end of file" lexbuf
+let ill_formed_line lexbuf = error "ill-formed line" lexbuf
+let unterminated_quote lexbuf = error "unterminated quote" lexbuf
+let lone_backslash lexbuf = error "lone \\ (backslash) at end of file" lexbuf
 
 }