Permalink
Browse files

PR#5116: abide english typography in debugger messages.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13022 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
xclerc committed Oct 17, 2012
1 parent 9dc80e8 commit 97e3ed17d85cfe7b6a86ae8d290b7424b0a845d9
Showing with 37 additions and 37 deletions.
  1. +2 −2 debugger/breakpoints.ml
  2. +19 −19 debugger/command_line.ml
  3. +1 −1 debugger/printval.ml
  4. +7 −7 debugger/show_information.ml
  5. +5 −5 debugger/time_travel.ml
  6. +3 −3 debugger/unix_tools.ml
View
@@ -167,7 +167,7 @@ let rec new_breakpoint =
incr breakpoint_number;
insert_position event.ev_pos;
breakpoints := (!breakpoint_number, event) :: !breakpoints);
- printf "Breakpoint %d at %d : %s" !breakpoint_number event.ev_pos
+ printf "Breakpoint %d at %d: %s" !breakpoint_number event.ev_pos
(Pos.get_desc event);
print_newline ()
@@ -180,7 +180,7 @@ let remove_breakpoint number =
(function () ->
breakpoints := List.remove_assoc number !breakpoints;
remove_position pos;
- printf "Removed breakpoint %d at %d : %s" number ev.ev_pos
+ printf "Removed breakpoint %d at %d: %s" number ev.ev_pos
(Pos.get_desc ev);
print_newline ()
)
View
@@ -124,7 +124,7 @@ let add_breakpoint_at_pc pc =
new_breakpoint (any_event_at_pc pc)
with
| Not_found ->
- eprintf "Can't add breakpoint at pc %i : no event there.@." pc;
+ eprintf "Can't add breakpoint at pc %i: no event there.@." pc;
raise Toplevel
let add_breakpoint_after_pc pc =
@@ -210,7 +210,7 @@ let line_loop ppf line_buffer =
| Exit ->
stop_user_input ()
(* | Sys_error s ->
- error ("System error : " ^ s) *)
+ error ("System error: " ^ s) *)
(** Instructions. **)
let instr_cd ppf lexbuf =
@@ -269,10 +269,10 @@ let instr_dir ppf lexbuf =
List.iter (function x -> add_path (expand_path x)) new_directory'
end;
let print_dirs ppf l = List.iter (function x -> fprintf ppf "@ %s" x) l in
- fprintf ppf "@[<2>Directories :%a@]@." print_dirs !Config.load_path;
+ fprintf ppf "@[<2>Directories: %a@]@." print_dirs !Config.load_path;
Hashtbl.iter
(fun mdl dirs ->
- fprintf ppf "@[<2>Source directories for %s :%a@]@." mdl print_dirs dirs)
+ fprintf ppf "@[<2>Source directories for %s: %a@]@." mdl print_dirs dirs)
Debugger_config.load_path_for
let instr_kill ppf lexbuf =
@@ -371,11 +371,11 @@ let instr_quit _ =
let print_variable_list ppf =
let pr_vars ppf = List.iter (fun v -> fprintf ppf "%s@ " v.var_name) in
- fprintf ppf "List of variables :%a@." pr_vars !variable_list
+ fprintf ppf "List of variables: %a@." pr_vars !variable_list
let print_info_list ppf =
let pr_infos ppf = List.iter (fun i -> fprintf ppf "%s@ " i.info_name) in
- fprintf ppf "List of info commands :%a@." pr_infos !info_list
+ fprintf ppf "List of info commands: %a@." pr_infos !info_list
let instr_complete ppf lexbuf =
let ppf = Format.err_formatter in
@@ -431,7 +431,7 @@ let instr_help ppf lexbuf =
| Some x ->
let print_help nm hlp =
eol lexbuf;
- fprintf ppf "%s : %s@." nm hlp in
+ fprintf ppf "%s: %s@." nm hlp in
begin match matching_instructions x with
| [] ->
eol lexbuf;
@@ -467,10 +467,10 @@ let instr_help ppf lexbuf =
print_help i.instr_name i.instr_help
| l ->
eol lexbuf;
- fprintf ppf "Ambiguous command \"%s\" : %a@." x pr_instrs l
+ fprintf ppf "Ambiguous command \"%s\": %a@." x pr_instrs l
end
| None ->
- fprintf ppf "List of commands : %a@." pr_instrs !instruction_list
+ fprintf ppf "List of commands: %a@." pr_instrs !instruction_list
(* Printing values *)
@@ -553,7 +553,7 @@ let instr_show =
(function ppf ->
List.iter
(function {var_name = nm; var_action = (_, funct)} ->
- fprintf ppf "%s : " nm;
+ fprintf ppf "%s: " nm;
funct ppf)
!variable_list)
@@ -848,14 +848,14 @@ let follow_fork_variable =
let pr_modules ppf mods =
let pr_mods ppf = List.iter (function x -> fprintf ppf "%s@ " x) in
- fprintf ppf "Used modules :@.%a@?" pr_mods mods
+ fprintf ppf "Used modules: @.%a@?" pr_mods mods
let info_modules ppf lexbuf =
eol lexbuf;
ensure_loaded ();
pr_modules ppf !modules
(********
- print_endline "Opened modules :";
+ print_endline "Opened modules: ";
if !opened_modules_names = [] then
print_endline "(no module opened)."
else
@@ -898,7 +898,7 @@ let info_breakpoints ppf lexbuf =
let info_events ppf lexbuf =
ensure_loaded ();
let mdle = convert_module (module_of_longident (opt_longident_eol Lexer.lexeme lexbuf)) in
- print_endline ("Module : " ^ mdle);
+ print_endline ("Module: " ^ mdle);
print_endline " Address Characters Kind Repr.";
List.iter
(function ev ->
@@ -1105,10 +1105,10 @@ using \"load_printer\"." };
var_action = loading_mode_variable ppf;
var_help =
"mode of loading.\n\
-It can be either :\n\
- direct : the program is directly called by the debugger.\n\
- runtime : the debugger execute `ocamlrun programname arguments'.\n\
- manual : the program is not launched by the debugger,\n\
+It can be either:\n\
+ direct: the program is directly called by the debugger.\n\
+ runtime: the debugger execute `ocamlrun programname arguments'.\n\
+ manual: the program is not launched by the debugger,\n\
but manually by the user." };
{ var_name = "processcount";
var_action = integer_variable false 1 "Must be >= 1."
@@ -1152,8 +1152,8 @@ It can be either :\n\
var_help =
"process to follow after forking.\n\
It can be either :
- child : the newly created process.\n\
- parent : the process that called fork.\n" }];
+ child: the newly created process.\n\
+ parent: the process that called fork.\n" }];
info_list :=
(* info name, function, help *)
View
@@ -100,7 +100,7 @@ let print_named_value max_depth exp env obj ppf ty =
let n = name_value obj ty in
fprintf ppf "$%i" n in
Printtyp.reset_and_mark_loops ty;
- fprintf ppf "@[<2>%a :@ %a@ =@ %a@]@."
+ fprintf ppf "@[<2>%a:@ %a@ =@ %a@]@."
print_value_name exp
Printtyp.type_expr ty
(print_value max_depth env obj) ty
@@ -24,10 +24,10 @@ open Breakpoints
(* Display information about the current event. *)
let show_current_event ppf =
- fprintf ppf "Time : %Li" (current_time ());
+ fprintf ppf "Time: %Li" (current_time ());
(match current_pc () with
| Some pc ->
- fprintf ppf " - pc : %i" pc
+ fprintf ppf " - pc: %i" pc
| _ -> ());
update_current_event ();
reset_frame ();
@@ -42,9 +42,9 @@ let show_current_event ppf =
| [] ->
()
| [breakpoint] ->
- fprintf ppf "Breakpoint : %i@." breakpoint
+ fprintf ppf "Breakpoint: %i@." breakpoint
| breakpoints ->
- fprintf ppf "Breakpoints : %a@."
+ fprintf ppf "Breakpoints: %a@."
(fun ppf l ->
List.iter
(function x -> fprintf ppf "%i " x) l)
@@ -73,7 +73,7 @@ let show_one_frame framenum ppf event =
let buffer = get_buffer pos event.ev_module in
snd (start_and_cnum buffer pos)
with _ -> pos.Lexing.pos_cnum in
- fprintf ppf "#%i Pc : %i %s char %i@."
+ fprintf ppf "#%i Pc: %i %s char %i@."
framenum event.ev_pos event.ev_module
cnum
@@ -88,9 +88,9 @@ let show_current_frame ppf selected =
begin match breakpoints_at_pc sel_ev.ev_pos with
| [] -> ()
| [breakpoint] ->
- fprintf ppf "Breakpoint : %i@." breakpoint
+ fprintf ppf "Breakpoint: %i@." breakpoint
| breakpoints ->
- fprintf ppf "Breakpoints : %a@."
+ fprintf ppf "Breakpoints: %a@."
(fun ppf l ->
List.iter (function x -> fprintf ppf "%i " x) l)
(List.sort compare breakpoints);
View
@@ -92,7 +92,7 @@ let wait_for_connection checkpoint =
(* Select a checkpoint as current. *)
let set_current_checkpoint checkpoint =
if !debug_time_travel then
- prerr_endline ("Select : " ^ (string_of_int checkpoint.c_pid));
+ prerr_endline ("Select: " ^ (string_of_int checkpoint.c_pid));
if not checkpoint.c_valid then
wait_for_connection checkpoint;
current_checkpoint := checkpoint;
@@ -101,7 +101,7 @@ let set_current_checkpoint checkpoint =
(* Kill `checkpoint'. *)
let kill_checkpoint checkpoint =
if !debug_time_travel then
- prerr_endline ("Kill : " ^ (string_of_int checkpoint.c_pid));
+ prerr_endline ("Kill: " ^ (string_of_int checkpoint.c_pid));
if checkpoint.c_pid > 0 then (* Ghosts don't have to be killed ! *)
(if not checkpoint.c_valid then
wait_for_connection checkpoint;
@@ -238,7 +238,7 @@ let duplicate_current_checkpoint () =
Checkpoint_done pid ->
(new_checkpoint.c_pid <- pid;
if !debug_time_travel then
- prerr_endline ("Waiting for connection : " ^ (string_of_int pid)))
+ prerr_endline ("Waiting for connection: " ^ (string_of_int pid)))
| Checkpoint_failed ->
prerr_endline
"A fork failed. Reducing maximum number of checkpoints.";
@@ -324,7 +324,7 @@ let internal_step duration =
set_current_checkpoint
(find_checkpoint_before (current_time ()))));
if !debug_time_travel then begin
- print_string "Checkpoints : pid(time)"; print_newline ();
+ print_string "Checkpoints: pid(time)"; print_newline ();
List.iter
(function {c_time = time; c_pid = pid; c_valid = valid} ->
Printf.printf "%d(%Ld)%s " pid time
@@ -370,7 +370,7 @@ let set_file_descriptor pid fd =
true)
in
if !debug_time_travel then
- prerr_endline ("New connection : " ^(string_of_int pid));
+ prerr_endline ("New connection: " ^(string_of_int pid));
find (!current_checkpoint::!checkpoints)
(* Kill all the checkpoints. *)
View
@@ -28,7 +28,7 @@ let convert_address address =
ADDR_INET
((try inet_addr_of_string host with Failure _ ->
try (gethostbyname host).h_addr_list.(0) with Not_found ->
- prerr_endline ("Unknown host : " ^ host);
+ prerr_endline ("Unknown host: " ^ host);
failwith "Can't convert address"),
(try int_of_string port with Failure _ ->
prerr_endline "The port number should be an integer";
@@ -41,14 +41,14 @@ let convert_address address =
(*** Report a unix error. ***)
let report_error = function
| Unix_error (err, fun_name, arg) ->
- prerr_string "Unix error : '";
+ prerr_string "Unix error: '";
prerr_string fun_name;
prerr_string "' failed";
if String.length arg > 0 then
(prerr_string " on '";
prerr_string arg;
prerr_string "'");
- prerr_string " : ";
+ prerr_string ": ";
prerr_endline (error_message err)
| _ -> fatal_error "report_error: not a Unix error"

0 comments on commit 97e3ed1

Please sign in to comment.