2005-08-17 Atsushi Enomoto <atsushi@ximian.com>

	* CultureInfoEntry.cs : added RegionId.
	* Driver.cs : modified to not write RegionLCIDMap and use
	  CultureInfoEntry for that lookup purpose instead.


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

3 files changed, 15 insertions, 26 deletions

diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog
index 38cd2841cc3..9069d6fc4e9 100644
--- a/tools/locale-builder/ChangeLog
+++ b/tools/locale-builder/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* CultureInfoEntry.cs : added RegionId.
+	* Driver.cs : modified to not write RegionLCIDMap and use
+	  CultureInfoEntry for that lookup purpose instead.
+
 2005-08-15  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* RegionInfoEntry.cs,
diff --git a/tools/locale-builder/CultureInfoEntry.cs b/tools/locale-builder/CultureInfoEntry.cs
index 00b84fdb80c..fe621b0e5cb 100644
--- a/tools/locale-builder/CultureInfoEntry.cs
+++ b/tools/locale-builder/CultureInfoEntry.cs
@@ -33,6 +33,7 @@ namespace Mono.Tools.LocaleBuilder {
                 public string Lcid;
                 public string ParentLcid;
                 public string SpecificLcid;
+                public int RegionId = -1;
                 public DateTimeFormatEntry DateTimeFormatEntry;
                 public NumberFormatEntry NumberFormatEntry;
                 public TextInfoEntry TextInfoEntry;
@@ -76,13 +77,13 @@ namespace Mono.Tools.LocaleBuilder {
                 public void AppendTableRow (StringBuilder builder)
                 {
                         builder.Append ("\t{");
-                        builder.AppendFormat ("{0}, {1}, {2}, " +
-                                        "{3}, {4}, {5}, " +
-                                        "{6}, {7}, {8}, " +
-                                        "{9}, {10}, " +
-                                        "{11}, " +
-                                        "{12}, {13}, {14}",
-                                        Lcid, ParentLcid, SpecificLcid,
+                        builder.AppendFormat ("{0}, {1}, {2}, {3}," +
+                                        "{4}, {5}, {6}, " +
+                                        "{7}, {8}, {9}, " +
+                                        "{10}, {11}, " +
+                                        "{12}, " +
+                                        "{13}, {14}, {15}",
+                                        Lcid, ParentLcid, SpecificLcid, RegionId,
                                         EncodeStringIdx (Name), EncodeStringIdx (IcuName), EncodeStringIdx (EnglishName),
                                         EncodeStringIdx (DisplayName), EncodeStringIdx (NativeName), EncodeStringIdx (Win3Lang),
                                         EncodeStringIdx (ISO3Lang), EncodeStringIdx (ISO2Lang),
diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index b4aacdad070..6e32d842c8e 100644
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -120,8 +120,6 @@ namespace Mono.Tools.LocaleBuilder {
 			foreach (RegionInfoEntry r in regionList)
 				r.RegionId = number++;
 
-			ArrayList regionMap = new ArrayList ();
-
 			foreach (CultureInfoEntry e in cultures) {
 				int lcid = int.Parse (e.Lcid.Substring (2),
 					NumberStyles.HexNumber);
@@ -147,7 +145,7 @@ namespace Mono.Tools.LocaleBuilder {
 					Console.Error.WriteLine ("No definition for region {0}", name);
 					continue;
 				}
-				regionMap.Add (new RegionLCIDMap (lcid, rm.RegionId));
+				e.RegionId = rm.RegionId;
 			}
 
                         /**
@@ -165,7 +163,6 @@ namespace Mono.Tools.LocaleBuilder {
 
                                 writer.WriteLine ("#define NUM_CULTURE_ENTRIES " + cultures.Count);
                                 writer.WriteLine ("#define NUM_REGION_ENTRIES " + regionList.Count);
-                                writer.WriteLine ("#define NUM_REGION_LCID_MAP " + regionMap.Count);
                                 writer.WriteLine ("\n");
 
                                 // Sort the cultures by lcid
@@ -262,21 +259,6 @@ namespace Mono.Tools.LocaleBuilder {
                                 writer.Write (builder);
                                 writer.WriteLine ("};\n\n");
 
-                                builder = new StringBuilder ();
-                                for (int i = 0; i < regionMap.Count; i++) {
-                                        RegionLCIDMap map = (RegionLCIDMap) regionMap [i];
-                                        builder.Append ("\t{" + map.LCID + ", ");
-                                        builder.Append (map.RegionId + "}");
-                                        if (i + 1 < regionMap.Count)
-                                                builder.Append (',');
-                                        builder.Append ('\n');
-                                }
-
-                                writer.WriteLine ("static const RegionLCIDMap region_lcid_map [] = {");
-                                writer.Write (builder);
-                                writer.WriteLine ("};\n\n");
-
-
                                 writer.WriteLine ("static const char locale_strings [] = {");
                                 writer.Write (Entry.GetStrings ());
                                 writer.WriteLine ("};\n\n");