imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 21:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

patterns: Allow str to be used in function bodies

Browse Source
This commit is contained in:
WerWolv
2021-10-04 20:26:34 +02:00
parent a93049056a
commit 4b9aff5b29
5 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/libimhex/source/pattern_language/evaluator.cpp
View File

@@ -20,19 +20,19 @@ namespace hex::pl {
if (!value.has_value())
LogConsole::abortEvaluation("cannot determine type of auto variable", type);
if (std::get_if<u128>(&*value) != nullptr)
if (std::get_if<u128>(&value.value()) != nullptr)
pattern = new PatternDataUnsigned(0, sizeof(u128), this);
else if (std::get_if<s128>(&*value) != nullptr)
else if (std::get_if<s128>(&value.value()) != nullptr)
pattern = new PatternDataSigned(0, sizeof(s128), this);
else if (std::get_if<double>(&*value) != nullptr)
else if (std::get_if<double>(&value.value()) != nullptr)
pattern = new PatternDataFloat(0, sizeof(double), this);
else if (std::get_if<bool>(&*value) != nullptr)
else if (std::get_if<bool>(&value.value()) != nullptr)
pattern = new PatternDataBoolean(0, this);
else if (std::get_if<char>(&*value) != nullptr)
else if (std::get_if<char>(&value.value()) != nullptr)
pattern = new PatternDataCharacter(0, this);
else if (std::get_if<PatternData*>(&*value) != nullptr)
pattern = std::get<PatternData*>(*value)->clone();
else if (std::get_if<std::string>(&*value) != nullptr)
else if (std::get_if<PatternData*>(&value.value()) != nullptr)
pattern = std::get<PatternData*>(value.value())->clone();
else if (std::get_if<std::string>(&value.value()) != nullptr)
pattern = new PatternDataString(0, 1, this);
else
__builtin_unreachable();

4
plugins/libimhex/source/pattern_language/parser.cpp
View File

@@ -494,10 +494,10 @@ namespace hex::pl {
statement = parseFunctionCall();
}
else
statement = parseMemberVariable(parseType());
statement = parseMemberVariable(parseType(true));
}
else if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY)) {
auto type = parseType();
auto type = parseType(true);
if (MATCHES(sequence(IDENTIFIER)))
statement = parseMemberVariable(type);