summaryrefslogtreecommitdiffstats
path: root/gcc
diff options
context:
space:
mode:
authortobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4>2005-05-11 22:32:04 +0000
committertobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4>2005-05-11 22:32:04 +0000
commit770616517d34851fabf7f16790dc9bd8d994bab5 (patch)
tree4359b959252f5ef9968c8f121291247c98ee326b /gcc
parent3ec3c84f411b699d86c249cdb9998c5b6e2345a6 (diff)
downloadppe42-gcc-770616517d34851fabf7f16790dc9bd8d994bab5.tar.gz
ppe42-gcc-770616517d34851fabf7f16790dc9bd8d994bab5.zip
fortran/
PR fortran/21260 * io.c (check_format): Look for literal characters inside hollerith constant. testsuite/ PR fortran/21260 * gfortran.dg/hollerith_1.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99597 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/io.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/hollerith_1.f9011
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b87d81474f4..98d9bb328b9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
2005-05-11 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+ PR fortran/21260
+ * io.c (check_format): Look for literal characters inside
+ hollerith constant.
+
+2005-05-11 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+
* resolve.c (resolve_symbol): Copy 'pointer' and 'dimension'
attribute from result symbol to function symbol.
* trans-expr.c (gfc_conv_function_call): Look at sym->attr.dimension
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 90eb855016d..8dab5f59afd 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -642,7 +642,7 @@ data_desc:
{
while(repeat >0)
{
- next_char(0);
+ next_char(1);
repeat -- ;
}
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6e3cae14cc9..ece62d2eacf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2005-05-11 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+ PR fortran/21260
+ * gfortran.dg/hollerith_1.f90: New test.
+
+2005-05-11 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+
* gfortran.dg/func_result_2.f90: New test.
2005-05-11 Bud Davis <bdavis@gfortran.org>
diff --git a/gcc/testsuite/gfortran.dg/hollerith_1.f90 b/gcc/testsuite/gfortran.dg/hollerith_1.f90
new file mode 100644
index 00000000000..d6732d40b69
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/hollerith_1.f90
@@ -0,0 +1,11 @@
+! { dg-do run }
+! PR 21260
+! We wrongly interpreted the '!' as the beginning of a comment.
+! Also verifies the functioning of hollerith formatting.
+ character*72 c
+ write(c,8000)
+8000 format(36(2H!)))
+ do i = 1,72,2
+ if (c(i:i+1) /= '!)') call abort
+ end do
+ end
OpenPOWER on IntegriCloud