LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow doubles that start with a decimal and doubles that have an 'E' right after the decimal.

Browse Source
This commit is contained in:
TylerBrinkley
2016-09-06 08:39:52 -05:00
parent 62470bd803
commit 7fa2cde56d
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs
+8 -6
View File
@@ -50,15 +50,15 @@ namespace Newtonsoft.Json.Tests.Utilities
ParseResult result = ConvertUtils.DoubleTryParse(c, 0, c.Length, out d);
double d2;
bool result2 = double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out d2)
&& !s.StartsWith(".")
&& s.IndexOf(".e", StringComparison.OrdinalIgnoreCase) == -1;
bool result2 = double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out d2);
Assert.AreEqual(expectedResult, result);
Assert.AreEqual(expectedResult == ParseResult.Success, result2);
if (expectedValue != null)
if (result2)
{
Assert.IsTrue(expectedValue.HasValue);
Assert.AreEqual(expectedValue.Value, d, "Input string: " + s);
Assert.AreEqual(expectedValue.Value, d2, "DoubleTryParse result is not equal to double.Parse. Input string: " + s);
@@ -98,12 +98,13 @@ namespace Newtonsoft.Json.Tests.Utilities
AssertDoubleTryParse("1E-100", ParseResult.Success, 1E-100);
AssertDoubleTryParse("1E-300", ParseResult.Success, 1E-300);
AssertDoubleTryParse(".1E23", ParseResult.Success, 1E22);
AssertDoubleTryParse("1.E23", ParseResult.Success, 1E23);
AssertDoubleTryParse("1E+309", ParseResult.Overflow, null);
AssertDoubleTryParse("-1E+5000", ParseResult.Overflow, null);
AssertDoubleTryParse(".1E23", ParseResult.Invalid, null);
AssertDoubleTryParse("1..1E23", ParseResult.Invalid, null);
AssertDoubleTryParse("1.E23", ParseResult.Invalid, null);
AssertDoubleTryParse("1E2.3", ParseResult.Invalid, null);
AssertDoubleTryParse("1EE-10", ParseResult.Invalid, null);
AssertDoubleTryParse("1E-1-0", ParseResult.Invalid, null);
@@ -129,6 +130,7 @@ namespace Newtonsoft.Json.Tests.Utilities
AssertDoubleTryParse("1E4294967297", ParseResult.Overflow, null);
AssertDoubleTryParse("1E4294967297B", ParseResult.Invalid, null);
AssertDoubleTryParse("1E-4294967297", ParseResult.Success, 0);
AssertDoubleTryParse("00000000000000000000000000000001E308", ParseResult.Success, 1E308);
}
[Test]
Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
+5 -12
View File
@@ -1006,11 +1006,6 @@ namespace Newtonsoft.Json.Utilities
switch (c)
{
case '.':
if (i == start)
{
return ParseResult.Invalid;
}
if (numDecimalStart != end)
{
// multiple decimal points
@@ -1025,11 +1020,6 @@ namespace Newtonsoft.Json.Utilities
{
return ParseResult.Invalid;
}
if (i == numDecimalStart)
{
// E follows decimal point
return ParseResult.Invalid;
}
i++;
if (i == end)
{
@@ -1085,7 +1075,10 @@ namespace Newtonsoft.Json.Utilities
if (mantissaDigits < 19)
{
mantissa = (10 * mantissa) + (ulong)(c - '0');
++mantissaDigits;
if (mantissa > 0)
{
++mantissaDigits;
}
}
else
{
@@ -1125,7 +1118,7 @@ namespace Newtonsoft.Json.Utilities
}
value *= DoubleNegativeExponents[154 - 1];
}
value = exponent < 23 ? value / DoubleExponents[exponent - 1] : value * DoubleNegativeExponents[exponent - 1];
}