diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2006-06-01 04:35:38 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2006-06-01 04:35:38 +0000 |
| commit | 699fa7aa1a796f815f01518b0ab622e8f478c7dc (patch) | |
| tree | 267121ad7ae5eb38b1baf53d34e58374d138a47e /gcc/fortran/interface.c | |
| parent | 86ce18257fad5bf1c86294b4ca1c20057ed5f50e (diff) | |
| download | gcc-699fa7aa1a796f815f01518b0ab622e8f478c7dc.zip gcc-699fa7aa1a796f815f01518b0ab622e8f478c7dc.tar.gz gcc-699fa7aa1a796f815f01518b0ab622e8f478c7dc.tar.bz2 | |
re PR fortran/25098 (Variable as actual argument for procedure dummy argument allowed)
2006-06-01 Paul Thomas <pault@gcc.gnu.org>
PR fortran/25098
PR fortran/25147
* interface.c (compare_parameter): Return 1 if the actual arg
is external and the formal is a procedure.
(compare_actual_formal): If the actual argument is a variable
and the formal a procedure, this an error. If a gsymbol exists
for a procedure of the same name, this is not yet resolved and
the error is cleared.
* trans-intrinsic.c (gfc_conv_associated): Make provision for
zero array length or zero string length contingent on presence
of target, for consistency with standard.
2006-06-01 Paul Thomas <pault@gcc.gnu.org>
PR fortran/25098
* gfortran.dg/dummy_procedure_1.f90: New test.
PR fortran/25147
* gfortran.dg/dummy_procedure_2.f90: New test.
* gfortran.dg/associated_2.f90: Correct to make consistent with
standard.
From-SVN: r114296
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 74f7669..521876e 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1123,7 +1123,8 @@ compare_parameter (gfc_symbol * formal, gfc_expr * actual, && !compare_type_rank (formal, actual->symtree->n.sym)) return 0; - if (formal->attr.if_source == IFSRC_UNKNOWN) + if (formal->attr.if_source == IFSRC_UNKNOWN + || actual->symtree->n.sym->attr.external) return 1; /* Assume match */ return compare_interfaces (formal, actual->symtree->n.sym, 0); @@ -1177,6 +1178,7 @@ compare_actual_formal (gfc_actual_arglist ** ap, { gfc_actual_arglist **new, *a, *actual, temp; gfc_formal_arglist *f; + gfc_gsymbol *gsym; int i, n, na; bool rank_check; @@ -1276,6 +1278,24 @@ compare_actual_formal (gfc_actual_arglist ** ap, return 0; } + /* Satisfy 12.4.1.2 by ensuring that a procedure actual argument is + provided for a procedure formal argument. */ + if (a->expr->ts.type != BT_PROCEDURE + && a->expr->expr_type == EXPR_VARIABLE + && f->sym->attr.flavor == FL_PROCEDURE) + { + gsym = gfc_find_gsymbol (gfc_gsym_root, + a->expr->symtree->n.sym->name); + if (gsym == NULL || (gsym->type != GSYM_FUNCTION + && gsym->type != GSYM_SUBROUTINE)) + { + if (where) + gfc_error ("Expected a procedure for argument '%s' at %L", + f->sym->name, &a->expr->where); + return 0; + } + } + if (f->sym->as && f->sym->as->type == AS_ASSUMED_SHAPE && a->expr->expr_type == EXPR_VARIABLE |