re PR fortran/32555 (Miscompilation of NIST testsuite)

2007-06-30  Tobias Burnus  <burnus@net-b.de>

	PR fortran/32555
	* io.c (check_format): Allow zero to precede the
	P edit descriptor.

2007-06-30  Tobias Burnus  <burnus@net-b.de>

	PR fortran/32555
	* gfortran.dg/fmt_zero_check.f90: New.

From-SVN: r126152

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3786adcaec6fa663198790f04152ffa09e67287f..19ab39117fa8de31e5f4e047d0741e72f72bc36f 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-30  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/32555
+       * io.c (check_format): Allow zero to precede the
+       P edit descriptor.
+
 2007-06-30  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/32472

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index f9b5eac21d72cf364da528ae2132177b0d706689..e8f4debbd4e62c6d2d4f954616f12b06ca62d4c8 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -487,6 +487,7 @@ format_item_1:
       goto format_item;
 
     case FMT_SIGNED_INT:
+    case FMT_ZERO:
       /* Signed integer can only precede a P format.  */
       t = format_lex ();
       if (t != FMT_P)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a763456aea331bfdc48887aa2027060b22e5b71..d6a6dba26ebd8990261dbfb5b8587aa0f7c2f83f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-30  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/32555
+       * gfortran.dg/fmt_zero_check.f90: New.
+
 2007-06-30  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/30284

diff --git a/gcc/testsuite/gfortran.dg/fmt_zero_check.f90 b/gcc/testsuite/gfortran.dg/fmt_zero_check.f90
new file mode 100644 (file)
index 0000000..d8b6c5d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fmt_zero_check.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! PR fortran/32555
+!
+2050  FORMAT(0PF9.4)
+2050  FORMAT(0F9.4) ! { dg-error "Expected P edit descriptor" }
+end