Merge branch 'devlead-feeature/invariant' into develop

* devlead-feeature/invariant:
  Changed to use invariant number parsing

Author: devlead

src/LitJson/JsonReader.cs

@@ -11,6 +11,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Text;
 
@@ -142,16 +143,16 @@ private static IDictionary<int, IDictionary<int, int[]>> PopulateParseTable ()
         {
             // See section A.2. of the manual for details
             IDictionary<int, IDictionary<int, int[]>> parse_table = new Dictionary<int, IDictionary<int, int[]>> ();
-    
+
             TableAddRow (parse_table, ParserToken.Array);
             TableAddCol (parse_table, ParserToken.Array, '[',
                             '[',
                             (int) ParserToken.ArrayPrime);
-    
+
             TableAddRow (parse_table, ParserToken.ArrayPrime);
             TableAddCol (parse_table, ParserToken.ArrayPrime, '"',
                             (int) ParserToken.Value,
-    
+
                             (int) ParserToken.ValueRest,
                             ']');
             TableAddCol (parse_table, ParserToken.ArrayPrime, '[',
@@ -180,46 +181,46 @@ private static IDictionary<int, IDictionary<int, int[]>> PopulateParseTable ()
                             (int) ParserToken.Value,
                             (int) ParserToken.ValueRest,
                             ']');
-    
+
             TableAddRow (parse_table, ParserToken.Object);
             TableAddCol (parse_table, ParserToken.Object, '{',
                             '{',
                             (int) ParserToken.ObjectPrime);
-    
+
             TableAddRow (parse_table, ParserToken.ObjectPrime);
             TableAddCol (parse_table, ParserToken.ObjectPrime, '"',
                             (int) ParserToken.Pair,
                             (int) ParserToken.PairRest,
                             '}');
             TableAddCol (parse_table, ParserToken.ObjectPrime, '}',
                             '}');
-    
+
             TableAddRow (parse_table, ParserToken.Pair);
             TableAddCol (parse_table, ParserToken.Pair, '"',
                             (int) ParserToken.String,
                             ':',
                             (int) ParserToken.Value);
-    
+
             TableAddRow (parse_table, ParserToken.PairRest);
             TableAddCol (parse_table, ParserToken.PairRest, ',',
                             ',',
                             (int) ParserToken.Pair,
                             (int) ParserToken.PairRest);
             TableAddCol (parse_table, ParserToken.PairRest, '}',
                             (int) ParserToken.Epsilon);
-    
+
             TableAddRow (parse_table, ParserToken.String);
             TableAddCol (parse_table, ParserToken.String, '"',
                             '"',
                             (int) ParserToken.CharSeq,
                             '"');
-    
+
             TableAddRow (parse_table, ParserToken.Text);
             TableAddCol (parse_table, ParserToken.Text, '[',
                             (int) ParserToken.Array);
             TableAddCol (parse_table, ParserToken.Text, '{',
                             (int) ParserToken.Object);
-    
+
             TableAddRow (parse_table, ParserToken.Value);
             TableAddCol (parse_table, ParserToken.Value, '"',
                             (int) ParserToken.String);
@@ -235,15 +236,15 @@ private static IDictionary<int, IDictionary<int, int[]>> PopulateParseTable ()
                             (int) ParserToken.False);
             TableAddCol (parse_table, ParserToken.Value, (int) ParserToken.Null,
                             (int) ParserToken.Null);
-    
+
             TableAddRow (parse_table, ParserToken.ValueRest);
             TableAddCol (parse_table, ParserToken.ValueRest, ',',
                             ',',
                             (int) ParserToken.Value,
                             (int) ParserToken.ValueRest);
             TableAddCol (parse_table, ParserToken.ValueRest, ']',
                             (int) ParserToken.Epsilon);
-    
+
             return parse_table;
         }
 
@@ -268,7 +269,7 @@ private void ProcessNumber (string number)
                 number.IndexOf ('E') != -1) {
 
                 double n_double;
-                if (Double.TryParse (number, out n_double)) {
+                if (double.TryParse (number, NumberStyles.Any, CultureInfo.InvariantCulture, out n_double)) {
                     token = JsonToken.Double;
                     token_value = n_double;
 
@@ -277,23 +278,23 @@ private void ProcessNumber (string number)
             }
 
             int n_int32;
-            if (Int32.TryParse (number, out n_int32)) {
+            if (int.TryParse (number, NumberStyles.Integer, CultureInfo.InvariantCulture, out n_int32)) {
                 token = JsonToken.Int;
                 token_value = n_int32;
 
                 return;
             }
 
             long n_int64;
-            if (Int64.TryParse (number, out n_int64)) {
+            if (long.TryParse (number, NumberStyles.Integer, CultureInfo.InvariantCulture, out n_int64)) {
                 token = JsonToken.Long;
                 token_value = n_int64;
 
                 return;
             }
 
             ulong n_uint64;
-            if (UInt64.TryParse(number, out n_uint64))
+            if (ulong.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out n_uint64))
             {
                 token = JsonToken.Long;
                 token_value = n_uint64;