mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
2a3c1174c3
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.
102 lines
2.7 KiB
C++
102 lines
2.7 KiB
C++
/* Parse a printf-style format string.
|
|
|
|
Copyright (C) 1986-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef COMMON_FORMAT_H
|
|
#define COMMON_FORMAT_H
|
|
|
|
#include "gdbsupport/gdb_string_view.h"
|
|
|
|
#if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG)
|
|
# define USE_PRINTF_I64 1
|
|
# define PRINTF_HAS_LONG_LONG
|
|
#else
|
|
# define USE_PRINTF_I64 0
|
|
#endif
|
|
|
|
/* The argclass represents the general type of data that goes with a
|
|
format directive; int_arg for %d, long_arg for %l, and so forth.
|
|
Note that these primarily distinguish types by size and need for
|
|
special handling, so for instance %u and %x are (at present) also
|
|
classed as int_arg. */
|
|
|
|
enum argclass
|
|
{
|
|
literal_piece,
|
|
int_arg, long_arg, long_long_arg, ptr_arg,
|
|
string_arg, wide_string_arg, wide_char_arg,
|
|
double_arg, long_double_arg,
|
|
dec32float_arg, dec64float_arg, dec128float_arg
|
|
};
|
|
|
|
/* A format piece is a section of the format string that may include a
|
|
single print directive somewhere in it, and the associated class
|
|
for the argument. */
|
|
|
|
struct format_piece
|
|
{
|
|
format_piece (const char *str, enum argclass argc, int n)
|
|
: string (str),
|
|
argclass (argc),
|
|
n_int_args (n)
|
|
{
|
|
}
|
|
|
|
bool operator== (const format_piece &other) const
|
|
{
|
|
return (this->argclass == other.argclass
|
|
&& gdb::string_view (this->string) == other.string);
|
|
}
|
|
|
|
const char *string;
|
|
enum argclass argclass;
|
|
/* Count the number of preceding 'int' arguments that must be passed
|
|
along. This is used for a width or precision of '*'. Note that
|
|
this feature is only available in "gdb_extensions" mode. */
|
|
int n_int_args;
|
|
};
|
|
|
|
class format_pieces
|
|
{
|
|
public:
|
|
|
|
format_pieces (const char **arg, bool gdb_extensions = false);
|
|
~format_pieces () = default;
|
|
|
|
DISABLE_COPY_AND_ASSIGN (format_pieces);
|
|
|
|
typedef std::vector<format_piece>::iterator iterator;
|
|
|
|
iterator begin ()
|
|
{
|
|
return m_pieces.begin ();
|
|
}
|
|
|
|
iterator end ()
|
|
{
|
|
return m_pieces.end ();
|
|
}
|
|
|
|
private:
|
|
|
|
std::vector<format_piece> m_pieces;
|
|
gdb::unique_xmalloc_ptr<char> m_storage;
|
|
};
|
|
|
|
#endif /* COMMON_FORMAT_H */
|