01770bbde9
It'd be handy to be able to iterate over command arguments in
user-defined commands, in order to support optional arguments
($arg0..$argN).
I thought I could make it work with "eval", but alas, it doesn't work
currently. E.g., with:
define test
set $i = 0
while $i < $argc
eval "print $arg%d", $i
set $i = $i + 1
end
end
we get:
(gdb) test 1
$1 = void
(gdb) test 1 2 3
$2 = void
$3 = void
$4 = void
(gdb)
The problem is that "eval" doesn't do user-defined command arguments
substitution after expanding its own argument. This patch fixes that,
which makes the example above work:
(gdb) test 1
$1 = 1
(gdb) test 1 2 3
$2 = 1
$3 = 2
$4 = 3
(gdb)
New test included, similar the above, but also exercises expanding
$argc.
I think this is likely to simplify many scripts out there, so I'm
adding an example to the manual and mentioning it in NEWS as well.
gdb/ChangeLog:
2016-12-02 Pedro Alves <palves@redhat.com>
PR cli/20559
* NEWS: Mention "eval" expands user-defined command arguments.
* cli/cli-script.c (execute_control_command): Adjust to rename.
(insert_args): Rename to ...
(insert_user_defined_cmd_args): ... this, and make extern.
* cli/cli-script.h (insert_user_defined_cmd_args): New
declaration.
* printcmd.c: Include "cli/cli-script.h".
(eval_command): Call insert_user_defined_cmd_args.
gdb/doc/ChangeLog:
2016-12-02 Pedro Alves <palves@redhat.com>
PR cli/20559
* gdb.texinfo (Define): Add example of using "eval" to process a
variable number of arguments.
(Output) <eval>: Add anchor.
gdb/testsuite/ChangeLog:
2016-12-02 Pedro Alves <palves@redhat.com>
PR cli/20559
* gdb.base/commands.exp (user_defined_command_args_eval): New
procedure.
(top level): Call it.
70 lines
2.2 KiB
C++
70 lines
2.2 KiB
C++
/* Header file for GDB CLI command implementation library.
|
|
Copyright (C) 2000-2016 Free Software Foundation, Inc.
|
|
|
|
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/>. */
|
|
|
|
#if !defined (CLI_SCRIPT_H)
|
|
#define CLI_SCRIPT_H 1
|
|
|
|
struct ui_file;
|
|
struct command_line;
|
|
struct cmd_list_element;
|
|
|
|
/* Exported to cli/cli-cmds.c */
|
|
|
|
extern void script_from_file (FILE *stream, const char *file);
|
|
|
|
extern void show_user_1 (struct cmd_list_element *c,
|
|
const char *prefix,
|
|
const char *name,
|
|
struct ui_file *stream);
|
|
|
|
/* Exported to gdb/breakpoint.c */
|
|
|
|
extern enum command_control_type
|
|
execute_control_command (struct command_line *cmd);
|
|
|
|
extern enum command_control_type
|
|
execute_control_command_untraced (struct command_line *cmd);
|
|
|
|
extern struct command_line *get_command_line (enum command_control_type,
|
|
char *);
|
|
|
|
extern void print_command_lines (struct ui_out *,
|
|
struct command_line *, unsigned int);
|
|
|
|
extern struct command_line * copy_command_lines (struct command_line *cmds);
|
|
|
|
extern struct cleanup *
|
|
make_cleanup_free_command_lines (struct command_line **arg);
|
|
|
|
/* Exported to gdb/infrun.c */
|
|
|
|
extern void execute_user_command (struct cmd_list_element *c, char *args);
|
|
|
|
/* If we're in a user-defined command, replace any $argc/$argN
|
|
reference found in LINE with the arguments that were passed to the
|
|
command. Otherwise, treat $argc/$argN as normal convenience
|
|
variables. */
|
|
extern std::string insert_user_defined_cmd_args (const char *line);
|
|
|
|
/* Exported to top.c */
|
|
|
|
extern void print_command_trace (const char *cmd);
|
|
|
|
/* Exported to event-top.c */
|
|
|
|
extern void reset_command_nest_depth (void);
|
|
|
|
#endif /* !defined (CLI_SCRIPT_H) */
|