Util: Optimize m_index variable usage

This commit is contained in:
Riyyi
2022-07-01 11:32:26 +02:00
parent d65f56bf03
commit 925fdd474a
+1 -6
View File
@@ -422,30 +422,25 @@ Value Parser::getObject()
} }
// Add member (name:value pair) to object // Add member (name:value pair) to object
token = consume(); token = peek();
if (token.type == Token::Type::Literal) { if (token.type == Token::Type::Literal) {
printf("Adding literal to object.. k:{%s}, v:{%s}, t:{%d}\n", name.c_str(), token.symbol.c_str(), (int)token.type); printf("Adding literal to object.. k:{%s}, v:{%s}, t:{%d}\n", name.c_str(), token.symbol.c_str(), (int)token.type);
m_index--;
object[name] = getLiteral(); object[name] = getLiteral();
} }
else if (token.type == Token::Type::Number) { else if (token.type == Token::Type::Number) {
printf("Adding number to object.. k:{%s}, v:{%s}, t:{%d} -> %f\n", name.c_str(), token.symbol.c_str(), (int)token.type, std::stod(token.symbol)); printf("Adding number to object.. k:{%s}, v:{%s}, t:{%d} -> %f\n", name.c_str(), token.symbol.c_str(), (int)token.type, std::stod(token.symbol));
m_index--;
object[name] = getNumber(); object[name] = getNumber();
} }
else if (token.type == Token::Type::String) { else if (token.type == Token::Type::String) {
#ifdef JSON_DEBUG #ifdef JSON_DEBUG
printf("Adding string to object.. k:{%s}, v:{%s}, t:{%d}\n", name.c_str(), token.symbol.c_str(), (int)token.type); printf("Adding string to object.. k:{%s}, v:{%s}, t:{%d}\n", name.c_str(), token.symbol.c_str(), (int)token.type);
#endif #endif
m_index--;
object[name] = getString(); object[name] = getString();
} }
else if (token.type == Token::Type::BracketOpen) { else if (token.type == Token::Type::BracketOpen) {
m_index--;
object[name] = getArray(); object[name] = getArray();
} }
else if (token.type == Token::Type::BraceOpen) { else if (token.type == Token::Type::BraceOpen) {
m_index--;
object[name] = getObject(); object[name] = getObject();
} }
else { else {