diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-01-19 15:41:04 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-01-19 15:41:04 +0000 |
| commit | f503118e3c5cee82ad9a2d58f5c6848faaaf4c9a (patch) | |
| tree | 1be5fcc97dfa3af194b49fcac90136b7e4261ed0 /gcc/fortran/primary.c | |
| parent | cb20fbcc781d9ca3abb76e25bfe4a643ca38571e (diff) | |
| download | gcc-f503118e3c5cee82ad9a2d58f5c6848faaaf4c9a.tar.gz | |
2008-01-19 Tobias Burnus <burnus@net-b.de>
PR fortran/34760
* primary.c (match_variable): Handle FL_UNKNOWN without
uneducated guessing.
(match_variable): Improve error message.
2008-01-19 Tobias Burnus <burnus@net-b.de>
PR fortran/34760
* gfortran.dg/implicit_11.f90: New.
* gfortran.dg/allocate_stat.f90: Update dg-error pattern.
* gfortran.dg/entry_15.f90: Ditto.
* gfortran.dg/func_assign.f90: Ditto.
* gfortran.dg/gomp/reduction3.f90: Ditto.
* gfortran.dg/proc_assign_1.f90: Ditto.
* gfortran.dg/interface_proc_end.f90: Use dg-error instead
of dg-excess-errors.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131652 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/primary.c')
| -rw-r--r-- | gcc/fortran/primary.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 1d282f2b37c..4e7d4a11506 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -2521,12 +2521,22 @@ match_variable (gfc_expr **result, int equiv_flag, int host_flag) break; case FL_UNKNOWN: - if (sym->attr.access == ACCESS_PUBLIC - || sym->attr.access == ACCESS_PRIVATE) - break; - if (gfc_add_flavor (&sym->attr, FL_VARIABLE, - sym->name, NULL) == FAILURE) - return MATCH_ERROR; + { + sym_flavor flavor = FL_UNKNOWN; + + gfc_gobble_whitespace (); + + if (sym->attr.external || sym->attr.procedure + || sym->attr.function || sym->attr.subroutine) + flavor = FL_PROCEDURE; + else if (gfc_peek_char () != '(' || sym->ts.type != BT_UNKNOWN + || sym->attr.pointer || sym->as != NULL) + flavor = FL_VARIABLE; + + if (flavor != FL_UNKNOWN + && gfc_add_flavor (&sym->attr, flavor, sym->name, NULL) == FAILURE) + return MATCH_ERROR; + } break; case FL_PARAMETER: @@ -2553,7 +2563,7 @@ match_variable (gfc_expr **result, int equiv_flag, int host_flag) /* Fall through to error */ default: - gfc_error ("Expected VARIABLE at %C"); + gfc_error ("'%s' at %C is not a variable", sym->name); return MATCH_ERROR; } |