From 2a3c1174c3c0db1140180fb3fc56ac324d1c0a7c Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 5 Jun 2019 09:17:16 +0100 Subject: 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 Tom Tromey * 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) : 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) : Add comment. : New methods. : 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) : Add style parameter. * mi/mi-out.c (mi_ui_out::do_message): Add style parameter. * gdbsupport/format.h (class 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) : 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) : New method. gdb/testsuite/ChangeLog 2019-10-01 Tom Tromey * gdb.base/style.exp: Update tests. --- gdb/mi/mi-out.c | 3 ++- gdb/mi/mi-out.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'gdb/mi') diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 0b93073..71af486 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -166,7 +166,8 @@ mi_ui_out::do_text (const char *string) } void -mi_ui_out::do_message (const char *format, va_list args) +mi_ui_out::do_message (const ui_file_style &style, + const char *format, va_list args) { } diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h index 90528fd..9393809 100644 --- a/gdb/mi/mi-out.h +++ b/gdb/mi/mi-out.h @@ -72,8 +72,9 @@ protected: override ATTRIBUTE_PRINTF (6,0); virtual void do_spaces (int numspaces) override; virtual void do_text (const char *string) override; - virtual void do_message (const char *format, va_list args) override - ATTRIBUTE_PRINTF (2,0); + virtual void do_message (const ui_file_style &style, + const char *format, va_list args) override + ATTRIBUTE_PRINTF (3,0); virtual void do_wrap_hint (const char *identstring) override; virtual void do_flush () override; virtual void do_redirect (struct ui_file *outstream) override; -- cgit v1.1