Author: atsushi
Date: 2005-11-14 17:55:31 -0500 (Mon, 14 Nov 2005)
New Revision: 53034
Modified:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/
trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
trunk/mcs/class/corlib/Mono.Globalization.Unicode/MSCompatUnicodeTable.cs
trunk/mcs/class/corlib/Mono.Globalization.Unicode/downloaded/
trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog
trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
Log:
2005-11-14 Atsushi Enomoto <[EMAIL PROTECTED]>
* MSCompatUnicodeTable.cs : (IsIgnorable) \0 is not ignorable.
Fixed bug 76702.
* CompareInfoTest.cs : added NullCharacter() for bug #76702.
Property changes on: trunk/mcs/class/corlib/Mono.Globalization.Unicode
___________________________________________________________________
Name: svn:ignore
+ dtd
create-collation-element-table.exe
create-collation-element-table.exe.mdb
collation-tables.h
normalization-tables.h
create-normalization-source.exe
create-normalization-source.exe.mdb
create-mscompat-collation-table.exe
create-mscompat-collation-table.exe.mdb
MSCompatUnicodeTableGenerated.cs
NormalizationGenerated.cs
CollationElementTable.cs
Modified: trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog 2005-11-14
22:37:32 UTC (rev 53033)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog 2005-11-14
22:55:31 UTC (rev 53034)
@@ -1,5 +1,10 @@
2005-11-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * MSCompatUnicodeTable.cs : (IsIgnorable) \0 is not ignorable.
+ Fixed bug 76702.
+
+2005-11-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* SimpleCollator.cs :
Created another struct to reduce method arguments. Created another
flags that keeps "once-matched" state (counterpart of
Modified:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/MSCompatUnicodeTable.cs
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/MSCompatUnicodeTable.cs
2005-11-14 22:37:32 UTC (rev 53033)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/MSCompatUnicodeTable.cs
2005-11-14 22:55:31 UTC (rev 53034)
@@ -313,6 +313,8 @@
public static bool IsIgnorable (int cp, byte flag)
{
+ if (cp == 0)
+ return false;
if ((flag & 1) != 0) {
UnicodeCategory uc = Char.GetUnicodeCategory
((char) cp);
// This check eliminates some extraneous code
areas
Property changes on:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/downloaded
___________________________________________________________________
Name: svn:ignore
+ allkeys.txt
Scripts.txt
DerivedCoreProperties.txt
common
core.zip
DerivedNormalizationProps.txt
DerivedCombiningClass.txt
DerivedAge.txt
UnicodeData.txt
CP932.TXT
Modified: trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog 2005-11-14
22:37:32 UTC (rev 53033)
+++ trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog 2005-11-14
22:55:31 UTC (rev 53034)
@@ -1,5 +1,9 @@
2005-11-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * CompareInfoTest.cs : added NullCharacter() for bug #76702.
+
+2005-11-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* CompareInfoTest.cs : added test for Compare() w/ OrdinalIgnoreCase.
2005-11-14 Atsushi Enomoto <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
2005-11-14 22:37:32 UTC (rev 53033)
+++ trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
2005-11-14 22:55:31 UTC (rev 53034)
@@ -1029,6 +1029,16 @@
"\u30D0\u30FC\u30EB", CompareOptions.IgnoreWidth);
}
+ [Test]
+ // for bug #76702
+ public void NullCharacter ()
+ {
+ AssertEquals ("#1", -1, "MONO".IndexOf ("\0\0\0"));
+ AssertEquals ("#2", -1, "MONO".LastIndexOf ("\0\0\0"));
+ AssertEquals ("#3", 1, "MONO".CompareTo ("\0\0\0"));
+ AssertEquals ("#4", -1, "MONO".CompareTo ("MONO\0\0\0"));
+ }
+
#if NET_2_0
[Test]
public void OrdinalIgnoreCaseCompare ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
