Re: report valid values for all errors for enum variables...

[Jim Ingham <jingham@apple.com>]

[-- Attachment #1: Type: text/plain, Size: 18 bytes --]

Sure, how 'bout:


[-- Attachment #2: var_enum.patch --]
[-- Type: application/octet-stream, Size: 3125 bytes --]

Index: cli-setshow.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-setshow.c,v
retrieving revision 1.13
diff -p -r1.13 cli-setshow.c
*** cli-setshow.c	4 Aug 2003 17:08:23 -0000	1.13
--- cli-setshow.c	28 Oct 2003 19:31:08 -0000
*************** do_setshow_command (char *arg, int from_
*** 197,252 ****
  	  {
  	    int i;
  	    int len;
! 	    int nmatches;
  	    const char *match = NULL;
  	    char *p;
  
! 	    /* if no argument was supplied, print an informative error message */
! 	    if (arg == NULL)
  	      {
! 		char msg[1024];
! 		strcpy (msg, "Requires an argument. Valid arguments are ");
  		for (i = 0; c->enums[i]; i++)
  		  {
  		    if (i != 0)
! 		      strcat (msg, ", ");
! 		    strcat (msg, c->enums[i]);
  		  }
! 		strcat (msg, ".");
! 		error ("%s", msg);
  	      }
- 
- 	    p = strchr (arg, ' ');
- 
- 	    if (p)
- 	      len = p - arg;
- 	    else
- 	      len = strlen (arg);
- 
- 	    nmatches = 0;
- 	    for (i = 0; c->enums[i]; i++)
- 	      if (strncmp (arg, c->enums[i], len) == 0)
- 		{
- 		  if (c->enums[i][len] == '\0')
- 		    {
- 		      match = c->enums[i];
- 		      nmatches = 1;
- 		      break; /* exact match. */
- 		    }
- 		  else
- 		    {
- 		      match = c->enums[i];
- 		      nmatches++;
- 		    }
- 		}
- 
- 	    if (nmatches <= 0)
- 	      error ("Undefined item: \"%s\".", arg);
- 
- 	    if (nmatches > 1)
- 	      error ("Ambiguous item \"%s\".", arg);
- 
- 	    *(const char **) c->var = match;
  	  }
  	  break;
  	default:
--- 197,257 ----
  	  {
  	    int i;
  	    int len;
! 	    int nmatches = 0;
  	    const char *match = NULL;
  	    char *p;
  
! 	    if (arg != NULL)
  	      {
! 		p = strchr (arg, ' ');
! 		
! 		if (p)
! 		  len = p - arg;
! 		else
! 		  len = strlen (arg);
! 		
! 		nmatches = 0;
! 		for (i = 0; c->enums[i]; i++)
! 		  if (strncmp (arg, c->enums[i], len) == 0)
! 		    {
! 		      if (c->enums[i][len] == '\0')
! 			{
! 			  match = c->enums[i];
! 			  nmatches = 1;
! 			  break; /* exact match. */
! 			}
! 		      else
! 			{
! 			  match = c->enums[i];
! 			  nmatches++;
! 			}
! 		    }
! 	      }
! 	    if (nmatches == 1)
! 	      *(const char **) c->var = match;
! 	    else
! 	      {
! 		/* If there was an error, print an informative
! 		   error message.  */
! 		struct ui_file *tmp_error_stream = mem_fileopen ();
! 		make_cleanup_ui_file_delete (tmp_error_stream);
! 
! 		if (arg == NULL)
! 		  fprintf_unfiltered (tmp_error_stream, "Requires an argument.");
! 		else if (nmatches <= 0)
! 		  fprintf_unfiltered (tmp_error_stream, "Undefined item: \"%s\".", arg);		
! 		else if (nmatches > 1)
! 		  fprintf_unfiltered  (tmp_error_stream, "Ambiguous item \"%s\".", arg);
! 		fprintf_unfiltered (tmp_error_stream, " Valid values are ");
  		for (i = 0; c->enums[i]; i++)
  		  {
  		    if (i != 0)
! 		      fprintf_unfiltered (tmp_error_stream, ", ");
! 		    fprintf_unfiltered (tmp_error_stream, c->enums[i]);
  		  }
! 		fprintf_unfiltered (tmp_error_stream, ".");
! 		error_stream (tmp_error_stream);
  	      }
  	  }
  	  break;
  	default:

[-- Attachment #3: Type: text/plain, Size: 911 bytes --]



Jim

On Oct 27, 2003, at 8:45 AM, Andrew Cagney wrote:

> Jim,
>
> Since you're looking a that code, can you please tweak it so that it 
> uses a mem_file instead of the 1024 byte stack buffer.
>
> Is there a test case?
>
> Andrew
>
> +               /* If there was an error, print an informative
> +                  error message.  */
>                 char msg[1024];
> !               if (arg == NULL)
> !                 strcpy (msg, "Requires an argument.");
> !               else if (nmatches <= 0)
> !                 sprintf (msg, "Undefined item: \"%s\".", arg);
> !               else if (nmatches > 1)
> !                 sprintf  (msg, "Ambiguous item \"%s\".", arg);
> !               strcat (msg, " Valid values are ");
>                 for (i = 0; c->enums[i]; i++)
>                   {
>
>
--
Jim Ingham                                   jingham@apple.com
Developer Tools
Apple Computer