summaryrefslogtreecommitdiff
path: root/debugger/show_information.ml
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2014-03-31 17:58:53 +0000
committerDamien Doligez <damien.doligez-inria.fr>2014-03-31 17:58:53 +0000
commit8643356b8542e0dcab358716f1e04d47b08b1a6d (patch)
treee10cc5a03f7ead69a2d4ed563cbd021df5770ef2 /debugger/show_information.ml
parentcd1bf4b9fc898cee2f4886ed18ddf6271ec522e8 (diff)
parent989ac0b2635443b9c0f183ee6343b663c854f4ea (diff)
downloadocaml-ephemeron.tar.gz
merge with trunk at rev 14512ephemeron
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/ephemeron@14514 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'debugger/show_information.ml')
-rw-r--r--debugger/show_information.ml13
1 files changed, 10 insertions, 3 deletions
diff --git a/debugger/show_information.ml b/debugger/show_information.ml
index 89111d3cc9..690645dfe2 100644
--- a/debugger/show_information.ml
+++ b/debugger/show_information.ml
@@ -21,6 +21,7 @@ open Frames
open Source
open Show_source
open Breakpoints
+open Parameters
(* Display information about the current event. *)
let show_current_event ppf =
@@ -73,9 +74,15 @@ 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@."
- framenum event.ev_pos event.ev_module
- cnum
+ if !machine_readable then
+ fprintf ppf "#%i Pc: %i %s char %i@."
+ framenum event.ev_pos event.ev_module
+ cnum
+ else
+ fprintf ppf "#%i %s %s:%i:%i@."
+ framenum event.ev_module
+ pos.Lexing.pos_fname pos.Lexing.pos_lnum
+ (pos.Lexing.pos_cnum - pos.Lexing.pos_bol + 1)
(* Display information about the current frame. *)
(* --- `select frame' must have succeded before calling this function. *)