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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index eb093a75b6d1337e203d9e84211d04b4d597f702..44c61b68bd55eb29991e8820a0582b9a9c0570aa 100644 (file)
--- 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 a65447a923332d0505ff8dd12de1c0dd4736f4d1..348b87fe136ae06424bb74b337710bdc06391238 100644 (file)
--- 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 7743fa08e9b3eeecbd2c89424fbcbfb86d80dfc8..fdce4c49228d81ed563c3447d6814b595873cdb7 100644 (file)
--- 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 (file)
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