binutils-gdb/gdb/interps.c
Philippe Waroquiers 590042fc45 Make first and last lines of 'command help documentation' consistent.
With this patch, the help docs now respect 2 invariants:
  * The first line of a command help is terminated by a '.' character.
  * The last character of a command help is not a newline character.

Note that the changes for the last invariant were done by Tom, as part of :
 [PATCH] Remove trailing newlines from help text
 https://sourceware.org/ml/gdb-patches/2019-06/msg00050.html
but some occurrences have been re-introduced since then.

Some help docs had to be rephrased/restructured to respect the above
invariants.

Before this patch, print_doc_line was printing the first line
of a command help documentation, but stopping at the first '.'
or ',' character.

This was giving inconsistent results :
  * The first line of command helps was sometimes '.' terminated,
    sometimes not.
  * The first line of command helps was not always designed to be
    readable/understandable/unambiguous when stopping at the first
    '.' or ',' character.

This e.g. created the following inconsistencies/problems:
< catch exception -- Catch Ada exceptions
< catch handlers -- Catch Ada exceptions
< catch syscall -- Catch system calls by their names
< down-silently -- Same as the `down' command
while the new help is:
> catch exception -- Catch Ada exceptions, when raised.
> catch handlers -- Catch Ada exceptions, when handled.
> catch syscall -- Catch system calls by their names, groups and/or numbers.
> down-silently -- Same as the `down' command, but does not print anything.

Also, the command help doc should not be terminated by a newline
character, but this was not respected by all commands.
The cli-option -OPT framework re-introduced some occurences.
So, the -OPT build help framework was changed to not output newlines at the
end of %OPTIONS% replacement.

This patch changes the help documentations to ensure the 2 invariants
given above.

It implied to slightly rephrase or restructure some help docs.

Based on the above invariants, print_doc_line (called by
'apropos' and 'help' commands to print the first line of a command
help) now outputs the full first line of a command help.

This all results in a lot of small changes in the produced help docs.
There are less code changes than changes in the help docs, as a lot
of docs are produced by some code (e.g. the remote packet usage settings).

gdb/ChangeLog
2019-08-07  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* cli/cli-decode.h (print_doc_line): Add for_value_prefix argument.
	* cli/cli-decode.c (print_doc_line): Likewise.  It now prints
	the full first line, except when FOR_VALUE_PREFIX.  In this case,
	the trailing '.' is not output, and the first character is uppercased.
	(print_help_for_command): Update call to print_doc_line.
	(print_doc_of_command): Likewise.
	* cli/cli-setshow.c (deprecated_show_value_hack): Likewise.
	* cli/cli-option.c (append_indented_doc): Do not append newline.
	(build_help_option): Append newline after first appended_indented_doc
	only if a second call is done.
	(build_help): Append 2 new lines before each option, except the first
	one.
	* compile/compile.c (_initialize_compile): Add new lines after
	%OPTIONS%, when not at the end of the help.
	Change help doc or code
	producing the help doc to respect the invariants.
	* maint-test-options.c (_initialize_maint_test_options): Likewise.
	Also removed the new line after 'Options:', as all other commands
	do not put an empty line between 'Options:' and the first option.
	* printcmd.c (_initialize_printcmd): Likewise.
	* stack.c (_initialize_stack): Likewise.
	* interps.c (interpreter_exec_cmd): Fix "Usage:" line that was
	incorrectly telling COMMAND is optional.
	* ada-lang.c (_initialize_ada_language): Change help doc or code
	producing the help doc to respect the invariants.
	* ada-tasks.c (_initialize_ada_tasks): Likewise.
	* breakpoint.c (_initialize_breakpoint): Likewise.
	* cli/cli-cmds.c (_initialize_cli_cmds): Likewise.
	* cli/cli-logging.c (_initialize_cli_logging): Likewise.
	* cli/cli-setshow.c (_initialize_cli_setshow): Likewise.
	* cli/cli-style.c (cli_style_option::add_setshow_commands,
	_initialize_cli_style): Likewise.
	* corelow.c (core_target_info): Likewise.
	* dwarf-index-cache.c (_initialize_index_cache): Likewise.
	* dwarf2read.c (_initialize_dwarf2_read): Likewise.
	* filesystem.c (_initialize_filesystem): Likewise.
	* frame.c (_initialize_frame): Likewise.
	* gnu-nat.c (add_task_commands): Likewise.
	* infcall.c (_initialize_infcall): Likewise.
	* infcmd.c (_initialize_infcmd): Likewise.
	* interps.c (_initialize_interpreter): Likewise.
	* language.c (_initialize_language): Likewise.
	* linux-fork.c (_initialize_linux_fork): Likewise.
	* maint-test-settings.c (_initialize_maint_test_settings): Likewise.
	* maint.c (_initialize_maint_cmds): Likewise.
	* memattr.c (_initialize_mem): Likewise.
	* printcmd.c (_initialize_printcmd): Likewise.
	* python/lib/gdb/function/strfns.py (_MemEq, _StrLen, _StrEq,
	_RegEx): Likewise.
	* ravenscar-thread.c (_initialize_ravenscar): Likewise.
	* record-btrace.c (_initialize_record_btrace): Likewise.
	* record-full.c (_initialize_record_full): Likewise.
	* record.c (_initialize_record): Likewise.
	* regcache-dump.c (_initialize_regcache_dump): Likewise.
	* regcache.c (_initialize_regcache): Likewise.
	* remote.c (add_packet_config_cmd, init_remote_threadtests,
	_initialize_remote): Likewise.
	* ser-tcp.c (_initialize_ser_tcp): Likewise.
	* serial.c (_initialize_serial): Likewise.
	* skip.c (_initialize_step_skip): Likewise.
	* source.c (_initialize_source): Likewise.
	* stack.c (_initialize_stack): Likewise.
	* symfile.c (_initialize_symfile): Likewise.
	* symtab.c (_initialize_symtab): Likewise.
	* target-descriptions.c (_initialize_target_descriptions): Likewise.
	* top.c (init_main): Likewise.
	* tracefile-tfile.c (tfile_target_info): Likewise.
	* tracepoint.c (_initialize_tracepoint): Likewise.
	* tui/tui-win.c (_initialize_tui_win): Likewise.
	* utils.c (add_internal_problem_command): Likewise.
	* valprint.c (value_print_option_defs): Likewise.

