fix delegate/function syntax

show function attributes with DMGL_VERBOSE

libiberty/d-demangle.c

@@ -383,7 +383,7 @@ dlang_symbol_backref (string *decl, const char *mangled,
    Return the remaining string on success or NULL on failure.  */
 static const char *
 dlang_type_backref (string *decl, const char *mangled, struct dlang_info *info,
-		    int is_function)
+		    int is_function, const char *fntype)
 {
   /* A type back reference always points to a letter.
 
@@ -406,7 +406,7 @@ dlang_type_backref (string *decl, const char *mangled, struct dlang_info *info,
 
   /* Must point to a type.  */
   if (is_function)
-    backref = dlang_function_type (decl, backref, info);
+    backref = dlang_function_type (decl, backref, info, fntype);
   else
     backref = dlang_type (decl, backref, info);
 
@@ -632,7 +632,8 @@ dlang_function_type_noreturn (string *args, string *call, string *attr,
 /* Demangle the function type from MANGLED and append it to DECL.
    Return the remaining string on success or NULL on failure.  */
 static const char *
-dlang_function_type (string *decl, const char *mangled, struct dlang_info *info)
+dlang_function_type (string *decl, const char *mangled, struct dlang_info *info,
+		     const char *fntype)
 {
   string attr, args, type;
 
@@ -656,9 +657,14 @@ dlang_function_type (string *decl, const char *mangled, struct dlang_info *info)
 
   /* Append to decl in order. */
   string_appendn (decl, type.b, string_length (&type));
-  string_appendn (decl, args.b, string_length (&args));
   string_append (decl, " ");
-  string_appendn (decl, attr.b, string_length (&attr));
+  string_append (decl, fntype);
+  string_appendn (decl, args.b, string_length (&args));
+  if (string_length (&attr))
+    {
+      string_append (decl, " ");
+      string_appendn (decl, attr.b, string_length (&attr));
+    }
 
   string_delete (&attr);
   string_delete (&args);
@@ -833,9 +839,7 @@ dlang_type (string *decl, const char *mangled, struct dlang_info *info)
     case 'R': /* function T (C++) */
     case 'Y': /* function T (Objective-C) */
       /* Function pointer types don't include the trailing asterisk.  */
-      mangled = dlang_function_type (decl, mangled, info);
-      string_append (decl, "function");
-      return mangled;
+      return dlang_function_type (decl, mangled, info, "function");
     case 'I': /* ident T */
     case 'C': /* class T */
     case 'S': /* struct T */
@@ -855,11 +859,10 @@ dlang_type (string *decl, const char *mangled, struct dlang_info *info)
 
       /* Back referenced function type.  */
       if (*mangled == 'Q')
-	mangled = dlang_type_backref (decl, mangled, info, 1);
+	mangled = dlang_type_backref (decl, mangled, info, 1, "delegate");
       else
-	mangled = dlang_function_type (decl, mangled, info);
+	mangled = dlang_function_type (decl, mangled, info, "delegate");
 
-      string_append (decl, "delegate");
       string_appendn (decl, mods.b, szmods);
 
       string_delete (&mods);
@@ -983,7 +986,7 @@ dlang_type (string *decl, const char *mangled, struct dlang_info *info)
 
     /* Back referenced type.  */
     case 'Q':
-      return dlang_type_backref (decl, mangled, info, 0);
+      return dlang_type_backref (decl, mangled, info, 0, NULL);
 
     default: /* unhandled */
       return NULL;
@@ -1650,11 +1653,15 @@ dlang_parse_qualified (string *decl, const char *mangled,
       if (mangled && (*mangled == 'M' || dlang_call_convention_p (mangled)))
 	{
 	  string mods;
+	  string call;
+	  string attr;
 	  const char *start = mangled;
 	  int saved = string_length (decl);
 
 	  /* Save the type modifiers for appending at the end if needed.  */
 	  string_init (&mods);
+	  string_init (&call);
+	  string_init (&attr);
 
 	  /* Skip over 'this' parameter and type modifiers.  */
 	  if (*mangled == 'M')
@@ -1664,19 +1671,33 @@ dlang_parse_qualified (string *decl, const char *mangled,
 	      string_setlength (decl, saved);
 	    }
 
-	  mangled = dlang_function_type_noreturn (decl, NULL, NULL,
+	  mangled = dlang_function_type_noreturn (decl, &call, &attr,
 						  mangled, info);
 	  if (suffix_modifiers)
-	    string_appendn (decl, mods.b, string_length (&mods));
+	    {
+	      string_appendn (decl, mods.b, string_length (&mods));
+	      if ((info->option & DMGL_VERBOSE) && string_length (&attr) > 0)
+		{
+		  string_append (decl, " ");
+		  string_appendn (decl, attr.b, string_length (&attr));
+		}
+	    }
 
 	  if (mangled == NULL || *mangled == '\0')
 	    {
 	      /* Did not match the rule we were looking for.  */
 	      mangled = start;
 	      string_setlength (decl, saved);
 	    }
+	  else
+	    {
+	      if (options & DMGL_VERBOSE)
+		string_prependn (decl, call.b, string_length (&call));
+	    }
 
 	  string_delete (&mods);
+	  string_delete (&call);
+	  string_delete (&attr);
 	}
     }
   while (mangled && dlang_symbol_name_p (mangled, info));