2007-05-15 Atsushi Enomoto <[email protected]>

	in metadata:
	* object-internals.h
	  culture-info.h : added territory field in MonoCulture and
	  CultureInfoEntry foreach. Added lcid field in RegionInfoEntry.
	* locales.c : fill territory field above too.
	* culture-info-table.h : regenerated.

	in locale-builder:
	* CultureInfoEntry.cs : output Territory, which is used for RegionInfo.
	* RegionInfoEntry.cs : added dummy int which is a slot for LCID.


svn path=/trunk/mono/; revision=77407

mono/metadata/ChangeLog

@@ -1,3 +1,11 @@
+2007-05-15  Atsushi Enomoto  <[email protected]>
+
+	* object-internals.h
+	  culture-info.h : added territory field in MonoCulture and
+	  CultureInfoEntry foreach. Added lcid field in RegionInfoEntry.
+	* locales.c : fill territory field above too.
+	* culture-info-table.h : regenerated.
+
 2007-05-12  Zoltan Varga  <[email protected]>
 
 	* class-internals.h (_MonoGenericContainer): Widen type_argc filed to 31 bits.

mono/metadata/culture-info.h

@@ -102,6 +102,7 @@ typedef struct {
 	const stridx_t win3lang;
 	const stridx_t iso3lang;
 	const stridx_t iso2lang;
+	const stridx_t territory;
 
 	gint calendar_data [NUM_OPT_CALS];
 
@@ -117,9 +118,9 @@ typedef struct {
 } CultureInfoNameEntry;
 
 typedef struct {
-	gint16 region_id;
+	gint16 lcid;
+	gint16 region_id; /* it also works as geoId in 2.0 */
 	/* gint8 measurement_system; // 0:metric 1:US 2:UK */
-	/* gint16 geo_id; */
 	const stridx_t iso2name;
 	const stridx_t iso3name;
 	const stridx_t win3name;

mono/metadata/locales.c

@@ -250,6 +250,7 @@ construct_culture (MonoCultureInfo *this, const CultureInfoEntry *ci)
 	MONO_OBJECT_SETREF (this, win3lang, mono_string_new (domain, idx2string (ci->win3lang)));
 	MONO_OBJECT_SETREF (this, iso3lang, mono_string_new (domain, idx2string (ci->iso3lang)));
 	MONO_OBJECT_SETREF (this, iso2lang, mono_string_new (domain, idx2string (ci->iso2lang)));
+	MONO_OBJECT_SETREF (this, territory, mono_string_new (domain, idx2string (ci->territory)));
 	this->parent_lcid = ci->parent_lcid;
 	this->specific_lcid = ci->specific_lcid;
 	this->datetime_index = ci->datetime_format_index;

mono/metadata/object-internals.h

@@ -387,6 +387,7 @@ typedef struct {
 	MonoString *iso2lang;
 	MonoString *icu_name;
 	MonoString *win3lang;
+	MonoString *territory;
 	MonoCompareInfo *compareinfo;
 	const gint32 *calendar_data;
 	const void* text_info_data;

tools/locale-builder/ChangeLog

@@ -1,3 +1,8 @@
+2007-05-15  Atsushi Enomoto  <[email protected]>
+
+	* CultureInfoEntry.cs : output Territory, which is used for RegionInfo.
+	* RegionInfoEntry.cs : added dummy int which is a slot for LCID.
+
 2007-04-25  Atsushi Enomoto  <[email protected]>
 
 	* Driver.cs : use invariant culture to sort culture names.

tools/locale-builder/CultureInfoEntry.cs

@@ -80,13 +80,14 @@ namespace Mono.Tools.LocaleBuilder {
                         builder.AppendFormat ("{0}, {1}, {2}, {3}," +
                                         "{4}, {5}, {6}, " +
                                         "{7}, {8}, {9}, " +
-                                        "{10}, {11}, " +
-                                        "{12}, " +
-                                        "{13}, {14}, {15}",
+                                        "{10}, {11}, {12}, " +
+                                        "{13}, " +
+                                        "{14}, {15}, {16}",
                                         Lcid, ParentLcid, SpecificLcid, RegionId,
                                         EncodeStringIdx (Name), EncodeStringIdx (IcuName), EncodeStringIdx (EnglishName),
                                         EncodeStringIdx (DisplayName), EncodeStringIdx (NativeName), EncodeStringIdx (Win3Lang),
                                         EncodeStringIdx (ISO3Lang), EncodeStringIdx (ISO2Lang),
+                                        EncodeStringIdx (Territory),
                                         ValuesString (CalendarData),
                                         DateTimeFormatEntry == null ? -1 : DateTimeFormatEntry.Row,
                                         NumberFormatEntry == null ? -1 : NumberFormatEntry.Row,

tools/locale-builder/RegionInfoEntry.cs

@@ -16,9 +16,8 @@ namespace Mono.Tools.LocaleBuilder
 {
 	public class RegionInfoEntry : Entry
 	{
-		public int RegionId; // numbered by alphabetical order of ISO2Name.
+		public int RegionId; // it is GeoId in 2.0.
 		// public byte MeasurementSystem;
-		// public int GeoId;
 		public string ISO2Name = String.Empty; // supplementalData.xml
 		public string ISO3Name = String.Empty;
 		public string Win3Name = String.Empty;
@@ -31,7 +30,7 @@ namespace Mono.Tools.LocaleBuilder
 
 		public void AppendTableRow (StringBuilder builder)
 		{
-			builder.Append ("\t{");
+			builder.Append ("\t{ 0, "); // 0 is a slot for LCID (stored at managed code)
 			builder.Append (RegionId);
 			builder.Append (',');
 			// builder.Append (MeasurementSystem);