2005-07-05 Atsushi Enomoto <atsushi@ximian.com>

	* SimpleCollator.cs : Compare() was missing French sort support.
	* TestDriver.cs : added example case.

svn path=/trunk/mcs/; revision=46931

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog b/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
index 455ff2a6ecf5e0b602123df982952973f5ba3a15..ae9767ea88a2db65e30c4269120d26792a529efa 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SimpleCollator.cs : Compare() was missing French sort support.
+       * TestDriver.cs : added example case.
+
 2005-07-05  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Collation-notes.txt : updated status. Eliminated descriptions on

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs b/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
index 4cb15216cb233c542ce0310bb1d7e5e2f12179d3..31dc9150871e3ed3e3d5999ac8630cfb04b48d3c 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
@@ -783,7 +783,7 @@ Console.WriteLine (" -> '{0}'", c.Replacement);
                                        ret = sk1 [2] - sk2 [2];
                                        if (ret != 0) {
                                                finalResult = ret;
-                                               currentLevel = 1;
+                                               currentLevel = frenchSort ? 2 : 1;
                                                continue;
                                        }
                                }

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/TestDriver.cs b/mcs/class/corlib/Mono.Globalization.Unicode/TestDriver.cs
index 83dcd4c8eaa4d2df4c44bfe2fb725d89ffc5d9bb..80c566f4688761732f26fad3c30333c7f17cae4b 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/TestDriver.cs
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/TestDriver.cs
@@ -110,6 +110,15 @@ namespace Mono.Globalization.Unicode
                        IsSuffix ("zs", "zs", CompareOptions.None);
                        IsSuffix ("sz", "z", CompareOptions.None);
                        IsSuffix ("sz", "s", CompareOptions.None);
+
+                       coll = new SimpleCollator (new CultureInfo (""));
+                       Compare ("c\u00F4te", "cot\u00E9");
+                       DumpSortKey ("c\u00F4te");
+                       DumpSortKey ("cot\u00E9");
+                       coll = new SimpleCollator (new CultureInfo ("fr"));
+                       Compare ("c\u00F4te", "cot\u00E9");
+                       DumpSortKey ("c\u00F4te");
+                       DumpSortKey ("cot\u00E9");
                }
 
                void Generate ()