maint.c (maintenance_demangle): Add switch to demangle

ObjC language symbols as well.

1 files changed, 13 insertions, 3 deletions

diff --git a/gdb/maint.c b/gdb/maint.c
index 92f9a16..db7d42d 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -151,7 +151,17 @@ maintenance_demangle (char *args, int from_tty)
     }
   else
     {
-      demangled = cplus_demangle (args, DMGL_ANSI | DMGL_PARAMS);
+      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);
+	  break;
+	}
       if (demangled != NULL)
 	{
 	  printf_unfiltered ("%s\n", demangled);
@@ -651,7 +661,7 @@ _initialize_maint_cmds (void)
 		  "Commands for use by GDB maintainers.\n\
 Includes commands to dump specific internal GDB structures in\n\
 a human readable form, to cause GDB to deliberately dump core,\n\
-to test internal functions such as the C++ demangler, etc.",
+to test internal functions such as the C++/ObjC demangler, etc.",
 		  &maintenancelist, "maintenance ", 0,
 		  &cmdlist);
 
@@ -713,7 +723,7 @@ Cause GDB to behave as if an internal warning was reported.",
 	   &maintenancelist);
 
   add_cmd ("demangle", class_maintenance, maintenance_demangle,
-	   "Demangle a C++ mangled name.\n\
+	   "Demangle a C++/ObjC mangled name.\n\
 Call internal GDB demangler routine to demangle a C++ link name\n\
 and prints the result.",
 	   &maintenancelist);