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

-Minor refactor

Browse Source
This commit is contained in:
James Newton-King
2017-10-14 11:14:39 +13:00
parent 6057d9b831
commit 5829826cbb
3 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json/JsonTextReader.cs
+15 -24
View File
@@ -202,8 +202,7 @@ namespace Newtonsoft.Json
if (dateParseHandling == DateParseHandling.DateTime)
{
DateTime dt;
if (DateTimeUtils.TryParseDateTime(_stringReference, DateTimeZoneHandling, DateFormatString, Culture, out dt))
if (DateTimeUtils.TryParseDateTime(_stringReference, DateTimeZoneHandling, DateFormatString, Culture, out DateTime dt))
{
SetToken(JsonToken.Date, dt, false);
return;
@@ -212,8 +211,7 @@ namespace Newtonsoft.Json
#if HAVE_DATE_TIME_OFFSET
else
{
DateTimeOffset dt;
if (DateTimeUtils.TryParseDateTimeOffset(_stringReference, DateFormatString, Culture, out dt))
if (DateTimeUtils.TryParseDateTimeOffset(_stringReference, DateFormatString, Culture, out DateTimeOffset dt))
{
SetToken(JsonToken.Date, dt, false);
return;
@@ -709,17 +707,17 @@ namespace Newtonsoft.Json
case ReadType.ReadAsString:
return Value;
case ReadType.ReadAsDateTime:
if (Value is DateTime)
if (Value is DateTime time)
{
return (DateTime)Value;
return time;
}
return ReadDateTimeString((string)Value);
#if HAVE_DATE_TIME_OFFSET
case ReadType.ReadAsDateTimeOffset:
if (Value is DateTimeOffset)
if (Value is DateTimeOffset offset)
{
return (DateTimeOffset)Value;
return offset;
}
return ReadDateTimeOffsetString((string)Value);
@@ -791,9 +789,9 @@ namespace Newtonsoft.Json
ParseNumber(ReadType.Read);
bool b;
#if HAVE_BIG_INTEGER
if (Value is BigInteger)
if (Value is BigInteger integer)
{
b = (BigInteger)Value != 0;
b = integer != 0;
}
else
#endif
@@ -1286,8 +1284,7 @@ namespace Newtonsoft.Json
{
if (enoughChars)
{
int value;
if (ConvertUtils.TryHexTextToInt(_chars, _charPos, _charPos + 4, out value))
if (ConvertUtils.TryHexTextToInt(_chars, _charPos, _charPos + 4, out int value))
{
char hexChar = Convert.ToChar(value);
_charPos += 4;
@@ -1984,8 +1981,7 @@ namespace Newtonsoft.Json
}
else
{
int value;
ParseResult parseResult = ConvertUtils.Int32TryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out value);
ParseResult parseResult = ConvertUtils.Int32TryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out int value);
if (parseResult == ParseResult.Success)
{
numberValue = value;
@@ -2027,8 +2023,7 @@ namespace Newtonsoft.Json
}
else
{
decimal value;
ParseResult parseResult = ConvertUtils.DecimalTryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out value);
ParseResult parseResult = ConvertUtils.DecimalTryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out decimal value);
if (parseResult == ParseResult.Success)
{
numberValue = value;
@@ -2068,8 +2063,7 @@ namespace Newtonsoft.Json
{
string number = _stringReference.ToString();
double value;
if (double.TryParse(number, NumberStyles.Float, CultureInfo.InvariantCulture, out value))
if (double.TryParse(number, NumberStyles.Float, CultureInfo.InvariantCulture, out double value))
{
numberValue = value;
}
@@ -2106,8 +2100,7 @@ namespace Newtonsoft.Json
}
else
{
long value;
ParseResult parseResult = ConvertUtils.Int64TryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out value);
ParseResult parseResult = ConvertUtils.Int64TryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out long value);
if (parseResult == ParseResult.Success)
{
numberValue = value;
@@ -2133,8 +2126,7 @@ namespace Newtonsoft.Json
{
if (_floatParseHandling == FloatParseHandling.Decimal)
{
decimal d;
parseResult = ConvertUtils.DecimalTryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out d);
parseResult = ConvertUtils.DecimalTryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out decimal d);
if (parseResult == ParseResult.Success)
{
numberValue = d;
@@ -2148,8 +2140,7 @@ namespace Newtonsoft.Json
{
string number = _stringReference.ToString();
double d;
if (double.TryParse(number, NumberStyles.Float, CultureInfo.InvariantCulture, out d))
if (double.TryParse(number, NumberStyles.Float, CultureInfo.InvariantCulture, out double d))
{
numberValue = d;
}
Src/Newtonsoft.Json/JsonTextWriter.Async.cs
+3 -5
View File
@@ -962,9 +962,9 @@ namespace Newtonsoft.Json
return WriteNullAsync(cancellationToken);
}
#if HAVE_BIG_INTEGER
if (value is BigInteger)
if (value is BigInteger i)
{
return WriteValueAsync((BigInteger)value, cancellationToken);
return WriteValueAsync(i, cancellationToken);
}
#endif
@@ -1354,6 +1354,4 @@ namespace Newtonsoft.Json
}
}
}
#endif
#endif
Src/Newtonsoft.Json/JsonWriter.cs
+4 -4
View File
@@ -546,9 +546,9 @@ namespace Newtonsoft.Json
case JsonToken.Integer:
ValidationUtils.ArgumentNotNull(value, nameof(value));
#if HAVE_BIG_INTEGER
if (value is BigInteger)
if (value is BigInteger integer)
{
WriteValue((BigInteger)value);
WriteValue(integer);
}
else
#endif
@@ -558,9 +558,9 @@ namespace Newtonsoft.Json
break;
case JsonToken.Float:
ValidationUtils.ArgumentNotNull(value, nameof(value));
if (value is decimal)
if (value is decimal d)
{
WriteValue((decimal)value);
WriteValue(d);
}
else if (value is double)
{