re PR fortran/84346 (Statement functions should not accept keywords)

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.

From-SVN: r257942

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 673a1b85fbeda1a0a2417667583cc50dea7afeb1..da2c445ec15d8070ce5b3453a827d767bd686dc9 100644 (file)
--- 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 ad029289c0fbee725131dead6865c6e55216a6eb..cb326e55c7550876227c3a53b681ec44c038d640 100644 (file)
--- 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 0c703ccd4f263bb3172e525970ea914a17e6301c..2ec3d4058000dfc202991fdfd25a235fcc9fbde7 100644 (file)
--- 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 f26f25c871295cc08fd7293731a681213a3a7dc8..e717725e67e74289bc1403ef1ebd315a52adf38d 100644 (file)
--- 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" }