112e8700a6
This patch finalizes the C++ conversion of the ui-out subsystem, by turning the ui_out and ui_out_impl structures into a single class hierarchy. ui_out functions are turned into virtual methods of that new class, so as a result there are a lot of call sites to update. In the previous version of the patchset, there were separate ui_out and ui_out_impl classes, but it wasn't really useful and added boilerplate. In this version there is simply an ui_out base class that is extended for CLI, TUI and MI. It's a bit hard to maintain a ChangeLog for such a big patch, I did my best but I'm sure there are some missing or outdated info in there... gdb/ChangeLog: * ui-out.h (ui_out_begin, ui_out_end, ui_out_table_header, ui_out_table_body, ui_out_field_int, ui_out_field_fmt_int, ui_out_field_core_addr, ui_out_field_string, ui_out_field_stream, ui_out_field_fmt, ui_out_field_skip, ui_out_spaces, ui_out_text, ui_out_message, ui_out_wrap_hint, ui_out_flush, ui_out_test_flags, ui_out_query_field, ui_out_is_mi_like_p, ui_out_redirect): Remove, replace with a method in class ui_out. (table_begin_ftype): Remove, replace with pure virtual method in class ui_out. (table_body_ftype): Likewise. (table_end_ftype): Likewise. (table_header_ftype): Likewise. (ui_out_begin_ftype): Likewise. (ui_out_end_ftype): Likewise. (field_int_ftype): Likewise. (field_skip_ftype): Likewise. (field_string_ftype): Likewise. (field_fmt_ftype): Likewise. (spaces_ftype): Likewise. (text_ftype): Likewise. (message_ftype): Likewise. (wrap_hint_ftype): Likewise. (flush_ftype): Likewise. (redirect_ftype): Likewise. (data_destroy_ftype): Likewise. (struct ui_out_impl): Remove, replace with class ui_out. (ui_out_new): Remove. (class ui_out): New class. * ui-out.c (struct ui_out): Remove, replaced with class ui_out. (current_level): Remove, replace with ui_out method. (push_level): Likewise. (pop_level): Likewise. (uo_table_begin, uo_table_body, uo_table_end, uo_table_header, uo_begin, uo_end, uo_field_int, uo_field_skip, uo_field_fmt, uo_spaces, uo_text, uo_message, uo_wrap_hint, uo_flush, uo_redirect, uo_field_string): Remove. (ui_out_table_begin): Replace with ... (ui_out::table_begin): ... this. (ui_out_table_body): Replace with ... (ui_out::table_body): ... this. (ui_out_table_end): Replace with ... (ui_out::table_end): ... this. (ui_out_table_header): Replace with ... (ui_out::table_header): ... this. (ui_out_begin): Replace with ... (ui_out::begin): ... this. (ui_out_end): Replace with ... (ui_out::end): ... this. (ui_out_field_int): Replace with ... (ui_out::field_int): ... this. (ui_out_field_fmt_int): Replace with ... (ui_out::field_fmt_int): ... this. (ui_out_field_core_addr): Replace with ... (ui_out::field_core_addr): ... this. (ui_out_field_stream): Replace with ... (ui_out::field_stream): ... this. (ui_out_field_skip): Replace with ... (ui_out::field_skip): ... this. (ui_out_field_string): Replace with ... (ui_out::field_string): ... this. (ui_out_field_fmt): Replace with ... (ui_out::field_fmt): ... this. (ui_out_spaces): Replace with ... (ui_out::spaces): ... this. (ui_out_text): Replace with ... (ui_out::text): ... this. (ui_out_message): Replace with ... (ui_out::message): ... this. (ui_out_wrap_hint): Replace with ... (ui_out::wrap_hint): ... this. (ui_out_flush): Replace with ... (ui_out::flush): ... this. (ui_out_redirect): Replace with ... (ui_out::redirect): ... this. (ui_out_test_flags): Replace with ... (ui_out::test_flags): ... this. (ui_out_is_mi_like_p): Replace with ... (ui_out::is_mi_like_p): ... this. (verify_field): Replace with ... (ui_out::verify_field): ... this. (ui_out_query_field): Replace with ... (ui_out::query_table_field): ... this. (ui_out_data): Remove. (ui_out_new): Remove, replace with ... (ui_out::ui_out): ... this constructor. (do_cleanup_table_end, make_cleanup_ui_out_tuple_begin_end, do_cleanup_end, make_cleanup_ui_out_tuple_begin_end, make_cleanup_ui_out_list_begin_end): Update fallouts of struct ui_out -> class ui_out change. * cli-out.c (cli_out_data): Remove. (cli_uiout_dtor): Remove. (cli_table_begin): Replace with ... (cli_ui_out::do_table_begin): ... this new method. (cli_table_body): Replace with ... (cli_ui_out::do_table_body): ... this new method. (cli_table_end): Replace with ... (cli_ui_out::do_table_end): ... this new method. (cli_table_header): Replace with ... (cli_ui_out::do_table_header): ... this new method. (cli_begin): Replace with ... (cli_ui_out::do_begin): ... this new method. (cli_end): Replace with ... (cli_ui_out::do_end): ... this new method. (cli_field_int): Replace with ... (cli_ui_out::do_field_int): ... this new method. (cli_field_skip): Replace with ... (cli_ui_out::do_field_skip): ... this new method. (cli_field_string): Replace with ... (cli_ui_out::do_field_string): ... this new method. (cli_field_fmt): Replace with ... (cli_ui_out::do_field_fmt): ... this new method. (cli_spaces): Replace with ... (cli_ui_out::do_spaces): ... this new method. (cli_text): Replace with ... (cli_ui_out::do_text): ... this new method. (cli_message): Replace with ... (cli_ui_out::do_message): ... this new method. (cli_wrap_hint): Replace with ... (cli_ui_out::do_wrap_hint): ... this new method. (cli_flush): Replace with ... (cli_ui_out::do_flush): ... this new method. (cli_redirect): Replace with ... (cli_ui_out::do_redirect): ... this new method. (out_field_fmt): Replace with ... (cli_ui_out::out_field_fmt): ... this new method. (field_separator): Replace with ... (cli_ui_out::field_separator): ... this new method. (cli_out_set_stream): Replace with ... (cli_ui_out::set_stream): ... this new method. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_ui_out_impl::cli_ui_out_impl): New constructor. (cli_ui_out_impl::~cli_ui_out_impl): New destructor. (cli_out_new): Change return type to cli_ui_out *, instantiate a cli_ui_out. * cli-out.h (cli_ui_out_data): Remove, replace with class cli_ui_out. (class cli_ui_out): New class. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_out_new): Change return type to cli_ui_out*. (cli_out_set_stream): Remove. * cli/cli-interp.c (struct cli_interp) <cli_uiout>: Change type to cli_ui_out*. (cli_interpreter_resume): Adapt. (cli_interpreter_exec): Adapt. * mi/mi-out.c (mi_ui_out_data, mi_out_data): Remove. (mi_ui_out_impl): Remove. (mi_table_begin): Replace with ... (mi_ui_out::do_table_begin): ... this. (mi_table_body): Replace with ... (mi_ui_out::do_table_body): ... this. (mi_table_end): Replace with ... (mi_ui_out::do_table_end): ... this. (mi_table_header): Replace with ... (mi_ui_out::do_table_header): ... this. (mi_begin): Replace with ... (mi_ui_out::do_begin): ... this. (mi_end): Replace with ... (mi_ui_out::do_end): ... this. (mi_field_int): Replace with ... (mi_ui_out::do_field_int): ... this. (mi_field_skip): Replace with ... (mi_ui_out::do_field_skip): ... this. (mi_field_string): Replace with ... (mi_ui_out::do_field_string): ... this. (mi_field_fmt): Replace with ... (mi_ui_out::do_field_fmt): ... this. (mi_spaces): Replace with ... (mi_ui_out::do_spaces): ... this. (mi_text): Replace with ... (mi_ui_out::do_text): ... this. (mi_message): Replace with ... (mi_ui_out::do_message): ... this. (mi_wrap_hint): Replace with ... (mi_ui_out::do_wrap_hint): ... this. (mi_flush): Replace with ... (mi_ui_out::do_flush): ... this. (mi_redirect): Replace with ... (mi_ui_out::do_redirect): (field_separator): Replace with ... (mi_ui_out::field_separator): (mi_open): Replace with ... (mi_ui_out::open): ... this. (mi_close): Replace with ... (mi_ui_out::close): ... this. (mi_out_rewind): Replace with ... (mi_ui_out::rewind): ... this. (mi_out_put): Replace with ... (mi_ui_out::put): ... this. (mi_version): Replace with ... (mi_ui_out::version): ... this. (mi_out_data_ctor): Replace with ... (mi_ui_out::mi_ui_out): ... this. (mi_out_data_dtor): Replace with ... (mi_ui_out::~mi_ui_out): ... this. (mi_out_new): Change return type to mi_ui_out*, instantiate an mi_ui_out object. (as_mi_ui_out): New function. (mi_version): Update fallouts of struct ui_out to class ui_out transition. (mi_out_put): Likewise. (mi_out_rewind): Likewise. * mi/mi-out.h (mi_out_new): Change return type to mi_ui_out*. * tui/tui-out.c (tui_ui_out_data, tui_out_data, tui_ui_out_impl): Remove. (tui_field_int): Replace with ... (tui_ui_out::do_field_int): ... this. (tui_field_string): Replace with ... (tui_ui_out::do_field_string): ... this. (tui_field_fmt): Replace with ... (tui_ui_out::do_field_fmt): ... this. (tui_text): Replace with ... (tui_ui_out::do_text): ... this. (tui_out_new): Change return type to tui_ui_out*, instantiate tui_ui_out object. (tui_ui_out::tui_ui_out): New. * tui/tui-out.h: New file. * tui/tui.h (tui_out_new): Move declaration to tui/tui-out.h. * tui/tui-io.c: Include tui/tui-out.h. (tui_old_uiout): Change type to cli_ui_out*. (tui_setup_io): Use dynamic_cast. * tui/tui-io.h (tui_old_uiout): Change type to cli_ui_out*. * tui/tui-interp.c (tui_resume): Adapt. * ada-lang.c (print_it_exception): Update fallouts of struct ui_out to class ui_out transition. (print_one_exception): Likewise. (print_mention_exception): Likewise. * ada-tasks.c (print_ada_task_info): Likewise. (info_task): Likewise. (task_command): Likewise. * auto-load.c (print_script): Likewise. (auto_load_info_scripts): Likewise. (info_auto_load_cmd): Likewise. * break-catch-sig.c (signal_catchpoint_print_one): Likewise. * break-catch-syscall.c (print_it_catch_syscall): Likewise. (print_one_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. (print_one_exception_catchpoint): Likewise. (print_one_detail_exception_catchpoint): Likewise. (print_mention_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): Likewise. (print_solib_event): Likewise. (watchpoint_check): Likewise. (wrap_indent_at_field): Likewise. (print_breakpoint_location): Likewise. (output_thread_groups): Likewise. (print_one_breakpoint_location): Likewise. (breakpoint_1): Likewise. (default_collect_info): Likewise. (watchpoints_info): Likewise. (print_it_catch_fork): Likewise. (print_one_catch_fork): Likewise. (print_it_catch_vfork): Likewise. (print_one_catch_vfork): Likewise. (print_it_catch_solib): Likewise. (print_one_catch_solib): Likewise. (print_it_catch_exec): Likewise. (print_one_catch_exec): Likewise. (mention): Likewise. (print_it_ranged_breakpoint): Likewise. (print_one_ranged_breakpoint): Likewise. (print_one_detail_ranged_breakpoint): Likewise. (print_mention_ranged_breakpoint): Likewise. (print_it_watchpoint): Likewise. (print_mention_watchpoint): Likewise. (print_it_masked_watchpoint): Likewise. (print_one_detail_masked_watchpoint): Likewise. (print_mention_masked_watchpoint): Likewise. (bkpt_print_it): Likewise. (tracepoint_print_one_detail): Likewise. (tracepoint_print_mention): Likewise. (update_static_tracepoint): Likewise. (tracepoints_info): Likewise. (save_breakpoints): Likewise. * cli/cli-cmds.c (complete_command): Likewise. * cli/cli-logging.c (set_logging_redirect): Likewise. (pop_output_files): Likewise. (handle_redirections): Likewise. * cli/cli-script.c (print_command_lines): Likewise. * cli/cli-setshow.c (do_show_command): Likewise. (cmd_show_list): Likewise. * cp-abi.c (list_cp_abis): Likewise. (show_cp_abi_cmd): Likewise. * darwin-nat-info.c (darwin_debug_regions_recurse): Likewise. * disasm.c (gdb_pretty_print_insn): Likewise. (do_mixed_source_and_assembly_deprecated): Likewise. (do_mixed_source_and_assembly): Likewise. * gdb_bfd.c (print_one_bfd): Likewise. (maintenance_info_bfds): Likewise. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Likewise. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Likewise. * i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Likewise. * i386-tdep.c (i386_mpx_print_bounds): Likewise. * infcmd.c (run_command_1): Likewise. (print_return_value_1): Likewise. * inferior.c (print_selected_inferior): Likewise. (print_inferior): Likewise. * infrun.c (print_end_stepping_range_reason): Likewise. (print_signal_exited_reason): Likewise. (print_exited_reason): Likewise. (print_signal_received_reason): Likewise. (print_no_history_reason): Likewise. * interps.c (interp_set): Likewise. * linespec.c (decode_line_full): Likewise. * linux-thread-db.c (info_auto_load_libthread_db): Likewise. * mi/mi-cmd-env.c (mi_cmd_env_pwd): Likewise. (mi_cmd_env_path): Likewise. (mi_cmd_env_dir): Likewise. (mi_cmd_inferior_tty_show): Likewise. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Likewise. (print_partial_file_name): Likewise. (mi_cmd_file_list_exec_source_files): Likewise. * mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions): Likewise. (mi_cmd_info_gdb_mi_command): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth): Likewise. (mi_cmd_stack_list_args): Likewise. (list_arg_or_local): Likewise. * mi/mi-cmd-var.c (print_varobj): Likewise. (mi_cmd_var_create): Likewise. (mi_cmd_var_delete): Likewise. (mi_cmd_var_set_format): Likewise. (mi_cmd_var_show_format): Likewise. (mi_cmd_var_info_num_children): Likewise. (mi_cmd_var_list_children): Likewise. (mi_cmd_var_info_type): Likewise. (mi_cmd_var_info_path_expression): Likewise. (mi_cmd_var_info_expression): Likewise. (mi_cmd_var_show_attributes): Likewise. (mi_cmd_var_evaluate_expression): Likewise. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. * mi/mi-interp.c (as_mi_interp): Likewise. (mi_on_normal_stop_1): Likewise. (mi_tsv_modified): Likewise. (mi_breakpoint_created): Likewise. (mi_breakpoint_modified): Likewise. (mi_solib_loaded): Likewise. (mi_solib_unloaded): Likewise. (mi_command_param_changed): Likewise. (mi_memory_changed): Likewise. (mi_user_selected_context_changed): Likewise. * mi/mi-main.c (print_one_inferior): Likewise. (output_cores): Likewise. (list_available_thread_groups): Likewise. (mi_cmd_data_list_register_names): Likewise. (mi_cmd_data_list_changed_registers): Likewise. (output_register): Likewise. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_list_features): Likewise. (mi_cmd_list_target_features): Likewise. (mi_cmd_add_inferior): Likewise. (mi_execute_command): Likewise. (mi_load_progress): Likewise. (print_variable_or_computed): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Likewise. * osdata.c (info_osdata_command): Likewise. * probe.c (gen_ui_out_table_header_info): Likewise. (print_ui_out_not_applicables): Likewise. (print_ui_out_info): Likewise. (info_probes_for_ops): Likewise. (enable_probes_command): Likewise. (disable_probes_command): Likewise. * progspace.c (print_program_space): Likewise. * python/py-breakpoint.c (bppy_get_commands): Likewise. * python/py-framefilter.c (py_print_type): Likewise. (py_print_value): Likewise. (py_print_single_arg): Likewise. (enumerate_args): Likewise. (enumerate_locals): Likewise. (py_print_args): Likewise. (py_print_frame): Likewise. * record-btrace.c (btrace_ui_out_decode_error): Likewise. (btrace_call_history_insn_range): Likewise. (btrace_call_history_src_line): Likewise. (btrace_call_history): Likewise. * remote.c (show_remote_cmd): Likewise. * skip.c (skip_info): Likewise. * solib.c (info_sharedlibrary_command): Likewise. * source.c (print_source_lines_base): Likewise. * spu-tdep.c (info_spu_event_command): Likewise. (info_spu_signal_command): Likewise. (info_spu_mailbox_list): Likewise. (info_spu_dma_cmdlist): Likewise. (info_spu_dma_command): Likewise. (info_spu_proxydma_command): Likewise. * stack.c (print_stack_frame): Likewise. (print_frame_arg): Likewise. (read_frame_arg): Likewise. (print_frame_args): Likewise. (print_frame_info): Likewise. (print_frame): Likewise. * symfile.c (load_progress): Likewise. (generic_load): Likewise. (print_transfer_performance): Likewise. * thread.c (do_captured_list_thread_ids): Likewise. (print_thread_info_1): Likewise. (restore_selected_frame): Likewise. (do_captured_thread_select): Likewise. (print_selected_thread_frame): Likewise. * top.c (execute_command_to_string): Likewise. * tracepoint.c (tvariables_info_1): Likewise. (trace_status_mi): Likewise. (tfind_1): Likewise. (print_one_static_tracepoint_marker): Likewise. (info_static_tracepoint_markers_command): Likewise. * utils.c (do_ui_out_redirect_pop): Likewise. (fputs_maybe_filtered): Likewise.
702 lines
15 KiB
C
702 lines
15 KiB
C
/* Output generating routines for GDB.
|
|
|
|
Copyright (C) 1999-2016 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions.
|
|
Written by Fernando Nasser for Cygnus.
|
|
|
|
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 "expression.h" /* For language.h */
|
|
#include "language.h"
|
|
#include "ui-out.h"
|
|
|
|
#include <vector>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <memory>
|
|
|
|
/* A header of a ui_out_table. */
|
|
|
|
class ui_out_hdr
|
|
{
|
|
public:
|
|
|
|
explicit ui_out_hdr (int number, int min_width, ui_align alignment,
|
|
const std::string &name, const std::string &header)
|
|
: m_number (number),
|
|
m_min_width (min_width),
|
|
m_alignment (alignment),
|
|
m_name (name),
|
|
m_header (header)
|
|
{
|
|
}
|
|
|
|
int number () const
|
|
{
|
|
return m_number;
|
|
}
|
|
|
|
int min_width () const
|
|
{
|
|
return m_min_width;
|
|
}
|
|
|
|
ui_align alignment () const
|
|
{
|
|
return m_alignment;
|
|
}
|
|
|
|
const std::string &header () const
|
|
{
|
|
return m_header;
|
|
}
|
|
|
|
const std::string &name () const
|
|
{
|
|
return m_name;
|
|
}
|
|
|
|
private:
|
|
|
|
/* The number of the table column this header represents, 1-based. */
|
|
int m_number;
|
|
|
|
/* Minimal column width in characters. May or may not be applicable,
|
|
depending on the actual implementation of ui_out. */
|
|
int m_min_width;
|
|
|
|
/* Alignment of the content in the column. May or may not be applicable,
|
|
depending on the actual implementation of ui_out. */
|
|
ui_align m_alignment;
|
|
|
|
/* Internal column name, used to internally refer to the column. */
|
|
std::string m_name;
|
|
|
|
/* Printed header text of the column. */
|
|
std::string m_header;
|
|
};
|
|
|
|
/* A level of nesting (either a list or a tuple) in a ui_out output. */
|
|
|
|
class ui_out_level
|
|
{
|
|
public:
|
|
|
|
explicit ui_out_level (ui_out_type type)
|
|
: m_type (type),
|
|
m_field_count (0)
|
|
{
|
|
}
|
|
|
|
ui_out_type type () const
|
|
{
|
|
return m_type;
|
|
}
|
|
|
|
int field_count () const
|
|
{
|
|
return m_field_count;
|
|
}
|
|
|
|
void inc_field_count ()
|
|
{
|
|
m_field_count++;
|
|
}
|
|
|
|
private:
|
|
|
|
/* The type of this level. */
|
|
ui_out_type m_type;
|
|
|
|
/* Count each field; the first element is for non-list fields. */
|
|
int m_field_count;
|
|
};
|
|
|
|
/* Tables are special. Maintain a separate structure that tracks
|
|
their state. At present an output can only contain a single table
|
|
but that restriction might eventually be lifted. */
|
|
|
|
class ui_out_table
|
|
{
|
|
public:
|
|
|
|
/* States (steps) of a table generation. */
|
|
|
|
enum class state
|
|
{
|
|
/* We are generating the table headers. */
|
|
HEADERS,
|
|
|
|
/* We are generating the table body. */
|
|
BODY,
|
|
};
|
|
|
|
explicit ui_out_table (int entry_level, int nr_cols, const std::string &id)
|
|
: m_state (state::HEADERS),
|
|
m_entry_level (entry_level),
|
|
m_nr_cols (nr_cols),
|
|
m_id (id)
|
|
{
|
|
}
|
|
|
|
/* Start building the body of the table. */
|
|
|
|
void start_body ();
|
|
|
|
/* Add a new header to the table. */
|
|
|
|
void append_header (int width, ui_align alignment,
|
|
const std::string &col_name, const std::string &col_hdr);
|
|
|
|
void start_row ();
|
|
|
|
/* Extract the format information for the next header and advance
|
|
the header iterator. Return false if there was no next header. */
|
|
|
|
bool get_next_header (int *colno, int *width, ui_align *alignment,
|
|
const char **col_hdr);
|
|
|
|
bool query_field (int colno, int *width, int *alignment,
|
|
const char **col_name) const;
|
|
|
|
state current_state () const;
|
|
|
|
int entry_level () const;
|
|
|
|
private:
|
|
|
|
state m_state;
|
|
|
|
/* The level at which each entry of the table is to be found. A row
|
|
(a tuple) is made up of entries. Consequently ENTRY_LEVEL is one
|
|
above that of the table. */
|
|
int m_entry_level;
|
|
|
|
/* Number of table columns (as specified in the table_begin call). */
|
|
int m_nr_cols;
|
|
|
|
/* String identifying the table (as specified in the table_begin
|
|
call). */
|
|
std::string m_id;
|
|
|
|
/* Pointers to the column headers. */
|
|
std::vector<std::unique_ptr<ui_out_hdr>> m_headers;
|
|
|
|
/* Iterator over the headers vector, used when printing successive fields. */
|
|
std::vector<std::unique_ptr<ui_out_hdr>>::const_iterator m_headers_iterator;
|
|
};
|
|
|
|
/* See ui-out.h. */
|
|
|
|
void ui_out_table::start_body ()
|
|
{
|
|
if (m_state != state::HEADERS)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("extra table_body call not allowed; there must be only "
|
|
"one table_body after a table_begin and before a "
|
|
"table_end."));
|
|
|
|
/* Check if the number of defined headers matches the number of expected
|
|
columns. */
|
|
if (m_headers.size () != m_nr_cols)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("number of headers differ from number of table "
|
|
"columns."));
|
|
|
|
m_state = state::BODY;
|
|
m_headers_iterator = m_headers.begin ();
|
|
}
|
|
|
|
/* See ui-out.h. */
|
|
|
|
void ui_out_table::append_header (int width, ui_align alignment,
|
|
const std::string &col_name,
|
|
const std::string &col_hdr)
|
|
{
|
|
if (m_state != state::HEADERS)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("table header must be specified after table_begin and "
|
|
"before table_body."));
|
|
|
|
std::unique_ptr<ui_out_hdr> header (new ui_out_hdr (m_headers.size () + 1,
|
|
width, alignment,
|
|
col_name, col_hdr));
|
|
|
|
m_headers.push_back (std::move (header));
|
|
}
|
|
|
|
/* See ui-out.h. */
|
|
|
|
void ui_out_table::start_row ()
|
|
{
|
|
m_headers_iterator = m_headers.begin ();
|
|
}
|
|
|
|
/* See ui-out.h. */
|
|
|
|
bool ui_out_table::get_next_header (int *colno, int *width, ui_align *alignment,
|
|
const char **col_hdr)
|
|
{
|
|
/* There may be no headers at all or we may have used all columns. */
|
|
if (m_headers_iterator == m_headers.end ())
|
|
return false;
|
|
|
|
ui_out_hdr *hdr = m_headers_iterator->get ();
|
|
|
|
*colno = hdr->number ();
|
|
*width = hdr->min_width ();
|
|
*alignment = hdr->alignment ();
|
|
*col_hdr = hdr->header ().c_str ();
|
|
|
|
/* Advance the header pointer to the next entry. */
|
|
m_headers_iterator++;
|
|
|
|
return true;
|
|
}
|
|
|
|
/* See ui-out.h. */
|
|
|
|
bool ui_out_table::query_field (int colno, int *width, int *alignment,
|
|
const char **col_name) const
|
|
{
|
|
/* Column numbers are 1-based, so convert to 0-based index. */
|
|
int index = colno - 1;
|
|
|
|
if (index >= 0 && index < m_headers.size ())
|
|
{
|
|
ui_out_hdr *hdr = m_headers[index].get ();
|
|
|
|
gdb_assert (colno == hdr->number ());
|
|
|
|
*width = hdr->min_width ();
|
|
*alignment = hdr->alignment ();
|
|
*col_name = hdr->name ().c_str ();
|
|
|
|
return true;
|
|
}
|
|
else
|
|
return false;
|
|
}
|
|
|
|
/* See ui-out.h. */
|
|
|
|
ui_out_table::state ui_out_table::current_state () const
|
|
{
|
|
return m_state;
|
|
}
|
|
|
|
/* See ui-out.h. */
|
|
|
|
int ui_out_table::entry_level () const
|
|
{
|
|
return m_entry_level;
|
|
}
|
|
|
|
int
|
|
ui_out::level () const
|
|
{
|
|
return m_levels.size ();
|
|
}
|
|
|
|
/* The current (inner most) level. */
|
|
|
|
ui_out_level *
|
|
ui_out::current_level () const
|
|
{
|
|
return m_levels.back ().get ();
|
|
}
|
|
|
|
/* Create a new level, of TYPE. */
|
|
void
|
|
ui_out::push_level (ui_out_type type)
|
|
{
|
|
std::unique_ptr<ui_out_level> level (new ui_out_level (type));
|
|
|
|
m_levels.push_back (std::move (level));
|
|
}
|
|
|
|
/* Discard the current level. TYPE is the type of the level being
|
|
discarded. */
|
|
void
|
|
ui_out::pop_level (ui_out_type type)
|
|
{
|
|
/* We had better not underflow the buffer. */
|
|
gdb_assert (m_levels.size () > 0);
|
|
gdb_assert (current_level ()->type () == type);
|
|
|
|
m_levels.pop_back ();
|
|
}
|
|
|
|
/* Mark beginning of a table. */
|
|
|
|
void
|
|
ui_out::table_begin (int nr_cols, int nr_rows, const std::string &tblid)
|
|
{
|
|
if (m_table_up != nullptr)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("tables cannot be nested; table_begin found before \
|
|
previous table_end."));
|
|
|
|
m_table_up.reset (new ui_out_table (level () + 1, nr_cols, tblid));
|
|
|
|
do_table_begin (nr_cols, nr_rows, tblid.c_str ());
|
|
}
|
|
|
|
void
|
|
ui_out::table_header (int width, ui_align alignment,
|
|
const std::string &col_name, const std::string &col_hdr)
|
|
{
|
|
if (m_table_up == nullptr)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("table_header outside a table is not valid; it must be \
|
|
after a table_begin and before a table_body."));
|
|
|
|
m_table_up->append_header (width, alignment, col_name, col_hdr);
|
|
|
|
do_table_header (width, alignment, col_name, col_hdr);
|
|
}
|
|
|
|
void
|
|
ui_out::table_body ()
|
|
{
|
|
if (m_table_up == nullptr)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("table_body outside a table is not valid; it must be "
|
|
"after a table_begin and before a table_end."));
|
|
|
|
m_table_up->start_body ();
|
|
|
|
do_table_body ();
|
|
}
|
|
|
|
void
|
|
ui_out::table_end ()
|
|
{
|
|
if (m_table_up == nullptr)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("misplaced table_end or missing table_begin."));
|
|
|
|
do_table_end ();
|
|
|
|
m_table_up = nullptr;
|
|
}
|
|
|
|
static void
|
|
do_cleanup_table_end (void *data)
|
|
{
|
|
ui_out *uiout = (ui_out *) data;
|
|
|
|
uiout->table_end ();
|
|
}
|
|
|
|
struct cleanup *
|
|
make_cleanup_ui_out_table_begin_end (ui_out *uiout, int nr_cols, int nr_rows,
|
|
const char *tblid)
|
|
{
|
|
uiout->table_begin (nr_cols, nr_rows, tblid);
|
|
return make_cleanup (do_cleanup_table_end, uiout);
|
|
}
|
|
|
|
void
|
|
ui_out::begin (ui_out_type type, const char *id)
|
|
{
|
|
/* Be careful to verify the ``field'' before the new tuple/list is
|
|
pushed onto the stack. That way the containing list/table/row is
|
|
verified and not the newly created tuple/list. This verification
|
|
is needed (at least) for the case where a table row entry
|
|
contains either a tuple/list. For that case bookkeeping such as
|
|
updating the column count or advancing to the next heading still
|
|
needs to be performed. */
|
|
{
|
|
int fldno;
|
|
int width;
|
|
ui_align align;
|
|
|
|
verify_field (&fldno, &width, &align);
|
|
}
|
|
|
|
push_level (type);
|
|
|
|
/* If the push puts us at the same level as a table row entry, we've
|
|
got a new table row. Put the header pointer back to the start. */
|
|
if (m_table_up != nullptr
|
|
&& m_table_up->current_state () == ui_out_table::state::BODY
|
|
&& m_table_up->entry_level () == level ())
|
|
m_table_up->start_row ();
|
|
|
|
do_begin (type, id);
|
|
}
|
|
|
|
void
|
|
ui_out::end (ui_out_type type)
|
|
{
|
|
pop_level (type);
|
|
|
|
do_end (type);
|
|
}
|
|
|
|
struct ui_out_end_cleanup_data
|
|
{
|
|
struct ui_out *uiout;
|
|
enum ui_out_type type;
|
|
};
|
|
|
|
static void
|
|
do_cleanup_end (void *data)
|
|
{
|
|
struct ui_out_end_cleanup_data *end_cleanup_data
|
|
= (struct ui_out_end_cleanup_data *) data;
|
|
|
|
end_cleanup_data->uiout->end (end_cleanup_data->type);
|
|
xfree (end_cleanup_data);
|
|
}
|
|
|
|
static struct cleanup *
|
|
make_cleanup_ui_out_end (struct ui_out *uiout,
|
|
enum ui_out_type type)
|
|
{
|
|
struct ui_out_end_cleanup_data *end_cleanup_data;
|
|
|
|
end_cleanup_data = XNEW (struct ui_out_end_cleanup_data);
|
|
end_cleanup_data->uiout = uiout;
|
|
end_cleanup_data->type = type;
|
|
return make_cleanup (do_cleanup_end, end_cleanup_data);
|
|
}
|
|
|
|
struct cleanup *
|
|
make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
|
|
const char *id)
|
|
{
|
|
uiout->begin (ui_out_type_tuple, id);
|
|
return make_cleanup_ui_out_end (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
struct cleanup *
|
|
make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
|
|
const char *id)
|
|
{
|
|
uiout->begin (ui_out_type_list, id);
|
|
return make_cleanup_ui_out_end (uiout, ui_out_type_list);
|
|
}
|
|
|
|
void
|
|
ui_out::field_int (const char *fldname, int value)
|
|
{
|
|
int fldno;
|
|
int width;
|
|
ui_align align;
|
|
|
|
verify_field (&fldno, &width, &align);
|
|
|
|
do_field_int (fldno, width, align, fldname, value);
|
|
}
|
|
|
|
void
|
|
ui_out::field_fmt_int (int input_width, ui_align input_align,
|
|
const char *fldname, int value)
|
|
{
|
|
int fldno;
|
|
int width;
|
|
ui_align align;
|
|
|
|
verify_field (&fldno, &width, &align);
|
|
|
|
do_field_int (fldno, input_width, input_align, fldname, value);
|
|
}
|
|
|
|
/* Documented in ui-out.h. */
|
|
|
|
void
|
|
ui_out::field_core_addr (const char *fldname, struct gdbarch *gdbarch,
|
|
CORE_ADDR address)
|
|
{
|
|
field_string (fldname, print_core_address (gdbarch, address));
|
|
}
|
|
|
|
void
|
|
ui_out::field_stream (const char *fldname, ui_file *stream)
|
|
{
|
|
std::string buffer = ui_file_as_string (stream);
|
|
|
|
if (!buffer.empty ())
|
|
field_string (fldname, buffer.c_str ());
|
|
else
|
|
field_skip (fldname);
|
|
ui_file_rewind (stream);
|
|
}
|
|
|
|
/* Used to omit a field. */
|
|
|
|
void
|
|
ui_out::field_skip (const char *fldname)
|
|
{
|
|
int fldno;
|
|
int width;
|
|
ui_align align;
|
|
|
|
verify_field (&fldno, &width, &align);
|
|
|
|
do_field_skip (fldno, width, align, fldname);
|
|
}
|
|
|
|
void
|
|
ui_out::field_string (const char *fldname, const char *string)
|
|
{
|
|
int fldno;
|
|
int width;
|
|
ui_align align;
|
|
|
|
verify_field (&fldno, &width, &align);
|
|
|
|
do_field_string (fldno, width, align, fldname, string);
|
|
}
|
|
|
|
/* VARARGS */
|
|
void
|
|
ui_out::field_fmt (const char *fldname, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
int fldno;
|
|
int width;
|
|
ui_align align;
|
|
|
|
/* Will not align, but has to call anyway. */
|
|
verify_field (&fldno, &width, &align);
|
|
|
|
va_start (args, format);
|
|
|
|
do_field_fmt (fldno, width, align, fldname, format, args);
|
|
|
|
va_end (args);
|
|
}
|
|
|
|
void
|
|
ui_out::spaces (int numspaces)
|
|
{
|
|
do_spaces (numspaces);
|
|
}
|
|
|
|
void
|
|
ui_out::text (const char *string)
|
|
{
|
|
do_text (string);
|
|
}
|
|
|
|
void
|
|
ui_out::message (const char *format, ...)
|
|
{
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
do_message (format, args);
|
|
va_end (args);
|
|
}
|
|
|
|
void
|
|
ui_out::wrap_hint (const char *identstring)
|
|
{
|
|
do_wrap_hint (identstring);
|
|
}
|
|
|
|
void
|
|
ui_out::flush ()
|
|
{
|
|
do_flush ();
|
|
}
|
|
|
|
int
|
|
ui_out::redirect (ui_file *outstream)
|
|
{
|
|
return do_redirect (outstream);
|
|
}
|
|
|
|
/* Test the flags against the mask given. */
|
|
ui_out_flags
|
|
ui_out::test_flags (ui_out_flags mask)
|
|
{
|
|
return m_flags & mask;
|
|
}
|
|
|
|
bool
|
|
ui_out::is_mi_like_p ()
|
|
{
|
|
return do_is_mi_like_p ();
|
|
}
|
|
|
|
/* Verify that the field/tuple/list is correctly positioned. Return
|
|
the field number and corresponding alignment (if
|
|
available/applicable). */
|
|
|
|
void
|
|
ui_out::verify_field (int *fldno, int *width, ui_align *align)
|
|
{
|
|
ui_out_level *current = current_level ();
|
|
const char *text;
|
|
|
|
if (m_table_up != nullptr
|
|
&& m_table_up->current_state () != ui_out_table::state::BODY)
|
|
{
|
|
internal_error (__FILE__, __LINE__,
|
|
_("table_body missing; table fields must be \
|
|
specified after table_body and inside a list."));
|
|
}
|
|
|
|
current->inc_field_count ();
|
|
|
|
if (m_table_up != nullptr
|
|
&& m_table_up->current_state () == ui_out_table::state::BODY
|
|
&& m_table_up->entry_level () == level ()
|
|
&& m_table_up->get_next_header (fldno, width, align, &text))
|
|
{
|
|
if (*fldno != current->field_count ())
|
|
internal_error (__FILE__, __LINE__,
|
|
_("ui-out internal error in handling headers."));
|
|
}
|
|
else
|
|
{
|
|
*width = 0;
|
|
*align = ui_noalign;
|
|
*fldno = current->field_count ();
|
|
}
|
|
}
|
|
|
|
/* Access table field parameters. */
|
|
|
|
bool
|
|
ui_out::query_table_field (int colno, int *width, int *alignment,
|
|
const char **col_name)
|
|
{
|
|
if (m_table_up == nullptr)
|
|
return false;
|
|
|
|
return m_table_up->query_field (colno, width, alignment, col_name);
|
|
}
|
|
|
|
/* The constructor. */
|
|
|
|
ui_out::ui_out (ui_out_flags flags)
|
|
: m_flags (flags)
|
|
{
|
|
/* Create the ui-out level #1, the default level. */
|
|
push_level (ui_out_type_tuple);
|
|
}
|
|
|
|
ui_out::~ui_out ()
|
|
{
|
|
}
|