diff options
| author | dfranke <dfranke@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-18 13:25:07 +0000 |
|---|---|---|
| committer | dfranke <dfranke@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-18 13:25:07 +0000 |
| commit | c89bc6fcb09d3fcb13d4538e00c429144bce4000 (patch) | |
| tree | 1b483c8f5e05aedb9cb6128bef77fd23e25519db | |
| parent | 23fd0dec13447be9d96eb2918d4dadf8982822d5 (diff) | |
| download | ppe42-gcc-c89bc6fcb09d3fcb13d4538e00c429144bce4000.tar.gz ppe42-gcc-c89bc6fcb09d3fcb13d4538e00c429144bce4000.zip | |
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
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/symbol.c | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dbd2cc85136..08c9d33a0d1 100644 --- 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 2fef9d52d0b..71f89123e95 100644 --- 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; } |
