mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 09:08:59 +00:00
Replace most calls to help_list and cmd_show_list
Currently there are many prefix commands that do nothing but call either help_list or cmd_show_list. I happened to notice that one such call, for "set print type", used the wrong command list parameter, causing incorrect output. Rather than fix this bug in isolation, I decided to eliminate this possibility by adding two new ways to add prefix commands, which simply route the call to help_list or cmd_show_list, as appropriate. This makes it impossible for a mismatch to occur. In some cases, a bit of output was removed; however, I don't think this output in general was very useful. It seemed redundant with what's already printed by help_list. A representative example is this hunk, removed from ada-lang.c: - printf_unfiltered (_(\ -"\"set ada\" must be followed by the name of a setting.\n")); This simplified the CLI style set/show commands quite a bit, and allowed the deletion of a macro. This also cleans up some unusual code in windows-tdep.c. Tested on x86-64 Fedora 30. Note that I have no way to build the go32-nat.c change. gdb/ChangeLog 2020-04-17 Tom Tromey <tromey@adacore.com> * auto-load.c (show_auto_load_cmd): Remove. (auto_load_show_cmdlist_get): Use add_show_prefix_cmd. * arc-tdep.c (_initialize_arc_tdep): Use add_show_prefix_cmd. (maintenance_print_arc_command): Remove. * tui/tui-win.c (tui_command): Remove. (tui_get_cmd_list): Use add_basic_prefix_cmd. * tui/tui-layout.c (tui_layout_command): Remove. (_initialize_tui_layout): Use add_basic_prefix_cmd. * python/python.c (user_set_python, user_show_python): Remove. (_initialize_python): Use add_basic_prefix_cmd, add_show_prefix_cmd. * guile/guile.c (set_guile_command, show_guile_command): Remove. (install_gdb_commands): Use add_basic_prefix_cmd, add_show_prefix_cmd. (info_guile_command): Remove. * dwarf2/read.c (set_dwarf_cmd, show_dwarf_cmd): Remove. (_initialize_dwarf2_read): Use add_basic_prefix_cmd, add_show_prefix_cmd. * cli/cli-style.h (class cli_style_option) <add_setshow_commands>: Remove do_set and do_show parameters. * cli/cli-style.c (set_style, show_style): Remove. (_initialize_cli_style): Use add_basic_prefix_cmd, add_show_prefix_cmd. (cli_style_option::add_setshow_commands): Remove do_set and do_show parameters. (cli_style_option::add_setshow_commands): Use add_basic_prefix_cmd, add_show_prefix_cmd. (STYLE_ADD_SETSHOW_COMMANDS): Remove macro. (set_style_name): Remove. * cli/cli-dump.c (dump_command, append_command): Remove. (srec_dump_command, ihex_dump_command, verilog_dump_command) (tekhex_dump_command, binary_dump_command) (binary_append_command): Remove. (_initialize_cli_dump): Use add_basic_prefix_cmd. * windows-tdep.c (w32_prefix_command_valid): Remove global. (init_w32_command_list): Remove; move into ... (_initialize_windows_tdep): ... here. Use add_basic_prefix_cmd. * valprint.c (set_print, show_print, set_print_raw) (show_print_raw): Remove. (_initialize_valprint): Use add_basic_prefix_cmd, add_show_prefix_cmd. * typeprint.c (set_print_type, show_print_type): Remove. (_initialize_typeprint): Use add_basic_prefix_cmd, add_show_prefix_cmd. * record.c (set_record_command, show_record_command): Remove. (_initialize_record): Use add_basic_prefix_cmd, add_show_prefix_cmd. * cli/cli-cmds.c (_initialize_cli_cmds): Use add_basic_prefix_cmd, add_show_prefix_cmd. (info_command, show_command, set_debug, show_debug): Remove. * top.h (set_history, show_history): Don't declare. * top.c (set_history, show_history): Remove. * target-descriptions.c (set_tdesc_cmd, show_tdesc_cmd) (unset_tdesc_cmd): Remove. (_initialize_target_descriptions): Use add_basic_prefix_cmd, add_show_prefix_cmd. * symtab.c (info_module_command): Remove. (_initialize_symtab): Use add_basic_prefix_cmd. * symfile.c (overlay_command): Remove. (_initialize_symfile): Use add_basic_prefix_cmd. * sparc64-tdep.c (info_adi_command): Remove. (_initialize_sparc64_adi_tdep): Use add_basic_prefix_cmd. * sh-tdep.c (show_sh_command, set_sh_command): Remove. (_initialize_sh_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * serial.c (serial_set_cmd, serial_show_cmd): Remove. (_initialize_serial): Use add_basic_prefix_cmd, add_show_prefix_cmd. * ser-tcp.c (set_tcp_cmd, show_tcp_cmd): Remove. (_initialize_ser_tcp): Use add_basic_prefix_cmd, add_show_prefix_cmd. * rs6000-tdep.c (set_powerpc_command, show_powerpc_command) (_initialize_rs6000_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * riscv-tdep.c (show_riscv_command, set_riscv_command) (show_debug_riscv_command, set_debug_riscv_command): Remove. (_initialize_riscv_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * remote.c (remote_command, set_remote_cmd): Remove. (_initialize_remote): Use add_basic_prefix_cmd. * record-full.c (set_record_full_command) (show_record_full_command): Remove. (_initialize_record_full): Use add_basic_prefix_cmd, add_show_prefix_cmd. * record-btrace.c (cmd_set_record_btrace) (cmd_show_record_btrace, cmd_set_record_btrace_bts) (cmd_show_record_btrace_bts, cmd_set_record_btrace_pt) (cmd_show_record_btrace_pt): Remove. (_initialize_record_btrace): Use add_basic_prefix_cmd, add_show_prefix_cmd. * ravenscar-thread.c (set_ravenscar_command) (show_ravenscar_command): Remove. (_initialize_ravenscar): Use add_basic_prefix_cmd, add_show_prefix_cmd. * mips-tdep.c (show_mips_command, set_mips_command) (_initialize_mips_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * maint.c (maintenance_command, maintenance_info_command) (maintenance_check_command, maintenance_print_command) (maintenance_set_cmd, maintenance_show_cmd): Remove. (_initialize_maint_cmds): Use add_basic_prefix_cmd, add_show_prefix_cmd. (show_per_command_cmd): Remove. * maint-test-settings.c (maintenance_set_test_settings_cmd): Remove. (maintenance_show_test_settings_cmd): Remove. (_initialize_maint_test_settings): Use add_basic_prefix_cmd, add_show_prefix_cmd. * maint-test-options.c (maintenance_test_options_command): Remove. (_initialize_maint_test_options): Use add_basic_prefix_cmd. * macrocmd.c (macro_command): Remove (_initialize_macrocmd): Use add_basic_prefix_cmd. * language.c (set_check, show_check): Remove. (_initialize_language): Use add_basic_prefix_cmd, add_show_prefix_cmd. * infcmd.c (unset_command): Remove. (_initialize_infcmd): Use add_basic_prefix_cmd. * i386-tdep.c (set_mpx_cmd, show_mpx_cmd): Remove. (_initialize_i386_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * go32-nat.c (go32_info_dos_command): Remove. (_initialize_go32_nat): Use add_basic_prefix_cmd. * cli/cli-decode.c (do_prefix_cmd, add_basic_prefix_cmd) (do_show_prefix_cmd, add_show_prefix_cmd): New functions. * frame.c (set_backtrace_cmd, show_backtrace_cmd): Remove. (_initialize_frame): Use add_basic_prefix_cmd, add_show_prefix_cmd. * dcache.c (set_dcache_command, show_dcache_command): Remove. (_initialize_dcache): Use add_basic_prefix_cmd, add_show_prefix_cmd. * cp-support.c (maint_cplus_command): Remove. (_initialize_cp_support): Use add_basic_prefix_cmd. * btrace.c (maint_btrace_cmd, maint_btrace_set_cmd) (maint_btrace_show_cmd, maint_btrace_pt_set_cmd) (maint_btrace_pt_show_cmd, _initialize_btrace): Use add_basic_prefix_cmd, add_show_prefix_cmd. * breakpoint.c (save_command): Remove. (_initialize_breakpoint): Use add_basic_prefix_cmd. * arm-tdep.c (set_arm_command, show_arm_command): Remove. (_initialize_arm_tdep): Use add_basic_prefix_cmd, add_show_prefix_cmd. * ada-lang.c (maint_set_ada_cmd, maint_show_ada_cmd) (set_ada_command, show_ada_command): Remove. (_initialize_ada_language): Use add_basic_prefix_cmd, add_show_prefix_cmd. * command.h (add_basic_prefix_cmd, add_show_prefix_cmd): Declare. gdb/testsuite/ChangeLog 2020-04-17 Tom Tromey <tromey@adacore.com> * gdb.cp/maint.exp (test_help): Simplify multiple_help_body. Update tests. * gdb.btrace/cpu.exp: Update tests. * gdb.base/maint.exp: Update tests. * gdb.base/default.exp: Update tests. * gdb.base/completion.exp: Update tests.
This commit is contained in:
Tom Tromey
@@ -215,20 +215,16 @@ void
|
||||
cli_style_option::add_setshow_commands (enum command_class theclass,
|
||||
const char *prefix_doc,
|
||||
struct cmd_list_element **set_list,
|
||||
void (*do_set) (const char *args,
|
||||
int from_tty),
|
||||
struct cmd_list_element **show_list,
|
||||
void (*do_show) (const char *args,
|
||||
int from_tty),
|
||||
bool skip_intensity)
|
||||
{
|
||||
m_set_prefix = std::string ("set style ") + m_name + " ";
|
||||
m_show_prefix = std::string ("show style ") + m_name + " ";
|
||||
|
||||
add_prefix_cmd (m_name, no_class, do_set, prefix_doc, &m_set_list,
|
||||
m_set_prefix.c_str (), 0, set_list);
|
||||
add_prefix_cmd (m_name, no_class, do_show, prefix_doc, &m_show_list,
|
||||
m_show_prefix.c_str (), 0, show_list);
|
||||
add_basic_prefix_cmd (m_name, no_class, prefix_doc, &m_set_list,
|
||||
m_set_prefix.c_str (), 0, set_list);
|
||||
add_show_prefix_cmd (m_name, no_class, prefix_doc, &m_show_list,
|
||||
m_show_prefix.c_str (), 0, show_list);
|
||||
|
||||
add_setshow_enum_cmd ("foreground", theclass, cli_colors,
|
||||
&m_foreground,
|
||||
@@ -260,20 +256,6 @@ cli_style_option::add_setshow_commands (enum command_class theclass,
|
||||
static cmd_list_element *style_set_list;
|
||||
static cmd_list_element *style_show_list;
|
||||
|
||||
static void
|
||||
set_style (const char *arg, int from_tty)
|
||||
{
|
||||
printf_unfiltered (_("\"set style\" must be followed "
|
||||
"by an appropriate subcommand.\n"));
|
||||
help_list (style_set_list, "set style ", all_commands, gdb_stdout);
|
||||
}
|
||||
|
||||
static void
|
||||
show_style (const char *arg, int from_tty)
|
||||
{
|
||||
cmd_show_list (style_show_list, from_tty, "");
|
||||
}
|
||||
|
||||
static void
|
||||
set_style_enabled (const char *args, int from_tty, struct cmd_list_element *c)
|
||||
{
|
||||
@@ -301,27 +283,15 @@ show_style_sources (struct ui_file *file, int from_tty,
|
||||
fprintf_filtered (file, _("Source code styling is disabled.\n"));
|
||||
}
|
||||
|
||||
/* Builds the "set style NAME " prefix. */
|
||||
|
||||
static std::string
|
||||
set_style_name (const char *name)
|
||||
{
|
||||
std::string result ("set style ");
|
||||
|
||||
result += name;
|
||||
result += " ";
|
||||
return result;
|
||||
}
|
||||
|
||||
void _initialize_cli_style ();
|
||||
void
|
||||
_initialize_cli_style ()
|
||||
{
|
||||
add_prefix_cmd ("style", no_class, set_style, _("\
|
||||
add_basic_prefix_cmd ("style", no_class, _("\
|
||||
Style-specific settings.\n\
|
||||
Configure various style-related variables, such as colors"),
|
||||
&style_set_list, "set style ", 0, &setlist);
|
||||
add_prefix_cmd ("style", no_class, show_style, _("\
|
||||
add_show_prefix_cmd ("style", no_class, _("\
|
||||
Style-specific settings.\n\
|
||||
Configure various style-related variables, such as colors"),
|
||||
&style_show_list, "show style ", 0, &showlist);
|
||||
@@ -348,78 +318,68 @@ available if the appropriate extension is available at runtime."
|
||||
), set_style_enabled, show_style_sources,
|
||||
&style_set_list, &style_show_list);
|
||||
|
||||
#define STYLE_ADD_SETSHOW_COMMANDS(STYLE, PREFIX_DOC, SKIP) \
|
||||
STYLE.add_setshow_commands (no_class, PREFIX_DOC, \
|
||||
&style_set_list, \
|
||||
[] (const char *args, int from_tty) \
|
||||
{ \
|
||||
help_list \
|
||||
(STYLE.set_list (), \
|
||||
set_style_name (STYLE.name ()).c_str (), \
|
||||
all_commands, \
|
||||
gdb_stdout); \
|
||||
}, \
|
||||
&style_show_list, \
|
||||
[] (const char *args, int from_tty) \
|
||||
{ \
|
||||
cmd_show_list \
|
||||
(STYLE.show_list (), \
|
||||
from_tty, \
|
||||
""); \
|
||||
}, SKIP)
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (file_name_style,
|
||||
_("\
|
||||
file_name_style.add_setshow_commands (no_class, _("\
|
||||
Filename display styling.\n\
|
||||
Configure filename colors and display intensity."), false);
|
||||
Configure filename colors and display intensity."),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (function_name_style,
|
||||
_("\
|
||||
function_name_style.add_setshow_commands (no_class, _("\
|
||||
Function name display styling.\n\
|
||||
Configure function name colors and display intensity"), false);
|
||||
Configure function name colors and display intensity"),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (variable_name_style,
|
||||
_("\
|
||||
variable_name_style.add_setshow_commands (no_class, _("\
|
||||
Variable name display styling.\n\
|
||||
Configure variable name colors and display intensity"), false);
|
||||
Configure variable name colors and display intensity"),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (address_style,
|
||||
_("\
|
||||
address_style.add_setshow_commands (no_class, _("\
|
||||
Address display styling.\n\
|
||||
Configure address colors and display intensity"), false);
|
||||
Configure address colors and display intensity"),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (title_style,
|
||||
_("\
|
||||
title_style.add_setshow_commands (no_class, _("\
|
||||
Title display styling.\n\
|
||||
Configure title colors and display intensity\n\
|
||||
Some commands (such as \"apropos -v REGEXP\") use the title style to improve\n\
|
||||
readability."), false);
|
||||
readability."),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (highlight_style,
|
||||
_("\
|
||||
highlight_style.add_setshow_commands (no_class, _("\
|
||||
Highlight display styling.\n\
|
||||
Configure highlight colors and display intensity\n\
|
||||
Some commands use the highlight style to draw the attention to a part\n\
|
||||
of their output."), false);
|
||||
of their output."),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (metadata_style,
|
||||
_("\
|
||||
metadata_style.add_setshow_commands (no_class, _("\
|
||||
Metadata display styling.\n\
|
||||
Configure metadata colors and display intensity\n\
|
||||
The \"metadata\" style is used when GDB displays information about\n\
|
||||
your data, for example \"<unavailable>\""), false);
|
||||
your data, for example \"<unavailable>\""),
|
||||
&style_set_list, &style_show_list,
|
||||
false);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (tui_border_style,
|
||||
_("\
|
||||
tui_border_style.add_setshow_commands (no_class, _("\
|
||||
TUI border display styling.\n\
|
||||
Configure TUI border colors\n\
|
||||
The \"tui-border\" style is used when GDB displays the border of a\n\
|
||||
TUI window that does not have the focus."), true);
|
||||
TUI window that does not have the focus."),
|
||||
&style_set_list, &style_show_list,
|
||||
true);
|
||||
|
||||
STYLE_ADD_SETSHOW_COMMANDS (tui_active_border_style,
|
||||
_("\
|
||||
tui_active_border_style.add_setshow_commands (no_class, _("\
|
||||
TUI active border display styling.\n\
|
||||
Configure TUI active border colors\n\
|
||||
The \"tui-active-border\" style is used when GDB displays the border of a\n\
|
||||
TUI window that does have the focus."), true);
|
||||
TUI window that does have the focus."),
|
||||
&style_set_list,
|
||||
&style_show_list,
|
||||
true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user