git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2018-12-10 Steven G. Kargl <kargl@gcc.gnu.org> 

PR fortran/97922
	* io.c (gfc_match_open): Additional checks on ASYNCHRONOUS.

2018-12-10  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/97922
	* gfortran.dg/io_constraints_8.f90: Update error message.
	* gfortran.dg/pr87922.f90: New test.

From-SVN: r266968
This commit is contained in:
Steven G. Kargl 2018-12-11 01:39:23 +00:00
parent 1486eb791f
commit 87550b74a7
5 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-10 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/97922
* io.c (gfc_match_open): Additional checks on ASYNCHRONOUS.
2018-12-10 Steven G. Kargl <kargl@gcc.gnu.org> 2018-12-10 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/88269 PR fortran/88269

30
gcc/fortran/io.c
View File

@ -2205,6 +2205,21 @@ gfc_match_open (void)
if (!is_char_type ("ASYNCHRONOUS", open->asynchronous)) if (!is_char_type ("ASYNCHRONOUS", open->asynchronous))
goto cleanup; goto cleanup;
if (open->asynchronous->ts.kind != 1)
{
gfc_error ("ASYNCHRONOUS= specifier at %L must be of default "
"CHARACTER kind", &open->asynchronous->where);
return MATCH_ERROR;
}
if (open->asynchronous->expr_type == EXPR_ARRAY
|| open->asynchronous->expr_type == EXPR_STRUCTURE)
{
gfc_error ("ASYNCHRONOUS= specifier at %L must be scalar",
&open->asynchronous->where);
return MATCH_ERROR;
}
if (open->asynchronous->expr_type == EXPR_CONSTANT) if (open->asynchronous->expr_type == EXPR_CONSTANT)
{ {
static const char * asynchronous[] = { "YES", "NO", NULL }; static const char * asynchronous[] = { "YES", "NO", NULL };
@ -3799,6 +3814,21 @@ if (condition) \
if (!is_char_type ("ASYNCHRONOUS", dt->asynchronous)) if (!is_char_type ("ASYNCHRONOUS", dt->asynchronous))
return MATCH_ERROR; return MATCH_ERROR;
if (dt->asynchronous->ts.kind != 1)
{
gfc_error ("ASYNCHRONOUS= specifier at %L must be of default "
"CHARACTER kind", &dt->asynchronous->where);
return MATCH_ERROR;
}
if (dt->asynchronous->expr_type == EXPR_ARRAY
|| dt->asynchronous->expr_type == EXPR_STRUCTURE)
{
gfc_error ("ASYNCHRONOUS= specifier at %L must be scalar",
&dt->asynchronous->where);
return MATCH_ERROR;
}
if (!compare_to_allowed_values if (!compare_to_allowed_values
("ASYNCHRONOUS", asynchronous, NULL, NULL, ("ASYNCHRONOUS", asynchronous, NULL, NULL,
dt->asynchronous->value.character.string, dt->asynchronous->value.character.string,

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2018-12-10 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/97922
* gfortran.dg/io_constraints_8.f90: Update error message.
* gfortran.dg/pr87922.f90: New test.
2018-12-10 Martin Sebor <msebor@redhat.com> 2018-12-10 Martin Sebor <msebor@redhat.com>
PR tree-optimization/86196 PR tree-optimization/86196

2
gcc/testsuite/gfortran.dg/io_constraints_8.f90
View File

@ -14,7 +14,7 @@ integer :: i
OPEN(99, access=4_'direct') ! { dg-error "must be a character string of default kind" } OPEN(99, access=4_'direct') ! { dg-error "must be a character string of default kind" }
OPEN(99, action=4_'read') ! { dg-error "must be a character string of default kind" } OPEN(99, action=4_'read') ! { dg-error "must be a character string of default kind" }
OPEN(99, asynchronous=4_'no') ! { dg-error "must be a character string of default kind" }) OPEN(99, asynchronous=4_'no') ! { dg-error "must be of default CHARACTER kind" }
OPEN(99, blank=4_'null') ! { dg-error "must be a character string of default kind" } OPEN(99, blank=4_'null') ! { dg-error "must be a character string of default kind" }
OPEN(99, decimal=4_'comma') ! { dg-error "must be a character string of default kind" } OPEN(99, decimal=4_'comma') ! { dg-error "must be a character string of default kind" }
OPEN(99, delim=4_'quote') ! { dg-error "must be a character string of default kind" } OPEN(99, delim=4_'quote') ! { dg-error "must be a character string of default kind" }

10
gcc/testsuite/gfortran.dg/pr87922.f90 Normal file
View File

@ -0,0 +1,10 @@
! { dg-do compile }
! PR fortran/87922
subroutine p
read(1, asynchronous=['no']) ! { dg-error "must be scalar" }
read(1, asynchronous=[character::]) ! { dg-error "must be scalar" }
end
subroutine q
write(1, asynchronous=['no']) ! { dg-error "must be scalar" }
write(1, asynchronous=[character::]) ! { dg-error "must be scalar" }
end