diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2005-05-12 00:32:04 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2005-05-12 00:32:04 +0200 |
| commit | b160dd2803ed9103058b7f48f2bae6ed87442886 (patch) | |
| tree | 4359b959252f5ef9968c8f121291247c98ee326b /gcc | |
| parent | 5e6c8b642870fa915835308210a6bd3679d3c9c5 (diff) | |
| download | gcc-b160dd2803ed9103058b7f48f2bae6ed87442886.zip gcc-b160dd2803ed9103058b7f48f2bae6ed87442886.tar.gz gcc-b160dd2803ed9103058b7f48f2bae6ed87442886.tar.bz2 | |
re PR fortran/21260 (Conflict between comment and H edit descriptor)
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.
From-SVN: r99597
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/io.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/hollerith_1.f90 | 11 |
4 files changed, 23 insertions, 1 deletions
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 <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 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 <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 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 |