Style locations when setting a breakpoint
say_where does not use ui-out, so function and file names printed by it were not styled. This patch changes say_where to use the low-level style code directly. gdb/ChangeLog 2018-12-28 Tom Tromey <tom@tromey.com> * breakpoint.c (say_where): Style file name. gdb/testsuite/ChangeLog 2018-12-28 Tom Tromey <tom@tromey.com> * gdb.base/style.exp: Add test for breakpoint setting.
This commit is contained in:
parent
80ae204359
commit
0bb296cb5f
|
@ -1,3 +1,7 @@
|
||||||
|
2018-12-28 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
|
* breakpoint.c (say_where): Style file name.
|
||||||
|
|
||||||
2018-12-28 Tom Tromey <tom@tromey.com>
|
2018-12-28 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
* ui-out.h (enum class ui_out_style_kind) <VARIABLE>: New global.
|
* ui-out.h (enum class ui_out_style_kind) <VARIABLE>: New global.
|
||||||
|
|
|
@ -68,6 +68,7 @@
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
#include "thread-fsm.h"
|
#include "thread-fsm.h"
|
||||||
#include "tid-parse.h"
|
#include "tid-parse.h"
|
||||||
|
#include "cli/cli-style.h"
|
||||||
|
|
||||||
/* readline include files */
|
/* readline include files */
|
||||||
#include "readline/readline.h"
|
#include "readline/readline.h"
|
||||||
|
@ -12195,9 +12196,14 @@ say_where (struct breakpoint *b)
|
||||||
/* If there is a single location, we can print the location
|
/* If there is a single location, we can print the location
|
||||||
more nicely. */
|
more nicely. */
|
||||||
if (b->loc->next == NULL)
|
if (b->loc->next == NULL)
|
||||||
printf_filtered (": file %s, line %d.",
|
{
|
||||||
symtab_to_filename_for_display (b->loc->symtab),
|
puts_filtered (": file ");
|
||||||
b->loc->line_number);
|
fputs_styled (symtab_to_filename_for_display (b->loc->symtab),
|
||||||
|
file_name_style.style (),
|
||||||
|
gdb_stdout);
|
||||||
|
printf_filtered (", line %d.",
|
||||||
|
b->loc->line_number);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
/* This is not ideal, but each location may have a
|
/* This is not ideal, but each location may have a
|
||||||
different file name, and this at least reflects the
|
different file name, and this at least reflects the
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2018-12-28 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
|
* gdb.base/style.exp: Add test for breakpoint setting.
|
||||||
|
|
||||||
2018-12-28 Tom Tromey <tom@tromey.com>
|
2018-12-28 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
* gdb.base/style.exp: Add test for variable names.
|
* gdb.base/style.exp: Add test for variable names.
|
||||||
|
|
|
@ -33,10 +33,13 @@ save_vars { env(TERM) } {
|
||||||
gdb_test_no_output "set style enabled on"
|
gdb_test_no_output "set style enabled on"
|
||||||
|
|
||||||
set main_expr "\033\\\[33mmain\033\\\[m"
|
set main_expr "\033\\\[33mmain\033\\\[m"
|
||||||
set file_expr "\033\\\[32m.*style\\.c\033\\\[m:\[0-9\]"
|
set base_file_expr "\033\\\[32m.*style\\.c\033\\\[m"
|
||||||
|
set file_expr "$base_file_expr:\[0-9\]"
|
||||||
set arg_expr "\033\\\[36marg.\033\\\[m"
|
set arg_expr "\033\\\[36marg.\033\\\[m"
|
||||||
|
|
||||||
gdb_test "frame" \
|
gdb_test "frame" \
|
||||||
"$main_expr.*$arg_expr.*$arg_expr.*$file_expr.*"
|
"$main_expr.*$arg_expr.*$arg_expr.*$file_expr.*"
|
||||||
gdb_test "info breakpoints" "$main_expr at $file_expr.*"
|
gdb_test "info breakpoints" "$main_expr at $file_expr.*"
|
||||||
|
|
||||||
|
gdb_test "break main" "file $base_file_expr.*"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue