riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util: Optimize more string creating and string.find() away

Browse Source
This commit is contained in:
Riyyi
2022-07-17 22:03:48 +02:00
parent 827286a0b2
commit 99759b82b7
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/json/parser.cpp
+13 -8
View File
@@ -155,7 +155,12 @@ Value Parser::getNumber()
}; };
State state = State::Int; State state = State::Int;
std::string validCharacters = "0123456789-";
#define CHECK_IF_VALID_NUMBER \
if (character < 48 || character > 57) { \
reportError(token, std::string() + "invalid number, unexpected '" + character + '\''); \
return nullptr; \
}
size_t fractionPosition = 0; size_t fractionPosition = 0;
size_t exponentPosition = 0; size_t exponentPosition = 0;
@@ -166,14 +171,12 @@ Value Parser::getNumber()
// Int -> Fraction // Int -> Fraction
if (character == '.' && state == State::Int) { if (character == '.' && state == State::Int) {
state = State::Fraction; state = State::Fraction;
validCharacters = "0123456789";
fractionPosition = i; fractionPosition = i;
continue; continue;
} }
// Int/Fraction -> Exponent // Int/Fraction -> Exponent
else if ((character == 'e' || character == 'E') && state != State::Exponent) { else if ((character == 'e' || character == 'E') && state != State::Exponent) {
state = State::Exponent; state = State::Exponent;
validCharacters = "0123456789+-";
exponentPosition = i; exponentPosition = i;
continue; continue;
} }
@@ -189,8 +192,12 @@ Value Parser::getNumber()
return nullptr; return nullptr;
} }
} }
else {
CHECK_IF_VALID_NUMBER;
}
} }
else if (state == State::Fraction) { else if (state == State::Fraction) {
CHECK_IF_VALID_NUMBER;
} }
else if (state == State::Exponent) { else if (state == State::Exponent) {
if (character == '-' || character == '+') { if (character == '-' || character == '+') {
@@ -203,11 +210,9 @@ Value Parser::getNumber()
return nullptr; return nullptr;
} }
} }
} else {
CHECK_IF_VALID_NUMBER;
if (validCharacters.find(character) == std::string::npos) { }
reportError(token, std::string() + "invalid number, unexpected '" + character + '\'');
return nullptr;
} }
} }