Remove RegEx in favour of simple logic to determine valid JSON Numbers

Author: mythz

src/ServiceStack.Text/JsonObject.cs

@@ -116,8 +116,6 @@ public string Child(string key)
         {
             return base[key];
         }
-        
-        static readonly Regex NumberRegEx = new Regex(@"^(0|[1-9]*)(?:\.[0-9]*)?$", PclExport.Instance.RegexOptions);
 
         /// <summary>
         /// Write JSON Array, Object, bool or number values as raw string
@@ -133,7 +131,7 @@ public static void WriteValue(TextWriter writer, object value)
                     || (firstChar == JsWriter.ListStartChar && lastChar == JsWriter.ListEndChar) 
                     || JsonUtils.True == strValue
                     || JsonUtils.False == strValue
-                    || (NumberRegEx.IsMatch(strValue) && IsJavaScriptNumber(strValue)))
+                    || IsJavaScriptNumber(strValue))
                 {
                     writer.Write(strValue);
                     return;
@@ -144,6 +142,15 @@ public static void WriteValue(TextWriter writer, object value)
 
 	    private static bool IsJavaScriptNumber(string strValue)
 	    {
+            var firstChar = strValue[0];
+            if (firstChar == '0')
+            {
+                if (strValue.Length == 1)
+                    return true;
+                if (!strValue.Contains("."))
+                    return false;
+            }
+
 	        if (!strValue.Contains("."))
 	        {
 	            long longValue; 

tests/ServiceStack.Text.Tests/JsonTests/JsonObjectTests.cs

@@ -30,22 +30,28 @@ public void Can_parse_empty_object_with_mixed_whitespaces()
         public void Can_Serialize_numbers()
         {
             string notNumber = "{\"field\":\"00001\"}";
-            Assert.AreEqual(notNumber, JsonObject.Parse(notNumber).ToJson<JsonObject>());
+            Assert.That(JsonObject.Parse(notNumber).ToJson(), Is.EqualTo(notNumber));
 
             string num1 = "{\"field\":0}";
-            Assert.AreEqual(num1, JsonObject.Parse(num1).ToJson<JsonObject>());
+            Assert.That(JsonObject.Parse(num1).ToJson(), Is.EqualTo(num1));
 
             string num2 = "{\"field\":0.5}";
-            Assert.AreEqual(num2, JsonObject.Parse(num2).ToJson<JsonObject>());
+            Assert.That(JsonObject.Parse(num2).ToJson(), Is.EqualTo(num2));
 
             string num3 = "{\"field\":.5}";
-            Assert.AreEqual(num3, JsonObject.Parse(num3).ToJson<JsonObject>());
+            Assert.That(JsonObject.Parse(num3).ToJson(), Is.EqualTo(num3));
 
             string num4 = "{\"field\":12312}";
-            Assert.AreEqual(num4, JsonObject.Parse(num4).ToJson<JsonObject>());
+            Assert.That(JsonObject.Parse(num4).ToJson(), Is.EqualTo(num4));
 
             string num5 = "{\"field\":12312.1231}";
-            Assert.AreEqual(num5, JsonObject.Parse(num5).ToJson<JsonObject>());
+            Assert.That(JsonObject.Parse(num5).ToJson(), Is.EqualTo(num5));
+
+            string num6 = "{\"field\":1435252569117}";
+            Assert.That(JsonObject.Parse(num6).ToJson(), Is.EqualTo(num6));
+
+            string num7 = "{\"field\":1435052569117}";
+            Assert.That(JsonObject.Parse(num7).ToJson(), Is.EqualTo(num7));
         }
 
         public class Jackalope
@@ -279,6 +285,7 @@ public void Can_Deserialize_JsonValue_After_Multiple_Serialize_2()
             Assert.That(fromJson.value1, Is.EqualTo(simple.value1));
             Assert.That(fromJson.value2, Is.EqualTo(simple.value2));
         }
+
         [Test]
         public void Can_Serialize_NestedJsonValueDto()
         {