gdb/testsuite/ChangeLog
2019-08-07  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* gdb.base/style.exp: Update tests for help doc new invariants.
	* gdb.base/help.exp: Likewise.
2019-08-07 00:04:33 +02:00

458 lines
12 KiB
C

/* Manages interpreters for GDB, the GNU debugger.
Copyright (C) 2000-2019 Free Software Foundation, Inc.
Written by Jim Ingham <jingham@apple.com> of Apple Computer, 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/>. */
/* This is just a first cut at separating out the "interpreter"
functions of gdb into self-contained modules. There are a couple
of open areas that need to be sorted out:
1) The interpreter explicitly contains a UI_OUT, and can insert itself
into the event loop, but it doesn't explicitly contain hooks for readline.
I did this because it seems to me many interpreters won't want to use
the readline command interface, and it is probably simpler to just let
them take over the input in their resume proc. */
#include "defs.h"
#include "gdbcmd.h"
#include "ui-out.h"
#include "event-loop.h"
#include "event-top.h"
#include "interps.h"
#include "completer.h"
#include "top.h" /* For command_loop. */
#include "continuations.h"
#include "main.h"
/* Each UI has its own independent set of interpreters. */
struct ui_interp_info
{
/* Each top level has its own independent set of interpreters. */
struct interp *interp_list;
struct interp *current_interpreter;
struct interp *top_level_interpreter;
/* The interpreter that is active while `interp_exec' is active, NULL
at all other times. */
struct interp *command_interpreter;
};
/* Get UI's ui_interp_info object. Never returns NULL. */
static struct ui_interp_info *
get_interp_info (struct ui *ui)
{
if (ui->interp_info == NULL)
ui->interp_info = XCNEW (struct ui_interp_info);
return ui->interp_info;
}
/* Get the current UI's ui_interp_info object. Never returns
NULL. */
static struct ui_interp_info *
get_current_interp_info (void)
{
return get_interp_info (current_ui);
}
/* The magic initialization routine for this module. */
static struct interp *interp_lookup_existing (struct ui *ui,
const char *name);
interp::interp (const char *name)
: m_name (xstrdup (name))
{
this->inited = false;
}
interp::~interp ()
{
xfree (m_name);
}
/* An interpreter factory. Maps an interpreter name to the factory
function that instantiates an interpreter by that name. */
struct interp_factory
{
interp_factory (const char *name_, interp_factory_func func_)
: name (name_), func (func_)
{}
/* This is the name in "-i=INTERP" and "interpreter-exec INTERP". */
const char *name;
/* The function that creates the interpreter. */
interp_factory_func func;
};
/* The registered interpreter factories. */
static std::vector<interp_factory> interpreter_factories;
/* See interps.h. */
void
interp_factory_register (const char *name, interp_factory_func func)
{
/* Assert that no factory for NAME is already registered. */
for (const interp_factory &f : interpreter_factories)
if (strcmp (f.name, name) == 0)
{
internal_error (__FILE__, __LINE__,
_("interpreter factory already registered: \"%s\"\n"),
name);
}
interpreter_factories.emplace_back (name, func);
}
/* Add interpreter INTERP to the gdb interpreter list. The
interpreter must not have previously been added. */
void
interp_add (struct ui *ui, struct interp *interp)
{
struct ui_interp_info *ui_interp = get_interp_info (ui);
gdb_assert (interp_lookup_existing (ui, interp->name ()) == NULL);
interp->next = ui_interp->interp_list;
ui_interp->interp_list = interp;
}
/* This sets the current interpreter to be INTERP. If INTERP has not
been initialized, then this will also run the init method.
The TOP_LEVEL parameter tells if this new interpreter is
the top-level one. The top-level is what is requested
on the command line, and is responsible for reporting general
notification about target state changes. For example, if
MI is the top-level interpreter, then it will always report
events such as target stops and new thread creation, even if they
are caused by CLI commands. */
static void
interp_set (struct interp *interp, bool top_level)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *old_interp = ui_interp->current_interpreter;
/* If we already have an interpreter, then trying to
set top level interpreter is kinda pointless. */
gdb_assert (!top_level || !ui_interp->current_interpreter);
gdb_assert (!top_level || !ui_interp->top_level_interpreter);
if (old_interp != NULL)
{
current_uiout->flush ();
old_interp->suspend ();
}
ui_interp->current_interpreter = interp;
if (top_level)
ui_interp->top_level_interpreter = interp;
/* We use interpreter_p for the "set interpreter" variable, so we need
to make sure we have a malloc'ed copy for the set command to free. */
if (interpreter_p != NULL
&& strcmp (interp->name (), interpreter_p) != 0)
{
xfree (interpreter_p);
interpreter_p = xstrdup (interp->name ());
}
/* Run the init proc. */
if (!interp->inited)
{
interp->init (top_level);
interp->inited = true;
}
/* Do this only after the interpreter is initialized. */
current_uiout = interp->interp_ui_out ();
/* Clear out any installed interpreter hooks/event handlers. */
clear_interpreter_hooks ();
interp->resume ();
}
/* Look up the interpreter for NAME. If no such interpreter exists,
return NULL, otherwise return a pointer to the interpreter. */
static struct interp *
interp_lookup_existing (struct ui *ui, const char *name)
{
struct ui_interp_info *ui_interp = get_interp_info (ui);
struct interp *interp;
for (interp = ui_interp->interp_list;
interp != NULL;
interp = interp->next)
{
if (strcmp (interp->name (), name) == 0)
return interp;
}
return NULL;
}
/* See interps.h. */
struct interp *
interp_lookup (struct ui *ui, const char *name)
{
if (name == NULL || strlen (name) == 0)
return NULL;
/* Only create each interpreter once per top level. */
struct interp *interp = interp_lookup_existing (ui, name);
if (interp != NULL)
return interp;
for (const interp_factory &factory : interpreter_factories)
if (strcmp (factory.name, name) == 0)
{
interp = factory.func (name);
interp_add (ui, interp);
return interp;
}
return NULL;
}
/* See interps.h. */
void
set_top_level_interpreter (const char *name)
{
/* Find it. */
struct interp *interp = interp_lookup (current_ui, name);
if (interp == NULL)
error (_("Interpreter `%s' unrecognized"), name);
/* Install it. */
interp_set (interp, true);
}
void
current_interp_set_logging (ui_file_up logfile, bool logging_redirect,
bool debug_redirect)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = ui_interp->current_interpreter;
interp->set_logging (std::move (logfile), logging_redirect, debug_redirect);
}
/* Temporarily overrides the current interpreter. */
struct interp *
scoped_restore_interp::set_interp (const char *name)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = interp_lookup (current_ui, name);
struct interp *old_interp = ui_interp->current_interpreter;
if (interp)
ui_interp->current_interpreter = interp;
return old_interp;
}
/* Returns true if the current interp is the passed in name. */
int
current_interp_named_p (const char *interp_name)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = ui_interp->current_interpreter;
if (interp != NULL)
return (strcmp (interp->name (), interp_name) == 0);
return 0;
}
/* The interpreter that was active when a command was executed.
Normally that'd always be CURRENT_INTERPRETER, except that MI's
-interpreter-exec command doesn't actually flip the current
interpreter when running its sub-command. The
`command_interpreter' global tracks when interp_exec is called
(IOW, when -interpreter-exec is called). If that is set, it is
INTERP in '-interpreter-exec INTERP "CMD"' or in 'interpreter-exec
INTERP "CMD". Otherwise, interp_exec isn't active, and so the
interpreter running the command is the current interpreter. */
struct interp *
command_interp (void)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
if (ui_interp->command_interpreter != NULL)
return ui_interp->command_interpreter;
else
return ui_interp->current_interpreter;
}
/* See interps.h. */
void
interp_pre_command_loop (struct interp *interp)
{
gdb_assert (interp != NULL);
interp->pre_command_loop ();
}
/* See interp.h */
int
interp_supports_command_editing (struct interp *interp)
{
return interp->supports_command_editing ();
}
/* interp_exec - This executes COMMAND_STR in the current
interpreter. */
struct gdb_exception
interp_exec (struct interp *interp, const char *command_str)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
/* See `command_interp' for why we do this. */
scoped_restore save_command_interp
= make_scoped_restore (&ui_interp->command_interpreter, interp);
return interp->exec (command_str);
}
/* A convenience routine that nulls out all the common command hooks.
Use it when removing your interpreter in its suspend proc. */
void
clear_interpreter_hooks (void)
{
deprecated_print_frame_info_listing_hook = 0;
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
deprecated_warning_hook = 0;
deprecated_readline_begin_hook = 0;
deprecated_readline_hook = 0;
deprecated_readline_end_hook = 0;
deprecated_context_hook = 0;
deprecated_target_wait_hook = 0;
deprecated_call_command_hook = 0;
deprecated_error_begin_hook = 0;
}
static void
interpreter_exec_cmd (const char *args, int from_tty)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *old_interp, *interp_to_use;
unsigned int nrules;
unsigned int i;
if (args == NULL)
error_no_arg (_("interpreter-exec command"));
gdb_argv prules (args);
nrules = prules.count ();
if (nrules < 2)
error (_("Usage: interpreter-exec INTERPRETER COMMAND..."));
old_interp = ui_interp->current_interpreter;
interp_to_use = interp_lookup (current_ui, prules[0]);
if (interp_to_use == NULL)
error (_("Could not find interpreter \"%s\"."), prules[0]);
interp_set (interp_to_use, false);
for (i = 1; i < nrules; i++)
{
struct gdb_exception e = interp_exec (interp_to_use, prules[i]);
if (e.reason < 0)
{
interp_set (old_interp, 0);
error (_("error in command: \"%s\"."), prules[i]);
}
}
interp_set (old_interp, 0);
}
/* See interps.h. */
void
interpreter_completer (struct cmd_list_element *ignore,
completion_tracker &tracker,
const char *text, const char *word)
{
int textlen = strlen (text);
for (const interp_factory &interp : interpreter_factories)
{
if (strncmp (interp.name, text, textlen) == 0)
{
tracker.add_completion
(make_completion_match_str (interp.name, text, word));
}
}
}
struct interp *
top_level_interpreter (void)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
return ui_interp->top_level_interpreter;
}
/* See interps.h. */
struct interp *
current_interpreter (void)
{
struct ui_interp_info *ui_interp = get_interp_info (current_ui);
return ui_interp->current_interpreter;
}
/* This just adds the "interpreter-exec" command. */
void
_initialize_interpreter (void)
{
struct cmd_list_element *c;
c = add_cmd ("interpreter-exec", class_support,
interpreter_exec_cmd, _("\
Execute a command in an interpreter.\n\
Usage: interpreter-exec INTERPRETER COMMAND...\n\
The first argument is the name of the interpreter to use.\n\
The following arguments are the commands to execute.\n\
A command can have arguments, separated by spaces.\n\
These spaces must be escaped using \\ or the command\n\
and its arguments must be enclosed in double quotes."), &cmdlist);
set_cmd_completer (c, interpreter_completer);
}