aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Coudert <coudert@clipper.ens.fr>2005-03-25 08:04:27 +0100
committerFrançois-Xavier Coudert <fxcoudert@gcc.gnu.org>2005-03-25 07:04:27 +0000
commita50f3cd3e63a4fef661eedf02756c7814c41faec (patch)
tree961e4b47dd7dbd9f60e655f4d3ba1794672ee5b9
parent17998b22b59b393fe28c766e3bd72a0419f70041 (diff)
downloadgcc-a50f3cd3e63a4fef661eedf02756c7814c41faec.zip
gcc-a50f3cd3e63a4fef661eedf02756c7814c41faec.tar.gz
gcc-a50f3cd3e63a4fef661eedf02756c7814c41faec.tar.bz2
re PR libfortran/15332 (colon edit descriptor not handled correctly)
PR libfortran/15332 * io/format.c (parse_format_list): format node for colon edit descriptor needs a repeat counter set to 1. * gfortran.dg/pr15332.f: New test. From-SVN: r97036
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/pr15332.f12
-rw-r--r--libgfortran/ChangeLog6
-rw-r--r--libgfortran/io/format.c1
4 files changed, 24 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 985dee5..65f355a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-25 Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ PR libfortran/15332
+ * gfortran.dg/pr15332.f: New test.
+
2005-03-24 Dale Johannesen <dalej@apple.com>
* gcc.dg/20020919-1.c: Fix for x86 Darwin.
diff --git a/gcc/testsuite/gfortran.dg/pr15332.f b/gcc/testsuite/gfortran.dg/pr15332.f
new file mode 100644
index 0000000..2385535
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr15332.f
@@ -0,0 +1,12 @@
+! PR libfortran/15332
+! {do-do run}
+ character*12 c
+
+ write (c,100) 0, 1
+ if (c .ne. 'i = 0, j = 1') call abort
+
+ write (c,100) 0
+ if (c .ne. 'i = 0 ') call abort
+
+ 100 format ('i = ',i1,:,', j = ',i1)
+ end
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index b952c54..6517e03 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-25 Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ PR libfortran/15332
+ * io/format.c (parse_format_list): format node for colon edit
+ descriptor needs a repeat counter set to 1.
+
2005-02-24 Francois-Xavier Coudert <coudert@clipper.ens.fr>
* config.h.in: Regenerate.
diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index db5e0fe..f8d858a 100644
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -564,6 +564,7 @@ parse_format_list (void)
case FMT_COLON:
get_fnode (&head, &tail, FMT_COLON);
+ tail->repeat = 1;
goto optional_comma;
case FMT_SLASH: