diff options
| author | Steven G. Kargl <kargls@comcast.net> | 2006-03-06 20:43:22 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2006-03-06 20:43:22 +0000 |
| commit | 9202989a98f7f0b7244cc4fe6efcb4e78833ad3d (patch) | |
| tree | 86f7d15b5470fd19faaee969540665ac0ebc86af /gcc | |
| parent | 8ffe5488225da983a577c994ae92a986f7ce1a80 (diff) | |
| download | gcc-9202989a98f7f0b7244cc4fe6efcb4e78833ad3d.zip gcc-9202989a98f7f0b7244cc4fe6efcb4e78833ad3d.tar.gz gcc-9202989a98f7f0b7244cc4fe6efcb4e78833ad3d.tar.bz2 | |
simplify.c (gfc_simplify_verify): Fix return when SET=''.
2006-03-06 Steven G. Kargl <kargls@comcast.net>
* simplify.c (gfc_simplify_verify): Fix return when SET=''.
* gfortran.dg/verify_2.f90: New test.
From-SVN: r111791
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/verify_2.f90 | 11 |
4 files changed, 21 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e3fb42c..ddb49cc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2006-03-05 Steven G. Kargl <kargls@comcast.net> + + * simplify.c (gfc_simplify_verify): Fix return when SET=''. + 2005-03-05 Erik Edelmann <eedelman@gcc.gnu.org> PR fortran/16136 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index b477078..d5dfb34 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -3759,7 +3759,7 @@ gfc_simplify_verify (gfc_expr * s, gfc_expr * set, gfc_expr * b) { if (lenset == 0) { - mpz_set_ui (result->value.integer, len); + mpz_set_ui (result->value.integer, 1); return result; } @@ -3773,7 +3773,7 @@ gfc_simplify_verify (gfc_expr * s, gfc_expr * set, gfc_expr * b) { if (lenset == 0) { - mpz_set_ui (result->value.integer, 1); + mpz_set_ui (result->value.integer, len); return result; } for (index = len; index > 0; index --) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 14a1469..8329ae4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2006-03-06 Steven G. Kargl <kargls@comcast.net> + * gfortran.dg/verify_2.f90: New test. + +2006-03-06 Steven G. Kargl <kargls@comcast.net> + * gfortran.dg/equiv_1.f90: Replace tab(s) with spaces. * gfortran.dg/arrayio_1.f90: Ditto. * gfortran.dg/pr25603.f: Ditto. diff --git a/gcc/testsuite/gfortran.dg/verify_2.f90 b/gcc/testsuite/gfortran.dg/verify_2.f90 new file mode 100644 index 0000000..705d775 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/verify_2.f90 @@ -0,0 +1,11 @@ +! { dg-do run } +program verify_2 + character(len=3) s1, s2 + s1 = 'abc' + s2 = '' + if (verify('ab', '') /= 1) call abort + if (verify(s1, s2) /= 1) call abort + if (verify('abc', '', .true.) /= 3) call abort + if (verify(s1, s2, .true.) /= 3) call abort +end program verify_2 + |