[runtime] Fix the managed name of the ReRegisterForFinalize () icall.

[mono.git] / tools / locale-builder / Driver.cs

diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index a8ec6d2f0e7771fcc9cd864db8fc221a66c884ff..b922d750ec68547c3029d8034fbeb52adf500361 100644 (file)
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -133,18 +133,18 @@ namespace Mono.Tools.LocaleBuilder
                                Dump (writer, df.DayNames, "DayNames");
                                writer.WriteLine ("{0}: {1}", "FirstDayOfWeek", (DayOfWeek) df.FirstDayOfWeek);
 //                             Dump (writer, df.GetAllDateTimePatterns (), "GetAllDateTimePatterns");
-                               writer.WriteLine ("{0}: {1}", "LongDatePattern", df.LongDatePattern);
-                               writer.WriteLine ("{0}: {1}", "LongTimePattern", df.LongTimePattern);
+//                             writer.WriteLine ("{0}: {1}", "LongDatePattern", df.LongDatePattern);
+//                             writer.WriteLine ("{0}: {1}", "LongTimePattern", df.LongTimePattern);
                                writer.WriteLine ("{0}: {1}", "MonthDayPattern", df.MonthDayPattern);
                                Dump (writer, df.MonthGenitiveNames, "MonthGenitiveNames");
                                Dump (writer, df.MonthNames, "MonthNames");
                                writer.WriteLine ("{0}: {1}", "NativeCalendarName", df.NativeCalendarName);
                                writer.WriteLine ("{0}: {1}", "PMDesignator", df.PMDesignator);
-                               writer.WriteLine ("{0}: {1}", "ShortDatePattern", df.ShortDatePattern);
+//                             writer.WriteLine ("{0}: {1}", "ShortDatePattern", df.ShortDatePattern);
                                Dump (writer, df.ShortestDayNames, "ShortestDayNames");
-                               writer.WriteLine ("{0}: {1}", "ShortTimePattern", df.ShortTimePattern);
+//                             writer.WriteLine ("{0}: {1}", "ShortTimePattern", df.ShortTimePattern);
                                writer.WriteLine ("{0}: {1}", "TimeSeparator", df.TimeSeparator);
-                               writer.WriteLine ("{0}: {1}", "YearMonthPattern", df.YearMonthPattern);
+//                             writer.WriteLine ("{0}: {1}", "YearMonthPattern", df.YearMonthPattern);
 
                                var ti = c.TextInfoEntry;
                                writer.WriteLine ("-- TextInfo --");
@@ -379,9 +379,13 @@ namespace Mono.Tools.LocaleBuilder
                                        throw new NotImplementedException ();
                                }
 
-                               var territories = entry.Attributes["territories"].Value.Split ();
+                               var territories = entry.Attributes["territories"].Value.Split (new [] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
                                foreach (var t in territories) {
-                                       territory2dayofweek.Add (t, dow);
+                                       var tr = t.Trim ();
+                                       if (tr.Length == 0)
+                                               continue;
+
+                                       territory2dayofweek.Add (tr, dow);
                                }
                        }
 
@@ -619,27 +623,6 @@ namespace Mono.Tools.LocaleBuilder
                                                break;
                                        }
                                }
-
-                               if (nfe.CurrencyDecimalDigits == null) {
-                                       var all_digits = new List<string> ();
-                                       GetAllChildrenValues (ci, all_digits, l => l.NumberFormatEntry.CurrencyDecimalDigits);
-                                       var children = all_digits.Where (l => l != null).Distinct ().ToList ();
-
-                                       if (children.Count == 1) {
-                                               nfe.CurrencyDecimalDigits = children[0];
-                                       } else if (children.Count == 0) {
-                                               if (!ci.HasMissingLocale)
-                                                       Console.WriteLine ("No currency decimal digits data for `{0}'", ci.Name);
-
-                                               nfe.CurrencyDecimalDigits = "2";
-                                       } else if (ci.IsNeutral) {
-                                               nfe.CurrencyDecimalDigits = "2";
-                                       } else {
-                                               // .NET has weird concept of territory data available for neutral cultures (e.g. en, es, pt)
-                                               // We have to manually disambiguate the correct entry (which is artofficial anyway)
-                                               throw new ApplicationException (string.Format ("Ambiguous currency decimal digits data for `{0}'", ci.Name));
-                                       }
-                               }
                        }
 
                        if (OutputCompare)
@@ -924,9 +907,6 @@ namespace Mono.Tools.LocaleBuilder
                                }
                        }
 
-                       // It looks like it never changes
-                       data.DateTimeFormatEntry.TimeSeparator = ":";
-
                        // TODO: Don't have input data available but most values are 2 with few exceptions for 1 and 3
                        // We don't add 3 as it's for some arabic states only
                        switch (data.ThreeLetterISOLanguageName) {
@@ -1130,13 +1110,16 @@ namespace Mono.Tools.LocaleBuilder
                                if (el != null) {
                                        // CLDR uses unicode negative sign for some culture (e.g sv, is, lt, don't kwnow why) but .net always
                                        // uses simple - sign
-                                       if (el.InnerText == "\u2212") {
+                                       switch (el.InnerText) {
+                                       case "\u2212":
+                                       case "\u200F\u002D": // Remove any right-to-left mark characters
+                                       case "\u200E\u002D":
                                                ni.NegativeSign = "-";
-                                       } else if (el.InnerText ==  "\u200F\u002D") {
-                                               // Remove any right-to-left mark characters
-                                               ni.NegativeSign = "-";
-                                       } else
-                                               ni.NegativeSign = el.InnerText;                                 
+                                               break;
+                                       default:
+                                               ni.NegativeSign = el.InnerText;
+                                               break;
+                                       }
                                }
 
                                el = node.SelectSingleNode ("infinity");
@@ -1164,29 +1147,6 @@ namespace Mono.Tools.LocaleBuilder
                                        ni.PercentSymbol = el.InnerText;
 
                        }
-
-                       string value = null;
-
-                       // .net has incorrect separators for some countries and we want to be compatible
-                       switch (ci.Name) {
-                       case "es-ES":
-                               // es-ES does not have group separator but .net has '.'
-                               value = ".";
-                               break;
-                       default:
-                               if (node != null) {
-                                       el = node.SelectSingleNode ("group");
-                                       if (el != null) {
-                                               value = el.InnerText;
-                                       }
-                               }
-
-                               break;
-                       }
-                                       
-                       if (value != null) {
-                               ni.NumberGroupSeparator = ni.CurrencyGroupSeparator = value;
-                       }
                }
 
                static void ToLower (string[] values)