Author: atsushi
Date: 2005-07-13 14:40:57 -0400 (Wed, 13 Jul 2005)
New Revision: 47280
Modified:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
trunk/mcs/class/corlib/Mono.Globalization.Unicode/Collation-notes.txt
trunk/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog
trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
Log:
2005-07-13 Atsushi Enomoto <[EMAIL PROTECTED]>
* SimpleCollator.cs : when restoring from expansion, go back to the
top of the loop (to avoid index out of range).
Now IsPrefix() is implemented to reuse Compare() and thus it now
supports extender as well.
* Collation-notes.txt : status update. Deleted optimization part in
status section (it is duplicate).
* CompareInfoTest.cs : Added Compare() test that contains expansion.
Fixed CompareSpecialWeight() which was not testing what I intended.
Added IsPrefix() tests with special weight (copying Compare() tests)
Modified: trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog 2005-07-13
18:10:39 UTC (rev 47279)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog 2005-07-13
18:40:57 UTC (rev 47280)
@@ -1,5 +1,14 @@
2005-07-13 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * SimpleCollator.cs : when restoring from expansion, go back to the
+ top of the loop (to avoid index out of range).
+ Now IsPrefix() is implemented to reuse Compare() and thus it now
+ supports extender as well.
+ * Collation-notes.txt : status update. Deleted optimization part in
+ status section (it is duplicate).
+
+2005-07-13 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* SimpleCollator.cs : some code reordering.
* create-mscompat-collation-table.cs : it was still missing U+3094.
Modified: trunk/mcs/class/corlib/Mono.Globalization.Unicode/Collation-notes.txt
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/Collation-notes.txt
2005-07-13 18:10:39 UTC (rev 47279)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/Collation-notes.txt
2005-07-13 18:40:57 UTC (rev 47280)
@@ -21,11 +21,8 @@
(via create-tailorings.exe).
* implement collation methods
- All methods are basically implemented in practical level.
- - except for GetSortKey(), they don't handle Japanese and
- Arabic extenders.
- - optimization in IndexOf() and Compare() : now I can
- consider to do it, but not yet. Porting them to C code is
- one possible approach.
+ - except for GetSortKey(), Compare() and Prefix(), they don't
+ handle Japanese and Arabic extenders.
* fix design (FIXMEs)
- Currently tailored sortkey does not handle CompareOptions.
However the flag is significant.
@@ -66,6 +63,8 @@
characters or it reached the beginning of the string, checking
HasContractTail(char) for composite.
+ Porting them to C code is an alternative possible approach.
+
** How to support CompareOptions
There are two kind of "ignorance" : strippers' ignorance and
Modified: trunk/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
2005-07-13 18:10:39 UTC (rev 47279)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
2005-07-13 18:40:57 UTC (rev 47280)
@@ -784,18 +784,21 @@
escape2.Source = null;
previousSortKey= previousSortKey2 = null;
previousChar = previousChar2 = -1;
- int ret = Compare (s1, idx1, len1, s2, idx2, len2,
(options & CompareOptions.StringSort) != 0);
+ bool dummy;
+ int ret = CompareInternal (s1, idx1, len1, s2, idx2,
len2, (options & CompareOptions.StringSort) != 0, out dummy);
return ret == 0 ? 0 : ret < 0 ? -1 : 1;
#endif
}
- int Compare (string s1, int idx1, int len1, string s2,
- int idx2, int len2, bool stringSort)
+ int CompareInternal (string s1, int idx1, int len1, string s2,
+ int idx2, int len2, bool stringSort,
+ out bool targetConsumed)
{
int start1 = idx1;
int start2 = idx2;
int end1 = idx1 + len1;
int end2 = idx2 + len2;
+ targetConsumed = false;
// It holds final result that comes from the comparison
// at level 2 or lower. Even if Compare() found the
@@ -839,6 +842,7 @@
idx1 = escape1.Index;
end1 = escape1.End;
escape1.Source = null;
+ continue;
}
if (idx2 >= end2) {
if (escape2.Source == null)
@@ -848,6 +852,7 @@
idx2 = escape2.Index;
end2 = escape2.End;
escape2.Source = null;
+ continue;
}
#if false
// FIXME: optimization could be done here.
@@ -1120,6 +1125,8 @@
if (finalResult == 0)
finalResult = lv5Value1 - lv5Value2;
}
+ if (finalResult == 0 && idx2 == end2)
+ targetConsumed = true;
return idx1 != end1 ? 1 : idx2 == end2 ? finalResult :
-1;
}
@@ -1132,12 +1139,28 @@
return IsPrefix (src, target, 0, src.Length, opt);
}
+#if true
public bool IsPrefix (string s, string target, int start, int
length, CompareOptions opt)
{
SetOptions (opt);
+ bool consumed;
+ escape1.Source = null;
+ escape2.Source = null;
+ previousSortKey= previousSortKey2 = null;
+ previousChar = previousChar2 = -1;
+ int ret = CompareInternal (s, start, length,
+ target, 0, target.Length,
+ (opt & CompareOptions.StringSort) != 0,
+ out consumed);
+ return consumed;
+ }
+#else
+ public bool IsPrefix (string s, string target, int start, int
length, CompareOptions opt)
+ {
+ SetOptions (opt);
return IsPrefix (s, target, start, length);
}
-
+#endif
// returns the consumed length in positive number, or -1 if
// target was not a prefix.
bool IsPrefix (string s, string target, int start, int length)
Modified: trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog 2005-07-13
18:10:39 UTC (rev 47279)
+++ trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog 2005-07-13
18:40:57 UTC (rev 47280)
@@ -1,5 +1,11 @@
2005-07-13 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * CompareInfoTest.cs : Added Compare() test that contains expansion.
+ Fixed CompareSpecialWeight() which was not testing what I intended.
+ Added IsPrefix() tests with special weight (copying Compare() tests)
+
+2005-07-13 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* CompareInfoTest.cs : added CompareSpecialWeight() and moved special
weight comparison there.
Modified: trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
2005-07-13 18:10:39 UTC (rev 47279)
+++ trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
2005-07-13 18:40:57 UTC (rev 47280)
@@ -236,6 +236,13 @@
}
void AssertIsPrefix (string message, bool expected, string source,
+ string target)
+ {
+ Assert (message, expected == invariant.IsPrefix (
+ source, target));
+ }
+
+ void AssertIsPrefix (string message, bool expected, string source,
string target, CompareOptions opt)
{
Assert (message, expected == invariant.IsPrefix (
@@ -243,6 +250,13 @@
}
void AssertIsSuffix (string message, bool expected, string source,
+ string target)
+ {
+ Assert (message, expected == invariant.IsSuffix (
+ source, target));
+ }
+
+ void AssertIsSuffix (string message, bool expected, string source,
string target, CompareOptions opt)
{
Assert (message, expected == invariant.IsSuffix (
@@ -695,6 +709,11 @@
AssertCompare ("#17", 0, String.Empty, "\u3007");
AssertCompare ("#18", 1, "A", "\u3007");
AssertCompare ("#19", 1, "ABC", "\u3007");
+
+ // shift weight comparison
+ AssertCompare ("#20", 1, "--start", "--");
+ // expansion
+ AssertCompare ("#21", -1, "\u00E6", "aes");
}
[Test]
@@ -704,8 +723,9 @@
return;
// Japanese (in invariant)
- AssertCompare ("#1", 1, "\u30D0\u30FD\u30B9",
"\uFF8A\uFF9F\uFF70\uFF7D");
- AssertCompare ("#2", 1, "\u30D0\u30FD\u30B9",
"\uFF8A\uFF9F\uFF70\uFF7D", CompareOptions.IgnoreWidth);
+ AssertCompare ("#1", 1, "\u30D1\u30FC\u30B9",
"\uFF8A\uFF9F\uFF70\uFF7D");
+ // FIXME: not working
+// AssertCompare ("#2", 0, "\u30D1\u30FC\u30B9",
"\uFF8A\uFF9F\uFF70\uFF7D", CompareOptions.IgnoreWidth);
AssertCompare ("#3", 0, "\uFF80\uFF9E\uFF72\uFF8C\uFF9E",
"\u30C0\u30A4\u30D6", CompareOptions.IgnoreWidth);
AssertCompare ("#4", 1, "\u3042\u309D", "\u3042\u3042");
@@ -792,6 +812,25 @@
}
[Test]
+ public void IsPrefixSpecialWeight ()
+ {
+ if (!doTest)
+ return;
+
+ // Japanese (in invariant)
+ AssertIsPrefix ("#1", false, "\u30D1\u30FC\u30B9",
"\uFF8A\uFF9F\uFF70\uFF7D");
+ // FIXME: not working
+// AssertIsPrefix ("#2", true, "\u30D1\u30FC\u30B9",
"\uFF8A\uFF9F\uFF70\uFF7D", CompareOptions.IgnoreWidth);
+ AssertIsPrefix ("#3", true, "\uFF80\uFF9E\uFF72\uFF8C\uFF9E",
+ "\u30C0\u30A4\u30D6", CompareOptions.IgnoreWidth);
+ AssertIsPrefix ("#4", false, "\u3042\u309D", "\u3042\u3042");
+ AssertIsPrefix ("#5", true, "\u3042\u309D", "\u3042\u3042",
CompareOptions.IgnoreNonSpace);
+ // FIXME: not working
+// AssertIsPrefix ("#6", true, "\uFF8A\uFF9E\uFF70\uFF99",
+// "\u30D0\u30FC\u30EB", CompareOptions.IgnoreWidth);
+ }
+
+ [Test]
public void IsSuffix ()
{
if (!doTest)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
