[Haiku-commits] r31243 - in haiku/trunk/src: add-ons/kernel/debugger/demangle apps/debugger/demangler

[Ingo Weinhold]

-------- Original-Nachricht --------
> Datum: Fri, 26 Jun 2009 00:49:21 +0200
> Von: phoudoin at mail.berlios.de

> Author: phoudoin
> Date: 2009-06-26 00:49:07 +0200 (Fri, 26 Jun 2009)
> New Revision: 31243
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31243&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/kernel/debugger/demangle/demangle.cpp
>    haiku/trunk/src/add-ons/kernel/debugger/demangle/demangle.h
>    haiku/trunk/src/apps/debugger/demangler/Demangler.cpp
>    haiku/trunk/src/apps/debugger/demangler/Jamfile
> Log:
> Reuse KDL demangler module demangle_symbol() and get_next_argument() to 
> improve userland Debugger arguments demangling support: 
> now with argument name and/or type, when available.

Cool, thanks!

> I hope I didn't break coding guideline doing so.

Didn't spot anything, but I didn't look too closely. :-)

[...]
> Modified: haiku/trunk/src/apps/debugger/demangler/Demangler.cpp
> ===================================================================
> --- haiku/trunk/src/apps/debugger/demangler/Demangler.cpp	2009-06-25
> 20:09:12 UTC (rev 31242)
> +++ haiku/trunk/src/apps/debugger/demangler/Demangler.cpp	2009-06-25
> 22:49:07 UTC (rev 31243)
> @@ -3,6 +3,8 @@
>   * Distributed under the terms of the MIT License.
>   */
>  
> +#include <TypeConstants.h>
> +
>  #include "Demangler.h"
>  
>  #include "demangle.h"
> @@ -11,21 +13,88 @@
>  /*static*/ BString
>  Demangler::Demangle(const BString& mangledName)
>  {
> +	BString demangledName;
>  	char buffer[1024];
>  	const char* demangled;
> -
> -	if (mangledName.Compare("_Z", 2) == 0) {
> -		demangled = demangle_name_gcc3(mangledName.String(), buffer,
> -			sizeof(buffer));
> -		if (demangled != NULL)
> -			return demangled;

It is actually preferable to continue using demangle_name_gcc3(), since it doesn't discard method qualifiers.

CU, Ingo