-Formatting

-Build
This commit is contained in:
James Newton-King
2015-12-04 23:54:38 +13:00
parent c96779dc10
commit eb0cbd6a75
334 changed files with 3952 additions and 514 deletions
+11 -4
View File
@@ -201,7 +201,6 @@ namespace Newtonsoft.Json
}
}
private static void BlockCopyChars(char[] src, int srcOffset, char[] dst, int dstOffset, int count)
{
const int charByteCount = 2;
@@ -452,7 +451,9 @@ namespace Newtonsoft.Json
// returns true if it hits
// end of object or array
if (ParsePostValue())
{
return true;
}
break;
case State.Finished:
if (EnsureChars(0, false))
@@ -467,7 +468,7 @@ namespace Newtonsoft.Json
ParseComment();
return true;
}
throw JsonReaderException.Create(this, "Additional text encountered after finished reading JSON content: {0}.".FormatWith(CultureInfo.InvariantCulture, _chars[_charPos]));
}
return false;
@@ -750,7 +751,7 @@ namespace Newtonsoft.Json
{
return;
}
throw JsonReaderException.Create(this, "Unexpected character encountered while parsing number: {0}.".FormatWith(CultureInfo.InvariantCulture, currentChar));
}
}
@@ -959,7 +960,9 @@ namespace Newtonsoft.Json
if (_charsUsed == _charPos)
{
if (ReadData(true) == 0)
{
throw JsonReaderException.Create(this, "Unexpected end while parsing unquoted property name.");
}
break;
}
@@ -997,7 +1000,9 @@ namespace Newtonsoft.Json
if (_charsUsed == _charPos)
{
if (ReadData(false) == 0)
{
return false;
}
}
else
{
@@ -1408,7 +1413,7 @@ namespace Newtonsoft.Json
{
throw JsonReaderException.Create(this, "JSON integer {0} is too large to parse.".FormatWith(CultureInfo.InvariantCulture, _stringReference.ToString()));
}
numberValue = BigIntegerParse(number, CultureInfo.InvariantCulture);
numberType = JsonToken.Integer;
#else
@@ -1473,7 +1478,9 @@ namespace Newtonsoft.Json
_charPos++;
if (!EnsureChars(1, false))
{
throw JsonReaderException.Create(this, "Unexpected end while parsing comment.");
}
bool singlelineComment;