This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[PATCH] Fix collate_members_xx.cc (take2)

From: Paolo Carlini <pcarlini at unitus dot it>
To: libstdc++ at gcc dot gnu dot org
Cc: bkoz at redhat dot com
Date: Thu, 14 Mar 2002 23:59:38 +0100
Subject: [PATCH] Fix collate_members_xx.cc (take2)
Ok,

now, consistently, as indicated by Benjamin, the values returned by
collate::compare are always checked vs +-1. Otherwise, there is nothing new.

Tested i686-pc-linux-gnu: 1 unexpected (c99_classification_macros_c.cc), 0
expected.

Ok?

Ciao, Paolo.

//////////////

2002-03-14  Paolo Carlini  <pcarlini@unitus.it>

        * testsuite/22_locale/collate_members_char.cc
        (test01): compare the result of collate::compare with
        that of collate::transform + string::compare, not with
        that of collate::transform + collate::compare.
        (test01): values returned by collate::compare are
        normalized, therefore test against +-1.
        * testsuite/22_locale/collate_members_wchar_t.cc: Ditto.


diff -urN libstdc++-v3-orig/testsuite/22_locale/collate_members_char.cc
libstdc++-v3/testsuite/22_locale/collate_members_char.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate_members_char.cc Mon Feb 11
19:56:24 2002
+++ libstdc++-v3/testsuite/22_locale/collate_members_char.cc Thu Mar 14 23:43:58
2002
@@ -60,18 +60,18 @@
   int i1;
   int size1 = strlen(strlit1) - 1;
   i1 = coll_c.compare(strlit1, strlit1 + size1, strlit1, strlit1 + 7);
-  VERIFY ( i1 > 0 );
+  VERIFY ( i1 == 1 );
   i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + size1);
-  VERIFY ( i1 < 0 );
+  VERIFY ( i1 == -1 );
   i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + 7);
   VERIFY ( i1 == 0 );

   int i2;
   int size2 = strlen(strlit2) - 1;
   i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + 13);
-  VERIFY ( i2 > 0 );
+  VERIFY ( i2 == 1 );
   i2 = coll_c.compare(strlit2, strlit2 + 13, strlit2, strlit2 + size2);
-  VERIFY ( i2 < 0 );
+  VERIFY ( i2 == -1 );
   i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + size2);
   VERIFY ( i2 == 0 );

@@ -86,10 +86,10 @@

   string str1 = coll_c.transform(strlit1, strlit1 + size1);
   string str2 = coll_c.transform(strlit2, strlit2 + size2);
-  i1 = coll_c.compare(str1.c_str(), str1.c_str() + size1,
-         str2.c_str(), str2.c_str() + size2);
+  i1 = str1.compare(str2);
   i2 = coll_c.compare(strlit1, strlit1 + size1, strlit2, strlit2 + size2);
-  VERIFY(i1 == i2);
+  VERIFY(i2 == 1);
+  VERIFY(i1 * i2 > 0);

   // Check German "de_DE" locale.
   const char* strlit3 = "Äuglein Augment"; // "C" == "Augment Äuglein"
@@ -97,9 +97,9 @@

   int size3 = strlen(strlit3) - 1;
   i1 = coll_de.compare(strlit3, strlit3 + size3, strlit3, strlit3 + 7);
-  VERIFY ( i1 > 0 );
+  VERIFY ( i1 == 1 );
   i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + size1);
-  VERIFY ( i1 < 0 );
+  VERIFY ( i1 == -1 );
   i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + 7);
   VERIFY ( i1 == 0 );

@@ -108,9 +108,9 @@

   int size4 = strlen(strlit4) - 1;
   i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + 13);
-  VERIFY ( i2 > 0 );
+  VERIFY ( i2 == 1 );
   i2 = coll_de.compare(strlit4, strlit4 + 13, strlit4, strlit4 + size4);
-  VERIFY ( i2 < 0 );
+  VERIFY ( i2 == -1 );
   i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + size4);
   VERIFY ( i2 == 0 );

@@ -123,10 +123,10 @@

   string str3 = coll_de.transform(strlit3, strlit3 + size3);
   string str4 = coll_de.transform(strlit4, strlit4 + size4);
