diff options
| author | Thomas Koenig <Thomas.Koenig@online.de> | 2006-06-01 19:23:56 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2006-06-01 19:23:56 +0000 |
| commit | 47fe00d8f5ae7ba8e66f1c97f969eb87a4695ffe (patch) | |
| tree | 5efb54dbef143558582bc811fea1879150fca2a4 | |
| parent | df5c71ac3c955306a63994af858694a29b2e6217 (diff) | |
| download | gcc-47fe00d8f5ae7ba8e66f1c97f969eb87a4695ffe.zip gcc-47fe00d8f5ae7ba8e66f1c97f969eb87a4695ffe.tar.gz gcc-47fe00d8f5ae7ba8e66f1c97f969eb87a4695ffe.tar.bz2 | |
re PR fortran/27715 (Extented ASCII characters lead to wrong "CASE" selection)
2006-06-01 Thomas Koenig <Thomas.Koenig@online.de>
PR fortran/27715
* arith.c: Cast the characters from the strings to unsigned
char to avoid values less than 0 for extended ASCII.
2006-06-01 Thomas Koenig <Thomas.Koenig@online.de>
PR fortran/27715
* gfortran.dg/extended_char_comparison_1.f: New test.
From-SVN: r114317
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/arith.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/extended_char_comparison_1.f | 20 |
4 files changed, 35 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index eb093a7..44c61b6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2006-06-01 Thomas Koenig <Thomas.Koenig@online.de> + + PR fortran/27715 + * arith.c: Cast the characters from the strings to unsigned + char to avoid values less than 0 for extended ASCII. + 2006-06-01 Per Bothner <bothner@bothner.com> * data.c (gfc_assign_data_value): Handle USE_MAPPED_LOCATION. diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index a65447a..348b87f 100644 --- a/gcc/fortran/arith.c +++ b/gcc/fortran/arith.c @@ -1133,8 +1133,10 @@ gfc_compare_string (gfc_expr * a, gfc_expr * b, const int *xcoll_table) for (i = 0; i < len; i++) { - ac = (i < alen) ? a->value.character.string[i] : ' '; - bc = (i < blen) ? b->value.character.string[i] : ' '; + /* We cast to unsigned char because default char, if it is signed, + would lead to ac<0 for string[i] > 127. */ + ac = (unsigned char) ((i < alen) ? a->value.character.string[i] : ' '); + bc = (unsigned char) ((i < blen) ? b->value.character.string[i] : ' '); if (xcoll_table != NULL) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7743fa0..fdce4c4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-06-01 Thomas Koenig <Thomas.Koenig@online.de> + + PR fortran/27715 + * gfortran.dg/extended_char_comparison_1.f: New test. + 2006-06-01 Paul Thomas <pault@gcc.gnu.org> PR fortran/25098 diff --git a/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f b/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f new file mode 100644 index 0000000..311567d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f @@ -0,0 +1,20 @@ +! { dg-do run } +! PR 27715 - the front end and the library used to have different ideas +! about ordering for characters whose encoding is above 127. + + program main + character*1 c1, c2 + logical a1, a2 + c1 = 'ç'; + c2 = 'c'; + a1 = c1 > c2; + call setval(c1, c2) + a2 = c1 > c2 + if (a1 .neqv. a2) call abort + end + + subroutine setval(c1, c2) + character*1 c1, c2 + c1 = 'ç'; + c2 = 'c'; + end |