-Numbers that contain e should be treated as doubles

JamesNK · May 4, 2008 · 5f19fd9 · 5f19fd9
1 parent d88e2cf
commit 5f19fd9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs
@@ -37,6 +37,18 @@ namespace Newtonsoft.Json.Tests.Linq
 {
   public class LinqToJsonTest : TestFixtureBase
   {
+    [Test]
+    public void DoubleValue()
+    {
+      JArray j = JArray.Parse("[-1E+4,100.0e-2]");
+
+      double value = (double)j[0];
+      Assert.AreEqual(-10000d, value);
+
+      value = (double)j[1];
+      Assert.AreEqual(1d, value);
+    }
+
     [Test]
     public void Manual()
     {

diff --git a/Src/Newtonsoft.Json/JsonTextReader.cs b/Src/Newtonsoft.Json/JsonTextReader.cs
@@ -596,7 +596,8 @@ private void ParseNumber()
       object numberValue;
       JsonToken numberType;
 
-      if (number.IndexOf('.') == -1)
+      if (number.IndexOf(".", StringComparison.OrdinalIgnoreCase) == -1
+        && number.IndexOf("e", StringComparison.OrdinalIgnoreCase) == -1)
       {
         numberValue = Convert.ToInt64(_buffer.ToString(), CultureInfo.InvariantCulture);
         numberType = JsonToken.Integer;