* io.c (check_format): Allow dollars everywhere in format, and
issue a warning.
* gfortran.dg/dollar_edit_descriptor-3.f: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118971
138bc75d-0d04-0410-961f-
82ee72b054a4
+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,
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;
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:
-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.
--- /dev/null
+! { 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$" }