
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.
351 lines
7.1 KiB
C
351 lines
7.1 KiB
C
/* MI Command Set - output generating routines.
|
|
|
|
Copyright (C) 2000-2019 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "mi-out.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "interps.h"
|
|
#include "ui-out.h"
|
|
#include "utils.h"
|
|
|
|
/* Mark beginning of a table. */
|
|
|
|
void
|
|
mi_ui_out::do_table_begin (int nr_cols, int nr_rows,
|
|
const char *tblid)
|
|
{
|
|
open (tblid, ui_out_type_tuple);
|
|
do_field_signed (-1, -1, ui_left, "nr_rows", nr_rows);
|
|
do_field_signed (-1, -1, ui_left, "nr_cols", nr_cols);
|
|
open ("hdr", ui_out_type_list);
|
|
}
|
|
|
|
/* Mark beginning of a table body. */
|
|
|
|
void
|
|
mi_ui_out::do_table_body ()
|
|
{
|
|
/* close the table header line if there were any headers */
|
|
close (ui_out_type_list);
|
|
open ("body", ui_out_type_list);
|
|
}
|
|
|
|
/* Mark end of a table. */
|
|
|
|
void
|
|
mi_ui_out::do_table_end ()
|
|
{
|
|
close (ui_out_type_list); /* body */
|
|
close (ui_out_type_tuple);
|
|
}
|
|
|
|
/* Specify table header. */
|
|
|
|
void
|
|
mi_ui_out::do_table_header (int width, ui_align alignment,
|
|
const std::string &col_name,
|
|
const std::string &col_hdr)
|
|
{
|
|
open (NULL, ui_out_type_tuple);
|
|
do_field_signed (0, 0, ui_center, "width", width);
|
|
do_field_signed (0, 0, ui_center, "alignment", alignment);
|
|
do_field_string (0, 0, ui_center, "col_name", col_name.c_str (),
|
|
ui_file_style ());
|
|
do_field_string (0, width, alignment, "colhdr", col_hdr.c_str (),
|
|
ui_file_style ());
|
|
close (ui_out_type_tuple);
|
|
}
|
|
|
|
/* Mark beginning of a list. */
|
|
|
|
void
|
|
mi_ui_out::do_begin (ui_out_type type, const char *id)
|
|
{
|
|
open (id, type);
|
|
}
|
|
|
|
/* Mark end of a list. */
|
|
|
|
void
|
|
mi_ui_out::do_end (ui_out_type type)
|
|
{
|
|
close (type);
|
|
}
|
|
|
|
/* Output an int field. */
|
|
|
|
void
|
|
mi_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
|
|
const char *fldname, LONGEST value)
|
|
{
|
|
do_field_string (fldno, width, alignment, fldname, plongest (value),
|
|
ui_file_style ());
|
|
}
|
|
|
|
/* Output an unsigned field. */
|
|
|
|
void
|
|
mi_ui_out::do_field_unsigned (int fldno, int width, ui_align alignment,
|
|
const char *fldname, ULONGEST value)
|
|
{
|
|
do_field_string (fldno, width, alignment, fldname, pulongest (value),
|
|
ui_file_style ());
|
|
}
|
|
|
|
/* Used to omit a field. */
|
|
|
|
void
|
|
mi_ui_out::do_field_skip (int fldno, int width, ui_align alignment,
|
|
const char *fldname)
|
|
{
|
|
}
|
|
|
|
/* Other specific mi_field_* end up here so alignment and field
|
|
separators are both handled by mi_field_string. */
|
|
|
|
void
|
|
mi_ui_out::do_field_string (int fldno, int width, ui_align align,
|
|
const char *fldname, const char *string,
|
|
const ui_file_style &style)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
field_separator ();
|
|
|
|
if (fldname)
|
|
fprintf_unfiltered (stream, "%s=", fldname);
|
|
fprintf_unfiltered (stream, "\"");
|
|
if (string)
|
|
fputstr_unfiltered (string, '"', stream);
|
|
fprintf_unfiltered (stream, "\"");
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_field_fmt (int fldno, int width, ui_align align,
|
|
const char *fldname, const char *format,
|
|
va_list args)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
field_separator ();
|
|
|
|
if (fldname)
|
|
fprintf_unfiltered (stream, "%s=\"", fldname);
|
|
else
|
|
fputs_unfiltered ("\"", stream);
|
|
vfprintf_unfiltered (stream, format, args);
|
|
fputs_unfiltered ("\"", stream);
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_spaces (int numspaces)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_text (const char *string)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_message (const ui_file_style &style,
|
|
const char *format, va_list args)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_wrap_hint (const char *identstring)
|
|
{
|
|
wrap_here (identstring);
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_flush ()
|
|
{
|
|
|
|
gdb_flush (m_streams.back ());
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_redirect (ui_file *outstream)
|
|
{
|
|
if (outstream != NULL)
|
|
m_streams.push_back (outstream);
|
|
else
|
|
m_streams.pop_back ();
|
|
}
|
|
|
|
void
|
|
mi_ui_out::field_separator ()
|
|
{
|
|
if (m_suppress_field_separator)
|
|
m_suppress_field_separator = false;
|
|
else
|
|
fputc_unfiltered (',', m_streams.back ());
|
|
}
|
|
|
|
void
|
|
mi_ui_out::open (const char *name, ui_out_type type)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
|
|
field_separator ();
|
|
m_suppress_field_separator = true;
|
|
|
|
if (name)
|
|
fprintf_unfiltered (stream, "%s=", name);
|
|
|
|
switch (type)
|
|
{
|
|
case ui_out_type_tuple:
|
|
fputc_unfiltered ('{', stream);
|
|
break;
|
|
|
|
case ui_out_type_list:
|
|
fputc_unfiltered ('[', stream);
|
|
break;
|
|
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
}
|
|
|
|
void
|
|
mi_ui_out::close (ui_out_type type)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
|
|
switch (type)
|
|
{
|
|
case ui_out_type_tuple:
|
|
fputc_unfiltered ('}', stream);
|
|
break;
|
|
|
|
case ui_out_type_list:
|
|
fputc_unfiltered (']', stream);
|
|
break;
|
|
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
|
|
m_suppress_field_separator = false;
|
|
}
|
|
|
|
string_file *
|
|
mi_ui_out::main_stream ()
|
|
{
|
|
gdb_assert (m_streams.size () == 1);
|
|
|
|
return (string_file *) m_streams.back ();
|
|
}
|
|
|
|
/* Clear the buffer. */
|
|
|
|
void
|
|
mi_ui_out::rewind ()
|
|
{
|
|
main_stream ()->clear ();
|
|
}
|
|
|
|
/* Dump the buffer onto the specified stream. */
|
|
|
|
void
|
|
mi_ui_out::put (ui_file *where)
|
|
{
|
|
string_file *mi_stream = main_stream ();
|
|
|
|
where->write (mi_stream->data (), mi_stream->size ());
|
|
mi_stream->clear ();
|
|
}
|
|
|
|
/* Return the current MI version. */
|
|
|
|
int
|
|
mi_ui_out::version ()
|
|
{
|
|
return m_mi_version;
|
|
}
|
|
|
|
/* Constructor for an `mi_out_data' object. */
|
|
|
|
mi_ui_out::mi_ui_out (int mi_version)
|
|
: ui_out (mi_version >= 3
|
|
? fix_multi_location_breakpoint_output : (ui_out_flag) 0),
|
|
m_suppress_field_separator (false),
|
|
m_suppress_output (false),
|
|
m_mi_version (mi_version)
|
|
{
|
|
string_file *stream = new string_file ();
|
|
m_streams.push_back (stream);
|
|
}
|
|
|
|
mi_ui_out::~mi_ui_out ()
|
|
{
|
|
}
|
|
|
|
/* See mi/mi-out.h. */
|
|
|
|
mi_ui_out *
|
|
mi_out_new (const char *mi_version)
|
|
{
|
|
if (streq (mi_version, INTERP_MI3) || streq (mi_version, INTERP_MI))
|
|
return new mi_ui_out (3);
|
|
|
|
if (streq (mi_version, INTERP_MI2))
|
|
return new mi_ui_out (2);
|
|
|
|
if (streq (mi_version, INTERP_MI1))
|
|
return new mi_ui_out (1);
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/* Helper function to return the given UIOUT as an mi_ui_out. It is an error
|
|
to call this function with an ui_out that is not an MI. */
|
|
|
|
static mi_ui_out *
|
|
as_mi_ui_out (ui_out *uiout)
|
|
{
|
|
mi_ui_out *mi_uiout = dynamic_cast<mi_ui_out *> (uiout);
|
|
|
|
gdb_assert (mi_uiout != NULL);
|
|
|
|
return mi_uiout;
|
|
}
|
|
|
|
int
|
|
mi_version (ui_out *uiout)
|
|
{
|
|
return as_mi_ui_out (uiout)->version ();
|
|
}
|
|
|
|
void
|
|
mi_out_put (ui_out *uiout, struct ui_file *stream)
|
|
{
|
|
return as_mi_ui_out (uiout)->put (stream);
|
|
}
|
|
|
|
void
|
|
mi_out_rewind (ui_out *uiout)
|
|
{
|
|
return as_mi_ui_out (uiout)->rewind ();
|
|
}
|