diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2007-05-11 11:42:56 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2007-05-11 11:42:56 +0000 |
| commit | 847b053dd214c6e26a2025bf29422457cb50143d (patch) | |
| tree | eb28e776bc0b0ddb2c8cd9a8a1ef194444373808 /gcc/fortran/resolve.c | |
| parent | 35dd9a0e6d9491ee708c2d75ecf8d74aa40cbb39 (diff) | |
| download | gcc-847b053dd214c6e26a2025bf29422457cb50143d.zip gcc-847b053dd214c6e26a2025bf29422457cb50143d.tar.gz gcc-847b053dd214c6e26a2025bf29422457cb50143d.tar.bz2 | |
re PR fortran/30878 (Rejects function f1; namelist /nml/ f1)
2007-05-11 Paul Thomas <pault@gcc.gnu.org>
PR fortran/30878
* resolve.c (resolve_fl_namelist): It is not an error if the
namelist element is the result variable of the enclosing
function. Search for the symbol in current and all parent
namespaces for a potential conflict.
* symbol.c (check_conflict): Remove the conflict between
'in_namelist' and 'FL_PROCEDURE' because the symbol info
is not available to exclude function result variables.
* trans-io.c (nml_get_addr_expr): Use the fake result decl
if the symbol is an implicit result variable.
2007-05-11 Paul Thomas <pault@gcc.gnu.org>
PR fortran/30878
* gfortran.dg/namelist_29.f90: New test.
From-SVN: r124615
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5c5d40b..dbb36d3 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6070,16 +6070,21 @@ resolve_fl_namelist (gfc_symbol *sym) } /* 14.1.2 A module or internal procedure represent local entities - of the same type as a namelist member and so are not allowed. - Note that this is sometimes caught by check_conflict so the - same message has been used. */ + of the same type as a namelist member and so are not allowed. */ for (nl = sym->namelist; nl; nl = nl->next) { if (nl->sym->ts.kind != 0 && nl->sym->attr.flavor == FL_VARIABLE) continue; + + if (nl->sym->attr.function && nl->sym == nl->sym->result) + if ((nl->sym == sym->ns->proc_name) + || + (sym->ns->parent && nl->sym == sym->ns->parent->proc_name)) + continue; + nlsym = NULL; - if (sym->ns->parent && nl->sym && nl->sym->name) - gfc_find_symbol (nl->sym->name, sym->ns->parent, 0, &nlsym); + if (nl->sym && nl->sym->name) + gfc_find_symbol (nl->sym->name, sym->ns, 1, &nlsym); if (nlsym && nlsym->attr.flavor == FL_PROCEDURE) { gfc_error ("PROCEDURE attribute conflicts with NAMELIST " |