diff options
| author | tobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-04 10:35:00 +0000 |
|---|---|---|
| committer | tobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-04 10:35:00 +0000 |
| commit | cd7da3b14dfeb58c62844f3e9c068f7c8cb77292 (patch) | |
| tree | 80d91455a2f217135699ed8ace4b1fa5b6ca86d8 | |
| parent | 2261c5d9e6f4d7bbcbcceae33c61e06a91c0a48c (diff) | |
| download | ppe42-gcc-cd7da3b14dfeb58c62844f3e9c068f7c8cb77292.tar.gz ppe42-gcc-cd7da3b14dfeb58c62844f3e9c068f7c8cb77292.zip | |
fortran/
* match.c (match_forall_iterator): Don't immediately give error if '='
is not followed by an expression.
testsuite/
* gfortran.dg/forall_1.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100580 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/match.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/forall_1.f90 | 27 |
4 files changed, 38 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index bc0fa79d7de..bc8c7b495f7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,9 @@ -2005-06-03 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> +2005-06-04 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> + + * match.c (match_forall_iterator): Don't immediately give error if '=' + is not followed by an expression. + +2005-06-04 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> Erik Edelmann <erik.edelmann@iki.fi> * array.c (gfc_match_array_constructor): Disallow empty array diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 741e1a30607..0592b1e974b 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -3084,9 +3084,7 @@ match_forall_iterator (gfc_forall_iterator ** result) } m = gfc_match_expr (&iter->start); - if (m == MATCH_NO) - goto syntax; - if (m == MATCH_ERROR) + if (m != MATCH_YES) goto cleanup; if (gfc_match_char (':') != MATCH_YES) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index acbdca22ea2..db1bea63628 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> + + * gfortran.dg/forall_1.f90: New test. + 2005-06-04 Erik Edelmann <erik.edelmann@iki.fi> * gfortran.dg/array_constructor_3.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/forall_1.f90 b/gcc/testsuite/gfortran.dg/forall_1.f90 new file mode 100644 index 00000000000..f657dcb279e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/forall_1.f90 @@ -0,0 +1,27 @@ +! { dg-do run } +! tests FORALL statements with a mask +dimension i2(15,10), i1(15) +type a + sequence + integer k +end type a +type(a) :: a1(10), a2(5,5) + +forall (i=1:15, i1(i) /= 0) + i1(i) = 0 +end forall +if (any(i1 /= 0)) call abort + +a1(:)%k = i1(1:10) +forall (i=1:10, a1(i)%k == 0) + a1(i)%k = i +end forall +if (any (a1(:)%k /= (/ (i, i=1,10) /))) call abort + +forall (i=1:15, j=1:10, a1(j)%k <= j) + i2(i,j) = j + i*11 +end forall +do i=1,15 + if (any (i2(i,:) /= (/ (i*11 + j, j=1,10) /))) call abort +end do +end |
