diff options
| author | Daniel Franke <franke.daniel@gmail.com> | 2007-05-18 09:25:07 -0400 |
|---|---|---|
| committer | Daniel Franke <dfranke@gcc.gnu.org> | 2007-05-18 09:25:07 -0400 |
| commit | 661051aaa96d8fc62fe7a1e44906a8d398de4f91 (patch) | |
| tree | 1b483c8f5e05aedb9cb6128bef77fd23e25519db /gcc | |
| parent | 10d7f5f36e61cd8edea5ca95f6718fe1f09abf73 (diff) | |
| download | gcc-661051aaa96d8fc62fe7a1e44906a8d398de4f91.zip gcc-661051aaa96d8fc62fe7a1e44906a8d398de4f91.tar.gz gcc-661051aaa96d8fc62fe7a1e44906a8d398de4f91.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -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 dbd2cc8..08c9d33 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 2fef9d5..71f8912 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; } |