diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-02-23 19:41:27 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-02-23 19:41:27 +0000 |
| commit | 31f17e0a0d4b5e60e5221e5ca608405571d6e839 (patch) | |
| tree | 21cde7cc1c944d9fc8e8773fff21ad927c2da2a2 | |
| parent | 70d5854c59db068cd43f430bf430f1bbe18668fc (diff) | |
| download | gcc-31f17e0a0d4b5e60e5221e5ca608405571d6e839.tar.gz | |
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 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/84346
* gfortran.dg/statement_function_1.f90: Update test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@257949 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 49930c72b03..0d948e40009 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-13 Alastair McKinstry <alastair.mckinstry@sceal.ie> Janne Blomqvist <jb@gcc.gnu.org> diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 09ed5ee8161..04b92c994f1 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -2739,6 +2739,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 e940f712802..282189c6921 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-21 Sudakshina Das <sudi.das@arm.com> Backport from trunk diff --git a/gcc/testsuite/gfortran.dg/statement_function_1.f90 b/gcc/testsuite/gfortran.dg/statement_function_1.f90 index f26f25c8712..e717725e67e 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" } |