diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 9 |
3 files changed, 17 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5ec90d2..a1301b3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,14 @@ 2007-07-12 Daniel Franke <franke.daniel@gmail.com> + PR fortran/31639 + * decl.c (gfc_match_suffix): Removed surplus general error that hides + a more specific message. + * resolve.c (resolve_fl_variable): Reject illegal initializiers only + if not already done. + (resolve_fl_procedure): Added check for initializers of functions. + +2007-07-12 Daniel Franke <franke.daniel@gmail.com> + PR fortran/32704 * invoke.texi (-static-libgfortran): Document new option. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 00241b8..2467c50 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -3578,12 +3578,6 @@ gfc_match_suffix (gfc_symbol *sym, gfc_symbol **result) break; } - if (is_result == MATCH_ERROR || is_bind_c == MATCH_ERROR) - { - gfc_error ("Error in function suffix at %C"); - return MATCH_ERROR; - } - if (is_bind_c == MATCH_YES) if (gfc_add_is_bind_c (&(sym->attr), sym->name, &gfc_current_locus, 1) == FAILURE) diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index f12cbd4..aa3c809 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6547,7 +6547,7 @@ resolve_fl_variable (gfc_symbol *sym, int mp_flag) } /* Reject illegal initializers. */ - if (sym->value && flag) + if (!sym->mark && sym->value && flag) { if (sym->attr.allocatable) gfc_error ("Allocatable '%s' at %L cannot have an initializer", @@ -6745,6 +6745,13 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) } } + if (sym->attr.function && sym->value && sym->attr.proc != PROC_ST_FUNCTION) + { + gfc_error ("Function '%s' at %L cannot have an initializer", + sym->name, &sym->declared_at); + return FAILURE; + } + /* An external symbol may not have an initializer because it is taken to be a procedure. */ if (sym->attr.external && sym->value) |