From f95a90893b2fcfcee14812ff3ba3d218ee70c306 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Mon, 21 Dec 2015 21:55:14 +1300 Subject: [PATCH] -Refactor --- Src/Newtonsoft.Json/JsonTextReader.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Src/Newtonsoft.Json/JsonTextReader.cs b/Src/Newtonsoft.Json/JsonTextReader.cs index be0446f6..ebf5e18c 100644 --- a/Src/Newtonsoft.Json/JsonTextReader.cs +++ b/Src/Newtonsoft.Json/JsonTextReader.cs @@ -505,7 +505,6 @@ namespace Newtonsoft.Json _charPos = charPos; if (!EnsureChars(0, true)) { - _charPos = charPos; throw JsonReaderException.Create(this, "Unterminated string. Expected delimiter: {0}.".FormatWith(CultureInfo.InvariantCulture, quote)); } @@ -513,43 +512,36 @@ namespace Newtonsoft.Json int escapeStartPos = charPos - 1; char currentChar = _chars[charPos]; + charPos++; char writeChar; switch (currentChar) { case 'b': - charPos++; writeChar = '\b'; break; case 't': - charPos++; writeChar = '\t'; break; case 'n': - charPos++; writeChar = '\n'; break; case 'f': - charPos++; writeChar = '\f'; break; case 'r': - charPos++; writeChar = '\r'; break; case '\\': - charPos++; writeChar = '\\'; break; case '"': case '\'': case '/': writeChar = currentChar; - charPos++; break; case 'u': - charPos++; _charPos = charPos; writeChar = ParseUnicode(); @@ -608,7 +600,6 @@ namespace Newtonsoft.Json charPos = _charPos; break; default: - charPos++; _charPos = charPos; throw JsonReaderException.Create(this, "Bad JSON escape sequence: {0}.".FormatWith(CultureInfo.InvariantCulture, @"\" + currentChar)); }