Author: atsushi
Date: 2005-08-03 14:34:32 -0400 (Wed, 03 Aug 2005)
New Revision: 47977
Modified:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
trunk/mcs/class/corlib/Mono.Globalization.Unicode/NormalizationTableUtil.cs
trunk/mcs/class/corlib/Mono.Globalization.Unicode/managed-collation.patch
Log:
2005-08-03 Atsushi Enomoto <[EMAIL PROTECTED]>
* NormalizationTableUtil.cs : oops, it does not compile.
* managed-collation.patch : I guess having managed resource would be
better for collation. At least current code has such #define so
Makefile should be in sync with it.
Modified: trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog 2005-08-03
18:15:03 UTC (rev 47976)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog 2005-08-03
18:34:32 UTC (rev 47977)
@@ -1,5 +1,12 @@
2005-08-03 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * NormalizationTableUtil.cs : oops, it does not compile.
+ * managed-collation.patch : I guess having managed resource would be
+ better for collation. At least current code has such #define so
+ Makefile should be in sync with it.
+
+2005-08-03 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* create-normalization-source.cs : Fixed CharMapComparer which
incorrectly returned 0 when the second arg is shorter. Reduced
extraneous helperIndex map. Other minor fixes and code removal.
Modified:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/NormalizationTableUtil.cs
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/NormalizationTableUtil.cs
2005-08-03 18:15:03 UTC (rev 47976)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/NormalizationTableUtil.cs
2005-08-03 18:34:32 UTC (rev 47977)
@@ -93,7 +93,7 @@
return Prop.ToCodePoint (index);
}
- public static int PropCount { get { return prop.TotalCount; } }
+ public static int PropCount { get { return Prop.TotalCount; } }
public static int MapIdx (int cp)
{
@@ -115,6 +115,6 @@
return Combining.ToCodePoint (index);
}
- public static int MapCount { get { return map.TotalCount; } }
+ public static int MapCount { get { return Map.TotalCount; } }
}
}
Modified:
trunk/mcs/class/corlib/Mono.Globalization.Unicode/managed-collation.patch
===================================================================
--- trunk/mcs/class/corlib/Mono.Globalization.Unicode/managed-collation.patch
2005-08-03 18:15:03 UTC (rev 47976)
+++ trunk/mcs/class/corlib/Mono.Globalization.Unicode/managed-collation.patch
2005-08-03 18:34:32 UTC (rev 47977)
@@ -1,6 +1,6 @@
Index: corlib.dll.sources
===================================================================
---- corlib.dll.sources (revision 47880)
+--- corlib.dll.sources (revision 47945)
+++ corlib.dll.sources (working copy)
@@ -8,6 +8,14 @@
Microsoft.Win32/Win32RegistryApi.cs
@@ -25,9 +25,38 @@
System.Globalization/StringInfo.cs
System.Globalization/TaiwanCalendar.cs
System.Globalization/TextElementEnumerator.cs
+Index: Makefile
+===================================================================
+--- Makefile (revision 47945)
++++ Makefile (working copy)
+@@ -3,6 +3,15 @@
+ include ../../build/rules.make
+ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
+
++RESOURCE_FILES = \
++ collation.core.bin \
++ collation.tailoring.bin \
++ collation.cjkCHS.bin \
++ collation.cjkCHT.bin \
++ collation.cjkJA.bin \
++ collation.cjkKO.bin \
++ collation.cjkKOlv2.bin
++
+ corlib_flags = -unsafe -nostdlib
+ LOCAL_MCS_FLAGS = -nowarn:169,612,618,649 -d:INSIDE_CORLIB
+
+@@ -12,7 +21,7 @@
+
+ LIBRARY = corlib.dll
+ LIBRARY_NAME = mscorlib.dll
+-LIB_MCS_FLAGS = $(corlib_flags)
++LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=/resource:%)
+ LIBRARY_USE_INTERMEDIATE_FILE = yes
+
+ LIBRARY_COMPILE = $(BOOT_COMPILE)
Index: System/String.cs
===================================================================
---- System/String.cs (revision 47880)
+--- System/String.cs (revision 47945)
+++ System/String.cs (working copy)
@@ -38,6 +38,7 @@
#if NET_2_0
@@ -93,7 +122,7 @@
/* This method is culture insensitive */
Index: System.Globalization/CompareInfo.cs
===================================================================
---- System.Globalization/CompareInfo.cs (revision 47880)
+--- System.Globalization/CompareInfo.cs (revision 47945)
+++ System.Globalization/CompareInfo.cs (working copy)
@@ -34,12 +34,21 @@
using System.Reflection;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches