diff options
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5bd8296..e798070 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -89,8 +89,6 @@ resolve_formal_arglist (gfc_symbol * proc) gfc_symbol *sym; int i; - /* TODO: Procedures whose return character length parameter is not constant - or assumed must also have explicit interfaces. */ if (proc->result != NULL) sym = proc->result; else @@ -5529,17 +5527,25 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) && resolve_fl_var_and_proc (sym, mp_flag) == FAILURE) return FAILURE; - if (sym->attr.proc == PROC_ST_FUNCTION) + if (sym->ts.type == BT_CHARACTER) { - if (sym->ts.type == BT_CHARACTER) - { - gfc_charlen *cl = sym->ts.cl; - if (!cl || !cl->length || cl->length->expr_type != EXPR_CONSTANT) - { + gfc_charlen *cl = sym->ts.cl; + if (!cl || !cl->length || cl->length->expr_type != EXPR_CONSTANT) + { + if (sym->attr.proc == PROC_ST_FUNCTION) + { gfc_error ("Character-valued statement function '%s' at %L must " "have constant length", sym->name, &sym->declared_at); return FAILURE; } + + if (sym->attr.external && sym->formal == NULL + && cl && cl->length && cl->length->expr_type != EXPR_CONSTANT) + { + gfc_error ("Automatic character length function '%s' at %L must " + "have an explicit interface", sym->name, &sym->declared_at); + return FAILURE; + } } } |