Fixed i18n issues with numbers

3 files changed, 37 insertions, 3 deletions

diff --git a/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs b/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs
index eca3d6d1..bd95e587 100644
--- a/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs
+++ b/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs
@@ -422,10 +422,10 @@ namespace Google.ProtocolBuffers.Descriptors {
               defaultValue = TextFormat.ParseUInt64(Proto.DefaultValue);
               break;
             case FieldType.Float:
-              defaultValue = float.Parse(Proto.DefaultValue);
+              defaultValue = TextFormat.ParseFloat(Proto.DefaultValue);
               break;
             case FieldType.Double:
-              defaultValue = double.Parse(Proto.DefaultValue);
+              defaultValue = TextFormat.ParseDouble(Proto.DefaultValue);
               break;
             case FieldType.Bool:
               if (Proto.DefaultValue == "true") {
diff --git a/src/ProtocolBuffers/TextFormat.cs b/src/ProtocolBuffers/TextFormat.cs
index 537f43ae..fc8030f7 100644
--- a/src/ProtocolBuffers/TextFormat.cs
+++ b/src/ProtocolBuffers/TextFormat.cs
@@ -231,6 +231,41 @@ namespace Google.ProtocolBuffers {
       return (int) ParseInteger(text, true, false);
     }
 
+    internal static float ParseFloat(string text) {
+      switch (text) {
+        case "-inf":
+        case "-infinity":
+        case "-inff":
+        case "-infinityf":
+          return float.NegativeInfinity;
+        case "inf":
+        case "infinity":
+        case "inff":
+        case "infinityf":
+          return float.PositiveInfinity;
+        case "nan":
+        case "nanf":
+          return float.NaN;
+        default:
+          return float.Parse(text, CultureInfo.InvariantCulture);
+      }
+    }
+
+    internal static double ParseDouble(string text) {
+      switch (text) {
+        case "-inf":
+        case "-infinity":
+          return double.NegativeInfinity;
+        case "inf":
+        case "infinity":
+          return double.PositiveInfinity;
+        case "nan":
+          return double.NaN;
+        default:
+          return double.Parse(text, CultureInfo.InvariantCulture);
+      }
+    }
+    
     /// <summary>
     /// Parses an integer in hex (leading 0x), decimal (no prefix) or octal (leading 0).
     /// Only a negative sign is permitted, and it must come before the radix indicator.
diff --git a/src/ProtocolBuffers/TextTokenizer.cs b/src/ProtocolBuffers/TextTokenizer.cs
index 0787c03e..8d639990 100644
--- a/src/ProtocolBuffers/TextTokenizer.cs
+++ b/src/ProtocolBuffers/TextTokenizer.cs
@@ -293,7 +293,6 @@ namespace Google.ProtocolBuffers {
     /// Otherwise, throw a FormatException.
     /// </summary>
     public float ConsumeFloat() {
-
       // We need to parse infinity and nan separately because
       // Float.parseFloat() does not accept "inf", "infinity", or "nan".
       if (FloatInfinity.IsMatch(currentToken)) {