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

[Yao Qi <yao@codesourcery.com>]

On 07/30/2013 02:17 AM, Pedro Alves wrote:
> Please help me understand the patch.  Why do we need to copy
> the arg vector?  Isn't it the same to do:
> 
> 	  /* Don't parse 'print-values' as an option.  */
> 	  int opt = mi_getopt ("-stack-list-locals", argc - 1, argv,
> 			       opts, &oind, &oarg);
> 
> ?

There was something wrong in mi_getopt (an internal error,
IIRC) when I call mi_getopt with 'argc - 1', however, I
can't reproduce it now.  Probably because my tree was dirty
then.  I update the patch to avoid copying the arg vector.
Patch 2/2 still apply.

-- 
Yao (齐尧)

gdb:

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

	* mi/mi-cmd-stack.c (mi_cmd_stack_list_locals): Parse argv by
	mi_getopt.
	(mi_cmd_stack_list_variables): Likewise.
---
 gdb/mi/mi-cmd-stack.c |   79 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 1f1068c..70ff0b6 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -212,16 +212,46 @@ 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)
+    {
+      int i;
+      enum opt
+      {
+	NO_FRAME_FILTERS
+      };
+      static const struct mi_opt opts[] =
+	{
+	  {"-no-frame-filters", NO_FRAME_FILTERS, 0},
+	  { 0, 0, 0 }
+	};
+
+      while (1)
+	{
+	  char *oarg;
+	  /* Don't parse 'print-values' as an option.  */
+	  int opt = mi_getopt ("-stack-list-locals", argc - 1, argv,
+			       opts, &oind, &oarg);
+
+	  if (opt < 0)
+	    break;
+	  switch ((enum opt) opt)
+	    {
+	    case NO_FRAME_FILTERS:
+	      raw_arg = oind;
+	      break;
+	    }
+	}
+    }
 
-  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 +371,46 @@ 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)
+    {
+      int i;
+      enum opt
+      {
+	NO_FRAME_FILTERS
+      };
+      static const struct mi_opt opts[] =
+	{
+	  {"-no-frame-filters", NO_FRAME_FILTERS, 0},
+	  { 0, 0, 0 }
+	};
+
+      while (1)
+	{
+	  char *oarg;
+	  /* Don't parse 'print-values' as an option.  */
+	  int opt = mi_getopt ("-stack-list-variables", argc - 1,
+			       argv, opts, &oind, &oarg);
+	  if (opt < 0)
+	    break;
+	  switch ((enum opt) opt)
+	    {
+	    case NO_FRAME_FILTERS:
+	      raw_arg = oind;
+	      break;
+	    }
+	}
+    }
 
-  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