[PATCH 1/2] Use mi_getopt in mi_cmd_stack_list_locals and mi_cmd_stack_list_variables

Yao Qi
2013-07-03T01:48:54Z

Hi,
During the review of frame filter MI patch, Tom pointed that it is better
to use mi_getopt to simplify option parsing. Unfortunately, the code
doesn't do it. Since I am trying to add another option to commands
'-stack-list-XXXX', I'd like to have a try to use mi_getopt.

For command '-stack-list-locals' and '-stack-list-variables',
the PRINT_VALUES may confuse option parsing by mi_getopt, so in this
patch, we copy the argv except PRINT_VALUES to a new vector, and parse
the new vector by mi_getopt.

gdb:

2013-07-03 Yao Qi <yao@codesourcery.com>

* mi/mi-cmd-stack.c (mi_cmd_stack_list_locals): Don't call
parse_no_frames_option. Copy ARGV to new_argv except PRINT_VALUES.
Parse new_argv by mi_getopt.
(mi_cmd_stack_list_variables): Likewise.
---
gdb/mi/mi-cmd-stack.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 4b21015..3212c03 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -212,16 +212,56 @@ mi_cmd_stack_list_locals (char *command, char **argv, int argc)
int raw_arg = 0;
enum py_bt_status result = PY_BT_ERROR;
int print_value;
+ int oind = 0;

- if (argc > 0)
- raw_arg = parse_no_frames_option (argv[0]);
+ if (argc > 1)
+ {
+ struct cleanup *cleanup;
+ int i;
+ char **new_argv = xmalloc ((argc - 1) * sizeof (char *));
+ enum opt
+ {
+ NO_FRAME_FILTERS
+ };
+ static const struct mi_opt opts[] =
+ {
+ {"-no-frame-filters", NO_FRAME_FILTERS, 0},
+ { 0, 0, 0 }
+ };
+
+ cleanup = make_cleanup (xfree, new_argv);
+
+ for (i = 0; i < argc - 1; i++)
+ {
+ new_argv[i] = xstrdup (argv[i]);
+ make_cleanup (xfree, new_argv[i]);
+ }
+
+ while (1)
+ {
+ char *oarg;
+ /* Don't parse 'print-values' as an option. */
+ int opt = mi_getopt ("-stack-list-locals", argc - 1, new_argv,
+ opts, &oind, &oarg);
+ if (opt < 0)
+ break;
+ switch ((enum opt) opt)
+ {
+ case NO_FRAME_FILTERS:
+ raw_arg = oind;
+ break;
+ }
+ }
+ do_cleanups (cleanup);
+ }

- if (argc < 1 || argc > 2 || (argc == 2 && ! raw_arg)
- || (argc == 1 && raw_arg))
+ /* After the last option is parsed, there should be only
+ 'print-values'. */
+ if (argc - oind != 1)
error (_("-stack-list-locals: Usage: [--no-frame-filters] PRINT_VALUES"));

frame = get_selected_frame (NULL);
- print_value = mi_parse_print_values (argv[raw_arg]);
+ print_value = mi_parse_print_values (argv[oind]);

if (! raw_arg && frame_filters)
{
@@ -341,17 +381,56 @@ mi_cmd_stack_list_variables (char *command, char **argv, int argc)
int raw_arg = 0;
enum py_bt_status result = PY_BT_ERROR;
int print_value;
+ int oind = 0;

- if (argc > 0)
- raw_arg = parse_no_frames_option (argv[0]);
+ if (argc > 1)
+ {
+ struct cleanup *cleanup;
+ int i;
+ char **new_argv = xmalloc ((argc - 1) * sizeof (char *));
+ enum opt
+ {
+ NO_FRAME_FILTERS
+ };
+ static const struct mi_opt opts[] =
+ {
+ {"-no-frame-filters", NO_FRAME_FILTERS, 0},
+ { 0, 0, 0 }
+ };
+ cleanup = make_cleanup (xfree, new_argv);
+
+ for (i = 0; i < argc - 1; i++)
+ {
+ new_argv[i] = xstrdup (argv[i]);
+ make_cleanup (xfree, new_argv[i]);
+ }
+
+ while (1)
+ {
+ char *oarg;
+ /* Don't parse 'print-values' as an option. */
+ int opt = mi_getopt ("-stack-list-variables", argc - 1,
+ new_argv, opts, &oind, &oarg);
+ if (opt < 0)
+ break;
+ switch ((enum opt) opt)
+ {
+ case NO_FRAME_FILTERS:
+ raw_arg = oind;
+ break;
+ }
+ }
+ do_cleanups (cleanup);
+ }

- if (argc < 1 || argc > 2 || (argc == 2 && ! raw_arg)
- || (argc == 1 && raw_arg))
+ /* After the last option is parsed, there should be only
+ 'print-values'. */
+ if (argc - oind != 1)
error (_("-stack-list-variables: Usage: " \
"[--no-frame-filters] PRINT_VALUES"));

frame = get_selected_frame (NULL);
- print_value = mi_parse_print_values (argv[raw_arg]);
+ print_value = mi_parse_print_values (argv[oind]);

if (! raw_arg && frame_filters)
{
--
1.7.7.6