-Performance improvements
This commit is contained in:
@@ -93,8 +93,8 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
private object ReadBson(BsonReader reader)
|
private object ReadBson(BsonReader reader)
|
||||||
{
|
{
|
||||||
string regexText = (string)reader.Value;
|
string regexText = (string) reader.Value;
|
||||||
int patternOptionDelimiterIndex = regexText.LastIndexOf(@"/");
|
int patternOptionDelimiterIndex = regexText.LastIndexOf('/');
|
||||||
|
|
||||||
string patternText = regexText.Substring(1, patternOptionDelimiterIndex - 1);
|
string patternText = regexText.Substring(1, patternOptionDelimiterIndex - 1);
|
||||||
string optionsText = regexText.Substring(patternOptionDelimiterIndex + 1);
|
string optionsText = regexText.Substring(patternOptionDelimiterIndex + 1);
|
||||||
@@ -134,7 +134,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
reader.Read();
|
reader.Read();
|
||||||
|
|
||||||
return new Regex(pattern, (RegexOptions)options);
|
return new Regex(pattern, (RegexOptions) options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -184,14 +184,14 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private static long UniversialTicksToJavaScriptTicks(long universialTicks)
|
private static long UniversialTicksToJavaScriptTicks(long universialTicks)
|
||||||
{
|
{
|
||||||
long javaScriptTicks = (universialTicks - InitialJavaScriptDateTicks) / 10000;
|
long javaScriptTicks = (universialTicks - InitialJavaScriptDateTicks)/10000;
|
||||||
|
|
||||||
return javaScriptTicks;
|
return javaScriptTicks;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static DateTime ConvertJavaScriptTicksToDateTime(long javaScriptTicks)
|
internal static DateTime ConvertJavaScriptTicksToDateTime(long javaScriptTicks)
|
||||||
{
|
{
|
||||||
DateTime dateTime = new DateTime((javaScriptTicks * 10000) + InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
DateTime dateTime = new DateTime((javaScriptTicks*10000) + InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
||||||
|
|
||||||
return dateTime;
|
return dateTime;
|
||||||
}
|
}
|
||||||
@@ -311,7 +311,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private static string EnsureDecimalPlace(double value, string text)
|
private static string EnsureDecimalPlace(double value, string text)
|
||||||
{
|
{
|
||||||
if (double.IsNaN(value) || double.IsInfinity(value) || text.IndexOf('.') != -1 || text.IndexOf('E') != -1)
|
if (double.IsNaN(value) || double.IsInfinity(value) || text.IndexOf('.') != -1 || text.IndexOf('E') != -1 || text.IndexOf('e') != -1)
|
||||||
return text;
|
return text;
|
||||||
|
|
||||||
return text + ".0";
|
return text + ".0";
|
||||||
@@ -463,7 +463,7 @@ namespace Newtonsoft.Json
|
|||||||
#if !PocketPC && !NET20
|
#if !PocketPC && !NET20
|
||||||
else if (value is DateTimeOffset)
|
else if (value is DateTimeOffset)
|
||||||
{
|
{
|
||||||
return ToString((DateTimeOffset)value);
|
return ToString((DateTimeOffset) value);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if (value is Guid)
|
else if (value is Guid)
|
||||||
@@ -514,16 +514,16 @@ namespace Newtonsoft.Json
|
|||||||
type = Nullable.GetUnderlyingType(type);
|
type = Nullable.GetUnderlyingType(type);
|
||||||
|
|
||||||
#if !PocketPC && !NET20
|
#if !PocketPC && !NET20
|
||||||
if (type == typeof(DateTimeOffset))
|
if (type == typeof (DateTimeOffset))
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
if (type == typeof(byte[]))
|
if (type == typeof (byte[]))
|
||||||
return true;
|
return true;
|
||||||
if (type == typeof(Uri))
|
if (type == typeof (Uri))
|
||||||
return true;
|
return true;
|
||||||
if (type == typeof(TimeSpan))
|
if (type == typeof (TimeSpan))
|
||||||
return true;
|
return true;
|
||||||
if (type == typeof(Guid))
|
if (type == typeof (Guid))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return IsJsonPrimitiveTypeCode(Type.GetTypeCode(type));
|
return IsJsonPrimitiveTypeCode(Type.GetTypeCode(type));
|
||||||
@@ -562,7 +562,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>A JSON string representation of the object.</returns>
|
/// <returns>A JSON string representation of the object.</returns>
|
||||||
public static string SerializeObject(object value)
|
public static string SerializeObject(object value)
|
||||||
{
|
{
|
||||||
return SerializeObject(value, Formatting.None, (JsonSerializerSettings)null);
|
return SerializeObject(value, Formatting.None, (JsonSerializerSettings) null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -575,7 +575,7 @@ namespace Newtonsoft.Json
|
|||||||
/// </returns>
|
/// </returns>
|
||||||
public static string SerializeObject(object value, Formatting formatting)
|
public static string SerializeObject(object value, Formatting formatting)
|
||||||
{
|
{
|
||||||
return SerializeObject(value, formatting, (JsonSerializerSettings)null);
|
return SerializeObject(value, formatting, (JsonSerializerSettings) null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -599,7 +599,7 @@ namespace Newtonsoft.Json
|
|||||||
public static string SerializeObject(object value, Formatting formatting, params JsonConverter[] converters)
|
public static string SerializeObject(object value, Formatting formatting, params JsonConverter[] converters)
|
||||||
{
|
{
|
||||||
JsonSerializerSettings settings = (converters != null && converters.Length > 0)
|
JsonSerializerSettings settings = (converters != null && converters.Length > 0)
|
||||||
? new JsonSerializerSettings { Converters = converters }
|
? new JsonSerializerSettings {Converters = converters}
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
return SerializeObject(value, formatting, settings);
|
return SerializeObject(value, formatting, settings);
|
||||||
@@ -638,7 +638,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>The deserialized object from the Json string.</returns>
|
/// <returns>The deserialized object from the Json string.</returns>
|
||||||
public static object DeserializeObject(string value)
|
public static object DeserializeObject(string value)
|
||||||
{
|
{
|
||||||
return DeserializeObject(value, null, (JsonSerializerSettings)null);
|
return DeserializeObject(value, null, (JsonSerializerSettings) null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -663,7 +663,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>The deserialized object from the Json string.</returns>
|
/// <returns>The deserialized object from the Json string.</returns>
|
||||||
public static object DeserializeObject(string value, Type type)
|
public static object DeserializeObject(string value, Type type)
|
||||||
{
|
{
|
||||||
return DeserializeObject(value, type, (JsonSerializerSettings)null);
|
return DeserializeObject(value, type, (JsonSerializerSettings) null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -674,7 +674,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>The deserialized object from the Json string.</returns>
|
/// <returns>The deserialized object from the Json string.</returns>
|
||||||
public static T DeserializeObject<T>(string value)
|
public static T DeserializeObject<T>(string value)
|
||||||
{
|
{
|
||||||
return DeserializeObject<T>(value, (JsonSerializerSettings)null);
|
return DeserializeObject<T>(value, (JsonSerializerSettings) null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -702,7 +702,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>The deserialized object from the JSON string.</returns>
|
/// <returns>The deserialized object from the JSON string.</returns>
|
||||||
public static T DeserializeObject<T>(string value, params JsonConverter[] converters)
|
public static T DeserializeObject<T>(string value, params JsonConverter[] converters)
|
||||||
{
|
{
|
||||||
return (T)DeserializeObject(value, typeof(T), converters);
|
return (T) DeserializeObject(value, typeof (T), converters);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -717,7 +717,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>The deserialized object from the JSON string.</returns>
|
/// <returns>The deserialized object from the JSON string.</returns>
|
||||||
public static T DeserializeObject<T>(string value, JsonSerializerSettings settings)
|
public static T DeserializeObject<T>(string value, JsonSerializerSettings settings)
|
||||||
{
|
{
|
||||||
return (T)DeserializeObject(value, typeof(T), settings);
|
return (T) DeserializeObject(value, typeof (T), settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -730,7 +730,7 @@ namespace Newtonsoft.Json
|
|||||||
public static object DeserializeObject(string value, Type type, params JsonConverter[] converters)
|
public static object DeserializeObject(string value, Type type, params JsonConverter[] converters)
|
||||||
{
|
{
|
||||||
JsonSerializerSettings settings = (converters != null && converters.Length > 0)
|
JsonSerializerSettings settings = (converters != null && converters.Length > 0)
|
||||||
? new JsonSerializerSettings { Converters = converters }
|
? new JsonSerializerSettings {Converters = converters}
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
return DeserializeObject(value, type, settings);
|
return DeserializeObject(value, type, settings);
|
||||||
@@ -831,7 +831,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>A JSON string of the XmlNode.</returns>
|
/// <returns>A JSON string of the XmlNode.</returns>
|
||||||
public static string SerializeXmlNode(XmlNode node, Formatting formatting, bool omitRootObject)
|
public static string SerializeXmlNode(XmlNode node, Formatting formatting, bool omitRootObject)
|
||||||
{
|
{
|
||||||
XmlNodeConverter converter = new XmlNodeConverter { OmitRootObject = omitRootObject };
|
XmlNodeConverter converter = new XmlNodeConverter {OmitRootObject = omitRootObject};
|
||||||
|
|
||||||
return SerializeObject(node, formatting, converter);
|
return SerializeObject(node, formatting, converter);
|
||||||
}
|
}
|
||||||
@@ -873,7 +873,7 @@ namespace Newtonsoft.Json
|
|||||||
converter.DeserializeRootElementName = deserializeRootElementName;
|
converter.DeserializeRootElementName = deserializeRootElementName;
|
||||||
converter.WriteArrayAttribute = writeArrayAttribute;
|
converter.WriteArrayAttribute = writeArrayAttribute;
|
||||||
|
|
||||||
return (XmlDocument)DeserializeObject(value, typeof(XmlDocument), converter);
|
return (XmlDocument) DeserializeObject(value, typeof (XmlDocument), converter);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -908,7 +908,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>A JSON string of the XNode.</returns>
|
/// <returns>A JSON string of the XNode.</returns>
|
||||||
public static string SerializeXNode(XObject node, Formatting formatting, bool omitRootObject)
|
public static string SerializeXNode(XObject node, Formatting formatting, bool omitRootObject)
|
||||||
{
|
{
|
||||||
XmlNodeConverter converter = new XmlNodeConverter { OmitRootObject = omitRootObject };
|
XmlNodeConverter converter = new XmlNodeConverter {OmitRootObject = omitRootObject};
|
||||||
|
|
||||||
return SerializeObject(node, formatting, converter);
|
return SerializeObject(node, formatting, converter);
|
||||||
}
|
}
|
||||||
@@ -950,7 +950,7 @@ namespace Newtonsoft.Json
|
|||||||
converter.DeserializeRootElementName = deserializeRootElementName;
|
converter.DeserializeRootElementName = deserializeRootElementName;
|
||||||
converter.WriteArrayAttribute = writeArrayAttribute;
|
converter.WriteArrayAttribute = writeArrayAttribute;
|
||||||
|
|
||||||
return (XDocument)DeserializeObject(value, typeof(XDocument), converter);
|
return (XDocument) DeserializeObject(value, typeof (XDocument), converter);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -458,7 +458,9 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal static JsonConverter GetMatchingConverter(IList<JsonConverter> converters, Type objectType)
|
internal static JsonConverter GetMatchingConverter(IList<JsonConverter> converters, Type objectType)
|
||||||
{
|
{
|
||||||
|
#if DEBUG
|
||||||
ValidationUtils.ArgumentNotNull(objectType, "objectType");
|
ValidationUtils.ArgumentNotNull(objectType, "objectType");
|
||||||
|
#endif
|
||||||
|
|
||||||
if (converters != null)
|
if (converters != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -298,7 +298,7 @@ namespace Newtonsoft.Json
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (char)value;
|
return (char) value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool HasNext()
|
private bool HasNext()
|
||||||
@@ -427,10 +427,10 @@ namespace Newtonsoft.Json
|
|||||||
if (TokenType == JsonToken.Null)
|
if (TokenType == JsonToken.Null)
|
||||||
return null;
|
return null;
|
||||||
if (TokenType == JsonToken.Float)
|
if (TokenType == JsonToken.Float)
|
||||||
return (decimal?)Value;
|
return (decimal?) Value;
|
||||||
|
|
||||||
decimal d;
|
decimal d;
|
||||||
if (TokenType == JsonToken.String && decimal.TryParse((string)Value, NumberStyles.Number, Culture, out d))
|
if (TokenType == JsonToken.String && decimal.TryParse((string) Value, NumberStyles.Number, Culture, out d))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Float, d);
|
SetToken(JsonToken.Float, d);
|
||||||
return d;
|
return d;
|
||||||
@@ -457,10 +457,10 @@ namespace Newtonsoft.Json
|
|||||||
if (TokenType == JsonToken.Null)
|
if (TokenType == JsonToken.Null)
|
||||||
return null;
|
return null;
|
||||||
if (TokenType == JsonToken.Date)
|
if (TokenType == JsonToken.Date)
|
||||||
return (DateTimeOffset)Value;
|
return (DateTimeOffset) Value;
|
||||||
|
|
||||||
DateTimeOffset dt;
|
DateTimeOffset dt;
|
||||||
if (TokenType == JsonToken.String && DateTimeOffset.TryParse((string)Value, Culture, DateTimeStyles.None, out dt))
|
if (TokenType == JsonToken.String && DateTimeOffset.TryParse((string) Value, Culture, DateTimeStyles.None, out dt))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Date, dt);
|
SetToken(JsonToken.Date, dt);
|
||||||
return dt;
|
return dt;
|
||||||
@@ -685,7 +685,7 @@ namespace Newtonsoft.Json
|
|||||||
case 'n':
|
case 'n':
|
||||||
if (HasNext())
|
if (HasNext())
|
||||||
{
|
{
|
||||||
char next = (char)PeekNext();
|
char next = (char) PeekNext();
|
||||||
|
|
||||||
if (next == 'u')
|
if (next == 'u')
|
||||||
ParseNull();
|
ParseNull();
|
||||||
@@ -828,11 +828,17 @@ namespace Newtonsoft.Json
|
|||||||
object numberValue;
|
object numberValue;
|
||||||
JsonToken numberType;
|
JsonToken numberType;
|
||||||
|
|
||||||
bool nonBase10 = (firstChar == '0' && !number.StartsWith("0.", StringComparison.OrdinalIgnoreCase));
|
bool singleDigit = (char.IsDigit(firstChar) && number.Length == 1);
|
||||||
|
bool nonBase10 = (firstChar == '0' && number.Length > 1 && number[1] != '.');
|
||||||
|
|
||||||
if (_readType == ReadType.ReadAsDecimal)
|
if (_readType == ReadType.ReadAsDecimal)
|
||||||
{
|
{
|
||||||
if (nonBase10)
|
if (singleDigit)
|
||||||
|
{
|
||||||
|
// digit char values start at 48
|
||||||
|
numberValue = (decimal)firstChar - 48;
|
||||||
|
}
|
||||||
|
else if (nonBase10)
|
||||||
{
|
{
|
||||||
// decimal.Parse doesn't support parsing hexadecimal values
|
// decimal.Parse doesn't support parsing hexadecimal values
|
||||||
long integer = number.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
|
long integer = number.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
|
||||||
@@ -850,14 +856,21 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (nonBase10)
|
if (singleDigit)
|
||||||
|
{
|
||||||
|
// digit char values start at 48
|
||||||
|
numberValue = (long)firstChar - 48;
|
||||||
|
numberType = JsonToken.Integer;
|
||||||
|
}
|
||||||
|
else if (nonBase10)
|
||||||
{
|
{
|
||||||
numberValue = number.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
|
numberValue = number.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
|
||||||
? Convert.ToInt64(number, 16)
|
? Convert.ToInt64(number, 16)
|
||||||
: Convert.ToInt64(number, 8);
|
: Convert.ToInt64(number, 8);
|
||||||
numberType = JsonToken.Integer;
|
numberType = JsonToken.Integer;
|
||||||
}
|
}
|
||||||
else if (number.IndexOf(".", StringComparison.OrdinalIgnoreCase) != -1 || number.IndexOf("e", StringComparison.OrdinalIgnoreCase) != -1)
|
// it's faster to do 3 indexof with single characters than an indexofany
|
||||||
|
else if (number.IndexOf('.') != -1 || number.IndexOf('E') != -1 || number.IndexOf('e') != -1)
|
||||||
{
|
{
|
||||||
numberValue = Convert.ToDouble(number, CultureInfo.InvariantCulture);
|
numberValue = Convert.ToDouble(number, CultureInfo.InvariantCulture);
|
||||||
numberType = JsonToken.Float;
|
numberType = JsonToken.Float;
|
||||||
@@ -935,8 +948,7 @@ namespace Newtonsoft.Json
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
i++;
|
i++;
|
||||||
}
|
} while (i < value.Length && ((currentChar = MoveNext()) != '\0' || !_end));
|
||||||
while (i < value.Length && ((currentChar = MoveNext()) != '\0' || !_end));
|
|
||||||
|
|
||||||
return (i == value.Length);
|
return (i == value.Length);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -210,20 +210,17 @@ namespace Newtonsoft.Json
|
|||||||
/// Writes indent characters.
|
/// Writes indent characters.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void WriteIndent()
|
protected override void WriteIndent()
|
||||||
{
|
|
||||||
if (Formatting == Formatting.Indented)
|
|
||||||
{
|
{
|
||||||
_writer.Write(Environment.NewLine);
|
_writer.Write(Environment.NewLine);
|
||||||
|
|
||||||
// levels of indentation multiplied by the indent count
|
// levels of indentation multiplied by the indent count
|
||||||
int currentIndentCount = Top * _indentation;
|
int currentIndentCount = Top*_indentation;
|
||||||
|
|
||||||
for (int i = 0; i < currentIndentCount; i++)
|
for (int i = 0; i < currentIndentCount; i++)
|
||||||
{
|
{
|
||||||
_writer.Write(_indentChar);
|
_writer.Write(_indentChar);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Writes the JSON value delimiter.
|
/// Writes the JSON value delimiter.
|
||||||
|
|||||||
@@ -522,8 +522,11 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
JsonToken token = GetCloseTokenForType(Pop());
|
JsonToken token = GetCloseTokenForType(Pop());
|
||||||
|
|
||||||
|
if (_formatting == Formatting.Indented)
|
||||||
|
{
|
||||||
if (_currentState != State.ObjectStart && _currentState != State.ArrayStart)
|
if (_currentState != State.ObjectStart && _currentState != State.ArrayStart)
|
||||||
WriteIndent();
|
WriteIndent();
|
||||||
|
}
|
||||||
|
|
||||||
WriteEnd(token);
|
WriteEnd(token);
|
||||||
}
|
}
|
||||||
@@ -616,6 +619,8 @@ namespace Newtonsoft.Json
|
|||||||
WriteIndentSpace();
|
WriteIndentSpace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_formatting == Formatting.Indented)
|
||||||
|
{
|
||||||
WriteState writeState = WriteState;
|
WriteState writeState = WriteState;
|
||||||
|
|
||||||
// don't indent a property when it is the first token to be written (i.e. at the start)
|
// don't indent a property when it is the first token to be written (i.e. at the start)
|
||||||
@@ -624,6 +629,7 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
WriteIndent();
|
WriteIndent();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
_currentState = newState;
|
_currentState = newState;
|
||||||
}
|
}
|
||||||
@@ -1196,7 +1202,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void Dispose(bool disposing)
|
private void Dispose(bool disposing)
|
||||||
{
|
{
|
||||||
if (WriteState != WriteState.Closed)
|
if (_currentState != State.Closed)
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// Initializes a new instance of the <see cref="JsonPropertyCollection"/> class.
|
/// Initializes a new instance of the <see cref="JsonPropertyCollection"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="type">The type.</param>
|
/// <param name="type">The type.</param>
|
||||||
public JsonPropertyCollection(Type type)
|
public JsonPropertyCollection(Type type) : base(StringComparer.Ordinal)
|
||||||
{
|
{
|
||||||
ValidationUtils.ArgumentNotNull(type, "type");
|
ValidationUtils.ArgumentNotNull(type, "type");
|
||||||
_type = type;
|
_type = type;
|
||||||
@@ -100,6 +100,18 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return property;
|
return property;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool TryGetValue(string key, out JsonProperty item)
|
||||||
|
{
|
||||||
|
if (Dictionary == null)
|
||||||
|
{
|
||||||
|
item = default(JsonProperty);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Dictionary.TryGetValue(key, out item);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a property by property name.
|
/// Gets a property by property name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -108,6 +120,16 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// <returns>A matching property if found.</returns>
|
/// <returns>A matching property if found.</returns>
|
||||||
public JsonProperty GetProperty(string propertyName, StringComparison comparisonType)
|
public JsonProperty GetProperty(string propertyName, StringComparison comparisonType)
|
||||||
{
|
{
|
||||||
|
// KeyedCollection has an ordinal comparer
|
||||||
|
if (comparisonType == StringComparison.Ordinal)
|
||||||
|
{
|
||||||
|
JsonProperty property;
|
||||||
|
if (TryGetValue(propertyName, out property))
|
||||||
|
return property;
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (JsonProperty property in this)
|
foreach (JsonProperty property in this)
|
||||||
{
|
{
|
||||||
if (string.Equals(propertyName, property.PropertyName, comparisonType))
|
if (string.Equals(propertyName, property.PropertyName, comparisonType))
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
|
|
||||||
private bool HasDefinedType(Type type)
|
private bool HasDefinedType(Type type)
|
||||||
{
|
{
|
||||||
return (type != null && type != typeof (object) && !typeof (JToken).IsAssignableFrom(type)
|
return (type != null && type != typeof (object) && !typeof (JToken).IsSubclassOf(type)
|
||||||
#if !(NET35 || NET20 || WINDOWS_PHONE)
|
#if !(NET35 || NET20 || WINDOWS_PHONE)
|
||||||
&& type != typeof (IDynamicMetaObjectProvider)
|
&& type != typeof (IDynamicMetaObjectProvider)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -35,21 +35,29 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
internal static class JavaScriptUtils
|
internal static class JavaScriptUtils
|
||||||
{
|
{
|
||||||
public static void WriteEscapedJavaScriptString(TextWriter writer, string value, char delimiter, bool appendDelimiters)
|
public static void WriteEscapedJavaScriptString(TextWriter writer, string s, char delimiter, bool appendDelimiters)
|
||||||
{
|
{
|
||||||
// leading delimiter
|
// leading delimiter
|
||||||
if (appendDelimiters)
|
if (appendDelimiters)
|
||||||
writer.Write(delimiter);
|
writer.Write(delimiter);
|
||||||
|
|
||||||
if (value != null)
|
if (s != null)
|
||||||
{
|
{
|
||||||
int lastWritePosition = 0;
|
|
||||||
int skipped = 0;
|
|
||||||
char[] chars = null;
|
char[] chars = null;
|
||||||
|
int lastWritePosition = -1;
|
||||||
|
|
||||||
for (int i = 0; i < value.Length; i++)
|
for (var index = 0; index < s.Length; ++index)
|
||||||
{
|
{
|
||||||
char c = value[i];
|
var c = s[index];
|
||||||
|
|
||||||
|
if (c >= ' ' && c < 128 && c != '\"' && c != '\\' && c != '\'')
|
||||||
|
{
|
||||||
|
if (lastWritePosition == -1)
|
||||||
|
lastWritePosition = index;
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
string escapedValue;
|
string escapedValue;
|
||||||
|
|
||||||
switch (c)
|
switch (c)
|
||||||
@@ -94,35 +102,39 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (escapedValue != null)
|
if (escapedValue == null)
|
||||||
|
{
|
||||||
|
if (lastWritePosition == -1)
|
||||||
|
lastWritePosition = index;
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lastWritePosition != -1)
|
||||||
{
|
{
|
||||||
if (chars == null)
|
if (chars == null)
|
||||||
chars = value.ToCharArray();
|
chars = s.ToCharArray();
|
||||||
|
|
||||||
// write skipped text
|
writer.Write(chars, lastWritePosition, index - lastWritePosition);
|
||||||
if (skipped > 0)
|
lastWritePosition = -1;
|
||||||
{
|
|
||||||
writer.Write(chars, lastWritePosition, skipped);
|
|
||||||
skipped = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// write escaped value and note position
|
|
||||||
writer.Write(escapedValue);
|
writer.Write(escapedValue);
|
||||||
lastWritePosition = i + 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
skipped++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// write any remaining skipped text
|
if (lastWritePosition != -1)
|
||||||
if (skipped > 0)
|
|
||||||
{
|
{
|
||||||
if (lastWritePosition == 0)
|
if (lastWritePosition == 0)
|
||||||
writer.Write(value);
|
{
|
||||||
|
writer.Write(s);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
writer.Write(chars, lastWritePosition, skipped);
|
{
|
||||||
|
if (chars == null)
|
||||||
|
chars = s.ToCharArray();
|
||||||
|
|
||||||
|
writer.Write(chars, lastWritePosition, s.Length - lastWritePosition);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user