diff options
| author | Feng Wang <fengwang@nudt.edu.cn> | 2005-06-01 03:44:43 +0000 |
|---|---|---|
| committer | Feng Wang <fengwang@gcc.gnu.org> | 2005-06-01 03:44:43 +0000 |
| commit | bf3ddf8a1f39e6c7cbf18535b184b077b3dd41be (patch) | |
| tree | 1bb734c2296915e4239eef9ee7d794c2ab9daa25 | |
| parent | 5d1dcb0e09a70edf1e3f6a5bd70a0e97d8c4ea2d (diff) | |
| download | gcc-bf3ddf8a1f39e6c7cbf18535b184b077b3dd41be.tar.gz | |
re PR fortran/20883 (unassigned integer used as format)
2005-06-01 Feng Wang <fengwang@nudt.edu.cn>
PR fortran/20883
* fortran/io.c (resolve_tag): Fix error message.
2005-06-01 Feng Wang <fengwang@nudt.edu.cn>
PR fortran/20883
* gfortran/assign_4.f90: New test.
* gfortran/assign_2.f90: Change compile to run.
From-SVN: r100424
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/io.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/assign_2.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/assign_4.f90 | 4 |
5 files changed, 19 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 388e87eb02b..af23e9f59ef 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2005-06-01 Feng Wang <fengwang@nudt.edu.cn> + + PR fortran/20883 + * fortran/io.c (resolve_tag): Fix error message. + 2005-05-31 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * fortran/trans-decl.c: Don't include errors.h. diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 7777f05a410..34619ab27df 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -974,8 +974,9 @@ resolve_tag (const io_tag * tag, gfc_expr * e) /* Format label can be integer varibale. */ if (tag != &tag_format || e->ts.type != BT_INTEGER) { - gfc_error ("%s tag at %L must be of type %s", tag->name, &e->where, - gfc_basic_typename (tag->type)); + gfc_error ("%s tag at %L must be of type %s or %s", tag->name, + &e->where, gfc_basic_typename (tag->type), + gfc_basic_typename (BT_INTEGER)); return FAILURE; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5b5fce64d40..c9aa862c4e2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2005-06-01 Feng Wang <fengwang@nudt.edu.cn> + + PR fortran/20883 + * gfortran/assign_4.f90: New test. + * gfortran/assign_2.f90: Change compile to run. + 2005-05-31 Geoffrey Keating <geoffk@geoffk.org> * lib/target-supports.exp diff --git a/gcc/testsuite/gfortran.dg/assign_2.f90 b/gcc/testsuite/gfortran.dg/assign_2.f90 index 4119cd94f58..6db1f2fe85c 100644 --- a/gcc/testsuite/gfortran.dg/assign_2.f90 +++ b/gcc/testsuite/gfortran.dg/assign_2.f90 @@ -1,4 +1,4 @@ -! { dg-do compile } +! { dg-do run } ! Option passed to avoid excess errors from obsolete warning ! { dg-options "-w" } ! PR18827 diff --git a/gcc/testsuite/gfortran.dg/assign_4.f90 b/gcc/testsuite/gfortran.dg/assign_4.f90 new file mode 100644 index 00000000000..f958e985904 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assign_4.f90 @@ -0,0 +1,4 @@ +! { dg-do compile } +! PR fortran/20883 + write (*, a) b ! { dg-error "must be of type CHARACTER or INTEGER" } + end |