aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2007-12-23 19:17:08 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2007-12-23 19:17:08 +0100
commit107d5ff67f3558b6fc77dfa51d0ccefc29eb7f49 (patch)
tree6d94f9d12e63cdb537bbdf4ef60b0ba7f3f36654 /gcc/fortran/resolve.c
parent57c65fb59c62beb1cbe6db6be2e42c0a9a077915 (diff)
downloadgcc-107d5ff67f3558b6fc77dfa51d0ccefc29eb7f49.zip
gcc-107d5ff67f3558b6fc77dfa51d0ccefc29eb7f49.tar.gz
gcc-107d5ff67f3558b6fc77dfa51d0ccefc29eb7f49.tar.bz2
re PR fortran/34421 (ENTRY functions: Character with different stringlength not rejected)
2007-12-23 Tobias Burnus <burnus@net-b.de> PR fortran/34421 * resolve.c (resolve_entries): Add standard error for functions returning characters with different length. 2007-12-23 Tobias Burnus <burnus@net-b.de> PR fortran/34421 * gfortran.dg/entry_17.f90: New. From-SVN: r131150
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 6289d5d..8fc679d 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -488,11 +488,28 @@ resolve_entries (gfc_namespace *ns)
|| (el->sym->result->attr.pointer
!= ns->entries->sym->result->attr.pointer))
break;
-
else if (as && fas && gfc_compare_array_spec (as, fas) == 0)
- gfc_error ("Procedure %s at %L has entries with mismatched "
+ gfc_error ("Function %s at %L has entries with mismatched "
"array specifications", ns->entries->sym->name,
&ns->entries->sym->declared_at);
+ /* The characteristics need to match and thus both need to have
+ the same string length, i.e. both len=*, or both len=4.
+ Having both len=<variable> is also possible, but difficult to
+ check at compile time. */
+ else if (ts->type == BT_CHARACTER && ts->cl && fts->cl
+ && (((ts->cl->length && !fts->cl->length)
+ ||(!ts->cl->length && fts->cl->length))
+ || (ts->cl->length
+ && ts->cl->length->expr_type
+ != fts->cl->length->expr_type)
+ || (ts->cl->length
+ && ts->cl->length->expr_type == EXPR_CONSTANT
+ && mpz_cmp (ts->cl->length->value.integer,
+ fts->cl->length->value.integer) != 0)))
+ gfc_notify_std (GFC_STD_GNU, "Extension: Function %s at %L with "
+ "entries returning variables of different "
+ "string lengths", ns->entries->sym->name,
+ &ns->entries->sym->declared_at);
}
if (el == NULL)