diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/func_decl_4.f90 | 17 |
5 files changed, 39 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5ec90d2b866..a1301b34db4 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 00241b83206..2467c505d62 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 f12cbd4241a..aa3c80986fd 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) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a4f28b5e94f..01831ebeb18 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-12 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/31639 + * gfortran.dg/func_decl_4.f90: New test. + 2007-07-12 Paul Thomas <pault@gcc.gnu.org> PR fortran/32727 diff --git a/gcc/testsuite/gfortran.dg/func_decl_4.f90 b/gcc/testsuite/gfortran.dg/func_decl_4.f90 new file mode 100644 index 00000000000..7c08f316827 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/func_decl_4.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! { dg-options "-c" } +! +! Functions shall not have an initializer. +! + +function f1() ! { dg-error "cannot have an initializer" } + integer :: f1 = 42 +end function + +function f2() RESULT (r) ! { dg-error "cannot have an initializer" } + integer :: r = 42 +end function + +function f3() RESULT (f3) ! { dg-error "must be different than function name" } + integer :: f3 = 42 +end function ! { dg-excess-errors "" } |