diff options
author | Pedro Alves <palves@redhat.com> | 2019-06-05 09:17:16 +0100 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-10-01 15:12:38 -0600 |
commit | 2a3c1174c3c0db1140180fb3fc56ac324d1c0a7c (patch) | |
tree | 174cd0bf2a3a09ac1f910d32d8700e947399b955 /gdb/cli-out.c | |
parent | 0dfe5bfbb7e7a3e55c57d1b59c265dc1a3cd9fc7 (diff) | |
download | gdb-2a3c1174c3c0db1140180fb3fc56ac324d1c0a7c.zip gdb-2a3c1174c3c0db1140180fb3fc56ac324d1c0a7c.tar.gz gdb-2a3c1174c3c0db1140180fb3fc56ac324d1c0a7c.tar.bz2 |
Introduce gdb-specific %p format suffixes
This introduces a few gdb-specific %p format suffixes. This is useful
for emitting gdb-specific output in an ergonomic way. It also yields
code that is more i18n-friendly.
The comment before ui_out::message explains the details.
Note that the tests had to change a little. When using one of the gdb
printf functions with styling, there can be spurious style changes
emitted to the output. This did not seem worthwhile to fix, as the
low-level output functions are rather spaghetti-ish already, and I
didn't want to make them even worse.
This change also necessitated adding support for "*" as precision and
width in format_pieces. These are used in various spots in gdb, and
it seemed better to me to implement them than to remove the uses.
gdb/ChangeLog
2019-10-01 Pedro Alves <palves@redhat.com>
Tom Tromey <tom@tromey.com>
* unittests/format_pieces-selftests.c: Add gdb_format parameter.
(test_gdb_formats): New function.
(run_tests): Call it.
(test_format_specifier): Update.
* utils.h (fputs_filtered): Update comment.
(vfprintf_styled, vfprintf_styled_no_gdbfmt)
(fputs_styled_unfiltered): Declare.
* utils.c (fputs_styled_unfiltered): New function.
(vfprintf_maybe_filtered): Add gdbfmt parameter.
(vfprintf_filtered): Update.
(vfprintf_unfiltered, vprintf_filtered): Update.
(vfprintf_styled, vfprintf_styled_no_gdbfmt): New functions.
* ui-out.h (enum ui_out_flag) <unfiltered_output,
disallow_ui_out_field>: New constants.
(enum class field_kind): New.
(struct base_field_s, struct signed_field_s): New.
(signed_field): New function.
(struct string_field_s): New.
(string_field): New function.
(struct styled_string_s): New.
(styled_string): New function.
(class ui_out) <message>: Add comment.
<vmessage, call_do_message>: New methods.
<do_message>: Add style parameter.
* ui-out.c (ui_out::call_do_message, ui_out::vmessage): New
methods.
(ui_out::message): Rewrite.
* mi/mi-out.h (class mi_ui_out) <do_message>: Add style
parameter.
* mi/mi-out.c (mi_ui_out::do_message): Add style parameter.
* gdbsupport/format.h (class format_pieces) <format_pieces>: Add
gdb_extensions parameter.
(class format_piece): Add parameter to constructor.
(n_int_args): New field.
* gdbsupport/format.c (format_pieces::format_pieces): Add
gdb_extensions parameter. Handle '*'.
* cli-out.h (class cli_ui_out) <do_message>: Add style parameter.
* cli-out.c (cli_ui_out::do_message): Add style parameter. Call
vfprintf_styled_no_gdbfmt.
(cli_ui_out::do_field_string, cli_ui_out::do_spaces)
(cli_ui_out::do_text, cli_ui_out::field_separator): Allow
unfiltered output.
* ui-style.h (struct ui_file_style) <ptr>: New method.
gdb/testsuite/ChangeLog
2019-10-01 Tom Tromey <tom@tromey.com>
* gdb.base/style.exp: Update tests.
Diffstat (limited to 'gdb/cli-out.c')
-rw-r--r-- | gdb/cli-out.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/gdb/cli-out.c b/gdb/cli-out.c index fa72a1d..c713607 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -170,7 +170,12 @@ cli_ui_out::do_field_string (int fldno, int width, ui_align align, spaces (before); if (string) - fputs_styled (string, style, m_streams.back ()); + { + if (test_flags (unfiltered_output)) + fputs_styled_unfiltered (string, style, m_streams.back ()); + else + fputs_styled (string, style, m_streams.back ()); + } if (after) spaces (after); @@ -201,7 +206,10 @@ cli_ui_out::do_spaces (int numspaces) if (m_suppress_output) return; - print_spaces_filtered (numspaces, m_streams.back ()); + if (test_flags (unfiltered_output)) + print_spaces (numspaces, m_streams.back ()); + else + print_spaces_filtered (numspaces, m_streams.back ()); } void @@ -210,16 +218,24 @@ cli_ui_out::do_text (const char *string) if (m_suppress_output) return; - fputs_filtered (string, m_streams.back ()); + if (test_flags (unfiltered_output)) + fputs_unfiltered (string, m_streams.back ()); + else + fputs_filtered (string, m_streams.back ()); } void -cli_ui_out::do_message (const char *format, va_list args) +cli_ui_out::do_message (const ui_file_style &style, + const char *format, va_list args) { if (m_suppress_output) return; - vfprintf_unfiltered (m_streams.back (), format, args); + /* Use the "no_gdbfmt" variant here to avoid recursion. + vfprintf_styled calls into cli_ui_out::message to handle the + gdb-specific printf formats. */ + vfprintf_styled_no_gdbfmt (m_streams.back (), style, + !test_flags (unfiltered_output), format, args); } void @@ -255,7 +271,10 @@ cli_ui_out::do_redirect (ui_file *outstream) void cli_ui_out::field_separator () { - fputc_filtered (' ', m_streams.back ()); + if (test_flags (unfiltered_output)) + fputc_unfiltered (' ', m_streams.back ()); + else + fputc_filtered (' ', m_streams.back ()); } /* Constructor for cli_ui_out. */ |