diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 | 46 |
2 files changed, 28 insertions, 23 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9beac3f..86b892c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-10-06 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + * gfortran.dg/actual_array_constructor_2.f90: Remove '\r's from + line endings. + 2006-10-06 Zdenek Dvorak <dvorakz@suse.cz> PR middle-end/29256 diff --git a/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 b/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 index 0a86b70..4265aeb 100644 --- a/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 +++ b/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 @@ -5,30 +5,30 @@ ! ! Based on the testscase by Harald Anlauf <anlauf@gmx.de> ! - character(4), dimension(4) :: c1, c2
- integer m
- m = 4
-! Test the original problem
- call foo ((/( 'abcd',i=1,m )/), c2)
- if (any(c2(:) .ne. (/'abcd','abcd', &
- 'abcd','abcd'/))) call abort ()
-
+ character(4), dimension(4) :: c1, c2 + integer m + m = 4 +! Test the original problem + call foo ((/( 'abcd',i=1,m )/), c2) + if (any(c2(:) .ne. (/'abcd','abcd', & + 'abcd','abcd'/))) call abort () + ! Now get a bit smarter
- call foo ((/"abcd", "efgh", "ijkl", "mnop"/), c1) ! worked previously
- call foo ((/(c1(i), i = m,1,-1)/), c2) ! was broken
- if (any(c2(4:1:-1) .ne. c1)) call abort ()
-
-! gfc_todo: Not Implemented: complex character array constructors
+ call foo ((/"abcd", "efgh", "ijkl", "mnop"/), c1) ! worked previously + call foo ((/(c1(i), i = m,1,-1)/), c2) ! was broken + if (any(c2(4:1:-1) .ne. c1)) call abort () + +! gfc_todo: Not Implemented: complex character array constructors call foo ((/(c1(i)(i/2+1:i/2+2), i = 1,4)/), c2) ! Ha! take that..! if (any (c2 .ne. (/"ab ","fg ","jk ","op "/))) call abort () -
+ ! Check functions in the constructor
- call foo ((/(achar(64+i)//achar(68+i)//achar(72+i)// &
- achar(76+i),i=1,4 )/), c1) ! was broken
- if (any (c1 .ne. (/"AEIM","BFJN","CGKO","DHLP"/))) call abort ()
-contains
- subroutine foo (chr1, chr2)
- character(*), dimension(:) :: chr1, chr2
- chr2 = chr1
- end subroutine foo
-end
\ No newline at end of file + call foo ((/(achar(64+i)//achar(68+i)//achar(72+i)// & + achar(76+i),i=1,4 )/), c1) ! was broken + if (any (c1 .ne. (/"AEIM","BFJN","CGKO","DHLP"/))) call abort () +contains + subroutine foo (chr1, chr2) + character(*), dimension(:) :: chr1, chr2 + chr2 = chr1 + end subroutine foo +end |