-Added Path to JsonReaderException/JsonSerializationException messages

-Added JsonException
-Fixed all Exceptions thrown to be more specific
This commit is contained in:
James Newton-King
2012-04-21 17:25:44 +12:00
parent c120bf530d
commit a7bddf989f
69 changed files with 1400 additions and 1161 deletions
+27 -27
View File
@@ -501,7 +501,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Additional text encountered after finished reading JSON content: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
throw JsonReaderException.Create(this, "Additional text encountered after finished reading JSON content: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
}
}
return false;
@@ -510,7 +510,7 @@ namespace Newtonsoft.Json
case State.Error:
break;
default:
throw CreateReaderException(this, "Unexpected state: {0}.".FormatWith(CultureInfo.InvariantCulture, CurrentState));
throw JsonReaderException.Create(this, "Unexpected state: {0}.".FormatWith(CultureInfo.InvariantCulture, CurrentState));
}
}
}
@@ -534,7 +534,7 @@ namespace Newtonsoft.Json
if (ReadData(true) == 0)
{
_charPos = charPos;
throw CreateReaderException(this, "Unterminated string. Expected delimiter: {0}.".FormatWith(CultureInfo.InvariantCulture, quote));
throw JsonReaderException.Create(this, "Unterminated string. Expected delimiter: {0}.".FormatWith(CultureInfo.InvariantCulture, quote));
}
}
break;
@@ -543,7 +543,7 @@ namespace Newtonsoft.Json
if (!EnsureChars(0, true))
{
_charPos = charPos;
throw CreateReaderException(this, "Unterminated string. Expected delimiter: {0}.".FormatWith(CultureInfo.InvariantCulture, quote));
throw JsonReaderException.Create(this, "Unterminated string. Expected delimiter: {0}.".FormatWith(CultureInfo.InvariantCulture, quote));
}
// start of escape sequence
@@ -648,7 +648,7 @@ namespace Newtonsoft.Json
default:
charPos++;
_charPos = charPos;
throw CreateReaderException(this, "Bad JSON escape sequence: {0}.".FormatWith(CultureInfo.InvariantCulture, @"\" + currentChar));
throw JsonReaderException.Create(this, "Bad JSON escape sequence: {0}.".FormatWith(CultureInfo.InvariantCulture, @"\" + currentChar));
}
if (buffer == null)
@@ -721,7 +721,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Unexpected end while parsing unicode character.");
throw JsonReaderException.Create(this, "Unexpected end while parsing unicode character.");
}
return writeChar;
}
@@ -848,7 +848,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "After parsing a value an unexpected character was encountered: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
throw JsonReaderException.Create(this, "After parsing a value an unexpected character was encountered: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
}
break;
}
@@ -927,7 +927,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Invalid property identifier character: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
throw JsonReaderException.Create(this, "Invalid property identifier character: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
}
string propertyName = _stringReference.ToString();
@@ -935,7 +935,7 @@ namespace Newtonsoft.Json
EatWhitespace(false);
if (_chars[_charPos] != ':')
throw CreateReaderException(this, "Invalid character after parsing property name. Expected ':' but got: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
throw JsonReaderException.Create(this, "Invalid character after parsing property name. Expected ':' but got: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
_charPos++;
@@ -964,7 +964,7 @@ namespace Newtonsoft.Json
if (_charsUsed == _charPos)
{
if (ReadData(true) == 0)
throw CreateReaderException(this, "Unexpected end while parsing unquoted property name.");
throw JsonReaderException.Create(this, "Unexpected end while parsing unquoted property name.");
break;
}
@@ -985,7 +985,7 @@ namespace Newtonsoft.Json
return;
}
throw CreateReaderException(this, "Invalid JavaScript property identifier character: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
throw JsonReaderException.Create(this, "Invalid JavaScript property identifier character: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
}
}
}
@@ -1029,11 +1029,11 @@ namespace Newtonsoft.Json
else if (next == 'e')
ParseConstructor();
else
throw CreateReaderException(this, "Unexpected character encountered while parsing value: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
throw JsonReaderException.Create(this, "Unexpected character encountered while parsing value: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
}
else
{
throw CreateReaderException(this, "Unexpected end.");
throw JsonReaderException.Create(this, "Unexpected end.");
}
return true;
case 'N':
@@ -1100,7 +1100,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Unexpected character encountered while parsing value: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
throw JsonReaderException.Create(this, "Unexpected character encountered while parsing value: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
}
}
}
@@ -1183,7 +1183,7 @@ namespace Newtonsoft.Json
if (_charsUsed == _charPos)
{
if (ReadData(true) == 0)
throw CreateReaderException(this, "Unexpected end while parsing constructor.");
throw JsonReaderException.Create(this, "Unexpected end while parsing constructor.");
}
else
{
@@ -1221,7 +1221,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Unexpected character while parsing constructor: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
throw JsonReaderException.Create(this, "Unexpected character while parsing constructor: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
}
}
@@ -1231,7 +1231,7 @@ namespace Newtonsoft.Json
EatWhitespace(false);
if (_chars[_charPos] != '(')
throw CreateReaderException(this, "Unexpected character while parsing constructor: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
throw JsonReaderException.Create(this, "Unexpected character while parsing constructor: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
_charPos++;
@@ -1350,7 +1350,7 @@ namespace Newtonsoft.Json
}
catch (OverflowException ex)
{
throw CreateReaderException((JsonReader)this, "JSON integer {0} is too large or small for an Int64.".FormatWith(CultureInfo.InvariantCulture, number), ex);
throw JsonReaderException.Create((JsonReader)this, "JSON integer {0} is too large or small for an Int64.".FormatWith(CultureInfo.InvariantCulture, number), ex);
}
numberType = JsonToken.Integer;
@@ -1369,7 +1369,7 @@ namespace Newtonsoft.Json
_charPos++;
if (!EnsureChars(1, false) || _chars[_charPos] != '*')
throw CreateReaderException(this, "Error parsing comment. Expected: *, got {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
throw JsonReaderException.Create(this, "Error parsing comment. Expected: *, got {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
else
_charPos++;
@@ -1385,7 +1385,7 @@ namespace Newtonsoft.Json
if (_charsUsed == _charPos)
{
if (ReadData(true) == 0)
throw CreateReaderException(this, "Unexpected end while parsing comment.");
throw JsonReaderException.Create(this, "Unexpected end while parsing comment.");
}
else
{
@@ -1498,7 +1498,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing boolean value.");
throw JsonReaderException.Create(this, "Error parsing boolean value.");
}
}
@@ -1510,7 +1510,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing null value.");
throw JsonReaderException.Create(this, "Error parsing null value.");
}
}
@@ -1522,7 +1522,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing undefined value.");
throw JsonReaderException.Create(this, "Error parsing undefined value.");
}
}
@@ -1534,7 +1534,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing boolean value.");
throw JsonReaderException.Create(this, "Error parsing boolean value.");
}
}
@@ -1546,7 +1546,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing negative infinity value.");
throw JsonReaderException.Create(this, "Error parsing negative infinity value.");
}
}
@@ -1558,7 +1558,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing positive infinity value.");
throw JsonReaderException.Create(this, "Error parsing positive infinity value.");
}
}
@@ -1570,7 +1570,7 @@ namespace Newtonsoft.Json
}
else
{
throw CreateReaderException(this, "Error parsing NaN value.");
throw JsonReaderException.Create(this, "Error parsing NaN value.");
}
}