aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2007-06-30 18:01:25 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2007-06-30 18:01:25 +0200
commitdf5be068b278d70e30e7b4a86d09b4172681d060 (patch)
tree98fa6097bf0d67b42ae7815b895ebc944aaa5888
parentb2e8326644ad7cf6f6a4fd4fdcda55cf666e434a (diff)
downloadgcc-df5be068b278d70e30e7b4a86d09b4172681d060.zip
gcc-df5be068b278d70e30e7b4a86d09b4172681d060.tar.gz
gcc-df5be068b278d70e30e7b4a86d09b4172681d060.tar.bz2
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
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/io.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/fmt_zero_check.f906
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3786adc..19ab391 100644
--- 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 f9b5eac..e8f4deb 100644
--- 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 5a76345..d6a6dba 100644
--- 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
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