j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor syntax adjustments

Browse source
This commit is contained in:
Niels 2015-01-09 16:38:34 +01:00
parent 661a44d156
commit 33f5e74905
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/json.cc
View file

@ -2049,13 +2049,16 @@ std::string json::parser::parseString()
bool evenAmountOfBackslashes = true; bool evenAmountOfBackslashes = true;
// iterate with pos_ over the whole string // iterate with pos_ over the whole string
for (;pos_ < buffer_.size(); pos_++) { for (; pos_ < buffer_.size(); pos_++)
{
char currentChar = buffer_[pos_]; char currentChar = buffer_[pos_];
// currentChar is a quote, so we might have found the end of the string // currentChar is a quote, so we might have found the end of the string
if (currentChar == '"') { if (currentChar == '"')
{
// but only if the amount of backslashes before that quote is even // but only if the amount of backslashes before that quote is even
if (evenAmountOfBackslashes) { if (evenAmountOfBackslashes)
{
const auto stringLength = pos_ - startPos; const auto stringLength = pos_ - startPos;
// set pos_ behind the trailing quote // set pos_ behind the trailing quote
@ -2068,13 +2071,18 @@ std::string json::parser::parseString()
} }
} }
// remember if we have an even amount of backslashes before the current character // remember if we have an even amount of backslashes before the current
if (currentChar == '\\') { // character
if (currentChar == '\\')
{
// jump between even/uneven for each backslash we encounter // jump between even/uneven for each backslash we encounter
evenAmountOfBackslashes = !evenAmountOfBackslashes; evenAmountOfBackslashes = not evenAmountOfBackslashes;
} else { }
// zero backslashes are also an even number, so as soon as we encounter a non-backslash else
// the chain of backslashes breaks and we start again from zero {
// zero backslashes are also an even number, so as soon as we
// encounter a non-backslash the chain of backslashes breaks and
// we start again from zero
evenAmountOfBackslashes = true; evenAmountOfBackslashes = true;
} }
} }