From 770616517d34851fabf7f16790dc9bd8d994bab5 Mon Sep 17 00:00:00 2001 From: tobi Date: Wed, 11 May 2005 22:32:04 +0000 Subject: [PATCH] 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 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/io.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/hollerith_1.f90 | 11 +++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/hollerith_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b87d814..98d9bb3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2005-05-11 Tobias Schl"uter + PR fortran/21260 + * io.c (check_format): Look for literal characters inside + hollerith constant. + +2005-05-11 Tobias Schl"uter + * 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 90eb855..8dab5f5 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 6e3cae1..ece62d2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2005-05-11 Tobias Schl"uter + PR fortran/21260 + * gfortran.dg/hollerith_1.f90: New test. + +2005-05-11 Tobias Schl"uter + * gfortran.dg/func_result_2.f90: New test. 2005-05-11 Bud Davis diff --git a/gcc/testsuite/gfortran.dg/hollerith_1.f90 b/gcc/testsuite/gfortran.dg/hollerith_1.f90 new file mode 100644 index 0000000..d6732d4 --- /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 -- 2.7.4