-  i1 = coll_de.compare(str3.c_str(), str3.c_str() + size3,
-         str4.c_str(), str4.c_str() + size4);
+  i1 = str3.compare(str4);
   i2 = coll_de.compare(strlit3, strlit3 + size3, strlit4, strlit4 + size4);
-  VERIFY(i1 == i2);
+  VERIFY(i2 == -1);
+  VERIFY(i1 * i2 > 0);
 }

 // libstdc++/5280
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate_members_wchar_t.cc
libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate_members_wchar_t.cc Mon Feb 11
19:56:24 2002
+++ libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc Thu Mar 14
23:45:00 2002
@@ -60,18 +60,18 @@
   int i1;
   int size1 = char_traits<wchar_t>::length(strlit1) - 1;
   i1 = coll_c.compare(strlit1, strlit1 + size1, strlit1, strlit1 + 7);
-  VERIFY ( i1 > 0 );
+  VERIFY ( i1 == 1 );
   i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + size1);
-  VERIFY ( i1 < 0 );
+  VERIFY ( i1 == -1 );
   i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + 7);
   VERIFY ( i1 == 0 );

   int i2;
   int size2 = char_traits<wchar_t>::length(strlit2) - 1;
   i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + 13);
-  VERIFY ( i2 > 0 );
+  VERIFY ( i2 == 1 );
   i2 = coll_c.compare(strlit2, strlit2 + 13, strlit2, strlit2 + size2);
-  VERIFY ( i2 < 0 );
+  VERIFY ( i2 == -1 );
   i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + size2);
   VERIFY ( i2 == 0 );

@@ -86,10 +86,10 @@

   wstring str1 = coll_c.transform(strlit1, strlit1 + size1);
   wstring str2 = coll_c.transform(strlit2, strlit2 + size2);
-  i1 = coll_c.compare(str1.c_str(), str1.c_str() + size1,
-        str2.c_str(), str2.c_str() + size2);
+  i1 = str1.compare(str2);
   i2 = coll_c.compare(strlit1, strlit1 + size1, strlit2, strlit2 + size2);
-  VERIFY(i1 == i2);
+  VERIFY(i2 == 1);
+  VERIFY(i1 * i2 > 0);

   // Check German "de_DE" locale.
   const wchar_t* strlit3 = L"Äuglein Augment"; // "C" == "Augment Äuglein"
@@ -97,9 +97,9 @@

   int size3 = char_traits<wchar_t>::length(strlit3) - 1;
   i1 = coll_de.compare(strlit3, strlit3 + size3, strlit3, strlit3 + 7);
-  VERIFY ( i1 > 0 );
+  VERIFY ( i1 == 1 );
   i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + size1);
-  VERIFY ( i1 < 0 );
+  VERIFY ( i1 == -1 );
   i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + 7);
   VERIFY ( i1 == 0 );

@@ -108,9 +108,9 @@

   int size4 = char_traits<wchar_t>::length(strlit4) - 1;
   i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + 13);
-  VERIFY ( i2 > 0 );
+  VERIFY ( i2 == 1 );
   i2 = coll_de.compare(strlit4, strlit4 + 13, strlit4, strlit4 + size4);
-  VERIFY ( i2 < 0 );
+  VERIFY ( i2 == -1 );
   i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + size4);
   VERIFY ( i2 == 0 );

@@ -123,10 +123,10 @@

   wstring str3 = coll_de.transform(strlit3, strlit3 + size3);
   wstring str4 = coll_de.transform(strlit4, strlit4 + size4);
-  i1 = coll_de.compare(str3.c_str(), str3.c_str() + size3,
-         str4.c_str(), str4.c_str() + size4);
+  i1 = str3.compare(str4);
   i2 = coll_de.compare(strlit3, strlit3 + size3, strlit4, strlit4 + size4);
-  VERIFY(i1 == i2);
+  VERIFY(i2 == -1);
+  VERIFY(i1 * i2 > 0);
 }

 // libstdc++/5280
Follow-Ups:
- Re: [PATCH] Fix collate_members_xx.cc (take2)
  - From: Benjamin Kosnik
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]