-JsonTextReader, BsonReader performance

-Fix dictionary key encoding when serializing
-Fix WrappedDictionary being set to a property when deserializing
-Fix Silverlight serialization security error
This commit is contained in:
JamesNK
2010-01-01 23:13:35 +00:00
parent 974178a162
commit 324c4e4bc5
25 changed files with 971 additions and 566 deletions
+4 -1
View File
@@ -102,6 +102,7 @@ namespace Newtonsoft.Json
private Type _valueType;
private char _quoteChar;
private State _currentState;
private JTokenType _currentTypeContext;
/// <summary>
/// Gets the current reader state.
@@ -182,6 +183,7 @@ namespace Newtonsoft.Json
{
_stack.Add(value);
_top++;
_currentTypeContext = value;
}
private JTokenType Pop()
@@ -189,13 +191,14 @@ namespace Newtonsoft.Json
JTokenType value = Peek();
_stack.RemoveAt(_stack.Count - 1);
_top--;
_currentTypeContext = _stack[_top - 1];
return value;
}
private JTokenType Peek()
{
return _stack[_top - 1];
return _currentTypeContext;
}
/// <summary>