re PR fortran/24633 (MODULE attribute conflicts with PROCEDURE attribute)

2007-05-18  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/24633
        * symbol.c (gfc_add_flavor): Add the NAME to error message if
        available.

From-SVN: r124828

gcc/fortran/ChangeLog

+2007-05-18  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR fortran/24633
+	* symbol.c (gfc_add_flavor): Add the NAME to error message if
+	available.
+
 2007-05-15  Daniel Franke  <franke.daniel@gmail.com>
 
 	PR fortran/31919

gcc/fortran/symbol.c

@@ -1156,6 +1156,11 @@ gfc_add_flavor (symbol_attribute * attr, sym_flavor f, const char *name,
       if (where == NULL)
 	where = &gfc_current_locus;
 
+      if (name)
+        gfc_error ("%s attribute of '%s' conflicts with %s attribute at %L",
+		   gfc_code2string (flavors, attr->flavor), name,
+		   gfc_code2string (flavors, f), where);
+      else
         gfc_error ("%s attribute conflicts with %s attribute at %L",
 		   gfc_code2string (flavors, attr->flavor),
 		   gfc_code2string (flavors, f), where);