diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/statement_function_1.f90 | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 673a1b8..da2c445 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-02-23 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/84346 + * interface.c (compare_actual_formal): Issue error if keyword is + used in a statement function. + 2018-02-23 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/84506 diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index ad02928..cb326e5 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -2865,6 +2865,13 @@ compare_actual_formal (gfc_actual_arglist **ap, gfc_formal_arglist *formal, for (a = actual; a; a = a->next, f = f->next) { + if (a->name != NULL && in_statement_function) + { + gfc_error ("Keyword argument %qs at %L is invalid in " + "a statement function", a->name, &a->expr->where); + return false; + } + /* Look for keywords but ignore g77 extensions like %VAL. */ if (a->name != NULL && a->name[0] != '%') { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0c703cc..2ec3d40 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-23 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/84346 + * gfortran.dg/statement_function_1.f90: Update test. + 2018-02-23 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/84506 diff --git a/gcc/testsuite/gfortran.dg/statement_function_1.f90 b/gcc/testsuite/gfortran.dg/statement_function_1.f90 index f26f25c..e717725 100644 --- a/gcc/testsuite/gfortran.dg/statement_function_1.f90 +++ b/gcc/testsuite/gfortran.dg/statement_function_1.f90 @@ -19,10 +19,6 @@ qofs(s, i) = i * s i = 42 w = qofs(hh, i) -! -! The following line should cause an error, because keywords are not -! allowed in a function with an implicit interface. -! - w = qofs(i = i, s = hh) + w = qofs(i = i, s = hh) ! { dg-error "invalid in a statement function" } end subroutine step ! { dg-prune-output " Obsolescent feature" } |