diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2012-03-28 20:45:16 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2012-03-28 20:45:16 +0000 |
| commit | b59e90711fdd29e707a9a071f14efdaee7d70d1a (patch) | |
| tree | 9f2a72800c06dbd5712fa0b41c9af5c638df17a1 /gcc/testsuite | |
| parent | 32e8bfc3f649f51969aa3ca63df162df25f5b9c8 (diff) | |
| download | gcc-b59e90711fdd29e707a9a071f14efdaee7d70d1a.zip gcc-b59e90711fdd29e707a9a071f14efdaee7d70d1a.tar.gz gcc-b59e90711fdd29e707a9a071f14efdaee7d70d1a.tar.bz2 | |
re PR fortran/52652 (call to gfc_match_asynchronous for allocatable at parse.c line 164)
2012-03-28 Paul Thomas <pault@gcc.gnu.org>
Tobias Burnus <burnus@gcc.gnu.org>
PR fortran/52652
* match.c (gfc_match_allocate, gfc_match_deallocate): Change
"not.. or" to "neither.. nor".
* parse.c (decode_specification_statement): Correct error in
chpice of matching function for "allocatable".
2012-03-28 Paul Thomas <pault@gcc.gnu.org>
Tobias Burnus <burnus@gcc.gnu.org>
PR fortran/52652
* gfortran.dg/allocate_class_1.f90 : Change error test.
* gfortran.dg/allocate_with_typespec_4.f90 : Change error test.
* gfortran.dg/allocate_alloc_opt_1.f90 : Change error test.
* gfortran.dg/deallocate_alloc_opt_1.f90 : Change error test.
Co-Authored-By: Tobias Burnus <burnus@gcc.gnu.org>
From-SVN: r185924
Diffstat (limited to 'gcc/testsuite')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocate_alloc_opt_1.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocate_class_1.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocate_with_typespec_4.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/deallocate_alloc_opt_1.f90 | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b965221..945e507 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2012-03-28 Paul Thomas <pault@gcc.gnu.org> + Tobias Burnus <burnus@gcc.gnu.org> + + PR fortran/52652 + * gfortran.dg/allocate_class_1.f90 : Change error test. + * gfortran.dg/allocate_with_typespec_4.f90 : Change error test. + * gfortran.dg/allocate_alloc_opt_1.f90 : Change error test. + * gfortran.dg/deallocate_alloc_opt_1.f90 : Change error test. + 2012-03-28 Jakub Jelinek <jakub@redhat.com> PR middle-end/52691 diff --git a/gcc/testsuite/gfortran.dg/allocate_alloc_opt_1.f90 b/gcc/testsuite/gfortran.dg/allocate_alloc_opt_1.f90 index 52e0262f..3a05e8c 100644 --- a/gcc/testsuite/gfortran.dg/allocate_alloc_opt_1.f90 +++ b/gcc/testsuite/gfortran.dg/allocate_alloc_opt_1.f90 @@ -24,7 +24,7 @@ program a allocate(i(2), errmsg=err) ! { dg-warning "useless without a STAT" } allocate(i(2), stat=j, errmsg=x) ! { dg-error "must be a scalar CHARACTER" } - allocate(err) ! { dg-error "nonprocedure pointer or an allocatable" } + allocate(err) ! { dg-error "neither a nonprocedure pointer nor an allocatable" } allocate(error(2),stat=j,errmsg=error(1)) ! { dg-error "shall not be ALLOCATEd within" } allocate(i(2), stat = i(1)) ! { dg-error "shall not be ALLOCATEd within" } diff --git a/gcc/testsuite/gfortran.dg/allocate_class_1.f90 b/gcc/testsuite/gfortran.dg/allocate_class_1.f90 index 1dea056..9a2a5cb 100644 --- a/gcc/testsuite/gfortran.dg/allocate_class_1.f90 +++ b/gcc/testsuite/gfortran.dg/allocate_class_1.f90 @@ -7,5 +7,5 @@ type :: t0 end type class(t0) :: x ! { dg-error "must be dummy, allocatable or pointer" } - allocate(x) ! { dg-error "is not a nonprocedure pointer or an allocatable variable" } + allocate(x) ! { dg-error "is neither a nonprocedure pointer nor an allocatable variable" } end diff --git a/gcc/testsuite/gfortran.dg/allocate_with_typespec_4.f90 b/gcc/testsuite/gfortran.dg/allocate_with_typespec_4.f90 index 327f28d..54ed109 100644 --- a/gcc/testsuite/gfortran.dg/allocate_with_typespec_4.f90 +++ b/gcc/testsuite/gfortran.dg/allocate_with_typespec_4.f90 @@ -21,7 +21,7 @@ subroutine not_an_f03_intrinsic allocate(real*8 :: y(1)) ! { dg-error "Invalid type-spec at" } allocate(real*4 :: x8) ! { dg-error "Invalid type-spec at" } allocate(real*4 :: y8(1)) ! { dg-error "Invalid type-spec at" } - allocate(double complex :: d1) ! { dg-error "not a nonprocedure pointer or an allocatable" } + allocate(double complex :: d1) ! { dg-error "neither a nonprocedure pointer nor an allocatable" } allocate(real_type :: b) allocate(real_type :: c(1)) diff --git a/gcc/testsuite/gfortran.dg/deallocate_alloc_opt_1.f90 b/gcc/testsuite/gfortran.dg/deallocate_alloc_opt_1.f90 index 5c00741..969ce25 100644 --- a/gcc/testsuite/gfortran.dg/deallocate_alloc_opt_1.f90 +++ b/gcc/testsuite/gfortran.dg/deallocate_alloc_opt_1.f90 @@ -24,7 +24,7 @@ program a deallocate(i, errmsg=err) ! { dg-warning "useless without a STAT" } deallocate(i, stat=j, errmsg=x) ! { dg-error "must be a scalar CHARACTER" } - deallocate(err) ! { dg-error "nonprocedure pointer or an allocatable" } + deallocate(err) ! { dg-error "nonprocedure pointer nor an allocatable" } deallocate(error,stat=j,errmsg=error(1)) ! { dg-error "shall not be DEALLOCATEd within" } deallocate(i, stat = i(1)) ! { dg-error "shall not be DEALLOCATEd within" } |