Re: [RFA] Compile objc-lang.c, objc-exp.tab.c [1/5]

[Daniel Jacobowitz <drow@mvista.com>]

On Mon, Mar 31, 2003 at 09:09:25PM -0700, Adam Fedor wrote:
> 
> 
> Andrew Cagney wrote:
> >
> >
> >Hmm, good catch.  Any reason for the unknown language demangler to not 
> >just do c++ demangling?
> >
> 
> OK. Here I've add java_demangle and now ukn_lang_demangle uses 
> cplus_demangle.

I think you've satisfied all my concerns.  Since Andrew and David both
liked this patch, it's OK to check in now.  Please fix one thing for
me: there are two switch statements below from which you remove all
cases except for default.  Please remove the switches entirely.

> @@ -153,13 +153,9 @@ maintenance_demangle (char *args, int fr
>      {
>        switch (current_language->la_language)
>  	{
> -	case language_objc:
> -	  /* Commented out until ObjC handling is enabled. */
> -	  /* demangled = objc_demangle (args); */
> -	  /* break; */
> -	case language_cplus:
>  	default:
> -	  demangled = cplus_demangle (args, DMGL_ANSI | DMGL_PARAMS);
> +	  demangled = language_demangle (current_language, args, 
> +					 DMGL_ANSI | DMGL_PARAMS);
>  	  break;
>  	}
>        if (demangled != NULL)

> Index: utils.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/utils.c,v
> retrieving revision 1.98
> diff -u -p -r1.98 utils.c
> --- utils.c	26 Feb 2003 14:35:19 -0000	1.98
> +++ utils.c	1 Apr 2003 04:01:30 -0000
> @@ -2300,18 +2300,9 @@ fprintf_symbol_filtered (struct ui_file 
>  	{
>  	  switch (lang)
>  	    {
> -	    case language_cplus:
> -	      demangled = cplus_demangle (name, arg_mode);
> -	      break;
> -	    case language_java:
> -	      demangled = cplus_demangle (name, arg_mode | DMGL_JAVA);
> -	      break;
> -	    case language_objc:
> -	      /* Commented out until ObjC handling is enabled.  */
> -	      /*demangled = objc_demangle (name); */
> -	      /*break; */
>  	    default:
> -	      demangled = NULL;
> +	      demangled = language_demangle (language_def (lang), 
> +					     name, arg_mode);
>  	      break;
>  	    }
>  	  fputs_filtered (demangled ? demangled : name, stream);


-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer