OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/24285 ([4.2 only] format(1000(a,$))) 

PR fortran/24285

	* io.c (check_format): Allow dollars everywhere in format, and
	issue a warning.

	* gfortran.dg/dollar_edit_descriptor-3.f: New test.

From-SVN: r118971
This commit is contained in:
Francois-Xavier Coudert 2006-11-18 13:16:42 +01:00 committed by François-Xavier Coudert
parent ea57490067
commit 7b66643229
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2006-11-18 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR fortran/24285
* io.c (check_format): Allow dollars everywhere in format, and
issue a warning.
2006-11-17 Francois-Xavier Coudert <coudert@clipper.ens.fr>
* gfortran.h (gfc_add_intrinsic_modules_path,

7
gcc/fortran/io.c
View File

@ -510,8 +510,8 @@ format_item_1:
return FAILURE;
if (t != FMT_RPAREN || level > 0)
{
error = _("$ must be the last specifier");
goto syntax;
gfc_warning ("$ should be the last specifier in format at %C");
goto optional_comma_1;
}
goto finished;
@ -755,8 +755,9 @@ between_desc:
optional_comma:
/* Optional comma is a weird between state where we've just finished
reading a colon, slash or P descriptor. */
reading a colon, slash, dollar or P descriptor. */
t = format_lex ();
optional_comma_1:
switch (t)
{
case FMT_COMMA:

6
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,9 @@
2006-11-17 Francois-Xavier Coudert <coudert@clipper.ens.fr>
2006-11-18 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR fortran/24285
* gfortran.dg/dollar_edit_descriptor-3.f: New test.
2006-11-17 Francois-Xavier Coudert <coudert@clipper.ens.fr>
* gfortran.dg/use_1.f90: New test.
* gfortran.dg/use_1.f90: New test.
* gfortran.dg/use_1.f90: New test.

8
gcc/testsuite/gfortran.dg/dollar_edit_descriptor-3.f Normal file
View File

@ -0,0 +1,8 @@
! { dg-do run }
! { dg-options "-std=gnu" }
! Test for dollar descriptor in the middle of a format
300 format(1000(a,$)) ! { dg-warning "should be the last specifier" }
write(*,300) "gee", "gee"
write(*,"(1000(a,$))") "foo", "bar" ! { dg-warning "should be the last specifier" }
end
! { dg-output "^geegeefoobar$" }