Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-06 14:14:22 +01:00
Code Releases Wiki Activity

pattern: Fixed sizeof and addressof operator parsing

Browse Source
This commit is contained in:
WerWolv 2022-01-30 17:48:20 +01:00
parent 69bd438fe1
commit 6a724352b0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libimhex/source/pattern_language/lexer.cpp
View File

@ -28,6 +28,10 @@ namespace hex::pl {
return string.find_first_not_of("0123456789ABCDEFabcdef.xUL"); return string.find_first_not_of("0123456789ABCDEFabcdef.xUL");
} }
bool isIdentifierCharacter(char c) {
return std::isalnum(c) || c == '_';
}
std::optional<Token::Literal> parseIntegerLiteral(const std::string &string) { std::optional<Token::Literal> parseIntegerLiteral(const std::string &string) {
Token::ValueType type = Token::ValueType::Any; Token::ValueType type = Token::ValueType::Any;
Token::Literal result; Token::Literal result;
@ -392,10 +396,10 @@ namespace hex::pl {
} else if (c == '$') { } else if (c == '$') {
tokens.emplace_back(TOKEN(Operator, Dollar)); tokens.emplace_back(TOKEN(Operator, Dollar));
offset += 1; offset += 1;
} else if (code.substr(offset, 9) == "addressof") { } else if (code.substr(offset, 9) == "addressof" && !isIdentifierCharacter(code[offset + 9])) {
tokens.emplace_back(TOKEN(Operator, AddressOf)); tokens.emplace_back(TOKEN(Operator, AddressOf));
offset += 9; offset += 9;
} else if (code.substr(offset, 6) == "sizeof") { } else if (code.substr(offset, 6) == "sizeof" && !isIdentifierCharacter(code[offset + 6])) {
tokens.emplace_back(TOKEN(Operator, SizeOf)); tokens.emplace_back(TOKEN(Operator, SizeOf));
offset += 6; offset += 6;
} else if (c == '\'') { } else if (c == '\'') {
@ -418,8 +422,8 @@ namespace hex::pl {
tokens.emplace_back(VALUE_TOKEN(String, Token::Literal(s))); tokens.emplace_back(VALUE_TOKEN(String, Token::Literal(s)));
offset += stringSize; offset += stringSize;
} else if (std::isalpha(c) || c == '_') { } else if (isIdentifierCharacter(c) && !std::isdigit(c)) {
std::string identifier = matchTillInvalid(&code[offset], [](char c) -> bool { return std::isalnum(c) || c == '_'; }); std::string identifier = matchTillInvalid(&code[offset], isIdentifierCharacter);
// Check for reserved keywords // Check for reserved keywords