Author: marek
Date: 2006-11-09 13:29:51 -0500 (Thu, 09 Nov 2006)
New Revision: 67623
Modified:
trunk/mcs/class/corlib/System.Globalization/ChangeLog
trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs
trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs
trunk/mcs/class/corlib/System.Globalization/TextInfo.cs
Log:
2006-11-09 Marek Safar <[EMAIL PROTECTED]>
* CompareInfo.cs: Cache full UseManagedCollation value;
* CultureInfo.cs (Parent): Add caching to avoid re-creating culture info
every time when the property is used.
* TextInfo.cs: Removed unused field.
Modified: trunk/mcs/class/corlib/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/ChangeLog 2006-11-09
18:28:33 UTC (rev 67622)
+++ trunk/mcs/class/corlib/System.Globalization/ChangeLog 2006-11-09
18:29:51 UTC (rev 67623)
@@ -1,3 +1,10 @@
+2006-11-09 Marek Safar <[EMAIL PROTECTED]>
+
+ * CompareInfo.cs: Cache full UseManagedCollation value;
+ * CultureInfo.cs (Parent): Add caching to avoid re-creating culture info
+ every time when the property is used.
+ * TextInfo.cs: Removed unused field.
+
2006-08-19 Miguel de Icaza <[EMAIL PROTECTED]>
* CultureInfo.cs (GetCultureInfo): implement two of the 2.0
Modified: trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs 2006-11-09
18:28:33 UTC (rev 67622)
+++ trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs 2006-11-09
18:29:51 UTC (rev 67623)
@@ -43,10 +43,10 @@
{
static readonly bool useManagedCollation =
Environment.internalGetEnvironmentVariable
("MONO_DISABLE_MANAGED_COLLATION")
- != "yes";
+ != "yes" && MSCompatUnicodeTable.IsReady;
internal static bool UseManagedCollation {
- get { return useManagedCollation &&
MSCompatUnicodeTable.IsReady; }
+ get { return useManagedCollation; }
}
// Keep in synch with MonoCompareInfo in the runtime.
Modified: trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs 2006-11-09
18:28:33 UTC (rev 67622)
+++ trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs 2006-11-09
18:29:51 UTC (rev 67623)
@@ -85,6 +85,8 @@
private unsafe readonly void *textinfo_data;
[NonSerialized]
private Calendar [] optional_calendars;
+ [NonSerialized]
+ CultureInfo parent_culture;
int m_dataItem; // MS.NET serializes this.
Calendar calendar; // MS.NET serializes this.
@@ -92,6 +94,8 @@
// Deserialized instances will set this to false
[NonSerialized]
bool constructed;
+
+ const int InvariantCultureId = 0x7F;
private static readonly string MSG_READONLY = "This instance is
read only";
@@ -103,7 +107,7 @@
static CultureInfo ()
{
- invariant_culture_info = new CultureInfo (0x7f, false);
+ invariant_culture_info = new CultureInfo
(InvariantCultureId, false);
invariant_culture_info.m_isReadOnly = true;
}
@@ -193,12 +197,18 @@
public virtual CultureInfo Parent
{
get {
- if (cultureID == 0x7f)
- return this;
- if (!constructed) Construct ();
- if (parent_lcid == cultureID)
- return null;
- return new CultureInfo (parent_lcid);
+ if (parent_culture == null) {
+ if (parent_lcid == cultureID)
+ return null;
+
+ if (parent_lcid == InvariantCultureId)
+ parent_culture =
InvariantCulture;
+ else if (cultureID ==
InvariantCultureId)
+ parent_culture = this;
+ else
+ parent_culture = new
CultureInfo (parent_lcid);
+ }
+ return parent_culture;
}
}
@@ -325,8 +335,10 @@
public virtual CompareInfo CompareInfo
{
get {
- if (!constructed) Construct ();
if(compareInfo==null) {
+ if (!constructed)
+ Construct ();
+
lock (this) {
if(compareInfo==null) {
compareInfo=new
CompareInfo (this);
@@ -549,7 +561,7 @@
private unsafe void ConstructInvariant (bool use_user_override)
{
m_isReadOnly=false;
- cultureID=0x7f;
+ cultureID = InvariantCultureId;
this.m_useUserOverride=use_user_override;
/* NumberFormatInfo defaults to the invariant data */
@@ -560,9 +572,9 @@
textInfo=new TextInfo (this, cultureID,
this.textinfo_data);
- m_name="";
- displayname="Invariant Language (Invariant Country)";
- englishname="Invariant Language (Invariant Country)";
+ m_name=String.Empty;
+ displayname=
+ englishname=
nativename="Invariant Language (Invariant Country)";
iso3lang="IVL";
iso2lang="iv";
@@ -599,7 +611,7 @@
constructed = true;
- if(name=="") {
+ if(name.Length==0) {
/* Short circuit the invariant culture */
ConstructInvariant (use_user_override);
return;
Modified: trunk/mcs/class/corlib/System.Globalization/TextInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/TextInfo.cs 2006-11-09
18:28:33 UTC (rev 67622)
+++ trunk/mcs/class/corlib/System.Globalization/TextInfo.cs 2006-11-09
18:29:51 UTC (rev 67623)
@@ -69,9 +69,6 @@
readonly CultureInfo ci;
[NonSerialized]
- readonly CultureInfo parentCulture;
-
- [NonSerialized]
readonly bool handleDotI;
[NonSerialized]
@@ -89,9 +86,8 @@
}
CultureInfo tmp = ci;
- while (tmp.Parent != null && tmp.Parent != tmp &&
tmp.Parent.LCID != 0x7F)
+ while (tmp.Parent != null && tmp.Parent.LCID != 0x7F &&
tmp.Parent != tmp)
tmp = tmp.Parent;
- parentCulture = tmp;
if (tmp != null) {
switch (tmp.LCID) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches