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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124828 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dbd2cc8..08c9d33 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 2fef9d5..71f8912 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -1156,9 +1156,14 @@ gfc_add_flavor (symbol_attribute * attr, sym_flavor f, const char *name,
       if (where == NULL)
        where = &gfc_current_locus;
 
-      gfc_error ("%s attribute conflicts with %s attribute at %L",
-                gfc_code2string (flavors, attr->flavor),
-                gfc_code2string (flavors, f), where);
+      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);
 
       return FAILURE;
     }