diff options
| author | Daniel Kraft <d@domob.eu> | 2009-03-28 16:18:59 +0100 |
|---|---|---|
| committer | Daniel Kraft <domob@gcc.gnu.org> | 2009-03-28 16:18:59 +0100 |
| commit | bc6600ab2aeff09a928a28d2f74288ffcb5ad839 (patch) | |
| tree | edcb71475fc72529d3a9569925700265df2ab20f /gcc | |
| parent | 6f1873a1cffee3fc59a1a0f479b58b8a82bc4e2c (diff) | |
| download | gcc-bc6600ab2aeff09a928a28d2f74288ffcb5ad839.zip gcc-bc6600ab2aeff09a928a28d2f74288ffcb5ad839.tar.gz gcc-bc6600ab2aeff09a928a28d2f74288ffcb5ad839.tar.bz2 | |
string_intrinsics.c: #include <assert.h>
2009-03-28 Daniel Kraft <d@domob.eu>
* intrinsics/string_intrinsics.c: #include <assert.h>
* intrinsics/string_intrinsics_inc.c (string_trim): Use string_len_trim
instead of calculating the length directly.
(string_len_trim): For KIND=1, speed search up.
2009-03-28 Daniel Kraft <d@domob.eu>
* gfortran.dg/trim_1.f90: New test.
From-SVN: r145192
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/trim_1.f90 | 41 |
2 files changed, 45 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 23f3ce1..bbc57f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-03-28 Daniel Kraft <d@domob.eu> + + * gfortran.dg/trim_1.f90: New test. + 2009-03-28 Richard Guenther <rguenther@suse.de> * gcc.dg/Warray-bounds.c: Do not use redundant stores. diff --git a/gcc/testsuite/gfortran.dg/trim_1.f90 b/gcc/testsuite/gfortran.dg/trim_1.f90 new file mode 100644 index 0000000..ac1e1f2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/trim_1.f90 @@ -0,0 +1,41 @@ +! { dg-do run } + +! Torture-test TRIM and LEN_TRIM for correctness. + + +! Given a total string length and a trimmed length, construct an +! appropriate string and check gfortran gets it right. + +SUBROUTINE check_trim (full_len, trimmed_len) + IMPLICIT NONE + INTEGER, INTENT(IN) :: full_len, trimmed_len + CHARACTER(LEN=full_len) :: string + + string = "" + IF (trimmed_len > 0) THEN + string(trimmed_len:trimmed_len) = "x" + END IF + + IF (LEN (string) /= full_len & + .OR. LEN_TRIM (string) /= trimmed_len & + .OR. LEN (TRIM (string)) /= trimmed_len & + .OR. TRIM (string) /= string (1:trimmed_len)) THEN + PRINT *, full_len, trimmed_len + PRINT *, LEN (string), LEN_TRIM (string) + CALL abort () + END IF +END SUBROUTINE check_trim + + +! The main program, check with various combinations. + +PROGRAM main + IMPLICIT NONE + INTEGER :: i, j + + DO i = 0, 20 + DO j = 0, i + CALL check_trim (i, j) + END DO + END DO +END PROGRAM main |